diff -Nru ant-1.9.10/build.xml ant-1.10.3/build.xml
--- ant-1.9.10/build.xml	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/build.xml	2018-03-24 12:37:12.000000000 +0000
@@ -31,12 +31,12 @@
   -->
   <property name="Name" value="Apache Ant"/>
   <property name="name" value="ant"/>
-  <!-- this is the groupId of ant in the Maven repository -->
+  <!-- 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.9.10"/>
+  <property name="project.version" value="1.10.3"/>
   <!-- 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.9.10"/>
-  <property name="manifest-version" value="1.9.10"/>
+  <property name="pom.version" value="1.10.3"/>
+  <property name="manifest-version" value="1.10.3"/>
   <property name="bootstrap.jar" value="ant-bootstrap.jar"/>
 
   <property name="ant.package" value="org/apache/tools/ant"/>
@@ -45,7 +45,7 @@
   <property name="optional.package" value="${taskdefs.package}/optional"/>
   <property name="type.package" value="${ant.package}/types"/>
   <property name="optional.type.package" value="${type.package}/optional"/>
-  <property name="apache.resolver.type.package" value="${ant.package}/types/resolver"/>
+  <property name="apache.resolver.type.package" value="${type.package}/resolver"/>
   <property name="util.package" value="${ant.package}/util"/>
   <property name="regexp.package" value="${util.package}/regexp"/>
 
@@ -60,14 +60,13 @@
   <property name="src.dir" value="src"/>
   <property name="java.dir" value="${src.dir}/main"/>
   <property name="script.dir" value="${src.dir}/script"/>
-  <property name="lib.dir" value="lib"/>
-  <property name="manual.dir" value="manual"/>
-  <property name="etc.dir" value="${src.dir}/etc"/>
+  <property name="resource.dir" value="${src.dir}/resources"/>
   <property name="src.junit" value="${src.dir}/tests/junit"/>
   <property name="src.antunit" value="${src.dir}/tests/antunit"/>
-  <property name="tests.etc.dir" value="${src.dir}/etc/testcases"/>
-  <property name="manifest" value="${src.dir}/etc/manifest"/>
-  <property name="resource.dir" value="${src.dir}/resources"/>
+  <property name="etc.dir" value="${src.dir}/etc"/>
+  <property name="tests.etc.dir" value="${etc.dir}/testcases"/>
+  <property name="lib.dir" value="lib"/>
+  <property name="manual.dir" value="manual"/>
 
   <!--
        ===================================================================
@@ -84,14 +83,14 @@
   <property name="build.tests.javadocs" value="${build.dir}/javadocs.test/"/>
   <property name="build.junit.xml" location="${build.tests}/xml"/>
   <property name="build.junit.tmpdir" location="${build.tests}/tmp"/>
+  <property name="build.junit.reports" location="${build.tests}/reports"/>
   <property name="antunit.xml" location="${build.dir}/antunit/xml"/>
   <property name="antunit.tmpdir" location="${build.dir}/antunit/tmp"/>
   <property name="antunit.reports" location="${build.dir}/antunit/reports"/>
   <property name="antunit.loglevel" value="none"/>
-  <property name="build.junit.reports" location="${build.tests}/reports"/>
-  <property name="manifest.tmp" value="${build.dir}/optional.manifest"/>
   <!-- the absolute path -->
   <property name="build.tests.value" location="${build.tests}"/>
+  <property name="build.pkg.dir" value="${build.dir}/pkg"/>
 
   <!--
        ===================================================================
@@ -99,12 +98,12 @@
        ===================================================================
   -->
   <property name="debug" value="true"/>
-  <property name="chmod.fail" value="true"/>
-  <property name="chmod.maxparallel" value="250"/>
+  <property name="setpermissions.fail" value="true"/>
+  <property name="setpermissions.nonposixmode" value="tryDosOrPass"/>
   <property name="deprecation" value="false"/>
   <property name="optimize" value="true"/>
-  <property name="javac.target" value="1.5"/>
-  <property name="javac.source" value="1.5"/>
+  <property name="javac.target" value="1.8"/>
+  <property name="javac.source" value="1.8"/>
   <property name="junit.filtertrace" value="off"/>
   <property name="junit.summary" value="no"/>
   <property name="test.haltonfailure" value="false"/>
@@ -121,7 +120,6 @@
   <property name="junit.collector.dir" value="${build.dir}/failingTests"/>
   <property name="junit.collector.class" value="FailedTests"/>
 
-
   <!--
        ===================================================================
          Set the paths used in the build
@@ -210,6 +208,20 @@
       </or>
   </selector>
 
+  <selector id="needs.junitlauncher">
+    <filename name="${optional.package}/junitlauncher/"/>
+  </selector>
+
+  <selector id="needs.junit.engine.vintage">
+    <!-- we need JUnit vintage engine only in tests where we test the junitlauncher task -->
+    <filename name="${src.junit}/org/apache/tools/ant/taskdefs/optional/junitlauncher/**/*"/>
+  </selector>
+
+  <selector id="needs.junit.engine.jupiter">
+    <!-- we need JUnit jupiter engine only in tests where we test the junitlauncher task -->
+    <filename name="${src.junit}/org/apache/tools/ant/taskdefs/optional/junitlauncher/**/*"/>
+  </selector>
+
   <selector id="needs.apache-regexp">
     <filename name="${regexp.package}/JakartaRegexp*"/>
   </selector>
@@ -293,6 +305,13 @@
     <filename name="${optional.package}/Xalan2TraceSupport*"/>
   </selector>
 
+  <selector id="needs.xz">
+    <or>
+      <filename name="${optional.package}/xz/"/>
+      <filename name="${type.package}/optional/xz/"/>
+    </or>
+  </selector>
+
   <selector id="ant.launcher">
     <filename name="${ant.package}/launch/"/>
   </selector>
@@ -317,8 +336,10 @@
         <selector refid="needs.jsch"/>
         <selector refid="needs.junit"/>
         <selector refid="needs.junit4"/>
+        <selector refid="needs.junitlauncher"/>
         <selector refid="needs.netrexx"/>
         <selector refid="needs.swing"/>
+        <selector refid="needs.xz"/>
         <selector refid="ant.launcher"/>
       </or>
     </not>
@@ -337,7 +358,7 @@
     <exclude unless="run.failing.tests" name="${optional.package}/jdepend/JDependTest.java"/>
   </patternset>
 
-  <!--tests that need an XML Schema-supporting parser to work-->
+  <!-- tests that need an XML Schema-supporting parser to work -->
   <selector id="needs.xmlschema">
     <or>
       <filename name="${optional.package}/SchemaValidateTest.*"/>
@@ -374,9 +395,6 @@
       </not>
     </condition>
     <property name="ignoresystemclasses" value="false"/>
-    <available property="jdk1.6+" classname="java.net.CookieStore"/>
-    <available property="jdk1.7+" classname="java.nio.file.FileSystem"/>
-    <available property="jdk1.8+" classname="java.lang.reflect.Executable"/>
     <available property="jdk9+" classname="java.lang.module.ModuleDescriptor"/>
     <condition property="jdk10+">
       <javaversion atleast="10"/>
@@ -402,6 +420,15 @@
     <available property="junit4.present"
                classname="org.junit.Test"
                classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
+    <available property="junitlauncher.present"
+               classname="org.junit.platform.launcher.Launcher"
+               classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
+    <available property="junit.engine.vintage.present"
+               classname="org.junit.vintage.engine.VintageTestEngine"
+               classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
+    <available property="junit.engine.jupiter.present"
+               classname="org.junit.jupiter.engine.JupiterTestEngine"
+               classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     <available property="antunit.present"
                classname="org.apache.ant.antunit.AntUnit"
                classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
@@ -444,15 +471,9 @@
     <available property="bcel.present"
                classname="org.apache.bcel.Constants"
                classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
-
-    <condition property="javamail.complete">
-      <and>
-        <available classname="javax.activation.DataHandler"
-          classpathref="classpath"/>
-        <available classname="javax.mail.Transport"
-          classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
-      </and>
-    </condition>
+    <available property="javamail.present"
+               classname="javax.mail.Transport"
+               classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
 
     <condition property="tests.and.ant.share.classloader">
       <or>
@@ -511,30 +532,19 @@
     <available property="jsch.present"
                classname="com.jcraft.jsch.Session"
                classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
+    <available property="xz.present"
+               classname="org.tukaani.xz.XZOutputStream"
+               classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
 
     <property name="build.compiler" value="modern"/>
 
-    <!--check for XSD support in the parser-->
+    <!-- check for XSD support in the parser -->
     <condition property="xmlschema.present">
       <or>
         <parsersupports feature="http://apache.org/xml/features/validation/schema"/>
         <parsersupports feature="http://java.sun.com/xml/jaxp/properties/schemaSource"/>
       </or>
     </condition>
-
-    <!-- 
-    Java8 introduced a HTML checker 'doclint' which is very strict and breaks 
-    the build if there is a HTML error in the JavaDoc.
-    -->
-    <condition 
-      property="javadoc.doclint.none" 
-      value="-Xdoclint:none" 
-      else="">
-      <and>
-        <isset property="jdk1.8+"/>
-        <not><isset property="withDoclint"/></not>
-      </and>
-    </condition>
   </target>
 
   <!--
@@ -542,7 +552,7 @@
          Prepare the build
        ===================================================================
   -->
-  <target name="prepare">
+  <target name="prepare" depends="check-optional-packages">
     <tstamp>
       <format property="year" pattern="yyyy"/>
     </tstamp>
@@ -556,7 +566,7 @@
          Build the code
        ===================================================================
   -->
-  <target name="build" depends="prepare,check-optional-packages"
+  <target name="build" depends="prepare"
           description="--> compiles the source code">
     <mkdir dir="${build.dir}"/>
     <mkdir dir="${build.classes}"/>
@@ -576,17 +586,19 @@
         <not>
           <or>
             <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? -->
             <selector refid="needs.junit4" unless="junit4.present"/>
+            <selector refid="needs.junitlauncher" unless="junitlauncher.present"/>
+            <selector refid="needs.junit.engine.vintage" unless="junit.engine.vintage.present"/>
+            <selector refid="needs.junit.engine.jupiter" unless="junit.engine.jupiter.present"/>
             <selector refid="needs.apache-regexp" unless="apache.regexp.present"/>
             <selector refid="needs.apache-oro" unless="apache.oro.present"/>
             <selector refid="needs.apache-bcel" unless="bcel.present"/>
             <selector refid="needs.apache-log4j" unless="log4j.present"/>
             <selector refid="needs.commons-logging" unless="commons.logging.present"/>
             <selector refid="needs.apache-bsf" unless="bsf.present"/>
-            <selector refid="needs.javamail" unless="javamail.complete"/>
+            <selector refid="needs.javamail" unless="javamail.present"/>
             <selector refid="needs.netrexx" unless="netrexx.present"/>
             <selector refid="needs.commons-net" unless="commons.net.present"/>
             <selector refid="needs.antlr" unless="antlr.present"/>
@@ -595,6 +607,7 @@
             <selector refid="needs.jdepend" unless="jdepend.present"/>
             <selector refid="needs.swing" unless="swing.present"/>
             <selector refid="needs.jsch" unless="jsch.present"/>
+            <selector refid="needs.xz" unless="xz.present"/>
             <selector refid="needs.xmlschema" unless="xmlschema.present"/>
             <selector refid="needs.apache-xalan2" unless="recent.xalan2.present"/>
           </or>
@@ -624,6 +637,8 @@
       <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>
@@ -647,28 +662,8 @@
       <mapper type="glob" from="*" to="*.txt"/>
     </copy>
 
-    <copy file="${manifest}" tofile="${manifest.tmp}"/>
-    <manifest file="${manifest.tmp}">
-      <section name="${optional.package}/">
-        <attribute name="Extension-name"
-                   value="org.apache.tools.ant"/>
-        <attribute name="Specification-Title"
-                   value="Apache Ant"/>
-        <attribute name="Specification-Version"
-                   value="${manifest-version}"/>
-        <attribute name="Specification-Vendor"
-                   value="Apache Software Foundation"/>
-        <attribute name="Implementation-Title"
-                   value="org.apache.tools.ant"/>
-        <attribute name="Implementation-Version"
-                   value="${manifest-version}"/>
-        <attribute name="Implementation-Vendor"
-                   value="Apache Software Foundation"/>
-      </section>
-    </manifest>
-
     <jar destfile="${build.lib}/${name}-launcher.jar"
-         basedir="${build.classes}"
+         basedir="${build.classes}" index="true"
          whenmanifestonly="fail">
       <selector refid="ant.launcher"/>
       <metainf dir="${build.dir}">
@@ -681,8 +676,7 @@
     </jar>
 
     <jar destfile="${build.lib}/${name}.jar"
-         basedir="${build.classes}"
-         manifest="${manifest}"
+         basedir="${build.classes}" index="true"
          whenmanifestonly="fail">
       <!-- Verification: (cd dist/lib; for j in *.jar; do jar tf $j; done) | egrep -v '/$|META-INF/MANIFEST\.MF' | sort | uniq -d -->
       <selector refid="ant.core"/>
@@ -690,10 +684,10 @@
         <include name="LICENSE.txt"/>
         <include name="NOTICE.txt"/>
       </metainf>
-
       <manifest>
+        <attribute name="Main-Class" value="org.apache.tools.ant.Main"/>
         <section name="${ant.package}/">
-          <attribute name="Extension-name"
+          <attribute name="Extension-Name"
                      value="org.apache.tools.ant"/>
           <attribute name="Specification-Title"
                      value="Apache Ant"/>
@@ -717,7 +711,6 @@
 
     <jar destfile="${build.lib}/${bootstrap.jar}"
          basedir="${build.classes}"
-         manifest="${manifest}"
          whenmanifestonly="fail">
       <include name="${ant.package}/Main.class"/>
       <metainf dir="${build.dir}">
@@ -725,8 +718,8 @@
         <include name="NOTICE.txt"/>
       </metainf>
       <manifest>
-        <attribute name="Class-Path"
-                   value="ant.jar xalan.jar"/>
+        <attribute name="Main-Class" value="org.apache.tools.ant.Main"/>
+        <attribute name="Class-Path" value="ant.jar xalan.jar"/>
       </manifest>
     </jar>
 
@@ -734,14 +727,31 @@
       <attribute name="dep"/>
       <sequential>
         <jar destfile="${build.lib}/${optional.jars.prefix}-@{dep}.jar"
-             basedir="${build.classes}"
-             manifest="${manifest.tmp}"
+             basedir="${build.classes}" index="true"
              whenmanifestonly="${optional.jars.whenmanifestonly}">
           <selector refid="needs.@{dep}"/>
           <metainf dir="${build.dir}">
             <include name="LICENSE.txt"/>
             <include name="NOTICE.txt"/>
           </metainf>
+          <manifest>
+            <section name="${optional.package}/">
+              <attribute name="Extension-Name"
+                         value="org.apache.tools.ant"/>
+              <attribute name="Specification-Title"
+                         value="Apache Ant"/>
+              <attribute name="Specification-Version"
+                         value="${manifest-version}"/>
+              <attribute name="Specification-Vendor"
+                         value="Apache Software Foundation"/>
+              <attribute name="Implementation-Title"
+                         value="org.apache.tools.ant"/>
+              <attribute name="Implementation-Version"
+                         value="${manifest-version}"/>
+              <attribute name="Implementation-Vendor"
+                         value="Apache Software Foundation"/>
+            </section>
+          </manifest>
         </jar>
       </sequential>
     </macrodef>
@@ -749,6 +759,7 @@
     <optional-jar dep="apache-resolver"/>
     <optional-jar dep="junit"/>
     <optional-jar dep="junit4"/>
+    <optional-jar dep="junitlauncher"/>
     <optional-jar dep="apache-regexp"/>
     <optional-jar dep="apache-oro"/>
     <optional-jar dep="apache-bcel"/>
@@ -765,6 +776,7 @@
     <optional-jar dep="jsch"/>
     <optional-jar dep="jdepend"/>
     <optional-jar dep="apache-xalan2"/>
+    <optional-jar dep="xz"/>
 
   </target>
 
@@ -776,7 +788,7 @@
       We cannot build the test jar unless JUnit is present,
       as JUnit is needed to compile the test classes.
     </fail>
-    <jar destfile="${build.lib}/${name}-testutil.jar"
+    <jar destfile="${build.lib}/${name}-testutil.jar" index="true"
          basedir="${build.tests}">
       <patternset refid="useful.tests"/>
       <metainf dir="${build.dir}">
@@ -841,6 +853,7 @@
     <optional-src-jar dep="apache-resolver"/>
     <optional-src-jar dep="junit"/>
     <optional-src-jar dep="junit4"/>
+    <optional-src-jar dep="junitlauncher"/>
     <optional-src-jar dep="apache-regexp"/>
     <optional-src-jar dep="apache-oro"/>
     <optional-src-jar dep="apache-bcel"/>
@@ -857,6 +870,7 @@
     <optional-src-jar dep="jsch"/>
     <optional-src-jar dep="jdepend"/>
     <optional-src-jar dep="apache-xalan2"/>
+    <optional-src-jar dep="xz"/>
 
   </target>
 
@@ -909,18 +923,23 @@
       <include name="*.pl"/>
     </fixcrlf>
 
-    <chmod perm="ugo+rx" dir="${dist.dir}" type="dir" includes="**"
-      failonerror="${chmod.fail}"/>
-    <chmod perm="ugo+r" dir="${dist.dir}" type="file" includes="**"
-      failonerror="${chmod.fail}" maxparallel="${chmod.maxparallel}"/>
-    <chmod perm="ugo+x" type="file" failonerror="${chmod.fail}">
+    <setpermissions mode="755" failonerror="${setpermissions.fail}"
+                    nonPosixMode="${setpermissions.nonposixmode}">
+      <dirset dir="${dist.dir}"/>
+    </setpermissions>
+    <setpermissions mode="644" failonerror="${setpermissions.fail}"
+                    nonPosixMode="${setpermissions.nonposixmode}">
+      <fileset dir="${dist.dir}"/>
+    </setpermissions>
+    <setpermissions mode="755" failonerror="${setpermissions.fail}"
+                    nonPosixMode="${setpermissions.nonposixmode}">
       <fileset dir="${dist.bin}">
         <include name="**/ant"/>
         <include name="**/antRun"/>
         <include name="**/*.pl"/>
         <include name="**/*.py"/>
       </fileset>
-    </chmod>
+    </setpermissions>
 
   </target>
 
@@ -957,9 +976,9 @@
   <macrodef name="checksums">
     <element name="resources" implicit="true"/>
     <sequential>
-      <checksums-mvn>
+      <checksum algorithm="sha1">
         <resources/>
-      </checksums-mvn>
+      </checksum>
       <checksum fileext=".sha512" algorithm="sha-512">
         <resources/>
       </checksum>
@@ -1020,18 +1039,23 @@
       </fileset>
     </copy>
 
-    <chmod perm="ugo+rx" dir="${dist.dir}" type="dir" includes="**"
-      failonerror="${chmod.fail}"/>
-    <chmod perm="ugo+r" dir="${dist.dir}" type="file" includes="**"
-      failonerror="${chmod.fail}" maxparallel="${chmod.maxparallel}"/>
-    <chmod perm="ugo+x" type="file" failonerror="${chmod.fail}">
+    <setpermissions mode="755" failonerror="${setpermissions.fail}"
+                    nonPosixMode="${setpermissions.nonposixmode}">
+      <dirset dir="${dist.dir}"/>
+    </setpermissions>
+    <setpermissions mode="644" failonerror="${setpermissions.fail}"
+                    nonPosixMode="${setpermissions.nonposixmode}">
+      <fileset dir="${dist.dir}"/>
+    </setpermissions>
+    <setpermissions mode="755" failonerror="${setpermissions.fail}"
+                    nonPosixMode="${setpermissions.nonposixmode}">
       <fileset dir="${dist.bin}">
         <include name="**/ant"/>
         <include name="**/antRun"/>
         <include name="**/*.pl"/>
         <include name="**/*.py"/>
       </fileset>
-    </chmod>
+    </setpermissions>
 
     <!-- publish some useful stylesheets -->
     <copy todir="${dist.etc}">
@@ -1135,18 +1159,26 @@
       <exclude name="${tests.etc.dir}/taskdefs/fixcrlf/input/Junk?.java"/>
     </fixcrlf>
 
-    <chmod perm="ugo+x" dir="${src.dist.dir}" type="dir"
-      failonerror="${chmod.fail}"/>
-    <chmod perm="ugo+r" dir="${src.dist.dir}" failonerror="${chmod.fail}"/>
-    <chmod perm="ugo+x" failonerror="${chmod.fail}">
+    <setpermissions mode="755" failonerror="${setpermissions.fail}"
+                    nonPosixMode="${setpermissions.nonposixmode}">
+      <dirset dir="${src.dist.dir}"/>
+    </setpermissions>
+
+    <setpermissions mode="644" failonerror="${setpermissions.fail}"
+                    nonPosixMode="${setpermissions.nonposixmode}">
+      <fileset dir="${src.dist.dir}"/>
+    </setpermissions>
+
+    <setpermissions mode="755" failonerror="${setpermissions.fail}"
+                    nonPosixMode="${setpermissions.nonposixmode}">
       <fileset dir="${src.dist.dir}">
-        <include name="**/.sh"/>
-        <include name="**/.pl"/>
-        <include name="**/.py"/>
+        <include name="**/*.sh"/>
+        <include name="**/*.pl"/>
+        <include name="**/*.py"/>
         <include name="**/ant"/>
         <include name="**/antRun"/>
       </fileset>
-    </chmod>
+    </setpermissions>
 
   </target>
 
@@ -1196,10 +1228,28 @@
   </condition>
 
   <target name="pkg-distribution" depends="zip-distribution" if="buildosxpackage">
-    <exec executable="release/build-osx-pkg.py">
-      <arg value="--output-dir"/>
-      <arg value="${dist.base.binaries}"/>
-      <arg value="${dist.base.binaries}/${dist.name}-bin.zip"/>
+    <mkdir dir="${build.pkg.dir}"/>
+    <unzip src="${dist.base.binaries}/${dist.name}-bin.zip" dest="${build.pkg.dir}">
+      <mapper type="regexp" from="^([^/]*)/(.*)$$" to="\2"/>
+    </unzip>
+    <chmod perm="+x" type="file">
+      <fileset dir="${build.pkg.dir}/bin">
+        <include name="ant"/>
+        <include name="antRun"/>
+        <include name="*.pl"/>
+        <include name="*.py"/>
+      </fileset>
+    </chmod>
+    <exec executable="/usr/bin/pkgbuild">
+      <arg value="--root"/>
+      <arg value="${build.pkg.dir}"/>
+      <arg value="--identifier"/>
+      <arg value="org.apache.ant"/>
+      <arg value="--version"/>
+      <arg value="${project.version}"/>
+      <arg value="--install-location"/>
+      <arg value="/usr/local/ant"/>
+      <arg value="${dist.base.binaries}/${dist.name}.pkg"/>
     </exec>
   </target>
 
@@ -1229,6 +1279,8 @@
           src="${dist.base.binaries}/${dist.name}-bin.tar"/>
     <bzip2 destfile="${dist.base.binaries}/${dist.name}-bin.tar.bz2"
            src="${dist.base.binaries}/${dist.name}-bin.tar"/>
+    <xz destfile="${dist.base.binaries}/${dist.name}-bin.tar.xz"
+        src="${dist.base.binaries}/${dist.name}-bin.tar"/>
     <delete file="${dist.base.binaries}/${dist.name}-bin.tar"/>
   </target>
 
@@ -1282,19 +1334,19 @@
           src="${dist.base.manual}/${dist.name}-manual.tar"/>
     <bzip2 destfile="${dist.base.manual}/${dist.name}-manual.tar.bz2"
            src="${dist.base.manual}/${dist.name}-manual.tar"/>
+    <xz destfile="${dist.base.manual}/${dist.name}-manual.tar.xz"
+        src="${dist.base.manual}/${dist.name}-manual.tar"/>
     <delete file="${dist.base.manual}/${dist.name}-manual.tar"/>
 
     <delete dir="${dist.name}"/>
     <checksums>
       <fileset dir="${dist.base.binaries}/">
         <exclude name="**/*.asc"/>
-        <exclude name="**/*.md5"/>
         <exclude name="**/*.sha1"/>
         <exclude name="**/*.sha512"/>
       </fileset>
       <fileset dir="${dist.base.manual}/">
         <exclude name="**/*.asc"/>
-        <exclude name="**/*.md5"/>
         <exclude name="**/*.sha1"/>
         <exclude name="**/*.sha512"/>
       </fileset>
@@ -1333,12 +1385,13 @@
           src="${dist.base.source}/${dist.name}-src.tar"/>
     <bzip2 destfile="${dist.base.source}/${dist.name}-src.tar.bz2"
            src="${dist.base.source}/${dist.name}-src.tar"/>
+    <xz destfile="${dist.base.source}/${dist.name}-src.tar.xz"
+        src="${dist.base.source}/${dist.name}-src.tar"/>
     <delete file="${dist.base.source}/${dist.name}-src.tar"/>
     <delete dir="${dist.name}"/>
     <checksums>
       <fileset dir="${dist.base.source}/">
         <exclude name="**/*.asc"/>
-        <exclude name="**/*.md5"/>
         <exclude name="**/*.sha1"/>
         <exclude name="**/*.sha512"/>
       </fileset>
@@ -1373,8 +1426,10 @@
           description="--> cleans up everything">
     <delete file="${bootstrap.dir}/bin/antRun"/>
     <delete file="${bootstrap.dir}/bin/antRun.bat"/>
-    <delete file="${bootstrap.dir}/bin/*.pl"/>
-    <delete file="${bootstrap.dir}/bin/*.py"/>
+    <delete>
+      <fileset dir="${bootstrap.dir}/bin" includes="*.pl"/>
+      <fileset dir="${bootstrap.dir}/bin" includes="*.py"/>
+    </delete>
   </target>
 
   <!--
@@ -1401,20 +1456,23 @@
          Creates the API documentation
        ===================================================================
   -->
-  <target name="check-javadoc">
+  <target name="check-javadoc" depends="prepare">
     <uptodate property="javadoc.notrequired"
-      targetfile="${build.javadocs}/packages.html">
+              targetfile="${build.javadocs}/packages.html">
       <srcfiles dir="${java.dir}" includes="**/*.java"/>
     </uptodate>
     <uptodate property="tests.javadoc.notrequired"
-      targetfile="${build.tests.javadocs}/packages.html">
+              targetfile="${build.tests.javadocs}/packages.html">
       <srcfiles dir="${src.junit}">
         <patternset refid="useful.tests"/>
       </srcfiles>
     </uptodate>
+    <condition property="javadoc.jaf.module" value="--add-modules java.activation" else="">
+      <isset property="jdk9+"/>
+    </condition>
   </target>
 
-  <target name="javadocs" depends="prepare,check-javadoc,check-optional-packages"
+  <target name="javadocs" depends="check-javadoc"
           description="--> creates the API documentation" unless="javadoc.notrequired">
     <mkdir dir="${build.javadocs}"/>
     <javadoc useexternalfile="yes"
@@ -1444,10 +1502,11 @@
       <group title="Optional Types" packages="org.apache.tools.ant.types.optional*"/>
       <group title="Ant Utilities" packages="org.apache.tools.ant.util*"/>
       <classpath refid="tests-classpath"/>
+      <arg line="${javadoc.jaf.module}"/>
     </javadoc>
   </target>
 
-  <target name="test-javadocs" depends="prepare,check-javadoc" unless="tests.javadoc.notrequired"
+  <target name="test-javadocs" depends="check-javadoc" unless="tests.javadoc.notrequired"
           description="--> creates the API documentation for test utilities">
     <mkdir dir="${build.tests.javadocs}"/>
     <javadoc useexternalfile="yes"
@@ -1581,6 +1640,11 @@
 
   <target name="test-init" depends="probe-offline,check-optional-packages,dump-info">
     <mkdir dir="${build.junit.tmpdir}"/>
+    <condition property="sun.io.useCanonCaches" value="false">
+      <not>
+        <javaversion atleast="9"/>
+      </not>
+    </condition>
     <macrodef name="test-junit">
       <element name="junit-nested" implicit="true"/>
       <sequential>
@@ -1626,6 +1690,11 @@
           <sysproperty key="tests.and.ant.share.classloader"
                        value="${tests.and.ant.share.classloader}"/>
           <sysproperty key="java.io.tmpdir" file="${build.junit.tmpdir}"/>
+          <!-- in Java8 the canonical cache seems to interfere with
+               our symlink tests -->
+          <syspropertyset>
+            <propertyref name="sun.io.useCanonCaches"/>
+          </syspropertyset>
           <classpath>
             <path refid="tests-runtime-classpath"/>
             <pathelement location="${junit.collector.dir}"/>
@@ -1763,8 +1832,7 @@
           <exclude name="${taskdefs.package}/TestProcess.java"/>
           <exclude name="${optional.package}/splash/SplashScreenTest.java"/>
 
-          <!-- only run these tests if their required libraries are
-               installed -->
+          <!-- only run these tests if their required libraries are installed -->
           <selector refid="conditional-patterns"/>
 
           <!-- tests excluded if the test is run in offline mode -->
@@ -1936,6 +2004,9 @@
     </length>
   </target>
 
+  <!-- JetBrains builds need this target -->
+  <target name="printFailingTests" depends="print-failing-tests"/>
+
   <target name="print-failing-tests">
     <property name="failingtests.dir" value="${build.dir}/errors"/>
     <mkdir dir=""/>
diff -Nru ant-1.9.10/CONTRIBUTORS ant-1.10.3/CONTRIBUTORS
--- ant-1.9.10/CONTRIBUTORS	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/CONTRIBUTORS	2018-03-24 12:37:12.000000000 +0000
@@ -287,6 +287,7 @@
 Nigel Magnay
 Oliver Merkel
 Oliver Rossmueller
+Olivier Parent
 Ondra Medek
 Omer Shapira
 Oystein Gisnas
diff -Nru ant-1.9.10/contributors.xml ant-1.10.3/contributors.xml
--- ant-1.9.10/contributors.xml	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/contributors.xml	2018-03-24 12:37:12.000000000 +0000
@@ -40,6 +40,10 @@
   </name>
   <name>
     <first>Adam</first>
+    <last>Retter</last>
+  </name> 
+  <name>
+    <first>Adam</first>
     <last>Sotona</last>
   </name>
   <name>
@@ -1169,6 +1173,10 @@
     <last>Rossmueller</last>
   </name>
   <name>
+    <first>Olivier</first>
+    <last>Parent</last>
+  </name>
+  <name>
     <first>Omer</first>
     <last>Shapira</last>
   </name>
diff -Nru ant-1.9.10/debian/ant-optional.poms ant-1.10.3/debian/ant-optional.poms
--- ant-1.9.10/debian/ant-optional.poms	2018-02-23 10:48:52.000000000 +0000
+++ ant-1.10.3/debian/ant-optional.poms	2018-03-27 23:41:26.000000000 +0000
@@ -16,3 +16,4 @@
 src/etc/poms/ant-junit4/pom.xml
 src/etc/poms/ant-swing/pom.xml
 src/etc/poms/ant-testutil/pom.xml
+src/etc/poms/ant-xz/pom.xml
diff -Nru ant-1.9.10/debian/ant.properties ant-1.10.3/debian/ant.properties
--- ant-1.9.10/debian/ant.properties	2018-02-23 10:48:52.000000000 +0000
+++ ant-1.10.3/debian/ant.properties	2018-03-27 23:41:26.000000000 +0000
@@ -1,5 +1,5 @@
 base64.present=true
 sunuue.present=true
 offline=true
-javac.target=1.5
-javac.source=1.5
+javac.target=1.8
+javac.source=1.8
diff -Nru ant-1.9.10/debian/changelog ant-1.10.3/debian/changelog
--- ant-1.9.10/debian/changelog	2018-03-19 09:04:26.000000000 +0000
+++ ant-1.10.3/debian/changelog	2018-03-29 07:35:04.000000000 +0000
@@ -1,3 +1,19 @@
+ant (1.10.3-1) unstable; urgency=medium
+
+  * New upstream release
+    - Refreshed the patches
+    - Changed the source/target level to 1.8 when building Ant
+    - Build the new optional ant-xz module
+    - Require Java 8 or higher to run Ant
+  * Don't use the javadoc --ignore-source-errors option when using
+    a custom doclet (Closes: #893547)
+  * Adjust the source/target level to 1.7 in anticipation of the 1.6 removal
+    in Java 11
+  * Added activation.jar to the build classpath to fix the empty ant-javamail
+    jar with Java 9
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Thu, 29 Mar 2018 09:35:04 +0200
+
 ant (1.9.10-2) unstable; urgency=medium
 
   * Non maintainer upload.
diff -Nru ant-1.9.10/debian/control ant-1.10.3/debian/control
--- ant-1.9.10/debian/control	2018-03-19 09:04:26.000000000 +0000
+++ ant-1.10.3/debian/control	2018-03-27 23:58:06.000000000 +0000
@@ -10,6 +10,7 @@
                default-jdk,
                junit,
                junit4 (>= 4.11),
+               libactivation-java,
                libbcel-java (>= 5.0),
                libbsf-java (>= 2.3.0rc1),
                libcommons-logging-java,
@@ -22,6 +23,7 @@
                libregexp-java,
                libxalan2-java (>= 2.4.0),
                libxml-commons-resolver1.1-java (>= 1.2-7~),
+               libxz-java,
                maven-repo-helper (>> 1.0)
 Standards-Version: 4.1.3
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/ant.git
@@ -30,7 +32,7 @@
 
 Package: ant
 Architecture: all
-Depends: default-jre-headless | java5-runtime-headless | java6-runtime-headless | java7-runtime-headless,
+Depends: default-jre-headless (>= 2:1.8) | java8-runtime-headless,
          ${misc:Depends}
 Recommends: ant-optional
 Suggests: ant-doc, default-jdk | java-compiler | java-sdk
@@ -54,6 +56,7 @@
           junit,
           junit4,
           jython,
+          libactivation-java,
           libbcel-java (>= 5.0),
           libbsf-java,
           libcommons-logging-java,
@@ -66,7 +69,8 @@
           liboro-java,
           libregexp-java,
           libxalan2-java (>= 2.4.0-1),
-          libxml-commons-resolver1.1-java
+          libxml-commons-resolver1.1-java,
+          libxz-java
 Description: Java based build tool like make - optional libraries
  Apache Ant is a Java library and command-line tool whose mission is to drive
  processes described in build files as targets and extension points dependent
diff -Nru ant-1.9.10/debian/patches/0009-reproducible-timestamp-task.patch ant-1.10.3/debian/patches/0009-reproducible-timestamp-task.patch
--- ant-1.9.10/debian/patches/0009-reproducible-timestamp-task.patch	2018-02-23 14:03:13.000000000 +0000
+++ ant-1.10.3/debian/patches/0009-reproducible-timestamp-task.patch	2018-03-27 23:41:26.000000000 +0000
@@ -1,18 +1,13 @@
-From: Emmanuel Bourg <ebourg@apache.org>
-Date: Mon, 28 Mar 2016 01:45:52 +0200
-Subject: Add support for the SOURCE_DATE_EPOCH variable in the Tstamp task
-
+Description: Add support for the SOURCE_DATE_EPOCH variable in the Tstamp task
+Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
----
- src/main/org/apache/tools/ant/taskdefs/Tstamp.java | 39 ++++++++++++++++++++++
- 1 file changed, 39 insertions(+)
-
 --- a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
 +++ b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
-@@ -71,20 +71,51 @@
+@@ -76,16 +76,49 @@
          try {
              Date d = getNow();
  
+-            customFormats.forEach(cts -> cts.execute(getProject(), d, getLocation()));
 +            boolean reproducibleBuild = false;
 +
 +            if (System.getenv("SOURCE_DATE_EPOCH") != null) {
@@ -27,9 +22,7 @@
 +                }
 +            }
 +
-             Enumeration i = customFormats.elements();
-             while (i.hasMoreElements()) {
-                 CustomFormat cts = (CustomFormat) i.nextElement();
++            for (CustomFormat cts : customFormats) {
 +                if (reproducibleBuild) {
 +                    if (cts.getTimezone() == null) {
 +                        cts.setTimezone("UTC");
@@ -38,8 +31,8 @@
 +                        cts.setLocale("en_US");
 +                    }
 +                }
-                 cts.execute(getProject(), d, getLocation());
-             }
++                cts.execute(getProject(), d, getLocation());
++            }
  
              SimpleDateFormat dstamp = new SimpleDateFormat("yyyyMMdd");
 +            if (reproducibleBuild) {
@@ -61,7 +54,7 @@
              setProperty("TODAY", today.format(d));
  
          } catch (Exception e) {
-@@ -200,6 +231,10 @@
+@@ -220,6 +253,10 @@
              }
          }
  
@@ -72,7 +65,7 @@
          /**
           * The timezone to use for displaying time.
           * The values are as defined by the Java TimeZone class.
-@@ -210,6 +245,10 @@
+@@ -230,6 +267,10 @@
              timeZone = TimeZone.getTimeZone(id);
          }
  
diff -Nru ant-1.9.10/debian/patches/0010-reproducible-javadoc-task.patch ant-1.10.3/debian/patches/0010-reproducible-javadoc-task.patch
--- ant-1.9.10/debian/patches/0010-reproducible-javadoc-task.patch	2018-02-23 14:03:13.000000000 +0000
+++ ant-1.10.3/debian/patches/0010-reproducible-javadoc-task.patch	2018-03-27 23:41:26.000000000 +0000
@@ -1,17 +1,11 @@
-From: Emmanuel Bourg <ebourg@apache.org>
-Date: Mon, 28 Mar 2016 02:00:16 +0200
-Subject: Improves the reproducibility of the javadoc task for the Debian
+Description: Improves the reproducibility of the javadoc task for the Debian
  builds by setting the locale to 'en' and the encoding to UTF-8 if none was
  specified and SOURCE_DATE_EPOCH is set.
-
+Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
----
- src/main/org/apache/tools/ant/taskdefs/Javadoc.java | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
 +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
-@@ -1707,6 +1707,16 @@
+@@ -1700,6 +1700,16 @@
       */
      @Override
      public void execute() throws BuildException {
@@ -27,4 +21,4 @@
 +
          checkTaskName();
  
-         final Vector<String> packagesToDoc = new Vector<String>();
+         final List<String> packagesToDoc = new Vector<>();
diff -Nru ant-1.9.10/debian/patches/0011-reproducible-propertyfile-task.patch ant-1.10.3/debian/patches/0011-reproducible-propertyfile-task.patch
--- ant-1.9.10/debian/patches/0011-reproducible-propertyfile-task.patch	2018-02-23 14:03:13.000000000 +0000
+++ ant-1.10.3/debian/patches/0011-reproducible-propertyfile-task.patch	2018-03-27 23:41:26.000000000 +0000
@@ -1,14 +1,8 @@
-From: Emmanuel Bourg <ebourg@apache.org>
-Date: Tue, 24 May 2016 00:22:11 +0200
-Subject: Improves the reproducibility of the propertyfile task for the Debian
+Description: Improves the reproducibility of the propertyfile task for the Debian
  builds by using the date specified by the SOURCE_DATE_EPOCH variable in the
  header of the .properties file generated
-
+Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
----
- src/main/org/apache/tools/ant/util/DateUtils.java | 5 +++++
- 1 file changed, 5 insertions(+)
-
 --- a/src/main/org/apache/tools/ant/util/DateUtils.java
 +++ b/src/main/org/apache/tools/ant/util/DateUtils.java
 @@ -238,6 +238,10 @@
diff -Nru ant-1.9.10/debian/patches/0013-auto-adjust-target.patch ant-1.10.3/debian/patches/0013-auto-adjust-target.patch
--- ant-1.9.10/debian/patches/0013-auto-adjust-target.patch	2018-02-23 14:03:13.000000000 +0000
+++ ant-1.10.3/debian/patches/0013-auto-adjust-target.patch	2018-03-29 07:19:33.000000000 +0000
@@ -1,19 +1,9 @@
-From: "ebourg@apache.org" <ebourg@apache.org>
-Date: Fri, 30 Jun 2017 00:35:44 +0200
-Subject: Adjust the source compatibility automatically for Debian builds with
- Java 9
-
+Description: Adjust the source compatibility automatically for Debian builds with Java 9
+Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
----
- src/main/org/apache/tools/ant/taskdefs/Javac.java  | 13 ++++-
- .../org/apache/tools/ant/taskdefs/Javadoc.java     |  7 ++-
- .../apache/tools/ant/taskdefs/LanguageLevel.java   | 62 ++++++++++++++++++++++
- 3 files changed, 79 insertions(+), 3 deletions(-)
- create mode 100644 src/main/org/apache/tools/ant/taskdefs/LanguageLevel.java
-
 --- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
 +++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
-@@ -210,7 +210,10 @@
+@@ -213,7 +213,10 @@
       */
      public String getSource() {
          return source != null
@@ -25,7 +15,7 @@
      }
  
      /**
-@@ -789,7 +792,10 @@
+@@ -792,7 +795,10 @@
      public String getTarget() {
          return targetAttribute != null
              ? targetAttribute
@@ -37,7 +27,7 @@
      }
  
      /**
-@@ -1118,6 +1124,9 @@
+@@ -1121,6 +1127,9 @@
          checkParameters();
          resetFileLists();
  
@@ -49,17 +39,12 @@
          if (hasPath(src)) {
 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
 +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
-@@ -2207,7 +2207,12 @@
+@@ -2174,7 +2174,7 @@
              : 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 (LanguageLevel.isDebianBuild() && !LanguageLevel.isPreJava9()) {
-+            toExecute.createArgument().setValue("--ignore-source-errors");
-+            log("Debian build on Java >=9: Adding --ignore-source-errors.");
          }
  
          if (linksource && doclet == null) {
@@ -77,10 +62,10 @@
 +class LanguageLevel {
 +
 +    /** The minimum language level supported by the current javac */
-+    private static final String MIN_LEVEL = "1.6";
++    private static final String MIN_LEVEL = "1.7";
 +
 +    /** The list of language levels no longer supported by the current javac */
-+    private static final List<String> UNSUPPORTED_LEVELS = Arrays.asList(new String[]{"1.1", "1.2", "1.3", "1.4", "1.5", "5"});
++    private static final List<String> UNSUPPORTED_LEVELS = Arrays.asList(new String[]{"1.1", "1.2", "1.3", "1.4", "1.5", "5", "1.6", "6"});
 +
 +    /** Detect if a Debian build is in process */
 +    static boolean isDebianBuild() {
diff -Nru ant-1.9.10/debian/patches/0014-remove-java-activation-module.patch ant-1.10.3/debian/patches/0014-remove-java-activation-module.patch
--- ant-1.9.10/debian/patches/0014-remove-java-activation-module.patch	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/debian/patches/0014-remove-java-activation-module.patch	2018-03-27 23:55:42.000000000 +0000
@@ -0,0 +1,13 @@
+Description: Don't add the java.activation module when building the Javadoc, this breaks the build, probably because JAF is already on the classpath
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -1502,7 +1502,6 @@
+       <group title="Optional Types" packages="org.apache.tools.ant.types.optional*"/>
+       <group title="Ant Utilities" packages="org.apache.tools.ant.util*"/>
+       <classpath refid="tests-classpath"/>
+-      <arg line="${javadoc.jaf.module}"/>
+     </javadoc>
+   </target>
+ 
diff -Nru ant-1.9.10/debian/patches/0015-javadoc-ignore-source-errors.patch ant-1.10.3/debian/patches/0015-javadoc-ignore-source-errors.patch
--- ant-1.9.10/debian/patches/0015-javadoc-ignore-source-errors.patch	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/debian/patches/0015-javadoc-ignore-source-errors.patch	2018-03-29 07:24:08.000000000 +0000
@@ -0,0 +1,17 @@
+Description: Ignore source errors when using the default doclet with Java 9
+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
+@@ -2177,6 +2177,11 @@
+             toExecute.createArgument().setValue(LanguageLevel.adjust(sourceArg, "javadoc -source", this));
+         }
+ 
++        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");
+         }
diff -Nru ant-1.9.10/debian/patches/series ant-1.10.3/debian/patches/series
--- ant-1.9.10/debian/patches/series	2018-02-23 10:48:52.000000000 +0000
+++ ant-1.10.3/debian/patches/series	2018-03-29 07:20:10.000000000 +0000
@@ -2,3 +2,5 @@
 0010-reproducible-javadoc-task.patch
 0011-reproducible-propertyfile-task.patch
 0013-auto-adjust-target.patch
+0015-javadoc-ignore-source-errors.patch
+0014-remove-java-activation-module.patch
diff -Nru ant-1.9.10/debian/rules ant-1.10.3/debian/rules
--- ant-1.9.10/debian/rules	2018-03-19 09:04:24.000000000 +0000
+++ ant-1.10.3/debian/rules	2018-03-27 23:41:26.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-DEPENDENCIES := antlr bcel bsf commons-logging javax.mail jdepend junit junit4 hamcrest-core log4j-1.2 oro regexp xalan2 serializer xml-resolver-1.2 commons-net jsch
+DEPENDENCIES := antlr bcel bsf commons-logging javax.activation javax.mail jdepend junit junit4 hamcrest-core log4j-1.2 oro regexp xalan2 serializer xml-resolver-1.2 commons-net jsch xz
 
 %:
 	dh $@ --with maven-repo-helper
@@ -31,7 +31,7 @@
 
 	mh_installpoms -pant-optional
 	for MODULE in antlr apache-bcel apache-bsf apache-log4j apache-oro apache-regexp apache-resolver apache-xalan2 \
-	              commons-logging commons-net javamail jdepend jmf jsch junit junit4 swing testutil; do \
+	              commons-logging commons-net javamail jdepend jmf jsch junit junit4 swing testutil xz; do \
 	  mh_installjar -pant-optional -l src/etc/poms/ant-$$MODULE/pom.xml build/lib/ant-$$MODULE.jar /usr/share/ant/lib/ant-$$MODULE.jar; \
 	done
 
@@ -48,10 +48,6 @@
 override_dh_compress:
 	dh_compress -XWHATSNEW
 
-# Hardening
-export AOT_GCJFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-export AOT_LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-
 override_dh_auto_clean:
 	rm -Rf bin build bootstrap lib/optional/*.jar
 
diff -Nru ant-1.9.10/fetch.xml ant-1.10.3/fetch.xml
--- ant-1.9.10/fetch.xml	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/fetch.xml	2018-03-24 12:37:12.000000000 +0000
@@ -109,6 +109,7 @@
       <attribute name="project"/>
       <attribute name="archive" default="@{project}"/>
       <attribute name="repository" default="${m2.repo}"/>
+      <attribute name="id" default="central"/>
       <sequential>
         <fail>
           Unknown archive @{archive} -no property @{archive}.version defined in ${lib.dir}/libraries.properties.
@@ -118,7 +119,6 @@
             </not>
           </condition>
         </fail>
-        <artifact:remoteRepository url="@{repository}" id="central"/>
         <artifact:dependencies pathID="@{archive}.path" useScope="runtime">
           <dependency groupId="@{project}"
                       artifactId="@{archive}"
@@ -127,6 +127,7 @@
             <exclusion groupId="org.apache.ant" artifactId="ant"/>
             <exclusion groupId="org.apache.ant" artifactId="ant-launcher"/>
           </dependency>
+          <artifact:remoteRepository url="@{repository}" id="@{id}"/>
         </artifact:dependencies>
         <!-- now we are left with the problem of getting the files into our directory -->
         <copy todir="${dest.dir}">
@@ -231,6 +232,24 @@
     <f2 project="org.hamcrest" archive="hamcrest-library"/>
   </target>
 
+  <target name="junitlauncher"
+    description="load junitlauncher libraries"
+    depends="init">
+    <f2 project="org.junit.platform" archive="junit-platform-launcher" />
+  </target>
+
+  <target name="junit-engine-jupiter"
+          description="load junit jupiter engine libraries (necessary only for internal Ant project tests)"
+          depends="init">
+    <f2 project="org.junit.jupiter" archive="junit-jupiter-engine" />
+  </target>
+
+  <target name="junit-engine-vintage"
+          description="load junit vintage engine libraries (necessary only for internal Ant project tests)"
+          depends="init">
+    <f2 project="org.junit.vintage" archive="junit-vintage-engine" />
+  </target>
+
   <target name="xml"
           description="load full XML libraries (Xalan and xml-resolver)"
           depends="init">
@@ -261,7 +280,7 @@
   <target name="bcel"
           description="load Byte Code Engineering Library (BCEL)"
           depends="init">
-    <f2 project="bcel"/>
+    <f2 project="org.apache.bcel" archive="bcel"/>
   </target>
 
   <target name="jdepend"
@@ -315,7 +334,6 @@
           description="load Java Mail"
           depends="init">
     <f2 project="javax.mail" archive="javax.mail-api"/>
-    <f2 project="javax.activation" archive="activation"/>
   </target>
 
   <target name="jspc"
@@ -329,9 +347,9 @@
   <target name="jai"
           description="load Java Advanced Imaging"
           depends="init">
-    <f2 project="javax.media" archive="jai-core"
+    <f2 project="javax.media" archive="jai-core" id="jboss"
         repository="https://repository.jboss.org/nexus/content/groups/public/"/>
-    <f2 project="com.sun.media" archive="jai-codec"
+    <f2 project="com.sun.media" archive="jai-codec" id="jboss"
         repository="https://repository.jboss.org/nexus/content/groups/public/"/>
   </target>
 
@@ -359,8 +377,14 @@
          dest="${temp.dir}/NetRexx.zip" skipexisting="true"/>
   </target>
 
+  <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="antunit,ivy,logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,javamail,jspc,jai,netrexx"/>
-
+    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"/>
 </project>
diff -Nru ant-1.9.10/lib/libraries.properties ant-1.10.3/lib/libraries.properties
--- ant-1.9.10/lib/libraries.properties	2018-02-03 16:12:24.000000000 +0000
+++ ant-1.10.3/lib/libraries.properties	2018-03-24 12:37:12.000000000 +0000
@@ -31,15 +31,13 @@
 # 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
+bcel.version=6.2
 bsf.version=2.4.0
 bsh.version=2.0b4
 bsh-core.version=${bsh.version}
-# Later versions are built with Java 6
-commons-net.version=2.2
+commons-net.version=3.6
 commons-logging.version=1.1
 commons-logging-api.version=${commons-logging.version}
 hamcrest-core.version=1.3
@@ -50,16 +48,18 @@
 # 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
+javax.mail-api.version=1.6.0
 jdepend.version=2.9.1
-# 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
+rhino.version=1.7.8
+junit-platform-launcher.version=1.1.0
+# Only used for internal tests in Ant project
+junit-vintage-engine.version=5.1.0
+# Only used for internal tests in Ant project
+junit-jupiter-engine.version=5.1.0
 jsch.version=0.1.54
-jython.version=2.5.3
+jython.version=2.7.0
 # log4j 1.2.15 requires JMS and a few other Sun jars that are not in the m2 repo
 log4j.version=1.2.14
 oro.version=2.0.8
@@ -67,6 +67,7 @@
 which.version=1.0
 xalan.version=2.7.2
 xml-resolver.version=1.2
+xz.version=1.8
 # paired
 jacl.version=1.2.6
 tcljava.version=${jacl.version}
diff -Nru ant-1.9.10/manual/antexternal.html ant-1.10.3/manual/antexternal.html
--- ant-1.9.10/manual/antexternal.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/antexternal.html	2018-03-24 12:37:12.000000000 +0000
@@ -14,7 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="Content-Language" content="en-us">
@@ -29,16 +28,16 @@
 
 <p>Apache Ant provides a rich set of tasks for buildfile creators and
 administrators.  But what about programmers?  Can the functionality
-provided by Ant tasks be used in java programs?</p>
+provided by Ant tasks be used in Java programs?</p>
 
-<p>Yes, and its quite easy.  Before getting into the details, however, 
+<p>Yes, and its quite easy.  Before getting into the details, however,
 we should mention the pros and cons of this approach:
 
 <h3>Pros</h3>
 
-<table cellpadding="0" margin="0" border="1">
+<table>
 <tr>
-<td><b>Robust</b></td>
+<td><strong>Robust</strong></td>
 <td>
 Ant tasks are very robust.  They have been banged on by many people.
 Ant tasks have been used in many different contexts, and have
@@ -47,7 +46,7 @@
 </td>
 </tr>
 <tr>
-<td><b>Cross Platform</b></td>
+<td><strong>Cross Platform</strong></td>
 <td>
 Ant tasks are cross platform.  They have been tested on all of the
 volume platforms, and several rather unusual ones (Netware and OS/390, to
@@ -55,7 +54,7 @@
 </td>
 </tr>
 <tr>
-<td><b>Community Support</b></td>
+<td><strong>Community Support</strong></td>
 <td>
 Using Ant tasks means you have less of your own code to support.  Ant
 code is supported by the entire Apache Ant community.
@@ -65,18 +64,18 @@
 
 <h3>Cons</h3>
 
-<table cellpadding="0" margin="0" border="1">
+<table>
 <tr>
-<td><b>Dependency on Ant Libraries</b></td>
+<td><strong>Dependency on Ant Libraries</strong></td>
 <td>
 Obviously, if you use an Ant task in your code, you will have to add
-"ant.jar" to your path.  Of course, you could use a code optimizer to
+<q>ant.jar</q> to your path.  Of course, you could use a code optimizer to
 remove the unnecessary classes, but you will still probably require a
 chunk of the Ant core.
 </td>
 </tr>
 <tr>
-<td><b>Loss of Flexibility</b></td>
+<td><strong>Loss of Flexibility</strong></td>
 <td>
 At some point, if you find yourself having to modify the Ant code, it
 probably makes more sense to "roll your own."  Of course, you can
@@ -86,7 +85,6 @@
 </tr>
 </table>
 
-
 <h2>Example</h2>
 
 <p>Let's say you want to unzip a zip file programmatically from java
@@ -109,8 +107,8 @@
 </pre>
 
 <p>
-The Ant task to perform this function is
-<code>org.apache.tools.ant.taskdefs.Expand</code>.  All we have to do
+The Ant task to perform this function
+is <code>org.apache.tools.ant.taskdefs.Expand</code>.  All we have to do
 is create a dummy Ant <code>Project</code> and <code>Target</code>,
 set the <code>Task</code> parameters that would normally be set in a
 buildfile, and call <code>execute()</code>.</p>
@@ -121,8 +119,7 @@
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Target;
 import org.apache.tools.ant.taskdefs.Expand;
-import java.io.File;
-</pre>
+import java.io.File;</pre>
 
 <p>The function call is actually quite simple:</p>
 
@@ -131,30 +128,30 @@
 
     final class Expander extends Expand {
         public Expander() {
- 	    project = new Project();
-	    project.init();
-	    taskType = "unzip";
-	    taskName = "unzip";
-	    target = new Target();
-	}	
+            project = new Project();
+            project.init();
+            taskType = "unzip";
+            taskName = "unzip";
+            target = new Target();
+        }
     }
     Expander expander = new Expander();
     expander.setSrc(new File(zipfile));
     expander.setDest(new File(destdir));
     expander.execute();
-</pre>
+}</pre>
 
 <p>In actual practice, you will probably want to add your own error
 handling code and you may not want to use a local inner class.
 However, the point of the example is to show how an Ant task can be
 called programmatically in relatively few lines of code.</p>
 
-<p>The question you are probably asking yourself at this point is:
-<i>How would I know which classes and methods have to be called in
-order to set up a dummy Project and Target?</i> The answer is: you
+<p>The question you are probably asking yourself at this point
+is: <em>How would I know which classes and methods have to be called in
+order to set up a dummy Project and Target?</em> The answer is: you
 don't.  Ultimately, you have to be willing to get your feet wet and
 read the source code.  The above example is merely designed to whet
 your appetite and get you started.  Go for it!</p>
 
-
+</body>
 </html>
diff -Nru ant-1.9.10/manual/anttaskslist.html ant-1.10.3/manual/anttaskslist.html
--- ant-1.9.10/manual/anttaskslist.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/anttaskslist.html	2018-03-24 12:37:12.000000000 +0000
@@ -25,16 +25,13 @@
 
 <body>
 
-
 <h2><a href="toc.html" target="navFrame">Table of Contents</a></h2>
 
 <h3>Apache Ant Tasks</h3>
 <ul class="inlinelist">
-<li><a href="tasksoverview.html" target="mainFrame">Overview of Ant Tasks</a></li>
-<li><a href="tasklist.html" target="navFrame">List of Tasks</a></li>
-<div style="padding-left:1em">
-  <li><a href="install.html#librarydependencies" target="mainFrame">Library Dependencies</a></li>
-</div>
+  <li><a href="tasksoverview.html" target="mainFrame">Overview of Ant Tasks</a></li>
+  <li><a href="tasklist.html" target="navFrame">List of Tasks</a></li>
+  <li class="indent"><a href="install.html#librarydependencies" target="mainFrame">Library Dependencies</a></li>
 </ul>
 
 </body>
diff -Nru ant-1.9.10/manual/argumentprocessor.html ant-1.10.3/manual/argumentprocessor.html
--- ant-1.9.10/manual/argumentprocessor.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/argumentprocessor.html	2018-03-24 12:37:12.000000000 +0000
@@ -25,52 +25,45 @@
 <body>
 <h1>The Command Line Processor Plugin: ArgumentProcessor</h1>
 
-<h2><a name="definition">What is an ArgumentProcessor?</a></h2>
+<h2 id="definition">What is an ArgumentProcessor?</h2>
 
 <p>
-An <code>ArgumentProcessor</code> is a parser of command line argument which is
-then call before and after the build file is being parsed. Third party
-libraries may then be able to have custom argument line argument which modify
-Ant behaviour.
+An <code class="code">ArgumentProcessor</code> is a parser of command line argument which is then
+call before and after the build file is being parsed. Third party libraries may then be able to have
+custom argument line argument which modify Ant behaviour.
 </p>
 
 <p>
-An <code>ArgumentProcessor</code> is called each time Ant parse an unknown
-argument, an <code>ArgumentProcessor</code> doesn't take precedence over Ant to
-parse already suported options. It is then recommended to third party
-<code>ArgumentProcessor</code> implementation to chose specific 'enough'
-argument name, avoiding for instance one letter arguments.
+An <code class="code">ArgumentProcessor</code> is called each time Ant parse an unknown argument,
+an <code class="code">ArgumentProcessor</code> doesn't take precedence over Ant to parse already
+supported options. It is then recommended to third party <code class="code">ArgumentProcessor</code>
+implementation to chose specific 'enough' argument name, avoiding for instance one letter arguments.
 </p>
 
 <p>
-It is also called at the different phases so different behaviour can be
-implemented. It is called just after every arguments are parsed, just
-before the project is being configured (the build file being parsed),
-and just after. Some of the methods to be implemented return a boolean:
-if <code>true</code> is returned, Ant will terminate immediately, without
-error.
+It is also called at the different phases so different behaviour can be implemented. It is called
+just after every arguments are parsed, just before the project is being configured (the build file
+being parsed), and just after. Some of the methods to be implemented return a boolean:
+if <q>true</q> is returned, Ant will terminate immediately, without error.
 </p>
 
 <p>
-Being called during all these phases, an <code>ArgumentProcessor</code>
-can just print some specific system properties and quit (like
-<code>-diagnose</code>), or print some specific properties of a project after
-being parsed and quit (like <code>-projectHelp</code>), or just set some
+Being called during all these phases, an <code class="code">ArgumentProcessor</code> can just print
+some specific system properties and quit (like <kbd>-diagnose</kbd>), or print some specific
+properties of a project after being parsed and quit (like <kbd>-projectHelp</kbd>), or just set some
 custom properties on the project and let it run.
 </p>
 
-<h2><a name="repository">How to register it's own ArgumentProcessor</a></h2>
+<h2 id="repository">How to register it's own ArgumentProcessor</h2>
 
-<p>First, the <code>ArgumentProcessor</code> must be an implementation of
-<code>org.apache.tools.ant.ArgumentProcessor</code>.
+<p>First, the <code class="code">ArgumentProcessor</code> must be an implementation
+of <code class="code">org.apache.tools.ant.ArgumentProcessor</code>.
 </p>
 
-<p>Then to decare it: create a file
-<code>META-INF/services/org.apache.tools.ant.ArgumentProcessor</code> which
-contains only one line the fully qualified name of the class of the
-implementation. This file together with the implementation class need then to
-be found in Ant's classpath.
+<p>Then to declare it: create a
+file <samp>META-INF/services/org.apache.tools.ant.ArgumentProcessor</samp> which contains only one
+line the fully qualified name of the class of the implementation. This file together with the
+implementation class need then to be found in Ant's classpath.
 </p>
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/base_task_classes.html ant-1.10.3/manual/base_task_classes.html
--- ant-1.9.10/manual/base_task_classes.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/base_task_classes.html	2018-03-24 12:37:12.000000000 +0000
@@ -29,15 +29,11 @@
 
 <p><strong>The links will not work in the online version of this document.</strong></p>
 
-<table border="1">
+<table>
 <thead>
 <tr>
-<th>
-Class
-</th>
-<th>
-Description
-</th>
+<th>Class</th>
+<th>Description</th>
 </tr>
 </thead>
 <tbody>
@@ -55,7 +51,7 @@
 <a href="api/org/apache/tools/ant/taskdefs/AbstractCvsTask.html">AbstractCvsTask</a>
 </td>
 <td>
-Another task can extend this with some customized output processing
+Another task can extend this with some customized output processing.
 </td>
 </tr>
 
@@ -86,7 +82,6 @@
 </td>
 </tr>
 
-
 <tr>
 <td>
 <a href="api/org/apache/tools/ant/taskdefs/Unpack.html">Unpack</a>
@@ -104,11 +99,8 @@
 Abstract Base class for tasks that may have multiple actions.
 </td>
 </tr>
-
 </tbody>
 </table>
 
-
-
 </body>
 </html>
diff -Nru ant-1.9.10/manual/clonevm.html ant-1.10.3/manual/clonevm.html
--- ant-1.9.10/manual/clonevm.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/clonevm.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,29 +24,26 @@
 
 <body>
 
-<h2><a name="clonevm">ant.build.clonevm</a></h2>
+<h2 id="clonevm">ant.build.clonevm</h2>
 
 <p><em>Since Apache Ant 1.7</em></p>
 
-<p>The value of the ant.build.clonevm system property controls how Ant
-instruments forked Java Virtual Machines.  The <a
-href="Tasks/java.html">java</a> and <a
-href="Tasks/junit.html">junit</a> tasks support clonevm
-attributes to control the VMs on a task-by-task basis while the system
-property applies to all forked Java VMs.</p>
-
-<p>If the value of the property is true, then all system properties of
-the forked Java Virtual Machine will be the same as those of the Java
-VM running Ant.  In addition, if you set ant.build.clonevm to true and <a
-href="sysclasspath.html">build.sysclasspath</a> has not been set, the
-bootclasspath of forked Java VMs gets constructed as if
-build.sysclasspath had the value "last".</p>
+<p>The value of the <code>ant.build.clonevm</code> system property
+controls how Ant instruments forked JVMs.  The <a href="Tasks/java.html">java</a>
+and <a href="Tasks/junit.html">junit</a> tasks support <var>clonevm</var>
+attributes to control JVMs on a task-by-task basis while the system
+property applies to all forked JVMs.</p>
+
+<p>If the value of the property is <q>true</q>, then all system properties of
+the forked JVM will be the same as those of the JVM running Ant. In
+addition, if you set <code>ant.build.clonevm</code> to <q>true</q>
+and <a href="sysclasspath.html">build.sysclasspath</a> has not been
+set, the <var>bootclasspath</var> of forked JVMs gets constructed as
+if <code>build.sysclasspath</code> had the value <q>last</q>.</p>
 
 <p>Note that this has to be a system property, so it cannot be
-specified on the Ant command line.  Use the ANT_OPTS environment
-variable instead.</p>
-
+specified on the Ant command line.  Use the <code>ANT_OPTS</code>
+environment variable instead.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/cover.html ant-1.10.3/manual/cover.html
--- ant-1.9.10/manual/cover.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/cover.html	2018-03-24 12:37:12.000000000 +0000
@@ -19,35 +19,26 @@
 <head>
 <meta http-equiv="Content-Language" content="en-us">
 <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
-<title>Apache Ant 1.9.10 User Manual</title>
+<title>Apache Ant 1.10.3 User Manual</title>
 </head>
 
-<body bgcolor="#FFFFFF">
-<div align="center"> 
-  <h1><img src="images/ant_logo_large.gif" width="190" height="120"></h1>
-  <h1>Apache Ant&trade; 1.9.10 Manual</h1>
-  <p align="left">This is the manual for version 1.9.10 of
-  <a target="_top" href="http://ant.apache.org/index.html">Apache Ant</a>. 
-    If your version 
-    of Ant (as verified with <tt>ant -version</tt>) is older or newer than this 
-    version then this is not the correct manual set. Please use the documentation 
-    appropriate to your current version. Also, if you are using a version
-    older than the most recent release, we recommend an upgrade to fix bugs
-    as well as provide new functionality. </p>
-  <p>&nbsp;</p>
+<body>
+  <h1 class="center"><img src="images/ant_logo_large.gif" width="190" height="120"></h1>
+  <h1 class="center">Apache Ant&trade; 1.10.3 Manual</h1>
+  <p>This is the manual for version 1.10.3 of <a href="https://ant.apache.org/" target="_top">Apache Ant</a>. If your
+    version of Ant (as verified with <kbd>ant -version</kbd>) is older or newer than this version then this is not the
+    correct manual set. Please use the documentation appropriate to your current version. Also, if you are using a
+    version older than the most recent release, we recommend an upgrade to fix bugs as well as provide new
+    functionality.</p>
 
-  <p align="left">Ant's manual and API documentation is part of
-    the <a href="http://ant.apache.org/bindownload.cgi">binary</a>
-    distributions or available as a
-    separate <a href="http://ant.apache.org/manualdownload.cgi">archive</a>.
-    Manuals for older releases are available for
-    download
-    <a href="http://ant.apache.org/bindownload.cgi#Old Ant Releases">as
-      well</a>.</p>
-
-  <p>Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.</p>
-</div>
+  <p>Ant's manual and API documentation is part of the <a href="https://ant.apache.org/bindownload.cgi"
+     target="_top">binary</a> distributions or available as a
+     separate <a href="https://ant.apache.org/manualdownload.cgi" target="_top">archive</a>.  Manuals for older releases
+     are available for download <a href="https://ant.apache.org/bindownload.cgi#Old Ant Releases" target="_top">as
+     well</a>.</p>
 
+  <p class="center">Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos
+    are trademarks of The Apache Software Foundation.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/credits.html ant-1.10.3/manual/credits.html
--- ant-1.9.10/manual/credits.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/credits.html	2018-03-24 12:37:12.000000000 +0000
@@ -18,16 +18,16 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
-<title>Apache Ant User Manual - Credits</title>
+<link rel="stylesheet" type="text/css" href="stylesheets/style.css">
+<title>Apache Ant User Manual&mdash;Credits</title>
 </head>
 
 <body>
 
-<div align="center">
-<h1>Apache Ant User Manual</h1>
-<p>by</p>
-</div>
+<h1 class="center">Apache Ant User Manual</h1>
+
+<p class="center">by</p>
+
 <!-- Names are in alphabetical order, on last name -->
 <ul>
   <li>Stephane Bailliez (<a href="mailto:sbailliez@imediation.com">sbailliez@imediation.com</a>)</li>
@@ -38,15 +38,15 @@
   <li>James Duncan Davidson (<a href="mailto:duncan@x180.com">duncan@x180.com</a>)</li>
   <li>Tom Dimock (<a href="mailto:tad1@cornell.edu">tad1@cornell.edu</a>)</li>
   <li>Peter Donald (<a href="mailto:donaldp@apache.org">donaldp@apache.org</a>)</li>
-  <li>dIon Gillard (<a href="mailto:dion@apache.org">dion@apache.org</a>)</li>
+  <li>Dion Gillard (<a href="mailto:dion@apache.org">dion@apache.org</a>)</li>
   <li>Erik Hatcher (<a href="mailto:ehatcher@apache.org">ehatcher@apache.org</a>)</li>
   <li>Diane Holt (<a href="mailto:holtdl@yahoo.com">holtdl@yahoo.com</a>)</li>
   <li>Bill Kelly (<a href="mailto:bill.kelly@softwired-inc.com">bill.kelly@softwired-inc.com</a>)</li>
   <li>Martijn Kruithof</li>
   <li>Arnout J. Kuiper (<a href="mailto:ajkuiper@wxs.nl">ajkuiper@wxs.nl</a>)</li>
-  <li>Antoine Lévy-Lambert</li>
+  <li>Antoine L&eacute;vy-Lambert</li>
   <li>Conor MacNeill</li>
-  <li>Jan Matèrne</li>
+  <li>Jan Mat&eacute;rne</li>
   <li>Stefano Mazzocchi (<a href="mailto:stefano@apache.org">stefano@apache.org</a>)</li>
   <li>Erik Meade (<a href="mailto:emeade@geekfarm.org">emeade@geekfarm.org</a>)</li>
   <li>Sam Ruby (<a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a>)</li>
@@ -61,10 +61,7 @@
   <li>Craeg Strong (<a href="mailto:cstrong@arielpartners.com">cstrong@arielpartners.com</a>)</li>
 </ul>
 
-<center>
-<p>Version: 1.9.10</p>
-</center>
-
+<p class="center">Version: 1.10.3</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/develop.html ant-1.10.3/manual/develop.html
--- ant-1.9.10/manual/develop.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/develop.html	2018-03-24 12:37:12.000000000 +0000
@@ -25,258 +25,210 @@
 <body>
 <h1>Developing with Apache Ant</h1>
 
-<h2><a name="writingowntask">Writing Your Own Task</a></h2>
+<h2 id="writingowntask">Writing Your Own Task</h2>
 <p>It is very easy to write your own task:</p>
 <ol>
-  <li>Create a Java class that extends <code>org.apache.tools.ant.Task</code>
-      or <a href="base_task_classes.html">another class</a> that was designed to be extended.</li>
+  <li>Create a Java class that extends <code class="code">org.apache.tools.ant.Task</code>
+    or <a href="base_task_classes.html">another class</a> that was designed to be extended.</li>
 
-  <li>For each attribute, write a <i>setter</i> method. The setter method must be a
-    <code>public void</code> method that takes a single argument. The
-    name of the method must begin with <code>set</code>, followed by the
-    attribute name, with the first character of the name in uppercase, and the rest in
-    lowercase<a href="#footnote-1"><sup>*</sup></a>.  That is, to support an attribute named
-    <code>file</code> you create a method <code>setFile</code>.
-    Depending on the type of the argument, Ant will perform some
-    conversions for you, see <a href="#set-magic">below</a>.</li>
-
-  <li>If your task shall contain other tasks as nested elements (like
-    <a href="Tasks/parallel.html"><code>parallel</code></a>), your
-    class must implement the interface
-    <code>org.apache.tools.ant.TaskContainer</code>.  If you do so, your
-    task can not support any other nested elements.  See 
-    <a href="#taskcontainer">below</a>.</li>
-
-  <li>If the task should support character data (text nested between the
-    start end end tags), write a <code>public void addText(String)</code>
-    method.  Note that Ant does <strong>not</strong> expand properties on
-    the text it passes to the task.</li>
-
-  <li>For each nested element, write a <i>create</i>, <i>add</i> or
-    <i>addConfigured</i> method.  A create method must be a
-    <code>public</code> method that takes no arguments and returns an
-    <code>Object</code> type. The name of the create method must begin
-    with <code>create</code>, followed by the element name. An add (or
-    addConfigured) method must be a <code>public void</code> method that
-    takes a single argument of an <code>Object</code> type with a
-    no-argument constructor.  The name of the add (addConfigured) method
-    must begin with <code>add</code> (<code>addConfigured</code>),
-    followed by the element name.  For a more complete discussion see 
-    <a href="#nested-elements">below</a>.</li>
-
-  <li>Write a <code>public void execute</code> method, with no arguments, that
-    throws a <code>BuildException</code>. This method implements the task
-    itself.</li>
+  <li id="footnote-1-back">For each attribute, write a <em>setter</em> method. The setter method
+    must be a <code>public void</code> method that takes a single argument. The name of the method
+    must begin with <code>set</code>, followed by the attribute name, with the first character of
+    the name in uppercase, and the rest in lowercase<a href="#footnote-1">*</a>.  That is, to
+    support an attribute named <var>file</var> you create a
+    method <code class="code">setFile</code>.  Depending on the type of the argument, Ant will
+    perform some conversions for you, see <a href="#set-magic">below</a>.</li>
+
+  <li>If your task shall contain other tasks as nested elements
+    (like <a href="Tasks/parallel.html"><code>parallel</code></a>), your class must implement the
+    interface <code class="code">org.apache.tools.ant.TaskContainer</code>.  If you do so, your task
+    can not support any other nested elements.  See <a href="#taskcontainer">below</a>.</li>
+
+  <li>If the task should support character data (text nested between the start and end tags), write
+    a <code class="code">public void addText(String)</code> method.  Note that Ant
+    does <strong>not</strong> expand properties on the text it passes to the task.</li>
+
+  <li>For each nested element, write a <em>create</em>, <em>add</em> or <em>addConfigured</em>
+    method.  A create method must be a <code>public</code> method that takes no arguments and
+    returns an <code>Object</code> type. The name of the create method must begin
+    with <code>create</code>, followed by the element name. An add (or addConfigured) method must be
+    a <code>public void</code> method that takes a single argument of an <code>Object</code> type
+    with a no-argument constructor.  The name of the add (addConfigured) method must begin
+    with <code>add</code> (<code>addConfigured</code>), followed by the element name.  For a more
+    complete discussion see <a href="#nested-elements">below</a>.</li>
+
+  <li>Write a <code class="code">public void execute()</code> method, with no arguments, that throws
+    a <code>BuildException</code>. This method implements the task itself.</li>
 </ol>
 
-<hr>
-<p><a name="footnote-1">*</a> Actually the case of the letters after
-the first one doesn't really matter to Ant, using all lower case is a
-good convention, though.</p>
+<hr/>
+<p id="footnote-1"><a href="#footnote-1-back">*</a> Actually the case of the letters after the first
+one doesn't really matter to Ant, using all lower case is a good convention, though.</p>
 
 <h3>The Life-cycle of a Task</h3>
 <ol>
-  <li>
-    The xml element that contains the tag corresponding to the
-    task gets converted to an UnknownElement at parser time.
-    This UnknownElement gets placed in a list within a target
-    object, or recursively within another UnknownElement.
+  <li>The xml element that contains the tag corresponding to the task gets converted to
+    an <code class="code">UnknownElement</code> at parse time.
+    This <code class="code">UnknownElement</code> gets placed in a list within a target object, or
+    recursively within another <code class="code">UnknownElement</code>.
   </li>
-  <li>
-    When the target is executed, each UnknownElement is invoked
-    using an <code>perform()</code> method. This instantiates
-    the task. This means that tasks only gets
-    instantiated at run time.
+
+  <li>When the target is executed, each <code class="code">UnknownElement</code> is invoked using
+    an <code class="code">perform()</code> method. This instantiates the task. This means that tasks
+    only gets instantiated at run time.
   </li>
 
-  <li>The task gets references to its project and location inside the
-    buildfile via its inherited <code>project</code> and
-    <code>location</code> variables.</li>
-
-  <li>If the user specified an <code>id</code> attribute to this task,
-    the project
-    registers a reference to this newly created task, at run
-    time.</li>
-
-  <li>The task gets a reference to the target it belongs to via its
-    inherited <code>target</code> variable.</li>
-
-  <li><code>init()</code> is called at run time.</li>
-
-  <li>All child elements of the XML element corresponding to this task
-    are created via this task's <code>createXXX()</code> methods or
-    instantiated and added to this task via its <code>addXXX()</code>
-    methods, at run time.  Child elements corresponding
-    to <code>addConfiguredXXX()</code> are created at this point but
-    the actual <code>addCondifgired</code> method is not called.</li>
-
-  <li>All attributes of this task get set via their corresponding
-    <code>setXXX</code> methods, at runtime.</li>
-
-  <li>The content character data sections inside the XML element
-    corresponding to this task is added to the task via its
-    <code>addText</code> method, at runtime.</li>
-
-  <li>All attributes of all child elements get set via their corresponding
-    <code>setXXX</code> methods, at runtime.</li>
-
-  <li>If child elements of the XML element corresponding to this task
-    have been created for <code>addConfiguredXXX()</code> methods,
-    those methods get invoked now.</li>
-
-  <li><a name="execute"><code>execute()</code></a> is called at runtime.
-    If <code>target1</code> and <code>target2</code> both depend
-    on <code>target3</code>, then running
-    <code>'ant target1 target2'</code> will run all tasks in
-    <code>target3</code> twice.</li>
-</ol>
+  <li>The task gets references to its project and location inside the buildfile via its
+    inherited <code>project</code> and <code>location</code> variables.</li>
 
-<h3><a name="set-magic">Conversions Ant will perform for attributes</a></h3>
+  <li>If the user specified an <var>id</var> attribute to this task, the project registers a
+    reference to this newly created task, at run time.</li>
 
-<p>Ant will always expand properties before it passes the value of an
-attribute to the corresponding setter method. <b>Since Ant 1.8</b>, it is
-possible to <a href="Tasks/propertyhelper.html">extend Ant's property handling</a>
-such that a non-string Object may be the result of the evaluation of a string
-containing a single property reference. These will be assigned directly via
-setter methods of matching type. Since it requires some beyond-the-basics
-intervention to enable this behavior, it may be a good idea to flag attributes
-intended to permit this usage paradigm.
-</p>
-
-<p>The most common way to write an attribute setter is to use a
-<code>java.lang.String</code> argument.  In this case Ant will pass
-the literal value (after property expansion) to your task.  But there
-is more!  If the argument of you setter method is</p>
+  <li>The task gets a reference to the target it belongs to via its inherited <code>target</code>
+    variable.</li>
 
-<ul>
+  <li><code class="code">init()</code> is called at run time.</li>
 
-  <li><code>boolean</code>, your method will be passed the value
-  <i>true</i> if the value specified in the build file is one of
-  <code>true</code>, <code>yes</code>, or <code>on</code> and
-  <i>false</i> otherwise.</li>
-
-  <li><code>char</code> or <code>java.lang.Character</code>, your
-  method will be passed the first character of the value specified in
-  the build file.</li>
-
-  <li>any other primitive type (<code>int</code>, <code>short</code>
-  and so on), Ant will convert the value of the attribute into this
-  type, thus making sure that you'll never receive input that is not a
-  number for that attribute.</li>
-
-  <li><code>java.io.File</code>, Ant will first determine whether the
-  value given in the build file represents an absolute path name.  If
-  not, Ant will interpret the value as a path name relative to the
-  project's basedir.</li>
-
-  <li><code>org.apache.tools.ant.types.Resource</code>
-  <code>org.apache.tools.ant.types.Resource</code>, Ant will
-  resolve the string as a <code>java.io.File</code> as above, then
-  pass in as a <code>org.apache.tools.ant.types.resources.FileResource</code>.
-  <b>Since Ant 1.8</b>
-  </li>
+  <li>All child elements of the XML element corresponding to this task are created via this
+    task's <code class="code">createXXX()</code> methods or instantiated and added to this task via
+    its <code class="code">addXXX()</code> methods, at run time.  Child elements corresponding
+    to <code class="code">addConfiguredXXX()</code> are created at this point but the
+    actual <em>addConfigured</em> method is not called.</li>
 
-  <li><code>org.apache.tools.ant.types.Path</code>, Ant will tokenize
-  the value specified in the build file, accepting <code>:</code> and
-  <code>;</code> as path separators.  Relative path names will be
-  interpreted as relative to the project's basedir.</li>
-
-  <li><code>java.lang.Class</code>, Ant will interpret the value
-  given in the build file as a Java class name and load the named
-  class from the system class loader.</li>
-
-  <li>any other type that has a constructor with a single
-  <code>String</code> argument, Ant will use this constructor to
-  create a new instance from the value given in the build file.</li>
-
-  <li>A subclass of
-  <code>org.apache.tools.ant.types.EnumeratedAttribute</code>, Ant
-  will invoke this classes <code>setValue</code> method.  Use this if
-  your task should support enumerated attributes (attributes with
-  values that must be part of a predefined set of values).  See
-  <code>org/apache/tools/ant/taskdefs/FixCRLF.java</code> and the
-  inner <code>AddAsisRemove</code> class used in <code>setCr</code>
-  for an example.</li>
-
-  <li>A (Java 5) enumeration. Ant will call the setter with the enum constant
-  matching the value given in the build file. This is easier than using
-  <code>EnumeratedAttribute</code> and can result in cleaner code, but of course
-  your task will not run on JDK 1.4 or earlier. Note that any override of
-  <code>toString()</code> in the enumeration is ignored; the build file must use
-  the declared name (see <code>Enum.getName()</code>). You may wish to use lowercase
-  enum constant names, in contrast to usual Java style, to look better in build files.
-  <em>As of Ant 1.7.0.</em></li>
+  <li>All attributes of this task get set via their corresponding <code class="code">setXXX()</code>
+    methods, at run time.</li>
+
+  <li>The content character data sections inside the XML element corresponding to this task is added
+    to the task via its <code class="code">addText()</code> method, at run time.</li>
+
+  <li>All attributes of all child elements get set via their
+    corresponding <code class="code">setXXX()</code> methods, at run time.</li>
+
+  <li>If child elements of the XML element corresponding to this task have been created
+    for <code class="code">addConfiguredXXX()</code> methods, those methods get invoked now.</li>
+
+  <li id="execute"><code class="code">execute()</code> is called at run time.  If <q>target1</q>
+    and <q>target2</q> both depend on <q>target3</q>, then running <kbd>ant target1 target2</kbd>
+    will run all tasks in <q>target3</q> twice.</li>
+</ol>
 
+<h3 id="set-magic">Conversions Ant will perform for attributes</h3>
+
+<p>Ant will always expand properties before it passes the value of an attribute to the corresponding
+setter method. <em>Since Ant 1.8</em>, it is possible to <a href="Tasks/propertyhelper.html">extend
+Ant's property handling</a> such that a non-string Object may be the result of the evaluation of a
+string containing a single property reference. These will be assigned directly via setter methods of
+matching type. Since it requires some beyond-the-basics intervention to enable this behavior, it may
+be a good idea to flag attributes intended to permit this usage paradigm.</p>
+
+<p>The most common way to write an attribute setter is to use
+a <code class="code">java.lang.String</code> argument.  In this case Ant will pass the literal value
+(after property expansion) to your task.  But there is more!  If the argument of you setter method
+is</p>
+
+<ul>
+  <li><code>boolean</code>, your method will be passed the value <q>true</q> if the value specified
+    in the build file is one of <q>true</q>, <q>yes</q>, or <q>on</q> and <q>false</q>
+    otherwise.</li>
+
+  <li><code>char</code> or <code class="code">java.lang.Character</code>, your method will be passed
+    the first character of the value specified in the build file.</li>
+
+  <li>any other primitive type (<code class="code">int</code>, <code class="code">short</code> and
+    so on), Ant will convert the value of the attribute into this type, thus making sure that you'll
+    never receive input that is not a number for that attribute.</li>
+
+  <li><code class="code">java.io.File</code>, Ant will first determine whether the value given in
+    the build file represents an absolute path name.  If not, Ant will interpret the value as a path
+    name relative to the project's <var>basedir</var>.</li>
+
+  <li><code class="code">org.apache.tools.ant.types.Resource</code>, Ant will resolve the string as
+    a <code class="code">java.io.File</code> as above, then pass in as
+    a <code class="code">org.apache.tools.ant.types.resources.FileResource</code>.  <em>Since Ant
+    1.8</em></li>
+
+  <li><code class="code">org.apache.tools.ant.types.Path</code>, Ant will tokenize the value
+    specified in the build file, accepting <q>:</q> and <q>;</q> as path separators.  Relative path
+    names will be interpreted as relative to the project's <var>basedir</var>.</li>
+
+  <li><code class="code">java.lang.Class</code>, Ant will interpret the value given in the build
+    file as a Java class name and load the named class from the system class loader.</li>
+
+  <li>any other type that has a constructor with a single <code class="code">String</code> argument,
+    Ant will use this constructor to create a new instance from the value given in the build
+    file.</li>
+
+  <li>A subclass of <code class="code">org.apache.tools.ant.types.EnumeratedAttribute</code>, Ant
+    will invoke this class's <code class="code">setValue</code> method.  Use this if your task
+    should support enumerated attributes (attributes with values that must be part of a predefined
+    set of values).  See <code>org/apache/tools/ant/taskdefs/FixCRLF.java</code> and the
+    inner <code class="code">AddAsisRemove</code> class used in <code class="code">setCr</code> for
+    an example.</li>
+
+  <li>A (Java 5) enumeration, Ant will call the setter with the enum constant matching the value
+    given in the build file. This is easier than using <code class="code">EnumeratedAttribute</code>
+    and can result in cleaner code, but of course your task will not run on JDK 1.4 or earlier. Note
+    that any override of <code class="code">toString()</code> in the enumeration is ignored; the
+    build file must use the declared name (see <code>Enum.getName()</code>). You may wish to use
+    lowercase enum constant names, in contrast to usual Java style, to look better in build
+    files.  <em>Since Ant 1.7.0</em></li>
 </ul>
 
-<p>What happens if more than one setter method is present for a given
-attribute?  A method taking a <code>String</code> argument will always
-lose against the more specific methods.  If there are still more
-setters Ant could chose from, only one of them will be called, but we
-don't know which, this depends on the implementation of your Java
-virtual machine.</p>
-
-<h3><a name="nested-elements">Supporting nested elements</a></h3>
-
-<p>Let's assume your task shall support nested elements with the name
-<code>inner</code>.  First of all, you need a class that represents
-this nested element.  Often you simply want to use one of Ant's
-classes like <code>org.apache.tools.ant.types.FileSet</code> to
-support nested <code>fileset</code> elements.</p>
-
-<p>Attributes of the nested elements or nested child elements of them
-will be handled using the same mechanism used for tasks (i.e. setter
-methods for attributes, addText for nested text and
-create/add/addConfigured methods for child elements).</p>
-
-<p>Now you have a class <code>NestedElement</code> that is supposed to
-be used for your nested <code>&lt;inner&gt;</code> elements, you have
-three options:</p>
+<p>What happens if more than one setter method is present for a given attribute?  A method taking
+a <code class="code">String</code> argument will always lose against the more specific methods.  If
+there are still more setters Ant could chose from, only one of them will be called, but we don't
+know which, this depends on the implementation of your Java virtual machine.</p>
+
+<h3 id="nested-elements">Supporting nested elements</h3>
+
+<p>Let's assume your task shall support nested elements with the name <code>inner</code>.  First of
+all, you need a class that represents this nested element.  Often you simply want to use one of
+Ant's classes like <code class="code">org.apache.tools.ant.types.FileSet</code> to support
+nested <code>fileset</code> elements.</p>
+
+<p>Attributes of the nested elements or nested child elements of them will be handled using the same
+mechanism used for tasks (i.e. <em>setter</em> methods for
+attributes, <code class="code">addText()</code> for nested text
+and <em>create</em>/<em>add</em>/<em>addConfigured</em> methods for child elements).</p>
+
+<p>Now you have a class <code class="code">NestedElement</code> that is supposed to be used for your
+nested <code>&lt;inner&gt;</code> elements, you have three options:</p>
 
 <ol>
-  <li><code>public NestedElement createInner()</code></li>
-  <li><code>public void addInner(NestedElement anInner)</code></li>
-  <li><code>public void addConfiguredInner(NestedElement anInner)</code></li>
+  <li><code class="code">public NestedElement createInner()</code></li>
+  <li><code class="code">public void addInner(NestedElement anInner)</code></li>
+  <li><code class="code">public void addConfiguredInner(NestedElement anInner)</code></li>
 </ol>
 
 <p>What is the difference?</p>
 
-<p>Option 1 makes the task create the instance of
-<code>NestedElement</code>, there are no restrictions on the type.
-For the options 2 and 3, Ant has to create an instance of
-<code>NestedInner</code> before it can pass it to the task, this
-means, <code>NestedInner</code> must have a <code>public</code> no-arg
-  constructor or a <code>public</code> one-arg constructor
-  taking a Project class as a parameter.
-This is the only difference between options 1 and 2.</p>
-
-<p>The difference between 2 and 3 is what Ant has done to the object
-before it passes it to the method.  <code>addInner</code> will receive
-an object directly after the constructor has been called, while
-<code>addConfiguredInner</code> gets the object <em>after</em> the
-attributes and nested children for this new object have been
-handled.</p>
-
-<p>What happens if you use more than one of the options?  Only one of
-the methods will be called, but we don't know which, this depends on
-the implementation of your Java virtual machine.</p>
-
-<h3><a name="nestedtype">Nested Types</a></h3>
-If your task needs to nest an arbitrary type that has been defined
-  using <code>&lt;typedef&gt;</code> you have two options.
-  <ol>
-    <li><code>public void add(Type type)</code></li>
-    <li><code>public void addConfigured(Type type)</code></li>
-  </ol>
-  The difference between 1 and 2 is the same as between 2 and 3 in the
-  previous section.
-  <p>
-    For example suppose one wanted to handle objects object of type
-    org.apache.tools.ant.taskdefs.condition.Condition, one may
-    have a class:
-  </p>
-  <blockquote>
-  <pre>
+<p>Option 1 makes the task create the instance of <code class="code">NestedElement</code>, there are
+no restrictions on the type.  For the options 2 and 3, Ant has to create an instance
+of <code class="code">NestedInner</code> before it can pass it to the task, this
+means, <code class="code">NestedInner</code> must have a <code>public</code> no-arg constructor or
+a <code>public</code> one-arg constructor taking a <code class="code">Project</code> class as a
+parameter.  This is the only difference between options 1 and 2.</p>
+
+<p>The difference between 2 and 3 is what Ant has done to the object before it passes it to the
+method.  <code class="code">addInner()</code> will receive an object directly after the constructor
+has been called, while <code class="code">addConfiguredInner()</code> gets the object <em>after</em>
+the attributes and nested children for this new object have been handled.</p>
+
+<p>What happens if you use more than one of the options?  Only one of the methods will be called,
+but we don't know which, this depends on the implementation of your JVM.</p>
+
+<h3 id="nestedtype">Nested Types</h3>
+<p>If your task needs to nest an arbitrary type that has been defined
+using <code>&lt;typedef&gt;</code> you have two options.</p>
+<ol>
+  <li><code class="code">public void add(Type type)</code></li>
+  <li><code class="code">public void addConfigured(Type type)</code></li>
+</ol>
+<p>The difference between 1 and 2 is the same as between 2 and 3 in the previous section.</p>
+<p>For example suppose one wanted to handle objects object of
+type <code class="code">org.apache.tools.ant.taskdefs.condition.Condition</code>, one may have a
+class:</p>
+<pre>
 public class MyTask extends Task {
     private List conditions = new ArrayList();
     public void add(Condition c) {
@@ -285,27 +237,17 @@
     public void execute() {
      // iterator over the conditions
     }
-}
-  </pre>
-  </blockquote>
-  <p>
-    One may define and use this class like this:
-  </p>
-  <blockquote>
-    <pre>
+}</pre>
+<p>One may define and use this class like this:</p>
+<pre>
 &lt;taskdef name="mytask" classname="MyTask" classpath="classes"/&gt;
 &lt;typedef name="condition.equals"
          classname="org.apache.tools.ant.taskdefs.conditions.Equals"/&gt;
 &lt;mytask&gt;
     &lt;condition.equals arg1="${debug}" arg2="true"/&gt;
-&lt;/mytask&gt;
-    </pre>
-  </blockquote>
-  <p>
-    A more complicated example follows:
-  </p>
-  <blockquote>
-    <pre>
+&lt;/mytask&gt;</pre>
+<p>A more complicated example follows:</p>
+<pre>
 public class Sample {
     public static class MyFileSelector implements FileSelector {
          public void setAttrA(int a) {}
@@ -318,13 +260,13 @@
 
     interface MyInterface {
         void setVerbose(boolean val);
-    }        
+    }
 
     public static class BuildPath extends Path {
         public BuildPath(Project project) {
             super(project);
         }
-        
+
         public void add(MyInterface inter) {}
         public void setUrl(String url) {}
     }
@@ -333,16 +275,11 @@
         public void setVerbose(boolean x) {}
         public void setCount(int c) {}
     }
-}
-    </pre>
-  </blockquote>
-  <p>
-    This class defines a number of static classes that implement/extend
-    Path, MyFileSelector and MyInterface. These may be defined and used
-    as follows:
-  </p>
-  <pre>
-    <blockquote>
+}</pre>
+<p>This class defines a number of static classes that
+implement/extend <code class="code">Path</code>, <code class="code">MyFileSelector</code>
+and <code class="code">MyInterface</code>. These may be defined and used as follows:</p>
+<pre>
 &lt;typedef name="myfileselector" classname="Sample$MyFileSelector"
          classpath="classes" loaderref="classes"/&gt;
 &lt;typedef name="buildpath" classname="Sample$BuildPath"
@@ -358,33 +295,28 @@
          &lt;/buildpath&gt;
       &lt;/myfileselector&gt;
    &lt;/fileset&gt;
-&lt;/copy&gt;
-    </blockquote>
-  </pre>
-
-<h3><a name="taskcontainer">TaskContainer</a></h3>
-
-<p>The <code>TaskContainer</code> consists of a single method,
-<code>addTask</code> that basically is the same as an <a
-href="#nested-elements">add method</a> for nested elements.  The task
-instances will be configured (their attributes and nested elements
-have been handled) when your task's <code>execute</code> method gets
-invoked, but not before that.</p>
-
-<p>When we <a href="#execute">said</a> <code>execute</code> would be
-called, we lied ;-).  In fact, Ant will call the <code>perform</code>
-method in <code>org.apache.tools.ant.Task</code>, which in turn calls
-<code>execute</code>.  This method makes sure that <a
-href="#buildevents">Build Events</a> will be triggered.  If you
-execute the task instances nested into your task, you should also
-invoke <code>perform</code> on these instances instead of
-<code>execute</code>.</p>
+&lt;/copy&gt;</pre>
+
+<h3 id="taskcontainer">TaskContainer</h3>
+
+<p>The <code class="code">TaskContainer</code> consists of a single
+method, <code class="code">addTask</code> that basically is the same as
+an <a href="#nested-elements">add method</a> for nested elements.  The task instances will be
+configured (their attributes and nested elements have been handled) when your
+task's <code class="code">execute</code> method gets invoked, but not before that.</p>
+
+<p>When we <a href="#execute">said</a> <code class="code">execute</code> would be called, we lied
+;-).  In fact, Ant will call the <code class="code">perform</code> method
+in <code class="code">org.apache.tools.ant.Task</code>, which in turn
+calls <code class="code">execute</code>.  This method makes sure that <a href="#buildevents">Build
+Events</a> will be triggered.  If you execute the task instances nested into your task, you should
+also invoke <code class="code">perform</code> on these instances instead
+of <code class="code">execute</code>.</p>
 
 <h3>Example</h3>
-<p>Let's write our own task, which prints a message on the
-<code>System.out</code> stream.
-The task has one attribute, called <code>message</code>.</p>
-<blockquote>
+<p>Let's write our own task, which prints a message on the <code>System.out</code> stream.  The task
+has one attribute, called <code>message</code>.</p>
+
 <pre>
 package com.mydomain;
 
@@ -403,21 +335,19 @@
     public void setMessage(String msg) {
         this.msg = msg;
     }
-}
-</pre>
-</blockquote>
+}</pre>
+
 <p>It's really this simple ;-)</p>
 <p>Adding your task to the system is rather simple too:</p>
 <ol>
-  <li>Make sure the class that implements your task is in the classpath when
-    starting Ant.</li>
-  <li>Add a <code>&lt;taskdef&gt;</code> element to your project.
-    This actually adds your task to the system.</li>
+  <li>Make sure the class that implements your task is in the classpath when starting Ant.</li>
+  <li>Add a <code>&lt;taskdef&gt;</code> element to your project.  This actually adds your task to
+    the system.</li>
   <li>Use your task in the rest of the buildfile.</li>
 </ol>
 
 <h3>Example</h3>
-<blockquote>
+
 <pre>
 &lt;?xml version=&quot;1.0&quot;?&gt;
 
@@ -427,17 +357,14 @@
   &lt;target name=&quot;main&quot;&gt;
     &lt;mytask message=&quot;Hello World! MyVeryOwnTask works!&quot;/&gt;
   &lt;/target&gt;
-&lt;/project&gt;
-</pre>
-</blockquote>
+&lt;/project&gt;</pre>
 
 <h3>Example 2</h3>
-To use a task directly from the buildfile which created it, place the
-<code>&lt;taskdef&gt;</code> declaration inside a target
-<i>after the compilation</i>. Use the <code>classpath</code> attribute of
-<code>&lt;taskdef&gt;</code> to point to where the code has just been
-compiled.
-<blockquote>
+<p>To use a task directly from the buildfile which created it, place
+the <code>&lt;taskdef&gt;</code> declaration inside a target <em>after the compilation</em>. Use
+the <var>classpath</var> attribute of <code>&lt;taskdef&gt;</code> to point to where the code has
+just been compiled.</p>
+
 <pre>
 &lt;?xml version=&quot;1.0&quot;?&gt;
 
@@ -457,27 +384,23 @@
   &lt;target name=&quot;main&quot; depends=&quot;declare&quot;&gt;
     &lt;mytask message=&quot;Hello World! MyVeryOwnTask works!&quot;/&gt;
   &lt;/target&gt;
-&lt;/project&gt;
-</pre>
-</blockquote>
-
-<p>Another way to add a task (more permanently), is to add the task name and
-implementing class name to the <code>default.properties</code> file in the
-<code>org.apache.tools.ant.taskdefs</code>
-package. Then you can use it as if it were a built-in task.</p>
+&lt;/project&gt;</pre>
 
+<p>Another way to add a task (more permanently) is to add the task name and implementing class name
+to the <samp>default.properties</samp> file in
+the <code class="code">org.apache.tools.ant.taskdefs</code> package. Then you can use it as if it
+were a built-in task.</p>
 
-
-<hr>
-<h2><a name="buildevents">Build Events</a></h2>
+<hr/>
+<h2 id="buildevents">Build Events</h2>
 <p>Ant is capable of generating build events as it performs the tasks necessary to build a project.
-Listeners can be attached to Ant to receive these events. This capability could be used, for example,
-to connect Ant to a GUI or to integrate Ant with an IDE.
-</p>
-<p>To use build events you need to create an ant <code>Project</code> object. You can then call the
-<code>addBuildListener</code> method to add your listener to the project. Your listener must implement
-the <code>org.apache.tools.antBuildListener</code> interface. The listener will receive BuildEvents
-for the following events</p>
+Listeners can be attached to Ant to receive these events. This capability could be used, for
+example, to connect Ant to a GUI or to integrate Ant with an IDE.</p>
+<p>To use build events you need to create an ant <code class="code">Project</code> object. You can
+then call the <code class="code">addBuildListener</code> method to add your listener to the
+project. Your listener must implement
+the <code class="code">org.apache.tools.antBuildListener</code> interface. The listener will receive
+BuildEvents for the following events</p>
 <ul>
   <li>Build started</li>
   <li>Build finished</li>
@@ -488,55 +411,49 @@
   <li>Message logged</li>
 </ul>
 
-<p>If the build file invokes another build file via 
-<a href="Tasks/ant.html"><code>&lt;ant&gt;</code></a> or 
-<a href="Tasks/subant.html"><code>&lt;subant&gt;</code></a> or uses 
-<a href="Tasks/antcall.html"><code>&lt;antcall&gt;</code></a>, you are creating a
-new Ant "project" that will send target and task level events of its
-own but never sends build started/finished events.  Ant 1.6.2
-introduces an extension of the BuildListener interface named
-SubBuildListener that will receive two new events for</p>
+<p>If the build file invokes another build file
+via <a href="Tasks/ant.html"><code>&lt;ant&gt;</code></a>
+or <a href="Tasks/subant.html"><code>&lt;subant&gt;</code></a> or
+uses <a href="Tasks/antcall.html"><code>&lt;antcall&gt;</code></a>, you are creating a new Ant
+"project" that will send target and task level events of its own but never sends build
+started/finished events. <em>Since Ant 1.6.2</em>, <code class="code">BuildListener</code> interface
+has an extension named <code class="code">SubBuildListener</code> that will receive two new events
+for</p>
 <ul>
   <li>SubBuild started</li>
   <li>SubBuild finished</li>
 </ul>
-<p>If you are interested in those events, all you need to do is to
-implement the new interface instead of BuildListener (and register the
-listener, of course).</p>
-
-<p>If you wish to attach a listener from the command line you may use the
-<code>-listener</code> option. For example:</p>
-<blockquote>
-  <pre>ant -listener org.apache.tools.ant.XmlLogger</pre>
-</blockquote>
-<p>will run Ant with a listener that generates an XML representation of the build progress. This
-listener is included with Ant, as is the default listener, which generates the logging to standard output.</p>
-
-<p><b>Note: </b>A listener must not access System.out and System.err directly since output on 
-these streams is redirected by Ant's core to the build event system. Accessing these 
-streams can cause an infinite loop in Ant. Depending on the version of Ant, this will
-either cause the build to terminate or the Java VM to run out of Stack space. A logger, also, may 
-not access System.out and System.err directly. It must use the streams with which it has
-been configured.</p>
-
-<p><b>Note2:</b> All methods of a BuildListener except for the "Build
-  Started" and "Build Finished" events may occur on several threads
-  simultaneously - for example while Ant is executing
-  a <code>&lt;parallel&gt;</code> task.</p>
+<p>If you are interested in those events, all you need to do is to implement the new interface
+instead of <code class="code">BuildListener</code> (and register the listener, of course).</p>
 
+<p>If you wish to attach a listener from the command line you may use the <kbd>-listener</kbd>
+option. For example:</p>
 
+<pre class="input">ant -listener org.apache.tools.ant.XmlLogger</pre>
 
+<p>will run Ant with a listener that generates an XML representation of the build progress. This
+listener is included with Ant, as is the default listener, which generates the logging to standard
+output.</p>
 
+<p><strong>Note</strong>: A listener must not access <code class="code">System.out</code>
+and <code class="code">System.err</code> directly since output on these streams is redirected by
+Ant's core to the build event system. Accessing these streams can cause an infinite loop in
+Ant. Depending on the version of Ant, this will either cause the build to terminate or the JVM to
+run out of Stack space. A logger, also, may not access <code class="code">System.out</code>
+and <code class="code">System.err</code> directly. It must use the streams with which it has been
+configured.</p>
+
+<p><strong>Note</strong>: All methods of a <code class="code">BuildListener</code> except for the
+"Build Started" and "Build Finished" events may occur on several threads simultaneously&mdash;for
+example while Ant is executing a <code>&lt;parallel&gt;</code> task.</p>
 
 <h3>Example</h3>
-Writing an adapter to your favourite log library is very easy.
-Just implent the BuildListener interface, instantiate your logger and delegate
-the message to that instance. <br>
-When starting your build provide your adapter class and the log library to the
-build classpath and activate your logger via <code>-listener</code> option as
-described above.
+<p>Writing an adapter to your favourite log library is very easy.  Just implement
+the <code class="code">BuildListener</code> interface, instantiate your logger and delegate the
+message to that instance.</p>
+<p>When starting your build provide your adapter class and the log library to the build classpath
+and activate your logger via <kbd>-listener</kbd> option as described above.</p>
 
-<blockquote>
 <pre>
 public class MyLogAdapter implements BuildListener {
 
@@ -561,29 +478,22 @@
     }
 
     // implement all methods in that way
-}
-</pre>
-</blockquote>
-
+}</pre>
 
+<hr/>
+<h2 id="integration">Source code integration</h2>
 
-<hr>
-<h2><a name="integration">Source code integration</a></h2>
-
-<p>The other way to extend Ant through Java is to make changes to existing tasks, which is positively encouraged.
-Both changes to the existing source and new tasks can be incorporated back into the Ant codebase, which
-benefits all users and spreads the maintenance load around.</p>
-
-<p>Please consult the
-<a href="http://www.apache.org/foundation/getinvolved.html">Getting Involved</a> pages on the Apache web site
-for details on how to fetch the latest source and how to submit changes for reincorporation into the
-source tree.</p>
-
-<p>Ant also has some
-<a href="http://ant.apache.org/ant_task_guidelines.html">task guidelines</a>
-which provides some advice to people developing and testing tasks. Even if you intend to
-keep your tasks to yourself, you should still read this as it should be informative.</p>
+<p>The other way to extend Ant through Java is to make changes to existing tasks, which is
+positively encouraged.  Both changes to the existing source and new tasks can be incorporated back
+into the Ant codebase, which benefits all users and spreads the maintenance load around.</p>
+
+<p>Please consult the <a href="https://www.apache.org/foundation/getinvolved.html"
+target="_top">Getting Involved</a> pages on the Apache web site for details on how to fetch the
+latest source and how to submit changes for reincorporation into the source tree.</p>
+
+<p>Ant also has some <a href="https://ant.apache.org/ant_task_guidelines.html" target="_top">task
+guidelines</a> which provides some advice to people developing and testing tasks. Even if you intend
+to keep your tasks to yourself, you should still read this as it should be informative.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/developlist.html ant-1.10.3/manual/developlist.html
--- ant-1.9.10/manual/developlist.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/developlist.html	2018-03-24 12:37:12.000000000 +0000
@@ -30,8 +30,8 @@
 <h3>Developing with Apache Ant</h3>
 
 <ul class="inlinelist">
-<li><a href="http://ant.apache.org/ant_in_anger.html">Ant in Anger</a> <small>(online)</small></li>
-<li><a href="http://ant.apache.org/ant_task_guidelines.html">Ant Task Guidelines</a> <small>(online)</small></li>
+<li><a href="https://ant.apache.org/ant_in_anger.html" target="_top">Ant in Anger</a> <small>(online)</small></li>
+<li><a href="https://ant.apache.org/ant_task_guidelines.html" target="_top">Ant Task Guidelines</a> <small>(online)</small></li>
 <li><a href="develop.html#writingowntask">Writing Your Own Task</a></li>
 <li><a href="base_task_classes.html">Tasks Designed for Extension</a></li>
 <li><a href="develop.html#buildevents">Build Events</a></li>
@@ -39,7 +39,7 @@
 <li><a href="inputhandler.html">InputHandler</a></li>
 <li><a href="antexternal.html">Using Ant Tasks Outside of Ant</a></li>
 <li><a href="projecthelper.html">The Ant frontend: ProjectHelper</a></li>
-<li><a href="argumentprocessor.html">The Command Line Processor Plugin:ArgumentProcessor</a></li>
+<li><a href="argumentprocessor.html">The Command Line Processor Plugin: ArgumentProcessor</a></li>
 </ul>
 
 <h3>Tutorials</h3>
diff -Nru ant-1.9.10/manual/dirtasks.html ant-1.10.3/manual/dirtasks.html
--- ant-1.9.10/manual/dirtasks.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/dirtasks.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,44 +24,46 @@
 
 <body>
 
-<h2><a name="directorybasedtasks">Directory-based Tasks</a></h2>
+<h2 id="directorybasedtasks">Directory-based Tasks</h2>
 <p>Some tasks use directory trees for the actions they perform.
 For example, the <a href="Tasks/javac.html">javac</a> task, which
-compiles a directory tree with <code>.java</code> files into
-<code>.class</code> files, is one of these directory-based tasks. Because
+compiles a directory tree with <samp>.java</samp> files into
+<samp>.class</samp> files, is one of these directory-based tasks. Because
 some of these tasks do so much work with a directory tree, the task itself
 can act as an implicit <a href="Types/fileset.html">FileSet</a>.</p>
+
 <p>Whether the fileset is implicit or not, it can often be very useful to
 work on a subset of the directory tree. This section describes how you can
 select a subset of such a directory tree when using one of these
 directory-based tasks.</p>
-<p>Apache Ant gives you two ways to create a subset of files in a fileset, both of
-which can be used at the same time:</p>
+
+<p>Apache Ant gives you two ways to create a subset of files in a
+fileset, both of which can be used at the same time:</p>
 <ul>
   <li>Only include files and directories that match any
-    <code>include</code> patterns and do not match any
-    <code>exclude</code> patterns in a given
+    <var>include</var> patterns and do not match any
+    <var>exclude</var> patterns in a given
     <a href="Types/patternset.html">PatternSet</a>.</li>
   <li>Select files based on selection criteria defined by a collection of
     <a href="Types/selectors.html">selector</a> nested elements.</li>
 </ul>
-<h3><a name="patternset">Patternset</a></h3>
+<h3 id="patternset">Patternset</h3>
 
-<p>We said that Directory-based tasks can sometimes act as an implicit
-<a href="Types/fileset.html"><code>&lt;fileset&gt;</code></a>,
-but in addition to that, a FileSet acts as an implicit
-<a href="Types/patternset.html"><code>&lt;patternset&gt;</code></a>.</p>
+<p>We said that Directory-based tasks can sometimes act as an
+implicit <a href="Types/fileset.html"><code>&lt;fileset&gt;</code></a>,
+but in addition to that, a FileSet acts as an
+implicit <a href="Types/patternset.html"><code>&lt;patternset&gt;</code></a>.</p>
 
 <p>The inclusion and exclusion elements of the implicit PatternSet can be
 specified inside the directory-based task (or explicit fileset) via
 either:</p>
 <ul>
-  <li>the attributes <code>includes</code> and
-    <code>excludes</code>.</li>
+  <li>the attributes <var>includes</var> and
+    <var>excludes</var>.</li>
   <li>nested elements <code>&lt;include&gt;</code> and
     <code>&lt;exclude&gt;</code>.</li>
   <li>external files specified with the attributes
-    <code>includesfile</code> and <code>excludesfile</code>.</li>
+    <var>includesfile</var> and <var>excludesfile</var>.</li>
   <li>external files specified with the nested elements
     <code>&lt;includesfile&gt;</code> and <code>&lt;excludesfile&gt;</code>.
   </li>
@@ -77,142 +79,139 @@
 are assumed to match the include pattern (with the possible exception of
 the default excludes).</p>
 
-<h4><a name="patterns">Patterns</a></h4>
+<h4 id="patterns">Patterns</h4>
 
 <p>As described earlier, patterns are used for the inclusion and exclusion
 of files. These patterns look very much like the patterns used in DOS and
 UNIX:</p>
-<p>'*' matches zero or more characters, '?' matches one character.</p>
+
+<p><q>*</q> matches zero or more characters, <q>?</q> matches one character.</p>
 
 <p>In general, patterns are considered relative paths, relative to a
-task dependent base directory (the dir attribute in the case of
-<code>&lt;fileset&gt;</code>).  Only files found below that base
-directory are considered.  So while a pattern like
-<code>../foo.java</code> is possible, it will not match anything when
-applied since the base directory's parent is never scanned for
-files.</p>
+task dependent base directory (the <var>dir</var> attribute in the
+case of <code>&lt;fileset&gt;</code>).  Only files found below that base
+directory are considered.  So while a pattern
+like <samp>../foo.java</samp> is possible, it will not match
+anything when applied since the base directory's parent is never
+scanned for files.</p>
 
-<p><b>Examples:</b></p>
+<h5>Examples</h5>
 <p>
-<code>*.java</code>&nbsp;&nbsp;matches&nbsp;&nbsp;<code>.java</code>,
-<code>x.java</code> and <code>FooBar.java</code>, but
-not <code>FooBar.xml</code> (does not end with <code>.java</code>).</p>
-<p>
-<code>?.java</code>&nbsp;&nbsp;matches&nbsp;&nbsp;<code>x.java</code>,
-<code>A.java</code>, but not <code>.java</code> or <code>xyz.java</code>
-(both don't have one character before <code>.java</code>).</p>
+<samp>*.java</samp>&nbsp;&nbsp;matches&nbsp;&nbsp;<samp>.java</samp>,
+<samp>x.java</samp> and <samp>FooBar.java</samp>, but
+not <samp>FooBar.xml</samp> (does not end with <samp>.java</samp>).</p>
+
 <p>
-Combinations of <code>*</code>'s and <code>?</code>'s are allowed.</p>
+<samp>?.java</samp>&nbsp;&nbsp;matches&nbsp;&nbsp;<samp>x.java</samp>,
+<samp>A.java</samp>, but not <samp>.java</samp> or <samp>xyz.java</samp>
+(both don't have one character before <samp>.java</samp>).</p>
+
+<p>Combinations of <q>*</q>'s and <q>?</q>'s are allowed.</p>
+
 <p>Matching is done per-directory. This means that first the first directory in
 the pattern is matched against the first directory in the path to match. Then
-the second directory is matched, and so on. For example, when we have the pattern
-<code>/?abc/*/*.java</code>
-and the path <code>/xabc/foobar/test.java</code>,
-the first <code>?abc</code> is matched with <code>xabc</code>,
-then <code>*</code> is matched with <code>foobar</code>,
-and finally <code>*.java</code> is matched with <code>test.java</code>.
+the second directory is matched, and so on. For example, when we have
+the pattern <samp>/?abc/*/*.java</samp>
+and the path <samp>/xabc/foobar/test.java</samp>,
+the first <samp>?abc</samp> is matched with <samp>xabc</samp>,
+then <samp>*</samp> is matched with <samp>foobar</samp>,
+and finally <samp>*.java</samp> is matched with <samp>test.java</samp>.
 They all match, so the path matches the pattern.</p>
+
 <p>To make things a bit more flexible, we add one extra feature, which makes it
 possible to match multiple directory levels. This can be used to match a
 complete directory tree, or a file anywhere in the directory tree.
-To do this, <code>**</code>
-must be used as the name of a directory.
-When <code>**</code> is used as the name of a
-directory in the pattern, it matches zero or more directories.
-For example:
-<code>/test/**</code> matches all files/directories under <code>/test/</code>,
-such as <code>/test/x.java</code>,
-or <code>/test/foo/bar/xyz.html</code>, but not <code>/xyz.xml</code>.</p>
-<p>There is one &quot;shorthand&quot;: if a pattern ends
-with <code>/</code>
-or <code>\</code>, then <code>**</code>
-is appended.
-For example, <code>mypackage/test/</code> is interpreted as if it were
-<code>mypackage/test/**</code>.</p>
-<p><b>Example patterns:</b></p>
-<table border="1" cellpadding="2" cellspacing="0">
+To do this, <q>**</q> must be used as the name of a
+directory. When <samp>**</samp> is used as the name of a directory in
+the pattern, it matches zero or more directories. For
+example: <samp>/test/**</samp> matches all files/directories
+under <samp>/test/</samp>, such as <samp>/test/x.java</samp>,
+or <samp>/test/foo/bar/xyz.html</samp>, but not <samp>/xyz.xml</samp>.</p>
+
+<p>There is one &quot;shorthand&quot;: if a pattern ends with <q>/</q>
+or <q>\</q>, then <q>**</q> is appended. For
+example, <samp>mypackage/test/</samp> is interpreted as if it
+were <samp>mypackage/test/**</samp>.</p>
+
+<h5>Example patterns</h5>
+<table>
   <tr>
-    <td valign="top"><code>**/CVS/*</code></td>
-    <td valign="top">Matches all files in <code>CVS</code>
+    <td>Example</td>
+    <td>Explanation</td>
+  </tr>
+  <tr>
+    <td><samp>**/CVS/*</samp></td>
+    <td>Matches all files in <samp>CVS</samp>
       directories that can be located
-      anywhere in the directory tree.<br>
+      anywhere in the directory tree.<br/>
       Matches:
-      <pre>
-      CVS/Repository
-      org/apache/CVS/Entries
-      org/apache/jakarta/tools/ant/CVS/Entries
-      </pre>
-      But not:
-      <pre>
-      org/apache/CVS/foo/bar/Entries (<code>foo/bar/</code>
-      part does not match)
-      </pre>
+<pre>
+CVS/Repository
+org/apache/CVS/Entries
+org/apache/jakarta/tools/ant/CVS/Entries</pre>
+But not:
+<pre>org/apache/CVS/foo/bar/Entries</pre>
+(<samp>foo/bar/</samp> part does not match)
     </td>
   </tr>
   <tr>
-    <td valign="top"><code>org/apache/jakarta/**</code></td>
-    <td valign="top">Matches all files in the <code>org/apache/jakarta</code>
-      directory tree.<br>
+    <td><samp>org/apache/jakarta/**</samp></td>
+    <td>Matches all files in the <samp>org/apache/jakarta</samp>
+      directory tree.<br/>
       Matches:
-      <pre>
-      org/apache/jakarta/tools/ant/docs/index.html
-      org/apache/jakarta/test.xml
-      </pre>
-      But not:
-      <pre>
-      org/apache/xyz.java
-      </pre>
-      (<code>jakarta/</code> part is missing).</td>
+<pre>
+org/apache/jakarta/tools/ant/docs/index.html
+org/apache/jakarta/test.xml
+</pre>
+But not:
+<pre>org/apache/xyz.java</pre>
+(<code>jakarta/</code> part is missing).</td>
   </tr>
   <tr>
-    <td valign="top"><code>org/apache/**/CVS/*</code></td>
-    <td valign="top">Matches all files in <code>CVS</code> directories
+    <td><samp>org/apache/**/CVS/*</samp></td>
+    <td>Matches all files in <samp>CVS</samp> directories
       that are located anywhere in the directory tree under
-      <code>org/apache</code>.<br>
+      <samp>org/apache</samp>.<br/>
       Matches:
-      <pre>
-      org/apache/CVS/Entries
-      org/apache/jakarta/tools/ant/CVS/Entries
-      </pre>
-      But not:
-      <pre>
-      org/apache/CVS/foo/bar/Entries
-      </pre>
-      (<code>foo/bar/</code> part does not match)</td>
+<pre>
+org/apache/CVS/Entries
+org/apache/jakarta/tools/ant/CVS/Entries</pre>
+But not:
+<pre>org/apache/CVS/foo/bar/Entries</pre>
+(<samp>foo/bar/</samp> part does not match)</td>
   </tr>
   <tr>
-    <td valign="top"><code>**/test/**</code></td>
-    <td valign="top">Matches all files that have a <code>test</code>
-        element in their path, including <code>test</code> as a filename.</td>
+    <td><samp>**/test/**</samp></td>
+    <td>Matches all files that have a <samp>test</samp>
+        element in their path, including <samp>test</samp> as a filename.</td>
   </tr>
 </table>
 <p>When these patterns are used in inclusion and exclusion, you have a powerful
 way to select just the files you want.</p>
 
-<h3><a name="selectors">Selectors</a></h3>
+<h3 id="selectors">Selectors</h3>
 <p>The <a href="Types/fileset.html"><code>&lt;fileset&gt;</code></a>,
-whether implicit or explicit in the
-directory-based task, also acts as an
-<a href="Types/selectors.html#andselect"><code>&lt;and&gt;</code></a>
+whether implicit or explicit in the directory-based task, also acts as
+an <a href="Types/selectors.html#andselect"><code>&lt;and&gt;</code></a>
 selector container. This can be used to create arbitrarily complicated
-selection criteria for the files the task should work with. See the
-<a href="Types/selectors.html">Selector</a> documentation for more
-information.</p>
+selection criteria for the files the task should work with. See
+the <a href="Types/selectors.html">Selector</a> documentation for
+more information.</p>
 
-<h3><a name="tasklist">Standard Tasks/Filesets</a></h3>
+<h3 id="tasklist">Standard Tasks/FileSets</h3>
 <p>Many of the standard tasks in ant take one or more filesets which follow
 the rules given here. This list, a subset of those, is a list of standard ant
 tasks that can act as an implicit fileset:</p>
 <ul>
-      <li><a href="Tasks/checksum.html"><code>&lt;checksum&gt;</code></a></li>
-  <li><a href="Tasks/copydir.html"><code>&lt;copydir&gt;</code></a> (deprecated)</li>
+  <li><a href="Tasks/checksum.html"><code>&lt;checksum&gt;</code></a></li>
+  <li><a href="Tasks/copydir.html"><code>&lt;copydir&gt;</code></a> (<em>deprecated</em>)</li>
   <li><a href="Tasks/delete.html"><code>&lt;delete&gt;</code></a></li>
   <li><a href="Tasks/dependset.html"><code>&lt;dependset&gt;</code></a></li>
   <li><a href="Tasks/fixcrlf.html"><code>&lt;fixcrlf&gt;</code></a></li>
   <li><a href="Tasks/javac.html"><code>&lt;javac&gt;</code></a></li>
   <li><a href="Tasks/replace.html"><code>&lt;replace&gt;</code></a></li>
   <li><a href="Tasks/rmic.html"><code>&lt;rmic&gt;</code></a></li>
-  <li><a href="Tasks/style.html"><code>&lt;style&gt;</code> (aka <code>&lt;xslt&gt;</code>)</a></li>
+  <li><a href="Tasks/style.html"><code>&lt;xslt&gt;</code> (aka <code>&lt;style&gt;</code>)</a></li>
   <li><a href="Tasks/tar.html"><code>&lt;tar&gt;</code></a></li>
   <li><a href="Tasks/zip.html"><code>&lt;zip&gt;</code></a></li>
   <li><a href="Tasks/ejb.html#ddcreator"><code>&lt;ddcreator&gt;</code></a></li>
@@ -221,38 +220,34 @@
   <li><a href="Tasks/cab.html"><code>&lt;cab&gt;</code></a></li>
   <li><a href="Tasks/native2ascii.html"><code>&lt;native2ascii&gt;</code></a></li>
   <li><a href="Tasks/netrexxc.html"><code>&lt;netrexxc&gt;</code></a></li>
-  <li>
-    <a href="Tasks/renameextensions.html"><code>&lt;renameextensions&gt;</code></a>
-  </li>
+  <li><a href="Tasks/renameextensions.html"><code>&lt;renameextensions&gt;</code></a></li>
   <li><a href="Tasks/depend.html"><code>&lt;depend&gt;</code></a></li>
   <li><a href="Tasks/translate.html"><code>&lt;translate&gt;</code></a></li>
   <li><a href="Tasks/image.html"><code>&lt;image&gt;</code></a></li>
-  <li><a href="Tasks/jlink.html"><code>&lt;jlink&gt;</code></a> (deprecated)</li>
-  <li><a href="Tasks/jspc.html"><code>&lt;jspc&gt;</code></a></li>
+  <li><a href="Tasks/jlink.html"><code>&lt;jlink&gt;</code></a> (<em>deprecated</em>)</li>
+  <li><a href="Tasks/jspc.html"><code>&lt;jspc&gt;</code></a> (<em>deprecated</em>)</li>
   <li><a href="Tasks/wljspc.html"><code>&lt;wljspc&gt;</code></a></li>
 </ul>
 
-<h3><a name="examples">Examples</a></h3>
+<h3 id="examples">Examples</h3>
 <pre>
 &lt;copy todir=&quot;${dist}&quot;&gt;
   &lt;fileset dir=&quot;${src}&quot;
            includes=&quot;**/images/*&quot;
-           excludes=&quot;**/*.gif&quot;
-  /&gt;
+           excludes=&quot;**/*.gif&quot;/&gt;
 &lt;/copy&gt;</pre>
-<p>This copies all files in directories called <code>images</code> that are
-located in the directory tree defined by <code>${src}</code> to the
-destination directory defined by <code>${dist}</code>,
-but excludes all <code>*.gif</code> files from the copy.</p>
+<p>This copies all files in directories called <samp>images</samp> that are
+located in the directory tree defined by <samp>${src}</samp> to the
+destination directory defined by <samp>${dist}</samp>,
+but excludes all <samp>*.gif</samp> files from the copy.</p>
 <pre>
 &lt;copy todir=&quot;${dist}&quot;&gt;
   &lt;fileset dir=&quot;${src}&quot;&gt;
     &lt;include name=&quot;**/images/*&quot;/&gt;
     &lt;exclude name=&quot;**/*.gif&quot;/&gt;
   &lt;/fileset&gt;
-&lt;/copy&gt;
-</pre>
-<p> The same as the example above, but expressed using nested elements.</p>
+&lt;/copy&gt;</pre>
+<p>The same as the example above, but expressed using nested elements.</p>
 
 <pre>
 &lt;delete dir=&quot;${dist}&quot;&gt;
@@ -263,52 +258,46 @@
 <p>Deleting the original set of files, the <code>delete</code> task can act
 as an implicit fileset.</p>
 
-<h3><a name="defaultexcludes">Default Excludes</a></h3>
+<h3 id="defaultexcludes">Default Excludes</h3>
 <p>There are a set of definitions that are excluded by default from all
-directory-based tasks. As of Ant 1.8.1 they are:</p>
+directory-based tasks. <em>Since Ant 1.8.1</em> they are:</p>
 <pre>
-     **/*~
-     **/#*#
-     **/.#*
-     **/%*%
-     **/._*
-     **/CVS
-     **/CVS/**
-     **/.cvsignore
-     **/SCCS
-     **/SCCS/**
-     **/vssver.scc
-     **/.svn
-     **/.svn/**
-     **/.DS_Store
-</pre>
-<p>Ant 1.8.2 adds the following default excludes:</p>
+**/*~
+**/#*#
+**/.#*
+**/%*%
+**/._*
+**/CVS
+**/CVS/**
+**/.cvsignore
+**/SCCS
+**/SCCS/**
+**/vssver.scc
+**/.svn
+**/.svn/**
+**/.DS_Store</pre>
+<p><em>Since Ant 1.8.2</em>, additional default excludes are:</p>
 <pre>
-     **/.git
-     **/.git/**
-     **/.gitattributes
-     **/.gitignore
-     **/.gitmodules
-     **/.hg
-     **/.hg/**
-     **/.hgignore
-     **/.hgsub
-     **/.hgsubstate
-     **/.hgtags
-     **/.bzr
-     **/.bzr/**
-     **/.bzrignore
-</pre>
+**/.git
+**/.git/**
+**/.gitattributes
+**/.gitignore
+**/.gitmodules
+**/.hg
+**/.hg/**
+**/.hgignore
+**/.hgsub
+**/.hgsubstate
+**/.hgtags
+**/.bzr
+**/.bzr/**
+**/.bzrignore</pre>
 <p>If you do not want these default excludes applied, you may disable
-them with the <code>defaultexcludes=&quot;no&quot;</code>
-attribute.</p>
+them with the <var>defaultexcludes</var>=<q>no</q> attribute.</p>
 
 <p>This is the default list; note that you can modify the list of
-default excludes by using the <a
-href="Tasks/defaultexcludes.html">defaultexcludes</a> task.</p>
-
-
+default excludes by using
+the <a href="Tasks/defaultexcludes.html">defaultexcludes</a> task.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/feedback.html ant-1.10.3/manual/feedback.html
--- ant-1.9.10/manual/feedback.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/feedback.html	2018-03-24 12:37:12.000000000 +0000
@@ -19,54 +19,50 @@
 <head>
 <meta http-equiv="Content-Language" content="en-us">
 <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
-<title>Apache Ant User Manual - Feedback</title>
+<title>Apache Ant User Manual&mdash;Feedback</title>
 </head>
 
 <body>
 
-<h1><a name="feedback">Feedback</a> and Troubleshooting</h1>
-<p>If things do not work, especially simple things like <tt>ant -version</tt>, 
-  then something is wrong with your configuration. Before filing bug reports and 
-  emailing all the Apache Ant mailing lists</p>
+<h1 id="feedback">Feedback and Troubleshooting</h1>
+<p>If things do not work, especially simple things like <kbd>ant -version</kbd>, then something is
+  wrong with your configuration. Before filing bug reports and emailing all the Apache Ant mailing
+  lists</p>
 <ol>
-  <li>Check your environment variables. Are ANT_HOME and JAVA_HOME correct? If 
-    they have quotes or trailing slashes, remove them.</li>
-  <li>Unset CLASSPATH; if that is wrong things go horribly wrong. Ant does not 
-    need the CLASSPATH variable defined to anything to work.</li>
-  <li>Make sure there are no versions of crimson.jar or other XML parsers in JRE/ext</li>
-  <li>Is your path correct? is Ant on it? What about JDK/bin? have you tested 
-    this? If you are using Jikes, is it on the path? A createProcess error (especially 
-    with ID=2 on windows) usually means executable not found on the path.</li>
-  <li>Which version of ant are you running? Other applications distribute a copy 
-    -it may be being picked up by accident.</li>
-  <li>If a task is failing to run is optional.jar in ANT_HOME/lib? Are there any 
-    libraries which it depends on missing?</li>
-  <li>If a task doesn't do what you expect, run <tt>ant -verbose</tt> or <tt>ant 
-    -debug</tt> to see what is happening</li>
+  <li>Check your environment variables. Are <code>ANT_HOME</code> and <code>JAVA_HOME</code>
+    correct? If they have quotes or trailing slashes, remove them.</li>
+  <li>Unset <code>CLASSPATH</code>; if that is wrong things go horribly wrong. Ant does not need
+    the <code>CLASSPATH</code> variable defined to anything to work.</li>
+  <li>Make sure there are no versions of <samp>crimson.jar</samp> or other XML parsers
+    in <samp>JAVA_HOME/jre/lib/ext</samp></li>
+  <li>Is your path correct? is Ant on it? What about <samp>JAVA_HOME/bin</samp>? have you tested
+    this? If you are using Jikes, is it on the path? A CreateProcess error (especially
+    with <code>error=2</code>) on Windows usually means executable not found on the path.</li>
+  <li>Which version of ant are you running? Other applications distribute a copy&mdash;it may be
+    being picked up by accident.</li>
+  <li>If a task failing to run is from <samp>optional.jar</samp> in <samp>ANT_HOME/lib</samp>? Are
+    there any libraries which it depends on missing?</li>
+  <li>If a task doesn't do what you expect, run <kbd>ant -verbose</kbd> or <kbd>ant -debug</kbd>
+    to see what is happening</li>
 </ol>
-<p>If you can't fix your problem, start with the <a href="http://ant.apache.org/mail.html" target="_top">Ant 
-  User Mailing List</a> . These are other ant users who will help you learn to 
-  use ant. If they cannot fix it then someone may suggest filing a bug report, 
-  which will escalate the issue. Remember of course, that support, like all open 
-  source development tasks, is voluntary. If you haven't invested time in helping 
-  yourself by following the steps above, it is unlikely that anyone will invest 
-  the time in helping you. </p>
-<p>Also, if you don't understand something, the <a href="http://ant.apache.org/mail.html" target="_top">Ant 
-  User Mailing List</a> is the place to ask questions. Not the developer list, 
-  nor the individuals whose names appears in the source and documentation. If 
-  they answered all such emails, nobody would have any time to improve ant. </p>
-<p>To provide feedback on this software, please subscribe to the <a href="http://ant.apache.org/mail.html" target="_top">Ant 
-  User Mailing List</a> </p>
-
-<p>If you want to contribute to Ant or stay current with the latest
-development, join the
-<a href="http://ant.apache.org/mail.html" target="_top">Ant Development Mailing List</a>
-</p>
-<p>A searchable archive can be found at <a
-href="http://marc.theaimsgroup.com" target="_top">http://marc.theaimsgroup.com</a>.
-Other archives will be documented online at  <a href="http://ant.apache.org/mail.html#Archives" target="_top">Mailing Lists Archives</a> </p>
-
+<p>If you can't fix your problem, start with the <a href="https://ant.apache.org/mail.html"
+  target="_top">Ant User Mailing List</a>. These are other ant users who will help you learn to use
+  ant. If they cannot fix it then someone may suggest filing a bug report, which will escalate the
+  issue. Remember of course, that support, like all open source development tasks, is voluntary. If
+  you haven't invested time in helping yourself by following the steps above, it is unlikely that
+  anyone will invest the time in helping you.</p>
+<p>Also, if you don't understand something, the <a href="https://ant.apache.org/mail.html"
+  target="_top">Ant User Mailing List</a> is the place to ask questions. Not the developer list, nor
+  the individuals whose names appears in the source and documentation. If they answered all such
+  emails, nobody would have any time to improve Ant.</p>
+<p>To provide feedback on this software, please subscribe to
+  the <a href="https://ant.apache.org/mail.html" target="_top">Ant User Mailing List</a></p>
+<p>If you want to contribute to Ant or stay current with the latest development, join
+  the <a href="https://ant.apache.org/mail.html" target="_top">Ant Development Mailing List</a></p>
+<p>A searchable archive can be found at <a href="https://marc.info"
+  target="_top">https://marc.info</a>. Other archives will be documented online
+  at <a href="https://ant.apache.org/mail.html#Archives" target="_top">Mailing Lists
+  Archives</a></p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/ide.html ant-1.10.3/manual/ide.html
--- ant-1.9.10/manual/ide.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/ide.html	2018-03-24 12:37:12.000000000 +0000
@@ -34,72 +34,42 @@
 
 <ul>
   <li>
-    <a href="http://antrunner.sourceforge.net/">
-      AntRunner For JBuilder (unbundled)
-    </a>
+    <a href="Integration/jext-plugin.html">AntWork Plugin for the Jext Java Text Editor
+    (unbundled)</a>
   </li>
   <li>
-    <a href="Integration/jext-plugin.html">
-      AntWork Plugin for the Jext Java Text Editor (unbundled)
-    </a>
+    <a href="http://jdee.sourceforge.net/" target="_top">JDEE (Java Development Environment for
+    Emacs)</a> has built-in text Ant integration: selection of target through text field, execution,
+    hyperlink to compilation errors. Installation: built-in JDEE 2.2.8 or later. Configuration:
+    through customize menu "Jde Build Function"
   </li>
   <li>
-    <a href="http://jdee.sunsite.dk/">
-      JDEE (Java Development Environment for Emacs)
-    </a> has built-in text ANT integration: selection of target through text
-    field, execution, hyperlink to compilation errors. Installation: built-in
-    JDEE 2.2.8 or later. Configuration: through customize menu
-    "Jde Build Function"
+    <a href="https://www.jetbrains.com/idea/" target="_top">IDEA</a> has built-in GUI ANT
+    integration: GUI selection of targets, execution, hyperlink to compilation errors
   </li>
   <li>
-    <a href="http://www.intellij.com/idea/">
-      IDEA
-    </a> has built-in GUI ANT integration: GUI selection of targets, execution,
-    hyperlink to compilation errors
+    <a href="http://ant.netbeans.org/" target="_top">NetBeans</a> IDE uses Ant as the basis for its
+    project system starting with the 4.0 release
   </li>
   <li>
-    <a href="http://ant.netbeans.org/">
-      NetBeans
-    </a>
-    NetBeans IDE uses Ant as the basis for its project system starting with the 4.0 release.
+    <a href="http://jedit.org/" target="_top">jEdit</a> is an open source Java IDE with some great
+    plugins for Java dev, a good XML editor and the Antfarm plugin to execute targets in a build
+    file
   </li>
   <li>
-    <a href="http://jedit.org/">
-      jEdit
-    </a>
-    jEdit is an open source java IDE with some great plugins for Java dev, a
-    good XML editor and the Antfarm plugin to execute targets in a build
-    file.
+    <a href="https://eclipse.org/" target="_top">Eclipse</a> is IBM's counterpoint to NetBeans; an
+    open source IDE with Java and Ant support
   </li>
   <li>
-    <a href="http://eclipse.org/">
-      Eclipse
-    </a>
-    Eclipse is IBM's counterpoint to NetBeans; an open source IDE with
-    Java and Ant support.
+    <a href="http://www.placidsystems.com/virtualant/" target="_top">Virtual Ant</a> GUI allows you
+    to work on a Virtual File System without dealing with the XML; plugs into Eclipse, Netbeans
+    &amp; IntelliJ
   </li>
   <li>
-    <a href="http://www.placidsystems.com/virtualant/">
-      Virtual Ant</a> GUI allows you to work on a Virtual File System without dealing with the XML. Plugs into Eclipse, Netbeans &amp; Intellij.
-  </li>
-  <li>
-    <a href="http://www7b.software.ibm.com/wsdd/library/techarticles/0203_searle/searle1.html">
-      WebSphere Studio Application Developer
-    </a>
-  </li>
-  <li>
-    <a href="http://www.borland.com/jbuilder/pdf/jb9_feamatrix.pdf">
-      JBuilder 9 Personal
-    </a>
-    JBuilder supports Ant with the following features. Add Ant nodes to
-    projects and execute Ant targets from within JBuilder. Add custom Ant-based
-    build tasks with custom Ant libraries to run Ant from within JBuilder.
-    Rapid navigation from Ant build error messages to source files.
-    Customize build menu and toolbar with custom build targets.
+    <a href="https://www.ibm.com/developerworks/offers/wsad2.html" target="_top">WebSphere Studio
+    Application Developer</a>
   </li>
 </ul>
 
-
-
 </body>
 </html>
diff -Nru ant-1.9.10/manual/ifunless.html ant-1.10.3/manual/ifunless.html
--- ant-1.9.10/manual/ifunless.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/ifunless.html	2018-03-24 12:37:12.000000000 +0000
@@ -23,30 +23,25 @@
 </head>
 
 <body>
-  <h1><a name="if_and_unless">If And Unless</a></h1>
+  <h1 id="if_and_unless">If And Unless</h1>
 
-  <p>Since Ant 1.9.1 it is possible to add if and unless attributes on all tasks and nested elements using special namespaces.</p>
+  <p><em>Since Ant 1.9.1</em>, it is possible to add <var>if</var> and <var>unless</var> attributes on all tasks and nested elements using special namespaces.</p>
 
   <p>In order to use this feature you need to add the following namespace declarations</p>
-  <blockquote><pre>
-    xmlns:if=&quot;ant:if&quot;
-    xmlns:unless=&quot;ant:unless&quot;
-    </pre>
-  </blockquote>
-
-  <p>The if and unless namespaces support the following 3 conditions :
-  <ul>
-    <li>true</li>true if the value of the attribute evaluates to true
-    <li>blank</li>true if the value of the attribute is null or empty
-    <li>set</li>true if the specified property is set
-  </ul></p>
-
-<blockquote>
-<pre>
+  <pre>
+xmlns:if=&quot;ant:if&quot;
+xmlns:unless=&quot;ant:unless&quot;</pre>
+
+  <p>The <code>if</code> and <code>unless</code> namespaces support the following 3 conditions:</p>
+  <dl>
+      <dt><q>true</q></dt><dd>true if the value of the attribute evaluates to true</dd>
+      <dt><q>blank</q></dt><dd>true if the value of the attribute is null or empty</dd>
+      <dt><q>set</q></dt><dd>true if the specified property is set</dd>
+  </dl>
+  <pre>
 &lt;project name=&quot;tryit&quot;
  xmlns:if=&quot;ant:if&quot;
- xmlns:unless=&quot;ant:unless&quot;
-&gt;
+ xmlns:unless=&quot;ant:unless&quot;&gt;
  &lt;exec executable=&quot;java&quot;&gt;
    &lt;arg line=&quot;-X&quot; if:true=&quot;${showextendedparams}&quot;/&gt;
    &lt;arg line=&quot;-version&quot; unless:true=&quot;${showextendedparams}&quot;/&gt;
@@ -56,9 +51,7 @@
  &lt;/condition&gt;
  &lt;echo if:set=&quot;onmac&quot;&gt;running on MacOS&lt;/echo&gt;
  &lt;echo unless:set=&quot;onmac&quot;&gt;not running on MacOS&lt;/echo&gt;
-&lt;/project&gt;
-</pre>
-</blockquote>
+&lt;/project&gt;</pre>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/index.html ant-1.10.3/manual/index.html
--- ant-1.9.10/manual/index.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/index.html	2018-03-24 12:37:12.000000000 +0000
@@ -27,7 +27,7 @@
 <frame src="cover.html" name="mainFrame">
 </frameset>
 <noframes>
-<H2>Apache Ant&trade; User Manual</H2>
+<h2>Apache Ant&trade; User Manual</h2>
 
 <a href="toc.html">Apache Ant User Manual</a></noframes>
 
diff -Nru ant-1.9.10/manual/inputhandler.html ant-1.10.3/manual/inputhandler.html
--- ant-1.9.10/manual/inputhandler.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/inputhandler.html	2018-03-24 12:37:12.000000000 +0000
@@ -14,7 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <meta http-equiv="Content-Language" content="en-us">
@@ -27,90 +26,77 @@
 
 <h2>Overview</h2>
 
-<p>When a task wants to prompt a user for input, it doesn't simply
-read the input from the console as this would make it impossible to
-embed Apache Ant in an IDE.  Instead it asks an implementation of the
-<code>org.apache.tools.ant.input.InputHandler</code> interface to
-prompt the user and hand the user input back to the task.</p>
-
-<p>To do this, the task creates an <code>InputRequest</code> object
-and passes it to the <code>InputHandler</code> Such an
-<code>InputRequest</code> may know whether a given user input is valid
-and the <code>InputHandler</code> is supposed to reject all invalid
-input.</p>
-
-<p>Exactly one <code>InputHandler</code> instance is associated with
-every Ant process, users can specify the implementation using the
-<code>-inputhandler</code> command line switch.</p>
+<p>When a task wants to prompt a user for input, it doesn't simply read the input from the console
+as this would make it impossible to embed Apache Ant in an IDE.  Instead it asks an implementation
+of the <code class="code">org.apache.tools.ant.input.InputHandler</code> interface to prompt the
+user and hand the user input back to the task.</p>
+
+<p>To do this, the task creates an <code class="code">InputRequest</code> object and passes it to
+the <code class="code">InputHandler</code>. Such an <code class="code">InputRequest</code> may know
+whether a given user input is valid and the <code class="code">InputHandler</code> is supposed to
+reject all invalid input.</p>
+
+<p>Exactly one <code class="code">InputHandler</code> instance is associated with every Ant process,
+users can specify the implementation using the <kbd>-inputhandler</kbd> command line switch.</p>
 
 <h2>InputHandler</h2>
 
-<p>The <code>InputHandler</code> interface contains exactly one
-method</p>
+<p>The <code class="code">InputHandler</code> interface contains exactly one method</p>
 
 <pre>
-    void handleInput(InputRequest request) 
-        throws org.apache.tools.ant.BuildException;
-</pre>
-
-<p>with some pre- and postconditions.  The main postcondition is that
-this method must not return unless the <code>request</code> considers
-the user input valid, it is allowed to throw an exception in this
-situation.</p>
+void handleInput(InputRequest request)
+    throws org.apache.tools.ant.BuildException;</pre>
+
+<p>with some pre- and postconditions.  The main postcondition is that this method must not return
+unless the <code>request</code> considers the user input valid; it is allowed to throw an exception
+in this situation.</p>
 
 <p>Ant comes with three built-in implementations of this interface:</p>
 
-<h3><a name="defaulthandler">DefaultInputHandler</a></h3>
+<h3 id="defaulthandler">DefaultInputHandler</h3>
 
-<p>This is the implementation you get, when you don't use the
-<code>-inputhandler</code> command line switch at all.  This
-implementation will print the prompt encapsulated in the
-<code>request</code> object to Ant's logging system and re-prompt for
-input until the user enters something that is considered valid input
-by the <code>request</code> object.  Input will be read from the
-console and the user will need to press the Return key.</p>
+<p>This is the implementation you get, when you don't use the <kbd>-inputhandler</kbd> command line
+switch at all.  This implementation will print the prompt encapsulated in the <code>request</code>
+object to Ant's logging system and re-prompt for input until the user enters something that is
+considered valid input by the <code>request</code> object.  Input will be read from the console and
+the user will need to press the Return key.</p>
 
 <h3>PropertyFileInputHandler</h3>
 
-<p>This implementation is useful if you want to run unattended build
-processes.  It reads all input from a properties file and makes the
-build fail if it cannot find valid input in this file.  The name of
-the properties file must be specified in the Java system property
-<code>ant.input.properties</code>.</p>
-
-<p>The prompt encapsulated in a <code>request</code> will be used as
-the key when looking up the input inside the properties file.  If no
-input can be found, the input is considered invalid and an exception
-will be thrown.</p>
-
-<p><strong>Note</strong> that <code>ant.input.properties</code> must
-be a Java system property, not an Ant property.  I.e. you cannot
-define it as a simple parameter to <code>ant</code>, but you can
+<p>This implementation is useful if you want to run unattended build processes.  It reads all input
+from a properties file and makes the build fail if it cannot find valid input in this file.  The
+name of the properties file must be specified in the Java system
+property <code>ant.input.properties</code>.</p>
+
+<p>The prompt encapsulated in a <code>request</code> will be used as the key when looking up the
+input inside the properties file.  If no input can be found, the input is considered invalid and an
+exception will be thrown.</p>
+
+<p><strong>Note</strong> that <code>ant.input.properties</code> must be a Java system property, not
+an Ant property.  I.e. you cannot define it as a simple parameter to <kbd>ant</kbd>, but you can
 define it inside the <code>ANT_OPTS</code> environment variable.</p>
 
 <h3>GreedyInputHandler</h3>
-
-<p>Like the default implementation, this InputHandler reads from standard
-input. However, it consumes <i>all</i> available input. This behavior is
-useful for sending Ant input via an OS pipe. <b>Since Ant 1.7</b>.</p>
+<p><em>Since Ant 1.7</em></p>
+<p>Like the default implementation, this InputHandler reads from standard input. However, it
+consumes <em>all</em> available input. This behavior is useful for sending Ant input via an OS
+pipe.</p>
 
 <h3>SecureInputHandler</h3>
-
-<p>This InputHandler calls <code>System.console().readPassword()</code>,
-available since Java 1.6.  On earlier platforms it falls back to the
-behavior of DefaultInputHandler. <b>Since Ant 1.7.1</b>.</p>
+<p><em>Since Ant 1.7.1</em></p>
+<p>This InputHandler calls <code class="code">System.console().readPassword()</code>, available
+since Java 6.  On earlier platforms it falls back to the behavior
+of <code class="code">DefaultInputHandler</code>.</p>
 
 <h2>InputRequest</h2>
 
-<p>Instances of <code>org.apache.tools.ant.input.InputRequest</code>
-encapsulate the information necessary to ask a user for input and
-validate this input.</p>
-
-<p>The instances of <code>InputRequest</code> itself will accept any
-input, but subclasses may use stricter validations.
-<code>org.apache.tools.ant.input.MultipleChoiceInputRequest</code>
-should be used if the user input must be part of a predefined set of
-choices.</p>
+<p>Instances of <code class="code">org.apache.tools.ant.input.InputRequest</code> encapsulate the
+information necessary to ask a user for input and validate this input.</p>
 
+<p>The instances of <code class="code">InputRequest</code> itself will accept any input, but
+subclasses may use stricter
+validations. <code class="code">org.apache.tools.ant.input.MultipleChoiceInputRequest</code> should
+be used if the user input must be part of a predefined set of choices.</p>
 
+</body>
 </html>
diff -Nru ant-1.9.10/manual/install.html ant-1.10.3/manual/install.html
--- ant-1.9.10/manual/install.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/install.html	2018-03-24 12:37:12.000000000 +0000
@@ -31,18 +31,18 @@
 To get up and running with the binary distribution of Ant quickly, follow these steps:
 </p>
 <ol>
-<li>Make sure you have a Java environment installed, See <a href="#sysrequirements">System Requirements</a> for
+<li>Make sure you have a Java environment installed. See <a href="#sysrequirements">System Requirements</a> for
 details.</li>
 <li>Download Ant. See <a href="#getBinary">Binary Distribution</a> for details.</li>
 <li>Uncompress the downloaded file into a directory.</li>
-<li>Set environmental variables <code>JAVA_HOME</code> to your Java environment, <code>ANT_HOME</code> to the directory
-you uncompressed Ant to, and add <code>${ANT_HOME}/bin</code> (Unix) or <code>%ANT_HOME%/bin</code> (Windows) to
+<li>Set environmental variables: <code>JAVA_HOME</code> to your Java environment, <code>ANT_HOME</code> to the directory
+you uncompressed Ant to, and add <samp>${ANT_HOME}/bin</samp> (Unix) or <samp>%ANT_HOME%/bin</samp> (Windows) to
 your <code>PATH</code>. See <a href="#setup">Setup</a> for details.</li>
-<li>Optionally, from the <code>ANT_HOME</code> directory run <code>ant -f fetch.xml -Ddest=system</code> to get the
+<li>Optionally, from the <code>ANT_HOME</code> directory run <kbd>ant -f fetch.xml -Ddest=system</kbd> to get the
 library dependencies of most of the Ant tasks that require them. If you don't do this, many of the dependent Ant tasks
 will not be available. See <a href="#optionalTasks">Optional Tasks</a> for details and other options for
-the <code>-Ddest</code> parameter.</li>
-<li>Optionally, add any desired Antlibs. See <a href="http://ant.apache.org/antlibs/proper.html" target="_top">Ant
+the <kbd>-Ddest</kbd> parameter.</li>
+<li>Optionally, add any desired Antlibs. See <a href="https://ant.apache.org/antlibs/proper.html" target="_top">Ant
 Libraries</a> for a list.</li>
 </ol>
 <p>
@@ -63,17 +63,17 @@
 <h3 id="getBinary">Binary Distribution</h3>
 
 <p>
-The latest stable version of Ant is available from the Ant web page <a href="http://ant.apache.org/"
-target="_top">http://ant.apache.org/</a>
+The latest stable version of Ant is available from the Ant web page <a href="https://ant.apache.org/"
+target="_top">https://ant.apache.org/</a>
 </p>
 <p>
 The binary distribution of Ant is available as 3 different archives
 </p>
 <ol>
-<li><b>.zip</b> - Recommended compression format for Windows, can also be used on other platforms. Supported by many
-programs and some operating systems natively.</li>
-<li><b>.tar.gz</b> - Using the tar program to gather files together, and gzip to compress and uncompress.</li>
-<li><b>.tar.bz2</b> - Using the tar program to gather files together, and bzip2 to compress and uncompress.</li>
+<li><samp>.zip</samp>&mdash;Recommended compression format for Windows, can also be used on other platforms. Supported
+by many programs and some operating systems natively.</li>
+<li><samp>.tar.gz</samp>&mdash;Using the tar program to gather files together, and gzip to compress and uncompress.</li>
+<li><samp>.tar.bz2</samp>&mdash;Using the tar program to gather files together, and bzip2 to compress and uncompress.</li>
 </ol>
 <p>
 Choose the format that is best supported for your platform.
@@ -97,27 +97,29 @@
 eliminate inconsistencies between command-line and IDE Ant.
 </p>
 
-<h3>Bundled in Java applications</h3>
+<h3>Bundled in Java Applications</h3>
 
 <p>
 Many Java applications, most particularly application servers, ship with a version of Ant. These are primarily for
 internal use by the application, using the Java APIs to delegate tasks such as JSP page compilation to the Ant
 runtime. Such distributions are usually unsupported by everyone. Particularly troublesome are those products that not
-only ship with their own Ant release, they add their own version of ANT.BAT or ant.sh to the <code>PATH</code>. If Ant
-starts behaving weirdly after installing something, try the <a href="#diagnostics">diagnostics</a> advice.
+only ship with their own Ant release, they add their own version of <samp>ANT.BAT</samp> or <samp>ant.sh</samp> to
+the <code>PATH</code>. If Ant starts behaving weirdly after installing something, try
+the <a href="#diagnostics">diagnostics</a> advice.
 </p>
 
 <h3 id="sourceEdition">Source Distribution</h3>
 
 <p>
-If you prefer the source distribution, you can download the source for the latest Ant release from
-<a href="http://ant.apache.org/srcdownload.cgi" target="_top">http://ant.apache.org/srcdownload.cgi</a>.
+If you prefer the source distribution, you can download the source for the latest Ant release
+from <a href="https://ant.apache.org/srcdownload.cgi" target="_top">https://ant.apache.org/srcdownload.cgi</a>.
 </p>
 <p>
 If you prefer the leading-edge code, you can access the code as it is being developed via Git. The Ant website has
-details on <a href="http://ant.apache.org/git.html" target="_top">accessing Git</a>. All bug fixes will go in against
-the HEAD of the source tree, and the first response to many bugreps will be "have you tried the latest version". Don't
-be afraid to download and build a prerelease distribution, as everything other than new features are usually stable.
+details on <a href="https://ant.apache.org/git.html" target="_top">accessing Git</a>. All bug fixes will go in against
+the HEAD of the source tree, and the first response to many bug reports will be "have you tried the latest
+version". Don't be afraid to download and build a prerelease distribution, as everything other than new features are
+usually stable.
 </p>
 <p>
 See the section <a href="#buildingant">Building Ant</a> on how to build Ant from the source code. You can also access
@@ -127,8 +129,8 @@
 <h3 id="archives">Archive Download Area Layout</h3>
 
 <p>
-Older versions of Ant are available in the archives at <a href="http://archive.apache.org/dist/ant/"
-target="_top">http://archive.apache.org/dist/ant/</a>. The files are organized as follows.
+Older versions of Ant are available in the archives at <a href="https://archive.apache.org/dist/ant/"
+target="_top">https://archive.apache.org/dist/ant/</a>. The files are organized as follows.
 </p>
 <table>
 <tr>
@@ -136,83 +138,82 @@
   <th>Description</th>
 </tr>
 <tr>
-  <td>KEYS</td>
+  <td><samp>KEYS</samp></td>
   <td>PGP keyfile. It contains the PGP keys of Ant developers so you can 'trust' the distribution.</td>
 </tr>
 <tr>
-  <td>RELEASE-NOTES-{version}.html</td>
+  <td><samp>RELEASE-NOTES-{version}.html</samp></td>
   <td>
     Release notes of the given version in HTML format. When upgrading your Ant installation you
-    should have a look at the <i>Changes that could break older environments</i> section.
+    should have a look at the <em>Changes that could break older environments</em> section.
   </td>
 </tr>
 <tr>
-  <td>ant-current-bin.zip</td>
+  <td><samp>ant-current-bin.zip</samp></td>
   <td>
-    ZIP archive containing the compiled version of Ant in the last released version. It is recommended that
-    you do not download the latest version this way, as the standard way of downloading described above will
-    redirect you to a mirror closer to you, thus making the download faster for you and reducing the load
-    on Apache servers.
+    ZIP archive containing the compiled version of Ant in the last released version. It is recommended that you do not
+    download the latest version this way, as the standard way of downloading described above will redirect you to a
+    mirror closer to you, thus making the download faster for you and reducing the load on Apache servers.
   </td>
 </tr>
 <tr>
-  <td>ant-current-src.zip</td>
+  <td><samp>ant-current-src.zip</samp></td>
   <td>
-    ZIP archive containing the sources of Ant. If you have this you can compile Ant. If you do not have the
-    <i>required</i> dependencies, the classes depending on them are just not built. Again, it is preferred to use the
-    standard way of getting the source package described above to make your download quicker and to reduce the load on
-    Apache servers.
+    ZIP archive containing the sources of Ant. If you have this you can compile Ant. If you do not have
+    the <em>required</em> dependencies, the classes depending on them are just not built. Again, it is preferred to use
+    the standard way of getting the source package described above to make your download quicker and to reduce the load
+    on Apache servers.
   </td>
 </tr>
 <tr>
-  <td>ant-current-*.asc</td>
+  <td><samp>ant-current-*.asc</samp></td>
   <td>
-    Security file for checking the correctness of the zip file. This one is the
-    <a href="http://en.wikipedia.org/wiki/Pretty_Good_Privacy" target="_blank">PGP</a> signature.
+    Security file for checking the correctness of the zip file. This one is
+    the <a href="https://en.wikipedia.org/wiki/Pretty_Good_Privacy" target="_top">PGP</a> signature.
   </td>
 </tr>
 <tr>
-  <td>ant-current-*.md5</td>
+  <td><samp>ant-current-*.md5</samp></td>
   <td>
-    Security file for checking the correctness of the zip file. This one is the
-    <a href="http://en.wikipedia.org/wiki/Md5" target="_blank">MD5</a> checksum.
+    Security file for checking the correctness of the zip file. This one is
+    the <a href="https://en.wikipedia.org/wiki/Md5" target="_top">MD5</a> checksum.
   </td>
 </tr>
 <tr>
-  <td>ant-current-*.sha1</td>
+  <td><samp>ant-current-*.sha1</samp></td>
   <td>
-    Security file for checking the correctness of the zip file. This one is the
-    <a href="http://en.wikipedia.org/wiki/SHA-1" target="_blank">SHA1</a> checksum.
+    Security file for checking the correctness of the zip file. This one is
+    the <a href="https://en.wikipedia.org/wiki/SHA-1" target="_top">SHA1</a> checksum.
   </td>
 </tr>
 <tr>
-  <td>antlibs/</td>
+  <td><samp>antlibs/</samp></td>
   <td>
     This directory holds the Antlibs that are made of available by the Apache Ant project. Antlibs are bundles of Ant
     tasks that are not delivered as part of the Ant core but are available as optional downloads.
   </td>
 </tr>
 <tr>
-  <td>binaries/</td>
+  <td><samp>binaries/</samp></td>
   <td>
     The binaries directory holds specific Ant releases bundled in both ZIP and tar.gz archive formats. The named
-    releases are in contrast to the ant-current-bin.zip file in the parent directory, which is always guaranteed to be
-    the most current release of Ant.
+    releases are in contrast to the <samp>ant-current-bin.zip</samp> file in the parent directory, which is always
+    guaranteed to be the most current release of Ant.
   </td>
 </tr>
 <tr>
-  <td>common/</td>
+  <td><samp>common/</samp></td>
   <td>
     The common directory holds various files, such as the Apache License file that Ant is licensed under, that people
     may wish to examine without having to download the whole Ant distribution.
   </td>
 </tr>
 <tr>
-  <td>source/</td>
+  <td><samp>source/</samp></td>
   <td>
     The source directory holds the source code for specific Ant releases bundled in both ZIP and tar.gz archive
-    formats. The named releases are in contrast to the ant-current-src.zip file in the parent directory, which is always
-    guaranteed to hold the source code for the most current release of Ant.
+    formats. The named releases are in contrast to the <samp>ant-current-src.zip</samp> file in the parent directory,
+    which is always guaranteed to hold the source code for the most current release of Ant.
   </td>
 </tr>
 </table>
@@ -221,26 +222,26 @@
 <h2 id="sysrequirements">System Requirements</h2>
 <p>
 Ant has been used successfully on many platforms, including Linux, commercial flavours of Unix such as Solaris and
-HP-UX, macOS, Windows NT descendants, OS/2 Warp, Novell Netware 6, OpenVMS. The platforms used most for development
-are, in no particular order, Linux, macOS, Microsoft Windows and Unix; these are therefore that platforms that tend to
-work best. As of Ant 1.7, Windows 9x is no longer supported.
+HP-UX, macOS, Windows NT descendants, OS/2 Warp, Novell Netware 6, OpenVMS. The platforms used most for development are,
+in no particular order, Linux, macOS, Microsoft Windows and Unix; these are therefore that platforms that tend to work
+best. <em>Since Ant 1.7</em>, Windows 9x is no longer supported.
 </p>
 <p>
-For the current version of Ant (1.9), you will also need a JDK installed on your system, version 1.5 or later required.
+For the current version of Ant (1.10), you will also need a JDK installed on your system, version 8 or later required.
 The more up-to-date the version of Java, the more Ant tasks you get.
 </p>
 <p>
-<strong>Note:</strong> If a JDK is not present, only the runtime (JRE), then many tasks will not work.
+<strong>Note</strong>: If a JDK is not present, only the runtime (JRE), then many tasks will not work.
 </p>
 <p>
-  <strong>Note:</strong>
-    Ant 1.8.* works with JDK 1.4 and higher, Ant 1.7.* works with JDK 1.3 and higher,
+  <strong>Note</strong>:
+    Ant 1.9.* works with JDK 1.5 and higher, Ant 1.8.* works with JDK 1.4 and higher, Ant 1.7.* works with JDK 1.3 and higher,
     Ant 1.6.* works with JDK 1.2 and higher, Ant 1.2 to Ant 1.5.* work with JDK 1.1 and higher.
 </p>
 
 <h3>Open Source Java Runtimes</h3>
 <p>
-The Ant team strongly supports users running Ant on <a target="_blank" href="http://openjdk.java.net/">OpenJDK</a> and
+The Ant team strongly supports users running Ant on <a href="http://openjdk.java.net/" target="_top">OpenJDK</a> and
 other open source Java runtimes, and so strives to have a product that works well on those platforms.
 </p>
 
@@ -256,63 +257,42 @@
    |
    +--- lib  // contains Ant JARs plus necessary dependencies
    |
-   +--- docs // contains documentation
-   |      |
-   |      +--- images  // various logos for html documentation
-   |      |
-   |      +--- manual  // Ant documentation (a must read ;-)
+   +--- manual  // Ant documentation (a must read ;-)
    |
    +--- etc // contains xsl goodies to:
             //   - create an enhanced report from xml output of various tasks.
             //   - migrate your build files and get rid of 'deprecated' warning
-            //   - ... and more ;-)
-</pre>
+            //   - ... and more ;-)</pre>
 <p>
-Only the <code>bin</code> and <code>lib</code> directories are required to run Ant.
+Only the <samp>bin</samp> and <samp>lib</samp> directories are required to run Ant.
 </p>
 <p>
-To install Ant, choose a directory and copy the distribution files there. This directory will be known as
-<code>ANT_HOME</code>.
+To install Ant, choose a directory and copy the distribution files there. This directory will be known
+as <code>ANT_HOME</code>.
 </p>
 
-<table width="80%">
-<tr>
-  <td colspan="2">
-    <b>Windows 95, Windows 98 &amp; Windows ME Note:</b>
-  </td>
-</tr>
-<tr>
-  <td width="5%">&nbsp;</td>
-  <td>
-    <i>Note that current releases of Ant no longer support these systems. If you are using an older version of Ant,
+<h3>Windows 95, Windows 98 &amp; Windows ME Note</h3>
+  <p>
+    <em>Note that current releases of Ant no longer support these systems. If you are using an older version of Ant,
     however, the script used to launch Ant will have problems if <code>ANT_HOME</code> is a long filename (i.e. a
     filename which is not of the format known as &quot;8.3&quot;). This is due to limitations in the OS's handling of
-    the <code>&quot;for&quot;</code> batch file statement. It is recommended, therefore, that Ant be installed in a
-    <b>short</b>, 8.3 path, such as <code>C:\Ant</code>.</i>
-  </td>
-</tr>
-<tr>
-  <td width="5%">&nbsp;</td>
-  <td>
-    <p>
+    the <code>&quot;for&quot;</code> batch file statement. It is recommended, therefore, that Ant be installed in
+    a <strong>short</strong>, 8.3 path, such as <samp>C:\Ant</samp>.</em>
+  </p>
+  <p>
     On these systems you will also need to configure more environment space to cater for the environment variables used
-    in the Ant launch script. To do this, you will need to add or update the following line in the
-    <code>config.sys</code> file
-    </p>
-    <p>
-    <code>shell=c:\command.com c:\ /p /e:32768</code>
-    </p>
-  </td>
-</tr>
-</table>
+    in the Ant launch script. To do this, you will need to add or update the following line in
+    the <samp>config.sys</samp> file
+  </p>
+  <pre>shell=c:\command.com c:\ /p /e:32768</pre>
 
 <h3 id="setup">Setup</h3>
 <p>
-Before you can run Ant there is some additional setup you will need to do unless you are installing the
-<a href="#jpackage">RPM version from jpackage.org</a>:
+Before you can run Ant there is some additional setup you will need to do unless you are installing
+the <a href="#jpackage">RPM Version from jpackage.org</a>:
 </p>
 <ul>
-<li>Add the <code>bin</code> directory to your path.</li>
+<li>Add the <samp>bin</samp> directory to your path.</li>
 <li>Set the <code>ANT_HOME</code> environment variable to the directory where you installed Ant. On some operating
 systems, Ant's startup scripts can guess <code>ANT_HOME</code> (Unix dialects and Windows NT descendants), but it is
 better to not rely on this behavior.</li>
@@ -320,47 +300,39 @@
 below). This should be set to the directory where your JDK is installed.</li>
 </ul>
 <p>
-Operating System-specific instructions for doing this from the command line are in the <a href="#windows">Windows</a>,
-<a href="#bash">Linux/Unix (bash)</a>, and <a href="#tcshcsh">Linux/Unix (csh)</a> sections. Note that using this
-method, the settings will only be valid for the command line session you run them in.
+Operating System-specific instructions for doing this from the command line are in
+the <a href="#windows">Windows</a>, <a href="#bash">Linux/Unix (bash)</a>, and <a href="#tcshcsh">Linux/Unix (csh)</a>
+sections. Note that using this method, the settings will only be valid for the command line session you run them in.
 </p>
 <p>
-<strong>Note:</strong> Do not install Ant's <code>ant.jar</code> file into the <code>lib/ext</code> directory of the
+<strong>Note</strong>: Do not install Ant's <samp>ant.jar</samp> file into the <samp>lib/ext</samp> directory of the
 JDK/JRE. Ant is an application, whilst the extension directory is intended for JDK extensions. In particular there are
 security restrictions on the classes which may be loaded by an extension.
 </p>
 
-<table width="80%">
-<tr>
-  <td colspan="2">
-    <b>Windows Note:</b>
-  </td>
-</tr>
-<tr>
-  <td width="5%">&nbsp;</td>
-  <td>
-    The <code>ant.bat</code> script makes use of three environment variables - <code>ANT_HOME</code>,
-    <code>CLASSPATH</code> and <code>JAVA_HOME</code>. <b>Ensure</b> that <code>ANT_HOME</code> and
-    <code>JAVA_HOME</code> variables are set, and that they do <b><u>not</u></b> have quotes (either ' or &quot;) and
-    they do <b><u>not</u></b> end with \ or with /. <code>CLASSPATH</code> should be unset or empty.
-  </td>
-</tr>
-</table>
+<h3>Windows Note</h3>
+<p>
+    The <samp>ant.bat</samp> script makes use of three environment
+    variables&mdash;<code>ANT_HOME</code>, <code>CLASSPATH</code> and <code>JAVA_HOME</code>. <strong>Ensure</strong>
+    that <code>ANT_HOME</code> and <code>JAVA_HOME</code> variables are set, and that they do <strong>not</strong> have
+    quotes (either ' or &quot;) and they do <strong>not</strong> end with \ or with /. <code>CLASSPATH</code> should be
+    unset or empty.
+</p>
 
 <h3 id="checkInstallation">Check Installation</h3>
 <p>
-You can check the basic installation with opening a new shell and typing <code>ant</code>. You should get a message like
+You can check the basic installation with opening a new shell and typing <kbd>ant</kbd>. You should get a message like
 this
 </p>
-<pre>
+<pre class="output">
 Buildfile: build.xml does not exist!
 Build failed
 </pre>
 <p>
-So Ant works. This message is there because you need to write a buildfile for your project. With a <code>ant
--version</code> you should get an output like
+So Ant works. This message is there because you need to write a buildfile for your project. With a <kbd>ant
+-version</kbd> you should get an output like
 </p>
-<pre>
+<pre class="output">
 Apache Ant(TM) version 1.9.2 compiled on July 8 2013
 </pre>
 <p>
@@ -372,11 +344,11 @@
   <li>required: <code>%PATH%=...<i>maybe-other-entries</i>...;%ANT_HOME%\bin;...<i>maybe-other-entries</i>...</code></li>
 </ul>
 <p>
-<b>ANT_HOME</b> is used by the launcher script for finding the libraries.
-<b>JAVA_HOME</b> is used by the launcher for finding the JDK/JRE to use. (JDK is recommended as some tasks require the
-Java tools.) If not set, the launcher tries to find one via the <code>%PATH%</code> environment variable.
-<b>PATH</b> is set for user convenience. With that set you can just start <i>ant</i> instead of always typing
-<i>the/complete/path/to/your/ant/installation/bin/ant</i>.
+<code>ANT_HOME</code> is used by the launcher script for finding the libraries. <code>JAVA_HOME</code> is used by the
+launcher for finding the JDK/JRE to use. (JDK is recommended as some tasks require the Java tools.) If not set, the
+launcher tries to find one via the <code>%PATH%</code> environment variable. <code>PATH</code> is set for user
+convenience. With that set you can just start <kbd>ant</kbd> instead of always
+typing <samp>the/complete/path/to/your/ant/installation/bin/ant</samp>.
 </p>
 
 <h3 id="optionalTasks">Optional Tasks</h3>
@@ -398,28 +370,28 @@
 
 <li>
 <p>
-In <code>${user.home}/.ant/lib</code> (as of Ant 1.6). This allows different users to add new libraries to Ant. All JAR
-files added to this directory are available to command-line Ant.
+In <code>${user.home}/.ant/lib</code> (<em>since Ant 1.6</em>). This allows different users to add new libraries to
+Ant. All JAR files added to this directory are available to command-line Ant.
 </p>
 </li>
 
 <li>
 <p>
-On the command line with a <code>-lib</code> parameter. This lets you add new JAR files on a case-by-case basis.
+On the command line with a <kbd>-lib</kbd> parameter. This lets you add new JAR files on a case-by-case basis.
 </p>
 </li>
 
 <li>
 <p>
-In the <code>CLASSPATH</code> environment variable. Avoid this; it makes the JAR files visible to <i>all</i> Java
+In the <code>CLASSPATH</code> environment variable. Avoid this; it makes the JAR files visible to <em>all</em> Java
 applications, and causes no end of support calls. See <a href="#classpath">below</a> for details.
 </p>
 </li>
 
 <li>
 <p>
-In some <code>&lt;classpath&gt;</code> accepted by the task itself. For example, as of Ant 1.7.0 you can run
-the <code>&lt;junit&gt;</code> task without <code>junit.jar</code> in Ant's own classpath, so long as it is included
+In some <code>&lt;classpath&gt;</code> accepted by the task itself. <em>Since Ant 1.7.0</em>, you can run
+the <code>&lt;junit&gt;</code> task without <samp>junit.jar</samp> in Ant's own classpath, so long as it is included
 (along with your program and tests) in the classpath passed when running the task.
 </p>
 <p>
@@ -433,7 +405,7 @@
 <p>
 If you are using the binary distribution of Ant, or if you are working from source code, you can easily gather most of
 the dependencies and install them for use with your Ant tasks. In your <code>ANT_HOME</code> directory you should see a
-file called <code>fetch.xml</code>. This is an Ant script that you can run to install almost all the dependencies that
+file called <samp>fetch.xml</samp>. This is an Ant script that you can run to install almost all the dependencies that
 the optional Ant tasks need.
 </p>
 
@@ -441,17 +413,15 @@
 To do so, change to the <code>ANT_HOME</code> directory and execute the command:
 </p>
 
-<blockquote>
-  <pre>ant -f fetch.xml -Ddest=<i>[option]</i></pre>
-</blockquote>
+<pre class="input">ant -f fetch.xml -Ddest=<em>[option]</em></pre>
 
 <p>
 where option is one of the following, as described above:
 </p>
 <ul>
-<li><code>system</code> - store in Ant's lib directory <i>(Recommended)</i></li>
-<li><code>user</code> - store in the user's home directory</li>
-<li><code>optional</code> - store in Ant's source code <code>lib/optional</code> directory, used when building Ant
+<li><code>system</code>&mdash;store in Ant's lib directory (<em>Recommended</em>)</li>
+<li><code>user</code>&mdash;store in the user's home directory</li>
+<li><code>optional</code>&mdash;store in Ant's source code <samp>lib/optional</samp> directory, used when building Ant
 source code</li>
 </ul>
 
@@ -460,18 +430,18 @@
 </p>
 
 <p>
-Note that not all dependencies are gathered using <code>fetch.xml</code>. Tasks that depend on commercial software, in
+Note that not all dependencies are gathered using <samp>fetch.xml</samp>. Tasks that depend on commercial software, in
 particular, will require you to have the commercial software installed in order to be used.
 </p>
 
 <p>
 The Apache Ant Project also provides additional tasks and types that are available as separately downloaded Ant
-Libraries. You can see the the list of available Antlibs at the <a href="http://ant.apache.org/antlibs/proper.html"
+Libraries. You can see the the list of available Antlibs at the <a href="https://ant.apache.org/antlibs/proper.html"
 target="_top">Ant Libraries</a> page.
 </p>
 
 <p>
-You can also find tasks and types provided by third-party projects at the <a href="http://ant.apache.org/external.html"
+You can also find tasks and types provided by third-party projects at the <a href="https://ant.apache.org/external.html"
 target="_top">External Tools and Tasks</a> page.
 </p>
 
@@ -480,7 +450,7 @@
 configuration dialog. Sometimes JAR files added to a project are automatically added to Ant's classpath.
 </p>
 
-<h3 id="classpath">The <code>CLASSPATH</code> environment variable</h3>
+<h3 id="classpath">The <code>CLASSPATH</code> Environment Variable</h3>
 <p>
 The <code>CLASSPATH</code> environment variable is a source of many Ant support queries. As the round trip time for
 diagnosis on the Ant user mailing list can be slow, and because filing bug reports complaining about 'ant.bat' not
@@ -497,14 +467,14 @@
 Ant's ability to quote the string. Again, this is not needed for the correct operation of the <code>CLASSPATH</code>
 environment variable, even if a DOS directory is to be added to the path.</li>
 
-<li>You can stop Ant using the <code>CLASSPATH</code> environment variable by setting the <code>-noclasspath</code>
+<li>You can stop Ant using the <code>CLASSPATH</code> environment variable by setting the <kbd>-noclasspath</kbd>
 option on the command line. This is an easy way to test for classpath-related problems.</li>
 </ol>
 
 <p>
-The usual symptom of <code>CLASSPATH</code> problems is that ant will not run with some error about not being able to
-find <code>org.apache.tools.ant.launch.Launcher</code>, or, if you have got the quotes/backslashes wrong, some very
-weird Java startup error. To see if this is the case, run <code>ant -noclasspath</code> or unset
+The usual symptom of <code>CLASSPATH</code> problems is that Ant will not run with some error about not being able to
+find <code class="code">org.apache.tools.ant.launch.Launcher</code>, or, if you have got the quotes/backslashes wrong,
+some very weird Java startup error. To see if this is the case, run <kbd>ant -noclasspath</kbd> or unset
 the <code>CLASSPATH</code> environment variable.
 </p>
 
@@ -533,16 +503,16 @@
 </p>
 
 <ul>
-<li><b>With Java 5 or above</b><br/>
+<li><strong>With Java 5 or above</strong><br/>
 <p>
 When you run Ant on Java 5 or above, you could try to use the automatic proxy setup mechanism
-with <code>-autoproxy</code>.
+with <kbd>-autoproxy</kbd>.
 </p>
 </li>
 
-<li><b>With explicit JVM properties.</b><br/>
+<li><strong>With explicit JVM properties.</strong><br/>
 <p>
-These are documented in <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/net/properties.html"
+These are documented in <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/net/properties.html"
 target="_top">Java's Networking Properties</a>, and control the proxy behaviour of the entire JVM. To set them in Ant,
 declare them in the <code>ANT_OPTS</code> environment variable. This is the best option for a non-mobile system. For a
 laptop, you have to change these settings as you roam. To set <code>ANT_OPTS</code>:
@@ -551,29 +521,23 @@
 <p>
 For csh/tcsh:
 </p>
-<pre>
-    setenv ANT_OPTS "-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"
-</pre>
+<pre class="input">setenv ANT_OPTS "-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"</pre>
 <p>
 For bash:
 </p>
-<pre>
-    export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"
-</pre>
+<pre class="input">export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"</pre>
 <p>
 For Windows, set the environment variable in the appropriate dialog box and open a new console or, by hand
 </p>
-<pre>
-    set ANT_OPTS = -Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080
-</pre>
+<pre class="input">set ANT_OPTS = -Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080</pre>
 </blockquote>
 </li>
 
-<li><b>In the build file itself</b><br/>
+<li><strong>In the build file itself</strong><br/>
 <p>
 If you are writing a build file that is always to be used behind the firewall,
 the <a href="Tasks/setproxy.html">setproxy</a> task lets you configure the proxy (which it does by setting the JVM
-properties). If you do this, we strongly recommend using ant properties to define the proxy host, port, etc, so that
+properties). If you do this, we strongly recommend using Ant properties to define the proxy host, port, etc, so that
 individuals can override the defaults.
 </p>
 </li>
@@ -582,11 +546,11 @@
 <p>
 The Ant team acknowledges that this is unsatisfactory. Until the JVM automatic proxy setup works properly everywhere,
 explicit JVM options via <code>ANT_ARGS</code> are probably the best solution. Setting properties on Ant's command line
-do not work, because those are <i>Ant properties</i> being set, not JVM options. This means the following does not set
+do not work, because those are <em>Ant properties</em> being set, not JVM options. This means the following does not set
 up the command line:
 </p>
 
-<pre>ant -Dhttp.proxyHost=proxy -Dhttp.proxyPort=81</pre>
+<pre class="input">ant -Dhttp.proxyHost=proxy -Dhttp.proxyPort=81</pre>
 
 <p>
 All it does is set up two Ant properties.
@@ -599,21 +563,21 @@
 </p>
 
 <h3 id="windows">Windows and OS/2</h3>
-<p>Assume Ant is installed in <code>c:\ant\</code>. The following sets up the
+<p>Assume Ant is installed in <samp>c:\ant\</samp>. The following sets up the
 environment:</p>
-<pre>set ANT_HOME=c:\ant
+<pre class="input">set ANT_HOME=c:\ant
 set JAVA_HOME=c:\jdk1.7.0_51
 set PATH=%PATH%;%ANT_HOME%\bin</pre>
 
 <h3 id="bash">Linux/Unix (bash)</h3>
-<p>Assume Ant is installed in <code>/usr/local/ant</code>. The following sets up
+<p>Assume Ant is installed in <samp>/usr/local/ant</samp>. The following sets up
 the environment:</p>
-<pre>export ANT_HOME=/usr/local/ant
+<pre class="input">export ANT_HOME=/usr/local/ant
 export JAVA_HOME=/usr/local/jdk1.7.0_51
 export PATH=${PATH}:${ANT_HOME}/bin</pre>
 
 <h3 id="tcshcsh">Linux/Unix (csh)</h3>
-<pre>setenv ANT_HOME /usr/local/ant
+<pre class="input">setenv ANT_HOME /usr/local/ant
 setenv JAVA_HOME /usr/local/jdk/jdk1.7.0_51
 set path=( $path $ANT_HOME/bin )</pre>
 
@@ -623,18 +587,18 @@
 <h3 id="jpackage">RPM version from jpackage.org</h3>
 <p>
 The <a href="http://www.jpackage.org" target="_top">JPackage project</a> distributes an RPM version of Ant. With this
-version, it is not necessary to set <code> JAVA_HOME</code> or <code>ANT_HOME</code> environment variables and the RPM
-installer will correctly place the Ant executable on your path.
+version, it is not necessary to set <code>JAVA_HOME</code> or <code>ANT_HOME</code> environment variables and the RPM
+installer will correctly place the <kbd>ant</kbd> executable on your path.
 </p>
 <p>
-<b>NOTE:</b> <i>Since Ant 1.7.0</i>, if the <code>ANT_HOME</code> environment variable is set, the JPackage
+<strong>Note</strong>: <em>Since Ant 1.7.0</em>, if the <code>ANT_HOME</code> environment variable is set, the JPackage
 distribution will be ignored.
 </p>
 <p>
 Optional JARs for the JPackage version are handled in two ways. The easiest, and best way is to get these external
 libraries from JPackage if JPackage has them available. (Note: for each such library, you will have to get both the
-external package itself (e.g. <code>oro-2.0.8-2jpp.noarch.rpm</code>) and the small library that links Ant and the
-external package (e.g. <code>ant-apache-oro-1.6.2-3jpp.noarch.rpm</code>).
+external package itself (e.g. <samp>oro-2.0.8-2jpp.noarch.rpm</samp>) and the small library that links Ant and the
+external package (e.g. <samp>ant-apache-oro-1.6.2-3jpp.noarch.rpm</samp>).
 </p>
 <p>
 However, JPackage does not package proprietary software, and since some of the optional packages depend on proprietary
@@ -644,32 +608,32 @@
 
 <ol>
 <li>Decide where you want to deploy the extra JARs. One option is in <code>$ANT_HOME/lib</code>, which, for JPackage is
-usually <code>/usr/share/ant/lib</code>. Another, less messy option is to create an <code>.ant/lib</code> subdirectory
+usually <samp>/usr/share/ant/lib</samp>. Another, less messy option is to create an <samp>.ant/lib</samp> subdirectory
 of your home directory and place your non-JPackage Ant JARs there, thereby avoiding mixing JPackage libraries with
 non-JPackage stuff in the same folder. More information on where Ant finds its libraries is
-available <a href="http://ant.apache.org/manual/running.html#libs">here</a></li>
-<li>Download a non-JPackage binary distribution from the regular <a href="http://ant.apache.org/bindownload.cgi"
+available <a href="running.html#libs">here</a></li>
+<li>Download a non-JPackage binary distribution from the regular <a href="https://ant.apache.org/bindownload.cgi"
 target="_top">Apache Ant site</a></li>
 <li>Unzip or untar the distribution into a temporary directory</li>
-<li>Copy the linking JAR, in this case <code>ant-jai.jar</code>, into the library directory you chose in step 1
+<li>Copy the linking JAR, in this case <samp>ant-jai.jar</samp>, into the library directory you chose in step 1
 above.</li>
 <li>Copy the proprietary JAR itself into the same directory.</li>
 </ol>
 
 Finally, if for some reason you are running on a system with both the JPackage and Apache versions of Ant available, if
 you should want to run the Apache version (which will have to be specified with an absolute file name, not found on the
-path), you should use Ant's <code>--noconfig</code> command-line switch to avoid JPackage's classpath mechanism.
+path), you should use Ant's <kbd>--noconfig</kbd> command-line switch to avoid JPackage's classpath mechanism.
 
 <h3 id="advanced">Advanced</h3>
 
 <p>There are many different ways to run Ant. What you need is at least the following:</p>
 
 <ul>
-<li>The classpath for Ant must contain <code>ant.jar</code> and any JARs/classes needed for your chosen JAXP-compliant
+<li>The classpath for Ant must contain <samp>ant.jar</samp> and any JARs/classes needed for your chosen JAXP-compliant
 XML parser.</li>
 <li>When you need JDK functionality (such as for the <a href="Tasks/javac.html">javac</a> task or
-the <a href="Tasks/rmic.html">rmic</a> task), then <code>tools.jar</code> must be added. The scripts supplied with Ant,
-in the <code>bin</code> directory, will add the required JDK classes automatically, if the <code>JAVA_HOME</code>
+the <a href="Tasks/rmic.html">rmic</a> task), then <samp>tools.jar</samp> must be added. The scripts supplied with Ant,
+in the <samp>bin</samp> directory, will add the required JDK classes automatically, if the <code>JAVA_HOME</code>
 environment variable is set.</li>
 <li>When you are executing platform-specific applications, such as the <a href="Tasks/exec.html">exec</a> task or
 the <a href="Tasks/cvs.html">cvs</a> task, the property <code>ant.home</code> must be set to the directory containing
@@ -697,13 +661,13 @@
 </p>
 
 <p>
-<b>Note</b>: The bootstrap process of Ant requires a greedy compiler like OpenJDK or Oracle's javac. It does not work
-with gcj or kjc.
+<strong>Note</strong>: The bootstrap process of Ant requires a greedy compiler like OpenJDK or
+Oracle's <kbd>javac</kbd>. It does not work with <kbd>gcj</kbd> or <kbd>kjc</kbd>.
 </p>
 
 <p>
 Make sure you have downloaded any auxiliary JARs required to build tasks you are interested in. These should be added to
-the <code>lib/optional</code> directory of the source tree. See <a href="#librarydependencies">Library Dependencies</a>
+the <samp>lib/optional</samp> directory of the source tree. See <a href="#librarydependencies">Library Dependencies</a>
 for a list of JAR requirements for various features. Note that this will make the auxiliary JAR available for the
 building of Ant only. For running Ant you will still need to make the JARs available as described
 under <a href="#installing">Installing Ant</a>.
@@ -711,22 +675,22 @@
 
 <p>
 You can also get most of the auxiliary JAR files (i.e. the JAR files that various optional Ant tasks depend on) by
-running Ant on the <code>fetch.xml</code> build file. See <a href="#optionalTasks">Optional Tasks</a> for instructions
+running Ant on the <samp>fetch.xml</samp> build file. See <a href="#optionalTasks">Optional Tasks</a> for instructions
 on how to do this.
 </p>
 
 <p>
-As of version 1.7.0 Ant has a hard dependency on JUnit. The <code>fetch.xml</code> build script will download JUnit
-automatically, but if you don't use this you must install it manually into <code>lib/optional</code> (download it
-from <a href="http://junit.org/" target="_top">JUnit.org</a>) if you are using a source distribution of Ant.
+<em>Since Ant 1.7.0</em>, Ant has a hard dependency on JUnit. The <samp>fetch.xml</samp> build script will download
+JUnit automatically, but if you don't use this you must install it manually into <samp>lib/optional</samp> (download it
+from <a href="https://junit.org/" target="_top">JUnit.org</a>) if you are using a source distribution of Ant.
 </p>
 
 <p>
 Your are now ready to build Ant:
 </p>
 <blockquote>
-  <p><code>build -Ddist.dir=&lt;<i>directory_to_contain_Ant_distribution</i>&gt; dist</code>&nbsp;&nbsp;&nbsp;&nbsp;(<i>Windows</i>)</p>
-  <p><code>sh build.sh -Ddist.dir=&lt;<i>directory_to_contain_Ant_distribution</i>&gt; dist</code>&nbsp;&nbsp;&nbsp;&nbsp;(<i>Unix</i>)</p>
+  <p><kbd>build -Ddist.dir=&lt;<i>directory-to-contain-Ant-distribution</i>&gt; dist</kbd>&nbsp;&nbsp;&nbsp;&nbsp;(<em>Windows</em>)</p>
+  <p><kbd>sh build.sh -Ddist.dir=&lt;<i>directory-to-contain-Ant-distribution</i>&gt; dist</kbd>&nbsp;&nbsp;&nbsp;&nbsp;(<em>Unix</em>)</p>
 </blockquote>
 
 <p>
@@ -740,49 +704,49 @@
 <li>If necessary it will bootstrap the Ant code. Bootstrapping involves the manual compilation of enough Ant code to be
 able to run Ant. The bootstrapped Ant is used for the remainder of the build steps.</li>
 <li>Invokes the bootstrapped Ant with the parameters passed to the build script. In this case, these parameters define
-an Ant property value and specify the &quot;dist&quot; target in Ant's own <code>build.xml</code> file.</li>
-<li>Create the <code>ant.jar</code> and <code>ant-launcher.jar</code> JAR files</li>
+an Ant property value and specify the <q>dist</q> target in Ant's own <samp>build.xml</samp> file.</li>
+<li>Create the <samp>ant.jar</samp> and <samp>ant-launcher.jar</samp> JAR files</li>
 <li>Create optional JARs for which the build had the relevant libraries. If a particular library is missing
-from <code>lib/optional</code>, then the matching ant-library JAR file will not be created. For
-example, <code>ant-junit.jar</code> is only built if there is a <code>junit.jar</code> in the <code>lib/optional</code>
+from <samp>lib/optional</samp>, then the matching ant-library JAR file will not be created. For
+example, <samp>ant-junit.jar</samp> is only built if there is a <samp>junit.jar</samp> in the <samp>lib/optional</samp>
 directory.</li>
 </ul>
 
 <p>
 On most occasions you will not need to explicitly bootstrap Ant since the build scripts do that for you. However, if the
 build file you are using makes use of features not yet compiled into the bootstrapped Ant, you will need to manually
-bootstrap. Run <code>bootstrap.bat</code> (Windows) or <code>bootstrap.sh</code> (UNIX) to build a new bootstrap version
+bootstrap. Run <kbd>bootstrap.bat</kbd> (Windows) or <kbd>bootstrap.sh</kbd> (UNIX) to build a new bootstrap version
 of Ant.
 </p>
 
 If you wish to install the build into the current <code>ANT_HOME</code>
 directory, you can use:
 <blockquote>
-  <p><code>build install</code>&nbsp;&nbsp;&nbsp;&nbsp;(<i>Windows</i>)</p>
-  <p><code>sh build.sh install</code>&nbsp;&nbsp;&nbsp;&nbsp;(<i>Unix</i>)</p>
+  <p><kbd>build install</kbd>&nbsp;&nbsp;&nbsp;&nbsp;(<em>Windows</em>)</p>
+  <p><kbd>sh build.sh install</kbd>&nbsp;&nbsp;&nbsp;&nbsp;(<em>Unix</em>)</p>
 </blockquote>
 
 You can avoid the lengthy Javadoc step, if desired, with:
 <blockquote>
-  <p><code>build install-lite</code>&nbsp;&nbsp;&nbsp;&nbsp;(<i>Windows</i>)</p>
-  <p><code>sh build.sh install-lite</code>&nbsp;&nbsp;&nbsp;&nbsp;(<i>Unix</i>)</p>
+  <p><kbd>build install-lite</kbd>&nbsp;&nbsp;&nbsp;&nbsp;(<em>Windows</em>)</p>
+  <p><kbd>sh build.sh install-lite</kbd>&nbsp;&nbsp;&nbsp;&nbsp;(<em>Unix</em>)</p>
 </blockquote>
-This will only install the <code>bin</code> and <code>lib</code> directories.
+This will only install the <samp>bin</samp> and <samp>lib</samp> directories.
 
 <p>
-Both the <code>install</code> and <code>install-lite</code> targets will overwrite the current Ant version
+Both the <var>install</var> and <var>install-lite</var> targets will overwrite the current Ant version
 in <code>ANT_HOME</code>.
 </p>
 
 <p>
-Ant's build script will try to set executable flags for its shell scripts on Unix-like systems. There are various
+Ant's build script will try to set executable flags for its shell scripts on Unix(-like) systems. There are various
 reasons why the <a href="Tasks/chmod.html">chmod</a> task might fail (like when you are running the build script as a
 different user than the one who installed Ant initially). In this case you can set the Ant
 property <code>chmod.fail</code> to false when starting the build like in
 </p>
-<blockquote>
-  <p><code>sh build.sh install -Dchmod.fail=false</code></p>
-</blockquote>
+
+<pre class="input">sh build.sh install -Dchmod.fail=false</pre>
+
 <p>
 and any error to change permission will not result in a build failure.
 </p>
@@ -794,33 +758,34 @@
 The following libraries are needed in Ant's classpath if you are using the indicated feature. Note that only one of the
 regexp libraries is needed for use with the mappers (and Java includes a regexp implementation which Ant will find
 automatically). You will also need to install the particular Ant optional JAR containing the task definitions to make
-these tasks available. Please refer to the <a href="#optionalTasks"> Installing Ant / Optional Tasks</a> section above.
+these tasks available. Please refer to the <a href="#optionalTasks">Installing Ant / Optional Tasks</a> section above.
 </p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
-    <td><b>JAR Name</b></td>
-    <td><b>Needed For</b></td>
-    <td><b>Available At</b></td>
+    <th>JAR Name</th>
+    <th>Needed For</th>
+    <th>Available At</th>
   </tr>
   <tr>
     <td>jakarta-regexp-1.4.jar</td>
     <td><a href="Types/mapper.html#regexp-mapper">regexp</a> type with mappers (if you do not wish to use
-    java.util.regex)</td>
+      java.util.regex)</td>
     <td><a href="https://attic.apache.org/projects/jakarta-regexp.html"
-    target="_top">https://attic.apache.org/projects/jakarta-regexp.html</a></td>
+           target="_top">https://attic.apache.org/projects/jakarta-regexp.html</a></td>
   </tr>
   <tr>
     <td>jakarta-oro-2.0.8.jar</td>
     <td><a href="Types/mapper.html#regexp-mapper">regexp</a> type with mappers (if you do not wish to use
-    java.util.regex) or <a href="Tasks/ftp.html">ftp</a> task with <a href="#commons-net">commons-net</a> 1.4.1</td>
+      java.util.regex) or <a href="Tasks/ftp.html">ftp</a> task with <a href="#commons-net">commons-net</a> 1.4.1</td>
     <td><a href="https://attic.apache.org/projects/jakarta-oro.html"
-    target="_top">https://attic.apache.org/projects/jakarta-oro.html</a></td>
+           target="_top">https://attic.apache.org/projects/jakarta-oro.html</a></td>
   </tr>
   <tr>
     <td>junit.jar</td>
-    <td><a href="Tasks/junit.html">junit</a> task (may be in classpath passed to task rather than Ant's classpath)</td>
-    <td><a href="http://junit.org/" target="_top">http://junit.org/</a></td>
+    <td><a href="Tasks/junit.html">junit</a> task (may be in classpath passed to task rather than
+      Ant's classpath)</td>
+    <td><a href="https://junit.org/" target="_top">https://junit.org/</a></td>
   </tr>
   <tr>
     <td>xalan.jar</td>
@@ -830,7 +795,7 @@
   <tr>
     <td>antlr.jar</td>
     <td><a href="Tasks/antlr.html">antlr</a> task</td>
-    <td><a href="http://www.antlr.org/" target="_top">http://www.antlr.org/</a></td>
+    <td><a href="https://www.antlr.org/" target="_top">https://www.antlr.org/</a></td>
   </tr>
   <tr>
     <td>bsf.jar</td>
@@ -845,23 +810,20 @@
     <td>Groovy JARs</td>
     <td>Groovy Ant tasks with bindings or Groovy with <a href="Tasks/script.html">script</a>
     and <a href="Tasks/scriptdef.html">scriptdef</a> tasks</td>
-    <td>
-      <a href="http://groovy-lang.org/" target="_top">http://groovy-lang.org/</a><br/>
-      Use either groovy-ant for Groovy Ant tasks with bindings or groovy-bsf for Groovy with script and scriptdef tasks
-      (or groovy-all)
+    <td><a href="http://groovy-lang.org/" target="_top">http://groovy-lang.org/</a><br/> Use either groovy-ant for
+      Groovy Ant tasks with bindings or groovy-bsf for Groovy with script and scriptdef tasks (or groovy-all)
     </td>
   </tr>
   <tr>
     <td>netrexx.jar</td>
     <td><a href="Tasks/netrexxc.html">netrexxc</a> task, Rexx with <a href="Tasks/script.html">script</a> task</td>
     <td><a href="https://www.ibm.com/software/awdtools/netrexx/library.html"
-    target="_top">https://www.ibm.com/software/awdtools/netrexx/library.html</a></td>
+           target="_top">https://www.ibm.com/software/awdtools/netrexx/library.html</a></td>
   </tr>
   <tr>
-    <td>rhino.jar<br/>
-    (included in Java 7 runtime, replaced by Nashorn in Java&nbsp;8 and later)</td>
-    <td>JavaScript with <a href="Tasks/script.html">script</a> task<br/>
-    <strong>Note:</strong> Apache BSF 2.4.0 works only with Rhino 1.5R4 and later versions.</td>
+    <td>rhino.jar<br/>(included in Java 7 runtime, replaced by Nashorn in Java&nbsp;8 and later)</td>
+    <td>JavaScript with <a href="Tasks/script.html">script</a> task<br/><strong>Note</strong>: Apache BSF 2.4.0 works
+      only with Rhino 1.5R4 and later versions.</td>
     <td><a href="https://www.mozilla.org/rhino/" target="_top">https://www.mozilla.org/rhino/</a></td>
   </tr>
   <tr>
@@ -881,8 +843,8 @@
   </tr>
   <tr>
     <td>BeanShell JAR(s)</td>
-    <td>BeanShell with <a href="Tasks/script.html">script</a> task.<br/>
-    <strong>Note</strong>: Ant requires BeanShell version 1.3 or later</td>
+    <td>BeanShell with <a href="Tasks/script.html">script</a> task.<br/><strong>Note</strong>: Ant requires BeanShell
+      version 1.3 or later</td>
     <td><a href="http://www.beanshell.org/" target="_top">http://www.beanshell.org/</a></td>
   </tr>
   <tr>
@@ -908,88 +870,103 @@
   <tr id="commons-net">
     <td>commons-net.jar</td>
     <td><a href="Tasks/ftp.html">ftp</a>, <a href="Tasks/rexec.html">rexec</a>
-    and <a href="Tasks/telnet.html">telnet</a> tasks<br/>
-    A minimum version of commons-net of 1.4.0 is needed to compile Ant, earlier versions did not support the full range
-    of configuration options.<br/>
-    jakarta-oro 2.0.8 is required together with commons-net 1.4.x at run time.<br/>
-    <strong>Note</strong>: do not use commons-net 3.2 because
-    of <a href="https://issues.apache.org/jira/browse/NET-493">performance issues</a>
+      and <a href="Tasks/telnet.html">telnet</a> tasks<br/> A minimum version of commons-net of 1.4.0 is needed to
+      compile Ant, earlier versions did not support the full range of configuration options.<br/>jakarta-oro 2.0.8 is
+      required together with commons-net 1.4.x at run time.<br/><strong>Note</strong>: do not use commons-net 3.2
+      because of <a href="https://issues.apache.org/jira/browse/NET-493" target="_top">performance issues</a>
     </td>
     <td><a href="https://commons.apache.org/net/" target="_top">https://commons.apache.org/net/</a></td>
   </tr>
   <tr>
     <td>bcel.jar</td>
     <td><a href="Types/classfileset.html">classfileset</a> data type, JavaClassHelper used by the ClassConstants filter
-    reader and optionally used by <a href="Tasks/ejb.html#ejbjar">ejbjar</a> task for dependency determination</td>
+      reader and optionally used by <a href="Tasks/ejb.html#ejbjar">ejbjar</a> task for dependency determination</td>
     <td><a href="https://commons.apache.org/bcel/" target="_top">https://commons.apache.org/bcel/</a></td>
   </tr>
   <tr>
     <td>javax.mail-api.jar</td>
     <td><a href="Tasks/mail.html">mail</a> task with MIME encoding,
-    and <i>deprecated</i> <a href="Tasks/mimemail.html">mimemail</a> task</td>
-    <td><a href="https://javaee.github.io/javamail/"
-        target="_top">https://javaee.github.io/javamail/</a></td>
+      and <em><u>deprecated</u></em> <a href="Tasks/mimemail.html">mimemail</a> task</td>
+    <td><a href="https://javaee.github.io/javamail/" target="_top">https://javaee.github.io/javamail/</a></td>
   </tr>
   <tr>
-    <td>activation.jar<br/>
-    (included in Java 6 and later runtime)</td>
+    <td>activation.jar<br/>(included in Java 6 and later runtime)</td>
     <td><a href="Tasks/mail.html">mail</a> task with MIME encoding,
-    and <i>deprecated</i> <a href="Tasks/mimemail.html">mimemail</a> task</td>
-    <td><a href="http://www.oracle.com/technetwork/java/javase/jaf-135115.html"
-        target="_top">http://www.oracle.com/technetwork/java/javase/jaf-135115.html</a></td>
+      and <em><u>deprecated</u></em> <a href="Tasks/mimemail.html">mimemail</a> task</td>
+    <td><a href="https://www.oracle.com/technetwork/java/javase/jaf-135115.html"
+           target="_top">https://www.oracle.com/technetwork/java/javase/jaf-135115.html</a></td>
   </tr>
   <tr>
     <td>jdepend.jar</td>
     <td><a href="Tasks/jdepend.html">jdepend</a> task</td>
-    <td><a href="https://github.com/clarkware/jdepend"
-        target="_top">https://github.com/clarkware/jdepend</a></td>
+    <td><a href="https://github.com/clarkware/jdepend" target="_top">https://github.com/clarkware/jdepend</a></td>
   </tr>
   <tr>
-    <td>resolver.jar <b>1.1 or later</b></td>
-    <td><a href="Types/xmlcatalog.html">xmlcatalog</a> datatype <i>only if support for external catalog files is
-    desired</i></td>
+    <td>resolver.jar <strong>1.1 or later</strong></td>
+    <td><a href="Types/xmlcatalog.html">xmlcatalog</a> datatype <em>only if support for external catalog files is
+      desired</em></td>
     <td><a href="https://xerces.apache.org/xml-commons/components/resolver/"
-    target="_top">https://xerces.apache.org/xml-commons/components/resolver/</a></td>
+           target="_top">https://xerces.apache.org/xml-commons/components/resolver/</a></td>
   </tr>
   <tr>
-    <td>jsch.jar <b>0.1.54 or later</b></td>
+    <td>jsch.jar <strong>0.1.54 or later</strong></td>
     <td><a href="Tasks/sshexec.html">sshexec</a> and <a href="Tasks/scp.html">scp</a> tasks</td>
     <td><a href="http://www.jcraft.com/jsch/" target="_top">http://www.jcraft.com/jsch/</a></td>
   </tr>
   <tr>
-    <td>JAI - Java Advanced Imaging</td>
+    <td>JAI&mdash;Java Advanced Imaging</td>
     <td><a href="Tasks/image.html">image</a> task</td>
     <td><a href="https://download.java.net/media/jai/builds/release/1_1_3/INSTALL.html"
-    target="_top">https://download.java.net/media/jai/builds/release/1_1_3/INSTALL.html</a></td>
+           target="_top">https://download.java.net/media/jai/builds/release/1_1_3/INSTALL.html</a></td>
+  </tr>
+  <tr>
+    <td>XZ&mdash;XZ for Java <strong>1.6 or later</strong></td>
+    <td><a href="Tasks/pack.html">xz</a> and <a href="Tasks/unpack.html">unxz</a>
+      tasks, <a href="Types/resources.html#xzresource">xzresource</a>, xz compression
+      in <a href="Tasks/tar.html">tar</a>/<a href="Tasks/unzip.html">untar</a> tasks</td>
+    <td><a href="https://www.tukaani.org/xz/java.html" target="_top">https://www.tukaani.org/xz/java.html</a></td>
+  </tr>
+  <tr>
+    <td>JUnit 5 Platform jars: 
+      <ul>
+          <li>junit-platform-commons.jar</li>
+          <li>junit-platform-engine.jar</li>
+          <li>junit-platform-launcher.jar</li>      
+      </ul>
+    </td>
+    <td><a href="Tasks/junitlauncher.html">junitlauncher</a> task. Additional libraries maybe needed depending
+      on the selected test engines, details of which are available in that task's documentation</td>
+    <td><a href="https://junit.org/junit5/" target="_top">https://junit.org/junit5/</a></td>
   </tr>
 </table>
 
-<li>Which optional tasks are available. If a task is not listed as being available, either it is not present, or
-libraries that it depends on are absent.</li>
+<h2 id="Troubleshooting">Troubleshooting</h2>
 
 <h3 id="diagnostics">Diagnostics</h3>
 
 <p>
-Ant has a built in diagnostics feature. If you run <code>ant -diagnostics</code> ant will look at its internal state and
-print it out. This code will check and print the following things.
+Ant has a built in diagnostics feature. If you run <kbd>ant -diagnostics</kbd>, Ant will look at its internal state
+and print it out. This code will check and print the following things.
 </p>
 
 <ul>
 
 <li>Where Ant is running from. Sometimes you can be surprised.</li>
 
-<li>The version of ant.jar and of the ant-*.jar containing the optional tasks - and whether they match</li>
+<li>The version of <samp>ant.jar</samp> and of the <samp>ant-*.jar</samp> containing the optional tasks&mdash;and
+whether they match</li>
 
 <li>Which JAR files are in <code>ANT_HOME/lib</code></li>
 
-<h2 id="Troubleshooting">Troubleshooting</h2>
+<li>Which optional tasks are available. If a task is not listed as being available, either it is not present, or
+libraries that it depends on are absent.</li>
 
 <li>XML Parser information</li>
 
 <li>JVM system properties</li>
 
-<li>The status of the temp directory. If this is not writable, or its clock is horribly wrong (possible if it is on a
-network drive), a lot of tasks will fail with obscure error messages.</li>
+<li>The status of the <samp>temp</samp> directory. If this is not writable, or its timestamp is horribly wrong (possible
+if it is on a network drive), a lot of tasks may fail with obscure error messages.</li>
 
 <li>The current time zone as Java sees it. If this is not what it should be for your location, then dependency logic may
 get confused.</li>
@@ -997,7 +974,7 @@
 </ul>
 
 <p>
-Running <code>ant -diagnostics</code> is a good way to check that Ant is installed. It is also a first step towards
+Running <kbd>ant -diagnostics</kbd> is a good way to check that Ant is installed. It is also a first step towards
 self-diagnosis of any problem. Any configuration problem reported to the user mailing list will probably result ins
 someone asking you to run the command and show the results, so save time by using it yourself.
 </p>
@@ -1008,7 +985,7 @@
 what the XML parser and classpath is, etc.
 </p>
 
-<h3 id="ant-user">user mailing list</h3>
+<h3 id="ant-user">User Mailing List</h3>
 
 <p>
 If you cannot get Ant installed or working, the Ant user mailing list is the best place to start with any
diff -Nru ant-1.9.10/manual/installlist.html ant-1.10.3/manual/installlist.html
--- ant-1.9.10/manual/installlist.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/installlist.html	2018-03-24 12:37:12.000000000 +0000
@@ -41,4 +41,3 @@
 </ul>
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Integration/jext-plugin.html ant-1.10.3/manual/Integration/jext-plugin.html
--- ant-1.9.10/manual/Integration/jext-plugin.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Integration/jext-plugin.html	2018-03-24 12:37:12.000000000 +0000
@@ -14,43 +14,40 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
 <html>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   <meta http-equiv="Content-Language" content="en-us">
   <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
 <title>Apache AntWork Plugin for the Jext Java Text Editor</title>
 </head>
 <body>
 
-<h1>AntWork Plugin for the Jext Java Text Editor</h1>
- <a name="authors"></a>by<ul>
-  <li>Klaus Hartlage
-      (<a href="mailto:KHartlage@t-online.de">KHartlage@t-online.de</a>)</li>
+<h1 id="authors">AntWork Plugin for the Jext Java Text Editor</h1>
+by
+<ul>
+  <li>Klaus Hartlage (<a href="mailto:KHartlage@t-online.de">KHartlage@t-online.de</a>)</li>
 </ul>
-<hr>
+<hr/>
 
-<p>You can download the plugin at: <a
-href="ftp://jext.sourceforge.net/pub/jext/plugins/AntWork.zip">ftp://jext.sourceforge.net/pub/jext/plugins/AntWork.zip</a></p>
+<p>You can download the plugin
+at: <a href="http://sourceforge.net/projects/jext/files/OldFiles/antwork_plugin.zip/download"
+target="_top">http://sourceforge.net/projects/jext/files/OldFiles/antwork_plugin.zip/download</a></p>
 
-<h2>Installation instructions from the Readme.txt:</h2>
+<h2>Installation instructions from the Readme.txt</h2>
 
 <p>You have to enable the Jext Console to see the Apache Ant output (menu:
-Edit-&gt;Options... - General Panel), because the Ant messages are
-redirected to the Jext console.</p>
+Edit&rarr;Options&hellip;&ndash;General Panel), because Ant messages are redirected to the Jext
+console.</p>
 
-<p>You can configure the Ant call in the Jext menu: Edit-&gt;Options... -
-Plugin Options - Antwork Plugin Panel; here you can set the ant home
-directory and the path to your build file.</p>
+<p>You can configure the Ant call in the Jext menu: Edit&rarr;Options&hellip;&ndash; Plugin
+Options&ndash;Antwork Plugin Panel; here you can set Ant home directory and the path to your build
+file.</p>
 
-<p>You can start AntWork in the menu: Plugins-&gt;Ant-&gt;Work Now!  In the
-appearing dialog box you can enter the target which you want to
-compile.</p>
+<p>You can start AntWork in the menu: Plugins&rarr;Ant&rarr;Work Now!  In the appearing dialog box
+you can enter the target which you want to compile.</p>
 
-<p>If a javac error occurs in the ant run an error-list opens within
-Jext. With a double-click on the error-message you jump to the error
-in the specified java text file.</p>
+<p>If a <code>javac</code> error occurs in the Ant run, an error list opens within Jext. With a
+double click on the error message you jump to the error in the specified Java source file.</p>
 
-
-</body></html>
+</body>
+</html>
diff -Nru ant-1.9.10/manual/intro.html ant-1.10.3/manual/intro.html
--- ant-1.9.10/manual/intro.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/intro.html	2018-03-24 12:37:12.000000000 +0000
@@ -19,19 +19,19 @@
 <head>
 <meta http-equiv="Content-Language" content="en-us">
 <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
-<title>Apache Ant User Manual - Introduction</title>
+<title>Apache Ant User Manual&mdash;Introduction</title>
 </head>
 
 <body>
-<h1><a name="introduction">Introduction</a></h1>
+<h1 id="introduction">Introduction</h1>
 <p>Apache Ant is a Java-based build tool. In theory, it is kind of like
-<i>make</i>, without <i>make</i>'s wrinkles.</p>
+<em>make</em>, without <em>make</em>'s wrinkles.</p>
 <h3>Why?</h3>
 <p>Why another build tool when there is already
-<i>make</i>,
-<i>gnumake</i>,
-<i>nmake</i>,
-<i>jam</i>,
+<em>make</em>,
+<em>gnumake</em>,
+<em>nmake</em>,
+<em>jam</em>,
 and
 others? Because all those tools have limitations that Ant's original author
 couldn't live with when developing software across multiple platforms.
@@ -54,16 +54,13 @@
 Task interface.</p>
 <p>Granted, this removes some of the expressive power that is inherent in being
 able to construct a shell command such as
-<nobr><code>`find . -name foo -exec rm {}`</code></nobr>, but it
-gives you the ability to be cross-platform--to work anywhere and
+<code>`find . -name foo -exec rm {}`</code>, but it
+gives you the ability to be cross-platform&mdash;to work anywhere and
 everywhere. And
 hey, if you really need to execute a shell command, Ant has an
 <code>&lt;exec&gt;</code> task that
 allows different commands to be executed based on the OS it is executing
 on.</p>
 
-
-
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/javacprops.html ant-1.10.3/manual/javacprops.html
--- ant-1.9.10/manual/javacprops.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/javacprops.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,30 +24,29 @@
 
 <body>
 
-<p>The source and target attributes of <code>&lt;javac&gt;</code>
-don't have any default values for historical reasons.  Since the
-underlying javac compiler's default depends on the JDK you use, you
-may encounter build files that don't explicitly set those attributes
-and that will no longer compile using a newer JDK.  If you cannot
-change the build file, Apache Ant provides two properties that help you
-setting default values for these attributes.  If the attributes have
-been set explicitly, the properties listed here will be ignored.</p>
+<p>The <var>source</var> and <var>target</var> attributes
+of <code>&lt;javac&gt;</code> don't have any default values for
+historical reasons.  Since the underlying <kbd>javac</kbd>
+compiler defaults depends on the JDK you use, you may encounter
+build files that don't explicitly set those attributes and that will
+no longer compile using a newer JDK.  If you cannot change the build
+file, Apache Ant provides two properties that help you setting
+default values for these attributes.  If the attributes have been
+set explicitly, the properties listed here will be ignored.</p>
 
-<h2><a name="source">ant.build.javac.source</a></h2>
+<h2 id="source">ant.build.javac.source</h2>
 
 <p><em>Since Ant 1.7</em></p>
 
-<p>Provides a default value for <code>&lt;javac&gt;</code>'s and
-<code>&lt;javadoc&gt;</code>'s source attribute.</p>
+<p>Provides a default value for <code>&lt;javac&gt;</code>'s
+and <code>&lt;javadoc&gt;</code>'s <var>source</var> attribute.</p>
 
-<h2><a name="target">ant.build.javac.target</a></h2>
+<h2 id="target">ant.build.javac.target</h2>
 
 <p><em>Since Ant 1.7</em></p>
 
-<p>Provides a default value for <code>&lt;javac&gt;</code>'s target
-attribute.</p>
-
+<p>Provides a default value
+for <code>&lt;javac&gt;</code>'s <var>target</var> attribute.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/listeners.html ant-1.10.3/manual/listeners.html
--- ant-1.9.10/manual/listeners.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/listeners.html	2018-03-24 12:37:12.000000000 +0000
@@ -25,12 +25,12 @@
 <body>
 <h1>Listeners &amp; Loggers</h1>
 
-<h2><a name="Overview">Overview</a></h2>
+<h2 id="Overview">Overview</h2>
 
-<p>Apache Ant has two related features to allow the build process to be monitored:
-listeners and loggers.</p>
+<p>Apache Ant has two related features to allow the build process to be monitored: listeners and
+loggers.</p>
 
-<h3><a name="Listeners">Listeners</a></h3>
+<h3 id="Listeners">Listeners</h3>
 
 <p>A listener is alerted of the following events:</p>
 
@@ -44,365 +44,326 @@
   <li>message logged</li>
 </ul>
 
-<p>
-  These are used internally for various recording and housekeeping operations,
-  however new listeners may registered on the command line through the <code>-listener</code>
-  argument.
-</p>
+<p>These are used internally for various recording and housekeeping operations, however new
+listeners may registered on the command line through the <kbd>-listener</kbd> argument.</p>
 
-<h3><a name="Loggers">Loggers</a></h3>
+<h3 id="Loggers">Loggers</h3>
 
 <p>Loggers extend the capabilities of listeners and add the following features:</p>
 
 <ul>
-  <li>Receives a handle to the standard output and error print streams and
-  therefore can log information to the console or the <code>-logfile</code> specified file.</li>
-  <li>Logging level (-quiet, -verbose, -debug) aware</li>
+  <li>Receives a handle to the standard output and error print streams and therefore can log
+    information to the console or the <kbd>-logfile</kbd> specified file.</li>
+  <li>Logging level (<kbd>-quiet</kbd>, <kbd>-verbose</kbd>, <kbd>-debug</kbd>) aware</li>
   <li>Emacs-mode aware</li>
 </ul>
 
-<h2><a name="builtin">Built-in Listeners/Loggers</a></h2>
+<h2 id="builtin">Built-in Listeners/Loggers</h2>
 
-<table border="1" cellspacing="1" width="100%" id="AutoNumber1">
+<table>
   <tr>
-    <td width="33%">Classname</td>
-    <td width="33%">Description</td>
-    <td width="34%">Type</td>
+    <th>Classname</th>
+    <th>Description</th>
+    <th>Type</th>
   </tr>
   <tr>
-    <td width="33%"><code><a href="#DefaultLogger">org.apache.tools.ant.DefaultLogger</a></code></td>
-    <td width="33%">The logger used implicitly unless overridden with the
-    <code>-logger</code> command-line switch.</td>
-    <td width="34%">BuildLogger</td>
+    <td><code><a href="#DefaultLogger">org.apache.tools.ant.DefaultLogger</a></code></td>
+    <td>The logger used implicitly unless overridden with the <kbd>-logger</kbd> command-line
+      switch.</td>
+    <td>BuildLogger</td>
   </tr>
   <tr>
-    <td width="33%"><code><a href="#NoBannerLogger">
-    org.apache.tools.ant.NoBannerLogger</a></code></td>
-    <td width="33%">This logger omits output of empty target output.</td>
-    <td width="34%">BuildLogger</td>
+    <td><code><a href="#NoBannerLogger">org.apache.tools.ant.NoBannerLogger</a></code></td>
+    <td>This logger omits output of empty target output.</td>
+    <td>BuildLogger</td>
   </tr>
   <tr>
-    <td width="33%"><code><a href="#MailLogger">
-    org.apache.tools.ant.listener.MailLogger</a></code></td>
-    <td width="33%">Extends DefaultLogger such that output is still generated
-    the same, and when the build is finished an e-mail can be sent.</td>
-    <td width="34%">BuildLogger</td>
+    <td><code><a href="#MailLogger">org.apache.tools.ant.listener.MailLogger</a></code></td>
+    <td>Extends DefaultLogger such that output is still generated the same, and when the build is
+      finished an e-mail can be sent.</td>
+    <td>BuildLogger</td>
   </tr>
   <tr>
-    <td width="33%"><code><a href="#AnsiColorLogger">
-    org.apache.tools.ant.listener.AnsiColorLogger</a></code></td>
-    <td width="33%">Colorifies the build output.</td>
-    <td width="34%">BuildLogger</td>
+    <td><code><a href="#AnsiColorLogger">org.apache.tools.ant.listener.AnsiColorLogger</a></code></td>
+    <td>Colorifies the build output.</td>
+    <td>BuildLogger</td>
   </tr>
   <tr>
-    <td width="33%"><code><a href="#Log4jListener">
-    org.apache.tools.ant.listener.Log4jListener</a></code></td>
-    <td width="33%">
-        Passes events to Apache Log4j for highly customizable logging.<br>
-        <b>Deprecated:</b> Apache Log4j (1.x) is not developed any more. Last
-        release is 1.2.17 from 26-May-2012 and contains vulnerability issues.
-    </td>
-    <td width="34%">BuildListener</td>
+    <td><code><a href="#Log4jListener">org.apache.tools.ant.listener.Log4jListener</a></code></td>
+    <td>Passes events to Apache Log4j for highly customizable
+      logging.<br/><em><u>Deprecated</u></em>: Apache Log4j (1.x) is not developed any more. Last
+      release is 1.2.17 from 26 May 2012 and contains vulnerability issues.</td>
+    <td>BuildListener</td>
   </tr>
   <tr>
-    <td width="33%"><code><a href="#XmlLogger">org.apache.tools.ant.XmlLogger</a></code></td>
-    <td width="33%">Writes the build information to an XML file.</td>
-    <td width="34%">BuildLogger</td>
+    <td><code><a href="#XmlLogger">org.apache.tools.ant.XmlLogger</a></code></td>
+    <td>Writes the build information to an XML file.</td>
+    <td>BuildLogger</td>
   </tr>
   <tr>
-    <td width="33%"><code><a href="#TimestampedLogger">org.apache.tools.ant.TimestampedLogger</a></code></td>
-    <td width="33%">Prints the time that a build finished</td>
-    <td width="34%">BuildLogger</td>
+    <td><code><a href="#TimestampedLogger">org.apache.tools.ant.TimestampedLogger</a></code></td>
+    <td>Prints the time that a build finished</td>
+    <td>BuildLogger</td>
   </tr>
   <tr>
-    <td width="33%"><code><a href="#BigProjectLogger">org.apache.tools.ant.listener.BigProjectLogger</a></code></td>
-    <td width="33%">Prints the project name every target</td>
-    <td width="34%">BuildLogger</td>
+    <td><code><a href="#BigProjectLogger">org.apache.tools.ant.listener.BigProjectLogger</a></code></td>
+    <td>Prints the project name every target</td>
+    <td>BuildLogger</td>
   </tr>
   <tr>
-    <td width="33%"><code><a href="#SimpleBigProjectLogger">org.apache.tools.ant.listener.SimpleBigProjectLogger</a></code></td>
-    <td width="33%">Prints the project name for subprojects only, otherwise like NoBannerLogger <em>Since Ant 1.8.1</em></td>
-    <td width="34%">BuildLogger</td>
+    <td><code><a href="#SimpleBigProjectLogger">org.apache.tools.ant.listener.SimpleBigProjectLogger</a></code></td>
+    <td>Prints the project name for subprojects only, otherwise like NoBannerLogger <em>Since Ant
+    1.8.1</em></td>
+    <td>BuildLogger</td>
   </tr>
   <tr>
-    <td width="33%"><code><a href="#ProfileLogger">org.apache.tools.ant.listener.ProfileLogger</a></code></td>
-    <td width="33%">The default logger, with start times, end times and
-    durations added for each task and target.</td>
-    <td width="34%">BuildLogger</td>
+    <td><code><a href="#ProfileLogger">org.apache.tools.ant.listener.ProfileLogger</a></code></td>
+    <td>The default logger, with start times, end times and durations added for each task and
+      target.</td>
+    <td>BuildLogger</td>
   </tr>
 </table>
 
-
-
-<h3><a name="DefaultLogger">DefaultLogger</a></h3>
+<h3 id="DefaultLogger">DefaultLogger</h3>
 <p>Simply run Ant normally, or:</p>
-<blockquote>
-<p><code>ant -logger org.apache.tools.ant.DefaultLogger</code></p>
-</blockquote>
-
 
+<pre class="input">ant -logger org.apache.tools.ant.DefaultLogger</pre>
 
-<h3><a name="NoBannerLogger">NoBannerLogger</a></h3>
+<h3 id="NoBannerLogger">NoBannerLogger</h3>
 <p>Removes output of empty target output.</p>
-<blockquote>
-<p><code>ant -logger org.apache.tools.ant.NoBannerLogger</code></p>
-</blockquote>
 
+<pre class="input">ant -logger org.apache.tools.ant.NoBannerLogger</pre>
 
-
-<h3><a name="MailLogger">MailLogger</a></h3>
-<p>The MailLogger captures all output logged through DefaultLogger (standard Ant
-output) and will send success and failure messages to unique e-mail lists, with
-control for turning off success or failure messages individually.</p>
+<h3 id="MailLogger">MailLogger</h3>
+<p>The MailLogger captures all output logged through DefaultLogger (standard Ant output) and will
+send success and failure messages to unique e-mail lists, with control for turning off success or
+failure messages individually.</p>
 
 <p>Properties controlling the operation of MailLogger:</p>
-<table border="1" cellspacing="1" width="100%" id="AutoNumber2">
+<table>
   <tr>
-    <th width="337">Property</th>
-    <th width="63%">Description</th>
-    <th width="63%">Required</th>
+    <th>Property</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td width="337">MailLogger.mailhost </td>
-    <td width="63%">Mail server to use</td>
-    <td width="63%">No, default &quot;localhost&quot;</td>
+    <td><code>MailLogger.mailhost</code></td>
+    <td>Mail server to use</td>
+    <td>No; default <q>localhost</q></td>
   </tr>
   <tr>
-    <td width="337">MailLogger.port </td>
-    <td width="63%">SMTP Port for the Mail server</td>
-    <td width="63%">No, default &quot;25&quot;</td>
+    <td><code>MailLogger.port</code></td>
+    <td>SMTP Port for the Mail server</td>
+    <td>No; default <q>25</q></td>
   </tr>
   <tr>
-    <td width="337">MailLogger.user</td>
-    <td width="63%">user name for SMTP auth</td>
-    <td width="63%">Yes, if SMTP auth is required on your SMTP server<br>
-    the email message will be then sent using Mime and requires JavaMail</td>
+    <td><code>MailLogger.user</code></td>
+    <td>user name for SMTP auth</td>
+    <td>Yes, if SMTP auth is required on your SMTP server<br/> the email message will be then sent
+      using MIME and requires JavaMail</td>
   </tr>
   <tr>
-    <td width="337">MailLogger.password</td>
-    <td width="63%">password for SMTP auth</td>
-    <td width="63%">Yes, if SMTP auth is required on your SMTP server<br>
-    the email message will be then sent using Mime and requires JavaMail</td>
+    <td><code>MailLogger.password</code></td>
+    <td>password for SMTP auth</td>
+    <td>Yes, if SMTP auth is required on your SMTP server<br/> the email message will be then sent
+      using MIME and requires JavaMail</td>
   </tr>
   <tr>
-    <td width="337">MailLogger.ssl</td>
-    <td width="63%">on or true if ssl is needed<br>
-    This feature requires JavaMail</td>
-    <td width="63%">
-    no</td>
+    <td><code>MailLogger.ssl</code></td>
+    <td>on or true if SSL is needed<br/>This feature requires JavaMail</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td width="337">MailLogger.from</td>
-    <td width="63%">Mail &quot;from&quot; address</td>
-    <td width="63%">Yes, if mail needs to be sent</td>
+    <td><code>MailLogger.from</code></td>
+    <td>Mail <q>from</q> address</td>
+    <td>Yes, if mail needs to be sent</td>
   </tr>
   <tr>
-    <td width="337">MailLogger.replyto</td>
-    <td width="63%">Mail &quot;replyto&quot; address(es), comma-separated</td>
-    <td width="63%">No</td>
+    <td><code>MailLogger.replyto</code></td>
+    <td>Mail <q>replyto</q> address(es), comma-separated</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td width="337">MailLogger.failure.notify </td>
-    <td width="63%">Send build failure e-mails?</td>
-    <td width="63%">No, default &quot;true&quot;</td>
+    <td><code>MailLogger.failure.notify</code></td>
+    <td>Send build failure e-mails?</td>
+    <td>No; default <q>true</q></td>
   </tr>
   <tr>
-    <td width="337">MailLogger.success.notify </td>
-    <td width="63%">Send build success e-mails?</td>
-    <td width="63%">No, default &quot;true&quot;</td>
+    <td><code>MailLogger.success.notify</code></td>
+    <td>Send build success e-mails?</td>
+    <td>No; default <q>true</q></td>
   </tr>
   <tr>
-    <td width="337">MailLogger.failure.to </td>
-    <td width="63%">Address(es) to send failure messages to, comma-separated</td>
-    <td width="63%">Yes, if failure mail is to be sent</td>
+    <td><code>MailLogger.failure.to</code></td>
+    <td>Address(es) to send failure messages to, comma-separated</td>
+    <td>Yes, if failure mail is to be sent</td>
   </tr>
   <tr>
-    <td width="337">MailLogger.success.to </td>
-    <td width="63%">Address(es) to send success messages to, comma-separated</td>
-    <td width="63%">Yes, if success mail is to be sent</td>
+    <td><code>MailLogger.success.to</code></td>
+    <td>Address(es) to send success messages to, comma-separated</td>
+    <td>Yes, if success mail is to be sent</td>
   </tr>
   <tr>
-    <td width="337">MailLogger.failure.cc </td>
-    <td width="63%">Address(es) to send failure messages to carbon copy (cc), comma-separated</td>
-    <td width="63%">No</td>
+    <td><code>MailLogger.failure.cc</code></td>
+    <td>Address(es) to send failure messages to carbon copy (cc), comma-separated</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td width="337">MailLogger.success.cc </td>
-    <td width="63%">Address(es) to send success messages to carbon copy (cc), comma-separated</td>
-    <td width="63%">No</td>
+    <td><code>MailLogger.success.cc</code></td>
+    <td>Address(es) to send success messages to carbon copy (cc), comma-separated</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td width="337">MailLogger.failure.bcc </td>
-    <td width="63%">Address(es) to send failure messages to blind carbon copy (bcc), comma-separated</td>
-    <td width="63%">No</td>
+    <td><code>MailLogger.failure.bcc</code></td>
+    <td>Address(es) to send failure messages to blind carbon copy (bcc), comma-separated</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td width="337">MailLogger.success.bcc </td>
-    <td width="63%">Address(es) to send success messages to blind carbon copy (bcc), comma-separated</td>
-    <td width="63%">No</td>
+    <td><code>MailLogger.success.bcc</code></td>
+    <td>Address(es) to send success messages to blind carbon copy (bcc), comma-separated</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td width="337">MailLogger.failure.subject </td>
-    <td width="63%">Subject of failed build</td>
-    <td width="63%">No, default &quot;Build Failure&quot;</td>
+    <td><code>MailLogger.failure.subject</code></td>
+    <td>Subject of failed build</td>
+    <td>No; default <q>Build Failure</q></td>
   </tr>
   <tr>
-    <td width="337">MailLogger.success.subject </td>
-    <td width="63%">Subject of successful build</td>
-    <td width="63%">No, default &quot;Build Success&quot;</td>
+    <td><code>MailLogger.success.subject</code></td>
+    <td>Subject of successful build</td>
+    <td>No; default <q>Build Success</q></td>
   </tr>
   <tr>
-    <td width="337">MailLogger.failure.body</td>
-    <td width="63%">Fixed body of the email for a failed
-      build.  <em>Since Ant 1.8.0</em></td>
-    <td width="63%">No, default is to send the full log output.</td>
+    <td><code>MailLogger.failure.body</code></td>
+    <td>Fixed body of the email for a failed build.  <em>Since Ant 1.8.0</em></td>
+    <td>No; default is to send the full log output</td>
   </tr>
   <tr>
-    <td width="337">MailLogger.success.body</td>
-    <td width="63%">Fixed body of the email for a successful
-      build.  <em>Since Ant 1.8.0</em></td>
-    <td width="63%">No, default is to send the full log output.</td>
+    <td><code>MailLogger.success.body</code></td>
+    <td>Fixed body of the email for a successful build.  <em>Since Ant 1.8.0</em></td>
+    <td>No; default is to send the full log output</td>
   </tr>
   <tr>
-    <td width="337">MailLogger.mimeType</td>
-    <td width="63%">MIME-Type of the message.  <em>Since Ant 1.8.0</em></td>
-    <td width="63%">No, default is text/plain</td>
+    <td><code>MailLogger.mimeType</code></td>
+    <td>MIME-Type of the message.  <em>Since Ant 1.8.0</em></td>
+    <td>No; default is <q>text/plain</q></td>
   </tr>
   <tr>
-    <td width="337">MailLogger.charset</td>
-    <td width="63%">Character set of the message.  <em>Since Ant 1.8.0</em></td>
-    <td width="63%">No</td>
+    <td><code>MailLogger.charset</code></td>
+    <td>Character set of the message.  <em>Since Ant 1.8.0</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td width="337">MailLogger.starttls.enable</td>
-    <td width="63%">on or true if STARTTLS should be supported
-    (requires JavaMail).  <em>Since Ant 1.8.0</em></td>
-    <td width="63%">No, default is false</td>
+    <td><code>MailLogger.starttls.enable</code></td>
+    <td>on or true if <code>STARTTLS</code> should be supported (requires JavaMail).  <em>Since Ant
+      1.8.0</em></td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td width="337">MailLogger.properties.file </td>
-    <td width="63%">Filename of properties file that will override other values.</td>
-    <td width="63%">No</td>
+    <td><code>MailLogger.properties.file</code></td>
+    <td>Filename of properties file that will override other values.</td>
+    <td>No</td>
   </tr>
 </table>
 
-<blockquote>
-<p><code>ant -logger org.apache.tools.ant.listener.MailLogger</code></p>
-</blockquote>
-
+<pre class="input">ant -logger org.apache.tools.ant.listener.MailLogger</pre>
 
+<h3 id="AnsiColorLogger">AnsiColorLogger</h3>
 
-<h3><a name="AnsiColorLogger">AnsiColorLogger</a></h3>
-
-<p>The AnsiColorLogger adds color to the standard Ant output
-by prefixing and suffixing ANSI color code escape sequences to
-it.  It is just an extension of <a href="#DefaultLogger">DefaultLogger</a>
+<p>The AnsiColorLogger adds color to the standard Ant output by prefixing and suffixing ANSI color
+code escape sequences to it.  It is just an extension of <a href="#DefaultLogger">DefaultLogger</a>
 and hence provides all features that DefaultLogger does.</p>
-<p>AnsiColorLogger differentiates the output by assigning
-different colors depending upon the type of the message.</p>
-<p>If used with the -logfile option, the output file
-will contain all the necessary escape codes to
-display the text in colorized mode when displayed
-in the console using applications like cat, more, etc.</p>
-<p>This is designed to work on terminals that support ANSI
-color codes.  It works on XTerm, ETerm, Win9x Console
-(with ANSI.SYS loaded.), etc.</p>
-<p><Strong>NOTE:</Strong>
-It doesn't work on WinNT and successors, even when a COMMAND.COM console loaded with
-ANSI.SYS is used.</p>
-<p>If the user wishes to override the default colors
-with custom ones, a file containing zero or more of the
-custom color key-value pairs must be created.  The recognized keys
-and their default values are shown below:</p><code><pre>
+<p>AnsiColorLogger differentiates the output by assigning different colors depending upon the type
+of the message.</p>
+<p>If used with the <kbd>-logfile</kbd> option, the output file will contain all the necessary
+escape codes to display the text in colorized mode when displayed in the console using applications
+like <code>cat</code>, <code>more</code>, etc.</p>
+<p>This is designed to work on terminals that support ANSI color codes.  It works on XTerm, ETerm,
+Win9x Console (with <code>ANSI.SYS</code> loaded.), etc.</p>
+<p><strong>Note</strong>: It doesn't work on WinNT and successors, even when
+a <code>COMMAND.COM</code> console loaded with <code>ANSI.SYS</code> is used.</p>
+<p>If the user wishes to override the default colors with custom ones, a file containing zero or
+more of the custom color key-value pairs must be created.  The recognized keys and their default
+values are shown below:</p>
+<pre>
 AnsiColorLogger.ERROR_COLOR=2;31
 AnsiColorLogger.WARNING_COLOR=2;35
 AnsiColorLogger.INFO_COLOR=2;36
 AnsiColorLogger.VERBOSE_COLOR=2;32
-AnsiColorLogger.DEBUG_COLOR=2;34</pre></code>
-<p>Each key takes as value a color combination defined as
-<b>Attribute;Foreground;Background</b>.  In the above example, background
-value has not been used.</p>
+AnsiColorLogger.DEBUG_COLOR=2;34</pre>
+<p>Each key takes as value a color combination defined as <q>Attribute;Foreground;Background</q>.
+In the above example, background value has not been used.</p>
 <p>This file must be specified as the value of a system variable
-named ant.logger.defaults and passed as an argument using the -D
-option to the <b>java</b> command that invokes the Ant application.
-An easy way to achieve this is to add -Dant.logger.defaults=
-<i>/path/to/your/file</i> to the ANT_OPTS environment variable.
-Ant's launching script recognizes this flag and will pass it to
-the java command appropriately.</p>
-<p>Format:</p><pre>
+named <code>ant.logger.defaults</code> and passed as an argument using the <kbd>-D</kbd> option to
+the <kbd>java</kbd> command that invokes the Ant application. An easy way to achieve this is to
+add <kbd>-Dant.logger.defaults=</kbd><samp class="input">/path/to/your/file</samp> to
+the <code>ANT_OPTS</code> environment variable. Ant's launching script recognizes this flag and will
+pass it to the <kbd>java</kbd> command appropriately.</p>
+<p>Format:</p>
+<pre>
 AnsiColorLogger.*=Attribute;Foreground;Background
 
 Attribute is one of the following:
-0 -&gt; Reset All Attributes (return to normal mode)
-1 -&gt; Bright (Usually turns on BOLD)
-2 -&gt; Dim
-3 -&gt; Underline
-5 -&gt; link
-7 -&gt; Reverse
-8 -&gt; Hidden
+0 &rarr; Reset All Attributes (return to normal mode)
+1 &rarr; Bright (Usually turns on BOLD)
+2 &rarr; Dim
+3 &rarr; Underline
+5 &rarr; link
+7 &rarr; Reverse
+8 &rarr; Hidden
 
 Foreground is one of the following:
-30 -&gt; Black
-31 -&gt; Red
-32 -&gt; Green
-33 -&gt; Yellow
-34 -&gt; Blue
-35 -&gt; Magenta
-36 -&gt; Cyan
-37 -&gt; White
+30 &rarr; Black
+31 &rarr; Red
+32 &rarr; Green
+33 &rarr; Yellow
+34 &rarr; Blue
+35 &rarr; Magenta
+36 &rarr; Cyan
+37 &rarr; White
 
 Background is one of the following:
-40 -&gt; Black
-41 -&gt; Red
-42 -&gt; Green
-43 -&gt; Yellow
-44 -&gt; Blue
-45 -&gt; Magenta
-46 -&gt; Cyan
-47 -&gt; White</pre>
-
-<blockquote>
-<p><code>ant -logger org.apache.tools.ant.listener.AnsiColorLogger</code></p>
-</blockquote>
+40 &rarr; Black
+41 &rarr; Red
+42 &rarr; Green
+43 &rarr; Yellow
+44 &rarr; Blue
+45 &rarr; Magenta
+46 &rarr; Cyan
+47 &rarr; White</pre>
+
+<pre class="input">ant -logger org.apache.tools.ant.listener.AnsiColorLogger</pre>
+
+<h3 id="Log4jListener">Log4jListener</h3>
+<p><em><u>Deprecated</u></em>: Apache Log4j (1) is not developed any more. Last release is 1.2.17
+from 26 May 2012 and contains vulnerability issues.</p>
+<p>Passes build events to Log4j, using the full classname's of the generator of each build event as
+the category:</p>
+<ul>
+  <li>build started / build finished&mdash;<code class="code">org.apache.tools.ant.Project</code></li>
+  <li>target started / target finished&mdash;<code class="code">org.apache.tools.ant.Target</code></li>
+  <li>task started / task finished&mdash;the fully qualified classname of the task</li>
+  <li>message logged&mdash;the classname of one of the above, so if a task logs a message, its
+    classname is the category used, and so on.</li>
+</ul>
+<p>All start events are logged as INFO. Finish events are either logged as INFO or ERROR depending
+on whether the build failed during that stage. Message events are logged according to their Ant
+logging level, mapping directly to a corresponding Log4j level.</p>
 
+<pre class="input">ant -listener org.apache.tools.ant.listener.Log4jListener</pre>
 
+<p>To use Log4j you will need the Log4j JAR file and a <samp>log4j.properties</samp> configuration
+file.  Both should be placed somewhere in your Ant classpath. If the <samp>log4j.properties</samp>
+is in your project root folder you can add this with <kbd>-lib</kbd> option:</p>
 
-<h3><a name="Log4jListener">Log4jListener</a></h3>
-<p><b>Deprecated:</b> Apache Log4j (1) is not developed any more. Last
-release is 1.2.17 from 26-May-2012 and contains vulnerability issues.</p>
-<p>Passes build events to Log4j, using the full classname's of the generator of
-each build event as the category:</p>
-<ul>
-  <li>build started / build finished - org.apache.tools.ant.Project</li>
-  <li>target started / target finished - org.apache.tools.ant.Target</li>
-  <li>task started / task finished - the fully qualified classname of the task</li>
-  <li>message logged - the classname of one of the above, so if a task logs a
-  message, its classname is the category used, and so on.</li>
-</ul>
-<p>All start events are logged as INFO.&nbsp; Finish events are either logged as
-INFO or ERROR depending on whether the build failed during that stage. Message
-events are logged according to their Ant logging level, mapping directly to a
-corresponding Log4j level.</p>
-
-<blockquote>
-<p><code>ant -listener org.apache.tools.ant.listener.Log4jListener</code></p>
-</blockquote>
-
-<p>To use Log4j you will need the Log4j JAR file and a 'log4j.properties'
-configuration file.  Both should be placed somewhere in your Ant
-classpath. If the log4j.properties is in your project root folder you can
-add this with <i>-lib</i> option:</p>
-
-<blockquote>
-<pre><code>ant -listener org.apache.tools.ant.listener.Log4jListener -lib .</code></pre>
-</blockquote>
-
-<p>If, for example, you wanted to capture the same information output to the
-console by the DefaultLogger and send it to a file named 'build.log', you
-could use the following configuration:</p>
+<pre class="input">ant -listener org.apache.tools.ant.listener.Log4jListener -lib .</pre>
+
+<p>If, for example, you wanted to capture the same information output to the console by the
+DefaultLogger and send it to a file named <samp>build.log</samp>, you could use the following
+configuration:</p>
 
-<blockquote>
-<pre><code>log4j.rootLogger=ERROR, LogFile
+<pre>
+log4j.rootLogger=ERROR, LogFile
 log4j.logger.org.apache.tools.ant.Project=INFO
 log4j.logger.org.apache.tools.ant.Target=INFO
 log4j.logger.org.apache.tools.ant.taskdefs=INFO
@@ -411,28 +372,26 @@
 log4j.appender.LogFile=org.apache.log4j.FileAppender
 log4j.appender.LogFile.layout=org.apache.log4j.PatternLayout
 log4j.appender.LogFile.layout.ConversionPattern=[%6r] %8c{1} : %m%n
-log4j.appender.LogFile.file=build.log
-</code></pre>
-</blockquote>
+log4j.appender.LogFile.file=build.log</pre>
 
-<p>For more information about configuring Log4J see <a href="http://logging.apache.org/log4j/docs/documentation.html">its
-documentation page</a>.</p>
+<p>For more information about configuring Log4J see <a href="https://logging.apache.org/log4j/1.2/"
+target="_top">its documentation page</a>.</p>
 
 <h4>Using the Log4j 1.2 Bridge</h4>
-You could use the <a href="http://logging.apache.org/log4j/2.x/log4j-1.2-api/index.html">Log4j Bridge</a>
-if your application is written against the Log4j (1.x) API, but you want to use the Log4j 2.x runtime.
-For using the bridge with Ant you have to add
+<p>You could use the <a href="https://logging.apache.org/log4j/2.x/log4j-1.2-api/index.html"
+target="_top">Log4j Bridge</a> if your application is written against the Log4j (1.x) API, but you
+want to use the Log4j 2.x runtime.  For using the bridge with Ant you have to add</p>
 <ul>
-  <li>log4j-1.2-api-${log4j.version}.jar</li>
-  <li>log4j-api-${log4j.version}.jar</li>
-  <li>log4j-core-${log4j.version}.jar</li>
-  <li>log4j2.xml</li>
+  <li><samp>log4j-1.2-api-${log4j.version}.jar</samp></li>
+  <li><samp>log4j-api-${log4j.version}.jar</samp></li>
+  <li><samp>log4j-core-${log4j.version}.jar</samp></li>
+  <li><samp>log4j2.xml</samp></li>
 </ul>
-to your classpath (e.g. via the <code>-lib</code> option).
-(For using the bridge Ant 1.9.10/1.10.2 or higher is required.)
-Translating the 1.x properties file into the 2.x xml syntax would result in
-<blockquote>
-<pre><code>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
+<p>to your classpath, e.g. via the <kbd>-lib</kbd> option.  (For using the bridge, Ant
+1.9.10/1.10.2 or higher is required.)  Translating the 1.x properties file into the 2.x XML syntax
+would result in</p>
+<pre>
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 &lt;Configuration status=&quot;WARN&quot;&gt;
   &lt;Appenders&gt;
     &lt;File name=&quot;file&quot; fileName=&quot;build.log&quot;&gt;
@@ -450,55 +409,34 @@
     &lt;Logger name=&quot;org.apache.tools.ant.taskdefs&quot; level=&quot;INFO&quot;/&gt;
     &lt;Logger name=&quot;org.apache.tools.ant.taskdefs.Echo&quot; level=&quot;WARN&quot;/&gt;
   &lt;/Loggers&gt;
-&lt;/Configuration&gt;
-</code></pre>
-</blockquote>
-
-
+&lt;/Configuration&gt;</pre>
 
-<h3><a name="XmlLogger">XmlLogger</a></h3>
-<p>Writes all build information out to an XML file named log.xml, or the value
-of the <code>XmlLogger.file</code> property if present, when used as a
-listener. When used as a logger, it writes all output to either the
-console or to the value of <code>-logfile</code>. Whether used as a listener
-or logger, the output is not generated until the build is complete, as it
-buffers the information in order to provide timing information for task,
-targets, and the project.</p>
-<p>By default the XML file creates a reference to an XSLT file "log.xsl" in the current directory;
-look in ANT_HOME/etc for one of these. You can set the property
-<code>ant.XmlLogger.stylesheet.uri</code> to provide a uri to a style sheet.
-this can be a relative or absolute file path, or an http URL.
-If you set the property to the empty string, "", no XSLT transform
-is declared at all.</p>
-
-<blockquote>
-<p><code>ant -listener org.apache.tools.ant.XmlLogger</code><br>
-<code>ant -logger org.apache.tools.ant.XmlLogger -verbose -logfile build_log.xml</code></p>
-</blockquote>
-
-
-
-<h3><a name="TimestampedLogger">TimestampedLogger</a></h3>
-<p>
-  Acts like the default logger, except that the final success/failure message also includes
-  the time that the build completed. For example:
-</p>
-<pre>
-  BUILD SUCCESSFUL - at 16/08/05 16:24
-</pre>
+<h3 id="XmlLogger">XmlLogger</h3>
+<p>Writes all build information out to an XML file named <samp>log.xml</samp>, or the value of
+the <code>XmlLogger.file</code> property if present, when used as a listener. When used as a logger,
+it writes all output to either the console or to the value of <kbd>-logfile</kbd>. Whether used as
+a listener or logger, the output is not generated until the build is complete, as it buffers the
+information in order to provide timing information for task, targets, and the project.</p>
+<p>By default the XML file creates a reference to an XSLT file <samp>log.xsl</samp> in the current
+directory; look in <samp>ANT_HOME/etc</samp> for one of these. You can set the
+property <code>ant.XmlLogger.stylesheet.uri</code> to provide a URI to a style sheet. This can be a
+relative or absolute file path, or an HTTP URL. If you set the property to the empty
+string, <q></q>, no XSLT transform is declared at all.</p>
+
+<pre class="input">ant -listener org.apache.tools.ant.XmlLogger
+ant -logger org.apache.tools.ant.XmlLogger -verbose -logfile build_log.xml</pre>
+
+<h3 id="TimestampedLogger">TimestampedLogger</h3>
+<p>Acts like the default logger, except that the final success/failure message also includes the
+time that the build completed. For example:</p>
+<pre class="output">BUILD SUCCESSFUL - at 16/08/05 16:24</pre>
 <p>To use this listener, use the command:</p>
 
-<blockquote>
-<code>ant  -logger org.apache.tools.ant.listener.TimestampedLogger</code>
-</blockquote>
+<pre class="input">ant -logger org.apache.tools.ant.listener.TimestampedLogger</pre>
 
-
-
-<h3><a name="BigProjectLogger">BigProjectLogger</a></h3>
-<p>
-  This logger is designed to make examining the logs of a big build easier,
-  especially those run under continuous integration tools. It
-</p>
+<h3 id="BigProjectLogger">BigProjectLogger</h3>
+<p>This logger is designed to make examining the logs of a big build easier, especially those run
+under continuous integration tools. It</p>
 <ol>
   <li>When entering a child project, prints its name and directory</li>
   <li>When exiting a child project, prints its name</li>
@@ -506,14 +444,10 @@
   <li>Omits logging the names of all targets that have no direct task output</li>
   <li>Includes the build finished timestamp of the TimeStamp logger</li>
 </ol>
-<p>
-  This is useful when using &lt;subant&gt; to build a large project
-  from many smaller projects -the output shows which particular
-  project is building. Here is an example in which "clean" is being called
-  on all a number of child projects, only some of which perform work:
-</p>
-<pre>
-
+<p>This is useful when using <code>&lt;subant&gt;</code> to build a large project from many smaller
+projects&mdash;the output shows which particular project is building. Here is an example in which
+"clean" is being called on all a number of child projects, only some of which perform work:</p>
+<pre class="output">
 ======================================================================
 Entering project "xunit"
 In /home/ant/components/xunit
@@ -534,25 +468,19 @@
 
 ======================================================================
 Exiting project "junit"
-======================================================================
-</pre>
+======================================================================</pre>
 
-<p>
-  The entry and exit messages are very verbose in this example, but in
-  a big project compiling or testing many child components, the messages
-  are reduced to becoming clear delimiters of where different projects
-  are in charge -or more importantly, which project is failing.
-</p>
+<p>The entry and exit messages are very verbose in this example, but in a big project compiling or
+testing many child components, the messages are reduced to becoming clear delimiters of where
+different projects are in charge&mdash;or, more importantly, which project is failing.</p>
 <p>To use this listener, use the command:</p>
-<blockquote>
-<code>ant  -logger org.apache.tools.ant.listener.BigProjectLogger</code>
-</blockquote>
-
-<h3><a name="SimpleBigProjectLogger">SimpleBigProjectLogger</a></h3>
-<p>Like <code>BigProjectLogger</code>, project-qualified target names are printed,
-useful for big builds with subprojects.
-Otherwise it is as quiet as <code>NoBannerLogger</code>:</p>
-<pre>
+<pre class="input">ant -logger org.apache.tools.ant.listener.BigProjectLogger</pre>
+
+<h3 id="SimpleBigProjectLogger">SimpleBigProjectLogger</h3>
+<p><em>Since Ant 1.8.1</em></p>
+<p>Like <code>BigProjectLogger</code>, project-qualified target names are printed, useful for big
+builds with subprojects. Otherwise it is as quiet as <code>NoBannerLogger</code>:</p>
+<pre class="output">
 Buildfile: /sources/myapp/build.xml
 
 myapp-lib.compile:
@@ -570,20 +498,16 @@
 Building jar: /sources/myapp/build/myapp.jar
 
 BUILD SUCCESSFUL
-Total time: 1 second
-</pre>
-<p><b>since Ant 1.8.1</b></p>
+Total time: 1 second</pre>
 <p>To use this listener, use the command:</p>
-<blockquote>
-<code>ant -logger org.apache.tools.ant.listener.SimpleBigProjectLogger</code>
-</blockquote>
+<pre class="input">ant -logger org.apache.tools.ant.listener.SimpleBigProjectLogger</pre>
 
-<h3><a name="ProfileLogger">ProfileLogger</a></h3>
-<p>This logger stores the time needed for executing a task, target and the whole build and prints
-these information. The output contains a timestamp when entering the build, target or task and a timestamp and the needed time when exiting.
-</p>
+<h3 id="ProfileLogger">ProfileLogger</h3>
 <!-- This is the 'since' as described in the Loggers JavaDoc -->
-<p><b>since Ant 1.8.0</b></p>
+<p><em>Since Ant 1.8.0</em></p>
+<p>This logger stores the time needed for executing a task, target and the whole build and prints
+these information. The output contains a timestamp when entering the build, target or task and a
+timestamp and the needed time when exiting.</p>
 <h4>Example</h4>
 Having that buildfile
 <pre>
@@ -597,10 +521,10 @@
     &lt;target name=&quot;anotherTarget&quot; depends=&quot;aTarget&quot;&gt;
         &lt;echo&gt;another-echo-task&lt;/echo&gt;
     &lt;/target&gt;
-&lt;/project&gt;
-</pre>
-and executing with <tt>ant -logger org.apache.tools.ant.listener.ProfileLogger anotherTarget</tt> gives that output (with other timestamps and duration of course ;) :
-<pre>
+&lt;/project&gt;</pre>
+<p>and executing with <kbd>ant -logger org.apache.tools.ant.listener.ProfileLogger
+anotherTarget</kbd> gives that output (with other timestamps and duration of course ;-):</p>
+<pre class="output">
 Buildfile: ...\build.xml
 
 Target aTarget: started Thu Jan 22 09:01:00 CET 2009
@@ -627,36 +551,34 @@
 Target anotherTarget: finished Thu Jan 22 09:01:01 CET 2009 (0ms)
 
 BUILD SUCCESSFUL
-Total time: 2 seconds
-</pre>
-
-
+Total time: 2 seconds</pre>
 
-<h2><a name="dev">Writing your own</a></h2>
+<h2 id="dev">Writing your own</h2>
 
-<p>See the <a href="develop.html#buildevents">Build Events</a> section for
-developers.</p>
+<p>See the <a href="develop.html#buildevents">Build Events</a> section for developers.</p>
 
 <p>Notes:</p>
 
 <ul>
   <li>
-    A listener or logger should not write to standard output or error in the <code>messageLogged()</code> method;
-    Ant captures these internally and it will trigger an infinite loop.
+    A listener or logger should not write to standard output or error in
+    the <code class="code">messageLogged()</code> method; Ant captures these internally and it will
+    trigger an infinite loop.
   </li>
   <li>
-    Logging is synchronous; all listeners and loggers are called one after the other, with the build blocking until
-    the output is processed. Slow logging means a slow build.
+    Logging is synchronous; all listeners and loggers are called one after the other, with the build
+    blocking until the output is processed. Slow logging means a slow build.
   </li>
-  <li>When a build is started, and <code>BuildListener.buildStarted(BuildEvent event)</code> is called,
-    the project is not fully functional. The build has started, yes, and the <code>event.getProject()</code> method call
-    returns the Project instance, but that project is initialized with JVM and ant properties, nor has it
-    parsed the build file yet. You cannot call <code>Project.getProperty()</code> for property lookup, or
-    <code>Project.getName()</code> to get the project name (it will return null).
+  <li>When a build is started, and <code class="code">BuildListener.buildStarted(BuildEvent
+    event)</code> is called, the project is not fully functional. The build has started, yes, and
+    the <code class="code">event.getProject()</code> method call returns the Project instance, but
+    that project is initialized with JVM and Ant properties, nor has it parsed the build file
+    yet. You cannot call <code class="code">Project.getProperty()</code> for property lookup, or
+    <code class="code">Project.getName()</code> to get the project name (it will return null).
   </li>
   <li>
-    Classes that implement <code>org.apache.tools.ant.SubBuildListener</code> receive notifications when child projects
-    start and stop.
+    Classes that implement <code class="code">org.apache.tools.ant.SubBuildListener</code> receive
+    notifications when child projects start and stop.
   </li>
 </ul>
 
diff -Nru ant-1.9.10/manual/platform.html ant-1.10.3/manual/platform.html
--- ant-1.9.10/manual/platform.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/platform.html	2018-03-24 12:37:12.000000000 +0000
@@ -15,114 +15,99 @@
    limitations under the License.
 -->
 <html>
-
 <head>
 <meta http-equiv="Content-Language" content="en-us">
 <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
 <title>Platform Issues</title>
 </head>
+<body>
 
 <h1>Platform Issues</h1>
 
 <h2>Java versions</h2>
-<h3>Java 1.5</h3>
-
-You may need a bigger stack than default, especially if you are using the built in
-XSLT engine. We recommend you use Apache Xalan; indeed, some tasks (JUnit report in XML,
-for example) may not work against the shipping XSL engine.
+<h3>Java 5</h3>
+<p>
+You may need a bigger stack than default, especially if you are using the built in XSLT engine. We
+recommend you use Apache Xalan; indeed, some tasks (JUnit report in XML, for example) may not work
+against the shipping XSL engine.
+</p>
 
 <h2>Unix and Linux</h2>
-
 <ul>
-<li> You should use a GNU version of <tt>tar</tt> to untar the Apache 
-Ant source tree, if you have downloaded this as a tar file. If you get
-weird errors about missing files, this is the problem. 
-</li>
-<li> Ant does not preserve file permissions when a file is copied, moved or 
-archived, because Java does not let it read or write the permissions.
- Use <tt>&lt;chmod&gt;</tt> to set permissions, and when creating a 
-tar archive, use the <tt>mode</tt> attribute of <tt>&lt;tarfileset&gt;</tt>
-to set the permissions in the tar file, or <code>&lt;apply&gt;</code> the real tar program.
-</li>
-<li> Ant is not symbolic link aware in moves, deletes and when recursing down a tree
-of directories to build up a list of files. Unexpected things can happen.
-</li>
-<li> Linux on IA-64: apparently you need a larger heap than the default
-one (64M) to compile big projects. If you get out of heap
-errors, either increase the heap or use a forking javac. Better yet,
-use jikes for extra compilation speed.   
-</li>
-
+<li>You should use a GNU version of <kbd>tar</kbd> to untar the Apache Ant source tree, if you have
+downloaded this as a tar file. If you get weird errors about missing files, this is the
+problem.</li>
+<li>Ant does not preserve file permissions when a file is copied, moved or archived, because Java
+does not let it read or write the permissions.  Use <code>&lt;chmod&gt;</code> to set permissions,
+and when creating a tar archive, use the <var>mode</var> attribute
+of <code>&lt;tarfileset&gt;</code> to set the permissions in the tar file,
+or <code>&lt;apply&gt;</code> the real <kbd>tar</kbd> program.</li>
+<li>Ant is not symbolic link aware in moves, deletes and when recursing down a tree of directories
+to build up a list of files. Unexpected things can happen.</li>
+<li>Linux on IA-64: apparently you need a larger heap than the default one (64M) to compile big
+projects. If you get out of heap errors, either increase the heap or use a
+forking <code>&lt;javac&gt;</code>. Better yet, use <kbd>jikes</kbd> for extra compilation
+speed.</li>
 </ul>
 
-
 <h2>Microsoft Windows</h2>
 <p>
-Windows 9x (win95, win98, win98SE and winME) are not supported in Ant1.7,
+Windows 9x (win95, win98, win98SE and winME) are not supported <em>since Ant 1.7</em>.
 </p>
-
 <p>
-The Ant team has retired support for these products because they are outdated and
-can expose customers to security risks. We recommend that customers who are
-still running Windows 98 or Windows Me upgrade to a newer, more secure 
-operating system, as soon as possible.
+The Ant team has retired support for these products because they are outdated and can expose
+customers to security risks. We recommend that customers who are still running Windows 98 or Windows
+ME upgrade to a newer, more secure operating system, as soon as possible.
 </p>
 <p>
-Customers who upgrade to Linux report improved security, richer
-functionality, and increased productivity. 
+Customers who upgrade to Linux report improved security, richer functionality, and increased
+productivity.
 </p>
-<h2>Microsoft Windows 2K, XP and Server 2K03 </h2>
 
+<h2>Microsoft Windows 2K, XP and Server 2K03</h2>
 <p>
-Windows 9x (win95, win98, win98SE and winME) has a batch file system which
-does not work fully with long file names, so we recommend that ant and the JDK
-are installed into directories without spaces, and with 8.3 filenames. 
-The Perl and Python launcher scripts do not suffer from this limitation.
+Windows 9x (win95, win98, win98SE and winME) has a batch file system which does not work fully with
+long file names, so we recommend that Ant and JDK are installed into directories without spaces, and
+with 8.3 filenames.  The Perl and Python launcher scripts do not suffer from this limitation.
 </p>
 <p>
-All versions of windows are usually case insensitive, although mounted 
-file systems (Unix drives, Clearcase views) can be case sensitive underneath,
-confusing patternsets.
+All versions of Windows are usually case insensitive, although mounted file systems (Unix drives,
+ClearCase views) can be case sensitive underneath, confusing patternsets.
 </p>
 <p>
-Ant can often not delete a directory which is open in an Explorer window. 
-There is nothing we can do about this short of spawning a program to kill
-the shell before deleting directories.
-Nor can files that are in use be overwritten.
+Ant can often not delete a directory which is open in an Explorer window.  There is nothing we can
+do about this short of spawning a program to kill the shell before deleting directories.  Nor can
+files that are in use be overwritten.
 </p>
 <p>
-    Finally, if any Ant task fails with an IOError=2, it means that whatever
-    native program Ant is trying to run, it is not on the path.
+Finally, if any Ant task fails with an <code>error=2</code>, it means that whatever native program
+Ant is trying to run, it is not on the <code>Path</code>.
 </p>
 
 <h2>Microsoft Windows Vista</h2>
 <p>
-    There are reports of problems with Windows Vista security bringing up
-    dialog boxes asking if the user wants to run an untrusted executable
-    during an ant run, such as when the &lt;signjar&gt task runs the jarsigner.exe
-    program. This is beyond Ant's control, and stems from the OS trying to provide
-    some illusion of security by being reluctant to run unsigned native executables.
-    The latest Java versions appear to resolve this problem by having signed
-    binaries. 
+There are reports of problems with Windows Vista security bringing up dialog boxes asking if the
+user wants to run an untrusted executable during an Ant run, such as when
+the <code>&lt;signjar&gt;</code> task runs the <kbd>jarsigner.exe</kbd> program. This is beyond
+Ant's control, and stems from the OS trying to provide some illusion of security by being reluctant
+to run unsigned native executables.  The latest Java versions appear to resolve this problem by
+having signed binaries.
 </p>
 
-
 <h2>Cygwin</h2>
-
-Cygwin is not an operating system; rather it is an application suite 
-running under Windows and providing some UNIX like functionality. Sun has 
-not created any specific Java Development Kit or Java Runtime Environment for 
-cygwin. See this link : 
-<a href="http://www.inonit.com/cygwin/faq/">http://www.inonit.com/cygwin/faq/</a> . 
-Only Windows path 
-names are supported by JDK and JRE tools under Windows or cygwin. Relative path 
-names such as "src/org/apache/tools" are supported, but Java tools do not 
-understand /cygdrive/c to mean c:\.
-<p>
-The utility cygpath (used industrially in the ant script to support cygwin) can 
-convert cygwin path names to Windows.
-You can use the <code>&lt;exec&gt;</code> task in ant to convert cygwin paths to Windows path, for 
-instance like that :
+<p>
+Cygwin is not an operating system; rather it is an application suite running under Windows and
+providing some UNIX like functionality. Sun has not created any specific Java Development Kit or
+Java Runtime Environment for cygwin. See this link: <a href="http://www.inonit.com/cygwin/faq/"
+target="_top">http://www.inonit.com/cygwin/faq/</a>.  Only Windows path names are supported by JDK
+and JRE tools under Windows or cygwin. Relative path names such as <samp>src/org/apache/tools</samp>
+are supported, but Java tools do not understand <samp>/cygdrive/c</samp> to mean <samp>c:\</samp>.
+</p>
+<p>
+The utility <kbd>cygpath</kbd> (used industrially in the <kbd>ant</kbd> script to support
+cygwin) can convert cygwin path names to Windows.  You can use the <code>&lt;exec&gt;</code> task in
+Ant to convert cygwin paths to Windows path, for instance like that:
+</p>
 <pre>
 &lt;property name=&quot;some.cygwin.path&quot; value=&quot;/cygdrive/h/somepath&quot;/&gt;
 &lt;exec executable=&quot;cygpath&quot; outputproperty=&quot;windows.pathname&quot;&gt;
@@ -131,48 +116,62 @@
 &lt;/exec&gt;
 &lt;echo message=&quot;${windows.pathname}&quot;/&gt;
 </pre>
+<p>
+We get lots of support calls from Cygwin users. Either it is incredibly popular, or it is
+trouble. If you do use it, remember that Java is a Windows application, so Ant is running in a
+Windows process, not a Cygwin one. This will save us having to mark your bug reports as invalid.
+</p>
 
-We get lots of support calls from Cygwin users. Either it is incredibly
-popular, or it is trouble. If you do use it, remember that Java is a
-Windows application, so Ant is running in a Windows process, not a
-Cygwin one. This will save us having to mark your bug reports as invalid. 
-
-<h2>Apple MacOS X</h2>
-
-MacOS X is the first of the Apple platforms that Ant supports completely;
-it is treated like any other Unix. 
+<h2>Apple MacOS X/macOS</h2>
+<p>
+MacOS X a.k.a. macOS is the first of the Apple platforms that Ant supports completely; it is treated
+like any other Unix.
+</p>
 
 <h2>Novell Netware</h2>
+<p>
+To give the same level of sophisticated control as Ant's startup scripts on other platforms, it was
+decided to make the main ant startup on NetWare be via a Perl Script, <code>runant.pl</code>.  This
+is found in the <samp>bin</samp> directory (for instance&mdash;<samp>bootstrap\bin</samp>
+or <samp>dist\bin</samp>).
+</p>
 
-<p>To give the same level of sophisticated control as Ant's startup scripts on other platforms, it was decided to make the main ant startup on NetWare be via a Perl Script, "runant.pl".  This is found in the bin directory (for instance - bootstrap\bin or dist\bin).</p>
-
-<p>One important item of note is that you need to set up the following to run ant:</p>
-<ul><li><code>CLASSPATH</code> - put ant.jar and any other needed jars on the system classpath.</li>
-   <li><code>ANT_OPTS</code> - On NetWare, <code>ANT_OPTS</code> needs to include a parameter of the form, <nobr>"-envCWD=<code>ANT_HOME</code>"</nobr>, with <code>ANT_HOME</code> being the fully expanded location of Ant, <b>not</b> an environment variable.  This is due to the fact that the NetWare System Console has no notion of a current working directory.</li>
+<p>One important item of note is that you need to set up the following to run Ant:</p>
+<ul>
+  <li><code>CLASSPATH</code>&mdash;put <samp>ant.jar</samp> and any other needed jars on the system
+    classpath.</li>
+  <li><code>ANT_OPTS</code>&mdash;On NetWare, <code>ANT_OPTS</code> needs to include a parameter of
+    the form, <kbd>-envCWD=<i>ANT_HOME</i></kbd>, with <kbd><i>ANT_HOME</i></kbd> being the
+    fully expanded location of Ant, <strong>not</strong> an environment variable.  This is due to
+    the fact that the NetWare System Console has no notion of a current working directory.</li>
 </ul>
-<p>It is suggested that you create up an ant.ncf that sets up these parameters, and calls <code>perl ANT_HOME/dist/bin/runant.pl</code></p>
-<p>The following is an example of such an NCF file(assuming ant is installed in <nobr>'sys:/apache-ant/'):</nobr></p>
-<code>
-   &nbsp;&nbsp;&nbsp;envset CLASSPATH=SYS:/apache-ant/bootstrap/lib/ant.jar<br>
-   &nbsp;&nbsp;&nbsp;envset CLASSPATH=$CLASSPATH;SYS:/apache-ant/lib/optional/junit.jar <br>
-   &nbsp;&nbsp;&nbsp;envset CLASSPATH=$CLASSPATH;SYS:/apache-ant/bootstrap/lib/optional.jar <br>
-<br>
-   &nbsp;&nbsp;&nbsp;setenv ANT_OPTS=-envCWD=sys:/apache-ant <br>
-   &nbsp;&nbsp;&nbsp;envset ANT_OPTS=-envCWD=sys:/apache-ant <br>
-   &nbsp;&nbsp;&nbsp;setenv ANT_HOME=sys:/apache-ant/dist/lib <br>
-   &nbsp;&nbsp;&nbsp;envset ANT_HOME=sys:/apache-ant/dist/lib <br>
-<br>
-   &nbsp;&nbsp;&nbsp;perl sys:/apache-ant/dist/bin/runant.pl <br>
-</code>
-
-<p>Ant works on JVM version 1.3 or higher.  You may have some luck running it on JVM 1.2, but serious problems have been found running Ant on JVM 1.1.7B.  These problems are caused by JVM bugs that will not be fixed.</p>
+<p>It is suggested that you create up an <samp>ant.ncf</samp> that sets up these parameters, and
+calls <samp>perl ANT_HOME/dist/bin/runant.pl</samp></p>
+<p>The following is an example of such an NCF file (assuming Ant is installed
+in <samp>sys:/apache-ant/</samp>):</p>
+<pre>
+envset CLASSPATH=sys:/apache-ant/bootstrap/lib/ant.jar
+envset CLASSPATH=$CLASSPATH;sys:/apache-ant/lib/optional/junit.jar
+envset CLASSPATH=$CLASSPATH;sys:/apache-ant/bootstrap/lib/optional.jar
+
+setenv ANT_OPTS=-envCWD=sys:/apache-ant
+envset ANT_OPTS=-envCWD=sys:/apache-ant
+setenv ANT_HOME=sys:/apache-ant/dist/lib
+envset ANT_HOME=sys:/apache-ant/dist/lib
+
+perl sys:/apache-ant/dist/bin/runant.pl</pre>
+
+<p>Ant works on JVM version 1.3 or higher.  You may have some luck running it on JVM 1.2, but
+serious problems have been found running Ant on JVM 1.1.7B.  These problems are caused by JVM bugs
+that will not be fixed.</p>
 <p>JVM 1.3 is supported on Novell NetWare versions 5.1 and higher.</p>
 
-
 <h2>Other platforms</h2>
-Support for other platforms is not guaranteed to be complete, as certain 
-techniques to hide platform details from build files need to be written and
-tested on every particular platform. Contributions in this area are welcome.
-
+<p>
+Support for other platforms is not guaranteed to be complete, as certain techniques to hide platform
+details from build files need to be written and tested on every particular platform. Contributions
+in this area are welcome.
+</p>
 
+</body>
 </html>
diff -Nru ant-1.9.10/manual/projecthelper.html ant-1.10.3/manual/projecthelper.html
--- ant-1.9.10/manual/projecthelper.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/projecthelper.html	2018-03-24 12:37:12.000000000 +0000
@@ -25,126 +25,118 @@
 <body>
 <h1>The Apache Ant frontend: ProjectHelper</h1>
 
-<h2><a name="definition">What is a ProjectHelper?</a></h2>
+<h2 id="definition">What is a ProjectHelper?</h2>
 
 <p>
-The <code>ProjectHelper</code> in Apache Ant is responsible for parsing the build file
-and creating java instances representing the build workflow. It also signals which
-kind of file it can parse, and which file name it expects as default input file.
+The <code class="code">ProjectHelper</code> in Apache Ant is responsible for parsing the build file
+and creating Java instances representing the build workflow. It also signals which kind of file it
+can parse, and which file name it expects as default input file.
 </p>
 
 <p>
-Ant' default <code>ProjectHelper</code>
-(<code>org.apache.tools.ant.helper.ProjectHelper2</code>) parses the
-usual build.xml files. And if no build file is specified on the command line, it
-will expect to find a file named <code>build.xml</code>.
+Ant's default <code class="code">ProjectHelper</code>
+(<code class="code">org.apache.tools.ant.helper.ProjectHelper2</code>) parses the
+usual <code>build.xml</code> files. And if no build file is specified on the command line, it will
+expect to find a file named <code>build.xml</code>.
 </p>
 
 <p>
-The immediate benefit of a such abstraction it that it is possible to make Ant
-understand other kind of descriptive languages than XML. Some experiments have
-been done around a pure java frontend, and a groovy one too (ask the dev mailing
-list for further info about these).
+The immediate benefit of a such abstraction it that it is possible to make Ant understand other kind
+of descriptive languages than XML. Some experiments have been done around a pure Java frontend, and
+a Groovy one too (ask the dev mailing list for further info about these).
 </p>
 
-<p>Since Ant 1.8.2, the <a href="Tasks/import.html">import</a> task will also
-try to use the proper helper to parse the imported file. So it is possible to
-write different build files in different languages and have them import each
-other.
+<p>
+<em>Since Ant 1.8.2</em>, the <a href="Tasks/import.html">import</a> task will also try to use the
+proper helper to parse the imported file. So it is possible to write different build files in
+different languages and have them import each other.
 </p>
 
-<h2><a name="repository">How is Ant is selecting the proper ProjectHelper</a></h2>
+<h2 id="repository">How is Ant is selecting the proper ProjectHelper</h2>
 
 <p>
-Ant knows about several implementations of <code>ProjectHelper</code>
-and has to decide which to use for each build file.
+Ant knows about several implementations of <code class="code">ProjectHelper</code> and has to decide
+which to use for each build file.
 </p>
 
-<p>At startup Ant lists the all implementations found and keeps them
-in the same order they've been found in an internal 'repository':
+<p>
+At startup Ant lists the all implementations found and keeps them in the same order they've been
+found in an internal 'repository':
+</p>
 <ul>
-    <li>the first to be searched for is the one declared by the system property
-        <code>org.apache.tools.ant.ProjectHelper</code> (see
-        <a href="running.html#sysprops">Java System Properties</a>);</li>
-    <li>then it searches with its class loader for a <code>ProjectHelper</code>
-        service declarations in the META-INF: it searches in the classpath for a
-        file <code>META-INF/services/org.apache.tools.ant.ProjectHelper</code>.
-        This file will just contain the fully qualified name of the
-        implementation of <code>ProjectHelper</code> to instantiate;</li>
-    <li>it will also search with the system class loader for
-        <code>ProjectHelper</code> service declarations in the META-INF;</li>
-    <li>last but not least it will add its default <code>ProjectHelper</code>
-        that can parse classical build.xml files.</li>
+  <li>the first to be searched for is the one declared by the system
+    property <code class="code">org.apache.tools.ant.ProjectHelper</code>
+    (see <a href="running.html#sysprops">Java System Properties</a>);</li>
+  <li>then it searches with its class loader for a <code>ProjectHelper</code> service declarations
+    in the <samp>META-INF</samp>: it searches in the classpath for a
+    file <samp>META-INF/services/org.apache.tools.ant.ProjectHelper</samp>.  This file will just
+    contain the fully qualified name of the implementation
+    of <code class="code">ProjectHelper</code> to instantiate;</li>
+  <li>it will also search with the system class loader for <code class="code">ProjectHelper</code>
+    service declarations in the <samp>META-INF</samp>;</li>
+  <li>last but not least it will add its default <code class="code">ProjectHelper</code> that can
+    parse classical <samp>build.xml</samp> files.</li>
 </ul>
-In case of an error while trying to instantiate a <code>ProjectHelper</code>, Ant
-will log an error but won't stop.  If you want further debugging
-info about the <code>ProjectHelper</code> internal 'repository', use the <b>system</b>
-property <code>ant.project-helper-repo.debug</code> and set it to
-<code>true</code>; the full stack trace will then also be printed.
+<p>
+In case of an error while trying to instantiate a <code class="code">ProjectHelper</code>, Ant will
+log an error but won't stop.  If you want further debugging info about
+the <code class="code">ProjectHelper</code> internal 'repository', use the <strong>system</strong>
+property <code>ant.project-helper-repo.debug</code> and set it to <q>true</q>; the full stack trace
+will then also be printed.
 </p>
 
 <p>
-When Ant is expected to parse a file, it will ask the
-<code>ProjectHelper</code> repository to find an implementation that will be
-able to parse the input file. Actually it will just iterate over the ordered list
-and the first implementation that returns <code>true</code> to
-<code>supportsBuildFile(File buildFile)</code> will be selected.
+When Ant is expected to parse a file, it will ask the <code class="code">ProjectHelper</code>
+repository to find an implementation that will be able to parse the input file. Actually it will
+just iterate over the ordered list and the first implementation that returns <q>true</q>
+to <code class="code">supportsBuildFile(File buildFile)</code> will be selected.
 </p>
 
 <p>
-When Ant is started and no input file has been specified, it will search for
-a default input file. It will iterate over list of <code>ProjectHelper</code>s
-and will select the first one that expects a default file that actually exist.
+When Ant is started and no input file has been specified, it will search for a default input
+file. It will iterate over list of <code class="code">ProjectHelper</code>s and will select the
+first one that expects a default file that actually exist.
 </p>
 
-<h2><a name="writing">Writing your own ProjectHelper</a></h2>
+<h2 id="writing">Writing your own ProjectHelper</h2>
 
 <p>
-The class <code>org.apache.tools.ant.ProjectHelper</code> is the API expected to
-be implemented. So write your own <code>ProjectHelper</code> by extending that
-abstract class. You are then expected to implement at least the function
-<code>parse(Project project, Object source)</code>. Note also that your
-implementation will be instantiated by Ant, and it is expecting a default
-constructor with no arguments.
+The class <code class="code">org.apache.tools.ant.ProjectHelper</code> is the API expected to be
+implemented. So write your own <code class="code">ProjectHelper</code> by extending that abstract
+class. You are then expected to implement at least the function <code class="code">parse(Project
+project, Object source)</code>. Note also that your implementation will be instantiated by Ant, and
+it is expecting a default constructor with no arguments.
 </p>
 
 <p>
-There are some functions that will help you define what your helper is
-capable of and what is is expecting:
+There are some functions that will help you define what your helper is capable of and what is is
+expecting:
+</p>
 <ul>
-    <li><code>getDefaultBuildFile()</code>: defines which file name is expected if
-    none provided</li>
-    <li><code>supportsBuildFile(File buildFile)</code>: defines if your parser
-    can parse the input file</li>
-
-    <li><code>canParseAntlibDescriptor(URL url)</code>: whether your
-      implementation is capable of parsing a given Antlib
-      descriptor.  The base class returns <code>false</code></li>
-    <li><code>parseAntlibDescriptor(Project containingProject, URL
-        source)</code>: invoked to actually parse the Antlib
-      descriptor if your implementation returned <code>true</code>
-      for the previous method.</li>
+  <li><code class="code">getDefaultBuildFile()</code>: defines which file name is expected if none
+    provided</li>
+  <li><code class="code">supportsBuildFile(File buildFile)</code>: defines if your parser can parse
+    the input file</li>
+  <li><code class="code">canParseAntlibDescriptor(URL url)</code>: whether your implementation is
+    capable of parsing a given Antlib descriptor.  The base class returns <q>false</q></li>
+  <li><code class="code">parseAntlibDescriptor(Project containingProject, URL source)</code>:
+    invoked to actually parse the Antlib descriptor if your implementation returned <q>true</q> for
+    the previous method.</li>
 </ul>
-</p>
 
 <p>
-Now that you have your implementation ready, you have to declare it to Ant. Three
-solutions here:
+Now that you have your implementation ready, you have to declare it to Ant. Three solutions here:
+</p>
 <ul>
-    <li>use the system property <code>org.apache.tools.ant.ProjectHelper</code>
-        (see also the <a href="running.html#sysprops">Java System Properties</a>);</li>
-    <li>use the service file in META-INF: in the jar you will build with your
-        implementation, add a file
-        <code>META-INF/services/org.apache.tools.ant.ProjectHelper</code>.
-        And then in this file just put the fully qualified name of your
-        implementation</li>
-    <li>use the <a href="Tasks/projecthelper.html">projecthelper</a> task (since
-        Ant 1.8.2) which will install dynamically an helper in the internal helper
-        'repository'. Then your helper can be used on the next call to the
-        <a href="Tasks/import.html">import</a> task.</li>
+  <li>use the system property <code class="code">org.apache.tools.ant.ProjectHelper</code> (see also
+    the <a href="running.html#sysprops">Java System Properties</a>);</li>
+  <li>use the service file in <samp>META-INF</samp>: in the jar you will build with your
+    implementation, add a file <samp>META-INF/services/org.apache.tools.ant.ProjectHelper</samp>.
+    And then in this file just put the fully qualified name of your implementation</li>
+  <li>use the <a href="Tasks/projecthelper.html">projecthelper</a> task (<em>since Ant 1.8.2</em>)
+    which will install dynamically a helper in the internal helper 'repository'. Then your helper
+    can be used on the next call to the <a href="Tasks/import.html">import</a> task.</li>
 </ul>
-</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/properties.html ant-1.10.3/manual/properties.html
--- ant-1.9.10/manual/properties.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/properties.html	2018-03-24 12:37:12.000000000 +0000
@@ -25,152 +25,139 @@
 <body>
   <h1>Properties</h1>
 
-  <p>Properties are key-value-pairs where Apache Ant tries to
-    expand <code>${key}</code> to <code>value</code> at runtime.</p>
+  <p>Properties are key-value pairs where Apache Ant tries to expand <code>${key}</code>
+    to <code>value</code> at run time.</p>
 
-  <p>There are many tasks that can set properties, the most common one
-    is the <a href="Tasks/property.html">property</a> task.  In
-    addition properties can be defined
-    via <a href="running.html">command line arguments</a> or similar
-    mechanisms from outside of Ant.</p>
-
-  <p>Normally property values can not be changed, once a property is
-    set, most tasks will not allow its value to be modified.  In
-    general properties are of global scope, i.e. once they have been
-    defined they are available for any task or target invoked
-    subsequently - it is not possible to set a property in a child
-    build process created via
-    the <a href="Tasks/ant.html">ant</a>, antcall or subant tasks
-    and make it available to the calling build process, though.</p>
-
-  <p>Starting with Ant 1.8.0
-    the <a href="Tasks/local.html">local</a> task can be used to
-    create properties that are locally scoped to a target or
-    a <a href="Tasks/sequential.html">sequential</a> element like
-    the one of the <a href="Tasks/macrodef.html">macrodef</a>
-    task.</p>
-
-  <h2><a name="built-in-props">Built-in Properties</a></h2>
-
-  <p>Ant provides access to all system properties as if they had been
-    defined using a <code>&lt;property&gt;</code> task.  For
-    example, <code>${os.name}</code> expands to the name of the
-    operating system.</p>
-  <p>For a list of system properties see
-    <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/System.html#getProperties%28%29">the Javadoc of System.getProperties</a>.
+  <p>There are many tasks that can set properties, the most common one is
+    the <a href="Tasks/property.html">property</a> task.  In addition properties can be defined
+    via <a href="running.html">command line arguments</a> or similar mechanisms from outside of
+    Ant.</p>
+
+  <p>Normally property values can not be changed, once a property is set, most tasks will not allow
+    its value to be modified.  In general properties are of global scope, i.e. once they have been
+    defined they are available for any task or target invoked subsequently&mdash;it is not possible
+    to set a property in a child build process created via
+    the <a href="Tasks/ant.html">ant</a>, <a href="Tasks/antcall.html">antcall</a>
+    or <a href="Tasks/subant.html">subant</a> tasks and make it available to the calling build
+    process, though.</p>
+
+  <p><em>Since Ant 1.8.0</em> the <a href="Tasks/local.html">local</a> task can be used to create
+    properties that are locally scoped to a target or
+    a <a href="Tasks/sequential.html">sequential</a> element like the one of
+    the <a href="Tasks/macrodef.html">macrodef</a> task.</p>
+
+  <h2 id="built-in-props">Built-in Properties</h2>
+
+  <p>Ant provides access to all system properties as if they had been defined using
+    a <code>&lt;property&gt;</code> task.  For example, <samp>${os.name}</samp> expands to the name
+    of the operating system.</p>
+
+  <p>For a list of system properties,
+    see <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/System.html#getProperties--"
+    target="_top">the javadoc of System.getProperties</a>.
   </p>
 
   <p>In addition, Ant has some built-in properties:</p>
-<pre><!-- TODO use <dl><dt><code>...</code></dt><dd>...</dd></dl> instead -->
-basedir             the absolute path of the project's basedir (as set
-                    with the basedir attribute of <a href="using.html#projects">&lt;project&gt;</a>).
-ant.file            the absolute path of the buildfile.
-ant.version         the version of Ant
-ant.project.name    the name of the project that is currently executing;
-                    it is set in the name attribute of &lt;project&gt;.
-ant.project.default-target
-                    the name of the currently executing project's
-                    default target;  it is set via the default
-                    attribute of &lt;project&gt;.
-ant.project.invoked-targets
-                    a comma separated list of the targets that have
-                    been specified on the command line (the IDE,
-                    an &lt;ant&gt; task ...) when invoking the current
-                    project.
-                    This property is set properly when the first target is executed.
-                    If you use it in the implicit target (directly
-                    under the &lt;project&gt; tag) the list will be
-                    empty if no target has been specified while it
-                    will contain the project's default target in this
-                    case for tasks nested into targets..
-ant.java.version    the JVM version Ant detected; currently it can hold
-                    the values &quot;9&quot;, &quot;1.8&quot;,
-                    &quot;1.7&quot;, &quot;1.6&quot;, &quot;1.5&quot;,
-                    &quot;1.4&quot;, &quot;1.3&quot; and
-                    &quot;1.2&quot;.
-ant.core.lib        the absolute path of the <code>ant.jar</code> file.
-</pre>
+  <dl>
+    <dt><code>basedir</code></dt>
+    <dd>the absolute path of the project's basedir (as set with
+      the <var>basedir</var> attribute
+      of <a href="using.html#projects">&lt;project&gt;</a>).</dd>
+    <dt><code>ant.file</code></dt>
+    <dd>the absolute path of the buildfile.</dd>
+    <dt><code>ant.version</code></dt>
+    <dd>the version of Ant</dd>
+    <dt><code>ant.project.name</code></dt>
+    <dd>the name of the project that is currently executing; it is set in the <var>name</var>
+      attribute of <code>&lt;project&gt;</code>.</dd>
+    <dt><code>ant.project.default-target</code></dt>
+    <dd>the name of the currently executing project's default target; it is set via
+      the <var>default</var> attribute of <code>&lt;project&gt;</code>.</dd>
+    <dt><code>ant.project.invoked-targets</code></dt>
+    <dd>a comma separated list of the targets that have been specified on the command line (the IDE,
+      an <code>&lt;ant&gt;</code> task ...) when invoking the current project.<br/>  This property
+      is set properly when the first target is executed.  If you use it in the implicit target
+      (directly under the <code>&lt;project&gt;</code> tag) the list will be empty if no target has
+      been specified while it will contain the project's default target in this case for tasks
+      nested into targets.</dd>
+    <dt><code>ant.java.version</code></dt>
+    <dd>the JVM version Ant detected; currently it can hold the
+      values <q>9</q>, <q>1.8</q>, <q>1.7</q>, <q>1.6</q>, <q>1.5</q>, <q>1.4</q>, <q>1.3</q>
+      and <q>1.2</q>.</dd>
+    <dt><code>ant.core.lib</code></dt>
+    <dd>the absolute path of the <samp>ant.jar</samp> file.</dd>
+  </dl>
+
+  <p>There is also another property, but this is set by the launcher script and therefore maybe not
+    set inside IDEs:</p>
+  <dl>
+    <dt><code>ant.home</code></dt>
+    <dd>home directory of Ant</dd>
+  </dl>
+
+  <p>The following property is only set if Ant is started via the Launcher class (which means it may
+    not be set inside IDEs either):</p>
+  <dl>
+    <dt><code>ant.library.dir</code></dt>
+    <dd>the directory that has been used to load Ant's jars from.  In most cases this
+      is <samp>ANT_HOME/lib</samp>.</dd>
+  </dl>
+
+  <h1 id="propertyHelper">PropertyHelpers</h1>
+
+  <p>Ant's property handling is accomplished by an instance
+    of <code class="code">org.apache.tools.ant.PropertyHelper</code> associated with the current
+    Project.  You can learn more about this class by examining Ant's Java API. In Ant 1.8 the
+    <code class="code">PropertyHelper</code> class was much reworked and now itself employs a number
+    of helper classes (actually instances of
+    the <code class="code">org.apache.tools.ant.PropertyHelper$Delegate</code> marker interface) to
+    take care of discrete tasks such as property setting, retrieval, parsing, etc. This makes Ant's
+    property handling highly extensible; also of interest is the
+    new <a href="Tasks/propertyhelper.html">propertyhelper</a> task used to manipulate the
+    PropertyHelper and its delegates from the context of the Ant buildfile.</p>
 
-  <p>There is also another property, but this is set by the launcher
-    script and therefore maybe not set inside IDEs:</p>
-<pre>
-ant.home            home directory of Ant
-</pre>
-
-  <p>The following property is only set if Ant is started via the
-    Launcher class (which means it may not be set inside IDEs
-    either):</p>
-<pre>
-ant.library.dir     the directory that has been used to load Ant's
-                    jars from.  In most cases this is ANT_HOME/lib.
-</pre>
-
-  <h1><a name="propertyHelper">PropertyHelpers</a></h1>
-
-  <p>Ant's property handling is accomplished by an instance of
-    <code>org.apache.tools.ant.PropertyHelper</code> associated with
-    the current Project.  You can learn more about this class by
-    examining Ant's Java API. In Ant 1.8 the PropertyHelper class was
-    much reworked and now itself employs a number of helper classes
-    (actually instances of
-    the <code>org.apache.tools.ant.PropertyHelper$Delegate</code>
-    marker interface) to take care of discrete tasks such as property
-    setting, retrieval, parsing, etc. This makes Ant's property
-    handling highly extensible; also of interest is the
-    new <a href="Tasks/propertyhelper.html">propertyhelper</a>
-    task used to manipulate the PropertyHelper and its delegates from
-    the context of the Ant buildfile.
-
-  <p>There are three sub-interfaces of <code>Delegate</code> that may be
-    useful to implement.</p>
+  <p>There are three sub-interfaces of <code class="code">Delegate</code> that may be useful to
+  implement.</p>
 
   <ul>
-    <li><code>org.apache.tools.ant.property.PropertyExpander</code> is
-      responsible for finding the property name inside a string in the
-      first place (the default extracts <code>foo</code>
-      from <code>${foo}</code>).
-
-      <p>This is the interface you'd implement if you wanted to invent
-        your own property syntax - or allow nested property expansions
-        since the default implementation doesn't balance braces
-        (see <a href="https://git-wip-us.apache.org/repos/asf?p=ant-antlibs-props.git;a=blob;f=src/main/org/apache/ant/props/NestedPropertyExpander.java;hb=HEAD"><code>NestedPropertyExpander</code>
-        in the "props" Antlib</a> for an example).</p>
+    <li><code>org.apache.tools.ant.property.PropertyExpander</code> is responsible for finding the
+      property name inside a string in the first place (the default extracts <samp>foo</samp>
+      from <samp>${foo}</samp>).
+
+      <p>This is the interface you'd implement if you wanted to invent your own property
+        syntax&mdash;or allow nested property expansions since the default implementation doesn't
+        balance braces
+        (see <a href="https://git-wip-us.apache.org/repos/asf?p=ant-antlibs-props.git;a=blob;f=src/main/org/apache/ant/props/NestedPropertyExpander.java;hb=HEAD"
+        target="_top"><code class="code">NestedPropertyExpander</code> in the <samp>props</samp> Antlib</a> for
+        an example).</p>
     </li>
 
-    <li><code>org.apache.tools.ant.PropertyHelper$PropertyEvaluator</code>
-      is used to expand <code>${some-string}</code> into
-      an <code>Object</code>.
-
-      <p>This is the interface you'd implement if you want to provide
-        your own storage independent of Ant's project instance - the
-        interface represents the reading end.  An example for this
-        would
-        be <code>org.apache.tools.ant.property.LocalProperties</code>
-        which implements storage
-        for <a href="Tasks/local.html">local properties</a>.</p>
-
-      <p>Another reason to implement this interface is if you wanted
-        to provide your own "property protocol" like
-        expanding <code>toString:foo</code> by looking up the project
-        reference foo and invoking <code>toString()</code> on it
-        (which is already implemented in Ant, see below).</p>
+    <li><code class="code">org.apache.tools.ant.PropertyHelper$PropertyEvaluator</code> is used to
+      expand <samp>${some-string}</samp> into an <code>Object</code>.
+
+      <p>This is the interface you'd implement if you want to provide your own storage independent
+        of Ant's project instance&mdash;the interface represents the reading end.  An example for
+        this would be <code class="code">org.apache.tools.ant.property.LocalProperties</code> which
+        implements storage for <a href="Tasks/local.html">local properties</a>.</p>
+
+      <p>Another reason to implement this interface is if you wanted to provide your own "property
+        protocol" like expanding <code>toString:foo</code> by looking up the project
+        reference <samp>foo</samp> and invoking <code class="code">toString()</code> on it (which is
+        already implemented in Ant, see below).</p>
     </li>
 
-    <li><code>org.apache.tools.ant.PropertyHelper$PropertySetter</code>
-      is responsible for setting properties.
+    <li><code class="code">org.apache.tools.ant.PropertyHelper$PropertySetter</code> is responsible
+      for setting properties.
 
-      <p>This is the interface you'd implement if you want to provide
-        your own storage independent of Ant's project instance - the
-        interface represents the reading end.  An example for this
-        would
-        be <code>org.apache.tools.ant.property.LocalProperties</code>
-        which implements storage
-        for <a href="Tasks/local.html">local properties</a>.</p>
+      <p>This is the interface you'd implement if you want to provide your own storage independent
+        of Ant's project instance&mdash;the interface represents the reading end.  An example for
+        this would be <code class="code">org.apache.tools.ant.property.LocalProperties</code> which
+        implements storage for <a href="Tasks/local.html">local properties</a>.</p>
     </li>
 
   </ul>
 
-  <p>The default <code>PropertyExpander</code> looks similar to:</p>
+  <p>The default <code class="code">PropertyExpander</code> looks similar to:</p>
 
 <pre>
 public class DefaultExpander implements PropertyExpander {
@@ -188,13 +175,12 @@
         }
         return null;
     }
-}
-</pre>
+}</pre>
 
-  <p>The logic that replaces <code>${toString:some-id}</code> with the
-    stringified representation of the object with
-    id <code>some-id</code> inside the current build is contained in a
-    PropertyEvaluator similar to the following code:</p>
+  <p>The logic that replaces <samp>${toString:<i>some-id</i>}</samp> with the stringified
+    representation of the object with <var>id</var> <samp><i>some-id</i></samp> inside the current
+    build is contained in a <code class="code">PropertyEvaluator</code> similar to the following
+    code:</p>
 
 <pre>
 public class ToStringEvaluator implements PropertyHelper.PropertyEvaluator {
@@ -207,198 +193,163 @@
         }
         return o == null ? null : o.toString();
     }
-}
-</pre>
-
+}</pre>
 
   <h1>Property Expansion</h1>
 
-  <p>When Ant encounters a construct <code>${some-text}</code> the
-    exact parsing semantics are subject to the configured property
-    helper delegates.</p>
+  <p>When Ant encounters a construct <samp>${some-text}</samp> the exact parsing semantics are
+    subject to the configured property helper delegates.</p>
 
   <h2><code>$$</code> Expansion</h2>
 
-  <p>In its default configuration Ant will expand the
-    text <code>$$</code> to a single <code>$</code> and suppress the
-    normal property expansion mechanism for the text immediately
-    following it, i.e. <code>$${key}</code> expands
-    to <code>${key}</code> and not <code>value</code> even though a
-    property named <code>key</code> was defined and had the
-    value <code>value</code>.  This can be used to escape
-    literal <code>$</code> characters and is useful in constructs that
-    only look like property expansions or when you want to provide
-    diagnostic output like in</p>
-
-<pre>  &lt;echo&gt;$${builddir}=${builddir}&lt;/echo&gt;</pre>
-
-    <p>which will echo this message:</p>
-
-<pre>  ${builddir}=build/classes</pre>
-
-  <p>if the property <code>builddir</code> has the
-    value <code>build/classes</code>.</p>
-    
-  <p>In order to maintain backward compatibility with older Ant
-    releases, a single '$' character encountered apart from a
-    property-like construct (including a matched pair of french
-    braces) will be interpreted literally; that is, as '$'.  The
-    "correct" way to specify this literal character, however, is by
-    using the escaping mechanism unconditionally, so that "$$" is
-    obtained by specifying "$$$$".  Mixing the two approaches yields
-    unpredictable results, as "$$$" results in "$$".</p>
+  <p>In its default configuration Ant will expand the text <q>$$</q> to a single <q>$</q> and
+    suppress the normal property expansion mechanism for the text immediately following it,
+    i.e. <samp>$${key}</samp> expands to <samp>${key}</samp> and not <code>value</code> even though
+    a property named <code>key</code> was defined and had the value <samp>value</samp>.  This can be
+    used to escape literal <q>$</q> characters and is useful in constructs that only look like
+    property expansions or when you want to provide diagnostic output like in</p>
+
+<pre>&lt;echo&gt;$${builddir}=${builddir}&lt;/echo&gt;</pre>
+
+  <p>which will echo this message:</p>
+
+<pre class="output">${builddir}=build/classes</pre>
+
+  <p>if the property <code>builddir</code> has the value <samp>build/classes</samp>.</p>
+
+  <p>In order to maintain backward compatibility with older Ant releases, a single <q>$</q>
+    character encountered apart from a property-like construct (including a matched pair of french
+    braces) will be interpreted literally; that is, as <q>$</q>.  The "correct" way to specify this
+    literal character, however, is by using the escaping mechanism unconditionally, so
+    that <q>$$</q> is obtained by specifying <q>$$$$</q>.  Mixing the two approaches yields
+    unpredictable results, as <q>$$$</q> results in <q>$$</q>.</p>
 
   <h2>Nesting of Braces</h2>
 
-  <p>In its default configuration Ant will not try to balance braces
-    in property expansions, it will only consume the text up to the
-    first closing brace when creating a property name.  I.e. when
-    expanding something like <code>${a${b}}</code> it will be
-    translated into two parts:</p>
+  <p>In its default configuration Ant will not try to balance braces in property expansions, it will
+    only consume the text up to the first closing brace when creating a property name.  I.e. when
+    expanding something like <samp>${a${b}}</samp> it will be translated into two parts:</p>
 
   <ol>
-    <li>the expansion of property <code>a${b</code> - likely nothing
-      useful.</li>
-    <li>the literal text <code>}</code> resulting from the second
-      closing brace</li>
+    <li>the expansion of property <samp>a${b</samp>&mdash;likely nothing useful.</li>
+    <li>the literal text <samp>}</samp> resulting from the second closing brace</li>
   </ol>
 
-  <p>This means you can't use easily expand properties whose names are
-    given by properties, but there
-    are <a href="http://ant.apache.org/faq.html#propertyvalue-as-name-for-property">some
-    workarounds</a> for older versions of Ant.  With Ant 1.8.0 and the
-    <a href="http://ant.apache.org/antlib/props/">the props Antlib</a>
-    you can configure Ant to use
-    the <code>NestedPropertyExpander</code> defined there if you need
-    such a feature.</p>
+  <p>This means you can't use easily expand properties whose names are given by properties, but
+    there are <a href="https://ant.apache.org/faq.html#propertyvalue-as-name-for-property"
+    target="_top">some workarounds</a> for older versions of Ant. <em>Since Ant 1.8.0</em> using
+    the <a href="https://ant.apache.org/antlibs/props/" target="_top">props Antlib</a> you can
+    configure Ant to use the <code class="code">NestedPropertyExpander</code> defined there if you
+    need such a feature.</p>
 
   <h2>Expanding a "Property Name"</h2>
 
-  <p>In its most simple form <code>${key}</code> is supposed to look
-    up a property named <code>key</code> and expand to the value of
-    the property.  Additional <code>PropertyEvaluator</code>s may
-    result in a different interpretation of <code>key</code>,
-    though.</p>
-
-  <p>The <a href="http://ant.apache.org/antlibs/props/">props
-      Antlib</a> provides a few interesting evaluators but there are
-      also a few built-in ones.</p>
-
-  <h3><a name="toString">Getting the value of a Reference with
-      ${toString:}</a></h3>
-
-  <p>Any Ant type which has been declared with a reference can also
-    its string value extracted by using the <code>${toString:}</code>
-    operation, with the name of the reference listed after
-    the <code>toString:</code> text.  The <code>toString()</code>
-    method of the Java class instance that is referenced is invoked
-    -all built in types strive to produce useful and relevant output
-    in such an instance.</p>
+  <p>In its most simple form <samp>${key}</samp> is supposed to look up a property
+    named <code>key</code> and expand to the value of the property.
+    Additional <code>PropertyEvaluator</code>s may result in a different interpretation
+    of <code>key</code>, though.</p>
+
+  <p>The <a href="https://ant.apache.org/antlibs/props/" target="_top">props Antlib</a> provides a
+    few interesting evaluators but there are also a few built-in ones.</p>
+
+  <h3 id="toString">Getting the value of a Reference with <samp>${toString:}</samp></h3>
+
+  <p>Any Ant type which has been declared with a reference can also its string value extracted by
+    using the <samp>${toString:}</samp> operation, with the name of the reference listed after
+    the <code>toString:</code> text.  The <code class="code">toString()</code> method of the Java
+    class instance that is referenced is invoked&mdash;all built in types strive to produce useful
+    and relevant output in such an instance.</p>
 
   <p>For example, here is how to get a listing of the files in a fileset,<p>
 
 <pre>
-&lt;fileset id=&quot;sourcefiles&quot; dir=&quot;src&quot; includes=&quot;**/*.java&quot; /&gt;
-&lt;echo&gt; sourcefiles = ${toString:sourcefiles} &lt;/echo&gt;
-</pre>
-
-  <p>There is no guarantee that external types provide meaningful
-    information in such a situation</p>
-
-  <h3><a name="ant.refid">Getting the value of a Reference with
-      ${ant.refid:}</a></h3>
-
-  <p>Any Ant type which has been declared with a reference can also be
-    used as a property by using the <code>${ant.refid:}</code>
-    operation, with the name of the reference listed after
-    the <code>ant.refid:</code> text.  The difference between this
-    operation and <a href="#toString"><code>${toString:}</code></a> is
-    that <code>${ant.refid:}</code> will expand to the referenced
-    object itself.  In most circumstances the toString method will be
-    invoked anyway, for example if the <code>${ant.refid:}</code> is
-    surrounded by other text.</p>
-
-  <p>This syntax is most useful when using a task with attribute
-    setters that accept objects other than String.  For example if the
-    setter accepts a Resource object as in</p>
-<pre>
-public void setAttr(Resource r) { ... }
-</pre>
+&lt;fileset id=&quot;sourcefiles&quot; dir=&quot;src&quot; includes=&quot;**/*.java&quot;/&gt;
+&lt;echo&gt; sourcefiles = ${toString:sourcefiles} &lt;/echo&gt;</pre>
 
-  <p>then the syntax can be used to pass in resource subclasses
-    previously defined as references like</p>
+  <p>There is no guarantee that external types provide meaningful information in such a
+    situation</p>
+
+  <h3 id="ant.refid">Getting the value of a Reference with <samp>${ant.refid:}</samp></h3>
+
+  <p>Any Ant type which has been declared with a reference can also be used as a property by using
+    the <samp>${ant.refid:}</samp> operation, with the name of the reference listed after
+    the <code>ant.refid:</code> text.  The difference between this operation
+    and <a href="#toString"><samp>${toString:}</samp></a> is that <samp>${ant.refid:}</samp> will
+    expand to the referenced object itself.  In most circumstances
+    the <code class="code">toString()</code> method will be invoked anyway, for example if
+    the <samp>${ant.refid:}</samp> is surrounded by other text.</p>
+
+  <p>This syntax is most useful when using a task with attribute setters that accept objects other
+    than <code class="code">String</code>.  For example, if the setter accepts
+    a <code class="code">Resource</code> object as in</p>
+
+  <pre>public void setAttr(Resource r) { ... }</pre>
+
+  <p>then the syntax can be used to pass in resource subclasses previously defined as references
+    like</p>
 <pre>
-  &lt;url url="http://ant.apache.org/" id="anturl"/&gt;
-  &lt;my:task attr="${ant.refid:anturl}"/&gt;
-</pre>
+&lt;url url="http://ant.apache.org/" id="anturl"/&gt;
+&lt;my:task attr="${ant.refid:anturl}"/&gt;</pre>
 
-  <h2><a name="if+unless">If/Unless Attributes</a></h2>
+  <h2 id="if+unless">If/Unless Attributes</h2>
   <p>
-      The <code>&lt;target></code> element and various tasks (such as
-      <code>&lt;fail></code>) and task elements (such as <code>&lt;test></code>
-      in <code>&lt;junit></code>) support <code>if</code> and <code>unless</code>
-      attributes which can be used to control whether the item is run or otherwise
-      takes effect.
+    The <code>&lt;target&gt;</code> element and various tasks (such as <code>&lt;fail&gt;</code>)
+    and task elements (such as <code>&lt;test&gt;</code> in <code>&lt;junit&gt;</code>)
+    support <var>if</var> and <var>unless</var> attributes which can be used to control whether the
+    item is run or otherwise takes effect.
   </p>
   <p>
-      In Ant 1.7.1 and earlier, these attributes could only be property names.
-      The item was enabled if a property with that name was defined - even to be
-      the empty string or <tt>false</tt> - and disabled if the property was not
-      defined. For example, the following works but there is no way to override
-      the file existence check negatively (only positively):
+    In Ant 1.7.1 and earlier, these attributes could only be property names.  The item was enabled
+    if a property with that name was defined&mdash;even to be the empty string
+    or <q>false</q>&mdash;and disabled if the property was not defined. For example, the following
+    works but there is no way to override the file existence check negatively (only positively):
   </p>
   <pre>
-&lt;target name="-check-use-file">
-    &lt;available property="file.exists" file="some-file"/>
-&lt;/target>
-&lt;target name="use-file" depends="-check-use-file" <b>if="file.exists"</b>>
-    &lt;!-- do something requiring that file... -->
+&lt;target name="-check-use-file"&gt;
+    &lt;available property="file.exists" file="some-file"/&gt;
+&lt;/target&gt;
+&lt;target name="use-file" depends="-check-use-file" <strong>if="file.exists"</strong>&gt;
+    &lt;!-- do something requiring that file... --&gt;
 &lt;/target>
-&lt;target name="lots-of-stuff" depends="use-file,other-unconditional-stuff"/>
-  </pre>
+&lt;target name="lots-of-stuff" depends="use-file,other-unconditional-stuff"/&gt;</pre>
   <p>
-      As of Ant 1.8.0, you may instead use property expansion; a value of
-      <tt>true</tt> (or <tt>on</tt> or <tt>yes</tt>) will enable the
-      item, while <tt>false</tt> (or <tt>off</tt> or <tt>no</tt>) will
-      disable it. Other values are still assumed to be property
-      names and so the item is enabled only if the named property is defined.
+    <em>Since Ant 1.8.0</em>, you may instead use property expansion; a value of <q>true</q>
+    (or <q>on</q> or <q>yes</q>) will enable the item, while <q>false</q> (or <q>off</q>
+    or <q>no</q>) will disable it. Other values are still assumed to be property names and so the
+    item is enabled only if the named property is defined.
   </p>
   <p>
-      Compared to the older style, this gives you additional flexibility, because
-      you can override the condition from the command line or parent scripts:
+    Compared to the older style, this gives you additional flexibility, because you can override the
+    condition from the command line or parent scripts:
   </p>
   <pre>
-&lt;target name="-check-use-file" <b>unless="file.exists"</b>>
-    &lt;available property="file.exists" file="some-file"/>
+&lt;target name="-check-use-file" <strong>unless="file.exists"</strong>&gt;
+    &lt;available property="file.exists" file="some-file"/&gt;
 &lt;/target>
-&lt;target name="use-file" depends="-check-use-file" <b>if="${file.exists}"</b>>
-    &lt;!-- do something requiring that file... -->
+&lt;target name="use-file" depends="-check-use-file" <strong>if="${file.exists}"</strong>&gt;
+    &lt;!-- do something requiring that file... --&gt;
 &lt;/target>
-&lt;target name="lots-of-stuff" depends="use-file,other-unconditional-stuff"/>
-  </pre>
+&lt;target name="lots-of-stuff" depends="use-file,other-unconditional-stuff"/&gt;</pre>
   <p>
-      Now <code>ant -Dfile.exists=false lots-of-stuff</code> will run
-      <code>other-unconditional-stuff</code> but not <code>use-file</code>,
-      as you might expect, and you can disable the condition from another script
-      too:
+    Now <kbd>ant -Dfile.exists=false lots-of-stuff</kbd> will run <q>other-unconditional-stuff</q>
+    but not <q>use-file</q>, as you might expect, and you can disable the condition from another
+    script too:
   </p>
   <pre>
-&lt;antcall target="lots-of-stuff">
-    &lt;param name="file.exists" value="false"/>
-&lt;/antcall>
-  </pre>
+&lt;antcall target="lots-of-stuff"&gt;
+    &lt;param name="file.exists" value="false"/&gt;
+&lt;/antcall&gt;</pre>
   <p>
-      Similarly, an <code>unless</code> attribute disables the item if it is
-      either the name of property which is defined, or if it evaluates to a
-      <tt>true</tt>-like value. For example, the following allows you to define
-      <tt>skip.printing.message=true</tt> in <tt>my-prefs.properties</tt> with
-      the results you might expect:
+    Similarly, an <var>unless</var> attribute disables the item if it is either the name of property
+    which is defined, or if it evaluates to a <q>true</q>-like value. For example, the following
+    allows you to define <code>skip.printing.message=true</code> in <samp>my-prefs.properties</samp>
+    with the results you might expect:
   </p>
   <pre>
-&lt;property file="my-prefs.properties"/>
-&lt;target name="print-message" <b>unless="${skip.printing.message}"</b>>
+&lt;property file="my-prefs.properties"/&gt;
+&lt;target name="print-message" <strong>unless="${skip.printing.message}"</strong>&gt;
     &lt;echo>hello!&lt;/echo>
-&lt;/target>
-  </pre>
+&lt;/target&gt;</pre>
 
 </body>
+</html>
diff -Nru ant-1.9.10/manual/proxy.html ant-1.10.3/manual/proxy.html
--- ant-1.9.10/manual/proxy.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/proxy.html	2018-03-24 12:37:12.000000000 +0000
@@ -26,84 +26,83 @@
 <h2>Proxy Configuration</h2>
 
 <p>
-This page discussing proxy issues on command-line Apache Ant.
-Consult your IDE documentation for IDE-specific information upon proxy setup.
+  This page discussing proxy issues on command-line Apache Ant.
+  Consult your IDE documentation for IDE-specific information upon
+  proxy setup.
 </p>
 
 <p>
-
-All tasks and threads running in Ant's JVM share the same HTTP/FTP/Socks
-proxy configuration.
+  All tasks and threads running in Ant's JVM share the same
+  HTTP/FTP/Socks proxy configuration.
 </p>
 
 <p>
-    When any task tries to retrieve content from an HTTP page, including the
-    <code>&lt;get&gt;</code> task, any automated URL retrieval in
-    an XML/XSL task, or any third-party task that uses the <code>java.net.URL</code>
-    classes, the proxy settings may make the difference between success and failure.
+  When any task tries to retrieve content from an HTTP page, including
+  the <code>&lt;get&gt;</code> task, any automated URL retrieval in an
+  XML/XSL task, or any third-party task that uses
+  the <code>java.net.URL</code> classes, the proxy settings may make
+  the difference between success and failure.
 </p>
 <p>
-    Anyone authoring a build file behind a blocking firewall will immediately appreciate
-    the problems and may want to write a build file to deal with the problem, but
-    users of third party build build files may find that the build file itself
-    does not work behind the firewall.
+  Anyone authoring a build file behind a blocking firewall will
+  immediately appreciate the problems and may want to write a build
+  file to deal with the problem, but users of third party build build
+  files may find that the build file itself does not work behind the
+  firewall.
 </p>
 <p>
-    This is a long standing problem with Java and Ant. The only way to fix
-    it is to explicitly configure Ant with the proxy settings, either
-    by passing down the proxy details as JVM properties, or to
-    tell Ant on a Java1.5+ system to have the JVM work it out for itself.
-
+  This is a long standing problem with Java and Ant. The only way to
+  fix it is to explicitly configure Ant with the proxy settings,
+  either by passing down the proxy details as JVM properties, or to
+  tell Ant on a Java 5+ system to have the JVM work it out for itself.
 </p>
 
-
-
-<h3>Java1.5+ proxy support (new for Ant1.7)</h3>
+<h3>Java 5+ proxy support</h3>
+<p><em>Since Ant 1.7</em></p>
 <p>
-    When Ant starts up, if the <code>-autoproxy</code>
-    command is supplied, Ant sets the
-    <code>java.net.useSystemProxies</code> system property. This tells 
-    a Java1.5+ JVM to use the current set of property settings of the host
-    environment. Other JVMs, such as the Kaffe and Apache Harmony runtimes,
-    may also use this property in future.
-    It is ignored on the Java1.4 and earlier runtimes.
+  When Ant starts up, if the <kbd>-autoproxy</kbd> command is
+  supplied, Ant sets the <code>java.net.useSystemProxies</code> system
+  property. This tells a Java 5+ runtime to use the current set of
+  property settings of the host environment. Other JVMs, such as
+  Kaffe and Apache Harmony, may also use this property in
+  future.  It is ignored on the Java 1.4 and earlier runtimes.
 </p>
 <p>
-    This property maybe enough to give command-line Ant
-    builds network access, although in practise the results
-    are inconsistent.
+  This property maybe enough to give command-line Ant builds network
+  access, although in practise the results are inconsistent.
 </p>
 <p>
-    It is has also been reported a breaking the IBM Java 5 JRE on AIX,
-    and does not always work on Linux (presumably due to missing gconf settings)
-    Other odd things can go wrong, like Oracle JDBC drivers or pure Java SVN clients.
+  It is has also been reported a breaking the IBM Java 5 runtime on AIX,
+  and does not always work on Linux (presumably due to
+  missing <code>gconf</code> settings) Other odd things can go wrong,
+  like Oracle JDBC drivers or pure Java SVN clients.
 </p>
-
 <p>
-    To make the <code>-autoproxy</code> option the default, add it to the environment variable
-    <code>ANT_ARGS</code>, which contains a list of arguments to pass to Ant on every
-    command line run.
+  To make the <kbd>-autoproxy</kbd> option the default, add it to
+  the environment variable <code>ANT_ARGS</code>, which contains a
+  list of arguments to pass to Ant on every command line run.
 </p>
 
 <h4>How Autoproxy works</h4>
 <p>
-The <code>java.net.useSystemProxies</code> is checked only
-once, at startup time, the other checks (registry, gconf, system properties) are done
-dynamically whenever needed (socket connection, URL connection etc..).
+  The <code>java.net.useSystemProxies</code> is checked only once, at
+  startup time, the other checks (registry, <code>gconf</code>, system
+  properties) are done dynamically whenever needed (socket connection,
+  URL connection etc..).
 </p>
-<h5>Windows</h5>
 
+<h5>Windows</h5>
 <p>
-The JVM goes straight to the registry, bypassing WinInet, as it is not
-present/consistent on all supported Windows platforms (it is part of IE,
-really). Java 7 may use the Windows APIs on the platforms when it is present.
+  The JVM goes straight to the registry, bypassing WinInet, as it is
+  not present/consistent on all supported Windows platforms (it is
+  part of IE, really). Java 7 may use the Windows APIs on the
+  platforms when it is present.
 </p>
 
 <h5>Linux</h5>
-
 <p>
-The JVM uses the gconf library to look at specific entries.
-The GConf-2 settings used are:
+  The JVM uses the <code>gconf</code> library to look at specific
+  entries.  The <code>GConf-2</code> settings used are:
 </p>
 <pre>
  - /system/http_proxy/use_http_proxy            boolean
@@ -124,168 +123,167 @@
  - /system/proxy/gopher_port                    int
 </pre>
 <p>
-If you are using KDE or another GUI than Gnome, you can still use the
-<code>gconf-editor</code> tool to add these entries.
+  If you are using KDE or another GUI than Gnome, you can still use
+  the <code>gconf-editor</code> tool to add these entries.
 </p>
 
-
 <h3>Manual JVM options</h3>
 <p>
-    Any JVM can have its proxy options explicitly configured by passing
-    the appropriate <code>-D</code> system property options to the runtime.
-    Ant can be configured through all its shell scripts via the
-    <code>ANT_OPTS</code> environment variable, which is a list of options to
-    supply to Ant's JVM:
+  Any JVM can have its proxy options explicitly configured by passing
+  the appropriate <kbd>-D</kbd> system property options to the
+  runtime.  Ant can be configured through all its shell scripts via
+  the <code>ANT_OPTS</code> environment variable, which is a list of
+  options to supply to Ant's JVM:
 </p>
 <p>
   For bash:
-</p>  
-<pre>
-    export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"
-</pre>
-  For csh/tcsh:
-<pre>
-    setenv ANT_OPTS "-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"
-</pre>
+</p>
+<pre>export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"</pre>
 <p>
-If you insert this line into the Ant shell script itself, it gets picked up
-by all continuous integration tools running on the system that call Ant via the
-command line.
+For csh/tcsh:
 </p>
+<pre>setenv ANT_OPTS "-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"</pre>
 <p>
-  For Windows, set the <code>ANT_OPTS</code> environment variable in the appropriate "My Computer" 
-  properties dialog box (winXP), "Computer" properties (Vista)
+  If you insert this line into the Ant shell script itself, it gets
+  picked up by all continuous integration tools running on the system
+  that call Ant via the command line.
 </p>
 <p>
-  This mechanism works across Java versions, is cross-platform and reliable. 
-  Once set, all build files run via the command line will automatically have
-  their proxy setup correctly, without needing any build file changes. It also
-  apparently overrides Ant's automatic proxy settings options.
+  For Windows, set the <code>ANT_OPTS</code> environment variable in
+  the appropriate "My Computer" properties dialog box (XP), "Computer"
+  properties (Vista)
 </p>
-<p>  
-  It is limited in the following ways:
-</p>  
-  <ol>
-  <li>Does not work under IDEs. These need their own proxy settings changed</li>
-  <li>Not dynamic enough to deal with laptop configuration changes.</li>
-  </ol>
-
-
-<h3>SetProxy Task</h3>
 <p>
-    The <a href="Tasks/setproxy.html">setproxy task</a> can be used to
-    explicitly set a proxy in a build file. This manipulates the many proxy 
-    configuration properties of a JVM, and controls the proxy settings for all 
-    network operations in the same JVM from that moment. 
+  This mechanism works across Java versions, is cross-platform and
+  reliable.  Once set, all build files run via the command line will
+  automatically have their proxy setup correctly, without needing any
+  build file changes. It also apparently overrides Ant's automatic
+  proxy settings options.
 </p>
 <p>
-    If you have a build file that is only to be used in-house, behind a firewall, on
-    an older JVM, <i>and you cannot change Ant's JVM proxy settings</i>, then
-    this is your best option. It is ugly and brittle, because the build file now contains
-    system configuration information. It is also hard to get this right across
-    the many possible proxy options of different users (none, HTTP, SOCKS).
+  It is limited in the following ways:
 </p>
+<ol>
+  <li>Does not work under IDEs. These need their own proxy settings changed</li>
+  <li>Not dynamic enough to deal with laptop configuration changes.</li>
+</ol>
 
-
+<h3>SetProxy Task</h3>
 <p>
-    Note that proxy configurations set with this task will probably override
-    any set by other mechanisms. It can also be used with fancy tricks to 
-    only set a proxy if the proxy is considered reachable:
+  The <a href="Tasks/setproxy.html">setproxy task</a> can be used to
+  explicitly set a proxy in a build file. This manipulates the many
+  proxy configuration properties of a JVM, and controls the proxy
+  settings for all network operations in the same JVM from that
+  moment.
+</p>
+<p>
+  If you have a build file that is only to be used in-house, behind a
+  firewall, on an older JVM, <em>and you cannot change Ant's JVM proxy
+  settings</em>, then this is your best option. It is ugly and
+  brittle, because the build file now contains system configuration
+  information. It is also hard to get this right across the many
+  possible proxy options of different users (none, HTTP, SOCKS).
+</p>
+<p>
+  Note that proxy configurations set with this task will probably
+  override any set by other mechanisms. It can also be used with fancy
+  tricks to only set a proxy if the proxy is considered reachable:
 </p>
 
 <pre>
-  &lt;target name="probe-proxy" depends="init"&gt;
-    &lt;condition property="proxy.enabled"&gt;
-      &lt;and&gt;
-        &lt;isset property="proxy.host"/&gt;
-        &lt;isreachable host="${proxy.host}"/&gt;
-      &lt;/and&gt;
-    &lt;/condition&gt;
-  &lt;/target&gt;
-
-  &lt;target name="proxy" depends="probe-proxy" if="proxy.enabled"&gt;
-    &lt;property name="proxy.port" value="80"/&gt;
-    &lt;property name="proxy.user" value=""/&gt;
-    &lt;property name="proxy.pass" value=""/&gt;
-    &lt;setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
-      proxyuser="${proxy.user}" proxypassword="${proxy.pass}"/&gt;
-  &lt;/target&gt;
-</pre>
+&lt;target name="probe-proxy" depends="init"&gt;
+  &lt;condition property="proxy.enabled"&gt;
+    &lt;and&gt;
+      &lt;isset property="proxy.host"/&gt;
+      &lt;isreachable host="${proxy.host}"/&gt;
+    &lt;/and&gt;
+  &lt;/condition&gt;
+&lt;/target&gt;
+
+&lt;target name="proxy" depends="probe-proxy" if="proxy.enabled"&gt;
+  &lt;property name="proxy.port" value="80"/&gt;
+  &lt;property name="proxy.user" value=""/&gt;
+  &lt;property name="proxy.pass" value=""/&gt;
+  &lt;setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+            proxyuser="${proxy.user}" proxypassword="${proxy.pass}"/&gt;
+&lt;/target&gt;</pre>
 
 <h3>Custom ProxySelector implementations</h3>
 <p>
-    As Java lets developers write their own ProxySelector implementations, it 
-    is theoretically possible for someone to write their own proxy selector class that uses
-    different policies to determine proxy settings. There is no explicit support
-    for this in Ant, and it has not, to the team's knowledge, been attempted. 
-</p>
-<p>
-    This could be the most flexible of solutions, as one could easily imagine
-    an Ant-specific proxy selector that was driven off ant properties, rather
-    than system properties. Developers could set proxy options in their
-    custom build.properties files, and have this propagate.
-</p>
-<p>
-    One issue here is with concurrency: the default proxy selector is per-JVM,
-    not per-thread, and so the proxy settings will apply to all sockets opened
-    on all threads; we also have the problem of how to propagate options from
-    one build to the JVM-wide selector.
+  As Java lets developers write their own ProxySelector
+  implementations, it is theoretically possible for someone to write
+  their own proxy selector class that uses different policies to
+  determine proxy settings. There is no explicit support for this in
+  Ant, and it has not, to the team's knowledge, been attempted.
+</p>
+<p>
+  This could be the most flexible of solutions, as one could easily
+  imagine an Ant-specific proxy selector that was driven off ant
+  properties, rather than system properties. Developers could set
+  proxy options in their custom build.properties files, and have this
+  propagate.
+</p>
+<p>
+  One issue here is with concurrency: the default proxy selector is
+  per-JVM, not per-thread, and so the proxy settings will apply to all
+  sockets opened on all threads; we also have the problem of how to
+  propagate options from one build to the JVM-wide selector.
 </p>
 
 <h3>Configuring the Proxy settings of Java programs under Ant</h3>
 
 <p>
-    Any program that is executed with <code>&lt;java&gt;</code> without setting
-    <code>fork="true"</code> will pick up the Ant's settings. If you need
-    different values, set <code>fork="false"</code> and provide the values
-    in <code>&lt;sysproperty&gt;</code> elements.
-</p>    
-    If you wish to have
-    a forked process pick up the Ant's settings, use the 
-    <a href="Types/propertyset.html"><code>&lt;syspropertyset&gt;</code></a>
-    element to propagate the normal proxy settings. The following propertyset
-    is a datatype which can be referenced in a <code>&lt;java&gt;</code> task to
-    pass down the current values.
-    
+  Any program that is executed with <code>&lt;java&gt;</code> without
+  setting <var>fork</var>=<q>true</q> will pick up the Ant's
+  settings. If you need different values,
+  set <var>fork</var>=<q>false</q> and provide the values
+  in <code>&lt;sysproperty&gt;</code> elements.
+</p>
+<p>
+  If you wish to have a forked process pick up the Ant's settings, use
+  the <a href="Types/propertyset.html"><code>&lt;syspropertyset&gt;</code></a>
+  element to propagate the normal proxy settings. The following
+  propertyset is a datatype which can be referenced in
+  a <code>&lt;java&gt;</code> task to pass down the current values.
 </p>
 <pre>
-&lt;propertyset id="proxy.properties">
-  &lt;propertyref prefix="java.net.useSystemProxies"/>
-  &lt;propertyref prefix="http."/>
-  &lt;propertyref prefix="https."/>
-  &lt;propertyref prefix="ftp."/>
-  &lt;propertyref prefix="socksProxy"/>
-&lt;/propertyset>
-</pre>
+&lt;propertyset id="proxy.properties"&gt;
+  &lt;propertyref prefix="java.net.useSystemProxies"/&gt;
+  &lt;propertyref prefix="http."/&gt;
+  &lt;propertyref prefix="https."/&gt;
+  &lt;propertyref prefix="ftp."/&gt;
+  &lt;propertyref prefix="socksProxy"/&gt;
+&lt;/propertyset&gt;</pre>
 
 <h3>Summary and conclusions</h3>
 <p>
-There are four ways to set up proxies in Ant.
+  There are four ways to set up proxies in Ant.
 </p>
 <ol>
-<li>With Ant1.7 and Java 1.5+ using the <code>-autoproxy</code> parameter.</li>
-<li>Via JVM system properties -set these in the ANT_ARGS environment variable.</li>
-<li>Via the &lt;setproxy&gt; task.</li>
-<li>Custom ProxySelector implementations</li>
+  <li>With Ant 1.7 and Java 5+ using the <kbd>-autoproxy</kbd> parameter.</li>
+  <li>Via JVM system properties&mdash;set these in the <code>ANT_ARGS</code> environment variable.</li>
+  <li>Via the <code>&lt;setproxy&gt;</code> task.</li>
+  <li>Custom ProxySelector implementations</li>
 </ol>
 <p>
-Proxy settings are automatically shared with Java programs started under Ant <i>
-that are not forked</i>; to pass proxy settings down to subsidiary programs, use
-a propertyset.
+  Proxy settings are automatically shared with Java programs started
+  under Ant <em>that are not forked</em>; to pass proxy settings down
+  to subsidiary programs, use a propertyset.
 </p>
 <p>
-Over time, we expect the Java 5+ proxy features to stabilize, and for Java code
-to adapt to them. However, given the fact that it currently does break some
-builds, it will be some time before Ant enables the automatic proxy feature by
-default. Until then, you have to enable the <code>-autoproxy</code> option or
-use one of the alternate mechanisms to configure the JVM.
+  Over time, we expect the Java 5+ proxy features to stabilize, and
+  for Java code to adapt to them. However, given the fact that it
+  currently does break some builds, it will be some time before Ant
+  enables the automatic proxy feature by default. Until then, you have
+  to enable the <kbd>-autoproxy</kbd> option or use one of the
+  alternate mechanisms to configure the JVM.
+</p>
 
 <h4>Further reading</h4>
 
 <ul>
-<li><a href="http://docs.oracle.com/javase/7/docs/technotes/guides/net/properties.html">
-Java Networking Properties</a>.
-</li>
+  <li><a href="https://docs.oracle.com/javase/8/docs/technotes/guides/net/properties.html"
+         target="_top">Java Networking Properties</a>.</li>
 </ul>
 
 </body>
diff -Nru ant-1.9.10/manual/running.html ant-1.10.3/manual/running.html
--- ant-1.9.10/manual/running.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/running.html	2018-03-24 12:37:12.000000000 +0000
@@ -25,80 +25,74 @@
 <body>
 
 <h1>Running Apache Ant</h1>
-<h2><a name="commandline">Command Line</a></h2>
-<p> If you've installed Apache Ant as described in the
-<a href="install.html"> Installing Ant</a> section,
-running Ant from the command-line is simple: just type
-<code>ant</code>.</p>
-<p>When no arguments are specified, Ant looks for a <code>build.xml</code>
-file in the current directory and, if found, uses that file as the
-build file and runs the target specified in the <code>default</code>
-attribute of the <code>&lt;project&gt;</code> tag.
-To make Ant use
-a build file other than <code>build.xml</code>, use the command-line
-option <nobr><code>-buildfile <i>file</i></code></nobr>,
-where <i>file</i> is the name of the build file you want to use
-(or a directory containing a <code>build.xml</code> file).</p>
-If you use the <nobr><code>-find [<i>file</i>]</code></nobr> option,
-Ant will search for a build file first in the current directory, then in
-the parent directory, and so on, until either a build file is found or the root
-of the filesystem has been reached. By default, it will look for a build file
-called <code>build.xml</code>. To have it search for a build file other
-than <code>build.xml</code>, specify a file argument.
-<strong>Note:</strong> If you include any other flags or arguments
-on the command line after
-the <nobr><code>-find</code></nobr> flag, you must include the file argument
-for the <nobr><code>-find</code></nobr> flag, even if the name of the
-build file you want to find is <code>build.xml</code>.
-
-<p>You can also set <a href="using.html#properties">properties</a> on the
-command line.  This can be done with
-the <nobr><code>-D<i>property</i>=<i>value</i></code></nobr> option,
-where <i>property</i> is the name of the property,
-and <i>value</i> is the value for that property. If you specify a
-property that is also set in the build file
-(see the <a href="Tasks/property.html">property</a> task),
-the value specified on the
-command line will override the value specified in the
-build file.
-Defining properties on the command line can also be used to pass in
-the value of environment variables; just pass
-<nobr><code>-DMYVAR=%MYVAR%</code></nobr> (Windows) or
-<nobr><code>-DMYVAR=$MYVAR</code></nobr> (Unix)
-to Ant. You can then access
-these variables inside your build file as <code>${MYVAR}</code>.
-You can also access environment variables using the
-<a href="Tasks/property.html"> property</a> task's
-<code>environment</code> attribute.
-</p>
-
-<p>Options that affect the amount of logging output by Ant are:
-<nobr><code>-quiet</code></nobr>,
-which instructs Ant to print less
-information to the console;
-<nobr><code>-verbose</code></nobr>, which causes Ant to print
-additional information to the console; <nobr><code>-debug</code></nobr>,
-which causes Ant to print considerably more additional information; and
-<nobr><code>-silent</code></nobr> which makes Ant print nothing but task
-output and build failures (useful to capture Ant output by scripts).
-</p>
-
-<p>It is also possible to specify one or more targets that should be executed.
-When omitted, the target that is specified in the
-<code>default</code> attribute of the
-<a href="using.html#projects"><code>project</code></a> tag is
+<h2 id="commandline">Command Line</h2>
+
+<p>If you've installed Apache Ant as described in
+the <a href="install.html">Installing Ant</a> section, running Ant
+from the command-line is simple: just type <kbd>ant</kbd>.</p>
+
+<p>When no arguments are specified, Ant looks for
+a <samp>build.xml</samp> file in the current directory and, if found,
+uses that file as the build file and runs the target specified in
+the <var>default</var> attribute of the <code>&lt;project&gt;</code>
+tag.  To make Ant use a build file other than <samp>build.xml</samp>,
+use the command-line option <kbd>-buildfile <i>file</i></kbd>,
+where <code><i>file</i></code> is the name of the build file you want to use (or
+a directory containing a <samp>build.xml</samp> file).</p>
+
+<p>If you use the <kbd>-find [<i>file</i>]</kbd> option, Ant will
+search for a build file first in the current directory, then in the
+parent directory, and so on, until either a build file is found or the
+root of the filesystem has been reached. By default, it will look for
+a build file called <samp>build.xml</samp>. To have it search for a
+build file other than <samp>build.xml</samp>, specify a file
+argument. <strong>Note</strong>: If you include any other flags or
+arguments on the command line after the <kbd>-find</kbd> flag, you
+must include the file argument for the <kbd>-find</kbd> flag, even
+if the name of the build file you want to find
+is <samp>build.xml</samp>.</p>
+
+<p>You can also set <a href="using.html#properties">properties</a> on
+the command line.  This can be done with
+the <kbd>-D<i>property</i>=<i>value</i></kbd> option,
+where <em>property</em> is the name of the property,
+and <em>value</em> is the value for that property. If you specify a
+property that is also set in the build file (see
+the <a href="Tasks/property.html">property</a> task), the value
+specified on the command line will override the value specified in the
+build file.  Defining properties on the command line can also be used
+to pass in the value of environment variables; just
+pass <kbd>-DMYVAR=%MYVAR%</kbd> (Windows)
+or <kbd>-DMYVAR=$MYVAR</kbd> (Unix) to Ant. You can then access
+these variables inside your build file as <code>${MYVAR}</code>.  You
+can also access environment variables using
+the <a href="Tasks/property.html">property</a>
+task's <var>environment</var> attribute.</p>
+
+<p>Options that affect the amount of logging output by Ant
+are: <kbd>-quiet</kbd>, which instructs Ant to print less
+information to the console; <kbd>-verbose</kbd>, which causes Ant to
+print additional information to the console; <kbd>-debug</kbd>,
+which causes Ant to print considerably more additional information;
+and <kbd>-silent</kbd> which makes Ant print nothing but task output
+and build failures (useful to capture Ant output by scripts).</p>
+
+<p>It is also possible to specify one or more targets that should be
+executed. When omitted, the target that is specified in
+the <var>default</var> attribute of
+the <a href="using.html#projects"><code>project</code></a> tag is
 used.</p>
 
-<p>The <nobr><code>-projecthelp</code></nobr> option prints out a list
-of the build file's targets. Targets that include a
-<code>description</code> attribute are listed as &quot;Main targets&quot;,
-those without a <code>description</code> are listed as
-&quot;Other targets&quot;, then the &quot;Default&quot; target is listed
-("Other targets" are only displayed if there are no main
-targets, or if Ant is invoked in -verbose or -debug mode).
+<p>The <kbd>-projecthelp</kbd> option prints out a list of the build
+file's targets. Targets that include a <var>description</var>
+attribute are listed as &quot;Main targets&quot;, those without
+a <var>description</var> are listed as &quot;Other targets&quot;, then
+the &quot;Default&quot; target is listed ("Other targets" are only
+displayed if there are no main targets, or if Ant is invoked
+in <kbd>-verbose</kbd> or <kbd>-debug</kbd> mode).</p>
 
-<h3><a name="options">Command-line Options Summary</a></h3>
-<pre>ant [options] [target [target2 [target3] ...]]
+<h3 id="options">Command-line Options Summary</h3>
+<pre class="output">ant [options] [target [target2 [target3] ...]]
 Options:
   -help, -h              print this message and exit
   -projecthelp, -p       print project help information and exit
@@ -131,400 +125,386 @@
                          1 (lowest) to 10 (highest); 5 is the default
   -nouserlib             Run ant without using the jar files from ${user.home}/.ant/lib
   -noclasspath           Run ant without using CLASSPATH
-  -autoproxy             Java 1.5+ : use the OS proxies
+  -autoproxy             Java 5+ : use the OS proxies
   -main &lt;class&gt;          override Ant's normal entry point
 </pre>
-<p>For more information about <code>-logger</code> and
-<code>-listener</code> see
-<a href="listeners.html">Loggers &amp; Listeners</a>.
-<p>For more information about <code>-inputhandler</code> see
-<a href="inputhandler.html">InputHandler</a>.
-<p>Easiest way of changing the exit-behaviour is subclassing the original main class:
+<p>For more information about <kbd>-logger</kbd>
+and <kbd>-listener</kbd> see <a href="listeners.html">Loggers &amp;
+Listeners</a>.
+<p>For more information about <kbd>-inputhandler</kbd>
+see <a href="inputhandler.html">InputHandler</a>.
+<p>Easiest way of changing the exit-behaviour is subclassing the
+original main class:</p>
 <pre>
 public class CustomExitCode extends org.apache.tools.ant.Main {
     protected void exit(int exitCode) {
         // implement your own behaviour, e.g. NOT exiting the JVM
     }
 }
-</pre> and starting Ant with access (<tt>-lib path-to-class</tt>) to this class.
-</p>
+</pre>
+<p>and starting Ant with access (<kbd>-lib <i>path-to-class</i></kbd>)
+to this class.</p>
 
-<h3><a name="libs">Library Directories</a></h3>
-<p>
-Prior to Ant 1.6, all jars in the ANT_HOME/lib would be added to the CLASSPATH
-used to run Ant. This was done in the scripts that started Ant. From Ant 1.6,
-two directories are scanned by default and more can be added as required. The
-default directories scanned are ANT_HOME/lib and a user specific directory,
-${user.home}/.ant/lib. This arrangement allows the Ant installation to be
-shared by many users while still allowing each user to deploy additional jars.
-Such additional jars could be support jars for Ant's optional tasks or jars
-containing third-party tasks to be used in the build. It also allows the main Ant installation to be locked down which will please system administrators.
-</p>
+<h3 id="libs">Library Directories</h3>
 
-<p>
-Additional directories to be searched may be added by using the -lib option.
-The -lib option specifies a search path. Any jars or classes in the directories
-of the path will be added to Ant's classloader. The order in which jars are
-added to the classpath is as follows:
-</p>
+<p>Prior to Ant 1.6, all jars in the <samp>ANT_HOME/lib</samp> would
+be added to the <samp>CLASSPATH</samp> used to run Ant. This was done
+in the scripts that started Ant. <em>Since Ant 1.6</em>, two
+directories are scanned by default and more can be added as
+required. The default directories scanned
+are <samp>ANT_HOME/lib</samp> and a user specific
+directory, <samp>${user.home}/.ant/lib</samp>. This arrangement allows
+the Ant installation to be shared by many users while still allowing
+each user to deploy additional jars.  Such additional jars could be
+support jars for Ant's optional tasks or jars containing third-party
+tasks to be used in the build. It also allows the main Ant
+installation to be locked down which will please system
+administrators.</p>
+
+<p>Additional directories to be searched may be added by using
+the <kbd>-lib</kbd> option.  The <kbd>-lib</kbd> option specifies
+a search path. Any jars or classes in the directories of the path will
+be added to Ant's classloader. The order in which jars are added to
+the classpath is as follows:</p>
 
 <ul>
-  <li>-lib jars in the order specified by the -lib elements on the command line</li>
-  <li>jars from ${user.home}/.ant/lib (unless -nouserlib is set)</li>
-  <li>jars from ANT_HOME/lib</li>
+  <li>jars in the order specified by the <kbd>-lib</kbd> options on the command line</li>
+  <li>jars from <samp>${user.home}/.ant/lib</samp> (unless <kbd>-nouserlib</kbd> is set)</li>
+  <li>jars from <samp>ANT_HOME/lib</samp></li>
 </ul>
 
-<p>
-Note that the CLASSPATH environment variable is passed to Ant using a -lib
-option. Ant itself is started with a very minimalistic classpath.
-Ant should work perfectly well with an empty CLASSPATH environment variable,
-something the the -noclasspath option actually enforces. We get many more support calls related to classpath problems (especially quoting problems) than
-we like.
-
-</p>
-
-<p>
-The location of ${user.home}/.ant/lib is somewhat dependent on the JVM. On Unix
-systems ${user.home} maps to the user's home directory whilst on recent
-versions of Windows it will be somewhere such as
-C:\Documents&nbsp;and&nbsp;Settings\username\.ant\lib. You should consult your
-JVM documentation for more details.
-</p>
+<p>Note that the <code>CLASSPATH</code> environment variable is passed
+to Ant using a <kbd>-lib</kbd> option. Ant itself is started with a
+very minimalistic classpath.  Ant should work perfectly well with an
+empty <code>CLASSPATH</code> environment variable, something the
+the <kbd>-noclasspath</kbd> option actually enforces. We get many more
+support calls related to classpath problems (especially quoting
+problems) than we like.</p>
+
+<p>The location of <samp>${user.home}/.ant/lib</samp> is somewhat
+dependent on the JVM. On Unix systems <samp>${user.home}</samp> maps
+to the user's home directory whilst on recent versions of Windows it
+will be somewhere such
+as <code>C:\Users\<i>username</i>\.ant\lib</code>. You should consult
+your JVM documentation for more details.</p>
 
 <h3>Examples</h3>
-<blockquote>
-  <pre>ant</pre>
-</blockquote>
-<p>runs Ant using the <code>build.xml</code> file in the current directory, on
-the default target.</p>
-
-<blockquote>
-  <pre>ant -buildfile test.xml</pre>
-</blockquote>
-<p>runs Ant using the <code>test.xml</code> file in the current directory, on
-the default target.</p>
-
-<blockquote>
-  <pre>ant -buildfile test.xml dist</pre>
-</blockquote>
-<p>runs Ant using the <code>test.xml</code> file in the current directory, on
-the target called <code>dist</code>.</p>
-
-<blockquote>
-  <pre>ant -buildfile test.xml -Dbuild=build/classes dist</pre>
-</blockquote>
-<p>runs Ant using the <code>test.xml</code> file in the current directory, on
-the target called <code>dist</code>, setting the <code>build</code> property
-to the value <code>build/classes</code>.</p>
-
-<blockquote>
-  <pre>ant -lib /home/ant/extras</pre>
-</blockquote>
-<p>runs Ant picking up additional task and support jars from the
-/home/ant/extras location</p>
-
-<blockquote>
-  <pre>ant -lib one.jar;another.jar</pre>
-  <pre>ant -lib one.jar -lib another.jar</pre>
-</blockquote>
-<p>adds two jars to Ants classpath.</p>
 
+<pre class="input">ant</pre>
+<p>runs Ant using the <samp>build.xml</samp> file in the current
+directory, on the default target.</p>
+
+<pre class="input">ant -buildfile test.xml</pre>
+<p>runs Ant using the <samp>test.xml</samp> file in the current
+directory, on the default target.</p>
+
+<pre class="input">ant -buildfile test.xml dist</pre>
+<p>runs Ant using the <samp>test.xml</samp> file in the current
+directory, on the target called <samp>dist</samp>.</p>
+
+<pre class="input">ant -buildfile test.xml -Dbuild=build/classes dist</pre>
+<p>runs Ant using the <samp>test.xml</samp> file in the current
+directory, on the target called <samp>dist</samp>, setting
+the <code>build</code> property to the value <q>build/classes</q>.</p>
+
+<pre class="input">ant -lib /home/ant/extras</pre>
+<p>runs Ant picking up additional task and support jars from
+the <samp>/home/ant/extras</samp> location</p>
 
+<pre class="input">ant -lib one.jar;another.jar</pre>
+<pre class="input">ant -lib one.jar -lib another.jar</pre>
+<p>adds two jars to Ants classpath.</p>
 
-<h3><a name="files">Files</a></h3>
+<h3 id="files">Files</h3>
 
 <p>The Ant wrapper script for Unix will source (read and evaluate) the
-file <code>~/.antrc</code> before it does anything. On Windows, the Ant
-wrapper batch-file invokes <code>%HOME%\antrc_pre.bat</code> at the start and
-<code>%HOME%\antrc_post.bat</code> at the end.  You can use these
-files, for example, to set/unset environment variables that should only be
-visible during the execution of Ant.  See the next section for examples.</p>
+file <samp>~/.antrc</samp> before it does anything. On Windows, the
+Ant wrapper batch-file invokes <samp>%HOME%\antrc_pre.bat</samp> at
+the start and <samp>%HOME%\antrc_post.bat</samp> at the end.  You can
+use these files, for example, to set/unset environment variables that
+should only be visible during the execution of Ant.  See the next
+section for examples.</p>
 
-<h3><a name="envvars">Environment Variables</a></h3>
+<h3 id="envvars">Environment Variables</h3>
 
-<p>The wrapper scripts use the following environment variables (if
-set):</p>
+<p>The wrapper scripts use the following environment variables (if set):</p>
 
 <ul>
-  <li><code>JAVACMD</code> - full path of the Java executable.  Use this
-  to invoke a different JVM than <code>JAVA_HOME/bin/java(.exe)</code>.</li>
+  <li><code>JAVACMD</code>&mdash;full path of the Java executable.  Use this
+  to invoke a different JVM than <samp>JAVA_HOME/bin/java(.exe)</samp>.</li>
 
-  <li><code>ANT_OPTS</code> - command-line arguments that should be
+  <li><code>ANT_OPTS</code>&mdash;command-line arguments that should be
   passed to the JVM. For example, you can define system properties or set
   the maximum Java heap size here.</li>
 
-  <li><code>ANT_ARGS</code> - Ant command-line arguments. For example,
+  <li><code>ANT_ARGS</code>&mdash;Ant command-line arguments. For example,
   set <code>ANT_ARGS</code> to point to a different logger, include a
-  listener, and to include the <code>-find</code> flag.</li>
-  <strong>Note:</strong> If you include <code>-find</code>
+  listener, and to include the <kbd>-find</kbd> flag.<br/>
+  <strong>Note</strong>: If you include <kbd>-find</kbd>
   in <code>ANT_ARGS</code>, you should include the name of the build file
-  to find, even if the file is called <code>build.xml</code>.
+  to find, even if the file is called <samp>build.xml</samp>.</li>
 </ul>
 
-<h3><a name="sysprops">Java System Properties</a></h3>
+<h3 id="sysprops">Java System Properties</h3>
 <p>Some of Ant's core classes can be configured via system properties.</p>
-<p>Here is the result of a search through the codebase. Because system properties are
-available via Project instance, I searched for them with a
-<pre>
-    grep -r -n "getPropert" * &gt; ..\grep.txt
-</pre>
-command. After that I filtered out the often-used but not-so-important values (most of them
-read-only values): <i>path.separator, ant.home, basedir, user.dir, os.name,
-line.separator, java.home, java.version, java.version, user.home, java.class.path</i><br>
-And I filtered out the <i>getPropertyHelper</i> access.</p>
-<table border="1">
+<p>Here is the result of a search through the codebase. Because system
+properties are available via Project instance, I searched for them with a</p>
+<pre class="input">grep -r -n "getPropert" * &gt; ..\grep.txt</pre>
+<p>command. After that I filtered out the often-used but
+not-so-important values (most of them read-only
+values): <code>path.separator</code>, <code>ant.home</code>, <code>basedir</code>,
+<code>user.dir</code>, <code>os.name</code>, <code>line.separator</code>,
+<code>java.home</code>, <code>java.version</code>, <code>java.version</code>,
+<code>user.home</code>, <code>java.class.path</code><br/>
+And I filtered out the <code>getPropertyHelper</code> access.</p>
+
+<table>
 <tr>
   <th>property name</th>
-  <th>valid values /default value</th>
+  <th>valid values/default value</th>
   <th>description</th>
 </tr>
 <tr>
   <td><code>ant.build.javac.source</code></td>
   <td>Source-level version number</td>
-  <td>Default <em>source</em> value for &lt;javac&gt;/&lt;javadoc&gt;</td>
+  <td>Default <var>source</var> value
+  for <code>&lt;javac&gt;</code>/<code>&lt;javadoc&gt;</code></td>
 </tr>
 <tr>
   <td><code>ant.build.javac.target</code></td>
   <td>Class-compatibility version number</td>
-  <td>Default <em>target</em> value for &lt;javac&gt;</td>
+  <td>Default <var>target</var> value for <code>&lt;javac&gt;</code></td>
 </tr>
 <tr>
   <td><code>ant.executor.class</code></td>
-  <td>classname; default is org. apache. tools. ant. helper. DefaultExecutor</td>
-  <td><b>Since Ant 1.6.3</b> Ant will delegate Target invocation to the
-org.apache.tools.ant.Executor implementation specified here.
-  </td>
+  <td>classname; default is <q>org.<wbr>apache.<wbr>tools.<wbr>ant.<wbr>helper.<wbr>DefaultExecutor</q></td>
+  <td><em>Since Ant 1.6.3</em> Ant will delegate Target invocation to
+  the <code class="code">org.apache.tools.ant.Executor</code>
+  implementation specified here.</td>
 </tr>
-
-<tr>
+  <tr>
   <td><code>ant.file</code></td>
   <td>read only: full filename of the build file</td>
-  <td>This is set to the name of the build file. In
-  <a href="Tasks/import.html">
-  &lt;import&gt;-ed</a> files, this is set to the containing build file.
-  </td>
+  <td>This is set to the name of the build
+  file. In <a href="Tasks/import.html">&lt;import&gt;-ed</a> files,
+  this is set to the containing build file.</td>
 </tr>
-
-<tr>
+  <tr>
   <td><code>ant.file.*</code></td>
-  <td>read only: full filename of the build file of Ant projects
-  </td>
-  <td>This is set to the name of a file by project;
-  this lets you determine the location of <a href="Tasks/import.html">
-  &lt;import&gt;-ed</a> files,
-  </td>
+  <td>read only: full filename of the build file of Ant projects</td>
+  <td>This is set to the name of a file by project; this lets you
+  determine the location
+  of <a href="Tasks/import.html">&lt;import&gt;-ed</a> files.</td>
 </tr>
-
-<tr>
+  <tr>
   <td><code>ant.input.properties</code></td>
   <td>filename (required)</td>
-  <td>Name of the file holding the values for the
-      <a href="inputhandler.html">PropertyFileInputHandler</a>.
-  </td>
+  <td>Name of the file holding the values for
+  the <a href="inputhandler.html">PropertyFileInputHandler</a>.</td>
 </tr>
 <tr>
   <td><code>ant.logger.defaults</code></td>
-  <!-- add the blank after the slash, so the browser can do a line break -->
-  <td>filename (optional, default '/org/ apache/ tools/ ant/ listener/ defaults.properties')</td>
-  <td>Name of the file holding the color mappings for the
-      <a href="listeners.html#AnsiColorLogger">AnsiColorLogger</a>.
-  </td>
+  <td>filename (optional, default <q>/org/<wbr>apache/<wbr>tools/<wbr>ant/<wbr>listener/<wbr>defaults.properties</q>)</td>
+  <td>Name of the file holding the color mappings for
+  the <a href="listeners.html#AnsiColorLogger">AnsiColorLogger</a>.</td>
 </tr>
 <tr>
   <td><code>ant.netrexxc.*</code></td>
   <td>several formats</td>
-  <td>Use specified values as defaults for <a href="Tasks/netrexxc.html">netrexxc</a>.
-  </td>
+  <td>Use specified values as defaults
+  for <a href="Tasks/netrexxc.html">netrexxc</a>.</td>
 </tr>
 <tr>
   <td><code>ant.PropertyHelper</code></td>
-  <td>ant-reference-name (optional)</td>
-  <td>Specify the PropertyHelper to use. The object must be of the type
-      org.apache.tools.ant.PropertyHelper. If not defined an object of
-      org.apache.tools.ant.PropertyHelper will be used as PropertyHelper.
-  </td>
+  <td>Ant reference name (optional)</td>
+  <td>Specify the PropertyHelper to use. The object must be of the
+  type <code class="code">org.apache.tools.ant.PropertyHelper</code>. By
+  default, an object
+  of <code class="code">org.apache.tools.ant.PropertyHelper</code>
+  will be used as PropertyHelper.</td>
 </tr>
 <tr>
   <td><code>ant.regexp.regexpimpl</code></td>
   <td>classname</td>
-  <td>classname for a RegExp implementation; if not set Ant uses JDK 1.4's implementation;
-      <a href="Types/mapper.html#regexp-mapper">RegExp-Mapper</a>
-      "Choice of regular expression implementation"
-  </td>
+  <td>classname for a RegExp implementation; by default, JDK 1.4+
+  implementation; <a href="Types/mapper.html#regexp-mapper">RegExp
+  Mapper</a> "Choice of regular expression implementation".</td>
 </tr>
 <tr>
   <td><code>ant.reuse.loader</code></td>
   <td>boolean</td>
-  <td>allow to reuse classloaders
-      used in org.apache.tools.ant.util.ClasspathUtil
-  </td>
+  <td>allow to reuse classloaders used
+  in <code class="code">org.apache.tools.ant.util.ClasspathUtil</code>.</td>
 </tr>
 <tr>
   <td><code>ant.XmlLogger.stylesheet.uri</code></td>
-  <td>filename (default 'log.xsl')</td>
-  <td>Name for the stylesheet to include in the logfile by
-      <a href="listeners.html#XmlLogger">XmlLogger</a>.
-  </td>
+  <td>filename (default <q>log.xsl</q>)</td>
+  <td>Name for the stylesheet to include in the logfile
+  by <a href="listeners.html#XmlLogger">XmlLogger</a>.</td>
 </tr>
 <tr>
   <td><code>build.compiler</code></td>
   <td>name</td>
-  <td>Specify the default compiler to use.
-      see <a href="Tasks/javac.html">javac</a>,
-      <a href="Tasks/ejb.html#ejbjar_weblogic">EJB Tasks</a>
-      (compiler attribute),
-      <a href="Tasks/javah.html">javah</a>
-  </td>
+  <td>Specify the default compiler to use;
+  see <a href="Tasks/javac.html">javac</a>, <a href="Tasks/ejb.html#ejbjar_weblogic">EJB
+  Tasks</a> (<var>compiler</var>
+  attribute), <a href="Tasks/javah.html">javah</a>.</td>
 </tr>
 <tr>
   <td><code>build.compiler.emacs</code></td>
-  <td>boolean (default false)</td>
-  <td>Enable emacs-compatible error messages.
-      see <a href="Tasks/javac.html">javac</a> "Jikes Notes"
-  </td>
+  <td>boolean (default <q>false</q>)</td>
+  <td>Enable emacs-compatible error messages;
+  see <a href="Tasks/javac.html#jikes">javac</a> "Jikes Notes".</td>
 </tr>
 <tr>
   <td><code>build.compiler.fulldepend</code></td>
   <td>boolean (default false)</td>
-  <td>Enable full dependency checking
-      see <a href="Tasks/javac.html">javac</a> "Jikes Notes"
-  </td>
+  <td>Enable full dependency checking;
+  see <a href="Tasks/javac.html#jikes">javac</a> "Jikes Notes".</td>
 </tr>
 <tr>
   <td><code>build.compiler.jvc.extensions</code></td>
-  <td>boolean (default true)</td>
-  <td>enable Microsoft extensions of their java compiler
-      see <a href="Tasks/javac.html">javac</a> "Jvc Notes"
-  </td>
+  <td><em><u>Deprecated</u></em></td>
+  <td>Enable Microsoft extensions of their Java compiler;
+  see <a href="Tasks/javac.html#jvc">javac</a> "Jvc Notes".</td>
 </tr>
 <tr>
   <td><code>build.compiler.pedantic</code></td>
-  <td>boolean (default false)</td>
-  <td>Enable pedantic warnings.
-      see <a href="Tasks/javac.html">javac</a> "Jikes Notes"
-  </td>
+  <td>boolean (default <q>false</q>)</td>
+  <td>Enable pedantic warnings;
+  see <a href="Tasks/javac.html#jikes">javac</a> "Jikes Notes".</td>
 </tr>
 <tr>
   <td><code>build.compiler.warnings</code></td>
-  <td>Deprecated flag</td>
-  <td> see <a href="Tasks/javac.html">javac</a> "Jikes Notes" </td>
+  <td><em><u>Deprecated</u></em></td>
+  <td>See <a href="Tasks/javac.html#jikes">javac</a> "Jikes Notes"</td>
 </tr>
 <tr>
   <td><code>build.rmic</code></td>
   <td>name</td>
-  <td>control the <a href="Tasks/rmic.html">rmic</a> compiler </td>
+  <td>Control the <a href="Tasks/rmic.html">rmic</a> compiler</td>
 </tr>
 <tr>
   <td><code>build.sysclasspath</code></td>
-  <td>see <a href="sysclasspath.html">its dedicated page</a>, no
-    default value</td>
-  <td>see <a href="sysclasspath.html">its dedicated page</a></td>
+  <td>No default value</td>
+  <td>See <a href="sysclasspath.html">its dedicated page</a></td>
 </tr>
 <tr>
   <td><code>file.encoding</code></td>
   <td>name of a supported character set (e.g. UTF-8, ISO-8859-1, US-ASCII)</td>
-  <td>use as default character set of email messages; use as default for source-, dest- and bundleencoding
-      in <a href="Tasks/translate.html">translate</a> <br>
-      see JavaDoc of <a target="_blank" href="http://docs.oracle.com/javase/7/docs/api/java/nio/charset/Charset.html">java.nio.charset.Charset</a>
-      for more information about character sets (not used in Ant, but has nice docs).
-  </td>
+  <td>use as default character set of email messages; use as default
+  for <var>srcencoding</var>, <var>destencoding</var>
+  and <var>bundleencoding</var>
+  in <a href="Tasks/translate.html">translate</a><br/> see JavaDoc
+  of <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/charset/Charset.html"
+  target="_top">java.nio.charset.Charset</a> for more information
+  about character sets (not used in Ant, but has nice docs).</td>
 </tr>
 <tr>
   <td><code>jikes.class.path</code></td>
   <td>path</td>
-  <td>The specified path is added to the classpath if jikes is used as compiler.</td>
+  <td>The specified path is added to the classpath if Jikes is used as compiler.</td>
 </tr>
 <tr>
-  <td><code>MailLogger.properties.file, MailLogger.*</code></td>
+  <td><code>MailLogger.properties.file</code>, <code>MailLogger.*</code></td>
   <td>filename (optional, defaults derived from Project instance)</td>
-  <td>Name of the file holding properties for sending emails by the
-      <a href="listeners.html#MailLogger">MailLogger</a>. Override properties set
-      inside the buildfile or via command line.
-  </td>
+  <td>Name of the file holding properties for sending emails by
+  the <a href="listeners.html#MailLogger">MailLogger</a>. Override
+  properties set inside the buildfile or via command line.</td>
 </tr>
 <tr>
   <td><code>org.apache.tools.ant.ProjectHelper</code></td>
-  <!-- add the blank after the slash, so the browser can do a line break -->
-  <td>classname (optional, default 'org.apache.tools.ant.ProjectHelper2')</td>
-  <td>specifies the classname to use as ProjectHelper. The class must extend
-      org.apache.tools.ant.ProjectHelper.
-  </td>
+  <td>classname (optional, default <q>org.<wbr>apache.<wbr>tools.<wbr>ant.<wbr>ProjectHelper2</q>)</td>
+  <td>specifies the classname to use as ProjectHelper. The class must
+  extend <code class="code">org.apache.tools.ant.ProjectHelper</code>.</td>
 </tr>
 <tr>
   <td><code>org.apache.tools.ant.ArgumentProcessor</code></td>
   <td>classname (optional)</td>
-  <td>specifies the classname to use as ArgumentProcessor. The class must extend
-      org.apache.tools.ant.ArgumentProcessor.
-  </td>
+  <td>specifies the classname to use as ArgumentProcessor. The class
+  must extend <code class="code">org.apache.tools.ant.ArgumentProcessor</code>.</td>
 </tr>
-
 <tr>
   <td><code>websphere.home</code></td>
   <td>path</td>
-  <td>Points to home directory of websphere.
-      see <a href="Tasks/ejb.html#ejbjar_websphere">EJB Tasks</a>
-  </td>
+  <td>Points to home directory of WebSphere;
+  see <a href="Tasks/ejb.html#ejbjar_websphere">EJB Tasks</a></td>
 </tr>
 <tr>
   <td><code>XmlLogger.file</code></td>
-  <td>filename (default 'log.xml')</td>
-  <td>Name for the logfile for <a href="listeners.html#MailLogger">MailLogger</a>.
-  </td>
+  <td>filename (default <q>log.xml</q>)</td>
+  <td>Name for the logfile
+  for <a href="listeners.html#MailLogger">MailLogger</a>.</td>
 </tr>
 <tr>
   <td><code>ant.project-helper-repo.debug</code></td>
-  <td>boolean (default 'false')</td>
-  <td>Set it to true to enable debugging with Ant's
-  <a href="projecthelper.html#repository">ProjectHelper internal repository</a>.
-  </td>
+  <td>boolean (default <q>false</q>)</td>
+  <td>Set it to <q>true</q> to enable debugging with
+  Ant's <a href="projecthelper.html#repository">ProjectHelper internal
+  repository</a>.</td>
 </tr>
 <tr>
   <td><code>ant.argument-processor-repo.debug</code></td>
-  <td>boolean (default 'false')</td>
-  <td>Set it to true to enable debugging with Ant's
-  <a href="argumentprocessor.html#repository">ArgumentProcessor internal repository</a>.
-  </td>
+  <td>boolean (default <q>false</q>)</td>
+  <td>Set it to <q>true</q> to enable debugging with
+  Ant's <a href="argumentprocessor.html#repository">ArgumentProcessor
+  internal repository</a>.</td>
 </tr>
 <tr>
   <td><code>ant.tstamp.now</code></td>
   <td>number, seconds since the epoch (midnight 1970-01-01)</td>
-  <td>The value to use as current time and date for &lt;tstamp&gt;</td>
+  <td rowspan="2">The value to use as current time and date
+  for <code>&lt;tstamp&gt;</code></td>
+</tr>
+<tr>
+  <td><code>ant.tstamp.now.iso</code></td>
+  <td>ISO-8601 timestamp string like <code>1972-04-17T08:07:00Z</code></td>
 </tr>
 </table>
 
 <p>
-If new properties get added (it happens), expect them to appear under the
-"ant." and "org.apache.tools.ant" prefixes, unless the developers have a
-very good reason to use another prefix. Accordingly, please avoid using
-properties that begin with these prefixes. This protects you from future
-Ant releases breaking your build file.
+If new properties get added (it happens), expect them to appear under
+the <code>ant.</code> and <code>org.apache.tools.ant.</code> prefixes,
+unless the developers have a very good reason to use another
+prefix. Accordingly, please avoid using properties that begin with
+these prefixes. This protects you from future Ant releases breaking
+your build file.
 </p>
 <h3>return code</h3>
-<p>the ant start up scripts (in their Windows and Unix version) return
-the return code of the java program. So a successful build returns 0,
-failed builds return other values.
-</p>
-
-<h2><a name="cygwin">Cygwin Users</a></h2>
-<p>The Unix launch script that come with Ant works correctly with Cygwin. You
-should not have any problems launching Ant from the Cygwin shell. It is
-important to note, however, that once Ant is running it is part of the JDK
-which operates as a native Windows application. The JDK is not a Cygwin
-executable, and it therefore has no knowledge of Cygwin paths, etc. In
-particular when using the <code>&lt;exec&gt;</code> task, executable names such
-as &quot;/bin/sh&quot; will not work, even though these work from the Cygwin
-shell from which Ant was launched. You can use an executable name such as
-&quot;sh&quot; and rely on that command being available in the Windows path.
-</p>
-
-<h2><a name="os2">OS/2 Users</a></h2>
-<p>The OS/2 launch script was developed to perform complex tasks. It has two parts:
-<code>ant.cmd</code> which calls Ant and <code>antenv.cmd</code> which sets the environment for Ant.
-Most often you will just call <code>ant.cmd</code> using the same command line options as described
-above. The behaviour can be modified by a number of ways explained below.</p>
+<p>
+Ant start up scripts (in their Windows and Unix version) return the
+return code of the <code>java</code> program. So a successful build
+returns <q>0</q>, failed builds return other values.
+</p>
 
-<p>Script <code>ant.cmd</code> first verifies whether the Ant environment is set correctly. The
-requirements are:</p>
+<h2 id="cygwin">Cygwin Users</h2>
+<p>
+Unix launch script that come with Ant works correctly with Cygwin. You
+should not have any problems launching Ant from the Cygwin shell. It
+is important to note, however, that once Ant is running it is part of
+the JDK which operates as a native Windows application. The JDK is not
+a Cygwin executable, and it therefore has no knowledge of Cygwin
+paths, etc. In particular when using the <code>&lt;exec&gt;</code>
+task, executable names such as <q>/bin/sh</q> will not work, even
+though these work from the Cygwin shell from which Ant was
+launched. You can use an executable name such as <q>sh</q> and rely on
+that command being available in the Windows path.
+</p>
+
+<h2 id="os2">OS/2 Users</h2>
+<p>
+The OS/2 launch script was developed to perform complex tasks. It has
+two parts: <kbd>ant.cmd</kbd> which calls Ant
+and <kbd>antenv.cmd</kbd> which sets the environment for Ant.  Most
+often you will just call <kbd>ant.cmd</kbd> using the same command
+line options as described above. The behaviour can be modified by a
+number of ways explained below.
+</p>
+
+<p>
+Script <kbd>ant.cmd</kbd> first verifies whether the Ant environment
+is set correctly. The requirements are:
+</p>
 <ol>
 <li>Environment variable <code>JAVA_HOME</code> is set.</li>
 <li>Environment variable <code>ANT_HOME</code> is set.</li>
@@ -532,82 +512,94 @@
 <code>JAVA_HOME</code> and at least one element from <code>ANT_HOME</code>.</li>
 </ol>
 
-<p>If any of these conditions is violated, script <code>antenv.cmd</code> is called. This script
-first invokes configuration scripts if there exist: the system-wide configuration
-<code>antconf.cmd</code> from the <code>%ETC%</code> directory and then the user configuration
-<code>antrc.cmd</code> from the <code>%HOME%</code> directory. At this moment both
-<code>JAVA_HOME</code> and <code>ANT_HOME</code> must be defined because <code>antenv.cmd</code>
-now adds <code>classes.zip</code> or <code>tools.jar</code> (depending on version of JVM) and
-everything from <code>%ANT_HOME%\lib</code> except <code>ant-*.jar</code> to
-<code>CLASSPATH</code>. Finally <code>ant.cmd</code> calls per-directory configuration
-<code>antrc.cmd</code>. All settings made by <code>ant.cmd</code> are local and are undone when the
-script ends. The settings made by <code>antenv.cmd</code> are persistent during the lifetime of the
-shell (of course unless called automatically from <code>ant.cmd</code>). It is thus possible to call
-<code>antenv.cmd</code> manually and modify some settings before calling <code>ant.cmd</code>.</p>
-
-<p>Scripts <code>envset.cmd</code> and <code>runrc.cmd</code> perform auxiliary tasks. All scripts
-have some documentation inside.</p>
-
-<h2><a name="background">Running Ant as a background process on
-    Unix(-like) systems</a></h2>
-
-<p>If you start Ant as a background process (like in <code>ant
-    &amp;</code>) and the build process creates another process, Ant will
-    immediately try to read from standard input, which in turn will
-    most likely suspend the process.  In order to avoid this, you must
-    redirect Ant's standard input or explicitly provide input to each
-    spawned process via the input related attributes of the
-    corresponding tasks.</p>
-
-<p>Tasks that create such new processes
-  include <code>&lt;exec&gt;</code>, <code>&lt;apply&gt;</code>
-  or <code>&lt;java&gt;</code> when the <code>fork</code> attribute is
-  <code>true</code>.</p>
-
-<h2><a name="viajava">Running Ant via Java</a></h2>
-<p>If you have installed Ant in the do-it-yourself way, Ant can be started
-from one of two entry points:</p>
-<blockquote>
-  <pre>java -Dant.home=c:\ant org.apache.tools.ant.Main [options] [target]</pre>
-</blockquote>
-
-<blockquote>
-  <pre>java -Dant.home=c:\ant org.apache.tools.ant.launch.Launcher [options] [target]</pre>
-</blockquote>
-
-<p>
-The first method runs Ant's traditional entry point. The second method uses
-the Ant Launcher introduced in Ant 1.6. The former method does not support
-the -lib option and all required classes are loaded from the CLASSPATH. You must
-ensure that all required jars are available. At a minimum the CLASSPATH should
-include:
+<p>
+If any of these conditions is violated, script <kbd>antenv.cmd</kbd>
+is called. This script first invokes configuration scripts if there
+exist: the system-wide configuration <kbd>antconf.cmd</kbd> from
+the <samp>%ETC%</samp> directory and then the user
+configuration <kbd>antrc.cmd</kbd> from the <samp>%HOME%</samp>
+directory. At this moment both <code>JAVA_HOME</code>
+and <code>ANT_HOME</code> must be defined
+because <kbd>antenv.cmd</kbd> now adds <samp>classes.zip</samp>
+or <samp>tools.jar</samp> (depending on version of JVM) and everything
+from <samp>%ANT_HOME%\lib</samp> except <samp>ant-*.jar</samp>
+to <code>CLASSPATH</code>. Finally <kbd>ant.cmd</kbd> calls
+per-directory configuration <kbd>antrc.cmd</kbd>. All settings made
+by <kbd>ant.cmd</kbd> are local and are undone when the script
+ends. The settings made by <kbd>antenv.cmd</kbd> are persistent
+during the lifetime of the shell (of course unless called
+automatically from <kbd>ant.cmd</kbd>). It is thus possible to
+call <kbd>antenv.cmd</kbd> manually and modify some settings before
+calling <kbd>ant.cmd</kbd>.
+</p>
+
+<p>
+Scripts <kbd>envset.cmd</kbd> and <kbd>runrc.cmd</kbd> perform
+auxiliary tasks. All scripts have some documentation inside.
+</p>
+
+<h2 id="background">Running Ant as a background process on Unix(-like) systems</h2>
+
+<p>
+If you start Ant as a background process (like in <kbd>ant
+&amp;</kbd>) and the build process creates another process, Ant will
+immediately try to read from standard input, which in turn will most
+likely suspend the process.  In order to avoid this, you must redirect
+Ant's standard input or explicitly provide input to each spawned
+process via the input related attributes of the corresponding tasks.
+</p>
+
+<p>
+Tasks that create such new processes
+include <code>&lt;exec&gt;</code>, <code>&lt;apply&gt;</code>
+or <code>&lt;java&gt;</code> when the <var>fork</var> attribute
+is <q>true</q>.
+</p>
+
+<h2 id="viajava">Running Ant via Java</h2>
+<p>
+If you have installed Ant in the do-it-yourself way, Ant can be
+started from one of two entry points:
+</p>
+
+<pre class="input">java -Dant.home=c:\ant org.apache.tools.ant.Main [options] [target]</pre>
+<pre class="input">java -Dant.home=c:\ant org.apache.tools.ant.launch.Launcher [options] [target]</pre>
+
+<p>
+The first method runs Ant's traditional entry point. The second method
+uses the Ant Launcher introduced in Ant 1.6. The former method does
+not support the <kbd>-lib</kbd> option and all required classes are
+loaded from the <code>CLASSPATH</code>. You must ensure that all
+required jars are available. At a minimum the <code>CLASSPATH</code>
+should include:
 </p>
 
 <ul>
-<li><code>ant.jar</code> and <code>ant-launcher.jar</code></li>
+<li><samp>ant.jar</samp> and <samp>ant-launcher.jar</samp></li>
 <li>jars/classes for your XML parser</li>
 <li>the JDK's required jar/zip files</li>
 </ul>
 
 <p>
-The latter method supports the -lib, -nouserlib, -noclasspath options and will
-    load jars from the specified ANT_HOME. You should start the latter with the most minimal
-classpath possible, generally just the ant-launcher.jar.
+The latter method supports
+the <kbd>-lib</kbd>, <kbd>-nouserlib</kbd>, <kbd>-noclasspath</kbd>
+options and will load jars from the
+specified <code>ANT_HOME</code>. You should start the latter with the
+most minimal classpath possible, generally just
+the <samp>ant-launcher.jar</samp>.
 </p>
 
-<a name="viaant"/>
-
+<p id="viaant">
 Ant can be started in Ant via the <code>&lt;java&gt;</code> command.
 Here is an example:
-
+</p>
 <pre>
-&lt;java
-        classname="org.apache.tools.ant.launch.Launcher"
-        fork="true"
-        failonerror="true"
-        dir="${sub.builddir}"
-        timeout="4000000"
-        taskname="startAnt"&gt;
+&lt;java classname="org.apache.tools.ant.launch.Launcher"
+      fork="true"
+      failonerror="true"
+      dir="${sub.builddir}"
+      timeout="4000000"
+      taskname="startAnt"&gt;
     &lt;classpath&gt;
         &lt;pathelement location="${ant.home}/lib/ant-launcher.jar"/&gt;
     &lt;/classpath&gt;
@@ -620,8 +612,6 @@
     &lt;arg value="${sub.target}"/&gt;
 &lt;/java&gt;
 </pre>
-<br>
-
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/runninglist.html ant-1.10.3/manual/runninglist.html
--- ant-1.9.10/manual/runninglist.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/runninglist.html	2018-03-24 12:37:12.000000000 +0000
@@ -29,18 +29,16 @@
 
 <h3>Running Apache Ant</h3>
 <ul class="inlinelist">
-<li><a href="running.html#commandline">Command Line</a></li>
-<div style="padding-left:1em">
-  <li><a href="running.html#options">Options</a></li>
-  <li><a href="running.html#libs">Library Directories</a></li>
-  <li><a href="running.html#files">Files</a></li>
-  <li><a href="running.html#envvars">Environment Variables</a></li>
-  <li><a href="running.html#sysprops">Java System Properties</a></li>
-  <li><a href="running.html#cygwin">Cygwin Users</a></li>
-  <li><a href="running.html#os2">OS/2 Users</a></li>
-  <li><a href="running.html#background">Running "in the background"</a></li>
-</div>
-<li><a href="running.html#viajava">Running Ant via Java</a></li>
+  <li><a href="running.html#commandline">Command Line</a></li>
+  <li class="indent"><a href="running.html#options">Options</a></li>
+  <li class="indent"><a href="running.html#libs">Library Directories</a></li>
+  <li class="indent"><a href="running.html#files">Files</a></li>
+  <li class="indent"><a href="running.html#envvars">Environment Variables</a></li>
+  <li class="indent"><a href="running.html#sysprops">Java System Properties</a></li>
+  <li class="indent"><a href="running.html#cygwin">Cygwin Users</a></li>
+  <li class="indent"><a href="running.html#os2">OS/2 Users</a></li>
+  <li class="indent"><a href="running.html#background">Running "in the background"</a></li>
+  <li><a href="running.html#viajava">Running Ant via Java</a></li>
 </ul>
 
 </body>
diff -Nru ant-1.9.10/manual/stylesheets/style.css ant-1.10.3/manual/stylesheets/style.css
--- ant-1.9.10/manual/stylesheets/style.css	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/stylesheets/style.css	2018-03-24 12:37:12.000000000 +0000
@@ -15,53 +15,187 @@
  *  limitations under the License.
  *
  */
+body {
+    font-family: “Palatino Linotype�, Palatino, Georgia, “Century Schoolbook�, serif;
+}
+
 h2 {
   font-size: 200%;
-  background-color: ffffff;
+  background-color: white;
 }
 
 h3 {
   font-size: 130%;
-  color:     #ffffff;
-  background-color: #525D76;
+  color: white;
+  background-color: #525d76;
 }
 
 h4 {
-  color:  #ffffff;
-  background-color: #828DA6;
+  color: white;
+  background-color: #828da6;
 }
 
-td {
-   background-color: eeeeee;
-   color:            000000;
+h5 {
+  font-size: 100%;
+  color: white;
+  background-color: #a6adbe;
+  margin-top: .5rem;
+  margin-bottom: .5rem;
+}
+
+h6 {
+  font-size: 100%;
+  color: white;
+  background-color: #c1c5d1;
+  margin-top: .5rem;
+  margin-bottom: .5rem;
+}
+
+h5 + p, h6 + p {
+  margin-top: .5rem;
+  margin-bottom: .5rem;
+}
+
+h3 > a, h4 > a, h5 > a, h6 > a {
+   color: white;
+}
+
+h3 > a:visited, h4 > a:visited, h5 > a:visited, h6 > a:visited,
+h3 > a:hover, h4 > a:hover, h5 > a:hover, h6 > a:hover {
+   color: lightskyblue;
+}
+
+var {
+    font-family: Verdana, Geneva, sans-serif;
+    font-size: 0.8rem;
+}
+
+q {
+    font-family: "Lucida Console", Monaco, monospace;
+    font-size: 0.8rem;
+}
+
+q.no-break {
+    white-space: nowrap;
+    hyphens: none;
+}
+
+code, samp, kbd {
+    white-space: nowrap;
+    hyphens: none;
+    font-size: 1.125rem;
 }
 
-/* first row */
-table tr:first-child td {
-   background-color: cccccc;
-   color:            000000;
+h2 > code, h2 > samp {
+    font-size: 2rem;
 }
 
-/* or th as first row */
-table th {
-   background-color: cccccc;
-   color:            000000;
+h3 > code, h3 > samp {
+    font-size: 1.5rem;
+}
+
+h3 > var {
+    font-size: 1.125rem;
 }
 
 pre {
-   background-color: efefef;
+   background-color: #efefef;
+   margin-right: 4rem;
+   margin-left: 4rem;
+   font-size: 1.125rem;
+}
+
+pre var, code var {
+    font-size: 0.65rem;
 }
 
 /* code snippets in examples and tutorials */
-.code { 
-   background: #EFEFEF; 
-   margin-top: 
+.code {
+   background: #efefef;
+}
+
+/* highlight console input */
+.input, kbd {
+   color: white;
+   background: darkseagreen;
+   overflow: hidden;
+   text-overflow: ellipsis;
 }
 
 /* highlight console output */
-.output { 
-   color: #FFFFFF; 
-   background: #837A67; 
+.output {
+   color: white;
+   background: #837a67;
+   overflow: hidden;
+   text-overflow: ellipsis;
+}
+
+/* a workaround for invisible
+   (white on white) overflows */
+pre.input:hover, pre.output:hover {
+    margin-right: 0;
+    margin-left: 0;
+    overflow: scroll;
+    text-overflow: initial;
+}
+
+td {
+   vertical-align: top;
+   background-color: #eeeeee;
+   color: black;
+}
+
+tr:hover > td {
+    background-color: whitesmoke;
+}
+
+th {
+   background-color: silver;
+   color: black;
+   vertical-align: middle;
+}
+
+td pre {
+    margin: 0 0 0 0;
+    font-size: 1rem;
+}
+
+thead.no-bold th {
+    font-weight: normal;
+    white-space: nowrap;
+}
+
+table.attr {
+    width: 100%;
+}
+
+table.attr td:first-child {
+    font-family: Verdana, Geneva, sans-serif;
+    font-size: 0.8rem;
+    font-style: italic;
+}
+
+table.attr td:last-child {
+    text-align: center;
+}
+
+table.attr td.center, h1.center, p.center {
+    text-align: center;
+}
+
+table.attr td.left {
+    font-family: “Palatino Linotype�, Palatino, Georgia, “Century Schoolbook�, serif;
+    font-size: 1rem;
+    font-style: normal;
+    text-align: left;
+}
+
+table.attr td.var {
+    text-align: left;
+}
+
+td[rowspan] {
+   vertical-align: middle;
 }
 
 ul.inlinelist {
@@ -70,3 +204,60 @@
    padding: 0;
 }
 
+li.indent {
+    padding-left: 1rem;
+}
+
+div.float {
+    margin-top: 0.5rem;
+    width: 100%;
+    min-height: 1.5rem;
+    line-height: 1.5rem;
+    background-color: silver;
+}
+
+div.float + table {
+    width: 100%;
+    table-layout: fixed;
+}
+
+div.float + table th:first-child {
+    width: 20%;
+    white-space: nowrap;
+}
+
+div.float + table tr:first-child {
+    width: 20%;
+    white-space: nowrap;
+}
+
+span.left {
+    float: left;
+    font-family: Verdana, Geneva, sans-serif;
+    font-weight: bold;
+}
+
+span.right {
+    float: right;
+}
+
+span.left, span.right {
+    vertical-align: middle;
+    background-color: silver;
+}
+
+ol.refs {
+    counter-reset: refs;
+}
+
+ol.refs > li {
+    list-style: none;
+    position: relative;
+}
+
+ol.refs > li:before {
+    content: "[" counter(refs, decimal) "]";
+    counter-increment: refs;
+    position: absolute;
+    left: -2rem;
+}
diff -Nru ant-1.9.10/manual/sysclasspath.html ant-1.10.3/manual/sysclasspath.html
--- ant-1.9.10/manual/sysclasspath.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/sysclasspath.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,18 +24,18 @@
 
 <body>
 
-<h2><a name="sysclasspath">build.sysclasspath</a></h2>
-<p>The value of the build.sysclasspath property
+<h2 id="sysclasspath">build.sysclasspath</h2>
+<p>The value of the <code>build.sysclasspath</code> property
 controls how the system classpath, i.e. the classpath in effect when
 Apache Ant is run, affects the behavior of classpaths in Ant.
 The default behavior varies from task to task.</p>
 
 The values and their meanings are:
 
-<table cellspacing="20">
+<table>
 <tr><th>value</th><th>meaning</th></tr>
 <tr>
-<td align="left" valign="top">only</td>
+<td>only</td>
 <td>Only the system classpath is used and classpaths specified in build files,
 etc are ignored. This situation could be considered as the person running
 the build file knows more about the environment than the person writing the
@@ -44,7 +44,7 @@
 </tr>
 
 <tr>
-<td align="left" valign="top">ignore</td>
+<td>ignore</td>
 <td>
 The system classpath is ignored. This situation is the reverse of the
 above. The person running the build trusts the build file writer to get the
@@ -53,7 +53,7 @@
 </tr>
 
 <tr>
-<td align="left" valign="top">last</td>
+<td>last</td>
 <td>
 The classpath is concatenated to any specified classpaths at the end. This
 is a compromise, where the build file writer has priority.
@@ -61,7 +61,7 @@
 </tr>
 
 <tr>
-<td align="left" valign="top">first</td>
+<td>first</td>
 <td>
 Any specified classpaths are concatenated to the system classpath. This is
 the other form of compromise where the build runner has priority.
@@ -70,9 +70,9 @@
 </table>
 
 <p><em>Since Ant 1.7</em> the value of this property also affects the
-bootclasspath settings--it combines the bootclasspath that has been
-specified for a task with the bootclasspath of the Java VM running
-Ant.  If the property has not been set, it defaults to "ignore" in
+bootclasspath settings&mdash;it combines the bootclasspath that has been
+specified for a task with the bootclasspath of the JVM running
+Ant.  If the property has not been set, it defaults to <q>ignore</q> in
 this case.</p>
 
 </body>
diff -Nru ant-1.9.10/manual/targets.html ant-1.10.3/manual/targets.html
--- ant-1.9.10/manual/targets.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/targets.html	2018-03-24 12:37:12.000000000 +0000
@@ -23,7 +23,7 @@
 </head>
 
 <body>
-  <h1><a name="targets">Targets</a></h1>
+  <h1 id="targets">Targets</h1>
 
   <p>A target is a container of tasks that cooperate to reach a
     desired state during the build process.</p>
@@ -33,27 +33,25 @@
     example you might have a target for compiling and a
     target for creating a distributable. You can only build a
     distributable when you have compiled first, so the distribute
-    target <i>depends on</i> the compile target.</p>
+    target <em>depends on</em> the compile target.</p>
 
-  <p>Ant tries to execute the targets in the <code>depends</code>
+  <p>Ant tries to execute the targets in the <var>depends</var>
     attribute in the order they appear (from left to right). Keep in
     mind that it is possible that a target can get executed earlier
     when an earlier target depends on it:</p>
 
-<blockquote>
-<pre>&lt;target name=&quot;A&quot;/&gt;
+  <pre>&lt;target name=&quot;A&quot;/&gt;
 &lt;target name=&quot;B&quot; depends=&quot;A&quot;/&gt;
 &lt;target name=&quot;C&quot; depends=&quot;B&quot;/&gt;
 &lt;target name=&quot;D&quot; depends=&quot;C,B,A&quot;/&gt;</pre>
-</blockquote>
 
   <p>Suppose we want to execute target D. From its
-    <code>depends</code> attribute, you might think that first target
+    <var>depends</var> attribute, you might think that first target
     C, then B and then A is executed.  Wrong! C depends on B, and B
     depends on A, so first A is executed, then B, then C, and finally
     D.</p>
-    
-  <blockquote><pre><b>Call-Graph:</b>  A --> B --> C --> D</pre></blockquote>
+
+  <pre><b>Call-Graph:</b>  A &rarr; B &rarr; C &rarr; D</pre>
 
   <p>In a chain of dependencies stretching back from a given target
     such as D above, each target gets executed only once, even when
@@ -61,7 +59,7 @@
     will first result in C being called, which in turn will first call
     B, which in turn will first call A. After A, then B, then C have
     executed, execution returns to the dependency list of D, which
-    will <u>not</u> call B and A, since they were already called in
+    will <strong>not</strong> call B and A, since they were already called in
     process of dependency resolution for C and B respectively as
     dependencies of D. Had no such dependencies been discovered in
     processing C and B, B and A would have been executed after C in
@@ -70,9 +68,9 @@
   <p>A target also has the ability to perform its execution if (or
     unless) a property has been set. This allows, for example, better
     control on the building process depending on the state of the
-    system (java version, OS, command-line property defines, etc.).
-    To make a target <i>sense</i> this property, you should add
-    the <code>if</code> (or <code>unless</code>) attribute with the
+    system (Java version, OS, command-line property defines, etc.).
+    To make a target <em>sense</em> this property, you should add
+    the <var>if</var> (or <var>unless</var>) attribute with the
     name of the property that the target should react
     to. <strong>Note:</strong> In the most simple case Ant will only
     check whether the property has been set, the value doesn't matter,
@@ -81,22 +79,21 @@
     <a href="properties.html#if+unless">the properties page</a> for
     more details.  For example:</p>
 
-<blockquote>
   <pre>&lt;target name=&quot;build-module-A&quot; if=&quot;module-A-present&quot;/&gt;</pre>
   <pre>&lt;target name=&quot;build-own-fake-module-A&quot; unless=&quot;module-A-present&quot;/&gt;</pre>
-</blockquote>
 
   <p>In the first example, if the <code>module-A-present</code>
-    property is set (to any value, e.g. <i>false</i>), the target will
+    property is set (to any value, e.g. <q>false</q>), the target will
     be run. In the second example, if
     the <code>module-A-present</code> property is set (again, to any
     value), the target will not be run.</p>
 
-  <p>Only one propertyname can be specified in the if/unless
-    clause. If you want to check multiple conditions, you can use a
-    dependent target for computing the result for the check:</p>
+  <p>Only one property name can be specified in
+    the <var>if</var>/<var>unless</var> attribute. If you want to
+    check multiple conditions, you can use a dependent target for
+    computing the result for the check:</p>
 
-<blockquote><pre>
+<pre>
 &lt;target name="myTarget" depends="myTarget.check" if="myTarget.run"&gt;
     &lt;echo&gt;Files foo.txt and bar.txt are present.&lt;/echo&gt;
 &lt/target&gt;
@@ -108,162 +105,163 @@
             &lt;available file="bar.txt"/&gt;
         &lt;/and&gt;
     &lt;/condition&gt;
-&lt/target&gt;
-</pre></blockquote>
+&lt/target&gt;</pre>
 
-  <blockquote><pre><b>Call-Graph:</b>  myTarget.check --> maybe(myTarget)</pre></blockquote>
+  <pre><b>Call-Graph:</b>  myTarget.check &rarr; maybe(myTarget)</pre>
 
-  <p>If no <code>if</code> and no <code>unless</code> attribute is
+  <p>If no <var>if</var> and no <var>unless</var> attribute is
     present, the target will always be executed.</p>
 
-  <p><b>Important:</b> the <code>if</code> and <code>unless</code>
+  <p><strong>Important</strong>: the <var>if</var> and <var>unless</var>
     attributes only enable or disable the target to which they are
     attached. They do not control whether or not targets that a
     conditional target depends upon get executed.  In fact, they do
     not even get evaluated until the target is about to be executed,
     and all its predecessors have already run.
 
-  <p>The optional <code>description</code> attribute can be used to
+  <p>The optional <var>description</var> attribute can be used to
     provide a one-line description of this target, which is printed by
-    the <code>-projecthelp</code> command-line option. Targets without
+    the <kbd>-projecthelp</kbd> command-line option. Targets without
     such a description are deemed internal and will not be listed,
-    unless either the <code>-verbose</code> or <code>-debug</code>
+    unless either the <kbd>-verbose</kbd> or <kbd>-debug</kbd>
     option is used.</p>
 
   <p>It is a good practice to place
     your <a href="Tasks/tstamp.html">tstamp</a> tasks in a
-    so-called <i>initialization</i> target, on which all other targets
+    so-called <em>initialization</em> target, on which all other targets
     depend. Make sure that target is always the first one in the
     depends list of the other targets. In this manual, most
     initialization targets have the name <code>&quot;init&quot;</code>.</p>
-    <blockquote><pre>
-    &lt;project&gt;
-        &lt;target name=&quot;init&quot;&gt;
-            &lt;tstamp/&gt;
-        &lt;/target&gt;
-        &lt;target name=&quot;otherTarget&quot; depends=&quot;init&quot;&gt;
-            ...
-        &lt;/target&gt;
-    &lt;/project&gt;
-    </pre></blockquote>
-
-  <p>Especially if you only have a few tasks you also could place these
-    tasks directly under the project tag (since Ant 1.6.0):</p>
-    <blockquote><pre>
-    &lt;project&gt;
+    <pre>
+&lt;project&gt;
+    &lt;target name=&quot;init&quot;&gt;
         &lt;tstamp/&gt;
-    &lt;/project&gt;
-    </pre></blockquote>
+    &lt;/target&gt;
+    &lt;target name=&quot;otherTarget&quot; depends=&quot;init&quot;&gt;
+        ...
+    &lt;/target&gt;
+&lt;/project&gt;</pre>
 
-  <p>If the depends attribute and the if/unless attribute are set, the
-    depends attribute is executed first.</p>
+  <p>Especially if you only have a few tasks you also could place these
+    tasks directly under the project tag (<em>since Ant 1.6.0</em>):</p>
+  <pre>
+&lt;project&gt;
+    &lt;tstamp/&gt;
+&lt;/project&gt;</pre>
+
+  <p>If the <var>depends</var> attribute and
+  the <var>if</var>/<var>unless</var> attribute are set,
+  the <var>depends</var> attribute is executed first.</p>
 
   <p>A target has the following attributes:</p>
 
-  <table border="1" cellpadding="2" cellspacing="0">
+  <table class="attr">
     <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
+      <th>Attribute</th>
+      <th>Description</th>
+      <th>Required</th>
     </tr>
     <tr>
-      <td valign="top">name</td>
-      <td valign="top">the name of the target.</td>
-      <td align="center" valign="top">Yes</td>
+      <td>name</td>
+      <td>the name of the target.</td>
+      <td>Yes</td>
     </tr>
     <tr>
-      <td valign="top">depends</td>
-      <td valign="top">a comma-separated list of names of targets on
+      <td>depends</td>
+      <td>a comma-separated list of names of targets on
         which this target depends.</td>
-      <td align="center" valign="top">No</td>
+      <td>No</td>
     </tr>
     <tr>
-      <td valign="top">if</td>
-      <td valign="top">the name of the property that must be set in
+      <td>if</td>
+      <td>the name of the property that must be set in
         order for this target to execute,
         or <a href="properties.html#if+unless">something evaluating to
-          true</a>.</td>
-      <td align="center" valign="top">No</td>
+          <q>true</q></a>.</td>
+      <td>No</td>
     </tr>
     <tr>
-      <td valign="top">unless</td>
-      <td valign="top">the name of the property that must not be set
+      <td>unless</td>
+      <td>the name of the property that must not be set
         in order for this target to execute,
         or <a href="properties.html#if+unless">something evaluating to
-        false</a>.</td>
-      <td align="center" valign="top">No</td>
+        <q>false</q></a>.</td>
+      <td>No</td>
     </tr>
     <tr>
-      <td valign="top">description</td>
-      <td valign="top">a short description of this target's function.</td>
-      <td align="center" valign="top">No</td>
+      <td>description</td>
+      <td>a short description of this target's function.</td>
+      <td>No</td>
     </tr>
     <tr>
-      <td valign="top">extensionOf</td>
-      <td valign="top">Adds the current target to the depends list of
+      <td>extensionOf</td>
+      <td>Adds the current target to the depends list of
         the named <a href="#extension-points">extension-point</a>.
-        <em>since Ant 1.8.0.</em></td>
-      <td align="center" valign="top">No</td>
+        <em>since Ant 1.8.0</em>.</td>
+      <td>No</td>
     </tr>
     <tr>
-      <td valign="top">onMissingExtensionPoint</td>
-      <td valign="top">What to do if this target tries to extend a
+      <td>onMissingExtensionPoint</td>
+      <td>What to do if this target tries to extend a
         missing
-        <a href="#extension-points">extension-point</a>. ("fail",
-        "warn", "ignore").
-        <em>since Ant 1.8.2.</em></td>
-      <td align="center" valign="top">No. Not allowed unless
-        <code>extensionOf</code> is present. Defaults to <code>fail</code>. 
+        <a href="#extension-points">extension-point</a>. (<q>fail</q>,
+        <q>warn</q>, <q>ignore</q>).
+        <em>since Ant 1.8.2</em>.</td>
+      <td>No; not allowed unless
+        <var>extensionOf</var> is present, defaults to <q>fail</q>.
       </td>
     </tr>
   </table>
 
   <p>A target name can be any alphanumeric string valid in the
-    encoding of the XML file. The empty string &quot;&quot; is in this
-    set, as is comma &quot;,&quot; and space &quot; &quot;.  Please
-    avoid using these, as they will not be supported in future Ant
-    versions because of all the confusion they cause on command line and IDE. IDE support of
-    unusual target names, or any target name containing spaces, varies
-    with the IDE.</p>
-
-  <p>Targets beginning with a hyphen such
-    as <code>&quot;-restart&quot;</code> are valid, and can be used to
-    name targets that should not be called directly from the command
-    line. <br>
-    For Ants main class every option starting with hyphen is an
-    option for Ant itself and not a target. For that reason calling these
-    target from command line is not possible. On the other hand IDEs usually
-    don't use Ants main class as entry point and calling them from the IDE
-    is usually possible.</p>
-
-  <h1><a name="extension-points">Extension-Points</a></h1>
-
-  <p><em>since Ant 1.8.0.</em></p>
-
-  <p>Extension-Points are similar to targets in that they have a name and
-    a depends list and can be executed from the command line.  Just
-    like targets they represent a state during the build process.</p>
+    encoding of the XML file. The empty string <q></q> is in this set,
+    as is comma <q>,</q> and space <q>&nbsp;</q>. Please avoid using
+    these, as they will not be supported in future Ant versions
+    because of all the confusion they cause on command line and
+    IDE. IDE support of unusual target names, or any target name
+    containing spaces, varies with the IDE.</p>
+
+  <p>Targets beginning with a hyphen such as <q>-restart</q> are
+    valid, and can be used to name targets that should not be called
+    directly from the command line.<br/>
+    For Ant's main class every option starting with hyphen is an
+    option for Ant itself and not a target. For that reason calling
+    these targets from command line is not possible. On the other
+    hand, IDEs usually don't use Ant's main class as entry point and
+    calling them from the IDE is usually possible.</p>
+
+  <h1 id="extension-points">Extension-Points</h1>
+
+  <p><em>Since Ant 1.8.0</em>.</p>
+
+  <p>Extension-Points are similar to targets in that they have a name
+    and a <var>depends</var> list and can be executed from the command
+    line.  Just like targets they represent a state during the build
+    process.</p>
 
   <p>Unlike targets they don't contain any tasks, their main purpose
     is to collect targets that contribute to the desired state in
-    their depends list.</p>
+    their <var>depends</var> list.</p>
 
-  <p>Targets can add themselves to an extension-points's depends list via
-    their extensionOf attribute.  The targets that add themselves will be
-    added after the targets of the explicit depends-attribute of the
-    extension-point, if multiple targets add themselves, their relative
-    order is not defined.</p>
+  <p>Targets can add themselves to an
+    extension-point's <var>depends</var> list via
+    their <var>extensionOf</var> attribute.  The targets that add
+    themselves will be added after the targets of the
+    explicit <var>depends</var> attribute of the extension-point, if
+    multiple targets add themselves, their relative order is not
+    defined.</p>
 
   <p>The main purpose of an extension-point is to act as an extension
     point for build files designed to
     be <a href="Tasks/import.html">imported</a>.  In the imported
-    file an extension-point defines a state that must be reached and
-    targets from other build files can join the depends list of said
-    extension-point in order to contribute to that state.</p>
+    file, an extension-point defines a state that must be reached and
+    targets from other build files can join the <var>depends</var>
+    list of said extension-point in order to contribute to that
+    state.</p>
 
   <p>For example your imported build file may need to compile code, it
     might look like:</p>
-<blockquote><pre>
+<pre>
 &lt;target name="create-directory-layout"&gt;
    ...
 &lt;/target&gt;
@@ -271,30 +269,26 @@
               depends="create-directory-layout"/&gt;
 &lt;target name="compile" depends="ready-to-compile"&gt;
    ...
-&lt;/target&gt;
-</pre></blockquote>
-
-  <blockquote><pre><b>Call-Graph:</b>  create-directory-layout --> 'empty slot' --> compile</pre></blockquote>
+&lt;/target&gt;</pre>
 
+  <pre><b>Call-Graph:</b>  create-directory-layout &rarr; 'empty slot' &rarr; compile</pre>
 
   <p>And you need to generate some source before compilation, then in
     your main build file you may use something like</p>
-<blockquote><pre>
+<pre>
 &lt;target name="generate-sources"
         extensionOf="ready-to-compile"&gt;
    ...
-&lt;/target&gt;
-</pre></blockquote>
-
-  <blockquote><pre><b>Call-Graph:</b>  create-directory-layout --> generate-sources  --> compile</pre></blockquote>
+&lt;/target&gt;</pre>
 
+  <pre><b>Call-Graph:</b>  create-directory-layout &rarr; generate-sources  &rarr; compile</pre>
 
-  <p>This will ensure that the <em>generate-sources</em> target is
-    executed before the <em>compile</em> target.</p>
+  <p>This will ensure that the <q>generate-sources</q> target is
+    executed before the <q>compile</q> target.</p>
 
   <p>Don't rely on the order of the depends list,
-    if <em>generate-sources</em> depends
-    on <em>create-directory-layout</em> then it must explicitly depend
+    if <q>generate-sources</q> depends
+    on <q>create-directory-layout</q> then it must explicitly depend
     on it via its own depends attribute.</p>
 </body>
 </html>
diff -Nru ant-1.9.10/manual/tasklist.html ant-1.10.3/manual/tasklist.html
--- ant-1.9.10/manual/tasklist.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/tasklist.html	2018-03-24 12:37:12.000000000 +0000
@@ -34,162 +34,163 @@
 
 <h3>Tasks</h3>
 <ul class="inlinelist">
-<li><a href="Tasks/ant.html">Ant</a></li>
-<li><a href="Tasks/antcall.html">AntCall</a></li>
-<li><a href="Tasks/antlr.html">ANTLR</a></li>
-<li><a href="Tasks/antstructure.html">AntStructure</a></li>
-<li><a href="Tasks/antversion.html">AntVersion</a></li>
-<li><a href="Tasks/apply.html">Apply/<i>ExecOn</i></a></li>
-<li><a href="Tasks/apt.html">Apt</a></li>
-<li><a href="Tasks/attrib.html">Attrib</a></li>
-<li><a href="Tasks/augment.html">Augment</a></li>
-<li><a href="Tasks/available.html">Available</a></li>
-<li><a href="Tasks/basename.html">Basename</a></li>
-<li><a href="Tasks/bindtargets.html">Bindtargets</a></li>
-<li><a href="Tasks/buildnumber.html">BuildNumber</a></li>
-<li><a href="Tasks/unpack.html">BUnzip2</a></li>
-<li><a href="Tasks/pack.html">BZip2</a></li>
-<li><a href="Tasks/cab.html">Cab</a></li>
-<li><a href="Tasks/ccm.html">Continuus/Synergy Tasks</a></li>
-<li><a href="Tasks/changelog.html">CvsChangeLog</a></li>
-<li><a href="Tasks/checksum.html">Checksum</a></li>
-<li><a href="Tasks/chgrp.html">Chgrp</a></li>
-<li><a href="Tasks/chmod.html">Chmod</a></li>
-<li><a href="Tasks/chown.html">Chown</a></li>
-<li><a href="Tasks/clearcase.html">Clearcase Tasks</a></li>
-<li><a href="Tasks/componentdef.html">Componentdef</a></li>
-<li><a href="Tasks/concat.html">Concat</a></li>
-<li><a href="Tasks/condition.html">Condition</a></li>
-<div style="padding-left:1em">
-  <li><a href="Tasks/conditions.html">Supported conditions</a></li>
-</div>
-<li><a href="Tasks/copy.html">Copy</a></li>
-<li><a href="Tasks/copydir.html"><i>Copydir</i></a></li>
-<li><a href="Tasks/copyfile.html"><i>Copyfile</i></a></li>
-<li><a href="Tasks/cvs.html">Cvs</a></li>
-<li><a href="Tasks/cvspass.html">CVSPass</a></li>
-<li><a href="Tasks/cvstagdiff.html">CvsTagDiff</a></li>
-<li><a href="Tasks/cvsversion.html">CvsVersion</a></li>
-<li><a href="Tasks/defaultexcludes.html">Defaultexcludes</a></li>
-<li><a href="Tasks/delete.html">Delete</a></li>
-<li><a href="Tasks/deltree.html"><i>Deltree</i></a></li>
-<li><a href="Tasks/depend.html">Depend</a></li>
-<li><a href="Tasks/dependset.html">Dependset</a></li>
-<li><a href="Tasks/diagnostics.html">Diagnostics</a></li>
-<li><a href="Tasks/dirname.html">Dirname</a></li>
-<li><a href="Tasks/ear.html">Ear</a></li>
-<li><a href="Tasks/echo.html">Echo</a></li>
-<li><a href="Tasks/echoproperties.html">Echoproperties</a></li>
-<li><a href="Tasks/echoxml.html">EchoXML</a></li>
-<li><a href="Tasks/ejb.html">EJB Tasks</a></li>
-<li><a href="Tasks/exec.html">Exec</a></li>
-<li><a href="Tasks/fail.html">Fail</a></li>
-<li><a href="Tasks/filter.html">Filter</a></li>
-<li><a href="Tasks/fixcrlf.html">FixCRLF</a></li>
-<li><a href="Tasks/ftp.html">FTP</a></li>
-<li><a href="Tasks/genkey.html">GenKey</a></li>
-<li><a href="Tasks/get.html">Get</a></li>
-<li><a href="Tasks/unpack.html">GUnzip</a></li>
-<li><a href="Tasks/pack.html">GZip</a></li>
-<li><a href="Tasks/hostinfo.html">Hostinfo</a></li>
-<li><a href="Tasks/image.html">Image</a></li>
-<li><a href="Tasks/import.html">Import</a></li>
-<li><a href="Tasks/include.html">Include</a></li>
-<li><a href="Tasks/input.html">Input</a></li>
-<li><a href="Tasks/jar.html">Jar</a></li>
-<li><a href="Tasks/jarlib-available.html">Jarlib-available</a></li>
-<li><a href="Tasks/jarlib-display.html">Jarlib-display</a></li>
-<li><a href="Tasks/jarlib-manifest.html">Jarlib-manifest</a></li>
-<li><a href="Tasks/jarlib-resolve.html">Jarlib-resolve</a></li>
-<li><a href="Tasks/java.html">Java</a></li>
-<li><a href="Tasks/javac.html">Javac</a></li>
-<li><a href="Tasks/javacc.html">JavaCC</a></li>
-<li><a href="Tasks/javadoc.html">Javadoc/<i>Javadoc2</i></a></li>
-<li><a href="Tasks/javah.html">Javah</a></li>
-<li><a href="Tasks/jdepend.html">JDepend</a></li>
-<li><a href="Tasks/jjdoc.html">JJDoc</a></li>
-<li><a href="Tasks/jjtree.html">JJTree</a></li>
-<li><a href="Tasks/jlink.html"><i>Jlink</i></a></li>
-<li><a href="Tasks/jspc.html">JspC</a></li>
-<li><a href="Tasks/junit.html">JUnit</a></li>
-<li><a href="Tasks/junitreport.html">JUnitReport</a></li>
-<li><a href="Tasks/length.html">Length</a><br/></li>
-<li><a href="Tasks/loadfile.html">LoadFile</a></li>
-<li><a href="Tasks/loadproperties.html">LoadProperties</a></li>
-<li><a href="Tasks/loadresource.html">LoadResource</a></li>
-<li><a href="Tasks/local.html">Local</a></li>
-<li><a href="Tasks/macrodef.html">MacroDef</a></li>
-<li><a href="Tasks/mail.html">Mail</a></li>
-<li><a href="Tasks/makeurl.html">MakeURL</a></li>
-<li><a href="Tasks/manifest.html">Manifest</a></li>
-<li><a href="Tasks/manifestclasspath.html">ManifestClassPath</a></li>
-<li><a href="Tasks/mimemail.html"><i>MimeMail</i></a></li>
-<li><a href="Tasks/mkdir.html">Mkdir</a></li>
-<li><a href="Tasks/move.html">Move</a></li>
-<li><a href="Tasks/native2ascii.html">Native2Ascii</a></li>
-<li><a href="Tasks/netrexxc.html">NetRexxC</a></li>
-<li><a href="Tasks/nice.html">Nice</a></li>
-<li><a href="Tasks/parallel.html">Parallel</a></li>
-<li><a href="Tasks/patch.html">Patch</a></li>
-<li><a href="Tasks/pathconvert.html">PathConvert</a></li>
-<li><a href="Tasks/presetdef.html">PreSetDef</a></li>
-<li><a href="Tasks/projecthelper.html">ProjectHelper</a></li>
-<li><a href="Tasks/property.html">Property</a></li>
-<li><a href="Tasks/propertyfile.html">PropertyFile</a></li>
-<li><a href="Tasks/propertyhelper.html">PropertyHelper</a></li>
-<li><a href="Tasks/pvcstask.html">Pvcs</a></li>
-<li><a href="Tasks/recorder.html">Record</a></li>
-<li><a href="Tasks/rename.html"><i>Rename</i></a></li>
-<li><a href="Tasks/renameextensions.html"><i>RenameExtensions</i></a></li>
-<li><a href="Tasks/replace.html">Replace</a></li>
-<li><a href="Tasks/replaceregexp.html">ReplaceRegExp</a></li>
-<li><a href="Tasks/resourcecount.html">ResourceCount</a></li>
-<li><a href="Tasks/retry.html">Retry</a></li>
-<li><a href="Tasks/rexec.html">RExec</a></li>
-<li><a href="Tasks/rmic.html">Rmic</a></li>
-<li><a href="Tasks/rpm.html">Rpm</a></li>
-<li><a href="Tasks/schemavalidate.html">SchemaValidate</a></li>
-<li><a href="Tasks/scp.html">Scp</a></li>
-<li><a href="Tasks/script.html">Script</a></li>
-<li><a href="Tasks/scriptdef.html">Scriptdef</a></li>
-<li><a href="Tasks/sequential.html">Sequential</a></li>
-<li><a href="Tasks/serverdeploy.html">ServerDeploy</a></li>
-<li><a href="Tasks/setproxy.html">Setproxy</a></li>
-<li><a href="Tasks/signjar.html">SignJar</a></li>
-<li><a href="Tasks/sleep.html">Sleep</a></li>
-<li><a href="Tasks/sos.html">SourceOffSite</a></li>
-<li><a href="Tasks/sound.html">Sound</a></li>
-<li><a href="Tasks/splash.html">Splash</a></li>
-<li><a href="Tasks/sql.html">Sql</a></li>
-<li><a href="Tasks/sshexec.html">Sshexec</a></li>
-<li><a href="Tasks/sshsession.html">Sshsession</a></li>
-<li><a href="Tasks/subant.html">Subant</a></li>
-<li><a href="Tasks/symlink.html">Symlink</a></li>
-<li><a href="Tasks/sync.html">Sync</a></li>
-<li><a href="Tasks/tar.html">Tar</a></li>
-<li><a href="Tasks/taskdef.html">Taskdef</a></li>
-<li><a href="Tasks/telnet.html">Telnet</a></li>
-<li><a href="Tasks/tempfile.html">Tempfile</a></li>
-<li><a href="Tasks/touch.html">Touch</a></li>
-<li><a href="Tasks/translate.html">Translate</a></li>
-<li><a href="Tasks/truncate.html">Truncate</a></li>
-<li><a href="Tasks/tstamp.html">TStamp</a></li>
-<li><a href="Tasks/typedef.html">Typedef</a></li>
-<li><a href="Tasks/unzip.html">Unjar</a></li>
-<li><a href="Tasks/unzip.html">Untar</a></li>
-<li><a href="Tasks/unzip.html">Unwar</a></li>
-<li><a href="Tasks/unzip.html">Unzip</a></li>
-<li><a href="Tasks/uptodate.html">Uptodate</a></li>
-<li><a href="Tasks/verifyjar.html">VerifyJar</a></li>
-<li><a href="Tasks/vss.html#tasks">Microsoft Visual SourceSafe Tasks</a></li>
-<li><a href="Tasks/waitfor.html">Waitfor</a></li>
-<li><a href="Tasks/war.html">War</a></li>
-<li><a href="Tasks/whichresource.html">WhichResource</a></li>
-<li><a href="Tasks/wljspc.html">Weblogic JSP Compiler</a></li>
-<li><a href="Tasks/xmlproperty.html">XmlProperty</a></li>
-<li><a href="Tasks/xmlvalidate.html">XmlValidate</a></li>
-<li><a href="Tasks/style.html">XSLT/<i>Style</i></a></li>
-<li><a href="Tasks/zip.html">Zip</a></li>
+  <li><a href="Tasks/ant.html">Ant</a></li>
+  <li><a href="Tasks/antcall.html">AntCall</a></li>
+  <li><a href="Tasks/antlr.html">ANTLR</a></li>
+  <li><a href="Tasks/antstructure.html">AntStructure</a></li>
+  <li><a href="Tasks/antversion.html">AntVersion</a></li>
+  <li><a href="Tasks/apply.html">Apply/<em>ExecOn</em></a></li>
+  <li><a href="Tasks/attrib.html">Attrib</a></li>
+  <li><a href="Tasks/augment.html">Augment</a></li>
+  <li><a href="Tasks/available.html">Available</a></li>
+  <li><a href="Tasks/basename.html">Basename</a></li>
+  <li><a href="Tasks/bindtargets.html">Bindtargets</a></li>
+  <li><a href="Tasks/buildnumber.html">BuildNumber</a></li>
+  <li><a href="Tasks/unpack.html">BUnzip2</a></li>
+  <li><a href="Tasks/pack.html">BZip2</a></li>
+  <li><a href="Tasks/cab.html">Cab</a></li>
+  <li><a href="Tasks/ccm.html">Continuus/Synergy Tasks</a></li>
+  <li><a href="Tasks/changelog.html">CvsChangeLog</a></li>
+  <li><a href="Tasks/checksum.html">Checksum</a></li>
+  <li><a href="Tasks/chgrp.html">Chgrp</a></li>
+  <li><a href="Tasks/chmod.html">Chmod</a></li>
+  <li><a href="Tasks/chown.html">Chown</a></li>
+  <li><a href="Tasks/clearcase.html">ClearCase Tasks</a></li>
+  <li><a href="Tasks/componentdef.html">Componentdef</a></li>
+  <li><a href="Tasks/concat.html">Concat</a></li>
+  <li><a href="Tasks/condition.html">Condition</a></li>
+  <li class="indent"><a href="Tasks/conditions.html">Supported conditions</a></li>
+  <li><a href="Tasks/copy.html">Copy</a></li>
+  <li><a href="Tasks/copydir.html"><em>Copydir</em></a></li>
+  <li><a href="Tasks/copyfile.html"><em>Copyfile</em></a></li>
+  <li><a href="Tasks/cvs.html">Cvs</a></li>
+  <li><a href="Tasks/cvspass.html">CVSPass</a></li>
+  <li><a href="Tasks/cvstagdiff.html">CvsTagDiff</a></li>
+  <li><a href="Tasks/cvsversion.html">CvsVersion</a></li>
+  <li><a href="Tasks/defaultexcludes.html">Defaultexcludes</a></li>
+  <li><a href="Tasks/delete.html">Delete</a></li>
+  <li><a href="Tasks/deltree.html"><em>Deltree</em></a></li>
+  <li><a href="Tasks/depend.html">Depend</a></li>
+  <li><a href="Tasks/dependset.html">Dependset</a></li>
+  <li><a href="Tasks/diagnostics.html">Diagnostics</a></li>
+  <li><a href="Tasks/dirname.html">Dirname</a></li>
+  <li><a href="Tasks/ear.html">Ear</a></li>
+  <li><a href="Tasks/echo.html">Echo</a></li>
+  <li><a href="Tasks/echoproperties.html">Echoproperties</a></li>
+  <li><a href="Tasks/echoxml.html">EchoXML</a></li>
+  <li><a href="Tasks/ejb.html">EJB Tasks</a></li>
+  <li><a href="Tasks/exec.html">Exec</a></li>
+  <li><a href="Tasks/fail.html">Fail</a></li>
+  <li><a href="Tasks/filter.html">Filter</a></li>
+  <li><a href="Tasks/fixcrlf.html">FixCRLF</a></li>
+  <li><a href="Tasks/ftp.html">FTP</a></li>
+  <li><a href="Tasks/genkey.html">GenKey</a></li>
+  <li><a href="Tasks/get.html">Get</a></li>
+  <li><a href="Tasks/unpack.html">GUnzip</a></li>
+  <li><a href="Tasks/pack.html">GZip</a></li>
+  <li><a href="Tasks/hostinfo.html">Hostinfo</a></li>
+  <li><a href="Tasks/image.html">Image</a></li>
+  <li><a href="Tasks/import.html">Import</a></li>
+  <li><a href="Tasks/include.html">Include</a></li>
+  <li><a href="Tasks/input.html">Input</a></li>
+  <li><a href="Tasks/jar.html">Jar</a></li>
+  <li><a href="Tasks/jarlib-available.html">Jarlib-available</a></li>
+  <li><a href="Tasks/jarlib-display.html">Jarlib-display</a></li>
+  <li><a href="Tasks/jarlib-manifest.html">Jarlib-manifest</a></li>
+  <li><a href="Tasks/jarlib-resolve.html">Jarlib-resolve</a></li>
+  <li><a href="Tasks/java.html">Java</a></li>
+  <li><a href="Tasks/javac.html">Javac</a></li>
+  <li><a href="Tasks/javacc.html">JavaCC</a></li>
+  <li><a href="Tasks/javadoc.html">Javadoc/<em>Javadoc2</em></a></li>
+  <li><a href="Tasks/javah.html">Javah</a></li>
+  <li><a href="Tasks/jdepend.html">JDepend</a></li>
+  <li><a href="Tasks/jjdoc.html">JJDoc</a></li>
+  <li><a href="Tasks/jjtree.html">JJTree</a></li>
+  <li><a href="Tasks/jlink.html"><em>Jlink</em></a></li>
+  <li><a href="Tasks/jspc.html"><em>JspC</em></a></li>
+  <li><a href="Tasks/junit.html">JUnit</a> (3 &amp; 4)</li>
+  <li><a href="Tasks/junitlauncher.html">JUnitLauncher</a> (JUnit 5)</li>
+  <li><a href="Tasks/junitreport.html">JUnitReport</a></li>
+  <li><a href="Tasks/length.html">Length</a><br/></li>
+  <li><a href="Tasks/loadfile.html">LoadFile</a></li>
+  <li><a href="Tasks/loadproperties.html">LoadProperties</a></li>
+  <li><a href="Tasks/loadresource.html">LoadResource</a></li>
+  <li><a href="Tasks/local.html">Local</a></li>
+  <li><a href="Tasks/macrodef.html">MacroDef</a></li>
+  <li><a href="Tasks/mail.html">Mail</a></li>
+  <li><a href="Tasks/makeurl.html">MakeURL</a></li>
+  <li><a href="Tasks/manifest.html">Manifest</a></li>
+  <li><a href="Tasks/manifestclasspath.html">ManifestClassPath</a></li>
+  <li><a href="Tasks/mimemail.html"><em>MimeMail</em></a></li>
+  <li><a href="Tasks/mkdir.html">Mkdir</a></li>
+  <li><a href="Tasks/move.html">Move</a></li>
+  <li><a href="Tasks/native2ascii.html">Native2Ascii</a></li>
+  <li><a href="Tasks/netrexxc.html">NetRexxC</a></li>
+  <li><a href="Tasks/nice.html">Nice</a></li>
+  <li><a href="Tasks/parallel.html">Parallel</a></li>
+  <li><a href="Tasks/patch.html">Patch</a></li>
+  <li><a href="Tasks/pathconvert.html">PathConvert</a></li>
+  <li><a href="Tasks/presetdef.html">PreSetDef</a></li>
+  <li><a href="Tasks/projecthelper.html">ProjectHelper</a></li>
+  <li><a href="Tasks/property.html">Property</a></li>
+  <li><a href="Tasks/propertyfile.html">PropertyFile</a></li>
+  <li><a href="Tasks/propertyhelper.html">PropertyHelper</a></li>
+  <li><a href="Tasks/pvcstask.html">Pvcs</a></li>
+  <li><a href="Tasks/recorder.html">Record</a></li>
+  <li><a href="Tasks/rename.html"><em>Rename</em></a></li>
+  <li><a href="Tasks/renameextensions.html"><em>RenameExtensions</em></a></li>
+  <li><a href="Tasks/replace.html">Replace</a></li>
+  <li><a href="Tasks/replaceregexp.html">ReplaceRegExp</a></li>
+  <li><a href="Tasks/resourcecount.html">ResourceCount</a></li>
+  <li><a href="Tasks/retry.html">Retry</a></li>
+  <li><a href="Tasks/rexec.html">RExec</a></li>
+  <li><a href="Tasks/rmic.html">Rmic</a></li>
+  <li><a href="Tasks/rpm.html">Rpm</a></li>
+  <li><a href="Tasks/schemavalidate.html">SchemaValidate</a></li>
+  <li><a href="Tasks/scp.html">Scp</a></li>
+  <li><a href="Tasks/script.html">Script</a></li>
+  <li><a href="Tasks/scriptdef.html">Scriptdef</a></li>
+  <li><a href="Tasks/sequential.html">Sequential</a></li>
+  <li><a href="Tasks/serverdeploy.html">ServerDeploy</a></li>
+  <li><a href="Tasks/setpermissions.html">SetPermissions</a></li>
+  <li><a href="Tasks/setproxy.html">SetProxy</a></li>
+  <li><a href="Tasks/signjar.html">SignJar</a></li>
+  <li><a href="Tasks/sleep.html">Sleep</a></li>
+  <li><a href="Tasks/sos.html">SourceOffSite</a></li>
+  <li><a href="Tasks/sound.html">Sound</a></li>
+  <li><a href="Tasks/splash.html">Splash</a></li>
+  <li><a href="Tasks/sql.html">Sql</a></li>
+  <li><a href="Tasks/sshexec.html">Sshexec</a></li>
+  <li><a href="Tasks/sshsession.html">Sshsession</a></li>
+  <li><a href="Tasks/subant.html">Subant</a></li>
+  <li><a href="Tasks/symlink.html">Symlink</a></li>
+  <li><a href="Tasks/sync.html">Sync</a></li>
+  <li><a href="Tasks/tar.html">Tar</a></li>
+  <li><a href="Tasks/taskdef.html">Taskdef</a></li>
+  <li><a href="Tasks/telnet.html">Telnet</a></li>
+  <li><a href="Tasks/tempfile.html">Tempfile</a></li>
+  <li><a href="Tasks/touch.html">Touch</a></li>
+  <li><a href="Tasks/translate.html">Translate</a></li>
+  <li><a href="Tasks/truncate.html">Truncate</a></li>
+  <li><a href="Tasks/tstamp.html">TStamp</a></li>
+  <li><a href="Tasks/typedef.html">Typedef</a></li>
+  <li><a href="Tasks/unzip.html">Unjar</a></li>
+  <li><a href="Tasks/unzip.html">Untar</a></li>
+  <li><a href="Tasks/unzip.html">Unwar</a></li>
+  <li><a href="Tasks/unpack.html">UnXZ</a></li>
+  <li><a href="Tasks/unzip.html">Unzip</a></li>
+  <li><a href="Tasks/uptodate.html">Uptodate</a></li>
+  <li><a href="Tasks/verifyjar.html">VerifyJar</a></li>
+  <li><a href="Tasks/vss.html#tasks">Microsoft Visual SourceSafe Tasks</a></li>
+  <li><a href="Tasks/waitfor.html">Waitfor</a></li>
+  <li><a href="Tasks/war.html">War</a></li>
+  <li><a href="Tasks/whichresource.html">WhichResource</a></li>
+  <li><a href="Tasks/wljspc.html">WebLogic JSP Compiler</a></li>
+  <li><a href="Tasks/xmlproperty.html">XmlProperty</a></li>
+  <li><a href="Tasks/xmlvalidate.html">XmlValidate</a></li>
+  <li><a href="Tasks/pack.html">XZ</a></li>
+  <li><a href="Tasks/style.html">XSLT/<em>Style</em></a></li>
+  <li><a href="Tasks/zip.html">Zip</a></li>
 </ul>
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/antcall.html ant-1.10.3/manual/Tasks/antcall.html
--- ant-1.9.10/manual/Tasks/antcall.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/antcall.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,156 +24,137 @@
 
 <body>
 
-<h2><a name="antcall">AntCall</a></h2>
+<h2 id="antcall">AntCall</h2>
 <h3>Description</h3>
 
-<p>Call another target within the same buildfile optionally
-specifying some properties (params in this context).  <strong>This
-task must not be used outside of a <code>target</code>.</strong></p>
-
-<p>By default, all of the properties of the current project will be
-available in the new project.   Alternatively, you can
-set the <i>inheritAll</i> attribute to <code>false</code> and only
-&quot;user&quot; properties (i.e., those passed on the command-line)
-will be passed to the new project.  In either case, the set of
-properties passed to the new project will override the properties that
-are set in the new project (See also the <a href="property.html">property task</a>).</p>
-<p>You can also set properties in the new project from the old project
-by using nested param tags. These properties are always passed
-to the new project and any project created in that project
-regardless of the setting of <i>inheritAll</i>.  This allows you to
-parameterize your subprojects.  Properties defined on the command line
-can not be overridden by nested <code>&lt;param&gt;</code> elements.</p>
-
-<p>When more than one nested <code>&lt;param&gt;</code> element
-  would set a property of the same name, the one declared last will
-  win.  This is for backwards compatibility reasons even so it is
-  different from the way <code>&lt;property&gt;</code> tasks in build
-  files behave.</p>
-
-<p>Nested <a href="#reference"><i><code>&lt;reference&gt</code>;</i></a> elements can
-be used to copy references from the calling project to the new
-project, optionally under a different id.  References taken from
-nested elements will override existing references that have been
-defined outside of targets in the new project - but not those defined
-inside of targets.</p>
-
-<p>
-When a target is invoked by antcall, all of its dependent targets will
-also be called within the context of any new parameters. For example. if
-the target &quot;doSomethingElse&quot; depended on the target &quot;init&quot;, then the
-<i>antcall</i> of &quot;doSomethingElse&quot; will call &quot;init&quot; during the call.
-Of course, any properties defined in the antcall task or inherited from the calling target
-will be fixed and not overridable in the init task--or indeed in the &quot;doSomethingElse&quot; task.
-</p>
-
-<p>The called target(s) are run in a new project; be aware that this
-means properties, references, etc.  set by called targets will not
-persist back to the calling project.</p>
+<p>Call another target within the same buildfile optionally specifying some properties (params in
+this context).  <strong>This task must not be used outside of a <code>target</code>.</strong></p>
 
-<p>If the build file changes after you've started the build, the
-behavior of this task is undefined.</p>
+<p>By default, all of the properties of the current project will be available in the new project.
+Alternatively, you can set the <var>inheritAll</var> attribute to <q>false</q> and only
+&quot;user&quot; properties (i.e., those passed on the command-line) will be passed to the new
+project.  In either case, the set of properties passed to the new project will override the
+properties that are set in the new project (see also the <a href="property.html">property</a>
+task).</p>
+<p>You can also set properties in the new project from the old project by using
+nested <code>&lt;param&gt;</code> tags. These properties are always passed to the new project and
+any project created in that project regardless of the setting of <var>inheritAll</var>.  This allows
+you to parameterize your subprojects.  Properties defined on the command line can not be overridden
+by nested <code>&lt;param&gt;</code> elements.</p>
+
+<p>When more than one nested <code>&lt;param&gt;</code> element would set a property of the same
+name, the one declared last will win.  This is for backwards compatibility reasons even so it is
+different from the way <code>&lt;property&gt;</code> tasks in build files behave.</p>
+
+<p>Nested <a href="#reference"><code>&lt;reference&gt;</code></a> elements can be used to copy
+references from the calling project to the new project, optionally under a different <var>id</var>.
+References taken from nested elements will override existing references that have been defined
+outside of targets in the new project&mdash;but not those defined inside of targets.</p>
+
+<p>When a target is invoked by <code>antcall</code>, all of its dependent targets will also be
+called within the context of any new parameters. For example. if the target <q>doSomethingElse</q>;
+depended on the target <q>init</q>, then the <code>antcall</code> of <q>doSomethingElse</q> will
+call <q>init</q> during the call.  Of course, any properties defined in the <code>antcall</code>
+task or inherited from the calling target will be fixed and not overridable in the <q>init</q>
+target&mdash;or indeed in the <q>doSomethingElse</q> target.</p>
+
+<p>The called target(s) are run in a new project; be aware that this means properties, references,
+etc. set by called targets will not persist back to the calling project.</p>
+
+<p>If the build file changes after you've started the build, the behavior of this task is
+undefined.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">target</td>
-    <td valign="top">The target to execute.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>target</td>
+    <td>The target to execute.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">inheritAll</td>
-    <td valign="top">If <code>true</code>, pass all properties to the new Apache Ant
-    project.  Defaults to <code>true</code>.
-    </td>
-    <td align="center" valign="top">No</td>
+    <td>inheritAll</td>
+    <td>If <q>true</q>, pass all properties to the new Apache Ant project.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">inheritRefs</td>
-    <td valign="top">If <code>true</code>, pass all references to the
-      new Ant project.  Defaults to <code>false</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>inheritRefs</td>
+    <td>If <q>true</q>, pass all references to the new Ant project.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
 </table>
 
 <h3>Note on <code>inheritRefs</code></h3>
 
-<p><code>&lt;antcall&gt;</code> will not override existing references,
-even if you set <code>inheritRefs</code> to true.  As the called build
-files is the same build file as the calling one, this means it will
-not override any reference set via an <code>id</code> attribute at
-all.  The only references that can be inherited by the child project
-are those defined by nested <code>&lt;reference&gt;</code> elements or
-references defined by tasks directly (not using the <code>id</code>
-attribute).</p>
+<p><code>&lt;antcall&gt;</code> will not override existing references, even if you
+set <var>inheritRefs</var> to true.  As the called build files is the same build file as the calling
+one, this means it will not override any reference set via an <var>id</var> attribute at all.  The
+only references that can be inherited by the child project are those defined by
+nested <code>&lt;reference&gt;</code> elements or references defined by tasks directly (not using
+the <var>id</var> attribute).</p>
 
 <h3>Parameters specified as nested elements</h3>
 <h4>param</h4>
-<p>Specifies the properties to set before running the specified target. See <a
-href="property.html">property</a> for usage guidelines.<br>
-These properties become equivalent to properties you define on
-the command line. These are special properties and they will always get passed
-down, even through additional <code>&lt;*ant*&gt;</code> tasks with inheritall set to
-false (see above).
-</p>
+<p>Specifies the properties to set before running the specified
+target. See <a href="property.html">property</a> for usage guidelines.<br/>  These properties become
+equivalent to properties you define on the command line. These are special properties and they will
+always get passed down, even through additional <code>&lt;*ant*&gt;</code> tasks
+with <var>inheritAll</var> set to <q>false</q> (see above).</p>
 
-<h4><a name="reference">reference</a></h4>
-<p>Used to choose references that shall be copied into the new project,
-optionally changing their id.</p>
+<h4 id="reference">reference</h4>
+<p>Used to choose references that shall be copied into the new project, optionally changing
+their <var>id</var>.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">refid</td>
-    <td valign="top">The id of the reference in the calling project.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>refid</td>
+    <td>The <var>id</var> of the reference in the calling project.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">torefid</td>
-    <td valign="top">The id of the reference in the new project.</td>
-    <td valign="top" align="center">No, defaults to the value of refid.</td>
+    <td>torefid</td>
+    <td>The <var>id</var> of the reference in the new project.</td>
+    <td>No; defaults to the value of <var>refid</var></td>
   </tr>
 </table>
 
 <h4>propertyset</h4>
 
-<p>You can specify a set of properties to be copied into the new
-project with <a
-href="../Types/propertyset.html">propertyset</a>s.</p>
+<p><em>Since Ant 1.6</em>.</p>
 
-<p><em>since Ant 1.6</em>.</p>
+<p>You can specify a set of properties to be copied into the new project
+with <a href="../Types/propertyset.html">propertyset</a>s.</p>
 
 <h4>target</h4>
+<p><em>Since Ant 1.6.3</em>.</p>
 
-<p>You can specify multiple targets using nested <code>&lt;target&gt;</code> elements
-instead of using the target attribute.  These will be executed as if
-Ant had been invoked with a single target whose dependencies are the
-targets so specified, in the order specified.</p>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+<p>You can specify multiple targets using nested <code>&lt;target&gt;</code> elements instead of
+using the <var>target</var> attribute.  These will be executed as if Ant had been invoked with a
+single target whose dependencies are the targets so specified, in the order specified.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The name of the called target.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>name</td>
+    <td>The name of the called target.</td>
+    <td>Yes</td>
   </tr>
 </table>
-<p><em>since Ant 1.6.3</em>.</p>
 
 <h3>Examples</h3>
-<blockquote><pre>
+<pre>
 &lt;target name=&quot;default&quot;&gt;
   &lt;antcall target=&quot;doSomethingElse&quot;&gt;
     &lt;param name=&quot;param1&quot; value=&quot;value&quot;/&gt;
@@ -182,20 +163,16 @@
 
 &lt;target name=&quot;doSomethingElse&quot;&gt;
   &lt;echo message=&quot;param1=${param1}&quot;/&gt;
-&lt;/target&gt;
-</pre></blockquote>
-<p>Will run the target 'doSomethingElse' and echo 'param1=value'.</p>
+&lt;/target&gt;</pre>
+<p>Will run the target <var>doSomethingElse</var> and echo <code>param1=value</code>.</p>
 
-<blockquote><pre>
+<pre>
 &lt;antcall ... &gt;
   &lt;reference refid=&quot;path1&quot; torefid=&quot;path2&quot;/&gt;
-&lt;/antcall&gt;
-</pre></blockquote>
-
-<p>will copy the parent's definition of <code>path1</code> into the
-new project using the id <code>path2</code>.</p>
-
+&lt;/antcall&gt;</pre>
 
+<p>will copy the parent's definition of <samp>path1</samp> into the new project using
+the <var>id</var> <samp>path2</samp>.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/ant.html ant-1.10.3/manual/Tasks/ant.html
--- ant-1.9.10/manual/Tasks/ant.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/ant.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,313 +24,276 @@
 
 <body>
 
-<h2><a name="ant">Ant</a></h2>
+<h2 id="ant">Ant</h2>
 <h3>Description</h3>
 
-<p>Runs Apache Ant on a supplied buildfile. This can be used to build
-subprojects.  <strong>This task must not be used outside of a
-<code>target</code> if it invokes the same build file it is part
+<p>Runs Apache Ant on a supplied buildfile. This can be used to build subprojects.  <strong>This
+task must not be used outside of a <code>target</code> if it invokes the same build file it is part
 of.</strong></p>
 
-<p>When the <i>antfile</i> attribute is omitted, the file &quot;build.xml&quot;
-in the supplied directory (<i>dir</i> attribute) is used.</p>
-<p>If no target attribute is supplied, the default target of the new project is
-used.</p>
-<p>By default, all of the properties of the current project will be
-available in the new project.  Alternatively, you can set the
-<i>inheritAll</i> attribute to <code>false</code> and only
-&quot;user&quot; properties (i.e., those passed on the command-line)
-will be passed to the new project.  In either case, the set of
-properties passed to the new project will override the properties that
-are set in the new project (See also the <a
-href="property.html">property task</a>).</p>
-
-<p>You can also set properties in the new project from the old project
-by using nested property tags. These properties are always passed
-to the new project and any project created in that project
-regardless of the setting of <i>inheritAll</i>.  This allows you to
-parameterize your subprojects.</p>
-
-<p>When more than one nested <code>&lt;property&gt;</code> element
-  would set a property of the same name, the one declared last will
-  win.  This is for backwards compatibility reasons even so it is
-  different from the way <code>&lt;property&gt;</code> tasks in build
-  files behave.</p>
+<p>When the <var>antfile</var> attribute is omitted, the file <samp>build.xml</samp> in the supplied
+directory (<var>dir</var> attribute) is used.</p>
+<p>If no target attribute is supplied, the default target of the new project is used.</p>
+<p>By default, all of the properties of the current project will be available in the new project.
+Alternatively, you can set the <var>inheritAll</var> attribute to <q>false</q> and only
+&quot;user&quot; properties (i.e., those passed on the command-line) will be passed to the new
+project.  In either case, the set of properties passed to the new project will override the
+properties that are set in the new project (See also the <a href="property.html">property</a>
+task).</p>
+
+<p>You can also set properties in the new project from the old project by using
+nested <code>property</code> tags. These properties are always passed to the new project and any
+project created in that project regardless of the setting of <var>inheritAll</var>.  This allows you
+to parameterize your subprojects.</p>
+
+<p>When more than one nested <code>&lt;property&gt;</code> element would set a property of the same
+name, the one declared last will win.  This is for backwards compatibility reasons even though it is
+different from the way <code>&lt;property&gt;</code> tasks in build files behave.</p>
 
 <p>Properties defined on the command line cannot be overridden by
-  nested <code>&lt;property&gt;</code> elements.  <em>Since Ant
-  1.8.0.</em> the same is true for nested structures
-  of <code>&lt;ant&gt;</code> tasks: if a build file <em>A</em>
-  invokes <em>B</em> via an <code>&lt;ant&gt;</code> task setting a
-  property with a nested <code>&lt;property&gt;</code> element
-  and <em>B</em> contains an <code>&lt;ant&gt;</code> tasks
-  invoking <em>C</em>, <em>C</em> will see the value set
-  in <em>A</em>, even if <em>B</em> used a
-  nested <code>&lt;property&gt;</code> element as well.</p>
-
-<p>References to data types can also be passed to the new project, but
-by default they are not.  If you set the inheritrefs attribute to
-true, all references will be copied, but they will not override
-references defined in the new project.</p>
-
-<p>Nested <a href="#reference"><i><code>&lt;reference&gt;</code></i></a> elements
-can also be used to copy references from the calling project to the
-new project, optionally under a different id.  References taken from
-nested elements will override existing references that have been
-defined outside of targets in the new project - but not those defined
-inside of targets.</p>
+nested <code>&lt;property&gt;</code> elements.  <em>Since Ant 1.8.0</em>, the same is true for
+nested structures of <code>&lt;ant&gt;</code> tasks: if a build file <var>A</var>
+invokes <var>B</var> via an <code>&lt;ant&gt;</code> task setting a property with a
+nested <code>&lt;property&gt;</code> element and <var>B</var> contains an <code>&lt;ant&gt;</code>
+tasks invoking <var>C</var>, <var>C</var> will see the value set in <var>A</var>, even
+if <var>B</var> used a nested <code>&lt;property&gt;</code> element as well.</p>
+
+<p>References to data types can also be passed to the new project, but by default they are not.  If
+you set the <var>inheritrefs</var> attribute to <q>true</q>, all references will be copied, but they
+will not override references defined in the new project.</p>
+
+<p>Nested <a href="#reference"><code>&lt;reference&gt;</code></a> elements can also be used to copy
+references from the calling project to the new project, optionally under a different <var>id</var>.
+References taken from nested elements will override existing references that have been defined
+outside of targets in the new project&mdash;but not those defined inside of targets.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">antfile</td>
-    <td valign="top">the buildfile to use. Defaults to
-      &quot;build.xml&quot;.  This file is expected to be a filename
-      relative to the dir attribute given.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">dir</td>
-    <td valign="top">the directory to use as a basedir for the new Ant
-      project (unless useNativeBasedir is set to true).
-      Defaults to the current project's basedir, unless
-      inheritall has been set to false, in which case it doesn't
-      have a default value.  This will override the basedir
-      setting of the called project.<br/>
-      Also serves as the directory to resolve the antfile and output
-      attribute's values (if any).
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>antfile</td>
+    <td>the buildfile to use. This file is expected to be a filename relative to the <var>dir</var>
+      attribute given.</td>
+    <td>No; defaults to <q>build.xml</q></td>
+  </tr>
+  <tr>
+    <td>dir</td>
+    <td>the directory to use as a <var>basedir</var> for the new Ant project
+      (unless <var>useNativeBasedir</var> is set to <q>true</q>).  This will override
+      the <var>basedir</var> setting of the called project.<br/>  Also serves as the directory to
+      resolve the <var>antfile</var> and <var>output</var> attribute's values (if any).
     </td>
-    <td valign="top" align="center">No</td>
+    <td>No; defaults to the current project's <var>basedir</var>, unless <var>inheritall</var> has
+      been set to <q>false</q>, in which case it doesn't have a default value</td>
   </tr>
   <tr>
-    <td valign="top">target</td>
-    <td valign="top">the target of the new Ant project that should be executed.
-      Defaults to the new project's default target.</td>
-    <td valign="top" align="center">No</td>
+    <td>target</td>
+    <td>the target of the new Ant project that should be executed.</td>
+    <td>No; defaults to the new project's default target</td>
   </tr>
   <tr>
-    <td valign="top">output</td>
-    <td valign="top">Filename to write the ant output to.  This is
-    relative to the value of the dir attribute if it has been set or
-    to the base directory of the current project otherwise.
+    <td>output</td>
+    <td>Filename to write the Ant output to.  This is relative to the value of the <var>dir</var>
+      attribute if it has been set or to the <var>basedir</var> of the current project otherwise.
     </td>
-    <td align="center" valign="top">No</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">inheritAll</td>
-    <td valign="top">If <code>true</code>, pass all properties to the
-      new Ant project.  Defaults to <code>true</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>inheritAll</td>
+    <td>If <q>true</q>, pass all properties to the new Ant project.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">inheritRefs</td>
-    <td valign="top">If <code>true</code>, pass all references to the
-      new Ant project.  Defaults to <code>false</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>inheritRefs</td>
+    <td>If <q>true</q>, pass all references to the new Ant project.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">useNativeBasedir</td>
-    <td valign="top">If set to true, the child build will use the same
-      basedir as it would have used when run from the command line
-      (i.e. the basedir one would expect when looking at the child
-      build's buildfile).  Defaults to <code>false</code>.  <em>since
-      Ant 1.8.0</em></td>
-    <td valign="top" align="center">No</td>
+    <td>useNativeBasedir</td>
+    <td>If set to <q>true</q>, the child build will use the same <var>basedir</var> as it would have
+      used when run from the command line (i.e. the <var>basedir</var> one would expect when looking
+      at the child build's buildfile).  <em>Since Ant 1.8.0</em></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
 
 <h4>property</h4>
-<p>See the description of the <a href="property.html">property
-task</a>. <br>
-These properties become equivalent to properties you define on
-the command line. These are special properties and they will always get passed
-down, even through additional <code>&lt;*ant*&gt;</code> tasks with inheritall set to
-false (see above). <br>
-Note that the <code>refid</code> attribute points to a
-reference in the calling project, not in the new one.</p>
-
-<h4><a name="reference">reference</a></h4>
-<p>Used to choose references that shall be copied into the new project,
-optionally changing their id.</p>
-
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">refid</td>
-    <td valign="top">The id of the reference in the calling project.</td>
-    <td valign="top" align="center">Yes</td>
-  </tr>
-  <tr>
-    <td valign="top">torefid</td>
-    <td valign="top">The id of the reference in the new project.</td>
-    <td valign="top" align="center">No, defaults to the value of refid.</td>
+<p>See the description of the <a href="property.html">property</a> task.<br/>  These properties
+become equivalent to properties you define on the command line. These are special properties and
+they will always get passed down, even through additional <code>&lt;*ant*&gt;</code> tasks
+with <var>inheritAll</var> set to <q>false</q> (see above).<br/>  Note that the <var>refid</var>
+attribute points to a reference in the calling project, not in the new one.</p>
+
+<h4 id="reference">reference</h4>
+<p>Used to choose references that shall be copied into the new project, optionally changing
+their <var>id</var>.</p>
+
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>refid</td>
+    <td>The <var>id</var> of the reference in the calling project.</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>torefid</td>
+    <td>The <var>id</var> of the reference in the new project.</td>
+    <td>No; defaults to the value of <var>refid</var></td>
   </tr>
 </table>
 
 <h4>propertyset</h4>
 
-<p>You can specify a set of properties to be copied into the new
-project with <a
-href="../Types/propertyset.html">propertyset</a>s.</p>
+<p><em>Since Ant 1.6</em>.</p>
 
-<p><em>since Ant 1.6</em>.</p>
+<p>You can specify a set of properties to be copied into the new project
+with <a href="../Types/propertyset.html">propertyset</a>s.</p>
 
 <h4>target</h4>
+<p><em>Since Ant 1.6.3</em>.</p>
 
-<p>You can specify multiple targets using nested <code>&lt;target&gt;</code> elements
-instead of using the target attribute.  These will be executed as if
-Ant had been invoked with a single target whose dependencies are the
-targets so specified, in the order specified.</p>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+<p>You can specify multiple targets using nested <code>&lt;target&gt;</code> elements instead of
+using the <var>target</var> attribute.  These will be executed as if Ant had been invoked with a
+single target whose dependencies are the targets so specified, in the order specified.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The name of the called target.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>name</td>
+    <td>The name of the called target.</td>
+    <td>Yes</td>
   </tr>
 </table>
-<p><em>since Ant 1.6.3</em>.</p>
 
 <h3>Basedir of the new project</h3>
 
-<p>If you set <code>useNativeBasedir</code> to true, the basedir of
-  the new project will be whatever the basedir attribute of
-  the <code>&lt;project&gt;</code> element of the new project says (or
-  the new project's directory if the there is no basedir attribute) -
-  no matter what any other attribute of this task says and no matter
-  how deeply nested into levels of
-  <code>&lt;ant&gt;</code> invocations this task lives.</p>
- 
-<p>If you haven't set <code>useNativeBasedir</code> or set it to
-  false, the following rules apply:</p>
-
-<p>The basedir value of the new project is affected by the two
-  attributes dir and inheritall as well as
-  the <code>&lt;ant&gt;</code> task's history.  The current behaviour
-  is known to be confusing but cannot be changed without breaking
-  backwards compatibility in subtle ways.</p>
-
-<p>If the <code>&lt;ant&gt;</code> task is in a "top level" build
-  file, i.e. the project containing the <code>&lt;ant&gt;</code> task
-  has not itself been invoked as part of a
-  different <code>&lt;ant&gt;</code> (or <code>&lt;antcall&gt;</code>)
-  task "higher up", the following table shows the details:</p>
-
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>dir attribute</b></td>
-    <td valign="top"><b>inheritAll attribute</b></td>
-    <td valign="top"><b>new project's basedir</b></td>
-  </tr>
-  <tr>
-    <td valign="top">value provided</td>
-    <td valign="top">true</td>
-    <td valign="top">value of dir attribute</td>
-  </tr>
-  <tr>
-    <td valign="top">value provided</td>
-    <td valign="top">false</td>
-    <td valign="top">value of dir attribute</td>
-  </tr>
-  <tr>
-    <td valign="top">omitted</td>
-    <td valign="top">true</td>
-    <td valign="top">basedir of calling project (the one whose build
-        file contains the <code>&lt;ant&gt;</code> task).</td>
-  </tr>
-  <tr>
-    <td valign="top">omitted</td>
-    <td valign="top">false</td>
-    <td valign="top">basedir attribute of the <code>&lt;project&gt;</code> element
-        of the new project</td>
+<p>If you set <var>useNativeBasedir</var> to true, the <var>basedir</var> of the new project will be
+whatever the <var>basedir</var> attribute of the <code>&lt;project&gt;</code> element of the new
+project says (or the new project's directory if the there is no <var>basedir</var>
+attribute)&mdash;no matter what any other attribute of this task says and no matter how deeply
+nested into levels of <code>&lt;ant&gt;</code> invocations this task lives.</p>
+
+<p>If you haven't set <var>useNativeBasedir</var> or set it to <q>false</q>, the following rules
+apply:</p>
+
+<p>The <var>basedir</var> value of the new project is affected by the two attributes, <var>dir</var>
+and <var>inheritall</var>, as well as the <code>&lt;ant&gt;</code> task's history.  The current
+behaviour is known to be confusing but cannot be changed without breaking backwards compatibility in
+subtle ways.</p>
+
+<p>If the <code>&lt;ant&gt;</code> task is in a "top level" build file, i.e. the project containing
+the <code>&lt;ant&gt;</code> task has not itself been invoked as part of a
+different <code>&lt;ant&gt;</code> (or <code>&lt;antcall&gt;</code>) task "higher up", the following
+table shows the details:</p>
+
+<table>
+  <tr>
+    <th><var>dir</var> attribute</th>
+    <th><var>inheritAll</var> attribute</th>
+    <th>new project's <var>basedir</var></th>
+  </tr>
+  <tr>
+    <td>value provided</td>
+    <td><q>true</q></td>
+    <td>value of <var>dir</var> attribute</td>
+  </tr>
+  <tr>
+    <td>value provided</td>
+    <td><q>false</q></td>
+    <td>value of <var>dir</var> attribute</td>
+  </tr>
+  <tr>
+    <td>omitted</td>
+    <td><q>true</q></td>
+    <td><var>basedir</var> of calling project (the one whose build
+      file contains the <code>&lt;ant&gt;</code> task).</td>
+  </tr>
+  <tr>
+    <td>omitted</td>
+    <td><q>false</q></td>
+    <td><var>basedir</var> attribute of the <code>&lt;project&gt;</code> element
+      of the new project</td>
   </tr>
 </table>
 
-<p>If on the other hand the <code>&lt;ant&gt;</code> task is already
-  nested into another invocation, the parent invocation's settings
-  affect the outcome of the basedir value.  The current task's dir
-  attribute will always win, but if the dir attribute has been omitted
-  an even more complex situation arises:</p>
-
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>parent dir attribute</b></td>
-    <td valign="top"><b>parent inheritAll attribute</b></td>
-    <td valign="top"><b>current inheritAll attribute</b></td>
-    <td valign="top"><b>new project's basedir</b></td>
-  </tr>
-  <tr>
-    <td valign="top">value provided</td>
-    <td valign="top">any</td>
-    <td valign="top">any</td>
-    <td valign="top">value of parent's dir attribute</td>
-  </tr>
-  <tr>
-    <td valign="top">omitted</td>
-    <td valign="top">true</td>
-    <td valign="top">true</td>
-    <td valign="top">basedir of parent project (the one whose build
-        file called the build file that contains
-        the current <code>&lt;ant&gt;</code> task).</td>
-  </tr>
-  <tr>
-    <td valign="top">omitted</td>
-    <td valign="top">true</td>
-    <td valign="top">false</td>
-    <td valign="top">basedir of parent project (the one whose build
-        file called the build file that contains
-        the current <code>&lt;ant&gt;</code> task).</td>
-  </tr>
-  <tr>
-    <td valign="top">omitted</td>
-    <td valign="top">false</td>
-    <td valign="top">true</td>
-    <td valign="top">basedir of calling project (the one whose build
-        file contains the current <code>&lt;ant&gt;</code> task).</td>
-  </tr>
-  <tr>
-    <td valign="top">omitted</td>
-    <td valign="top">false</td>
-    <td valign="top">false</td>
-    <td valign="top">basedir attribute of the <code>&lt;project&gt;</code> element
-        of the new project</td>
+<p>If on the other hand the <code>&lt;ant&gt;</code> task is already nested into another invocation,
+the parent invocation's settings affect the outcome of the <var>basedir</var> value.  The current
+task's <var>dir</var> attribute will always win, but if the <var>dir</var> attribute has been
+omitted an even more complex situation arises:</p>
+
+<table>
+  <tr>
+    <th>parent <var>dir</var> attribute</th>
+    <th>parent <var>inheritAll</var> attribute</th>
+    <th>current <var>inheritAll</var> attribute</th>
+    <th>new project's <var>basedir</var></th>
+  </tr>
+  <tr>
+    <td>value provided</td>
+    <td>any</td>
+    <td>any</td>
+    <td>value of parent's <var>dir</var> attribute</td>
+  </tr>
+  <tr>
+    <td>omitted</td>
+    <td><q>true</q></td>
+    <td><q>true</q></td>
+    <td><var>basedir</var> of parent project (the one whose build file called the build file that
+      contains the current <code>&lt;ant&gt;</code> task).</td>
+  </tr>
+  <tr>
+    <td>omitted</td>
+    <td><q>true</q></td>
+    <td><q>false</q></td>
+    <td><var>basedir</var> of parent project (the one whose build file called the build file that
+      contains the current <code>&lt;ant&gt;</code> task).</td>
+  </tr>
+  <tr>
+    <td>omitted</td>
+    <td><q>false</q></td>
+    <td><q>true</q></td>
+    <td><var>basedir</var> of calling project (the one whose build file contains the
+      current <code>&lt;ant&gt;</code> task).</td>
+  </tr>
+  <tr>
+    <td>omitted</td>
+    <td><q>false</q></td>
+    <td><q>false</q></td>
+    <td><var>basedir</var> attribute of the <code>&lt;project&gt;</code> element of the new
+      project</td>
   </tr>
 </table>
 
-<p>If you add even deeper levels of nesting, things get even more
-  complicated and you need to apply the above table recursively.</p>
+<p>If you add even deeper levels of nesting, things get even more complicated and you need to apply
+the above table recursively.</p>
 
-<p>If the basedir of the outer most build has been specified as a
-  property on the command line (i.e. <code>-Dbasedir=some-value</code>
-  or a <code>-propertyfile</code> argument) the value provided will
-  get an even higher priority.  For any <code>&lt;ant&gt;</code> task
-  that doesn't specify a dir attribute, the new project's basedir will
-  be the value specified on the command line - no matter how deeply
-  nested into layers of build files the task may be.</p>
-
-<p>The same happens if the basedir is specified as a
-  nested <code>&lt;property&gt;</code> of an <code>&lt;ant&gt;</code>
-  task.  The basedir of build files started at deeper levels will be
-  set to the specified value of the property element unless the
-  corresponding Ant tasks set the dir attribute explicitly.</p>
+<p>If the <var>basedir</var> of the outermost build has been specified as a property on the command
+line (i.e. <kbd>-Dbasedir=some-value</kbd> or a <kbd>-propertyfile</kbd> argument) the value
+provided will get an even higher priority.  For any <code>&lt;ant&gt;</code> task that doesn't
+specify a <var>dir</var> attribute, the new project's <var>basedir</var> will be the value specified
+on the command line&mdash;no matter how deeply nested into layers of build files the task may
+be.</p>
+
+<p>The same happens if the <var>basedir</var> is specified as a nested <code>&lt;property&gt;</code>
+of an <code>&lt;ant&gt;</code> task.  The <var>basedir</var> of build files started at deeper levels
+will be set to the specified value of the property element unless the corresponding Ant tasks set
+the <var>dir</var> attribute explicitly.</p>
 
 <h3>Examples</h3>
-<blockquote><pre>
+<pre>
 &lt;ant antfile=&quot;subproject/subbuild.xml&quot; target=&quot;compile&quot;/&gt;
 
 &lt;ant dir=&quot;subproject&quot;/&gt;
@@ -342,72 +305,55 @@
 
 &lt;ant inheritAll=&quot;false&quot; antfile=&quot;subproject/subbuild.xml&quot;&gt;
   &lt;property name=&quot;output.type&quot; value=&quot;html&quot;/&gt;
-&lt;/ant&gt;
-</pre></blockquote>
+&lt;/ant&gt;</pre>
 
 <p>These lines invoke the same build file:</p>
-<blockquote><pre>
-&lt;ant antfile=&quot;sub1/sub2/build.xml&quot; /&gt;
-&lt;ant antfile=&quot;sub2/build.xml&quot; dir=&quot;sub1&quot; /&gt;
-&lt;ant antfile=&quot;build.xml&quot; dir=&quot;sub1/sub2&quot; /&gt;
-</pre></blockquote>
+<pre>
+&lt;ant antfile=&quot;sub1/sub2/build.xml&quot;/&gt;
+&lt;ant antfile=&quot;sub2/build.xml&quot; dir=&quot;sub1&quot;/&gt;
+&lt;ant antfile=&quot;build.xml&quot; dir=&quot;sub1/sub2&quot;/&gt;</pre>
 
-<p>The build file of the calling project defines some
-<code>&lt;path&gt;</code> elements like this:</p>
+<p>The build file of the calling project defines some <code>&lt;path&gt;</code> elements like
+this:</p>
 
-<blockquote><pre>
+<pre>
 &lt;path id="path1"&gt;
     ...
 &lt;/path&gt;
 &lt;path id="path2"&gt;
     ...
-&lt;/path&gt;
-</pre></blockquote>
+&lt;/path&gt;</pre>
+
+<p>and the called build file (<samp>subbuild.xml</samp>) also defines a <code>&lt;path&gt;</code>
+with the <var>id</var> <samp>path1</samp>, but <samp>path2</samp> is not defined:</p>
+
+<pre>&lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;true&quot;/&gt;</pre>
 
-<p>and the called build file (<code>subbuild.xml</code>) also defines
-a <code>&lt;path&gt;</code> with the id <code>path1</code>, but
-<code>path2</code> is not defined:</p>
-
-<blockquote><pre>
-&lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;true&quot;/&gt;
-</pre></blockquote>
-
-<p>will not override <code>subbuild</code>'s definition of
-<code>path1</code>, but make the parent's definition of
-<code>path2</code> available in the subbuild.</p>
-
-<blockquote><pre>
-&lt;ant antfile=&quot;subbuild.xml&quot;/&gt;
-</pre></blockquote>
+<p>will not override <samp>subbuild</samp>'s definition of <samp>path1</samp>, but make the parent's
+definition of <samp>path2</samp> available in the <samp>subbuild</samp>.</p>
+
+<pre>&lt;ant antfile=&quot;subbuild.xml&quot;/&gt;</pre>
 
 <p>as well as</p>
 
-<blockquote><pre>
-&lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;false&quot;/&gt;
-</pre></blockquote>
+<pre>&lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;false&quot;/&gt;</pre>
 
-<p>will neither override <code>path1</code> nor copy
-<code>path2</code>.</p>
+<p>will neither override <samp>path1</samp> nor copy <samp>path2</samp>.</p>
 
-<blockquote><pre>
+<pre>
 &lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;false&quot;&gt;
   &lt;reference refid=&quot;path1&quot;/&gt;
-&lt;/ant&gt;
-</pre></blockquote>
+&lt;/ant&gt;</pre>
 
-<p>will override <code>subbuild</code>'s definition of
-<code>path1</code>.</p>
+<p>will override <samp>subbuild</samp>'s definition of <samp>path1</samp>.</p>
 
-<blockquote><pre>
+<pre>
 &lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;false&quot;&gt;
   &lt;reference refid=&quot;path1&quot; torefid=&quot;path2&quot;/&gt;
-&lt;/ant&gt;
-</pre></blockquote>
-
-<p>will copy the parent's definition of <code>path1</code> into the
-new project using the id <code>path2</code>.</p>
-
+&lt;/ant&gt;</pre>
 
+<p>will copy the parent's definition of <samp>path1</samp> into the new project using
+the <var>id</var> <samp>path2</samp>.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/antlr.html ant-1.10.3/manual/Tasks/antlr.html
--- ant-1.9.10/manual/Tasks/antlr.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/antlr.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,180 +24,125 @@
 
 <body>
 
-<h2><a name="antlr">ANTLR</a></h2>
+<h2 id="antlr">ANTLR</h2>
 <h3>Description</h3>
-<p>
-  Invokes the <a HREF="http://www.antlr.org/" target="_top">ANTLR</a> Translator generator
-  on a grammar file.
-</p>
-<p>
-  To use the ANTLR task, set the <i>target</i> attribute to the name of the
-  grammar file to process.  Optionally, you can also set the
-  <i>outputdirectory</i> to write the generated file to a specific directory.
-  Otherwise ANTLR writes the generated files to the directory containing
-  the grammar file.
-</p>
-<p>
-  This task only invokes ANTLR if the grammar file (or the
-  supergrammar specified by the glib attribute) is newer than the
-  generated files.
-</p>
-<p><strong>Note:</strong> This task depends on external libraries not
-included in the Apache Ant distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a>
-for more information.</p>
-<p>Antlr 2.7.1 Note:
-<i>
-  To successfully run ANTLR, your best option is probably to build the whole
-  jar with the provided script <b>mkalljar</b> and drop the resulting jar (about 300KB)
-  into ${ant.home}/lib. Dropping the default jar (70KB) is probably not enough
-  for most needs and your only option will be to add ANTLR home directory
-  to your classpath as described in ANTLR <tt>install.html</tt> document.
-</i>
-</p>
-<p>Antlr 2.7.2 Note:
-<i>
-  Instead of the above, you will need antlrall.jar that can be created
-  by the <b>antlr-all.jar</b> target of the Makefile provided with the
-  download.
-</i>
-</p>
+<p>Invokes the <a href="https://www.antlr.org/" target="_top">ANTLR</a> Translator generator on a
+grammar file.</p>
+<p>To use the ANTLR task, set the <var>target</var> attribute to the name of the grammar file to
+process.  Optionally, you can also set the <var>outputdirectory</var> to write the generated file to
+a specific directory.  Otherwise ANTLR writes the generated files to the directory containing the
+grammar file.</p>
+<p>This task only invokes ANTLR if the grammar file (or the supergrammar specified by
+the <var>glib</var> attribute) is newer than the generated files.</p>
+<p><strong>Note</strong>: This task depends on external libraries not included in the Apache Ant
+distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a> for more
+information.</p>
+<p>Antlr 2.7.2 Note: <em>You will need <samp>antlrall.jar</samp> that can be created by
+the <q>antlr-all.jar</q> target of the Makefile provided with the download.</em></p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">target</td>
-    <td valign="top">The grammar file to process.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>target</td>
+    <td>The grammar file to process.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">outputdirectory</td>
-    <td valign="top">
-      The directory to write the generated files to.  If not set, the files
-      are written to the directory containing the grammar file.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>outputdirectory</td>
+    <td>The directory to write the generated files to.</td>
+    <td>No; defaults to the directory containing the grammar file</td>
   </tr>
   <tr>
-    <td valign="top">glib</td>
-    <td valign="top">
-      An optional super grammar file that the target grammar overrides.  This
-      feature is only needed for advanced vocabularies.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>glib</td>
+    <td>An optional super grammar file that the target grammar overrides.  This feature is only
+      needed for advanced vocabularies.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">debug</td>
-    <td valign="top">
-      When set to "yes", this flag adds code to the generated parser that will
-      launch the ParseView debugger upon invocation.  The default is "no".
-      <br>
-      Note: ParseView is a separate component that needs to be installed or your
-      grammar will have compilation errors.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>debug</td>
+    <td>When set to <q>yes</q>, this flag adds code to the generated parser that will launch the
+      ParseView debugger upon invocation.<br/>  Note: ParseView is a separate component that needs
+      to be installed or your grammar will have compilation errors.</td>
+    <td>No; default is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">html</td>
-    <td valign="top">
-      Emit an html version of the grammar with hyperlinked actions.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>html</td>
+    <td>Emit an HTML version of the grammar with hyperlinked actions if set to <q>yes</q>.</td>
+    <td>No; default is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">diagnostic</td>
-    <td valign="top">
-      Generates a text file with debugging information based on the target grammar.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>diagnostic</td>
+    <td>Generate a text file with debugging information based on the target grammar if set
+      to <q>yes</q>.</td>
+    <td>No; default is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">trace</td>
-    <td valign="top">
-      Forces <b>all</b> rules to call traceIn/traceOut if set to "yes".
-      The default is "no".
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>trace</td>
+    <td>Force <strong>all</strong> rules to call traceIn/traceOut if set to <q>yes</q>.</td>
+    <td>No; default is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">traceParser</td>
-    <td valign="top">
-      Only forces parser rules to call traceIn/traceOut if set to "yes".
-      The default is "no".
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>traceParser</td>
+    <td>Only force parser rules to call traceIn/traceOut if set to <q>yes</q>.</td>
+    <td>No; default is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">traceLexer</td>
-    <td valign="top">
-      Only forces lexer rules to call traceIn/traceOut if set to "yes".
-      The default is "no".
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>traceLexer</td>
+    <td>Only force lexer rules to call traceIn/traceOut if set to <q>yes</q>.</td>
+    <td>No; default is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">traceTreeWalker</td>
-    <td valign="top">
-      Only forces tree walker rules to call traceIn/traceOut if set to
-      "yes".  The default is "no".
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>traceTreeWalker</td>
+    <td>Only force tree walker rules to call traceIn/traceOut if set to <q>yes</q>.</td>
+    <td>No; default is <q>no</q></td>
   </tr>
   <!--tr>
-    <td valign="top">fork</td>
-    <td valign="top">Run ANTLR in a separate VM.</td>
-    <td align="center" valign="top">No, default is &quot;off&quot;</td>
+    <td>fork</td>
+    <td>Run ANTLR in a separate JVM.</td>
+    <td>No; default is <q>off</q></td>
   </tr-->
   <tr>
-    <td valign="top">dir</td>
-    <td valign="top">The directory to invoke the VM in. <!--(ignored if
-      fork is disabled)--></td>
-    <td align="center" valign="top">No</td>
+    <td>dir</td>
+    <td>The directory to invoke JVM in.<!--(ignored if fork is disabled)--></td>
+    <td>No</td>
   </tr>
 </table>
 
-<h3><a name="nested">Nested Elements</a></h3>
+<h3 id="nested">Parameters specified as nested elements</h3>
 
-<p><code>ANTLR</code> supports a nested <code>&lt;classpath&gt;</code>
-element, that represents a <a href="../using.html#path">PATH like
-structure</a>. It is given as a convenience if you have to specify
-the original ANTLR directory. In most cases, dropping the appropriate
-ANTLR jar in the normal Ant lib repository will be enough.</p>
+<p>The task supports a nested <code>&lt;classpath&gt;</code> element, that represents
+a <a href="../using.html#path">path-like structure</a>. It is given as a convenience if you have to
+specify the original ANTLR directory. In most cases, dropping the appropriate ANTLR jar in the
+normal Ant lib repository will be enough.</p>
 
 <h4>jvmarg</h4>
 
-<p><!--If fork is enabled, -->Additional parameters may be passed to the new
-VM via nested <code>&lt;jvmarg&gt;</code> attributes, for example:</p>
+<p><!--If fork is enabled, -->Additional parameters may be passed to the new JVM via
+nested <code>&lt;jvmarg&gt;</code> attributes, for example:</p>
 
 <pre>
 &lt;antlr target="..."&gt;
   &lt;jvmarg value=&quot;-Djava.compiler=NONE&quot;/&gt;
   ...
-&lt;/antlr&gt;
-</pre>
+&lt;/antlr&gt;</pre>
 
-<p>would run ANTLR in a VM without JIT.</p>
+<p>would run ANTLR in a JVM without JIT.</p>
 
-<p><code>&lt;jvmarg&gt;</code> allows all attributes described in <a
-href="../using.html#arg">Command line arguments</a>.</p>
+<p><code>&lt;jvmarg&gt;</code> allows all attributes described
+in <a href="../using.html#arg">Command line arguments</a>.</p>
 
 <h3>Example</h3>
-<blockquote><pre>
+<pre>
 &lt;antlr
     target=&quot;etc/java.g&quot;
-    outputdirectory=&quot;build/src&quot;
-/&gt;
-</pre></blockquote>
-<p>
-  This invokes ANTLR on grammar file etc/java.g, writing the generated
-  files to build/src.
-</p>
-
+    outputdirectory=&quot;build/src&quot;/&gt;</pre>
+<p>This invokes ANTLR on grammar file <samp>etc/java.g</samp>, writing the generated files
+to <samp>build/src</samp>.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/antstructure.html ant-1.10.3/manual/Tasks/antstructure.html
--- ant-1.9.10/manual/Tasks/antstructure.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/antstructure.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,55 +24,49 @@
 
 <body>
 
-<h2><a name="antstructure">AntStructure</a></h2>
-<h3>Description</h3> 
+<h2 id="antstructure">AntStructure</h2>
+<h3>Description</h3>
 
-<p>Generates an DTD for Apache Ant buildfiles which contains information
-about all tasks currently known to Ant.</p>
+<p>Generates an DTD for Apache Ant buildfiles which contains information about all tasks currently
+known to Ant.</p>
 
-<p>Actually the DTD will not be a real DTD for buildfiles since Ant's
-usage of XML cannot be captured with a DTD.  Several elements in Ant
-can have different attribute lists depending on the element that
-contains them.  &quot;fail&quot; for example can be <a
-href="fail.html">the task</a> or the nested child element of the <a
-href="../Tasks/sound.html">sound</a> task.  Don't consider the
-generated DTD something to rely upon.</p>
-
-<p>Also note that the DTD generated by this task is incomplete, you can
-always add XML entities using <a
-href="taskdef.html"><code>&lt;taskdef&gt;</code></a> or <a
-href="typedef.html"><code>&lt;typedef&gt;</code></a>. See <a
-href="http://www.sdv.fr/pages/casa/html/ant-dtd.en.html"
+<p>Actually the DTD will not be a real DTD for buildfiles since Ant's usage of XML cannot be
+captured with a DTD.  Several elements in Ant can have different attribute lists depending on the
+element that contains them. <a href="fail.html"><code>&lt;fail&gt;</code></a> for example can be a
+task or a nested child element of the <a href="../Tasks/sound.html"><code>&lt;sound&gt;</code></a>
+task.  Don't consider the generated DTD something to rely upon.</p>
+
+<p>Also note that the DTD generated by this task is incomplete, you can always add XML entities
+using <a href="taskdef.html"><code>&lt;taskdef&gt;</code></a>
+or <a href="typedef.html"><code>&lt;typedef&gt;</code></a>.
+See <a href="https://web.archive.org/web/20071231061243/http://www.sdv.fr/pages/casa/html/ant-dtd.en.html"
 target="_top">here</a> for a way to get around this problem.</p>
-<p>This task doesn't know about required attributes, all will be
-listed as <code>#IMPLIED</code>.</p>
+<p>This task doesn't know about required attributes, all will be listed
+as <code>#IMPLIED</code>.</p>
 
-<p><em>Since Ant 1.7</em> custom structure printers can be used
-instead of the one that emits a DTD.  In order to plug in your own
-structure, you have to implement the interface
-<code>org.apache.tools.ant.taskdefs.AntStructure.StructurePrinter</code>
-and <code>&lt;typedef&gt; your class and use the new type as a nested
-element of this task - see the example below.</code>
+<p><em>Since Ant 1.7</em> custom structure printers can be used instead of the one that emits a DTD.
+In order to plug in your own structure, you have to implement the
+interface <code class="code">org.apache.tools.ant.taskdefs.AntStructure.StructurePrinter</code>
+and <code>&lt;typedef&gt;</code> your class and use the new type as a nested element of this
+task&mdash;see the example below.
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">output</td>
-    <td valign="top">file to write the DTD to.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>output</td>
+    <td>file to write the DTD to.</td>
+    <td>Yes</td>
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote><pre>
-&lt;antstructure output=&quot;project.dtd&quot; /&gt;
-</pre></blockquote>
+<pre>&lt;antstructure output=&quot;project.dtd&quot;/&gt;</pre>
 
-<p><b>Emitting your own structure instead of a DTD</b></p>
+<p><strong>Emitting your own structure instead of a DTD</strong></p>
 
 <p>First you need to implement the interface</p>
 
@@ -81,20 +75,18 @@
 import org.apache.tools.ant.taskdefs.AntStructure;
 public class MyPrinter implements AntStructure.StructurePrinter {
     ...
-}
-</pre>
+}</pre>
 
 <p>and then use it via typedef</p>
 
 <pre>
-  &lt;typedef name="myprinter" classname="org.example.MyPrinter" /&gt;
-  &lt;antstructure output="project.my"&gt;
-    &lt;myprinter /&gt;
-  &lt;/antstructure&gt;
-</pre>
+&lt;typedef name="myprinter" classname="org.example.MyPrinter"/&gt;
+&lt;antstructure output="project.my"&gt;
+  &lt;myprinter/&gt;
+&lt;/antstructure&gt;</pre>
 
-<p>Your own StructurePrinter can accept attributes and nested elements
-just like any other Ant type or task.</p>
+<p>Your own StructurePrinter can accept attributes and nested elements just like any other Ant type
+or task.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/antversion.html ant-1.10.3/manual/Tasks/antversion.html
--- ant-1.9.10/manual/Tasks/antversion.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/antversion.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,72 +24,64 @@
 
 <body>
 
-<h2><a name="antversion">Antversion</a></h2>
+<h2 id="antversion">Antversion</h2>
+<p><em>Since Ant 1.7.0</em></p>
 <h3>Description</h3>
-<p>
-Stores the Apache Ant version (when used as task) or checks for a specific Ant version 
-(when used as condition).
-<b>Since Ant 1.7.0</b>
-</p>
+<p>Stores the Apache Ant version (when used as task) or checks for a specific Ant version (when used
+as condition).</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required (Task)</b></td>
-    <td align="center" valign="top"><b>Required (Condition)</b></td>
+    <th rowspan="2">Attribute</th>
+    <th rowspan="2">Description</th>
+    <th colspan="2">Required</th>
   </tr>
   <tr>
-    <td valign="top">atleast</td>
-    <td valign="top">The version that this at least.
-      The format is major.minor.point.</td>
-    <td valign="top" align="center">No</td>
-    <td valign="top" rowspan="2" align="center">One of these.</td>
+    <th>Task</th>
+    <th>Condition</th>
   </tr>
   <tr>
-    <td valign="top">exactly</td>
-    <td valign="top">The version that this ant is exactly.
-      The format is <tt>major.minor.point</tt>.</td>
-    <td valign="top" align="center">No</td>
+    <td>atleast</td>
+    <td>The version that this Ant is of at least.  The format
+      is <code>major.minor.point</code>.</td>
+    <td class="center">No</td>
+    <td rowspan="2">Exactly one of these</td>
   </tr>
   <tr>
-    <td valign="top">property</td>
-    <td valign="top">The name of the property to set.</td>
-    <td valign="top" align="center">Yes</td>
-    <td valign="top" align="center">No (ignored)</td>
+    <td>exactly</td>
+    <td>The version that this Ant is of exactly.  The format is <code>major.minor.point</code>.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>property</td>
+    <td>The name of the property to set.</td>
+    <td class="center">Yes</td>
+    <td>Ignored</td>
   </tr>
 </table>
 
-
 <h3>Examples</h3>
 
-<blockquote><pre>
-&lt;antversion property=&quot;antversion&quot;/&gt;
-</pre></blockquote>
-<p>Stores the current Ant version in the property <i>antversion</i>.</p>
-
-<blockquote><pre>
-&lt;antversion property=&quot;antversion&quot; atleast=&quot;1.6&quot;/&gt;
-</pre></blockquote>
-<p>Stores the Ant version in the property <i>antversion</i> if the current Ant version is 1.6.0
-or higher. Otherwise the property remains unset.</p>
-
-<blockquote><pre>
-&lt;antversion property=&quot;ant-is-exact-7&quot; exactly=&quot;1.7.0&quot;/&gt;
-</pre></blockquote>
-<p>Sets the property <i>ant-is-exact-7</i> if Ant 1.7.0 is running. Neither 1.6.5 nor 1.7.0
+<pre>&lt;antversion property=&quot;antversion&quot;/&gt;</pre>
+<p>Stores the current Ant version in the property <code>antversion</code>.</p>
+
+<pre>&lt;antversion property=&quot;antversion&quot; atleast=&quot;1.6&quot;/&gt;</pre>
+<p>Stores the Ant version in the property <code>antversion</code> if the current Ant version is
+1.6.0 or higher. Otherwise the property remains unset.</p>
+
+<pre>&lt;antversion property=&quot;ant-is-exact-7&quot; exactly=&quot;1.7.0&quot;/&gt;</pre>
+<p>Sets the property <code>ant-is-exact-7</code> if Ant 1.7.0 is running. Neither 1.6.5 nor 1.7.1
 would match.</p>
 
-<blockquote><pre>
+<pre>
 &lt;condition property=&quot;Ant17isOnline&quot;&gt;
   &lt;and&gt;
     &lt;antversion exactly=&quot;1.7.0&quot;/&gt;
     &lt;http url=&quot;http://ant.apache.org&quot;/&gt;
   &lt;/and&gt;
-&lt;/condition&gt;
-</pre></blockquote>
-<p>Sets <i>Ant17isOnline</i> if Ant 1.7.0 is running and can get a non-error-response from
-the Ant homepage.</p>
+&lt;/condition&gt;</pre>
+<p>Sets <code>Ant17isOnline</code> if Ant 1.7.0 is running and can get a non-error-response from the
+Ant homepage.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/apply.html ant-1.10.3/manual/Tasks/apply.html
--- ant-1.9.10/manual/Tasks/apply.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/apply.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,383 +24,333 @@
 
 <body>
 
-<h2><a name="apply">Apply/<i>ExecOn</i></a></h2>
-<p><i>The name <code>execon</code> is deprecated and only kept for backwards
-compatibility.</i></p>
+<h2 id="apply">Apply</h2>
+<p><em>The name <code>execon</code> is <u>deprecated</u> and only kept for backwards
+compatibility.</em></p>
 <h3>Description</h3>
-<p>Executes a system command. When the <i>os</i> attribute is specified, then
-the command is only executed when Apache Ant is run on one of the specified operating
-systems.</p>
-
-<p>The files and/or directories of a number of <a
-href="../Types/resources.html#collection">Resource Collection</a>s
-&ndash; including but not restricted to
- <a href="../Types/fileset.html">FileSet</a>s,
- <a href="../Types/dirset.html">DirSet</a>s
- (<em>since&nbsp;Ant&nbsp;1.6</em>) or
- <a href="../Types/filelist.html">FileList</a>s
- (<em>since&nbsp;Ant&nbsp;1.6</em>)
-&ndash;
- are passed as arguments to the system command.</p>
-<p>If you specify a nested <a href="../Types/mapper.html">mapper</a>,
-the timestamp of each source file is compared to the timestamp of a
-target file which is defined by the nested mapper element and searched
-for in the given <i>dest</i>, if specified.</p>
-<p>At least one fileset or filelist is required,
-and you must not specify more than one mapper.</p>
-
-<p>Note that you cannot interact with the forked program, the only way
-to send input to it is via the input and inputstring attributes.</p>
-
-<h4><a name="background">Running Ant as a background process on
-    Unix(-like) systems</a></h4>
-
-<p>If you run Ant as a background process (like <code>ant &</code>)
-  and use the <code>&lt;apply&gt;</code> task with <code>spawn</code>
-  set to <code>false</code>, you must provide explicit input to the
-  forked process or Ant will be suspended because it tries to read
-  from the standard input.</p>
+<p>Executes a system command. When the <var>os</var> attribute is specified, then the command is
+only executed when Apache Ant is run on one of the specified operating systems.</p>
+
+<p>The files and/or directories of a number of <a href="../Types/resources.html#collection">Resource
+Collection</a>s &ndash;- including but not restricted
+to <a href="../Types/fileset.html">FileSet</a>s, <a href="../Types/dirset.html">DirSet</a>s
+(<em>since Ant 1.6</em>) or <a href="../Types/filelist.html">FileList</a>s (<em>since Ant 1.6</em>)
+&ndash;- are passed as arguments to the system command.</p>
+<p>If you specify a nested <a href="../Types/mapper.html">mapper</a>, the timestamp of each source
+file is compared to the timestamp of a target file which is defined by the
+nested <code>mapper</code> element and searched for in the given <var>dest</var>, if specified.</p>
+<p>At least one <code>fileset</code> or <code>filelist</code> is required, and you must not specify
+more than one <code>mapper</code>.</p>
+
+<p>Note that you cannot interact with the forked program, the only way to send input to it is via
+the <var>input</var> and <var>inputstring</var> attributes.</p>
+
+<h4 id="background">Running Ant as a background process on Unix(-like) systems</h4>
+
+<p>If you run Ant as a background process (like <kbd>ant &amp;</kbd>) and use
+the <code>&lt;apply&gt;</code> task with <var>spawn</var> set to <q>false</q>, you must provide
+explicit input to the forked process or Ant will be suspended because it tries to read from the
+standard input.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">executable</td>
-    <td valign="top">the command to execute without any command line
-      arguments.</td>
-    <td align="center" valign="top">Yes</td>
+    <td>executable</td>
+    <td>the command to execute without any command line arguments.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">dest</td>
-    <td valign="top">the directory where the command is expected to place
-    target files when it is executed. This attribute is valid only when used
-    in conjunction with a nested mapper; if omitted, the target filenames
-    returned by the mapper will be interpreted as absolute paths.</td>
-    <td align="center" valign="top">No</td>
+    <td>dest</td>
+    <td>the directory where the command is expected to place target files when it is executed.</td>
+    <td>No; ignored unless a nested mapper is specified; by default, the target filenames returned
+      by the mapper will be interpreted as absolute paths</td>
   </tr>
   <tr>
-    <td valign="top">spawn</td>
-    <td valign="top">whether or not you want the commands to be spawned.<br>
-    If you spawn a command, its output will not be logged by ant.<br>
-    The input, output, error, and result property settings are not active when spawning a process.<br>
-    <em>since&nbsp;Ant&nbsp;1.6</em>
-    </td>
-    <td align="center" valign="top">No, default is <i>false</i></td>
+    <td>spawn</td>
+    <td>whether or not you want the commands to be spawned.<br/>  If you spawn a command, its output
+    will not be logged by Ant.<br/>  The input, output, error, and result property settings are not
+    active when spawning a process.<br/>  <em>since Ant 1.6</em></td>
+    <td>No; default is <q>false</q></td>
   </tr>
-
   <tr>
-    <td valign="top">dir</td>
-    <td valign="top">the directory in which the command should be executed.</td>
-    <td align="center" valign="top">No.<br/>
-      <strong>Note:</strong> the default used when dir has not been
-      specified depends on the <code>vmlauncher</code> attribute.  If
-      <code>vmlauncher</code> is <code>true</code> the task will use
-      the current working directory, otherwise it uses the project's basedir.
-    </td>
+    <td>dir</td>
+    <td>the directory in which the command should be executed.</td>
+    <td>No; if <var>vmlauncher</var> is <q>true</q>, defaults to the current working directory,
+      otherwise the project's <var>basedir</var></td>
   </tr>
   <tr>
-    <td valign="top">relative</td>
-    <td valign="top">whether the filenames should be passed on the
-      command line as relative pathnames (relative to the base directory
-      of the corresponding fileset/list for source files or the
-      <i>dest</i> attribute for target files).</td>
-    <td align="center" valign="top">No, default is <i>false</i></td>
+    <td>relative</td>
+    <td>whether the filenames should be passed on the command line as relative pathnames (relative
+      to the base directory of the corresponding fileset/list for source files or
+      the <var>dest</var> attribute for target files).</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">forwardslash</td>
-    <td valign="top">whether the file names should be passed
-      with forward slashes even if the operating system requires other
-      file separator. The option is ignored if the system file separator
-      is a forward slash.</td>
-    <td align="center" valign="top">No, default is <i>false</i></td>
+    <td>forwardslash</td>
+    <td>whether the file names should be passed with forward slashes even if the operating system
+      requires other file separator. The option is ignored if the system file separator is a forward
+      slash.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">os</td>
-    <td valign="top">list of Operating Systems on which the command may be
-      executed.</td>
-    <td align="center" valign="top">No</td>
+    <td>os</td>
+    <td>list of Operating Systems on which the command may be executed.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">osfamily</td>
-    <td valign="top">OS family as used in the &lt;os&gt; condition.
+    <td>osfamily</td>
+    <td>OS family as used in the <code>&lt;os&gt;</code> condition.
     <em>since Ant 1.7</em></td>
-    <td align="center" valign="top">No</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">output</td>
-    <td valign="top">the file to which the output of the command
-    should be redirected.  If the error stream is not also redirected
-    to a file or property, it will appear in this output.</td>
-    <td align="center" valign="top">No</td>
+    <td>output</td>
+    <td>the file to which the output of the command should be redirected.  If the error stream is
+    not also redirected to a file or property, it will appear in this output.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">error</td>
-    <td valign="top">The file to which the standard error of the
-    command should be redirected.  <em>since&nbsp;Ant&nbsp;1.6</em></td>
-    <td align="center" valign="top">No</td>
+    <td>error</td>
+    <td>The file to which the standard error of the command should be redirected.  <em>since Ant
+    1.6</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">logError</td>
-    <td valign="top">This attribute is used when you wish to see error
-    output in Ant's log and you are redirecting output to a
-    file/property. The error output will not be included in the output
-    file/property. If you redirect error with the &quot;error&quot; or
-    &quot;errorProperty&quot; attributes, this will have no effect.
-    <em>since&nbsp;Ant&nbsp;1.6</em></td>
-    <td align="center" valign="top">No</td>
+    <td>logError</td>
+    <td>This attribute is used when you wish to see error output in Ant's log and you are
+    redirecting output to a file/property. The error output will not be included in the output
+    file/property. If you redirect error with the <var>error</var> or <var>errorProperty</var>
+    attributes, this will have no effect.  <em>since Ant 1.6</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">append</td>
-    <td valign="top">whether output should be appended to or overwrite
-      an existing file.  If you set parallel to false, you will probably
-      want to set this one to true.</td>
-    <td align="center" valign="top">No, default is <i>false</i></td>
+    <td>append</td>
+    <td>whether output should be appended to or overwrite an existing file.  If you
+      set <var>parallel</var> to <q>false</q>, you will probably want to set this one
+      to <q>true</q>.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">outputproperty</td>
-    <td valign="top">the name of a property in which the output of the
-    command should be stored.  Unless the error stream is redirected
-    to a separate file or stream, this property will include the error
+    <td>outputproperty</td>
+    <td>the name of a property in which the output of the command should be stored.  Unless the
+    error stream is redirected to a separate file or stream, this property will include the error
     output.</td>
-    <td align="center" valign="top">No</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">errorproperty</td>
-    <td valign="top">The name of a property in which the standard error of the
-      command should be stored.  <em>since&nbsp;Ant&nbsp;1.6</em></td>
-    <td align="center" valign="top">No</td>
+    <td>errorproperty</td>
+    <td>The name of a property in which the standard error of the command should be
+      stored.  <em>since Ant 1.6</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">input</td>
-    <td valign="top">A file from which the executed command's standard
-    input is taken. This attribute is mutually exclusive with the
-    inputstring attribute.  <em>since&nbsp;Ant&nbsp;1.6</em></td>
-    <td align="center" valign="top">No</td>
+    <td>input</td>
+    <td>A file from which the executed command's standard input is taken. This attribute is mutually
+    exclusive with the <var>inputstring</var> attribute.  <em>since Ant 1.6</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">inputstring</td>
-    <td valign="top">A string which serves as the input stream for the
-    executed command. This attribute is mutually exclusive with the
-    input attribute.  <em>since&nbsp;Ant&nbsp;1.6</em></td>
-    <td align="center" valign="top">No</td>
+    <td>inputstring</td>
+    <td>A string which serves as the input stream for the executed command. This attribute is
+    mutually exclusive with the <var>input</var> attribute.  <em>since Ant 1.6</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">resultproperty</td>
-    <td valign="top">the name of a property in which the return code
-      of the command should be stored. Only of interest if
-      failonerror=false. If you set parallel to false, only the result
-      of the first execution will be stored.</td>
-    <td align="center" valign="top">No</td>
+    <td>resultproperty</td>
+    <td>the name of a property in which the return code of the command should be stored. Only of
+      interest if <var>failonerror</var> is <q>false</q>. If you set <var>parallel</var>
+      to <q>false</q>, only the result of the first execution will be stored.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">timeout</td>
-    <td valign="top">Stop the command if it doesn't finish within the
-      specified time (given in milliseconds).</td>
-    <td align="center" valign="top">No</td>
+    <td>timeout</td>
+    <td>Stop the command if it doesn't finish within the specified time (given in
+      milliseconds).</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">Stop the buildprocess if the command exits with a
-      returncode other than 0.</td>
-    <td align="center" valign="top">No</td>
+    <td>failonerror</td>
+    <td>Stop the build process if the command exits with a return code other than <q>0</q>.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">failifexecutionfails</td>
-    <td valign="top">Stop the build if we can't start the program.
-      Defaults to true. </td>
-    <td align="center" valign="top">No</td>
+    <td>failifexecutionfails</td>
+    <td>Stop the build if we can't start the program.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">skipemptyfilesets</td>
-    <td valign="top">Don't run the command, if no source files have
-      been found or are newer than their corresponding target
-      files.  Despite its name, this attribute applies to filelists as
+    <td>skipemptyfilesets</td>
+    <td>Don't run the command, if no source files have been found or are newer than their
+      corresponding target files.  Despite its name, this attribute applies to filelists as
       well.</td>
-    <td align="center" valign="top">No, default is <i>false</i></td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">parallel</td>
-    <td valign="top">Run the command only once, appending all files as
-      arguments. If false, command will be executed once for every file.</td>
-    <td align="center" valign="top">No, default is <i>false</i></td>
+    <td>parallel</td>
+    <td>Run the command only once, appending all files as arguments. If <q>false</q>, command will
+      be executed once for every file.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">type</td>
-    <td valign="top">One of <i>file</i>, <i>dir</i> or
-      <i>both</i>. If set to <i>file</i>, only the names of plain
-      files will be sent to the command. If set to <i>dir</i>, only
-      the names of directories are considered.<br>
-      <strong>Note:</strong> The type attribute does not apply to
-      nested <i>dirset</i>s - <i>dirset</i>s always implicitly
-      assume type to be <i>dir</i>.</td>
-    <td align="center" valign="top">No, default is <i>file</i></td>
+    <td>type</td>
+    <td>One of <q>file</q>, <q>dir</q> or <q>both</q>. If set to <q>file</q>, only the names of
+      plain files will be sent to the command. If set to <q>dir</q>, only the names of directories
+      are considered.<br/>
+      <strong>Note</strong>: The <var>type</var> attribute does not apply to
+      nested <code>dirset</code>s&mdash;<code>dirset</code>s always implicitly assume type to
+      be <q>dir</q>.</td>
+    <td>No; default is <q>file</q></td>
   </tr>
   <tr>
-    <td valign="top">newenvironment</td>
-    <td valign="top">Do not propagate old environment when new environment
-      variables are specified.</td>
-    <td align="center" valign="top">No, default is <i>false</i></td>
+    <td>newenvironment</td>
+    <td>Do not propagate old environment when new environment variables are specified.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">vmlauncher</td>
-    <td valign="top">Run command using the Java VM's execution facilities
-        where available. If set to false the underlying OS's shell,
-        either directly or through the antRun scripts, will be used.
-        Under some operating systems, this gives access to facilities
-        not normally available through the VM including, under Windows,
-        being able to execute scripts, rather than their associated
-        interpreter.  If you want to specify the name of the
-        executable as a relative path to the directory given by the
-        dir attribute, it may become necessary to set vmlauncher to
-        false as well.</td>
-    <td align="center" valign="top">No, default is <i>true</i></td>
+    <td>vmlauncher</td>
+    <td>Run command using the JVM's execution facilities where available. If set to <q>false</q> the
+      underlying OS's shell, either directly or through the <kbd>antRun</kbd> scripts, will be
+      used.  Under some operating systems, this gives access to facilities not normally available
+      through JVM including, under Windows, being able to execute scripts, rather than their
+      associated interpreter.  If you want to specify the name of the executable as a relative path
+      to the directory given by the <var>dir</var> attribute, it may become necessary to
+      set <var>vmlauncher</var> to <q>false</q> as well.</td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">resolveExecutable</td>
-    <td valign="top">When this attribute is true, the name of the
-    executable if resolved firstly against the project basedir and if
-    that does not exist, against the execution directory if
-    specified. On Unix systems, if you only want to allow execution of
-    commands in the user's path, set this to false.
-    <em>since&nbsp;Ant&nbsp;1.6</em></td>
-    <td align="center" valign="top">No, default is <i>false</i></td>
+    <td>resolveExecutable</td>
+    <td>When this attribute is <q>true</q>, the name of the executable if resolved firstly against
+      the project <var>basedir</var> and if that does not exist, against the execution directory if
+      specified. On Unix systems, if you only want to allow execution of commands in the user's
+      path, set this to <q>false</q>.
+    <em>since Ant 1.6</em></td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">maxparallel</td>
-    <td valign="top">Limit the amount of parallelism by passing at
-      most this many sourcefiles at once.  Set it to &lt;= 0 for
-      unlimited. <em>Since&nbsp;Ant&nbsp;1.6.</em></td>
-    <td align="center" valign="top">No, unlimited by default</td>
+    <td>maxparallel</td>
+    <td>Limit the amount of parallelism by passing at most this many sourcefiles at once.  Set it to
+      negative integer for unlimited. <em>Since Ant 1.6</em>.</td>
+    <td>No, unlimited by default</td>
   </tr>
   <tr>
-    <td valign="top">addsourcefile</td>
-    <td valign="top">Whether source file names should be added to the
-      command automatically. <em>Since&nbsp;Ant&nbsp;1.6.</em></td>
-    <td align="center" valign="top">No, default is <i>true</i></td>
+    <td>addsourcefile</td>
+    <td>Whether source file names should be added to the command automatically. <em>Since Ant
+      1.6</em>.</td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">Whether to print a summary after execution or not.
-      <em>Since&nbsp;Ant&nbsp;1.6.</em></td>
-    <td align="center" valign="top">No, default <i>false</i></td>
+    <td>verbose</td>
+    <td>Whether to print a summary after execution or not.  <em>Since Ant 1.6</em>.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">ignoremissing</td>
-    <td valign="top">Whether to ignore nonexistent files specified
-      via filelists.  <em>Since&nbsp;Ant&nbsp;1.6.2.</em></td>
-    <td align="center" valign="top">No, default is <i>true</i></td>
+    <td>ignoremissing</td>
+    <td>Whether to ignore nonexistent files specified via filelists.  <em>Since Ant 1.6.2</em>.</td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">force</td>
-    <td valign="top">Whether to bypass timestamp comparisons
-      for target files.  <em>Since&nbsp;Ant&nbsp;1.6.3.</em></td>
-    <td align="center" valign="top">No, default is <i>false</i></td>
+    <td>force</td>
+    <td>Whether to bypass timestamp comparisons for target files.  <em>Since Ant 1.6.3</em>.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 <h4>fileset</h4>
-<p>You can use any number of nested <code>&lt;fileset&gt;</code>
-elements to define the files for this task and refer to
-<code>&lt;fileset&gt;</code>s defined elsewhere.</p>
+<p>You can use any number of nested <code>&lt;fileset&gt;</code> elements to define the files for
+this task and refer to <code>&lt;fileset&gt;</code>s defined elsewhere.</p>
+
 <h4>filelist</h4>
-<p><em>Since&nbsp;Ant&nbsp;1.6</em></p>
-<p>You can use any number of nested <code>&lt;filelist&gt;</code>
-elements to define the files for this task and refer to
-<code>&lt;filelist&gt;</code>s defined elsewhere.</p>
+<p><em>Since Ant 1.6</em></p>
+<p>You can use any number of nested <code>&lt;filelist&gt;</code> elements to define the files for
+this task and refer to <code>&lt;filelist&gt;</code>s defined elsewhere.</p>
+
 <h4>dirset</h4>
-<p><em>Since&nbsp;Ant&nbsp;1.6</em></p>
-<p>You can use any number of nested <code>&lt;dirset&gt;</code>
-elements to define the directories for this task and refer to
-<code>&lt;dirset&gt;</code>s defined elsewhere.</p>
-
-<h4>Any other <a href="../Types/resources.html#collection">Resource
-Collection</a></h4>
-<p><em>since Ant 1.7</em></p>
+<p><em>Since Ant 1.6</em></p>
+<p>You can use any number of nested <code>&lt;dirset&gt;</code> elements to define the directories
+for this task and refer to <code>&lt;dirset&gt;</code>s defined elsewhere.</p>
+
+<h4>Any other <a href="../Types/resources.html#collection">resource collection</a></h4>
+<p><em>Since Ant 1.7</em></p>
 <p>You can use any number of nested resource collections.</p>
 
 <h4>mapper</h4>
-<p>A single <code>&lt;mapper&gt;</code> specifies the target files relative
-to the <code>dest</code> attribute for dependency checking. If the
-<code>dest</code> attribute is specified it will be used as a base directory
-for resolving relative pathnames returned by the mapper. At least one
+<p>A single <code>&lt;mapper&gt;</code> specifies the target files relative to the <var>dest</var>
+attribute for dependency checking. If the <var>dest</var> attribute is specified it will be used as
+a base directory for resolving relative pathnames returned by the mapper. At least one
 <code>&lt;fileset&gt;</code> or <code>&lt;filelist&gt;</code> is required.</p>
+
 <h4>arg</h4>
-<p>Command line arguments should be specified as nested
-<code>&lt;arg&gt;</code> elements. See <a
-href="../using.html#arg">Command line arguments</a>.</p>
+<p>Command line arguments should be specified as nested <code>&lt;arg&gt;</code>
+elements. See <a href="../using.html#arg">Command line arguments</a>.</p>
+
 <h4>srcfile</h4>
-<p>By default the file names of the source files will be added to the
-end of the command line (unless you set addsourcefile to
-<code>false</code>). If you need to place it somewhere different,
-use a nested <code>&lt;srcfile&gt;</code> element between your
-<code>&lt;arg&gt;</code> elements to mark the insertion point.</p>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">prefix</td>
-    <td valign="top">a prefix to place in front of the file name when
-    building the command line argument.  <em>Since Ant 1.8.0</em></td>
-    <td align="center" valign="top">No.</td>
-  </tr>
-  <tr>
-    <td valign="top">suffix</td>
-    <td valign="top">a suffix to append to the file name when
-    building the command line argument.  <em>Since Ant 1.8.0</em></td>
-    <td align="center" valign="top">No.</td>
+<p>By default the file names of the source files will be added to the end of the command line
+(unless you set <var>addsourcefile</var> to <q>false</q>). If you need to place it somewhere
+different, use a nested <code>&lt;srcfile&gt;</code> element between your <code>&lt;arg&gt;</code>
+elements to mark the insertion point.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>prefix</td>
+    <td>a prefix to place in front of the file name when building the command line
+    argument.  <em>Since Ant 1.8.0</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>suffix</td>
+    <td>a suffix to append to the file name when building the command line argument.  <em>Since Ant
+    1.8.0</em></td>
+    <td>No</td>
   </tr>
 </table>
 <h4>targetfile</h4>
-<p><code>&lt;targetfile&gt;</code> is similar to
-<code>&lt;srcfile&gt;</code> and marks the position of the target
-filename on the command line. If omitted, the target filenames will
-not be added to the command line at all. This element can only be
-specified if you also define a nested mapper.</p>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">prefix</td>
-    <td valign="top">a prefix to place in front of the file name when
-    building the command line argument.  <em>Since Ant 1.8.0</em></td>
-    <td align="center" valign="top">No.</td>
-  </tr>
-  <tr>
-    <td valign="top">suffix</td>
-    <td valign="top">a suffix to append to the file name when
-    building the command line argument.  <em>Since Ant 1.8.0</em></td>
-    <td align="center" valign="top">No.</td>
+<p><code>&lt;targetfile&gt;</code> is similar to <code>&lt;srcfile&gt;</code> and marks the position
+of the target filename on the command line. If omitted, the target filenames will not be added to
+the command line at all. This element can only be specified if you also define a nested mapper.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>prefix</td>
+    <td>a prefix to place in front of the file name when building the command line
+    argument.  <em>Since Ant 1.8.0</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>suffix</td>
+    <td>a suffix to append to the file name when building the command line argument.  <em>Since Ant
+    1.8.0</em></td>
+    <td>No</td>
   </tr>
 </table>
 <h4>env</h4>
-<p>It is possible to specify environment variables to pass to the
-system command via nested <code>&lt;env&gt;</code> elements. See the
-description in the section about <a href="exec.html#env">exec</a></p>
+<p>It is possible to specify environment variables to pass to the system command via
+nested <code>&lt;env&gt;</code> elements. See the description in the section
+about <a href="exec.html#env">exec</a></p>
 <h4>redirector</h4>
-<i><b>Since&nbsp;Ant&nbsp;1.6.2</b></i>
-<p>A nested <a href="../Types/redirector.html">I/O Redirector</a>
-can be specified.  &lt;apply&gt;'s behavior is like that of
-<a href="exec.html#redirector">exec</a> with regard to
-redirectors, with the exception that, in non-<i>parallel</i> mode,
-file mapping will take place with each iteration.  This grants the
-user the capacity to receive input from, and send output to, different
-files for each sourcefile.
-</p>
-<p>In <i>parallel</i>-mode the redirector will be reset for each batch
-  of executions (with <i>maxparallel</i> &gt; 0) and null will be used
-  a source file just like it is in the case of <code>exec</code>.</p>
+<em>Since Ant 1.6.2</em>
+<p>A nested <a href="../Types/redirector.html">I/O Redirector</a> can be specified.  &lt;apply&gt;'s
+behavior is like that of <a href="exec.html#redirector">exec</a> with regard to redirectors, with
+the exception that, in non-<var>parallel</var> mode, file mapping will take place with each
+iteration.  This grants the user the capacity to receive input from, and send output to, different
+files for each sourcefile.</p>
+<p>In <var>parallel</var> mode the redirector will be reset for each batch of executions
+(with <var>maxparallel</var> &gt; 0) and null will be used a source file just like it is in the case
+of <code>exec</code>.</p>
 <h3>Examples</h3>
-<blockquote><pre>
+<pre>
 &lt;apply executable=&quot;ls&quot;&gt;
   &lt;arg value=&quot;-l&quot;/&gt;
   &lt;fileset dir=&quot;/tmp&quot;&gt;
@@ -409,26 +359,23 @@
     &lt;/patternset&gt;
   &lt;/fileset&gt;
   &lt;fileset refid=&quot;other.files&quot;/&gt;
-&lt;/apply&gt;
-</pre></blockquote>
-<p>invokes <code>ls -l</code>, adding the absolute filenames of all
-files below <code>/tmp</code> not ending in <code>.txt</code> and all
-files of the FileSet with <code>id</code> <code>other.files</code> to
-the command line.</p>
-<blockquote><pre>
+&lt;/apply&gt;</pre>
+<p>invokes <kbd>ls -l</kbd>, adding the absolute filenames of all files below <samp>/tmp</samp> not
+ending in <samp>.txt</samp> and all files of the FileSet with <var>id</var> <samp>other.files</samp>
+to the command line.</p>
+<pre>
 &lt;apply executable=&quot;somecommand&quot; parallel=&quot;false&quot;&gt;
   &lt;arg value=&quot;arg1&quot;/&gt;
   &lt;srcfile/&gt;
   &lt;arg value=&quot;arg2&quot;/&gt;
   &lt;fileset dir=&quot;/tmp&quot;/&gt;
 &lt;/apply&gt;
-</pre></blockquote>
-<p>invokes <code>somecommand arg1 SOURCEFILENAME arg2</code> for each
-file in <code>/tmp</code> replacing SOURCEFILENAME with the absolute
-filename of each file in turn. If <code>parallel</code> had been set
-to true, SOURCEFILENAME would be replaced with the absolute filenames
-of all files separated by spaces.</p>
-<blockquote><pre>
+</pre>
+<p>invokes <code>somecommand arg1 SOURCEFILENAME arg2</code> for each file in <samp>/tmp</samp>
+replacing <code>SOURCEFILENAME</code> with the absolute filename of each file in
+turn. If <var>parallel</var> had been set to true, <code>SOURCEFILENAME</code> would be replaced
+with the absolute filenames of all files separated by spaces.</p>
+<pre>
 &lt;apply executable=&quot;cc&quot; dest=&quot;src/C&quot; parallel=&quot;false&quot;&gt;
   &lt;arg value=&quot;-c&quot;/&gt;
   &lt;arg value=&quot;-o&quot;/&gt;
@@ -436,14 +383,12 @@
   &lt;srcfile/&gt;
   &lt;fileset dir=&quot;src/C&quot; includes=&quot;*.c&quot;/&gt;
   &lt;mapper type=&quot;glob&quot; from=&quot;*.c&quot; to=&quot;*.o&quot;/&gt;
-&lt;/apply&gt;
-</pre></blockquote>
-<p>invokes <code>cc -c -o TARGETFILE SOURCEFILE</code> for each
-<code>.c</code> file that is newer than the corresponding
-<code>.o</code>, replacing TARGETFILE with the absolute filename of
-the <code>.o</code> and SOURCEFILE with the absolute name of the
-<code>.c</code> file.</p>
-<blockquote><pre>
+&lt;/apply&gt;</pre>
+<p>invokes <kbd>cc -c -o TARGETFILE SOURCEFILE</kbd> for each <samp>.c</samp> file that is newer
+than the corresponding <samp>.o</samp>, replacing <code>TARGETFILE</code> with the absolute filename
+of the <samp>.o</samp> and <code>SOURCEFILE</code> with the absolute name of the <samp>.c</samp>
+file.</p>
+<pre>
 &lt;mapper id=&quot;out&quot; type=&quot;glob&quot;
            from=&quot;src${file.separator}*.file&quot;
            to=&quot;dest${file.separator}*.out&quot;/&gt;
@@ -454,30 +399,28 @@
   &lt;redirector&gt;
     &lt;outputmapper refid=&quot;out&quot;/&gt;
   &lt;/redirector&gt;
-&lt;/apply&gt;
-</pre></blockquote>
-Applies the fictitious &quot;processfile&quot; executable to all
-files matching <code>*.file</code> in the <code>src</code> directory.
-The <code>out</code> <code>&lt;mapper&gt;</code> has been set up to map
-<code>*.file</code> to <code>*.out</code>, then this <code>&lt;mapper&gt;</code>
-is used to specify <code>targetfile</code>s for this &lt;apply&gt;
-task.  A reference to <code>out</code> is then used as an
-<code>&lt;outputmapper&gt;</code> nested in a <code>&lt;redirector&gt;</code>, which in turn is
-nested beneath this <code>&lt;apply&gt;</code> instance.  This allows us to perform
-dependency checking against output files--the target files in this case.
-<blockquote><pre>
+&lt;/apply&gt;</pre>
+<p>Applies the fictitious <kbd>processfile</kbd> executable to all files
+matching <samp>*.file</samp> in the <samp>src</samp> directory.
+The <samp>out</samp> <code>&lt;mapper&gt;</code> has been set up to map <samp>*.file</samp>
+to <samp>*.out</samp>, then this <code>&lt;mapper&gt;</code> is used to
+specify <code>targetfile</code>s for this <code>&lt;apply&gt;</code> task.  A reference
+to <samp>out</samp> is then used as an <code>&lt;outputmapper&gt;</code> nested in
+a <code>&lt;redirector&gt;</code>, which in turn is nested beneath this <code>&lt;apply&gt;</code>
+instance.  This allows us to perform dependency checking against output files&mdash;the target files
+in this case.</p>
+<pre>
 &lt;apply executable="ls" parallel="true"
        force="true" dest="${basedir}" append="true" type="both"&gt;
   &lt;path&gt;
     &lt;pathelement path="${env.PATH}"/&gt;
   &lt;/path&gt;
   &lt;identitymapper/&gt;
-&lt;/apply&gt;
-</pre></blockquote>
-Applies the "ls" executable to all directories in the PATH, effectively
-listing all executables that are available on the PATH.
+&lt;/apply&gt;</pre>
+<p>Applies the <kbd>ls</kbd> executable to all directories in the <code>PATH</code>, effectively
+listing all executables that are available on the <code>PATH</code>.</p>
 
-<blockquote><pre>
+<pre>
 &lt;apply executable="jsmin" addsourcefile="false"&gt;
     &lt;!-- Collect the JS-files --&gt;
     &lt;fileset dir="src" includes="*.js"/&gt;
@@ -488,17 +431,10 @@
         &lt;!-- redirect STDOUT to file in dest-dir --&gt;
         &lt;outputmapper id="out" type="glob" from="*.js" to="dest/*.js"/&gt;
     &lt;/redirector&gt;
-&lt;/apply&gt;
-</pre></blockquote>
-Conversion of the command <code>jsmin &lt; src/a.js &gt; dest/a.js</code> but for
-all files in the src-directory. Because the filename itself should not be passed
-to the <code>jsmin</code> program, the <code>addsourcefile</code> is set to
-<code>false</code>.
-
-
-
-
-
+&lt;/apply&gt;</pre>
+<p>Conversion of the command <kbd>jsmin &lt; src/a.js &gt; dest/a.js</kbd> but for all files in
+the <samp>src</samp> directory. Because the filename itself should not be passed to
+the <code>jsmin</code> program, the <var>addsourcefile</var> is set to <q>false</q>.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/apt.html ant-1.10.3/manual/Tasks/apt.html
--- ant-1.9.10/manual/Tasks/apt.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/apt.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,179 +0,0 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (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
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<html lang="en-us"><head>
-<meta http-equiv="Content-Language" content="en-us"><link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
-<title>Apt Task</title></head>
-
-<body>
-
-<h2><a name="Apt">Apt</a></h2>
-<h3>Description</h3>
-<p>Runs the annotation processor tool (apt), and then optionally compiles
-   the original code, and any generated source code.
-   <p>This task runs on Java 1.5 to Java 1.7.</p>
-   <p>Apt is deprecated in Java 1.6, which can run annotation
-   processors as part of javac, and removed from the distribution in Java 1.8.
-   The task will fire an exception when attempting to run under Java 1.8.</p>
-
-
-<p>This task inherits from the <a href="javac.html">Javac Task</a>, and thus
-   supports nearly all of the same attributes, and subelements.  
-   There is one special case, the <tt>fork</tt> attribute, which is present
-   but which can only be set to <tt>true</tt>. That is, apt only works as
-   a forked process.
- </p>
- <p>
-   In addition, it supports
-   the following addition items:</p>
-
-<h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tbody><tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">compile</td>
-    <td valign="top">After running the Apt, should the code be compiled.  (see the
-                     <code>-nocompile</code> flag on the Apt executable)</td>
-    <td align="center" valign="top">No, defaults to false.</td>
-  </tr>
-  <tr>
-    <td valign="top">factory</td>
-    <td valign="top">The fully qualified classname of the AnnotationProcessFactory to be used
-                     to construct annotation processors.  This represents the <code>-factory</code>
-                     command line flag of the Apt executable.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">factorypathref</td>
-    <td valign="top">The reference id of the path used to find the classes needed by the
-                     AnnotationProcessorFactory (and the location of the factory itself).
-                     This represents the <code>-factorypath</code> flag on the Apt executable.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">preprocessdir</td>
-    <td valign="top">The directory used for preprocessing.  This is the directory where the
-                     generated source code will be place.  This represents the <code>-s</code> flag on
-                     the Apt executable.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-</tbody></table>
-
-<h3>Parameters specified as nested elements</h3>
-
-
-<h4>factorypath</h4>
-
-<p>You can specify the path used to find the classes needed by the AnnotationProcessorFactory
-   at runtime, using this element.  It is represents as a generic path like structure.  This
-   represents the <code>-factorypath</code> flag on the Apt executable.</p>
-
-
-<h4>option</h4>
-
-<p>Used to represent a generic option to pass to Apt.  This represents the <code>-A</code> flag on the
-   Apt executable.  You can specify zero or more <code>&lt;option&gt;</code> elements.</p>
-
-<table border="1" cellpadding="2" cellspacing="0">
-<tbody><tr>
-  <td valign="top" width="12%"><b>Attribute</b></td>
-  <td valign="top" width="78%"><b>Description</b></td>
-  <td valign="top" width="10%"><b>Required</b></td>
-</tr>
-  <tr>
-    <td valign="top">name</td>
-    <td align="center">The name of the option</td>
-    <td align="center">Yes.</td>
-  </tr>
-  <tr>
-    <td valign="top">value</td>
-    <td align="center">The value to set the option to</td>
-    <td align="center">Yes.</td>
-  </tr>
-</tbody></table>
-
-<h3>Examples</h3>
-<blockquote><pre>
-&lt;apt srcdir="${src}"
-     destdir="${build}"
-     classpath="xyz.jar"
-     debug="on"
-     compile="true"
-     factory="com.mycom.MyAnnotationProcessorFactory"
-     factorypathref="my.factorypath.id"
-     preprocessdir="${preprocess.dir}"&gt;
-&lt;/apt&gt;
-</pre></blockquote>
-<p>compiles all <code>.java</code> files under the <code>${src}</code>
-directory, and stores
-the <code>.class</code> files in the <code>${build}</code> directory.
-The classpath used includes <code>xyz.jar</code>, and compiling with
-debug information is on.  It also forces the generated source code to
-be compiled.  The generated source code will be placed in
-<code>${preprocess.dir}</code> directory, using the class
-<code>com.mycom.MyAnnotationProcessorFactory</code> to supply
-AnnotationProcessor instances.</p>
-
-
-<h3>Notes</h3>
-
-<p>
-The inherited "fork" attribute is set to true by default; please do not change it.
-</p>
-
-<p>
-The inherited "compiler" attribute is ignored, as it is forced to use the Apt compiler
-</p>
-
-<p>Using the Apt compiler with the "compile" option set to "true"
-   forces you to use Sun's Apt compiler, which will use the JDK's Javac compiler.
-   If you wish to use another compiler, you will first need run the Apt processor
-   with the "compile" flag set to "false", and then use a
-   <code>&lt;javac&gt;</code> task to compile first your original source code, and then the
-   generated source code:</p>
-
-<blockquote><pre>
-&lt;apt srcdir="${src}"
-     destdir="${build}"
-     classpath="xyz.jar"
-     debug="true"
-     compile="false"
-     factory="com.mycom.MyAnnotationProcessorFactory"
-     factorypathref="my.factorypath.id"
-     preprocessdir="${preprocess.dir}"&gt;
-&lt;/apt&gt;
-
-&lt;javac srcdir="${src}"
-       destdir="${build}"
-       classpath="xyz.jar"
-       debug="on"/&gt;
-
-&lt;javac srcdir="${preprocess.dir}"
-       destdir="${build}"
-       classpath="xyz.jar"
-       debug="true"/&gt;
-</pre></blockquote>
-
-This may involve more build file coding, but the speedup gained from switching
-to jikes may justify the effort.
-<p>
-</p>
-
-</body></html>
diff -Nru ant-1.9.10/manual/Tasks/attrib.html ant-1.10.3/manual/Tasks/attrib.html
--- ant-1.9.10/manual/Tasks/attrib.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/attrib.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,24 +24,22 @@
 
 <body>
 
-<h2><a name="attrib">Attrib</a></h2>
-<p><em>Since Apache Ant 1.6.</em></p>
+<h2 id="attrib">Attrib</h2>
+<p><em>Since Apache Ant 1.6</em>.</p>
 <h3>Description</h3>
 
-<p>Changes the attributes of a file or all files inside specified
-directories.  Right now it has effect only under Windows. Each of the
-4 possible permissions has its own attribute, matching the arguments
-for the attrib command.</p>
-
-<p><a href="../Types/fileset.html">FileSet</a>s, 
-<a href="../Types/dirset.html">DirSet</a>s or <a
-href="../Types/filelist.html">FileList</a>s can be specified using
-nested <code>&lt;fileset&gt;</code>, <code>&lt;dirset&gt;</code> and 
-<code>&lt;filelist&gt;</code> elements.</p>
-
-<p>Starting with Ant 1.7, this task supports arbitrary <a
-href="../Types/resources.html#collection">Resource Collection</a>s
-as nested elements.</p>
+<p>Changes the attributes of a file or all files inside specified directories.  Right now it has
+effect only under Windows. Each of the 4 possible permissions has its own attribute, matching the
+arguments for the attrib command.</p>
+
+<p><a href="../Types/fileset.html">FileSet</a>s, <a href="../Types/dirset.html">DirSet</a>s
+or <a href="../Types/filelist.html">FileList</a>s can be specified using
+nested <code>&lt;fileset&gt;</code>, <code>&lt;dirset&gt;</code> and <code>&lt;filelist&gt;</code>
+elements.</p>
+
+<p><em>Since Ant 1.7</em>, this task supports
+arbitrary <a href="../Types/resources.html#collection">resource collections</a> as nested
+elements.</p>
 
 <!--p>By default this task will use a single invocation of the underlying
 attrib command.  If you are working on a large number of files this
@@ -51,117 +49,107 @@
 use highly depends on the length of your file names (the depth of your
 directory tree), so you'll have to experiment a little.</p-->
 
-<p>By default this task won't do anything unless it detects it is
-  running on a Windows system.  If you know for sure that you have a
-  "attrib" executable on your PATH that is command line compatible with
-  the Windows command, you can use the task's os attribute and set its
-  value to your current os.</p>
+<p>By default this task won't do anything unless it detects it is running on a Windows system.  If
+you know for sure that you have a <code>attrib</code> executable on your <code>PATH</code> that is
+command line compatible with the Windows command, you can use the task's <var>os</var> attribute and
+set its value to your current OS.</p>
+
+<p>See the <a href="setpermissions.html">setpermissions</a> task for a platform independent
+alternative.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">the file or directory of which the permissions must be
-    changed.</td>
-    <td valign="top" valign="middle">Yes or nested
-    <code>&lt;fileset/list&gt;</code> elements.</td>
+    <td>file</td>
+    <td>the file or directory of which the permissions must be changed.</td>
+    <td>Yes, or nested <code>&lt;fileset/list&gt;</code> elements</td>
   </tr>
   <tr>
-    <td valign="top">readonly</td>
-    <td valign="top">the readonly permission.</td>
-    <td valign="top" rowspan="4">at least one of the four. </td>
+    <td>readonly</td>
+    <td>the readonly permission.</td>
+    <td rowspan="4">At least one of the four</td>
   </tr>
   <tr>
-    <td valign="top">archive</td>
-    <td valign="top">the archive permission.</td>
+    <td>archive</td>
+    <td class="left">the archive permission.</td>
   </tr>
   <tr>
-    <td valign="top">system</td>
-    <td valign="top">the system permission.</td>
+    <td>system</td>
+    <td class="left">the system permission.</td>
   </tr>
   <tr>
-    <td valign="top">hidden</td>
-    <td valign="top">the hidden permission.</td>
+    <td>hidden</td>
+    <td class="left">the hidden permission.</td>
   </tr>
   <tr>
-    <td valign="top">type</td>
-    <td valign="top">One of <i>file</i>, <i>dir</i> or <i>both</i>. If set to
-      <i>file</i>, only the permissions of plain files are going to be changed.
-      If set to <i>dir</i>, only the directories are considered.<br>
-      <strong>Note:</strong> The type attribute does not apply to
-      nested <i>dirset</i>s - <i>dirset</i>s always implicitly
-      assume type to be <i>dir</i>.</td>
-    <td align="center" valign="top">No, default is <i>file</i></td>
+    <td>type</td>
+    <td>One of <q>file</q>, <q>dir</q> or <q>both</q>. If set to <q>file</q>, only the permissions
+      of plain files are going to be changed.  If set to <q>dir</q>, only the directories are
+      considered.<br/>
+      <strong>Note</strong>: The type attribute does not apply to
+      nested <code>dirset</code>s&mdash;<code>dirset</code>s always implicitly assume type to
+      be <q>dir</q>.</td>
+    <td>No; default is <q>file</q></td>
   </tr>
   <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">Whether to print a summary after execution or not.
-      Defaults to <code>false</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>verbose</td>
+    <td>Whether to print a summary after execution or not.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <!--tr>
-    <td valign="top">parallel</td>
-    <td valign="top">process all specified files using a single
-      <code>chmod</code> command. Defaults to true.</td>
-    <td valign="top" align="center">No</td>
+    <td>parallel</td>
+    <td>process all specified files using a single
+      <kbd>chmod</kbd> command.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">maxparallel</td>
-    <td valign="top">Limit the amount of parallelism by passing at
-      most this many sourcefiles at once.  Set it to &lt;= 0 for
-      unlimited.  Defaults to unlimited.  <em>Since Ant 1.6.</em></td>
-    <td align="center" valign="top">No</td>
+    <td>maxparallel</td>
+    <td>Limit the amount of parallelism by passing at
+      most this many sourcefiles at once.  Set it to negative integer for
+      unlimited.  <em>Since Ant 1.6</em>.</td>
+    <td>No, defaults to unlimited</td>
   </tr-->
   <tr>
-    <td valign="top">os</td>
-    <td valign="top">list of Operating Systems on which the command may be
-      executed.</td>
-    <td align="center" valign="top">No</td>
+    <td>os</td>
+    <td>list of Operating Systems on which the command may be executed.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">osfamily</td>
-    <td valign="top">OS family as used in
-      the <a href="../Tasks/conditions.html#os">&lt;os&gt;</a>
+    <td>osfamily</td>
+    <td>OS family as used in the <a href="../Tasks/conditions.html#os">&lt;os&gt;</a>
       condition.</td>
-    <td align="center" valign="top">No - defaults to "windows"</td>
+    <td>No; defaults to <q>windows</q></td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-  <blockquote>
+
 <pre>&lt;attrib file=&quot;${dist}/run.bat&quot; readonly=&quot;true&quot; hidden=&quot;true&quot;/&gt;</pre>
-</blockquote>
-<p>makes the &quot;run.bat&quot; file read-only and hidden.</p>
 
-<blockquote>
-  <pre>&lt;attrib readonly=&quot;false&quot;&gt;
+<p>makes the <code>run.bat</code> file read-only and hidden.</p>
+
+<pre>&lt;attrib readonly=&quot;false&quot;&gt;
   &lt;fileset dir=&quot;${meta.inf}&quot; includes=&quot;**/*.xml&quot;/&gt;
-&lt;/attrib&gt;
-</pre>
-</blockquote>
-<p>makes all &quot;.xml&quot; files below <code>${meta.inf}</code> readable.</p>
+&lt;/attrib&gt;</pre>
 
-<blockquote>
-  <pre>
+<p>makes all <samp>.xml</samp> files below <samp>${meta.inf}</samp> readable.</p>
+
+<pre>
 &lt;attrib readonly=&quot;true&quot; archive=&quot;true&quot;&gt;
   &lt;fileset dir=&quot;shared/sources1&quot;&gt;
     &lt;exclude name=&quot;**/trial/**&quot;/&gt;
   &lt;/fileset&gt;
   &lt;fileset refid=&quot;other.shared.sources&quot;/&gt;
-&lt;/attrib&gt;
-</pre>
-</blockquote>
-<p>makes all files below <code>shared/sources1</code> (except those below any
-  directory named trial) read-only and archived. In addition all files belonging
-  to a FileSet with <code>id</code> <code>other.shared.sources</code> get the
-  same attributes.</p>
+&lt;/attrib&gt;</pre>
 
+<p>makes all files below <samp>shared/sources1</samp> (except those below any directory
+named <samp>trial</samp>) read-only and archived. In addition all files belonging to a FileSet
+with <var>id</var> <samp>other.shared.sources</samp> get the same attributes.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/augment.html ant-1.10.3/manual/Tasks/augment.html
--- ant-1.9.10/manual/Tasks/augment.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/augment.html	2018-03-24 12:37:12.000000000 +0000
@@ -25,59 +25,49 @@
 <body>
 
 <h2>Augment</h2>
-
+<p><em>Since Apache Ant 1.8.1</em></p>
 <h3>Description</h3>
-<p>Modify an existing reference by adding nested elements or (re-)assigning properties
-mapped as XML attributes. This is an unusual task that makes use of Ant's internal
-processing mechanisms to reload a previously declared reference by means of the 'id'
-attribute, then treats the declared <code>augment</code> element as though it were the
-original element.
-<b>Since Apache Ant 1.8.1</b></p>
+<p>Modify an existing reference by adding nested elements or (re-)assigning properties mapped as XML
+attributes. This is an unusual task that makes use of Ant's internal processing mechanisms to reload
+a previously declared reference by means of the <var>id</var> attribute, then treats the
+declared <code>augment</code> element as though it were the original element.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">id</td>
-    <td valign="top">The id of the reference to augment. If no such reference has
-      been declared a <code>BuildException</code> is generated.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>id</td>
+    <td>The <var>id</var> of the reference to augment. If no such reference has been declared
+      a <code>BuildException</code> is thrown.</td>
+    <td>Yes</td>
   </tr>
 </table>
-<p>
-Additional permissible attributes are dependent on the reference to be modified.
-</p>
+<p>Additional permissible attributes are dependent on the reference to be modified.</p>
 
 <h3>Parameters specified as nested elements</h3>
 
-<p>
-Permissible nested elements are dependent on the reference to be modified.
-</p>
+<p>Permissible nested elements are dependent on the reference to be modified.</p>
 
 <h3>Examples</h3>
 
-Given
-<pre>
-  &lt;fileset id="input-fs" dir="${basedir}" /&gt;
-</pre>
+<p>Given</p>
 
-<pre>
-  &lt;augment id="input-fs" excludes="foo" /&gt;
-</pre>
+<pre>&lt;fileset id="input-fs" dir="${basedir}"/&gt;</pre>
+
+<pre>&lt;augment id="input-fs" excludes="foo"/&gt;</pre>
 
-<p>Modifies the <code>excludes</code> attribute of <code>input-fs</code>.</p>
+<p>modifies the <var>excludes</var> attribute of <samp>input-fs</samp>.</p>
 
 <pre>
-  &lt;augment id="input-fs"&gt;
-    &lt;filename name="bar" /&gt;
-  &lt;/augment&gt;
-</pre>
+&lt;augment id="input-fs"&gt;
+  &lt;filename name="bar"/&gt;
+&lt;/augment&gt;</pre>
 
-<p>Adds a <code>filename</code> selector to <code>input-fs</code>.</p>
+<p>Adds a <code>filename</code> selector to <samp>input-fs</samp>.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/available.html ant-1.10.3/manual/Tasks/available.html
--- ant-1.9.10/manual/Tasks/available.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/available.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,137 +24,126 @@
 
 <body>
 
-<h2><a name="available">Available</a></h2>
+<h2 id="available">Available</h2>
 <h3>Description</h3>
-<p>Sets a property if a resource is available at runtime. This resource can be a
-file, a directory, a class in the classpath, or a JVM system resource.</p>
-<p>If the resource is present, the property value is set to true by
-default; otherwise, the property is not set. You can set the value to
-something other than the default by specifying the <code>value</code> attribute.</p>
-<p>Normally, this task is used to set properties that are useful to avoid target
-execution depending on system parameters.</p>
+<p>Sets a property if a resource is available at run time. This resource can be a file, a directory,
+a class in the classpath, or a JVM system resource.</p>
+<p>If the resource is present, the property value is set to <q>true</q> by default; otherwise, the
+property is not set. You can set the value to something other than the default by specifying
+the <var>value</var> attribute.</p>
+<p>Normally, this task is used to set properties that are useful to avoid target execution depending
+on system parameters.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">property</td>
-    <td valign="top">The name of the property to set.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>property</td>
+    <td>The name of the property to set.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">The value to set the property to. Defaults to &quot;true&quot;.</td>
-    <td valign="top" align="center">No</td>
+    <td>value</td>
+    <td>The value to set the property to.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">classname</td>
-    <td valign="top">The class to look for in the classpath.</td>
-    <td valign="middle" align="center" rowspan="3">Yes</td>
+    <td>classname</td>
+    <td>The class to look for in the classpath.</td>
+    <td rowspan="3">Exactly one of the three</td>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">The file to look for.</td>
+    <td>file</td>
+    <td class="left">The file to look for.</td>
   </tr>
   <tr>
-    <td valign="top">resource</td>
-    <td valign="top">The resource to look for in the JVM.</td>
+    <td>resource</td>
+    <td class="left">The resource to look for in the JVM.</td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">The classpath to use when looking up <code>classname</code> or <code>resource</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>classpath</td>
+    <td>The classpath to use when looking up <var>classname</var> or <var>resource</var>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">filepath</td>
-    <td valign="top">The path to use when looking up <code>file</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>filepath</td>
+    <td>The path to use when looking up <var>file</var>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">The classpath to use, given as a <a href="../using.html#references">reference</a> to a path defined elsewhere.</td>
-    <td align="center" valign="top">No</td>
+    <td>classpathref</td>
+    <td>The classpath to use, given as a <a href="../using.html#references">reference</a> to a path
+    defined elsewhere.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">type</td>
-    <td valign="top">The type of <code>file</code> to look for, either a directory (<code>type=&quot;dir&quot;</code>) or a file
-      (<code>type=&quot;file&quot;</code>). If not set, the property will be set if the name specified in the <code>file</code>
-      attribute exists as either a file or a directory.</td>
-    <td align="center" valign="top">No</td>
+    <td>type</td>
+    <td>The type of <var>file</var> to look for, either a directory (<var>type</var>=<q>dir</q>) or
+    a file (<var>type</var>=<q>file</q>). If not set, the property will be set if the name specified
+    in the <var>file</var> attribute exists as either a file or a directory.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">ignoresystemclasses</td>
-    <td valign="top">Ignore Ant's runtime classes, using only the specified
-      classpath.  Only affects the "classname" attribute.  Defaults to &quot;false&quot;</td>
-    <td align="center" valign="top">No</td>
+    <td>ignoresystemclasses</td>
+    <td>Ignore Ant's runtime classes, using only the specified classpath.  Only affects
+    the <var>classname</var> attribute.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">searchparents</td>
-    <td valign="top">This contains the behaviour of the "file" type.
-      If true, the available task will, when
-      searching for a file, search not only the directories specified but
-      will also search the parent directories of those
-      specified.
-      If false, only the directories specified will be searched.
-      Defaults to "false".
-      <em>Since Ant 1.7</em>
-    </td>
-    <td align="center" valign="top">No</td>
+    <td>searchparents</td>
+    <td>This contains the behaviour of the <q>file</q> <var>type</var>.  If <q>true</q>, the task
+    will, when searching for a file, search not only the directories specified but will also search
+    the parent directories of those specified.  If <q>false</q>, only the directories specified will
+    be searched.  <em>Since Ant 1.7</em></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 <h4>classpath</h4>
-<p><code>Available</code>'s <code>classpath</code> attribute is a <a
-href="../using.html#path">path-like structure</a> and can also be set via a nested
+<p><code>Available</code>'s <var>classpath</var> attribute is
+a <a href="../using.html#path">path-like structure</a> and can also be set via a nested
 <code>&lt;classpath&gt;</code> element.</p>
 <h4>filepath</h4>
-<p><code>Available</code>'s <code>filepath</code> attribute is a <a
-href="../using.html#path">path-like structure</a> and can also be set via a nested
-<code>&lt;filepath&gt;</code> element.</p>
+<p><code>Available</code>'s <var>filepath</var> attribute is
+a <a href="../using.html#path">path-like structure</a> and can also be set via a
+nested <code>&lt;filepath&gt;</code> element.</p>
 <h3>Examples</h3>
-<blockquote><pre>
-&lt;available classname=&quot;org.whatever.Myclass&quot; property=&quot;Myclass.present&quot;/&gt;
-</pre></blockquote>
-<p>sets the <code>Myclass.present</code> property to the value &quot;true&quot;
-if the class <code>org.whatever.Myclass</code> is found in Ant's classpath.</p>
-<blockquote><pre>
+<pre>&lt;available classname=&quot;org.whatever.Myclass&quot; property=&quot;Myclass.present&quot;/&gt;</pre>
+<p>sets the <code>Myclass.present</code> property to the value <q>true</q> if the
+class <code>org.whatever.Myclass</code> is found in Ant's classpath.</p>
+<pre>
 &lt;property name=&quot;jaxp.jar&quot; value=&quot;./lib/jaxp11/jaxp.jar&quot;/&gt;
-&lt;available file=&quot;${jaxp.jar}&quot; property=&quot;jaxp.jar.present&quot;/&gt;
-</pre></blockquote>
-<p>sets the <code>jaxp.jar.present</code> property to the value &quot;true&quot;
-if the file <code>./lib/jaxp11/jaxp.jar</code> is found.</p>
-<blockquote><pre>
+&lt;available file=&quot;${jaxp.jar}&quot; property=&quot;jaxp.jar.present&quot;/&gt;</pre>
+<p>sets the <code>jaxp.jar.present</code> property to the value <q>true</q> if the
+file <samp>./lib/jaxp11/jaxp.jar</samp> is found.</p>
+<pre>
 &lt;available file=&quot;/usr/local/lib&quot; type=&quot;dir&quot;
-           property=&quot;local.lib.present&quot;/&gt;
-</pre></blockquote>
-<p>sets the <code>local.lib.present</code> property to the value &quot;true&quot;
-if the directory <code>/usr/local/lib</code> is found.</p>
-<blockquote><pre>
+           property=&quot;local.lib.present&quot;/&gt;</pre>
+<p>sets the <code>local.lib.present</code> property to the value <q>true</q> if the
+directory <samp>/usr/local/lib</samp> is found.</p>
+<pre>
 ...in project ...
 &lt;property name=&quot;jaxp.jar&quot; value=&quot;./lib/jaxp11/jaxp.jar&quot;/&gt;
 &lt;path id=&quot;jaxp&quot; location=&quot;${jaxp.jar}&quot;/&gt;
 ...in target ...
 &lt;available classname=&quot;javax.xml.transform.Transformer&quot;
-           classpathref=&quot;jaxp&quot; property=&quot;jaxp11.present&quot;/&gt;
-</pre></blockquote>
-<p>sets the <code>jaxp11.present</code> property to the value &quot;true&quot;
-if the class <code>javax.xml.transform.Transformer</code> is found in the classpath referenced by <code>jaxp</code> (in this case, <code>./lib/jaxp11/jaxp.jar</code>).
+           classpathref=&quot;jaxp&quot; property=&quot;jaxp11.present&quot;/&gt;</pre>
+<p>sets the <code>jaxp11.present</code> property to the value <q>true</q> if the
+class <code>javax.xml.transform.Transformer</code> is found in the classpath referenced
+by <samp>jaxp</samp> (in this case, <samp>./lib/jaxp11/jaxp.jar</samp>).
 </p>
-<blockquote><pre>
+<pre>
 &lt;available property=&quot;have.extras&quot; resource=&quot;extratasks.properties&quot;&gt;
   &lt;classpath&gt;
-    &lt;pathelement location=&quot;/usr/local/ant/extra.jar&quot; /&gt;
-&nbsp;&nbsp;&lt;/classpath&gt;
-&lt;/available&gt;
-</pre></blockquote>
-<p>sets the <code>have.extras</code> property to the value &quot;true&quot;
-if the resource-file <code>extratasks.properties</code> is found.
+    &lt;pathelement location=&quot;/usr/local/ant/extra.jar&quot;/&gt;
+  &lt;/classpath&gt;
+&lt;/available&gt;</pre>
+<p>sets the <code>have.extras</code> property to the value <q>true</q> if the resource
+file <samp>extratasks.properties</samp> is found.
 </p>
 
-
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/basename.html ant-1.10.3/manual/Tasks/basename.html
--- ant-1.9.10/manual/Tasks/basename.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/basename.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,69 +24,55 @@
 
 <body>
 
-<h2><a name="echo">Basename</a></h2>
+<h2 id="echo">Basename</h2>
+
 <h3>Description</h3>
-<p>
-Task to determine the basename of a specified file, optionally minus a
-specified suffix.
-</p>
-<p>
-When this task executes, it will set the specified property to the
-value of the last path element of the specified file. If <code>file</code> is a
-directory, the basename will be the last directory element. If
-<code>file</code> is a full-path, relative-path, or simple filename,
-the basename will be the simple file name, without any directory elements.
-</p>
-<p> 
+<p>Task to determine the basename of a specified file, optionally minus a specified suffix.</p>
+<p>When this task executes, it will set the specified property to the value of the last path element
+of the specified file. If <var>file</var> is a directory, the basename will be the last directory
+element. If <var>file</var> is a full-path, relative-path, or simple filename, the basename will be
+the simple file name, without any directory elements.</p>
+
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">The path to take the basename of.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>file</td>
+    <td>The path to take the basename of.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">property</td>
-    <td valign="top">The name of the property to set.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>property</td>
+    <td>The name of the property to set.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">suffix</td>
-    <td valign="top">The suffix to remove from the resulting basename
-      (specified either with or without the &quot;<code>.</code>&quot;).</td>
-    <td valign="top" align="center">No</td>
+    <td>suffix</td>
+    <td>The suffix to remove from the resulting basename (specified either with or without
+    the <q>.</q>).</td>
+    <td>No</td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<blockquote><pre>
-&lt;basename property=&quot;jar.filename&quot; file=&quot;${lib.jarfile}&quot;/&gt;
-</pre></blockquote>
-will set <code>jar.filename</code> to
-<code>myjar.jar</code>, if <code>lib.jarfile</code> is defined as either a
-full-path filename (eg., <code>/usr/local/lib/myjar.jar</code>),
-a relative-path filename (eg., <code>lib/myjar.jar</code>),
-or a simple filename (eg., <code>myjar.jar</code>).
-<blockquote><pre>
+<pre>&lt;basename property=&quot;jar.filename&quot; file=&quot;${lib.jarfile}&quot;/&gt;</pre>
+<p>will set <code>jar.filename</code> to <samp>myjar.jar</samp>, if <code>lib.jarfile</code> is
+defined as either a full-path filename (eg., <samp>/usr/local/lib/myjar.jar</samp>), a relative-path
+filename (eg., <samp>lib/myjar.jar</samp>), or a simple filename (eg., <samp>myjar.jar</samp>).</p>
+<pre>
 &lt;basename property=&quot;cmdname&quot; file=&quot;D:/usr/local/foo.exe&quot;
-          suffix=&quot;.exe&quot;/&gt;
-</pre></blockquote>
-will set <code>cmdname</code> to <code>foo</code>.
-<blockquote><pre>
+          suffix=&quot;.exe&quot;/&gt;</pre>
+<p>will set <code>cmdname</code> to <samp>foo</samp>.</p>
+<pre>
 &lt;property environment=&quot;env&quot;/&gt;
 &lt;basename property=&quot;temp.dirname&quot; file=&quot;${env.TEMP}&quot;/&gt;
-</pre></blockquote>
-
-will set <code>temp.dirname</code> to the last directory element of
-the path defined for the <code>TEMP</code> environment variable.</p>
-
-
+</pre>
+<p>will set <code>temp.dirname</code> to the last directory element of the path defined for
+the <code>TEMP</code> environment variable.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/bindtargets.html ant-1.10.3/manual/Tasks/bindtargets.html
--- ant-1.9.10/manual/Tasks/bindtargets.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/bindtargets.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,69 +24,59 @@
 
 <body>
 
-<h2><a name="ant">Bindtargets</a></h2>
+<h2 id="ant">Bindtargets</h2>
+<p><em>Since Apache Ant 1.8.2</em></p>
 <h3>Description</h3>
 
-<p>Make some target the extension of some defined
-<a href="../targets.html#extension-points">extension point</a>. It will make the
-list of targets dependencies of the extension point.</p>
-
-<p>This target is useful when you want to have a target participate to another
-build workflow, build workflow which explicitly expose an extension point for
-that kind of insertion. But the target to bind and the extension point to
-bind to are both declared in some imported build files. Modifying directly the
-target dependency graph of these external build files may have a side effect
-on some other project which import them. This task helps then to modify the
-target dependencies but only in your context.
-</p>
-
-<p>Note: this task is quite equivalent to the definition of an intermediate
-target which will be the bridge between the target to bind and the extension
-point. For instance:
-</p>
-<blockquote><pre>&lt;bindtargets targets="jar,javadoc" extensionPoint="dist" /&gt;</pre></blockquote>
-is quite equivalent to:
-<blockquote><pre>&lt;target name="bind-to-dist" depends="jar,javadoc" extensionOf="dist" /&gt;</pre></blockquote>
-<p>
-This task basically avoid the creation of a target.
-</p>
-
-<p>The bindtargets task may only be used as a top-level task. This means that
-it may not be used in a target. This is making the target dependency graph static
-and predictable as soon as every build file is loaded.</p>
-
-<p><b>Since Apache Ant 1.8.2</b></p>
+<p>Make some target the extension of some
+defined <a href="../targets.html#extension-points">extension point</a>. It will make the list of
+targets dependencies of the extension point.</p>
+
+<p>This target is useful when you want to have a target to participate in another build workflow
+which explicitly exposes an extension point for that kind of insertion. Thus the target to bind and
+the extension point to bind to are both declared in some imported build files. But directly
+modifying the target dependency graph of these external build files may have a side effect on some
+other project which imports them. This task helps to modify the target dependencies but only in your
+context.</p>
+
+<p><strong>Note</strong>: this task is quite equivalent to the definition of an intermediate target
+which will be the bridge between the target to bind and the extension point. For instance:</p>
+<pre>&lt;bindtargets targets="jar,javadoc" extensionPoint="dist"/&gt;</pre>
+<p>is quite equivalent to:</p>
+<pre>&lt;target name="bind-to-dist" depends="jar,javadoc" extensionOf="dist"/&gt;</pre>
+<p>This task basically avoids the creation of a target.</p>
+
+<p>The <code>bindtargets</code> task may only be used as a top-level task. This means that it may
+not be used in a target. This is making the target dependency graph static and predictable as soon
+as every build file is loaded.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">targets</td>
-    <td valign="top">a comma separated list of target names to bind.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>targets</td>
+    <td>a comma separated list of target names to bind.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">extensionPoint</td>
-    <td valign="top">the name of the extension point to bind the targets to.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>extensionPoint</td>
+    <td>the name of the extension point to bind the targets to.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">onMissingExtensionPoint</td>
-    <td valign="top">What to do if this target tries to extend a missing
-        <a href="../targets.html#extension-points">extension-point</a>. ("fail",
-        "warn", "ignore").</td>
-    <td valign="top" align="center">No. Defaults to <code>fail</code></td>
+    <td>onMissingExtensionPoint</td>
+    <td>What to do if this target tries to extend a
+    missing <a href="../targets.html#extension-points">extension-point</a>: <q>fail</q>, <q>warn</q>, <q>ignore</q>.</td>
+    <td>No; defaults to <q>fail</q></td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<blockquote><pre>
-&lt;bindtargets targets=&quot;build-jar,build-src-jar&quot; extensionPoint=&quot;dist&quot; /&gt;
-</pre></blockquote>
+<pre>&lt;bindtargets targets=&quot;build-jar,build-src-jar&quot; extensionPoint=&quot;dist&quot;/&gt;</pre>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/BorlandEJBTasks.html ant-1.10.3/manual/Tasks/BorlandEJBTasks.html
--- ant-1.9.10/manual/Tasks/BorlandEJBTasks.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/BorlandEJBTasks.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,120 +24,113 @@
 
 <body>
 
-<h2><a name="log">BorlandDeploy</a>Tool</h2>
+<h2 id="log">BorlandDeployTool</h2>
 <p>by Benoit Moussaud (<a href="mailto:benoit.moussaud@criltelecom.com">benoit.moussaud@criltelecom.com</a>)</p>
 
 
 <h3>Description</h3>
 <p>The BorlandDeployTool is a vendor specific nested element for the Ejbjar optional task.</p>
-<p>BorlandDeploymentTool is dedicated to the Borland Application Server 4.5.x and Borland
-  Enterprise Server 5.x. It  generates and compiles the stubs and skeletons for all ejb described into the
-  Deployment Descriptor, builds the jar file including the support files and
-  verify whether the produced jar is valid or not.</p>
-
-<p>Benoit Moussaud maintains a separate <a
-href="http://www.moussaud.org/ejbjar.html">FAQ</a> for this task at
-his homepage.</p>
+<p>BorlandDeployTool is dedicated to the Borland Application Server 4.5.x and Borland Enterprise
+Server 5.x. It generates and compiles the stubs and skeletons for all EJBs described in the
+Deployment Descriptor, builds the jar file including the support files and verifies whether the
+produced jar is valid or not.</p>
+
+<p>Benoit Moussaud maintains a
+separate <a href="https://web.archive.org/web/20141122083215/http://www.moussaud.org/ejbjar.html"
+target="_top">FAQ</a> for this task at his homepage.</p>
 
 <h3>Borland element</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top" width="63"><b>Attribute</b></td>
-    <td valign="top" width="915"><b>Description</b></td>
-    <td align="center" valign="top" width="62"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top" width="63">destdir</td>
-    <td valign="top" width="915">The base directory into which the generated borland
-      ready jar files are deposited</td>
-    <td align="center" valign="middle" width="62">yes</td>
+    <td>destdir</td>
+    <td>The base directory in which the generated Borland ready jar files are stored</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top" width="63">debug</td>
-    <td valign="top" width="915">If true, turn on the debug mode for each borland
-      tools (java2iiop, iastool ...) default = false</td>
-    <td align="center" valign="middle" width="62">no</td>
+    <td>debug</td>
+    <td>If <q>true</q>, turn on the debug mode for each Borland tools
+      (<code>java2iiop</code>, <code>iastool</code>, ...)</td>
+    <td>No; default <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top" width="63">verify</td>
-    <td valign="top" width="915">If true, turn on the verification at the end
-      of the jar production (default = false)</td>
-    <td align="center" valign="middle" width="62">no</td>
+    <td>verify</td>
+    <td>If <q>true</q>, turn on the verification at the end of the jar production.</td>
+    <td>No; default <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top" width="63">verifyargs</td>
-    <td valign="top" width="915">extra parameter for verify command</td>
-    <td align="center" valign="middle" width="62">no</td>
+    <td>verifyargs</td>
+    <td>extra parameter for verify command</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top" width="63">suffix</td>
-    <td valign="top" width="915">String value appended to the basename of the
-      deployment descriptor to create the filename of the Borland EJB jar file.</td>
-    <td align="center" valign="middle" width="62">No, defaults to '-ejb.jar'.</td>
+    <td>suffix</td>
+    <td>String value appended to the basename of the deployment descriptor to create the filename of
+      the Borland EJB jar file.</td>
+    <td>No; defaults to <q class="no-break">-ejb.jar</q></td>
   </tr>
   <tr>
-    <td valign="top" width="63">basdtd</td>
-    <td valign="top" width="915"><b>Deprecated</b>. Defines the location of the
-      DTD which covers the Borland specific deployment descriptors.
-      This should not be necessary if you have borland in your classpath. If you
-      do not, you should use a nested
+    <td>basdtd</td>
+    <td><em><u>Deprecated</u></em>. Defines the location of the DTD which covers the Borland
+      specific deployment descriptors.  This should not be necessary if you have borland in your
+      classpath. If you do not, you should use a nested
       <a href="ejb.html#ejbjar-dtd"><code>&lt;dtd&gt;</code></a> element, described
       in the ejbjar task documentation.</td>
-    <td align="center" valign="middle" width="62">no</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top" width="63">ejbdtd</td>
-    <td valign="top" width="915"><b>Deprecated</b>. Defines the location of the
-      ejb-jar DTD in the class hierarchy. This should not be necessary
-      if you have borland in your classpath. If you do not, you should use a
-      nested <a href="ejb.html#ejbjar-dtd"><code>&lt;dtd&gt;</code></a> element,
-      described in the ejbjar task
-      documentation. </td>
-    <td align="center" valign="middle" width="62">no</td>
-  </tr>
-  <tr>
-    <td valign="top" width="63">generateclient </td>
-    <td valign="top" width="915">If true, turn on the generation of the corresponding
-      ejbjar (default = false)</td>
-    <td align="center" valign="middle" width="62">no</td>
-  </tr>
-  <tr>
-    <td valign="top" width="63">version</td>
-    <td valign="top" width="915">set the Borland Application Version.
-            <ul>
-              <li>4 means B.A.S (Borland Application Server) 4.x, target will add ejb-inprise.xml file</li>
-              <li>5 means B.E.S (Borland Application Server) 5.x, target will add ejb-borland.xml file</li>
-            </ul>
-          </td>
-    <td align="center" valign="middle" width="62">No, defaults to 4</td>
-  </tr>
-  <tr>
-    <td valign="top" width="63">java2iiopParams </td>
-    <td valign="top" width="915">If filled, the params are added to the java2iiop command (ex: -no_warn_missing_define)</td>
-    <td align="center" valign="middle" width="62">no</td>
+    <td>ejbdtd</td>
+    <td><em><u>Deprecated</u></em>. Defines the location of the ejb-jar DTD in the class
+      hierarchy. This should not be necessary if you have borland in your classpath. If you do not,
+      you should use a nested <a href="ejb.html#ejbjar-dtd"><code>&lt;dtd&gt;</code></a> element,
+      described in the ejbjar task documentation.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>generateclient</td>
+    <td>If <q>true</q>, turn on the generation of the corresponding EJB jar.</td>
+    <td>No; default <q>false</q></td>
+  </tr>
+  <tr>
+    <td>version</td>
+    <td>set the Borland Application Version.
+      <ul>
+        <li>4 means B.A.S (Borland Application Server) 4.x, target will add ejb-inprise.xml file</li>
+        <li>5 means B.E.S (Borland Application Server) 5.x, target will add ejb-borland.xml file</li>
+      </ul>
+    </td>
+    <td>No; defaults to <q>4</q></td>
+  </tr>
+  <tr>
+    <td>java2iiopParams</td>
+    <td>If filled, the params are added to the <kbd>java2iiop</kbd> command
+    (ex: <kbd>-no_warn_missing_define</kbd>)</td>
+    <td>No</td>
   </tr>
 
 </table>
 
 <h3>Examples</h3>
-<p>The following build.xml snippet is an example of how to use Borland element
-  into the ejbjar task</p>
-<pre>    &lt;ejbjar srcdir=&quot;${build.classes}&quot; basejarname=&quot;vsmp&quot; descriptordir=&quot;${rsc.dir}/hrmanager&quot;&gt;
-        &lt;borland destdir=&quot;lib&quot; verify=&quot;on&quot; generateclient=&quot;on&quot; version=&quot;5&quot;&gt;
-          &lt;classpath refid=&quot;classpath&quot;/&gt;
-        &lt;/borland&gt;
-        &lt;include name=&quot;**\ejb-jar.xml&quot;/&gt;
-        &lt;support dir=&quot;${build.classes}&quot;&gt;
-          &lt;include name=&quot;demo\*.class&quot;/&gt;
-          &lt;include name=&quot;demo\helper\*.class&quot;/&gt;
-         &lt;/support&gt;
-     &lt;/ejbjar&gt;</pre>
-<pre>The borland element will generate into the lib dir an ejb jar file using the deployment descriptor placed into the ${rsc.dir}/hrmanager directory.
-The verify phase is turned on and the generate client phase as well.
-</pre>
-
-<h3>&nbsp;</h3>
+<p>The following <samp>build.xml</samp> snippet is an example of how to use Borland element in
+the <code>ejbjar</code> task</p>
+<pre>
+&lt;ejbjar srcdir=&quot;${build.classes}&quot; basejarname=&quot;vsmp&quot; descriptordir=&quot;${rsc.dir}/hrmanager&quot;&gt;
+    &lt;borland destdir=&quot;lib&quot; verify=&quot;on&quot; generateclient=&quot;on&quot; version=&quot;5&quot;&gt;
+        &lt;classpath refid=&quot;classpath&quot;/&gt;
+    &lt;/borland&gt;
+    &lt;include name=&quot;**\ejb-jar.xml&quot;/&gt;
+    &lt;support dir=&quot;${build.classes}&quot;&gt;
+        &lt;include name=&quot;demo\*.class&quot;/&gt;
+        &lt;include name=&quot;demo\helper\*.class&quot;/&gt;
+    &lt;/support&gt;
+&lt;/ejbjar&gt;</pre>
+<p>The <code>borland</code> element will generate into the <samp>lib</samp> directory an EJB jar
+file using the deployment descriptor placed into the <samp>${rsc.dir}/hrmanager</samp> directory.
+The verify phase is turned on and the generate client phase as well.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/BorlandGenerateClient.html ant-1.10.3/manual/Tasks/BorlandGenerateClient.html
--- ant-1.9.10/manual/Tasks/BorlandGenerateClient.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/BorlandGenerateClient.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,67 +24,64 @@
 
 <body>
 
-<h2><a name="log">BorlandGenerateClient</a></h2>
+<h2 id="log">BorlandGenerateClient</h2>
 <p>by Benoit Moussaud (<a href="mailto:benoit.moussaud@criltelecom.com">benoit.moussaud@criltelecom.com</a>)</p>
 <h3>Description</h3>
-<p>The BorlandGenerateClient is a task dedicated to Borland Application Server
-  v 4.5. It offers to generate the client jar file corresponding to an ejb jar
-  file.</p>
+<p>The BorlandGenerateClient is a task dedicated to Borland Application Server v 4.5. It offers to
+generate the client jar file corresponding to an EJB jar file.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top" width="63"><b>Attribute</b></td>
-    <td valign="top" width="915"><b>Description</b></td>
-    <td align="center" valign="top" width="62"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top" width="63">ejbjar</td>
-    <td valign="top" width="915">ejb jar file</td>
-    <td align="center" valign="middle" width="62">yes</td>
+    <td>ejbjar</td>
+    <td>EJB jar file</td>
+    <td>yes</td>
   </tr>
   <tr>
-    <td valign="top" width="63">debug</td>
-    <td valign="top" width="915">If true, turn on the debug mode for each borland
-      tools (java2iiop, iastool ...) default = false</td>
-    <td align="center" valign="middle" width="62">no</td>
+    <td>debug</td>
+    <td>If <q>true</q>, turn on the debug mode for each Borland tool
+      (<code>java2iiop</code>, <code>iastool</code>, ...)</td>
+    <td>no; default <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top" width="63">clientjar</td>
-    <td valign="top" width="915">client jar file name. If missing the client jar
-      file name is build using the ejbjar file name: ejbjar = hellobean-ejb.jar
-      =&gt; hellobean-ejbclient.jar</td>
-    <td align="center" valign="middle" width="62">no</td>
+    <td>clientjar</td>
+    <td>client jar file name. If missing the client jar file name is build using
+      the <var>ejbjar</var> file name: <var>ejbjar</var>=<q>hellobean-ejb.jar</q>
+      &rArr; <q>hellobean-ejbclient.jar</q></td>
+    <td>no</td>
   </tr>
   <tr>
-    <td valign="top" width="63">mode</td>
-    <td valign="top" width="915">choose the command launching mode. Two values:
-      java or fork. default = fork. java is not supported for version=5.Possibility to specify a classpath.</td>
-    <td align="center" valign="middle" width="62">no</td>
+    <td>mode</td>
+    <td>choose the command launching mode. Two values: <q>java</q> or <q>fork</q>
+      (default). <q>java</q> is not supported for <var>version</var>=<q>5</q>. Possibility to
+      specify a classpath.</td>
+    <td>no</td>
   </tr>
   <tr>
-    <td valign="top" width="63">version</td>
-    <td valign="top" width="915">set the Borland Application Version.
-            <ul>
-              <li>4 means B.A.S (Borland Application Server 4.x)</li>
-              <li>5 means B.E.S (Borland Application Server 5.x)</li>
-            </ul>
-          </td>
-    <td align="center" valign="middle" width="62">No, defaults to 4</td>
+    <td>version</td>
+    <td>set the Borland Application Version.
+      <ul>
+        <li><q>4</q> means B.A.S (Borland Application Server 4.x)</li>
+        <li><q>5</q> means B.E.S (Borland Application Server 5.x)</li>
+      </ul>
+    </td>
+    <td>No; defaults to <q>4</q></td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<p>The following build.xml snippet is an example of how to use Borland element
-   into the ejbjar task using the java mode.</p>
+<p>The following <samp>build.xml</samp> snippet is an example of how to use Borland element in
+the <code>ejbjar</code> task using the <q>fork</q> <var>mode</var>.</p>
 <pre>
-&lt;blgenclient ejbjar=&quot;lib/secutest-ejb.jar&quot; clientjar=&quot;lib/client.jar&quot; debug=&quot;true&quot; mode=&quot;fork&quot;&gt; version=&quot;5&quot;&gt;
+&lt;blgenclient ejbjar=&quot;lib/secutest-ejb.jar&quot; clientjar=&quot;lib/client.jar&quot; debug=&quot;true&quot; mode=&quot;fork&quot; version=&quot;5&quot;&gt;
     &lt;classpath&gt;
         &lt;pathelement location=&quot;mymodule.jar&quot;/&gt;
     &lt;/classpath&gt;
-&lt;/blgenclient&gt;
-</pre>
-<pre>&nbsp;</pre>
+&lt;/blgenclient&gt;</pre>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/buildnumber.html ant-1.10.3/manual/Tasks/buildnumber.html
--- ant-1.9.10/manual/Tasks/buildnumber.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/buildnumber.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,51 +24,37 @@
 
 <body>
 
-<h2><a name="buildnumber">BuildNumber</a></h2>
+<h2 id="buildnumber">BuildNumber</h2>
 <h3>Description</h3>
 <p>This is a basic task that can be used to track build numbers.</p>
-<p>It will first attempt to read a build number from a file (by default,
-<code>build.number</code> in the current directory), then
-set the property <code>build.number</code> to the value that was read in
-(or to <code>0</code>, if no such value). It will then increment the
-number by one and write it back out to the file.
-(See the
-<a href="../Tasks/propertyfile.html">PropertyFile</a> task
-if you need finer control over things such as the property name or
-the number format.)
-</p>
+<p>It will first attempt to read a build number from a file (by default, <samp>build.number</samp>
+in the current directory), then set the property <code>build.number</code> to the value that was
+read in (or to <q>0</q>, if no such value). It will then increment the number by one and write it
+back out to the file.  (See the <a href="../Tasks/propertyfile.html">PropertyFile</a> task if you
+need finer control over things such as the property name or the number format.)</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">The file to read and write the build number from/to.</td>
-    <td align="center" valign="top">No; defaults to &quot;build.number&quot;</td>
+    <td>file</td>
+    <td>The file to read and write the build number from/to.</td>
+    <td>No; defaults to <q>build.number</q></td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<blockquote><pre>
-&lt;buildnumber/&gt;
-</pre></blockquote>
-
-<p>Read, increment, and write a build number to the default file,
-<code>build.number</code>.</p>
-
-<blockquote><pre>
-&lt;buildnumber file=&quot;mybuild.number&quot;/&gt;
-</pre></blockquote>
+<pre>&lt;buildnumber/&gt;</pre>
 
-<p>Read, increment, and write a build number to the file
-<code>mybuild.number</code>.</p>
+<p>Read, increment, and write a build number to the default file, <samp>build.number</samp>.</p>
 
+<pre>&lt;buildnumber file=&quot;mybuild.number&quot;/&gt;</pre>
 
+<p>Read, increment, and write a build number to the file <samp>mybuild.number</samp>.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/cab.html ant-1.10.3/manual/Tasks/cab.html
--- ant-1.9.10/manual/Tasks/cab.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/cab.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,144 +24,120 @@
 
 <body>
 
-<h2><a name="cab">Cab</a></h2>
+<h2 id="cab">Cab</h2>
 <h3>Description</h3>
-<p>The cab task creates Microsoft cab archive files.  It is invoked
-similar to the <a href="../Tasks/jar.html">jar</a> or <a href="../Tasks/zip.html">zip</a> tasks.
-This task will work on Windows using the external cabarc tool (provided by Microsoft)
-which must be located in your executable path.</p>
-<p>To use this task on other platforms you need to download and compile libcabinet from
-<a href="http://trill.cis.fordham.edu/~barbacha/cabinet_library/">
-http://trill.cis.fordham.edu/~barbacha/cabinet_library/</a>.</p>
-<p>See the section on <a href="../dirtasks.html#directorybasedtasks">directory based
-tasks</a>, on how the inclusion/exclusion of files works, and how to
-write patterns.</p>
-<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and
-supports most attributes of <code>&lt;fileset&gt;</code>
-(<code>dir</code> becomes <code>basedir</code>) as well as the nested
-<code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and
-<code>&lt;patternset&gt;</code> elements.</p>
+<p>The cab task creates Microsoft cabinet archive files.  It is invoked similar to
+the <a href="../Tasks/jar.html">jar</a> or <a href="../Tasks/zip.html">zip</a> tasks.  This task
+will work on Windows using the external <kbd>cabarc</kbd> tool (provided by Microsoft) which must
+be located in your executable path.</p>
+<p>To use this task on other platforms you need to download and compile <code>libcabinet</code>
+from <a href="https://www.freshports.org/archivers/libcabinet/"
+target="_top">https://www.freshports.org/archivers/libcabinet/</a>.</p>
+<p>See the section on <a href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on
+how the inclusion/exclusion of files works, and how to write patterns.</p>
+<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and supports most
+attributes of <code>&lt;fileset&gt;</code> (<var>dir</var> becomes <var>basedir</var>) as well as
+the nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code>
+and <code>&lt;patternset&gt;</code> elements.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">cabfile</td>
-    <td valign="top">the name of the cab file to create.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>cabfile</td>
+    <td>the name of the cab file to create.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">basedir</td>
-    <td valign="top">the directory to start archiving files from.</td>
-    <td valign="top" align="center">No</td>
+    <td>basedir</td>
+    <td>the directory to start archiving files from.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">set to &quot;yes&quot; if you want to see the output from
-      the cabarc tool.  defaults to &quot;no&quot;.</td>
-    <td valign="top" align="center">No</td>
+    <td>verbose</td>
+    <td>set to <q>yes</q> if you want to see the output from the <code>cabarc</code> tool.</td>
+    <td>No; defaults to <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">compress</td>
-    <td valign="top">set to &quot;no&quot; to store files without compressing.
-      defaults to &quot;yes&quot;.</td>
-    <td valign="top" align="center">No</td>
+    <td>compress</td>
+    <td>set to <q>no</q> to store files without compressing.</td>
+    <td>No; defaults to <q>yes</q></td>
   </tr>
   <tr>
-    <td valign="top">options</td>
-    <td valign="top">use to set additional command-line options for
-      the cabarc tool.  should not normally be necessary.</td>
-    <td valign="top" align="center">No</td>
+    <td>options</td>
+    <td>set additional command-line options for the <code>cabarc</code> tool.  Should not
+      normally be necessary.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">includes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that
-      must be included. All files are included when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>includes</td>
+    <td>comma- or space-separated list of patterns of files that must be included.</td>
+    <td>No; defaults to all (<q>**</q>)</td>
   </tr>
   <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an include pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>includesfile</td>
+    <td>name of a file. Each line of this file is taken to be an include pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">excludes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that
-      must be excluded. No files (except default excludes) are excluded
-      when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>excludes</td>
+    <td>comma- or space-separated list of patterns of files that must be excluded.</td>
+    <td>No; defaults to default excludes or none if <var>defaultexcludes</var> is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an exclude pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>excludesfile</td>
+    <td>name of a file. Each line of this file is taken to be an exclude pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">defaultexcludes</td>
-    <td valign="top">indicates whether default excludes should be used
-      or not (&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>defaultexcludes</td>
+    <td>indicates whether default excludes should be used or not (<q>yes|no</q>).</td>
+    <td>No; defaults to <q>yes</q></td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 <h4>fileset</h4>
 
-<p>The cab task supports one nested <a
-href="../Types/fileset.html"><code>&lt;fileset&gt;</code></a>
-element to specify the files to be included in the archive.
-  If this is specified, the "basedir" attribute cannot be used.
-</p>
+<p>The cab task supports one nested <a href="../Types/fileset.html"><code>&lt;fileset&gt;</code></a>
+element to specify the files to be included in the archive.  If this is specified,
+the <var>basedir</var> attribute cannot be used.</p>
 
 <h3>Examples</h3>
-<blockquote><pre>
+<pre>
 &lt;cab cabfile=&quot;${dist}/manual.cab&quot;
-     basedir=&quot;htdocs/manual&quot;
-  /&gt;
-</pre></blockquote>
-<p>cabs all files in the htdocs/manual directory into a file called
-manual.cab in the ${dist} directory.</p>
-<blockquote><pre>
+     basedir=&quot;htdocs/manual&quot;/&gt;</pre>
+<p>cabs all files in the <samp>htdocs/manual</samp> directory into a file
+called <samp>manual.cab</samp> in the <samp>${dist}</samp> directory.</p>
+<pre>
 &lt;cab cabfile=&quot;${dist}/manual.cab&quot;
      basedir=&quot;htdocs/manual&quot;
-     excludes=&quot;mydocs/**, **/todo.html&quot;
-  /&gt;
-</pre></blockquote>
-<p>cabs all files in the htdocs/manual directory into a file called
-manual.cab in the ${dist} directory. Files in the directory mydocs,
-or files with the name todo.html are excluded.</p>
-<blockquote><pre>
+     excludes=&quot;mydocs/**, **/todo.html&quot;/&gt;</pre>
+<p>cabs all files in the <samp>htdocs/manual</samp> directory into a file
+called <samp>manual.cab</samp> in the <samp>${dist}</samp> directory. Files in the
+directory <samp>mydocs</samp>, or files with the name <samp>todo.html</samp> are excluded.</p>
+<pre>
 &lt;cab cabfile=&quot;${dist}/manual.cab&quot;
      basedir=&quot;htdocs/manual&quot;
      includes=&quot;api/**/*.html&quot;
      excludes=&quot;**/todo.html&quot;
-     verbose=&quot;yes&quot;
-  /&gt;
-</pre></blockquote>
-<p>Cab all files in the htdocs/manual directory into a file called
-manual.cab in the ${dist} directory. Only html files under the
-directory api are archived, and files with the name todo.html are
-excluded. Output from the cabarc tool is displayed in the build
-output.</p>
+     verbose=&quot;yes&quot;/&gt;</pre>
+<p>Cab all files in the <samp>htdocs/manual</samp> directory into a file
+called <samp>manual.cab</samp> in the <samp>${dist}</samp> directory. Only <samp>.html</samp> files
+under the directory <samp>api</samp> are archived, and files with the name <samp>todo.html</samp>
+are excluded. Output from the <code>cabarc</code> tool is displayed in the build output.</p>
 
-<blockquote><pre>
+<pre>
 &lt;cab cabfile=&quot;${dist}/manual.cab&quot;
      verbose=&quot;yes&quot;&gt;
   &lt;fileset
        dir=&quot;htdocs/manual&quot;
        includes=&quot;api/**/*.html&quot;
-       excludes=&quot;**/todo.html&quot;
-  /&gt;
-&lt;/cab&gt;
-</pre></blockquote>
+       excludes=&quot;**/todo.html&quot;/&gt;
+&lt;/cab&gt;</pre>
 <p>is equivalent to the example above.</p>
 
-
-
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/ccm.html ant-1.10.3/manual/Tasks/ccm.html
--- ant-1.9.10/manual/Tasks/ccm.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/ccm.html	2018-03-24 12:37:12.000000000 +0000
@@ -33,14 +33,18 @@
   <li><a href="#ccmcreatetask">CCMCreateTask</a></li>
 </ul>
 
-<p>These Apache Ant tasks are wrappers around Continuus Source Manager. They have been tested
-  against versions 5.1/6.2 on Windows 2000, but should work on other platforms with ccm installed.</p>
-<hr>
-<h2><a name="ccmcheckin">CCMCheckin</a></h2>
+<p>These Apache Ant tasks are wrappers
+around <a href="https://en.wikipedia.org/wiki/Rational_Synergy" target="_top">Continuus Source
+Manager</a>. They have been tested against versions 5.1/6.2 on Windows 2000, but should work on
+other platforms with <kbd>ccm</kbd> installed.</p>
+
+<hr/>
+
+<h2 id="ccmcheckin">CCMCheckin</h2>
 <h3>Description</h3>
-Task to checkin a file
+<p>Check in a file to Continuus</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0" width="598">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -53,35 +57,37 @@
   </tr>
   <tr>
     <td>comment</td>
-    <td>Specify a comment. Default is &quot;Checkin&quot; plus the date</td>
-    <td>No</td>
+    <td>Specify a comment.</td>
+    <td>No; default is <q>Checkin</q> plus the date</td>
   </tr>
   <tr>
     <td>task</td>
-    <td>Specify the task number used to check in the file (may use 'default')</td>
+    <td>Specify the task number used to check in the file (may use <q>default</q>)</td>
     <td>No</td>
   </tr>
   <tr>
     <td>ccmdir</td>
-    <td>path to the ccm executable file, required if it is not on the PATH</td>
+    <td>path to the <kbd>ccm</kbd> executable file, required if it is not on
+    the <code>PATH</code></td>
     <td>No</td>
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
-  <pre>&lt;ccmcheckin file=&quot;c:/wa/com/foo/MyFile.java&quot;
-        comment=&quot;mycomment&quot;/&gt;
-</pre>
-</blockquote>
-<p>Checks in the file <i>c:/wa/com/foo/MyFile.java</i>.
-  Comment attribute <i>mycomment</i> is added as a task comment. The task
-  used is the one set as the default.</p>
-<hr>
-<h2><a name="ccmcheckout">CCMCheckout</a></h2>
+
+<pre>
+&lt;ccmcheckin file=&quot;c:/wa/com/foo/MyFile.java&quot;
+            comment=&quot;mycomment&quot;/&gt;</pre>
+
+<p>Checks in the file <samp>c:/wa/com/foo/MyFile.java</samp>.  Text <samp>mycomment</samp> is added
+as a comment. The task used is the one set as the default.</p>
+
+<hr/>
+
+<h2 id="ccmcheckout">CCMCheckout</h2>
 <h3>Description</h3>
-Task to perform a Checkout command to Continuus
+<p>Run a Continuus checkout command</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0" width="614">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -90,59 +96,57 @@
   <tr>
     <td>file</td>
     <td>Path to the file that the command will operate on</td>
-    <td rowspan=2">Yes (file|fileset)</td>
+    <td rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
     <td>fileset</td>
-    <td>fileset containing the file to be checked out</td>
+    <td class="left">fileset containing the file to be checked out</td>
   </tr>
   <tr>
     <td>comment</td>
-    <td>Specify a comment.</td>
+    <td>Specify a comment</td>
     <td>No</td>
   </tr>
   <tr>
     <td>task</td>
-    <td>Specify the task number used to checkin the file (may use
-      'default')</td>
+    <td>Specify the task number used to checkin the file (may use <q>default</q>)</td>
     <td>No</td>
   </tr>
   <tr>
     <td>ccmdir</td>
-    <td>path to the ccm executable file, required if it is not on the PATH</td>
+    <td>path to the <kbd>ccm</kbd> executable file, required if it is not on
+    the <code>PATH</code></td>
     <td>No</td>
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
-  <pre>&lt;ccmcheckout file=&quot;c:/wa/com/foo/MyFile.java&quot;
-        comment=&quot;mycomment&quot;/&gt;
-</pre>
-</blockquote>
-<p>Check out the file <i>c:/wa/com/foo/MyFile.java</i>.
-  Comment attribute <i>mycomment</i> is added as a task comment
-   The used task is the one set as the default.</p>
-<blockquote>
-  <pre>&lt;ccmcheckout  comment=&quot;mycomment&quot;&gt;
+
+<pre>
+&lt;ccmcheckout file=&quot;c:/wa/com/foo/MyFile.java&quot;
+             comment=&quot;mycomment&quot;/&gt;</pre>
+
+<p>Check out the file <samp>c:/wa/com/foo/MyFile.java</samp>.  Comment
+attribute <samp>mycomment</samp> is added as a task comment The used task is the one set as the
+default.</p>
+
+<pre>
+&lt;ccmcheckout comment=&quot;mycomment&quot;&gt;
   &lt;fileset dir=&quot;lib&quot; &gt;
     &lt;include name=&quot;**/*.jar&quot;/&gt;
   &lt;/fileset&gt;
-&lt;/ccmcheckout &gt;
-  </pre>
-</blockquote>
-
-<p>Check out all the files in the <i>lib</i> directory having the <i>.jar</i> extension.
-  Comment attribute <i>mycomment</i> is added as a task comment
-   The used task is the one set as the default.</p>
+&lt;/ccmcheckout &gt;</pre>
 
+<p>Check out all the files in the <samp>lib</samp> directory having the <samp>.jar</samp> extension.
+Comment attribute <samp>mycomment</samp> is added as a task comment The used task is the one set as
+the default.</p>
 
+<hr/>
 
-<hr>
-<h2><a name="ccmcheckintask">CCMCheckinTask</a></h2>
+<h2 id="ccmcheckintask">CCMCheckinTask</h2>
 <h3>Description</h3>
-Task to perform a check in default task command to Continuus
+<p>Run a Continuus command to checkin default task</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -155,27 +159,29 @@
   </tr>
   <tr>
     <td>task</td>
-    <td>Specify the task number used to check in the file (may use 'default')</td>
+    <td>Specify the task number used to check in the file (may use <q>default</q>)</td>
     <td>No</td>
   </tr>
   <tr>
     <td>ccmdir</td>
-    <td >path to the ccm executable file, required if it is not on the PATH</td>
+    <td>path to the <kbd>ccm</kbd> executable file, required if it is not on
+    the <code>PATH</code></td>
     <td>No</td>
   </tr>
 </table>
-<h3>Examples </h3>
-<blockquote>
-  <pre>&lt;ccmcheckintask comment=&quot;blahblah/&gt;
-</pre>
-</blockquote>
+<h3>Examples</h3>
+
+<pre>&lt;ccmcheckintask comment=&quot;blahblah/&gt;</pre>
+
 <p>Does a Checkin default task on all the checked out files in the current task.</p>
-<hr>
-<h2><a name="ccmreconfigure">CCMReconfigure</a></h2>
+
+<hr/>
+
+<h2 id="ccmreconfigure">CCMReconfigure</h2>
 <h3>Description</h3>
-Task to perform an reconfigure command to Continuus.
+<p>Run a Continuus reconfigure/update command</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -183,13 +189,13 @@
   </tr>
   <tr>
     <td>recurse</td>
-    <td>recurse on subproject (default false)</td>
-    <td>No</td>
+    <td>recurse on subproject</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
     <td>verbose</td>
-    <td>do a verbose reconfigure operation (default false)</td>
-    <td>No</td>
+    <td>do a verbose reconfigure operation</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
     <td>ccmproject</td>
@@ -198,24 +204,26 @@
   </tr>
   <tr>
     <td>ccmdir</td>
-    <td >path to the ccm executable file, required if it is not on the PATH</td>
+    <td>path to the <kbd>ccm</kbd> executable file, required if it is not on
+    the <code>PATH</code></td>
     <td>No</td>
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
- <pre>&lt;ccmreconfigure ccmproject=&quot;ANTCCM_TEST#BMO_1&quot;
-         verbose=&quot;true&quot;/&gt;
-</pre>
-</blockquote>
-<p>Does a Continuus <i>reconfigure</i> on the project <i>ANTCCM_TEST#BMO_1</i>.
-</p>
-<hr>
-<h2><a name="ccmcreatetask">CCMCreateTask</a></h2>
+
+<pre>
+&lt;ccmreconfigure ccmproject=&quot;ANTCCM_TEST#BMO_1&quot;
+                verbose=&quot;true&quot;/&gt;</pre>
+
+<p>Does a Continuus <code>reconfigure</code> on the project <samp>ANTCCM_TEST#BMO_1</samp>.</p>
+
+<hr/>
+
+<h2 id="ccmcreatetask">CCMCreateTask</h2>
 <h3>Description</h3>
-Create a Continuus task.
+<p>Create a Continuus task.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -223,7 +231,7 @@
   </tr>
   <tr>
     <td>comment</td>
-    <td>Specify a comment.</td>
+    <td>Specify a comment</td>
     <td>No</td>
   </tr>
   <tr>
@@ -233,7 +241,8 @@
   </tr>
   <tr>
     <td>ccmdir</td>
-    <td >path to the ccm executable file, required if it is not on the PATH</td>
+    <td>path to the <kbd>ccm</kbd> executable file, required if it is not on
+    the <code>PATH</code></td>
     <td>No</td>
   </tr>
   <tr>
@@ -253,20 +262,18 @@
   </tr>
   <tr>
     <td>task</td>
-    <td>Specify the task number used to checkin the file (may use 'default')</td>
+    <td>Specify the task number used to checkin the file (may use <q>default</q>)</td>
     <td>No</td>
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
-  <pre>&lt;ccmcreatetask resolver=&quot;${user.name}&quot;
-            release=&quot;ANTCCM_TEST&quot; comment=&quot;blahblah&quot;/&gt;
-</pre>
-</blockquote>
-<p>Creates a task for the release <i>ANTCCM_TEST</i> with the
-  current user as the resolver for this task.</p>
 
+<pre>
+&lt;ccmcreatetask resolver=&quot;${user.name}&quot;
+               release=&quot;ANTCCM_TEST&quot; comment=&quot;blahblah&quot;/&gt;</pre>
 
-</body>
+<p>Creates a task for the release <samp>ANTCCM_TEST</samp> with the current user as the resolver for
+this task.</p>
 
+</body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/changelog.html ant-1.10.3/manual/Tasks/changelog.html
--- ant-1.9.10/manual/Tasks/changelog.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/changelog.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,249 +24,229 @@
 
 <body>
 
-<h2><a name="changelog">CvsChangeLog</a></h2>
+<h2 id="changelog">CvsChangeLog</h2>
 <h3>Description</h3>
-<p>Generates an XML-formatted report file of the change logs recorded in a
-<a href="http://www.nongnu.org/cvs/" target="_top">CVS</a> repository. </p>
-<p><b>Important:</b> This task needs &quot;<code>cvs</code>&quot; on the path. If it isn't, you will get
-an error (such as error <code>2</code> on windows). If <code>&lt;cvs&gt;</code> doesn't work, try to execute <code>cvs.exe</code>
-from the command line in the target directory in which you are working.
-Also note that this task assumes that the cvs executable is compatible
-with the Unix version from cvshome.org, this is not completely true
-for certain other cvs clients - like CVSNT for example - and some
-operation may fail when using such an incompatible client.
-</p>
+<p>Generates an XML-formatted report file of the change logs recorded in
+a <a href="https://www.nongnu.org/cvs/" target="_top">CVS</a> repository.</p>
+<p><strong>Important</strong>: This task needs <kbd>cvs</kbd> on the path. If it isn't, you will get
+an error (such as <code>error=2</code> on Windows). If <code>&lt;cvs&gt;</code> doesn't work, try to
+execute <kbd>cvs.exe</kbd> from the command line in the target directory in which you are working.
+Also note that this task assumes that the <kbd>cvs</kbd> executable is compatible with the Unix
+version, this is not completely true for certain other CVS clients&mdash;like CVSNT for
+example&mdash;and some operation may fail when using such an incompatible client.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td colspan="3">Attributes from parent Cvs task which are meaningful here<br>
-    Since Apache Ant 1.6.1</td>
+    <td colspan="3" class="left">Attributes from parent <code>&lt;cvs&gt;</code> task which are
+    meaningful here<br/><em>Since Apache Ant 1.6.1</em></td>
   </tr>
   <tr>
-    <td valign="top">cvsRoot</td>
-    <td valign="top">the <code>CVSROOT</code> variable.</td>
-    <td align="center" valign="top">No</td>
+    <td>cvsRoot</td>
+    <td>the <code>CVSROOT</code> variable.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">cvsRsh</td>
-    <td valign="top">the <code>CVS_RSH</code> variable.</td>
-    <td align="center" valign="top">No</td>
+    <td>cvsRsh</td>
+    <td>the <code>CVS_RSH</code> variable.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">package</td>
-    <td valign="top">the package/module to check out.  <b>Note:</b>
-      multiple attributes can be split using spaces.  Use a nested
-      &lt;module&gt; element if you want to specify a module with
-      spaces in its name.</td>
-    <td align="center" valign="top">No</td>
+    <td>package</td>
+    <td>the package/module to check out.  <strong>Note</strong>: multiple attributes can be split
+      using spaces.  Use a nested <code>&lt;module&gt;</code> element if you want to specify a
+      module with spaces in its name.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">port</td>
-    <td valign="top">Port used by CVS to communicate with the server.</td>
-    <td align="center" valign="top">No, default port 2401.</td>
+    <td>port</td>
+    <td>Port used by CVS to communicate with the server.</td>
+    <td>No; defaults to <q>2401</q></td>
   </tr>
   <tr>
-    <td valign="top">passfile</td>
-    <td valign="top">Password file to read passwords from.</td>
-    <td align="center" valign="top">No, default file <code>~/.cvspass</code>.</td>
+    <td>passfile</td>
+    <td>Password file to read passwords from.</td>
+    <td>No; defaults to <q>~/.cvspass</q></td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">Stop the build process if the command exits with a
-      return code other than <code>0</code>. Defaults to false</td>
-    <td align="center" valign="top">No</td>
+    <td>failonerror</td>
+    <td>Stop the build process if the command exits with a return code other than <q>0</q></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">tag</td>
-    <td valign="top">query the changelog for a specific branch.</td>
-    <td align="center" valign="top">No</td>
+    <td>tag</td>
+    <td>query the changelog for a specific branch.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td colspan="3">Specific attributes</td>
+    <td colspan="3" class="left">Specific attributes</td>
   </tr>
   <tr>
-    <td valign="top">dir</td>
-    <td valign="top">The directory from which to run the CVS <em>log</em>
-     command.</td>
-    <td align="center" valign="top">No; defaults to ${basedir}.</td>
+    <td>dir</td>
+    <td>The directory from which to run the <kbd>cvs log</kbd> command.</td>
+    <td>No; defaults to <q>${basedir}</q></td>
   </tr>
   <tr>
-    <td valign="top">destfile</td>
-    <td valign="top">The file in which to write the change log report.</td>
-    <td align="center" valign="top">Yes</td>
+    <td>destfile</td>
+    <td>The file in which to write the change log report.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">usersfile</td>
-    <td valign="top">Property file that contains name-value pairs mapping
-     user IDs and names that should be used in the report in place of
-     the user ID.</td>
-    <td align="center" valign="top">No</td>
+    <td>usersfile</td>
+    <td>Property file that contains name-value pairs mapping user IDs and names that should be used
+      in the report in place of the user ID.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">daysinpast</td>
-    <td valign="top">Sets the number of days into the past for which the
-     change log information should be retrieved.</td>
-    <td align="center" valign="top">No</td>
+    <td>daysinpast</td>
+    <td>Sets the number of days into the past for which the change log information should be
+      retrieved.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">start</td>
-    <td valign="top">The earliest date from which change logs are to be
-     included in the report.</td>
-    <td align="center" valign="top">No</td>
+    <td>start</td>
+    <td>The earliest date from which change logs are to be included in the report.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">end</td>
-    <td valign="top">The latest date to which change logs are to be
-     included in the report.</td>
-    <td align="center" valign="top">No</td>
+    <td>end</td>
+    <td>The latest date to which change logs are to be included in the report.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">remote</td>
-    <td valign="top">If set to true, works against the repository
-      (using rlog) without a working copy.  Default is
-      false.  <em>Since Ant 1.8.0</em></td>
-    <td align="center" valign="top">No</td>
+    <td>remote</td>
+    <td>If set to true, works against the repository (using <kbd>cvs rlog</kbd>) without a working
+      copy.  <em>Since Ant 1.8.0</em></td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">startTag</td>
-    <td valign="top">The start of a tag range. If endTag is also
-      specified, they must both be on the same branch. If endTag is not
-      specified, the end of the range will be the latest on the same
-      branch on which startTag lives.  <em>Since Ant 1.8.0</em></td>
-    <td align="center" valign="top">No</td>
+    <td>startTag</td>
+    <td>The start of a tag range. If <var>endTag</var> is also specified, they must both be on the
+      same branch. If <var>endTag</var> is not specified, the end of the range will be the latest on
+      the same branch on which <var>startTag</var> lives. <em>Since Ant 1.8.0</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">endTag</td>
-    <td valign="top">The end of a tag range. If startTag is also
-     specified, they must both be on the same branch. If startTag is
-     not specified, the start of the range will be the top of the
-     branch on which endTag lives.</td>  included in the report.
-    <em>Since Ant 1.8.0</em></td>
-    <td align="center" valign="top">No</td>
+    <td>endTag</td>
+    <td>The end of a tag range. If <var>startTag</var> is also specified, they must both be on the
+      same branch. If <var>startTag</var> is not specified, the start of the range will be the top
+      of the branch on which <var>endTag</var> lives. <em>Since Ant 1.8.0</em></td>
+    <td>No</td>
   </tr>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
-<h4><a name="user">user</a></h4>
-<p>The nested <code>&lt;user&gt;</code> element allows you to specify a
-mapping between a user ID as it appears on the CVS server and a name to
-include in the formatted report.
-Anytime the specified user ID has made a change in the repository, the
-<code>&lt;author&gt;</code> tag in the report file will include
-the name specified in <code>displayname</code> rather than the user ID.
-</p>
+<h4 id="user">user</h4>
+<p>The nested <code>&lt;user&gt;</code> element allows you to specify a mapping between a user ID as
+it appears on the CVS server and a name to include in the formatted report.  Anytime the specified
+user ID has made a change in the repository, the <code>&lt;author&gt;</code> tag in the report file
+will include the name specified in <var>displayname</var> rather than the user ID.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">displayname</td>
-    <td valign="top">The name to be used in the CVS change log report.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>displayname</td>
+    <td>The name to be used in the CVS change log report.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">userid</td>
-    <td valign="top">The userid of the person as it exists on the CVS server.
+    <td>userid</td>
+    <td>The user ID of the person as it exists on the CVS server.
     </td>
-    <td valign="top" align="center">Yes</td>
+    <td>Yes</td>
   </tr>
 </table>
 
 <h4>module</h4>
 
-<p>Specifies a package/module to work on, unlike the package attribute
-  modules specified using this attribute can contain spaces in their
-  name.</p>
+<p>Specifies a package/module to work on, unlike the package attribute modules specified using this
+attribute can contain spaces in their name.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The module's/package's name.</td>
-    <td align="center" valign="top">Yes.</td>
+    <td>name</td>
+    <td>The module's/package's name.</td>
+    <td>Yes</td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<pre>  &lt;cvschangelog dir=&quot;dve/network&quot;
-                destfile=&quot;changelog.xml&quot;
-  /&gt;</pre>
-
-<p>Generates a change log report for all the changes that have been made
-under the <code>dve/network</code> directory.
-It writes these changes into the file <code>changelog.xml</code>.</p>
-
-<pre>  &lt;cvschangelog dir=&quot;dve/network&quot;
-                destfile=&quot;changelog.xml&quot;
-                daysinpast=&quot;10&quot;
-  /&gt;</pre>
-
-<p>Generates a change log report for any changes that were made
-under the <code>dve/network</code> directory in the past 10 days.
-It writes these changes into the file <code>changelog.xml</code>.</p>
-
-<pre>  &lt;cvschangelog dir=&quot;dve/network&quot;
-                destfile=&quot;changelog.xml&quot;
-                start=&quot;20 Feb 2002&quot;
-                end=&quot;20 Mar 2002&quot;
-  /&gt;</pre>
-
-<p>Generates a change log report for any changes that were made
-between February 20, 2002 and March 20, 2002
-under the <code>dve/network</code> directory.
-It writes these changes into the file <code>changelog.xml</code>.</p>
-
-<pre>  &lt;cvschangelog dir=&quot;dve/network&quot;
-                destfile=&quot;changelog.xml&quot;
-                start=&quot;20 Feb 2002&quot;
-  /&gt;</pre>
-
-<p>Generates a change log report for any changes that were made
-after February 20, 2002 under the <code>dve/network</code> directory.
-It writes these changes into the file <code>changelog.xml</code>.</p>
-
-<pre>  &lt;cvschangelog dir=&quot;dve/network&quot;
-                destfile=&quot;changelog.xml&quot;&gt;
-       &lt;user displayname=&quot;Peter Donald&quot; userid=&quot;donaldp&quot;/&gt;
-  &lt;/cvschangelog&gt;</pre>
-
-<p>Generates a change log report for all the changes that were made
-under the <code>dve/network</code> directory, substituting the name
-&quot;Peter Donald&quot; in the <code>&lt;author&gt;</code> tags
-anytime it encounters a change made by the user ID &quot;donaldp&quot;.
-It writes these changes into the file <code>changelog.xml</code>.</p>
+<pre>
+&lt;cvschangelog dir=&quot;dve/network&quot;
+              destfile=&quot;changelog.xml&quot;/&gt;</pre>
+
+<p>Generates a change log report for all the changes that have been made under
+the <samp>dve/network</samp> directory.  It writes these changes into the
+file <samp>changelog.xml</samp>.</p>
+
+<pre>
+&lt;cvschangelog dir=&quot;dve/network&quot;
+              destfile=&quot;changelog.xml&quot;
+              daysinpast=&quot;10&quot;/&gt;</pre>
+
+<p>Generates a change log report for any changes that were made under the <samp>dve/network</samp>
+directory in the past 10 days.  It writes these changes into the
+file <samp>changelog.xml</samp>.</p>
+
+<pre>
+&lt;cvschangelog dir=&quot;dve/network&quot;
+              destfile=&quot;changelog.xml&quot;
+              start=&quot;20 Feb 2002&quot;
+              end=&quot;20 Mar 2002&quot;/&gt;</pre>
+
+<p>Generates a change log report for any changes that were made between February 20, 2002 and March
+20, 2002 under the <samp>dve/network</samp> directory.  It writes these changes into the
+file <samp>changelog.xml</samp>.</p>
+
+<pre>
+&lt;cvschangelog dir=&quot;dve/network&quot;
+              destfile=&quot;changelog.xml&quot;
+              start=&quot;20 Feb 2002&quot;/&gt;</pre>
+
+<p>Generates a change log report for any changes that were made after February 20, 2002 under
+the <samp>dve/network</samp> directory.  It writes these changes into the
+file <samp>changelog.xml</samp>.</p>
+
+<pre>
+&lt;cvschangelog dir=&quot;dve/network&quot;
+              destfile=&quot;changelog.xml&quot;&gt;
+    &lt;user displayname=&quot;Peter Donald&quot; userid=&quot;donaldp&quot;/&gt;
+&lt;/cvschangelog&gt;</pre>
+
+<p>Generates a change log report for all the changes that were made under
+the <code>dve/network</code> directory, substituting the name <samp>Peter Donald</samp> in
+the <code>&lt;author&gt;</code> tags anytime it encounters a change made by the user
+ID <samp>donaldp</samp>.  It writes these changes into the file <samp>changelog.xml</samp>.</p>
 
 <p>Generates a change log report on the <code>ANT_16_BRANCH</code>.</p>
 <pre>
- &lt;cvschangelog dir=&quot;c:/dev/asf/ant.head&quot; passfile=&quot;c:/home/myself/.cvspass&quot;
-                destfile=&quot;changelogant.xml&quot; tag=&quot;ANT_16_BRANCH&quot;/&gt;
-</pre>
+&lt;cvschangelog dir=&quot;c:/dev/asf/ant.head&quot; passfile=&quot;c:/home/myself/.cvspass&quot;
+              destfile=&quot;changelogant.xml&quot; tag=&quot;ANT_16_BRANCH&quot;/&gt;</pre>
 <h4>Generate Report</h4>
-<p>Ant includes a basic XSLT stylesheet that you can use to generate 
-a HTML report based on the xml output. The following example illustrates
-how to generate a HTML report from the XML report.</p>
+<p>Ant includes a basic XSLT stylesheet that you can use to generate a HTML report based on the xml
+output. The following example illustrates how to generate a HTML report from the XML report.</p>
 
 <pre>
-        &lt;style in="changelog.xml" 
-               out="changelog.html" 
-               style="${ant.home}/etc/changelog.xsl"&gt;
-          &lt;param name="title" expression="Ant ChangeLog"/&gt;
-          &lt;param name="module" expression="ant"/&gt;
-          &lt;param name="cvsweb" expression="http://cvs.apache.org/viewcvs/"/&gt;
-        &lt;/style&gt;
-</pre>
+&lt;style in="changelog.xml"
+      out="changelog.html"
+      style="${ant.home}/etc/changelog.xsl"&gt;
+  &lt;param name="title" expression="Ant ChangeLog"/&gt;
+  &lt;param name="module" expression="ant"/&gt;
+  &lt;param name="cvsweb" expression="http://cvs.apache.org/viewcvs/"/&gt;
+&lt;/style&gt;</pre>
 
 <h4>Sample Output</h4>
 <pre>
@@ -284,11 +264,7 @@
 
 This allows templates to be stored inside jar]]&gt;&lt;/msg&gt;
   &lt;/entry&gt;
-&lt;/changelog&gt;
-</pre>
-
-
+&lt;/changelog&gt;</pre>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/checksum.html ant-1.10.3/manual/Tasks/checksum.html
--- ant-1.9.10/manual/Tasks/checksum.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/checksum.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,246 +24,214 @@
 
 <body>
 
-<h2><a name="checksum">Checksum</a></h2>
+<h2 id="checksum">Checksum</h2>
 <h3>Description</h3>
-<p>
-Generates checksum for files.  This task can also be used to
-perform checksum verifications.
-</p>
-
-<p>Note that many popular message digest functions - including MD5 and
-SHA-1 - have been broken recently.  If you are going to use the task
-to create checksums used in an environment where security is
-important, please take some time to investigate the algorithms offered
-by your JCE provider.  Note also that some JCE providers like the one
-by <a href="http://www.bouncycastle.org/">The Legion of the Bouncy
-Castle</a>, the <a href="http://www.gnu.org/software/gnu-crypto/">GNU
-project</a> or <a
-href="http://jce.iaik.tugraz.at/products/01_jce/index.php">the
-Technical University Graz</a> offer more digest algorithms than those
-built-in into your JDK.</p>
-
-<p>
-Warning: the case of the extension is that of the algorithm used.
-If you ask for "SHA1", you get a .SHA1 extension; if you ask for "sha1", you
-get a file ending in .sha1. The Java Crypto Engines are case-insensitive
-in matching algorithms, so choose a name to match your desired output extension,
-or set the <tt>fileext</tt> attribute. The names of common hashing algorithms can be located on the
-<a target="_blank" href="http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#MessageDigest">Cryptography Architecture Standard Algorithm Name Documentation</a>
-</p>
+<p>Generates checksum for files.  This task can also be used to perform checksum verifications.</p>
+
+<p>Note that many popular message digest functions&mdash;including MD5 and SHA-1&mdash;have been
+broken recently.  If you are going to use the task to create checksums used in an environment where
+security is important, please take some time to investigate the algorithms offered by your JCE
+provider.  Note also that some JCE providers like the one by <a href="https://www.bouncycastle.org/"
+target="_top">The Legion of the Bouncy Castle</a>,
+the <a href="https://www.gnu.org/software/gnu-crypto/" target="_top">GNU Crypto project</a>
+or <a href="https://jce.iaik.tugraz.at/sic/Products" target="_top">the Technical University Graz</a>
+offer more digest algorithms than those built-in into your JDK.</p>
+
+<p>Warning: the case of the extension is that of the algorithm used.  If you ask
+for <samp>SHA1</samp>, you get a <samp>.SHA1</samp> extension; if you ask for <samp>sha1</samp>, you
+get a file ending in <samp>.sha1</samp>. The Java Crypto Engines are case-insensitive in matching
+algorithms, so choose a name to match your desired output extension, or set the <var>fileext</var>
+attribute. The names of common hashing algorithms can be located on
+the <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#MessageDigest"
+target="_top">Cryptography Architecture Standard Algorithm Name Documentation</a></p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">The file to generate checksum for.</td>
-    <td valign="top" align="center">One of either <var>file</var> or
-    at least one nested (filesystem-only) resource collection.</td>
+    <td>file</td>
+    <td>The file to generate checksum for.</td>
+    <td>Yes, unless at least one nested (filesystem-only) resource collection is specified.</td>
   </tr>
   <tr>
-    <td valign="top">todir</td>
-    <td valign="top">The root directory where checksums should be written.</td>
-    <td valign="top" align="center">No. If not specified, checksum files
-      will be written to the same directory as the files themselves.
-      <em>since Apache Ant 1.6</em>
+    <td>todir</td>
+    <td>The root directory where checksums should be written.</td>
+    <td>No; by default, checksum files will be written to the same directory as the original
+      files.  <em>since Apache Ant 1.6</em>
     </td>
   </tr>
   <tr>
-    <td valign="top">algorithm</td>
-    <td valign="top">Specifies the algorithm to be used to
-      compute the checksum. Defaults to &quot;MD5&quot;.
-      Other <a target="_blank" href="http://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#MessageDigest">popular algorithms</a> like &quot;SHA&quot; or &quot;SHA-512&quot; may be used
-      as well.
+    <td>algorithm</td>
+    <td>Specifies the algorithm to be used to compute the checksum. Please check
+      the <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#MessageDigest"
+      target="_top">documentation</a> for available algorithm names, like <q>SHA-1</q>
+      or <q>SHA-512</q>.
     </td>
-    <td valign="top" align="center">No</td>
+    <td>No; defaults to <q>MD5</q></td>
   </tr>
   <tr>
-    <td valign="top">provider</td>
-    <td valign="top">Specifies the provider of the algorithm.</td>
-    <td valign="top" align="center">No</td>
+    <td>provider</td>
+    <td>Specifies the provider of the algorithm.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">fileext</td>
-    <td valign="top">The generated checksum file's name will be the
-    original filename with the fileext added to it.
-    Defaults to a "." and the algorithm name being used.
+    <td>fileext</td>
+    <td>The generated checksum file's name will be the original filename with the <var>fileext</var>
+      added to it.
     </td>
-    <td valign="top" align="center">No</td>
+    <td>No; defaults to a <q>.</q> and the algorithm name being used</td>
   </tr>
   <tr>
-    <td valign="top">property</td>
-    <td valign="top">This attribute can mean two different things, it
-    depends on the presence of the verifyproperty attribute.<br>
-    <b>If you don't set the verifyproperty attribute</b>, property
-    specifies the name of the property to be set with the generated
-    checksum value.<br>
-    <b>If you set the verifyproperty attribute</b>, property specifies
-    the checksum you expect to be generated (the checksum itself, not
-    a name of a property containing the checksum).<br>
-    This cannot be specified when fileext is being used or when the
-    number of files for which checksums is to be generated is greater
-    than 1.
+    <td>property</td>
+    <td>This attribute can mean two different things, it depends on the presence of
+      the <var>verifyproperty</var> attribute.<br/><strong>If you don't set</strong>
+      the <var>verifyproperty</var> attribute, property specifies the name of the property to be set
+      with the generated checksum value.<br/><strong>If you set</strong>
+      the <var>verifyproperty</var> attribute, property specifies the checksum you expect to be
+      generated (the checksum itself, not a name of a property containing the checksum).<br/>  This
+      cannot be specified when <var>fileext</var> is being used or when the number of files for
+      which checksums are to be generated is greater than 1.
     </td>
-    <td valign="top" align="center">No</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>pattern</td>
+    <td>Specifies the pattern to use as a pattern suitable
+    for <a href="https://docs.oracle.com/javase/8/docs/api/java/text/MessageFormat.html"
+    target="_top">MessageFormat</a> where <code>{0}</code> is replaced with the checksum
+    and <code>{1}</code> with the file name. <em>Since Ant 1.7.0</em><br/><em>Since Ant
+    1.8.2</em> <code>{2}</code> is replaced by the path of the file relative to the checksum file
+    being written, <code>{3}</code> with the path of the file relative to the
+    project's <var>basedir</var> and <code>{4}</code> with the absolute path of the file.</td>
+    <td>No; default is <q>{0}</q></td>
   </tr>
   <tr>
-    <td valign="top">pattern</td>
-    <td valign="top">Specifies the pattern to use as a pattern
-    suitable
-    for <a href="http://download.oracle.com/javase/6/docs/api/java/text/MessageFormat.html">MessageFormat</a>
-    where <code>{0}</code> is replaced with the checksum and
-      <code>{1}</code> with the file name. <em>Since Ant
-      1.7.0</em><br/>
-      <em>starting with Ant 1.8.2</em> <code>{2}</code> is replaced by
-      the path of the file relative to the checksum file being
-      written, <code>{3}</code> with tha path of the file relative to
-      the project's basedir and <code>{4}</code> with the absolute
-      path of the file.</td>
-    <td valign="top" align="center">No - default is &quot;{0}&quot;.</td>
-  </tr>
-  <tr>
-    <td valign="top">format</td>
-    <td valign="top">Specifies the pattern to use as one of a
-    well-known format.  Supported values are 
-      <table border="1">
+    <td>format</td>
+    <td>Specifies the pattern to use as one of a well-known format.  Supported values are
+      <table>
       <tr>
         <th>name</th>
         <th>pattern</th>
         <th>description</th>
       </tr>
       <tr>
-        <td>CHECKSUM </td>
-        <td><tt>{0}</tt></td>
-        <td>only the checksum itself </td>
+        <td>CHECKSUM</td>
+        <td><code>{0}</code></td>
+        <td>only the checksum itself</td>
       </tr>
       <tr>
-        <td>MD5SUM </td>
-        <td><tt>{0} *{1}</tt></td>
-        <td>the format of GNU textutils md5sum</td>
+        <td>MD5SUM</td>
+        <td><code>{0} *{1}</code></td>
+        <td>the format of GNU textutils <code>md5sum</code></td>
       </tr>
       <tr>
-        <td>SVF </td>
-        <td><tt>MD5 ({1}) = {0}</tt></td>
-        <td>the format of BSDs md5 command </td>
+        <td>SVF</td>
+        <td><code>MD5 ({1}) = {0}</code></td>
+        <td>the format of BSD <code>md5</code> command</td>
       </tr>
       </table>
-       <em>Since Ant 1.7.0</em>
-    </td>
-    <td valign="top" align="center">No - default is &quot;CHECKSUM&quot;.</td>
+      <em>Since Ant 1.7.0</em></td>
+    <td>No; default is <q>CHECKSUM</q></td>
   </tr>
   <tr>
-    <td valign="top">totalproperty</td>
-    <td valign="top">If specified, this attribute specifies the name of
-      the property that will hold a checksum of all the checksums and
-      file paths. The individual checksums and the relative paths to the files
-      within the resource collections in which they are defined will be used to
-      compute this checksum. (The file separators in the paths will be
-      converted to '/' before computation to ensure platform portability).
-      <em>since Ant 1.6</em>
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>totalproperty</td>
+    <td>If specified, this attribute specifies the name of the property that will hold a checksum of
+      all the checksums and file paths. The individual checksums and the relative paths to the files
+      within the resource collections in which they are defined will be used to compute this
+      checksum. (The file separators in the paths will be converted to <q>/</q> before computation
+      to ensure platform portability).  <em>since Ant 1.6</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>forceoverwrite</td>
+    <td>Overwrite existing files even if the destination files are newer.</td>
+    <td>No; defaults to <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">forceoverwrite</td>
-    <td valign="top">Overwrite existing files even if the destination
-      files are newer. Defaults to &quot;no&quot;.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">verifyproperty</td>
-    <td valign="top">Specifies the name of the property to be set
-    with &quot;true&quot; or &quot;false&quot; depending upon whether
-    the generated checksum matches the existing checksum.  When
-    this is set, the generated checksum is not written to a file or
-    property, but rather, the content of the file or property is used to
-    check against the generated checksum.
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">readbuffersize</td>
-    <td valign="top">The size of the buffer (in bytes) to use when
-    reading a file. Defaults to &quot;8192&quot; - you may get a
-    better performance on big files if you increase this value.</td>
-    <td valign="top" align="center">No</td>
+    <td>verifyproperty</td>
+    <td>Specifies the name of the property to be set with <q>true</q> or <q>false</q> depending upon
+      whether the generated checksum matches the existing checksum.  When this is set, the generated
+      checksum is not written to a file or property, but rather, the content of the file or property
+      is used to check against the generated checksum.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>readbuffersize</td>
+    <td>The size of the buffer (in bytes) to use when reading a file.</td>
+    <td>No; defaults to <q>8192</q>&mdash;you may get a better performance on big files if you
+      increase this value</td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 
-<h4>resource collection</h4>
- <p>
- <a href="../Types/resources.html#collection">Resource collections</a> are
- used to select files for which checksums should be generated.
- </p>
+<h4>resource collections</h4>
+<p><a href="../Types/resources.html#collection">Resource collections</a> are used to select files
+for which checksums should be generated.</p>
 
 <h3>Examples</h3>
-<p><b>Example 1</b></p>
-<blockquote><pre>&lt;checksum file=&quot;foo.bar&quot;/&gt;</pre></blockquote>
-Generates a MD5 checksum for foo.bar and stores the checksum in the destination file
-foo.bar.MD5.  foo.bar.MD5 is overwritten only if foo.bar is newer than itself.
-
-<p><b>Example 2</b></p>
-<blockquote><pre>&lt;checksum file=&quot;foo.bar&quot; forceOverwrite=&quot;yes&quot;/&gt;</pre></blockquote>
-Generates a MD5 checksum for foo.bar and stores the checksum in foo.bar.MD5.
-If foo.bar.MD5 already exists, it is overwritten.
-
-<p><b>Example 3</b></p>
-<blockquote><pre>&lt;checksum file=&quot;foo.bar&quot; property=&quot;foobarMD5&quot;/&gt;</pre></blockquote>
-Generates a MD5 checksum for foo.bar and stores it in the Project Property foobarMD5.
-
-<p><b>Example 4</b></p>
-<blockquote><pre>&lt;checksum file=&quot;foo.bar&quot; verifyProperty=&quot;isMD5ok&quot;/&gt;</pre></blockquote>
-Generates a MD5 checksum for foo.bar, compares it against foo.bar.MD5 and sets
-isMD5ok to either true or false, depending upon the result.
-
-<p><b>Example 5</b></p>
-<blockquote><pre>&lt;checksum file=&quot;foo.bar&quot; algorithm=&quot;SHA-512&quot; fileext=&quot;asc&quot;/&gt;</pre></blockquote>
-Generates a SHA-512 checksum for foo.bar and stores the checksum in the destination file
-foo.bar.asc.  foo.bar.asc is overwritten only if foo.bar is newer than itself.
-
-<p><b>Example 6</b></p>
-<blockquote><pre>
-&lt;checksum file=&quot;foo.bar&quot; property=&quot;${md5}&quot; verifyProperty=&quot;isEqual&quot;/&gt;
-</pre></blockquote>
-Generates a MD5 checksum for foo.bar, compares it against the value of the property
-md5, and sets isEqual to either true or false, depending upon the result.
+<p><strong>Example 1</strong></p>
+<pre>&lt;checksum file=&quot;foo.bar&quot;/&gt;</pre>
+<p>Generates a MD5 checksum for <samp>foo.bar</samp> and stores the checksum in the destination
+file <samp>foo.bar.MD5</samp>.  <samp>foo.bar.MD5</samp> is overwritten only if <samp>foo.bar</samp>
+is newer than itself.</p>
+
+<p><strong>Example 2</strong></p>
+<pre>&lt;checksum file=&quot;foo.bar&quot; forceOverwrite=&quot;yes&quot;/&gt;</pre>
+<p>Generates a MD5 checksum for <samp>foo.bar</samp> and stores the checksum
+in <samp>foo.bar.MD5</samp>.  If <samp>foo.bar.MD5</samp> already exists, it is overwritten.</p>
+
+<p><strong>Example 3</strong></p>
+<pre>&lt;checksum file=&quot;foo.bar&quot; property=&quot;foobarMD5&quot;/&gt;</pre>
+<p>Generates a MD5 checksum for <samp>foo.bar</samp> and stores it in the project
+property <code>foobarMD5</code>.</p>
+
+<p><strong>Example 4</strong></p>
+<pre>&lt;checksum file=&quot;foo.bar&quot; verifyProperty=&quot;isMD5ok&quot;/&gt;</pre>
+<p>Generates a MD5 checksum for <samp>foo.bar</samp>, compares it against <samp>foo.bar.MD5</samp>
+and sets <code>isMD5ok</code> to either <q>true</q> or <q>false</q>, depending upon the result.</p>
+
+<p><strong>Example 5</strong></p>
+<pre>&lt;checksum file=&quot;foo.bar&quot; algorithm=&quot;SHA-512&quot; fileext=&quot;asc&quot;/&gt;</pre>
+<p>Generates a SHA-512 checksum for <samp>foo.bar</samp> and stores the checksum in the destination
+file <samp>foo.bar.asc</samp>.  <samp>foo.bar.asc</samp> is overwritten only if <samp>foo.bar</samp>
+is newer than itself.</p>
+
+<p><strong>Example 6</strong></p>
+<pre>&lt;checksum file=&quot;foo.bar&quot; property=&quot;${md5}&quot; verifyProperty=&quot;isEqual&quot;/&gt;</pre>
+<p>Generates a MD5 checksum for <samp>foo.bar</samp>, compares it against the value of the
+property <code>md5</code>, and sets <code>isEqual</code> to either <q>true</q> or <q>false</q>,
+depending upon the result.</p>
 
-<p><b>Example 7</b></p>
-<blockquote><pre>
+<p><strong>Example 7</strong></p>
+<pre>
 &lt;checksum&gt;
   &lt;fileset dir=&quot;.&quot;&gt;
     &lt;include name=&quot;foo*&quot;/&gt;
   &lt;/fileset&gt;
-&lt;/checksum&gt;
-</pre></blockquote>
-Works just like Example 1, but generates a .MD5 file for every file that begins with the name foo.
+&lt;/checksum&gt;</pre>
+<p>Works just like Example 1, but generates a <samp>.MD5</samp> file for every file that begins with
+the name <samp>foo</samp>.</p>
 
-<p><b>Example 8</b></p>
-<blockquote><pre>
+<p><strong>Example 8</strong></p>
+<pre>
 &lt;condition property=&quot;isChecksumEqual&quot;&gt;
   &lt;checksum&gt;
     &lt;fileset dir=&quot;.&quot;&gt;
       &lt;include name=&quot;foo.bar&quot;/&gt;
     &lt;/fileset&gt;
   &lt;/checksum&gt;
-&lt;/condition&gt;
-</pre></blockquote>
-Works like Example 4, but only sets isChecksumEqual to true, if the
-checksum matches - it will never be set to false.  This example
-demonstrates use with the Condition task.
-
-
-<h3>Note:</h3>
-When working with more than one file, if condition and/or verifyproperty is used,
-the result will be true only if the checksums matched correctly for all files being
-considered.
-
-
+&lt;/condition&gt;</pre>
+<p>Works like Example 4, but only sets <code>isChecksumEqual</code> to <q>true</q>, if the checksum
+matches&mdash;it will never be set to <q>false</q>.  This example demonstrates use with
+the <code>condition</code> task.</p>
+
+<h3>Note</h3>
+<p>When working with more than one file, if condition and/or <var>verifyproperty</var> is used, the
+result will be true only if the checksums matched correctly for all files being considered.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/chgrp.html ant-1.10.3/manual/Tasks/chgrp.html
--- ant-1.9.10/manual/Tasks/chgrp.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/chgrp.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,125 +24,105 @@
 
 <body>
 
-<h2><a name="Chgrp">Chgrp</a></h2>
-<p><em>Since Apache Ant 1.6.</em></p>
+<h2 id="chgrp">Chgrp</h2>
+<p><em>Since Apache Ant 1.6</em>.</p>
 <h3>Description</h3>
 
-<p>Changes the group of a file or all files inside specified
-directories. Right now it has effect only under Unix.  The group
-attribute is equivalent to the corresponding argument for the chgrp
-command.</p>
-
-<p><a href="../Types/fileset.html">FileSet</a>s, 
-<a href="../Types/dirset.html">DirSet</a>s or <a
-href="../Types/filelist.html">FileList</a>s can be specified using
-nested <code>&lt;fileset&gt;</code>, <code>&lt;dirset&gt;</code> and 
-<code>&lt;filelist&gt;</code> elements.</p>
-
-<p>Starting with Ant 1.7, this task supports arbitrary <a
-href="../Types/resources.html#collection">Resource Collection</a>s
-as nested elements.</p>
-
-<p>By default this task will use a single invocation of the underlying
-chgrp command.  If you are working on a large number of files this may
-result in a command line that is too long for your operating system.
-If you encounter such problems, you should set the maxparallel
-attribute of this task to a non-zero value.  The number to use highly
-depends on the length of your file names (the depth of your directory
-tree) and your operating system, so you'll have to experiment a
-little.  POSIX recommends command line length limits of at least 4096
-characters, this may give you an approximation for the number you
-could use as initial value for these experiments.</p>
-
-<p>By default this task won't do anything unless it detects it is
-  running on a Unix system.  If you know for sure that you have a
-  "chgrp" executable on your PATH that is command line compatible with
-  the Unix command, you can use the task's os attribute and set its
-  value to your current os.</p>
+<p>Changes the group of a file or all files inside specified directories. Right now it has effect
+only under Unix.  The group attribute is equivalent to the corresponding argument for
+the <kbd>chgrp</kbd> command.</p>
+
+<p><a href="../Types/fileset.html">FileSet</a>s, <a href="../Types/dirset.html">DirSet</a>s
+or <a href="../Types/filelist.html">FileList</a>s can be specified using
+nested <code>&lt;fileset&gt;</code>, <code>&lt;dirset&gt;</code> and <code>&lt;filelist&gt;</code>
+elements.</p>
+
+<p><em>Since Ant 1.7</em>, this task supports
+arbitrary <a href="../Types/resources.html#collection">resource collections</a> as nested
+elements.</p>
+
+<p>By default this task will use a single invocation of the underlying <kbd>chgrp</kbd> command.
+If you are working on a large number of files this may result in a command line that is too long for
+your operating system.  If you encounter such problems, you should set the <var>maxparallel</var>
+attribute of this task to a non-zero value.  The number to use highly depends on the length of your
+file names (the depth of your directory tree) and your operating system, so you'll have to
+experiment a little.  POSIX recommends command line length limits of at least 4096 characters, this
+may give you an approximation for the number you could use as initial value for these
+experiments.</p>
+
+<p>By default this task won't do anything unless it detects it is running on a Unix system.  If you
+know for sure that you have a <kbd>chgrp</kbd> executable on your <code>PATH</code> that is
+command line compatible with the Unix command, you can use the task's <var>os</var> attribute and
+set its value to your current OS.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">the file or directory of which the group must be
-    changed.</td>
-    <td valign="top" valign="middle">Yes, unless nested
-      <code>&lt;fileset|filelist|dirset&gt;</code>
-      elements are specified</td>
+    <td>file</td>
+    <td>the file or directory of which the group must be changed.</td>
+    <td>Yes, unless nested <code>&lt;fileset|filelist|dirset&gt;</code> elements are specified</td>
   </tr>
   <tr>
-    <td valign="top">group</td>
-    <td valign="top">the new group.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>group</td>
+    <td>the new group.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">parallel</td>
-    <td valign="top">process all specified files using a single
-      <code>chgrp</code> command. Defaults to true.</td>
-    <td valign="top" align="center">No</td>
+    <td>parallel</td>
+    <td>process all specified files using a single <kbd>chgrp</kbd> command.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">type</td>
-    <td valign="top">One of <i>file</i>, <i>dir</i> or
-      <i>both</i>. If set to <i>file</i>, only the group of
-      plain files are going to be changed. If set to <i>dir</i>, only
-      the directories are considered.<br>
-      <strong>Note:</strong> The type attribute does not apply to
-      nested <i>dirset</i>s - <i>dirset</i>s always implicitly
-      assume type to be <i>dir</i>.</td>
-    <td align="center" valign="top">No, default is <i>file</i></td>
+    <td>type</td>
+    <td>One of <q>file</q>, <q>dir</q> or <q>both</q>. If set to <q>file</q>, only the group of
+      plain files are going to be changed. If set to <q>dir</q>, only the directories are
+      considered.<br/><strong>Note</strong>: The type attribute does not apply to
+      nested <code>dirset</code>s&mdash;<code>dirset</code>s always implicitly assume type to
+      be <q>dir</q>.</td>
+    <td>No; default is <q>file</q></td>
   </tr>
   <tr>
-    <td valign="top">maxparallel</td>
-    <td valign="top">Limit the amount of parallelism by passing at
-      most this many sourcefiles at once.  Set it to &lt;= 0 for
-      unlimited.  Defaults to unlimited.</td>
-    <td align="center" valign="top">No</td>
-
+    <td>maxparallel</td>
+    <td>Limit the amount of parallelism by passing at most this many sourcefiles at once.  Set it to
+      negative integer for unlimited.</td>
+    <td>No; defaults to unlimited</td>
   </tr>
   <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">Whether to print a summary after execution or not.
-      Defaults to <code>false</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>verbose</td>
+    <td>Whether to print a summary after execution or not.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">os</td>
-    <td valign="top">list of Operating Systems on which the command may be
-      executed.</td>
-    <td align="center" valign="top">No</td>
+    <td>os</td>
+    <td>list of Operating Systems on which the command may be executed.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">osfamily</td>
-    <td valign="top">OS family as used in
-      the <a href="../Tasks/conditions.html#os">&lt;os&gt;</a>
+    <td>osfamily</td>
+    <td>OS family as used in the <a href="../Tasks/conditions.html#os">&lt;os&gt;</a>
       condition.</td>
-    <td align="center" valign="top">No - defaults to "unix"</td>
+    <td>No; defaults to <q>unix</q></td>
   </tr>
-
 </table>
 <h3>Examples</h3>
-  <blockquote><pre>
-&lt;chgrp file=&quot;${dist}/start.sh&quot; group=&quot;coders&quot;/&gt;
-</pre>
-</blockquote>
-<p>makes the &quot;start.sh&quot; file belong to the coders group on a
-UNIX system.</p>
-<blockquote>
+<pre>&lt;chgrp file=&quot;${dist}/start.sh&quot; group=&quot;coders&quot;/&gt;</pre>
+
+<p>makes the <samp>start.sh</samp> file belong to the <samp>coders</samp> group on a UNIX
+system.</p>
+
 <pre>
 &lt;chgrp group=&quot;coders&quot;&gt;
   &lt;fileset dir=&quot;${dist}/bin&quot; includes=&quot;**/*.sh&quot;/&gt;
-&lt;/chgrp&gt;
-</pre>
-</blockquote>
-<p>makes all &quot;.sh&quot; files below <code>${dist}/bin</code>
-belong to the coders group on a UNIX system.</p>
-<blockquote>
+&lt;/chgrp&gt;</pre>
+
+<p>makes all <samp>.sh</samp> files below <samp>${dist}/bin</samp> belong to the <samp>coders</samp>
+group on a UNIX system.</p>
+
 <pre>
 &lt;chgrp group=&quot;coders&quot;&gt;
   &lt;fileset dir=&quot;shared/sources1&quot;&gt;
@@ -151,14 +131,12 @@
   &lt;fileset refid=&quot;other.shared.sources&quot;/&gt;
 &lt;/chgrp&gt;
 </pre>
-</blockquote>
-<p>makes all files below <code>shared/sources1</code> (except those
-below any directory named trial) belong to the coders group on a UNIX 
-system. In addition all files belonging to a FileSet
-with <code>id</code> <code>other.shared.sources</code> get the same
+
+<p>makes all files below <samp>shared/sources1</samp> (except those below any directory
+named <samp>trial</samp>) belong to the <samp>coders</samp> group on a UNIX system. In addition all
+files belonging to a FileSet with <var>id</var> <samp>other.shared.sources</samp> get the same
 group.</p>
 
-<blockquote>
 <pre>
 &lt;chgrp group=&quot;webdev&quot; type=&quot;file&quot;&gt;
   &lt;fileset dir=&quot;/web&quot;&gt;
@@ -168,18 +146,12 @@
   &lt;dirset dir=&quot;/web&quot;&gt;
     &lt;include name=&quot;**/test_*&quot;/&gt;
   &lt;/dirset&gt;
-&lt;/chmod&gt;
-</pre>
-</blockquote>
-
-<p>makes all <code>.test.jsp</code>, and <code>.new</code> files belong to 
-group webdev. Directories beginning with <code>test_</code> also will belong 
-to webdev, but if there is a directory that ends in <code>.new</code> or a file
-that begins with <code>test_</code> it will be unaffected.</p>
-
-
+&lt;/chmod&gt;</pre>
 
+<p>makes all <samp>.test.jsp</samp>, and <samp>.new</samp> files belong to
+group <samp>webdev</samp>. Directories with names beginning with <samp>test_</samp> also will belong
+to <samp>webdev</samp>, but if there is a directory name that ends in <samp>.new</samp> or a file
+name that begins with <samp>test_</samp> it will be unaffected.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/chmod.html ant-1.10.3/manual/Tasks/chmod.html
--- ant-1.9.10/manual/Tasks/chmod.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/chmod.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,169 +24,144 @@
 
 <body>
 
-<h2><a name="chmod">Chmod</a></h2>
+<h2 id="chmod">Chmod</h2>
 <h3>Description</h3>
-<p>Changes the permissions of a file or all files inside specified
-directories. Right now it has effect only under Unix or NonStop Kernel (Tandem).
-The permissions are also UNIX style, like the argument for the chmod command.</p>
-<p>See the section on <a href="../dirtasks.html#directorybasedtasks">directory based
-tasks</a>, on how the inclusion/exclusion of files works, and how to
-write patterns.</p>
-
-<p>This task holds an implicit <a
-href="../Types/fileset.html">FileSet</a> and supports all of
-FileSet's attributes and nested elements directly. More sets can be
-specified using nested <code>&lt;fileset&gt;</code> or
-<code>&lt;dirset&gt;</code> (<em>since Apache Ant 1.6</em>) elements. </p>
-
-<p>Starting with Ant 1.6, this task also supports nested <a
-href="../Types/filelist.html">filelist</a>s.</p>
-
-<p>Starting with Ant 1.7, this task supports arbitrary <a
-href="../Types/resources.html#collection">Resource Collection</a>s
-as nested elements.</p>
-
-<p>By default this task will use a single invocation of the underlying
-chmod command.  If you are working on a large number of files this may
-result in a command line that is too long for your operating system.
-If you encounter such problems, you should set the maxparallel
-attribute of this task to a non-zero value.  The number to use highly
-depends on the length of your file names (the depth of your directory
-tree) and your operating system, so you'll have to experiment a
-little.  POSIX recommends command line length limits of at least 4096
-characters, this may give you an approximation for the number you
-could use as initial value for these experiments.</p>
-
-<p>By default this task won't do anything unless it detects it is
-  running on a Unix system.  If you know for sure that you have a
-  "chmod" executable on your PATH that is command line compatible with
-  the Unix command, you can use the task's os attribute and set its
-  value to your current os.</p>
+<p>Changes the permissions of a file or all files inside specified directories. Right now it has
+effect only under Unix or NonStop Kernel (Tandem).  The permissions are also UNIX style, like the
+argument for the <kbd>chmod</kbd> command.</p>
+<p>See the section on <a href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on
+how the inclusion/exclusion of files works, and how to write patterns.</p>
+
+<p>This task holds an implicit <a href="../Types/fileset.html">FileSet</a> and supports all of
+FileSet's attributes and nested elements directly. More sets can be specified using
+nested <code>&lt;fileset&gt;</code> or <code>&lt;dirset&gt;</code> (<em>since Apache Ant 1.6</em>)
+elements.</p>
+
+<p><em>Since Ant 1.6</em>, this task also supports
+nested <a href="../Types/filelist.html">filelist</a>s.</p>
+
+<p><em>Since Ant 1.7</em>, this task supports
+arbitrary <a href="../Types/resources.html#collection">resource collections</a> as nested
+elements.</p>
+
+<p>By default this task will use a single invocation of the underlying <kbd>chmod</kbd> command.
+If you are working on a large number of files this may result in a command line that is too long for
+your operating system.  If you encounter such problems, you should set the <var>maxparallel</var>
+attribute of this task to a non-zero value.  The number to use highly depends on the length of your
+file names (the depth of your directory tree) and your operating system, so you'll have to
+experiment a little.  POSIX recommends command line length limits of at least 4096 characters, this
+may give you an approximation for the number you could use as initial value for these
+experiments.</p>
+
+<p>By default this task won't do anything unless it detects it is running on a Unix system.  If you
+know for sure that you have a <kbd>chmod</kbd> executable on your <code>PATH</code> that is
+command line compatible with the Unix command, you can use the task's <var>os</var> attribute and
+set its value to your current OS.</p>
+
+<p>See the <a href="setpermissions.html">setpermissions</a> task for a platform independent
+alternative.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">the file or single directory of which the permissions 
-      must be changed.</td>
-    <td valign="top" valign="middle" rowspan="2">exactly one of the two or nested <code>&lt;fileset/list&gt;</code> elements.</td>
+    <td>file</td>
+    <td>the file or single directory of which the permissions must be changed.</td>
+    <td rowspan="2">Exactly one of the two, unless
+      nested <code>&lt;fileset|filelist|dirset&gt;</code> elements are specified</td>
   </tr>
   <tr>
-    <td valign="top">dir</td>
-    <td valign="top">the directory which holds the files whose permissions 
-      must be changed.<br/>
-      <b>Note:</b> for backwards compatibility
-      reasons <code>&lt;chmod&nbsp;dir="some-dir"/&gt;</code> will
-      only change the permissions on "some-dir" but not recurse into
-      it, unless you also specify any patterns.</td>
+    <td>dir</td>
+    <td class="left">the directory which holds the files whose permissions must be
+      changed.<br/><strong>Note</strong>: for backwards compatibility reasons <code>&lt;chmod
+      dir="some-dir"/&gt;</code> will only change the permissions on <samp>some-dir</samp> but not
+      recurse into it, unless you also specify any patterns.</td>
   </tr>
   <tr>
-    <td valign="top">perm</td>
-    <td valign="top">the new permissions.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>perm</td>
+    <td>the new permissions.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">includes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      included.</td>
-    <td valign="top" align="center">No</td>
+    <td>includes</td>
+    <td>comma- or space-separated list of patterns of files that must be included.</td>
+    <td>No; defaults to all (<q>**</q>)</td>
   </tr>
   <tr>
-    <td valign="top">excludes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      excluded. No files (except default excludes) are excluded when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>excludes</td>
+    <td>comma- or space-separated list of patterns of files that must be excluded.</td>
+    <td>No; defaults to default excludes or none if <var>defaultexcludes</var> is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">defaultexcludes</td>
-    <td valign="top">indicates whether default excludes should be used or not
-      (&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>defaultexcludes</td>
+    <td>indicates whether default excludes should be used or not (<q>yes|no</q>).</td>
+    <td>No; defaults to <q>yes</q></td>
   </tr>
   <tr>
-    <td valign="top">parallel</td>
-    <td valign="top">process all specified files using a single
-      <code>chmod</code> command. Defaults to true.</td>
-    <td valign="top" align="center">No</td>
+    <td>parallel</td>
+    <td>process all specified files using a single <kbd>chmod</kbd> command.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">type</td>
-    <td valign="top">One of <i>file</i>, <i>dir</i> or
-      <i>both</i>. If set to <i>file</i>, only the permissions of
-      plain files are going to be changed. If set to <i>dir</i>, only
-      the directories are considered.<br>
-      <strong>Note:</strong> The type attribute does not apply to
-      nested <i>dirset</i>s - <i>dirset</i>s always implicitly
-      assume type to be <i>dir</i>.</td>
-    <td align="center" valign="top">No, default is <i>file</i></td>
+    <td>type</td>
+    <td>One of <q>file</q>, <q>dir</q> or <q>both</q>. If set to <q>file</q>, only the permissions
+      of plain files are going to be changed. If set to <q>dir</q>, only the directories are
+      considered.<br/><strong>Note</strong>: The type attribute does not apply to
+      nested <code>dirset</code>s&mdash;<code>dirset</code>s always implicitly assume type to
+      be <q>dir</q>.</td>
+    <td>No; default is <q>file</q></td>
   </tr>
   <tr>
-    <td valign="top">maxparallel</td>
-    <td valign="top">Limit the amount of parallelism by passing at
-      most this many sourcefiles at once.  Set it to &lt;= 0 for
-      unlimited.  Defaults to unlimited.  <em>Since Ant 1.6.</em></td>
-    <td align="center" valign="top">No</td>
+    <td>maxparallel</td>
+    <td>Limit the amount of parallelism by passing at most this many sourcefiles at once.  Set it to
+      negative integer for unlimited.  <em>Since Ant 1.6</em>.</td>
+    <td>No; defaults to unlimited</td>
   </tr>
   <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">Whether to print a summary after execution or not.
-      Defaults to <code>false</code>.  <em>Since Ant 1.6.</em></td>
-    <td align="center" valign="top">No</td>
+    <td>verbose</td>
+    <td>Whether to print a summary after execution or not.  <em>Since Ant 1.6</em>.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">os</td>
-    <td valign="top">list of Operating Systems on which the command may be
-      executed.</td>
-    <td align="center" valign="top">No</td>
+    <td>os</td>
+    <td>list of Operating Systems on which the command may be executed.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">osfamily</td>
-    <td valign="top">OS family as used in
-      the <a href="conditions.html#os">&lt;os&gt;</a> condition.</td>
-    <td align="center" valign="top">No - defaults to "unix"</td>
+    <td>osfamily</td>
+    <td>OS family as used in the <a href="conditions.html#os">&lt;os&gt;</a> condition.</td>
+    <td>No; defaults to <q>unix</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
-  <blockquote><pre>
-&lt;chmod file=&quot;${dist}/start.sh&quot; perm=&quot;ugo+rx&quot;/&gt;
-</pre></blockquote>
-<p>makes the &quot;start.sh&quot; file readable and executable for anyone on a
-UNIX system.</p>
-<blockquote><pre>
-&lt;chmod file=&quot;${dist}/start.sh&quot; perm=&quot;700&quot;/&gt;
-</pre></blockquote>
-<p>makes the &quot;start.sh&quot; file readable, writable and executable only for the owner on a
+<pre>&lt;chmod file=&quot;${dist}/start.sh&quot; perm=&quot;ugo+rx&quot;/&gt;</pre>
+<p>makes the <samp>start.sh</samp> file readable and executable for anyone on a UNIX system.</p>
+
+<pre>&lt;chmod file=&quot;${dist}/start.sh&quot; perm=&quot;700&quot;/&gt;</pre>
+<p>makes the <samp>start.sh</samp> file readable, writable and executable only for the owner on a
 UNIX system.</p>
-<blockquote>
+
 <pre>
-&lt;chmod dir=&quot;${dist}/bin&quot; perm=&quot;ugo+rx&quot; 
-       includes=&quot;**/*.sh&quot;/&gt;
-</pre>
-</blockquote>
-<p>makes all &quot;.sh&quot; files below <code>${dist}/bin</code>
-readable and executable for anyone on a UNIX system.</p>
-<blockquote>
+&lt;chmod dir=&quot;${dist}/bin&quot; perm=&quot;ugo+rx&quot;
+       includes=&quot;**/*.sh&quot;/&gt;</pre>
+<p>makes all <samp>.sh</samp> files below <samp>${dist}/bin</samp> readable and executable for
+anyone on a UNIX system.</p>
+
 <pre>
 &lt;chmod perm=&quot;g+w&quot;&gt;
   &lt;fileset dir=&quot;shared/sources1&quot;&gt;
     &lt;exclude name=&quot;**/trial/**&quot;/&gt;
   &lt;/fileset&gt;
   &lt;fileset refid=&quot;other.shared.sources&quot;/&gt;
-&lt;/chmod&gt;
-</pre>
-</blockquote>
-<p>makes all files below <code>shared/sources1</code> (except those
-below any directory named trial) writable for members of the same
-group on a UNIX system. In addition all files belonging to a FileSet
-with <code>id</code> <code>other.shared.sources</code> get the same
-permissions.</p>
+&lt;/chmod&gt;</pre>
+<p>makes all files below <samp>shared/sources1</samp> (except those below any directory named trial)
+writable for members of the same group on a UNIX system. In addition all files belonging to a
+FileSet with <var>id</var> <samp>other.shared.sources</samp> get the same permissions.</p>
 
-<blockquote>
 <pre>
 &lt;chmod perm=&quot;go-rwx&quot; type=&quot;file&quot;&gt;
   &lt;fileset dir=&quot;/web&quot;&gt;
@@ -196,30 +171,17 @@
   &lt;dirset dir=&quot;/web&quot;&gt;
     &lt;include name=&quot;**/private_*&quot;/&gt;
   &lt;/dirset&gt;
-&lt;/chmod&gt;
-</pre>
-</blockquote>
-
-<p>keeps non-owners from touching cgi scripts, files with a <code>.old</code>
-extension or directories beginning with <code>private_</code>. A directory 
-ending in <code>.old</code> or a file beginning with private_ would remain
-unaffected.</p>
-
-
-  <h3>Note on maxparallel attribute</h3>
-  <p>
-    Some shells have a limit of the number of characters that
-    a command line may contain. 
-    This maximum limit varies from shell to shell and from operating
-    system to operating system.
-    If one has a large number of files to change mode on, consider
-    using the <em>maxparallel</em> attribute. For example
-    when using AIX and the limit is reached, the system responds
-    with a warning: "Warning: 
-    UNIXProcess.forkAndExec native error: The parameter or environment lists
-    are too long". A value of about 300 seems to result in a
-    command line that is acceptable.
-  </p>
+&lt;/chmod&gt;</pre>
+<p>keeps non-owners from touching cgi scripts, files with a <samp>.old</samp> extension or
+directories beginning with <samp>private_</samp>. A directory ending in <samp>.old</samp> or a file
+beginning with <samp>private_</samp> would remain unaffected.</p>
+
+<h3>Note on <var>maxparallel</var> attribute</h3>
+<p>Some shells have a limit of the number of characters that a command line may contain.  This
+maximum limit varies from shell to shell and from operating system to operating system.  If one has
+a large number of files to change mode on, consider using the <var>maxparallel</var> attribute. For
+example when using AIX and the limit is reached, the system responds with a warning: <code>"Warning:
+UNIXProcess.forkAndExec native error: The parameter or environment lists are too long"</code>. A
+value of about 300 seems to result in a command line that is acceptable.</p>
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/chown.html ant-1.10.3/manual/Tasks/chown.html
--- ant-1.9.10/manual/Tasks/chown.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/chown.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,140 +24,114 @@
 
 <body>
 
-<h2><a name="Chown">Chown</a></h2>
-<p><em>Since Apache Ant 1.6.</em></p>
+<h2 id="chown">Chown</h2>
+<p><em>Since Apache Ant 1.6</em>.</p>
 <h3>Description</h3>
 
-<p>Changes the owner of a file or all files inside specified
-directories. Right now it has effect only under Unix.  The owner
-attribute is equivalent to the corresponding argument for the chown
-command.</p>
-
-<p><a href="../Types/fileset.html">FileSet</a>s, 
-<a href="../Types/dirset.html">DirSet</a>s or <a
-href="../Types/filelist.html">FileList</a>s can be specified using
-nested <code>&lt;fileset&gt;</code>, <code>&lt;dirset&gt;</code> and 
-<code>&lt;filelist&gt;</code> elements.</p>
-
-<p>Starting with Ant 1.7, this task supports arbitrary <a
-href="../Types/resources.html#collection">Resource Collection</a>s
-as nested elements.</p>
-
-<p>By default this task will use a single invocation of the underlying
-chown command.  If you are working on a large number of files this may
-result in a command line that is too long for your operating system.
-If you encounter such problems, you should set the maxparallel
-attribute of this task to a non-zero value.  The number to use highly
-depends on the length of your file names (the depth of your directory
-tree) and your operating system, so you'll have to experiment a
-little.  POSIX recommends command line length limits of at least 4096
-characters, this may give you an approximation for the number you
-could use as initial value for these experiments.</p>
-
-<p>By default this task won't do anything unless it detects it is
-  running on a Unix system.  If you know for sure that you have a
-  "chown" executable on your PATH that is command line compatible with
-  the Unix command, you can use the task's os attribute and set its
-  value to your current os.</p>
+<p>Changes the owner of a file or all files inside specified directories. Right now it has effect
+only under Unix.  The owner attribute is equivalent to the corresponding argument for
+the <kbd>chown</kbd> command.</p>
+
+<p><a href="../Types/fileset.html">FileSet</a>s, <a href="../Types/dirset.html">DirSet</a>s
+or <a href="../Types/filelist.html">FileList</a>s can be specified using
+nested <code>&lt;fileset&gt;</code>, <code>&lt;dirset&gt;</code> and <code>&lt;filelist&gt;</code>
+elements.</p>
+
+<p><em>Since Ant 1.7</em>, this task supports
+arbitrary <a href="../Types/resources.html#collection">resource collections</a> as nested
+elements.</p>
+
+<p>By default this task will use a single invocation of the underlying <kbd>chown</kbd> command.
+If you are working on a large number of files this may result in a command line that is too long for
+your operating system.  If you encounter such problems, you should set the <var>maxparallel</var>
+attribute of this task to a non-zero value.  The number to use highly depends on the length of your
+file names (the depth of your directory tree) and your operating system, so you'll have to
+experiment a little.  POSIX recommends command line length limits of at least 4096 characters, this
+may give you an approximation for the number you could use as initial value for these
+experiments.</p>
+
+<p>By default this task won't do anything unless it detects it is running on a Unix system.  If you
+know for sure that you have a <kbd>chown</kbd> executable on your <code>PATH</code> that is command
+line compatible with the Unix command, you can use the task's <var>os</var> attribute and set its
+value to your current OS.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">the file or directory of which the owner must be
+    <td>file</td>
+    <td>the file or directory of which the owner must be
     changed.</td>
-    <td valign="top" valign="middle">Yes or nested
-    <code>&lt;fileset/list&gt;</code> elements.</td>
+    <td>Yes, unless nested <code>&lt;fileset|filelist|dirset&gt;</code> elements are specified</td>
   </tr>
   <tr>
-    <td valign="top">owner</td>
-    <td valign="top">the new owner.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>owner</td>
+    <td>the new owner.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">parallel</td>
-    <td valign="top">process all specified files using a single
-      <code>chown</code> command. Defaults to true.</td>
-    <td valign="top" align="center">No</td>
+    <td>parallel</td>
+    <td>process all specified files using a single <kbd>chown</kbd> command.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">type</td>
-    <td valign="top">One of <i>file</i>, <i>dir</i> or
-      <i>both</i>. If set to <i>file</i>, only the owner of
-      plain files are going to be changed. If set to <i>dir</i>, only
-      the directories are considered.<br>
-      <strong>Note:</strong> The type attribute does not apply to
-      nested <i>dirset</i>s - <i>dirset</i>s always implicitly
-      assume type to be <i>dir</i>.</td>
-    <td align="center" valign="top">No, default is <i>file</i></td>
+    <td>type</td>
+    <td>One of <q>file</q>, <q>dir</q> or <q>both</q>. If set to <q>file</q>, only the owner of
+      plain files are going to be changed. If set to <q>dir</q>, only the directories are
+      considered.<br/><strong>Note</strong>: The <var>type</var> attribute does not apply to
+      nested <code>dirset</code>s&mdash;<code>dirset</code>s always implicitly assume type to
+      be <q>dir</q>.</td>
+    <td>No; default is <q>file</q></td>
   </tr>
   <tr>
-    <td valign="top">maxparallel</td>
-    <td valign="top">Limit the amount of parallelism by passing at
-      most this many sourcefiles at once.  Set it to &lt;= 0 for
-      unlimited.  Defaults to unlimited.</td>
-    <td align="center" valign="top">No</td>
-
+    <td>maxparallel</td>
+    <td>Limit the amount of parallelism by passing at most this many sourcefiles at once.  Set it to
+      negative integer for unlimited.</td>
+    <td>No; defaults to unlimited</td>
   </tr>
   <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">Whether to print a summary after execution or not.
-      Defaults to <code>false</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>verbose</td>
+    <td>Whether to print a summary after execution or not.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">os</td>
-    <td valign="top">list of Operating Systems on which the command may be
-      executed.</td>
-    <td align="center" valign="top">No</td>
+    <td>os</td>
+    <td>list of Operating Systems on which the command may be executed.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">osfamily</td>
-    <td valign="top">OS family as used in
-      the <a href="../Tasks/conditions.html#os">&lt;os&gt;</a>
+    <td>osfamily</td>
+    <td>OS family as used in the <a href="../Tasks/conditions.html#os">&lt;os&gt;</a>
       condition.</td>
-    <td align="center" valign="top">No - defaults to "unix"</td>
+    <td>No; defaults to <q>unix</q></td>
   </tr>
-
 </table>
 <h3>Examples</h3>
-<blockquote><pre>
-&lt;chown file="${dist}/start.sh" owner="coderjoe"/&gt;
-</pre>
-</blockquote>
-<p>makes the "start.sh" file belong to coderjoe on a
-UNIX system.</p>
-<blockquote>
+<pre>&lt;chown file="${dist}/start.sh" owner="coderjoe"/&gt;</pre>
+<p>makes the <samp>start.sh</samp> file belong to <samp>coderjoe</samp> on a UNIX system.</p>
+
 <pre>
-    &lt;chown owner="coderjoe"&gt;
-      &lt;fileset dir="${dist}/bin" includes="**/*.sh"/&gt;
-    &lt;/chown&gt;
-</pre>
-</blockquote>
-<p>makes all ".sh" files below <code>${dist}/bin</code>
-belong to coderjoe on a UNIX system.</p>
-<blockquote>
+&lt;chown owner="coderjoe"&gt;
+  &lt;fileset dir="${dist}/bin" includes="**/*.sh"/&gt;
+&lt;/chown&gt;</pre>
+<p>makes all <samp>.sh</samp> files below <samp>${dist}/bin</samp> belong to <samp>coderjoe</samp>
+on a UNIX system.</p>
+
 <pre>
 &lt;chown owner="coderjoe"&gt;
   &lt;fileset dir="shared/sources1"&gt;
     &lt;exclude name="**/trial/**"/&gt;
   &lt;/fileset&gt;
   &lt;fileset refid="other.shared.sources"/&gt;
-&lt;/chown&gt;
-</pre>
-</blockquote>
-<p>makes all files below <code>shared/sources1</code> (except those
-below any directory named trial) belong to coderjoe on a UNIX 
-system. In addition all files belonging to a FileSet
-with <code>id</code> <code>other.shared.sources</code> get the same
-owner.</p>
+&lt;/chown&gt;</pre>
+<p>makes all files below <samp>shared/sources1</samp> (except those below any directory
+named <samp>trial</samp>) belong to <samp>coderjoe</samp> on a UNIX system. In addition all files
+belonging to a FileSet with <var>id</var> <code>other.shared.sources</code> get the same owner.</p>
 
-<blockquote>
 <pre>
 &lt;chown owner="webadmin" type="file"&gt;
   &lt;fileset dir="/web"&gt;
@@ -167,17 +141,10 @@
   &lt;dirset dir="/web"&gt;
     &lt;include name="**/private_*"/&gt;
   &lt;/dirset&gt;
-&lt;/chmod&gt;
-</pre>
-</blockquote>
-
-<p>makes cgi scripts, files with a <code>.old</code> extension or
-directories beginning with <code>private_</code> belong to the user named
-webadmin. A directory ending in <code>.old</code> or a file beginning with 
-<code>private_</code> would remain unaffected.</p>
-
-
+&lt;/chmod&gt;</pre>
+<p>makes <samp>cgi</samp> scripts, files with a <samp>.old</samp> extension or directories beginning
+with <samp>private_</samp> belong to the user named <samp>webadmin</samp>. A directory ending
+in <samp>.old</samp> or a file beginning with <samp>private_</samp> would remain unaffected.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/clearcase.html ant-1.10.3/manual/Tasks/clearcase.html
--- ant-1.9.10/manual/Tasks/clearcase.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/clearcase.html	2018-03-24 12:37:12.000000000 +0000
@@ -19,60 +19,58 @@
 <head>
   <meta http-equiv="Content-Language" content="en-us">
   <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
-  <title>Clearcase Tasks</title>
+  <title>ClearCase Tasks</title>
 </head>
 
 <body>
 <h1>Apache Ant ClearCase Tasks</h1>
-<p>by:<br>
-Curtis White (cwhite at aracnet dot com),<br>
-Sean P. Kane (spkane at genomatica dot com),<br>
-Rob Anderson (Anderson.Rob at vectorscm dot com), and<br>
+<p>by:<br/>
+Curtis White (cwhite at aracnet dot com),<br/>
+Sean P. Kane (spkane at genomatica dot com),<br/>
+Rob Anderson (Anderson.Rob at vectorscm dot com), and<br/>
 Sean Egan    (sean at cm-logic dot com)</p>
 
-<p>Version 1.6 - 02/25/2003</p>
+<p>Version 1.6&mdash;02/25/2003</p>
 
 <h1>ClearCase Support</h1>
 <h2>Table of Contents</h2>
 <ul>
-  <li><A href="#introduction">Introduction</a>
-  <li><A href="#cccheckin">CCCheckin</a>
-  <li><A href="#cccheckout">CCCheckout</a>
-  <li><A href="#ccuncheckout">CCUnCheckout</a>
-  <li><A href="#ccupdate">CCUpdate</a>
-  <li><A href="#ccmklbtype">CCMklbtype</a>
-  <li><A href="#ccmklabel">CCMklabel</a>
-  <li><A href="#ccrmtype">CCRmtype</a>
-  <li><A href="#cclock">CCLock</a>
-  <li><A href="#ccunlock">CCUnlock</a>
-  <li><A href="#ccmkbl">CCMkbl</a>
-  <li><A href="#ccmkattr">CCMkattr</a>
-  <li><A href="#ccmkdir">CCMkdir</a>
-  <li><A href="#ccmkelem">CCMkelem</a></li>
+  <li><a href="#introduction">Introduction</a>
+  <li><a href="#cccheckin">CCCheckin</a>
+  <li><a href="#cccheckout">CCCheckout</a>
+  <li><a href="#ccuncheckout">CCUnCheckout</a>
+  <li><a href="#ccupdate">CCUpdate</a>
+  <li><a href="#ccmklbtype">CCMklbtype</a>
+  <li><a href="#ccmklabel">CCMklabel</a>
+  <li><a href="#ccrmtype">CCRmtype</a>
+  <li><a href="#cclock">CCLock</a>
+  <li><a href="#ccunlock">CCUnlock</a>
+  <li><a href="#ccmkbl">CCMkbl</a>
+  <li><a href="#ccmkattr">CCMkattr</a>
+  <li><a href="#ccmkdir">CCMkdir</a>
+  <li><a href="#ccmkelem">CCMkelem</a></li>
 
 </ul>
 
-<hr>
-<h2><a name="introduction">Introduction</a></h2>
-<p>Apache Ant provides several optional tasks for working with ClearCase. These tasks correspond to various
-ClearCase commands using the Cleartool program. The current tasks available for Ant correspond to only
-a few of the significant ClearCase commands.</p>
-
-<p>More tasks can be easily added by deriving from the ClearCase class and then adding
-functionality that is specific to that ClearCase command.</p>
-<p>
-    Important: these tasks all require <code>cleartool</code> on the command line.
-    If a task fails with an IOException, especially error code 2 on Windows,
-    this is your problem.
-</p>
+<hr/>
+<h2 id="introduction">Introduction</h2>
+<p>Apache Ant provides several optional tasks for working with ClearCase. These tasks correspond to
+various ClearCase commands using the <kbd>cleartool</kbd> program. The current tasks available for
+Ant correspond to only a few of the significant ClearCase commands.</p>
 
+<p>More tasks can be easily added by deriving from the ClearCase class and then adding functionality
+that is specific to that ClearCase command.</p>
+<p>Important: these tasks all require <kbd>cleartool</kbd> on the command line.  If a task fails
+with an <code>IOException</code>, especially <code>error=2</code> on Windows, this is your
+problem.</p>
 
-<hr>
-<h2><a name="cccheckin">CCCheckin</a></h2>
+<hr/>
+
+<h2 id="cccheckin">CCCheckin</h2>
 <h3>Description</h3>
-Task to perform a "cleartool checkin" command to ClearCase.
+<p>Task to perform a <kbd>cleartool checkin</kbd> command to ClearCase.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -80,20 +78,17 @@
   </tr>
   <tr>
     <td>viewpath</td>
-    <td>Path to the ClearCase view file or directory that the command
-        will operate on</td>
+    <td>Path to the ClearCase view file or directory that the command will operate on</td>
     <td>No</td>
   </tr>
   <tr>
     <td>comment</td>
-    <td>Specify a comment. Only one of comment or commentfile may be used.</td>
-    <td>No</td>
+    <td>Specify a comment</td>
+    <td rowspan="2">No; only one of the two may be used</td>
   </tr>
   <tr>
     <td>commentfile</td>
-    <td>Specify a file containing a comment. Only one of comment or commentfile
-        may be used.</td>
-    <td>No</td>
+    <td class="left">Specify a file containing a comment</td>
   </tr>
   <tr>
     <td>nowarn</td>
@@ -107,40 +102,40 @@
   </tr>
   <tr>
     <td>keepcopy</td>
-    <td>Keeps a copy of the file with a .keep extension</td>
+    <td>Keeps a copy of the file with a <samp>.keep</samp> extension</td>
     <td>No</td>
   </tr>
   <tr>
     <td>identical</td>
-    <td>Allows the file to be checked in even if it is identical
-        to the original</td>
+    <td>Allows the file to be checked in even if it is identical to the original</td>
     <td>No</td>
   </tr>
   <tr>
     <td>failonerr</td>
-    <td>Throw an exception if the command fails. Default is true</td>
-    <td>No</td>
+    <td>Throw an exception if the command fails</td>
+    <td>No; default is <q>true</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;cccheckin viewpath="c:/views/viewdir/afile"
-        commentfile="acomment.txt"
-        nowarn="true"
-        identical="true"/&gt;
-</pre>
-</blockquote>
-<p>Does a ClearCase <i>checkin</i> on the file <i>c:/views/viewdir/afile</i>.
-Comment text from the file <i>acomment.txt</i> is added to ClearCase as a comment.
-All warning messages are suppressed. The file is checked in even if it is
-<i>identical</i> to the original.</p>
-<hr>
-<h2><a name="cccheckout">CCCheckout</a></h2>
+           commentfile="acomment.txt"
+           nowarn="true"
+           identical="true"/&gt;</pre>
+
+<p>Does a ClearCase <code>checkin</code> on the file <samp>c:/views/viewdir/afile</samp>.  Comment
+text from the file <samp>acomment.txt</samp> is added to ClearCase as a comment.  All warning
+messages are suppressed. The file is checked in even if it is <em>identical</em> to the
+original.</p>
+
+<hr/>
+
+<h2 id="cccheckout">CCCheckout</h2>
 <h3>Description</h3>
-Task to perform a "cleartool checkout" command to ClearCase.
+<p>Task to perform a <kbd>cleartool checkout</kbd> command to ClearCase.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -148,8 +143,7 @@
   </tr>
   <tr>
     <td>viewpath</td>
-    <td>Path to the ClearCase view file or directory that the command
-        will operate on</td>
+    <td>Path to the ClearCase view file or directory that the command will operate on</td>
     <td>No</td>
   </tr>
   <tr>
@@ -164,8 +158,7 @@
   </tr>
   <tr>
     <td>nodata</td>
-    <td>Checks out the file but does not create an editable file
-        containing its data</td>
+    <td>Checks out the file but does not create an editable file containing its data</td>
     <td>No</td>
   </tr>
   <tr>
@@ -175,7 +168,8 @@
   </tr>
   <tr>
     <td>version</td>
-    <td>Allows checkout of a version other than main latest</td>
+    <td>Allows checkout of a version other than <code>/main/LATEST</code> (or whatever is selected
+    by a config spec)</td>
     <td>No</td>
   </tr>
   <tr>
@@ -185,48 +179,45 @@
   </tr>
   <tr>
     <td>comment</td>
-    <td>Specify a comment. Only one of comment or commentfile may be used.</td>
-    <td>No</td>
+    <td>Specify a comment</td>
+    <td rowspan="2">No; only one of the two may be used</td>
   </tr>
   <tr>
     <td>commentfile</td>
-    <td>Specify a file containing a comment. Only one of comment or
-        commentfile may be used.</td>
-    <td>No</td>
+    <td class="left">Specify a file containing a comment</td>
   </tr>
   <tr>
     <td>notco</td>
-    <td>Fail if it's already checked out to the current view. Set to false to ignore it.<br>
-    Since ant 1.6.1</td>
-    <td>No</td>
+    <td>Fail if it's already checked out to the current view. Set to <q>false</q> to ignore
+    it.<br/><em>Since Ant 1.6.1</em></td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
     <td>failonerr</td>
-    <td>Throw an exception if the command fails. Default is true.<br>
-    Since ant 1.6.1</td>
-    <td>No</td>
+    <td>Throw an exception if the command fails.<br/><em>Since Ant 1.6.1</em></td>
+    <td>No; default is <q>true</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;cccheckout viewpath="c:/views/viewdir/afile"
-        reserved="true"
-        branch="abranch"
-        nowarn="true"
-        comment="Some comment text"/&gt;
-</pre>
-</blockquote>
-<p>Does a ClearCase <i>checkout</i> on the file <i>c:/views/viewdir/afile</i>.
-It is checked out as <i>reserved</i> on branch called <i>abranch</i>. All
-warning messages are suppressed. A <i>Some comment text</i> is added to
-ClearCase as a comment.</p>
-<hr>
-<h2><a name="ccuncheckout">CCUnCheckout</a></h2>
+            reserved="true"
+            branch="abranch"
+            nowarn="true"
+            comment="Some comment text"/&gt;</pre>
+
+<p>Does a ClearCase <code>checkout</code> on the file <samp>c:/views/viewdir/afile</samp>.  It is
+checked out as <em>reserved</em> on branch called <samp>abranch</samp>. All warning messages are
+suppressed. A &quot;<samp>Some comment text</samp>&quot; is added to ClearCase as a comment.</p>
+
+<hr/>
+
+<h2 id="ccuncheckout">CCUnCheckout</h2>
 <h3>Description</h3>
-Task to perform a UnCheckout command to ClearCase.
+<p>Task to perform a <kbd>cleartool uncheckout</kbd> command to ClearCase.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -234,38 +225,34 @@
   </tr>
   <tr>
     <td>viewpath</td>
-    <td>Path to the ClearCase view file or directory that the command
-        will operate on</td>
+    <td>Path to the ClearCase view file or directory that the command will operate on</td>
     <td>No</td>
   </tr>
   <tr>
     <td>keepcopy</td>
-    <td>Specifies whether to keep a copy of the file with a .keep
-        extension or not</td>
+    <td>Specifies whether to keep a copy of the file with a <samp>.keep</samp> extension or not</td>
     <td>No</td>
   </tr>
   <tr>
     <td>failonerr</td>
-    <td>Throw an exception if the command fails. Default is true<br>
-    Since ant 1.6.1</td>
-    <td>No</td>
+    <td>Throw an exception if the command fails.<br/><em>Since Ant 1.6.1</em></td>
+    <td>No; default is <q>true</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
-<pre>
-&lt;ccuncheckout viewpath="c:/views/viewdir/afile"
-        keepcopy="true"/&gt;
-</pre>
-</blockquote>
-<p>Does a ClearCase <i>uncheckout</i> on the file <i>c:/views/viewdir/afile</i>.
-A copy of the file called <i>c:/views/viewdir/afile.keep</i> is kept.</p>
-<hr>
-<h2><a name="ccupdate">CCUpdate</a></h2>
+
+<pre>&lt;ccuncheckout viewpath="c:/views/viewdir/afile" keepcopy="true"/&gt;</pre>
+
+<p>Does a ClearCase <code>uncheckout</code> on the file <samp>c:/views/viewdir/afile</samp>.  A copy
+of the file called <samp>c:/views/viewdir/afile.keep</samp> is kept.</p>
+
+<hr/>
+
+<h2 id="ccupdate">CCUpdate</h2>
 <h3>Description</h3>
-Task to perform an "cleartool update" command to ClearCase.
+<p>Task to perform an <kbd>cleartool update</kbd> command to ClearCase.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -273,8 +260,7 @@
   </tr>
   <tr>
     <td>viewpath</td>
-    <td>Path to the ClearCase snapshot view file or directory that the command
-        will operate on</td>
+    <td>Path to the ClearCase snapshot view file or directory that the command will operate on</td>
     <td>No</td>
   </tr>
   <tr>
@@ -294,54 +280,49 @@
   </tr>
   <tr>
     <td>rename</td>
-    <td>Specifies that hijacked files should be renamed with a .keep extension</td>
+    <td>Specifies that hijacked files should be renamed with a <samp>.keep</samp> extension</td>
     <td>No</td>
   </tr>
   <tr>
     <td>currenttime</td>
-    <td>Specifies that modification time should be written as the
-        current time. Either currenttime or preservetime can be
-        specified.</td>
+    <td>Specifies that modification time should be written as the current time. Mutually exclusive
+    with <var>preservetime</var>.</td>
     <td>No</td>
   </tr>
   <tr>
     <td>preservetime</td>
-    <td>Specifies that modification time should preserved from the
-        VOB time. Either currenttime or preservetime can be
-        specified.</td>
+    <td>Specifies that modification time should preserved from the VOB time. Mutually exclusive
+    with <var>currenttime</var>.</td>
     <td>No</td>
   </tr>
   <tr>
     <td>failonerr</td>
-    <td>Throw an exception if the command fails. Default is true.<br>
-    Since ant 1.6.1</td>
-    <td>No</td>
+    <td>Throw an exception if the command fails.<br/>  <em>Since Ant 1.6.1</em></td>
+    <td>No; default is <q>true</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;ccupdate viewpath="c:/views/viewdir"
-        graphical="false"
-        log="log.log"
-        overwrite="true"
-        currenttime="true"
-        rename="false"/&gt;
-</pre>
-</blockquote>
-<p>Does a ClearCase <i>update</i> on the snapshot view directory <i>c:/views/viewdir</i>.
-A graphical dialog will be displayed. The output will be logged to
-<i>log.log</i> and it will overwrite any hijacked files. The modified
-time will be set to the current time.</p>
+          graphical="false"
+          log="log.log"
+          overwrite="true"
+          currenttime="true"
+          rename="false"/&gt;</pre>
 
+<p>Does a ClearCase <code>update</code> on the snapshot view
+directory <samp>c:/views/viewdir</samp>.  A graphical dialog will be displayed. The output will be
+logged to <samp>log.log</samp> and it will overwrite any hijacked files. The modified time will be
+set to the current time.</p>
 
+<hr/>
 
-<hr>
-<h2><a name="ccmklbtype">CCMklbtype</a></h2>
+<h2 id="ccmklbtype">CCMklbtype</h2>
 <h3>Description</h3>
-Task to perform a "mklbtype" command to ClearCase.
+<p>Task to perform a <kbd>cleartool mklbtype</kbd> command to ClearCase.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -351,74 +332,72 @@
     <td>typename</td>
     <td>Name of the label type to create</td>
     <td>Yes</td>
-  <tr>
+  </tr>
   <tr>
     <td>vob</td>
     <td>Name of the VOB</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>replace</td>
     <td>Replace an existing label definition of the same type</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>global</td>
-    <td>Either global or ordinary can be specified, not both. Creates a label type that is global to the VOB or to VOBs that use this VOB</td>
-    <td>No</td>
-  <tr>
+    <td>Creates a label type that is global to the VOB or to VOBs that use this VOB.</td>
+    <td rowspan="2">No; only one of the two may be used,
+    default <var>ordinary</var>=<q>true</q></td>
+  </tr>
   <tr>
     <td>ordinary</td>
-    <td>Either global or ordinary can be specified, not both. Creates a label type that can be used only in the current VOB. <B>Default</B></td>
-    <td>No</td>
-  <tr>
+    <td class="left">Creates a label type that can be used only in the current VOB.</td>
+  </tr>
   <tr>
     <td>pbranch</td>
     <td>Allows the label type to be used once per branch in a given element's version tree</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>shared</td>
-    <td>Sets the way mastership is checked by ClearCase. See ClearCase documentation for details</td>
+    <td>Sets the way mastership is checked by ClearCase. See ClearCase documentation for
+    details</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>comment</td>
-    <td>Specify a comment. Only one of comment or cfile may be used.</td>
-    <td>No</td>
-  <tr>
+    <td>Specify a comment</td>
+    <td rowspan="2">No; only one of the two may be used</td>
+  </tr>
   <tr>
     <td>commentfile</td>
-    <td>Specify a file containing a comment. Only one of comment or cfile may be used.</td>
-    <td>No</td>
-  <tr></tr>
+    <td class="left">Specify a file containing a comment</td>
+  </tr>
   <tr>
     <td>failonerr</td>
-    <td>Throw an exception if the command fails. Default is true<br>
-    Since ant 1.6.1</td>
-    <td>No</td>
+    <td>Throw an exception if the command fails.<br/><em>Since Ant 1.6.1</em></td>
+    <td>No; default is <q>true</q></td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;ccmklbtype typename="VERSION_1"
-        ordinary="true"
-        comment="Development version 1"/&gt;
-</pre>
-</blockquote>
-<p>Does a ClearCase <i>mklbtype</i> to create a label type named <i>VERSION_1</i>.
-It is created as <i>ordinary</i> so it is available only to the current VOB.
-The text <i>Development version 1</i> is added as a comment.</p>
+            ordinary="true"
+            comment="Development version 1"/&gt;</pre>
+
+<p>Does a ClearCase <code>mklbtype</code> to create a label type named <samp>VERSION_1</samp>.  It
+is created as <em>ordinary</em> so it is available only to the current VOB.  The text <q>Development
+version 1</q> is added as a comment.</p>
 
+<hr/>
 
-<hr>
-<h2><a name="ccmklabel">CCMklabel</a></h2>
+<h2 id="ccmklabel">CCMklabel</h2>
 <h3>Description</h3>
-Task to perform a "mklabel" command to ClearCase.
+<p>Task to perform a <kbd>cleartool mklabel</kbd> command to ClearCase.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -428,71 +407,69 @@
     <td>typename</td>
     <td>Name of the label type</td>
     <td>Yes</td>
-  <tr>
+  </tr>
   <tr>
     <td>viewpath</td>
     <td>Path to the ClearCase view file or directory that the command will operate on</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>replace</td>
     <td>Replace a label of the same type on the same branch</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>recurse</td>
-    <td>Process each subdirectory under viewpath</td>
+    <td>Process each subdirectory under <var>viewpath</var></td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>version</td>
     <td>Identify a specific version to attach the label to</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>vob</td>
     <td>Name of the VOB</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>comment</td>
-    <td>Specify a comment. Only one of comment or cfile may be used.</td>
-    <td>No</td>
-  <tr>
+    <td>Specify a comment</td>
+    <td rowspan="2">No; only one of the two may be used</td>
+  </tr>
   <tr>
     <td>commentfile</td>
-    <td>Specify a file containing a comment. Only one of comment or cfile may be used.</td>
-    <td>No</td>
-  <tr></tr>
+    <td class="left">Specify a file containing a comment</td>
+  </tr>
   <tr>
     <td>failonerr</td>
-    <td>Throw an exception if the command fails. Default is true<br>
-    Since ant 1.6.1</td>
-    <td>No</td>
+    <td>Throw an exception if the command fails.<br/><em>Since Ant 1.6.1</em></td>
+    <td>No; default is <q>true</q></td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;ccmklabel viewpath="c:/views/viewdir/afile"
-        comment="Some comment text"
-        recurse="true"
-        version="\main\2"
-        typename="VERSION_1"/&gt;
+           comment="Some comment text"
+           recurse="true"
+           version="\main\2"
+           typename="VERSION_1"/&gt;
 </pre>
-</blockquote>
-<p>Does a ClearCase <i>mklabel</i> on the file <i>c:/views/viewdir/afile</i> under
-the main branch for version 2 (<i>\main\2</i>). Text <i>Some comment text</i> is added
-as a comment. It will <i>recurse</i> all subdirectories.
 
+<p>Does a ClearCase <code>mklabel</code> on the file <samp>c:/views/viewdir/afile</samp> under the
+main branch for version 2 (<samp>\main\2</samp>). Text &quot;<samp>Some comment text</samp>&quot; is
+added as a comment. It will <em>recurse</em> all subdirectories.</p>
+
+<hr/>
 
-<hr>
-<h2><a name="ccrmtype">CCRmtype</a></h2>
+<h2 id="ccrmtype">CCRmtype</h2>
 <h3>Description</h3>
-Task to perform a "rmtype" command to ClearCase.
+<p>Task to perform a <kbd>cleartool rmtype</kbd> command to ClearCase.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -501,458 +478,441 @@
   <tr>
     <td>typekind</td>
     <td>The kind of type to create. Valid types are:
-      <table border="0" width="40%">
+      <table>
+        <tr>
+          <th>Kind</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td><q>attype</q></td>
+          <td>attribute type</td>
+        </tr>
+        <tr>
+          <td><q>brtype</q></td>
+          <td>branch type</td>
+        </tr>
+        <tr>
+          <td><q>eltype</q></td>
+          <td>element type</td>
+        </tr>
+        <tr>
+          <td><q>hltype</q></td>
+           <td>hyperlink type</td>
+        </tr>
         <tr>
-          <td width="15%"> </td>
-          <td><b>attype</b><br>
-              <b>brtype</b><br>
-              <b>eltype</b><br>
-              <b>hltype</b><br>
-              <b>lbtype</b><br>
-              <b>trtype</b>
-          </td>
-          <td>- <br>
-              - <br>
-              - <br>
-              - <br>
-              - <br>
-              -
-          </td>
-          <td>attribute type<br>
-              branch type<br>
-              element type<br>
-              hyperlink type<br>
-              label type<br>
-              trigger type
-          </td>
+          <td><q>lbtype</q></td>
+          <td>label type</td>
         </tr>
-      </table>
-    </td>
+        <tr>
+          <td><q>trtype</q></td>
+          <td>trigger type</td>
+        </tr>
+      </table></td>
     <td>Yes</td>
-  <tr>
+  </tr>
   <tr>
     <td>typename</td>
     <td>The name of the type to remove</td>
     <td>Yes</td>
-  <tr>
+  </tr>
   <tr>
     <td>ignore</td>
-    <td>Used with trigger types only. Forces removal of trigger type even if a pre-operation trigger would prevent its removal</td>
+    <td>Used with trigger types only. Forces removal of trigger type even if a pre-operation trigger
+    would prevent its removal</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>rmall</td>
     <td>Removes all instances of a type and the type object itself</td>
     <td>No</td>
-  <tr>
+  </tr>
   <tr>
     <td>comment</td>
-    <td>Specify a comment. Only one of comment or cfile may be used.</td>
-    <td>No</td>
-  <tr>
+    <td>Specify a comment</td>
+    <td rowspan="2">No; only one of the two may be used</td>
+  </tr>
   <tr>
     <td>commentfile</td>
-    <td>Specify a file containing a comment. Only one of comment or cfile may be used.</td>
-    <td>No</td>
-  <tr></tr>
+    <td class="left">Specify a file containing a comment</td>
+  </tr>
   <tr>
     <td>failonerr</td>
-    <td>Throw an exception if the command fails. Default is true
-    Since ant 1.6.1</td>
-    <td>No</td>
+    <td>Throw an exception if the command fails.  <em>Since Ant 1.6.1</em></td>
+    <td>No; default is <q>true</q></td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;ccrmtype typekind="lbtype"
-        typename="VERSION_1"
-        commentfile="acomment.txt"
-        rmall="true"/&gt;
-</pre>
-</blockquote>
-<p>Does a ClearCase <i>rmtype</i> to remove a label type (<i>lbtype</i>) named <i>VERSION_1</i>.
-Comment text from the file <i>acomment.txt</i> is added as a comment. All instances of the type
-are removed, including the type object itself.</p>
-<hr>
-
-<h2><a name="cclock">CCLock</a></h2>
-<h3>Description</h3>
-Task to perform a "cleartool lock" command to ClearCase.
-<h3>Parameters</h3>
- <table border="1" cellpadding="2" cellspacing="0">
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-      <td>replace</td>
-      <td>Specifies replacing an existing lock</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>nusers</td>
-      <td>Specifies user(s) who can still modify the object</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>obsolete</td>
-      <td>Specifies that the object should be marked obsolete</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>comment</td>
-      <td>Specifies how to populate comments fields</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>pname</td>
-      <td>Specifies the object pathname to be locked.</td>
-      <td>No</td>
-   <tr>
-      <td>objselect</td>
-      <td>This variable is obsolete. Should use <i>objsel</i> instead.</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>objsel</td>
-      <td>Specifies the object(s) to be locked.<br>
-      Since ant 1.6.1</td>
-      <td>No</td>
-   <tr>
+          typename="VERSION_1"
+          commentfile="acomment.txt"
+          rmall="true"/&gt;</pre>
+
+<p>Does a ClearCase <code>rmtype</code> to remove a label type (<q>lbtype</q>)
+named <samp>VERSION_1</samp>.  Comment text from the file <samp>acomment.txt</samp> is added as a
+comment. All instances of the type are removed, including the type object itself.</p>
+
+<hr/>
+
+<h2 id="cclock">CCLock</h2>
+<h3>Description</h3>
+<p>Task to perform a <kbd>cleartool lock</kbd> command to ClearCase.</p>
+<h3>Parameters</h3>
+<table class="attr">
   <tr>
-    <td>failonerr</td>
-    <td>Throw an exception if the command fails. Default is true.<br>
-    Since ant 1.6.1</td>
+    <th>Attribute</th>
+    <th>Values</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>replace</td>
+    <td>Specifies replacing an existing lock</td>
     <td>No</td>
   </tr>
-
- </table>
-<h3>Examples</h3>
-<blockquote>
-<pre>
-&lt;cclock
-    objsel="stream:Application_Integration@\MyProject_PVOB"
-    /&gt;
-</pre>
-</blockquote>
-<p>Does a ClearCase <i>lock</i> on the object <i>stream:Application_Integration@\MyProject_PVOB</i>.</p>
-<hr>
-
-<h2><a name="ccunlock">CCUnlock</a></h2>
-<h3>Description</h3>
-Task to perform a "cleartool unlock" command to ClearCase.
-<h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-      <td>comment</td>
-      <td>Specifies how to populate comments fields</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>pname</td>
-      <td>Specifies the object pathname to be unlocked.</td>
-      <td>No</td>
-   <tr>
-      <td>objselect</td>
-      <td>This variable is obsolete. Should use <i>objsel</i> instead.</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>objsel</td>
-      <td>Specifies the object(s) to be unlocked.<br>
-      Since ant 1.6.1</td>
-      <td>No</td>
-   <tr>
-  <tr>
-    <td>failonerr</td>
-    <td>Throw an exception if the command fails. Default is true.<br>
-    Since ant 1.6.1</td>
+  <tr>
+    <td>nusers</td>
+    <td>Specifies user(s) who can still modify the object</td>
     <td>No</td>
   </tr>
+  <tr>
+    <td>obsolete</td>
+    <td>Specifies that the object should be marked obsolete</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>comment</td>
+    <td>Specifies how to populate comments fields</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>pname</td>
+    <td>Specifies the object pathname to be locked.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>objselect</td>
+    <td><em>Obsolete</em>. Use <var>objsel</var> instead.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>objsel</td>
+    <td>Specifies the object(s) to be locked.<br/><em>Since Ant 1.6.1</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>failonerr</td>
+    <td>Throw an exception if the command fails.<br/><em>Since Ant 1.6.1</em></td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+</table>
+<h3>Examples</h3>
 
- </table>
- <h3>Examples</h3>
-<blockquote>
-<pre>
-&lt;ccunlock
-    objsel="stream:Application_Integration@\MyProject_PVOB"
-    /&gt;
-</pre>
-</blockquote>
-<p>Does a ClearCase <i>unlock</i> on the object <i>stream:Application_Integration@\MyProject_PVOB</i>.</p>
-<hr>
-
-<h2><a name="ccmkbl">CCMkbl</a></h2>
-<h3>Description</h3>
-Task to perform a "cleartool mkbl" command to ClearCase.
-<h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-      <td>comment</td>
-      <td>Specify a comment. Only one of comment or cfile may be
-used.</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>commentfile</td>
-      <td>Specify a file containing a comment. Only one of comment or
-cfile may be used.</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>baselinerootname</td>
-      <td>Specify the name to be associated with the baseline.</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>nowarn</td>
-      <td>Suppress warning messages</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>identical</td>
-      <td>Allows the baseline to be created even if it is identical to the
-previous baseline.</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>full</td>
-      <td>Creates a full baseline.</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>nlabel</td>
-      <td>Allows the baseline to be created without a label.</td>
-      <td>No</td>
-   </tr>
+<pre>&lt;cclock objsel="stream:Application_Integration@\MyProject_PVOB"/&gt;</pre>
+
+<p>Does a ClearCase <code>lock</code> on the
+object <samp>stream:Application_Integration@\MyProject_PVOB</samp>.</p>
+
+<hr/>
+
+<h2 id="ccunlock">CCUnlock</h2>
+<h3>Description</h3>
+<p>Task to perform a <kbd>cleartool unlock</kbd> command to ClearCase.</p>
+<h3>Parameters</h3>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Values</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>comment</td>
+    <td>Specifies how to populate comments fields</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>pname</td>
+    <td>Specifies the object pathname to be unlocked.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>objselect</td>
+    <td><em>Obsolete</em>. Use <var>objsel</var> instead.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>objsel</td>
+    <td>Specifies the object(s) to be unlocked.<br/><em>Since Ant 1.6.1</em></td>
+    <td>No</td>
+  </tr>
   <tr>
     <td>failonerr</td>
-    <td>Throw an exception if the command fails. Default is true.<br>
-    Since ant 1.6.1</td>
+    <td>Throw an exception if the command fails.<br/><em>Since Ant 1.6.1</em></td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+</table>
+<h3>Examples</h3>
+
+<pre>&lt;ccunlock objsel="stream:Application_Integration@\MyProject_PVOB"/&gt;</pre>
+
+<p>Does a ClearCase <code>unlock</code> on the
+object <samp>stream:Application_Integration@\MyProject_PVOB</samp>.</p>
+
+<hr/>
+
+<h2 id="ccmkbl">CCMkbl</h2>
+<h3>Description</h3>
+<p>Task to perform a <kbd>cleartool mkbl</kbd> command to ClearCase.</p>
+<h3>Parameters</h3>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Values</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>comment</td>
+    <td>Specify a comment</td>
+    <td rowspan="2">No; only one of the two may be used</td>
+  </tr>
+  <tr>
+    <td>commentfile</td>
+    <td class="left">Specify a file containing a comment</td>
+  </tr>
+  <tr>
+    <td>baselinerootname</td>
+    <td>Specify the name to be associated with the baseline.</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>nowarn</td>
+    <td>Suppress warning messages</td>
     <td>No</td>
   </tr>
- </table>
+  <tr>
+    <td>identical</td>
+    <td>Allows the baseline to be created even if it is identical to the previous baseline.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>full</td>
+    <td>Creates a full baseline.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>nlabel</td>
+    <td>Allows the baseline to be created without a label.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>failonerr</td>
+    <td>Throw an exception if the command fails.<br/><em>Since Ant 1.6.1</em></td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+</table>
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
-&lt;ccmkbl
-    baselinerootname="Application_Baseline_AUTO"
-    identical="yes"
-    full="no"
-    viewpath="v:\ApplicationCC"
-    /&gt;
-</pre>
-</blockquote>
-<p>Does a ClearCase <i>mkbl</i> on the Integration view at <i>v:\ApplicationCC</i>
-even if it is <i>identical</i> to a previous baseline. The new baseline with be
-incremental and named "Application_Baseline_AUTO".</p>
-<hr>
-
-<h2><a name="ccmkattr">CCMkattr</a></h2>
-<h3>Description</h3>
-Task to perform a &quot;cleartool mkattr&quot; command to ClearCase.<br>
-Since ant 1.6.1
-<h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-      <td>viewpath</td>
-      <td>Path to the ClearCase view file or directory that the command will operate on</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>replace</td>
-      <td>Replace the value of the attribute if it already exists</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>recurse</td>
-      <td>Process each subdirectory under viewpath</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>version</td>
-      <td>Identify a specific version to attach the attribute to</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>typename</td>
-      <td>Name of the attribute type</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>typevalue</td>
-      <td>Value to attach to the attribute type</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>comment</td>
-      <td>Specify a comment. Only one of comment or cfile may be used.</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>commentfile</td>
-      <td>Specify a file containing a comment. Only one of comment or cfile may be used.</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>failonerr</td>
-      <td>Throw an exception if the command fails. Default is true</td>
-      <td>No</td>
-   </tr>
- </table>
+&lt;ccmkbl baselinerootname="Application_Baseline_AUTO"
+        identical="yes"
+        full="no"
+        viewpath="v:\ApplicationCC"/&gt;</pre>
+
+<p>Does a ClearCase <code>mkbl</code> on the Integration view at <samp>v:\ApplicationCC</samp> even
+if it is <em>identical</em> to a previous baseline. The new baseline with be incremental and
+named <samp>Application_Baseline_AUTO</samp>.</p>
+
+<hr/>
+
+<h2 id="ccmkattr">CCMkattr</h2>
+<p><em>Since Ant 1.6.1</em></p>
+<h3>Description</h3>
+<p>Task to perform a <kbd>cleartool mkattr</kbd> command to ClearCase.</p>
+<h3>Parameters</h3>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Values</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>viewpath</td>
+    <td>Path to the ClearCase view file or directory that the command will operate on</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>replace</td>
+    <td>Replace the value of the attribute if it already exists</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>recurse</td>
+    <td>Process each subdirectory under <var>viewpath</var></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>version</td>
+    <td>Identify a specific version to attach the attribute to</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>typename</td>
+    <td>Name of the attribute type</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>typevalue</td>
+    <td>Value to attach to the attribute type</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>comment</td>
+    <td>Specify a comment</td>
+    <td rowspan="2">No; only one of the two may be used</td>
+  </tr>
+  <tr>
+    <td>commentfile</td>
+    <td class="left">Specify a file containing a comment</td>
+  </tr>
+  <tr>
+    <td>failonerr</td>
+    <td>Throw an exception if the command fails.</td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+</table>
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;ccmkattr viewpath=&quot;c:/views/viewdir/afile&quot;
-    typename=&quot;BugFix&quot;
-    typevalue=&quot;34445&quot;
-    /&gt;
+          typename=&quot;BugFix&quot;
+          typevalue=&quot;34445&quot;/&gt;
 </pre>
-</blockquote>
-<p>Does a ClearCase <i>mkattr</i> on the file <i>c:/views/viewdir/afile</i> and
-attaches the attribute <i>BugFix</i> with a value of <i>34445</i> to it.</p>
-<hr>
-
-<h2><a name="ccmkdir">CCMkdir</a></h2>
-<h3>Description</h3>
-Task to perform a &quot;cleartool mkdir&quot; command to ClearCase.<br>
-Since ant 1.6.1
-<h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-      <td>viewpath</td>
-      <td>Path to the ClearCase view directory that the command will operate on</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>comment</td>
-      <td>Specify a comment. Only one of comment or cfile may be used.</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>commentfile</td>
-      <td>Specify a file containing a comment. Only one of comment or cfile may be used.</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>nocheckout</td>
-      <td>Do not checkout after element creation</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>failonerr</td>
-      <td>Throw an exception if the command fails. Default is true</td>
-      <td>No</td>
-   </tr>
- </table>
+
+<p>Does a ClearCase <code>mkattr</code> on the file <samp>c:/views/viewdir/afile</samp> and attaches
+the attribute <samp>BugFix</samp> with a value of <samp>34445</samp> to it.</p>
+
+<hr/>
+
+<h2 id="ccmkdir">CCMkdir</h2>
+<p><em>Since Ant 1.6.1</em></p>
+<h3>Description</h3>
+<p>Task to perform a <kbd>cleartool mkdir</kbd> command to ClearCase.</p>
+<h3>Parameters</h3>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Values</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>viewpath</td>
+    <td>Path to the ClearCase view directory that the command will operate on</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>comment</td>
+    <td>Specify a comment</td>
+    <td rowspan="2">No; only one of the two may be used</td>
+  </tr>
+  <tr>
+    <td>commentfile</td>
+    <td class="left">Specify a file containing a comment</td>
+  </tr>
+  <tr>
+    <td>nocheckout</td>
+    <td>Do not checkout after element creation</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>failonerr</td>
+    <td>Throw an exception if the command fails.</td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+</table>
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;ccmkdir viewpath=&quot;c:/views/viewdir/adir&quot;
-        nocheckout=&quot;true&quot;
-        comment=&quot;Some comment text&quot;/&gt;
-</pre>
-</blockquote>
-<p>Does a ClearCase <i>mkdir</i> on the dir <i>c:/views/viewdir/adir</i> and
-does not automatically check it out.</p>
-<hr>
-
-<h2><a name="ccmkelem">CCMkelem</a></h2>
-<h3>Description</h3>
-Task to perform a &quot;cleartool mkelem&quot; command to ClearCase.<br>
-Since ant 1.6.1
-<h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-      <td>viewpath</td>
-      <td>Path to the ClearCase view file or directory that the command will operate on</td>
-      <td>Yes</td>
-   <tr>
-   <tr>
-      <td>comment</td>
-      <td>Specify a comment. Only one of comment or cfile may be used.</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>commentfile</td>
-      <td>Specify a file containing a comment. Only one of comment or cfile may be used.</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>nowarn</td>
-      <td>Suppress warning messages</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>nocheckout</td>
-      <td>Do not checkout after element creation</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>checkin</td>
-      <td>Checkin element after creation</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>preservetime</td>
-      <td>Preserve the modification time (for checkin)</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>master</td>
-      <td>Assign mastership of the main branch to the current site</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>eltype</td>
-      <td>Element type to use during element creation</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>failonerr</td>
-      <td>Throw an exception if the command fails. Default is true</td>
-      <td>No</td>
-   <tr>
- </table>
+         nocheckout=&quot;true&quot;
+         comment=&quot;Some comment text&quot;/&gt;</pre>
+
+<p>Does a ClearCase <code>mkdir</code> on the dir <samp>c:/views/viewdir/adir</samp> and does not
+automatically check it out.</p>
+
+<hr/>
+
+<h2 id="ccmkelem">CCMkelem</h2>
+<p><em>Since Ant 1.6.1</em></p>
+<h3>Description</h3>
+<p>Task to perform a <kbd>cleartool mkelem</kbd> command to ClearCase.</p>
+<h3>Parameters</h3>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Values</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>viewpath</td>
+    <td>Path to the ClearCase view file or directory that the command will operate on</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>comment</td>
+    <td>Specify a comment</td>
+    <td rowspan="2">No; only one of the two may be used</td>
+  </tr>
+  <tr>
+    <td>commentfile</td>
+    <td class="left">Specify a file containing a comment</td>
+  </tr>
+  <tr>
+    <td>nowarn</td>
+    <td>Suppress warning messages</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>nocheckout</td>
+    <td>Do not checkout after element creation</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>checkin</td>
+    <td>Checkin element after creation</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>preservetime</td>
+    <td>Preserve the modification time (for checkin)</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>master</td>
+    <td>Assign mastership of the main branch to the current site</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>eltype</td>
+    <td>Element type to use during element creation</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>failonerr</td>
+    <td>Throw an exception if the command fails.</td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+</table>
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;ccmkelem viewpath=&quot;c:/views/viewdir/afile&quot;
-        eltype=&quot;text_file&quot;
-        checkin=&quot;true&quot;
-        comment=&quot;Some comment text&quot;/&gt;
-</pre>
-</blockquote>
-<p>Does a ClearCase <i>mkelem</i> on the file <i>c:/views/viewdir/afile</i> with
-element type <i>text_file</i>. It also checks in the file after creation.</p>
+          eltype=&quot;text_file&quot;
+          checkin=&quot;true&quot;
+          comment=&quot;Some comment text&quot;/&gt;</pre>
+
+<p>Does a ClearCase <code>mkelem</code> on the file <samp>c:/views/viewdir/afile</samp> with element
+type <samp>text_file</samp>. It also checks in the file after creation.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/common.html ant-1.10.3/manual/Tasks/common.html
--- ant-1.9.10/manual/Tasks/common.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/common.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,36 +24,33 @@
 
 <body>
 
-<h2><a name="javac">Common Attributes of all Tasks</a></h2>
+<h2 id="javac">Common Attributes of all Tasks</h2>
 <p>All tasks share the following attributes:</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">id</td>
-    <td valign="top">Unique identifier for this task instance, can be
+    <td>id</td>
+    <td>Unique identifier for this task instance, can be
        used to reference this task in scripts.</td>
-    <td valign="top">No</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">taskname</td>
-    <td valign="top">A different name for this task instance - will
+    <td>taskname</td>
+    <td>A different name for this task instance&mdash;will
       show up in the logging output.</td>
-    <td valign="top">No</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">description</td>
-    <td valign="top">Room for your comments</td>
-    <td valign="top">No</td>
+    <td>description</td>
+    <td>Room for your comments</td>
+    <td>No</td>
   </tr>
 </table>
 
-
-
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/componentdef.html ant-1.10.3/manual/Tasks/componentdef.html
--- ant-1.9.10/manual/Tasks/componentdef.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/componentdef.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,39 +24,27 @@
 
 <body>
 
-<h2><a name="componentdef">componentdef</a></h2>
+<h2 id="componentdef">componentdef</h2>
 <h3>Description</h3>
-  <p>
-    Adds a component definition to the current project.
-    A component definition is the same as a
-    <a href="typedef.html">typedef</a> except:
-  </p>
-    <ol>
-      <li>
-        that it can only be used in other types or tasks that
-        accept components (by having an <i>add()</i> method).
-      </li>
-      <li>
-        multiple components may have the same name, provided they
-        implement different interfaces.
-      </li>
-    </ol>
-  <p>
-    The purpose of this is to allow internal Apache Ant definitions to be
-    made for tags like "and" or "or".
-  </p>
+<p>Adds a component definition to the current project.  A component definition is the same as
+a <a href="typedef.html">typedef</a> except:</p>
+<ol>
+  <li>that it can only be used in other types or tasks that accept components (by having
+    an <code>add()</code> method).</li>
+  <li>multiple components may have the same name, provided they implement different interfaces.</li>
+</ol>
+<p>The purpose of this is to allow internal Apache Ant definitions to be made for tags
+like <samp>and</samp> or <samp>or</samp>.</p>
 
-  <h3>Examples</h3>
+<h3>Examples</h3>
 
-<pre> &lt;componentdef name="or" onerror="ignore"
-    classname="com.apache.tools.ant.taskdefs.conditions.Or"/&gt;
-  &lt;componentdef name="or" onerror="ignore"
-    classname="com.apache.tools.ant.types.resources.selectors.Or"/&gt;</pre>
-  <p>
-    defines two components with the same name "or"; one is a condition
-    (see <a href="conditions.html">conditions</a>) and one is 
-    a selector (see <a href="../Types/selectors.html">selectors</a>).
-  </p>
+<pre>
+&lt;componentdef name="or" onerror="ignore"
+              classname="com.apache.tools.ant.taskdefs.conditions.Or"/&gt;
+&lt;componentdef name="or" onerror="ignore"
+              classname="com.apache.tools.ant.types.resources.selectors.Or"/&gt;</pre>
+<p>defines two components with the same name <samp>or</samp>; one is a condition
+(see <a href="conditions.html">conditions</a>) and one is a selector
+(see <a href="../Types/selectors.html">selectors</a>).</p>
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/concat.html ant-1.10.3/manual/Tasks/concat.html
--- ant-1.9.10/manual/Tasks/concat.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/concat.html	2018-03-24 12:37:12.000000000 +0000
@@ -16,322 +16,240 @@
 -->
 <html>
 
-    <head>
-      <meta http-equiv="Content-Language" content="en-us">
-      <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
-<title>Concat</title>
-    </head>
-
-    <body>
-
-      <h2><a name="Concat">Concat</a></h2>
-
-      <h3>Description</h3>
-
-      <p>
-        Concatenates one or more 
-        <a href="../Types/resources.html">resource</a>s
-        to a single file or to the console. The destination
-        file will be created if it does not exist unless the resource
-        list is empty and ignoreempty is true.
-      </p>
-
-      <p><strong>Since Apache Ant 1.7.1</strong>, this task can be used as a
-        <a href="../Types/resources.html#collection">Resource Collection</a>
-        that will return exactly one 
-        <a href="../Types/resources.html">resource</a>.
-      </p>
-
-      <p>
-        <a href="../Types/resources.html#collection">
-Resource Collection</a>s are used to
-        select which resources are to be concatenated. There is no
-        singular attribute to specify a single resource to cat.
-      </p>
-
-      <h3>Parameters</h3>
-
-      <table border="1" cellpadding="2" cellspacing="0">
-
-        <tr>
-          <td valign="top"><b>Attribute</b></td>
-          <td valign="top"><b>Description</b></td>
-          <td align="center" valign="top"><b>Required</b></td>
-        </tr>
-
-        <tr>
-          <td valign="top">destfile</td>
-          <td valign="top">
-            The destination file for the concatenated stream.
-        If not specified the console will be used instead.
-          </td>
-          <td valign="top" align="center">
-            No
-          </td>
-        </tr>
-
-        <tr>
-          <td valign="top">append</td>
-          <td valign="top">
-            Specifies whether or not the file specified by 'destfile'
-            should be appended. Defaults to &quot;no&quot;.
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">force</td>
-          <td valign="top">
-            Specifies whether or not the file specified by 'destfile'
-            should be written to even if it is newer than all source files.
-            <strong>deprecated, use the overwrite attribute instead</strong>
-            Defaults to &quot;yes&quot;.
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">overwrite</td>
-          <td valign="top">
-            Specifies whether or not the file specified by 'destfile'
-            should be written to even if it is newer than all source files.
-            <em>since Ant 1.8.2</em>.
-            Defaults to &quot;yes&quot;.
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-
-        <tr>
-          <td valign="top">forceReadOnly</td>
-          <td valign="top">Overwrite read-only destination
-            files.  <em>since Ant 1.8.2</em></td>
-          <td valign="top" align="center">No; defaults to false.</td>
-        </tr>
-
-        <tr>
-          <td valign="top">encoding</td>
-          <td valign="top">
-            Specifies the encoding for the input files. Please see <a
-            href="http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html">
-            Supported Encodings</a>
-            for a list of possible values. Defaults to the platform's
-            default character encoding.
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">outputencoding</td>
-          <td valign="top">
-            The encoding to use when writing the output file
-            <em>since Ant 1.6</em>.
-            Defaults to the value of the encoding attribute
-            if given or the default JVM encoding otherwise.
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">fixlastline</td>
-          <td valign="top">
-                 Specifies whether or not to check if
-            each file concatenated is terminated by
-            a new line. If this attribute is &quot;yes&quot;
-            a new line will be appended to the stream if
-            the file did not end in a new line.
-            <em>since Ant 1.6</em>.
-            Defaults to &quot;no&quot;.
-            This attribute does not apply to embedded text.
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">eol</td>
-          <td valign="top">
-            Specifies what the end of line character are
-            for use by the fixlastline attribute.
-            <em>since Ant 1.6</em>
-            Valid values for this property are:
-            <ul>
-              <li>cr: a single CR</li>
-              <li>lf: a single LF</li>
-              <li>crlf: the pair CRLF</li>
-              <li>mac: a single CR</li>
-              <li>unix: a single LF</li>
-              <li>dos: the pair CRLF</li>
-            </ul>
-            The default is platform dependent.
-            For Unix platforms, the default is &quot;lf&quot;.
-            For DOS based systems (including Windows),
-            the default is &quot;crlf&quot;.
-            For Mac OS, the default is &quot;cr&quot;.
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">binary</td>
-          <td valign="top">
-            <em>since Ant 1.6.2</em>
-            If this attribute is set to true, the task concatenates the files
-            in a byte by byte fashion. If this attribute is false, concat will
-            not normally work for binary files due to character encoding
-            issues.
-            If this option is set to true, the destfile attribute must be
-            set, and the task cannot used nested text.
-            Also the attributes encoding, outputencoding, filelastline
-            cannot be used.
-            The default is &quot;false&quot;.
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">ignoreempty</td>
-          <td valign="top">
-          <em>Since Ant 1.8.0</em>
-            Specifies whether or not the file specified by 'destfile'
-            should be created if the source resource list is
-            empty. Defaults to &quot;true&quot;.
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">resourcename</td>
-          <td valign="top">
-          <em>Since Ant 1.8.3</em>
-            Specifies the name reported if this task is exposed
-            as a <a href="../Types/resources.html">resource</a>.
-          </td>
-          <td valign="top" align="center">No</td>
-        </tr>
-
-      </table>
-
-      <h3>Parameters specified as nested elements</h3>
-        <h4>Resource Collection</h4>
-        <p><em>since Ant 1.7</em>.</p>
-
-      <p>
-        Any of the various <a href="../Types/resources.html#collection">
-        Resource Collection</a> types can specify the resources to be
-        concatenated.
-      </p>
-
-      <h4>filterchain</h4>
-        <p><em>since Ant 1.6</em>.</p>
-      <p>The concat task supports nested
-        <a href="../Types/filterchain.html"> FilterChain</a>s.</p>
-
-      <h4>header, footer</h4>
-        <p><em>since Ant 1.6</em>.</p>
-      <p>Used to prepend or postpend text into the concatenated stream.</p>
-      <p>The text may be in-line or be in a file.</p>
-      <table border="1" cellpadding="2" cellspacing="0">
-        <tr>
-          <td valign="top"><b>Attribute</b></td>
-          <td valign="top"><b>Description</b></td>
-          <td align="center" valign="top"><b>Required</b></td>
-        </tr>
-        <tr>
-          <td valign="top">filtering</td>
-          <td valign="top">
-            Whether to filter the text provided by this sub element,
-            default is "yes".
-          <td valign="top" align = "center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">file</td>
-          <td valign="top">A file to place at the head or tail of the
-                           concatenated text.
-          <td valign="top" align = "center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">trim</td>
-          <td valign="top">Whether to trim the value, default is "no"</td>
-          <td valign="top" align = "center">No</td>
-        </tr>
-        <tr>
-          <td valign="top">trimleading</td>
-          <td valign="top">
-            Whether to trim leading white space on each line, default is "no"
-          </td>
-          <td valign="top" align = "center">No</td>
-        </tr>
-      </table>
-
-      <h3>Examples</h3>
-
-      <p><b>Concatenate a string to a file:</b></p>
-
-      <pre>
-  &lt;concat destfile=&quot;README&quot;&gt;Hello, World!&lt;/concat&gt;
-      </pre>
-
-      <p><b>Concatenate a series of files to the console:</b></p>
-
-      <pre>
-  &lt;concat&gt;
-    &lt;fileset dir=&quot;messages&quot; includes=&quot;*important*&quot;/&gt;
-  &lt;/concat&gt;
-      </pre>
-
-      <p><b>Concatenate a single file, appending if the destination file exists:</b></p>
-
-      <pre>
-  &lt;concat destfile=&quot;NOTES&quot; append=&quot;true&quot;&gt;
-    &lt;filelist dir=&quot;notes&quot; files=&quot;note.txt&quot;/&gt;
-  &lt;/concat&gt;
-      </pre>
-
-      <p><b>Concatenate a series of files, update the destination
-      file only if is older that all the source files:</b></p>
-
-      <pre>
-  &lt;concat destfile=&quot;${docbook.dir}/all-sections.xml&quot;
-          force=&quot;no&quot;&gt;
-    &lt;filelist dir=&quot;${docbook.dir}/sections&quot;
-         files=&quot;introduction.xml,overview.xml&quot;/&gt;
-    &lt;fileset dir=&quot;${docbook.dir}&quot;
-         includes=&quot;sections/*.xml&quot;
-         excludes=&quot;introduction.xml,overview.xml&quot;/&gt;
-  &lt;/concat&gt;
-      </pre>
-
-      <p><b>Concatenate a series of files, expanding ant properties</b></p>
-        <pre>
-   &lt;concat destfile="${build.dir}/subs"&gt;
-      &lt;path&gt;
-        &lt;fileset dir="${src.dir}" includes="*.xml"/&gt;
-        &lt;pathelement location="build.xml"/&gt;
-      &lt;/path&gt;
-      &lt;filterchain&gt;
-        &lt;expandproperties/&gt;
-      &lt;/filterchain&gt;
-   &lt;/concat&gt;
-        </pre>
-
-      <p><b>Filter the lines containing project from build.xml and output
-           them to report.output, prepending with a header</b></p>
-        <pre>
-   &lt;concat destfile="${build.dir}/report.output"&gt;
-      &lt;header filtering="no" trimleading="yes"&gt;
-          Lines that contain project
-          ==========================
-      &lt;/header&gt;
-      &lt;path path="build.xml"/&gt;
-      &lt;filterchain&gt;
-         &lt;linecontains&gt;
-           &lt;contains value="project"/&gt;
-         &lt;/linecontains&gt;
-      &lt;/filterchain&gt;
-   &lt;/concat&gt;
-        </pre>
-
-      <p><b>Concatenate a number of binary files.</b></p>
-        <pre>
-   &lt;concat destfile="${build.dir}/dist.bin" binary="yes"&gt;
-     &lt;fileset file="${src.dir}/scripts/dist.sh" /&gt;
-     &lt;fileset file="${build.dir}/dist.tar.bz2" /&gt;
-   &lt;/concat&gt;
-        </pre>
+  <head>
+    <meta http-equiv="Content-Language" content="en-us">
+    <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
+    <title>Concat</title>
+  </head>
+
+  <body>
+
+    <h2 id="concat">Concat</h2>
+
+    <h3>Description</h3>
+
+    <p>Concatenates one or more <a href="../Types/resources.html">resource</a>s to a single file or
+      to the console. The destination file will be created if it does not exist unless the resource
+      list is empty and <var>ignoreempty</var> is <q>true</q>.</p>
+
+    <p><em>Since Apache Ant 1.7.1</em>, this task can be used as
+      a <a href="../Types/resources.html#collection">resource collection</a> that will return
+      exactly one <a href="../Types/resources.html">resource</a>.</p>
+
+    <p><a href="../Types/resources.html#collection">Resource collections</a> are used to select
+      which resources are to be concatenated. There is no singular attribute to specify a single
+      resource to <code>concat</code>.</p>
+
+    <h3>Parameters</h3>
+
+    <table class="attr">
+      <tr>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
+      </tr>
+      <tr>
+        <td>destfile</td>
+        <td>The destination file for the concatenated stream.  If not specified the console will be
+          used instead.</td>
+        <td>No</td>
+      </tr>
+      <tr>
+        <td>append</td>
+        <td>Specifies whether or not the file specified by <var>destfile</var> should be
+          appended.</td>
+        <td>No; defaults to <q>no</q></td>
+      </tr>
+      <tr>
+        <td>force</td>
+        <td>Specifies whether or not the file specified by <var>destfile</var> should be written to
+          even if it is newer than all source files. <em><u>Deprecated</u>, use
+          the <var>overwrite</var> attribute instead.</em></td>
+        <td>No; defaults to <q>yes</q></td>
+      </tr>
+      <tr>
+        <td>overwrite</td>
+        <td>Specifies whether or not the file specified by <var>destfile</var> should be written to
+          even if it is newer than all source files.  <em>Since Ant 1.8.2</em>.</td>
+        <td>No; defaults to <q>yes</q></td>
+      </tr>
+      <tr>
+        <td>forceReadOnly</td>
+        <td>Overwrite read-only destination files.  <em>Since Ant 1.8.2</em></td>
+        <td>No; defaults to <q>false</q></td>
+      </tr>
+      <tr>
+        <td>encoding</td>
+        <td>Specifies the encoding for the input files. Please
+          see <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html"
+          target="_top">Supported Encodings</a> for a list of possible values.</td>
+        <td>No; defaults to default JVM character encoding</td>
+      </tr>
+      <tr>
+        <td>outputencoding</td>
+        <td>The encoding to use when writing the output file.  <em>Since Ant 1.6</em>.</td>
+        <td>No; defaults to <var>encoding</var> if set or default JVM character encoding
+          otherwise</td>
+      </tr>
+      <tr>
+        <td>fixlastline</td>
+        <td>Specifies whether or not to check if each file concatenated is terminated by a new
+          line. If this attribute is <q>yes</q> a new line will be appended to the stream if the
+          file did not end in a new line.  <em>Since Ant 1.6</em>.  This attribute does not apply to
+          embedded text.</td>
+        <td>No; defaults to <q>no</q></td>
+      </tr>
+      <tr>
+        <td>eol</td>
+        <td>Specifies what the end of line character are for use by the fixlastline
+          attribute.  <em>Since Ant 1.6</em> Valid values for this property are:
+          <ul>
+            <li><q>cr</q>: a single CR</li>
+            <li><q>lf</q>: a single LF</li>
+            <li><q>crlf</q>: the pair CRLF</li>
+            <li><q>mac</q>: a single CR</li>
+            <li><q>unix</q>: a single LF</li>
+            <li><q>dos</q>: the pair CRLF</li>
+          </ul></td>
+        <td>No; default is platform dependent: <q>lf</q> for Unix, <q>crlf</q> for DOS family
+        (including Windows), <q>cr</q> for Mac OS 9 or earlier</td></tr>
+      <tr>
+        <td>binary</td>
+        <td><em>Since Ant 1.6.2</em> If this attribute is set to <q>true</q>, the task concatenates
+          the files in a byte by byte fashion. If this attribute is <q>false</q>, concat will not
+          normally work for binary files due to character encoding issues.  If this option is set
+          to <q>true</q>, the <var>destfile</var> attribute must be set, and the task cannot used
+          nested text.  Also the
+          attributes <var>encoding</var>, <var>outputencoding</var>, <var>filelastline</var> cannot
+          be used.</td>
+        <td>No; default is <q>false</q></td>
+      </tr>
+      <tr>
+        <td>ignoreempty</td>
+        <td><em>Since Ant 1.8.0</em> Specifies whether or not the file specified
+          by <var>destfile</var> should be created if the source resource list is empty.
+        </td>
+        <td>No; defaults to <q>true</q></td>
+      </tr>
+      <tr>
+        <td>resourcename</td>
+        <td><em>Since Ant 1.8.3</em> Specifies the name reported if this task is exposed as
+          a <a href="../Types/resources.html">resource</a>.
+        </td>
+        <td>No</td>
+      </tr>
+    </table>
+
+    <h3>Parameters specified as nested elements</h3>
+    <h4>resource collection</h4>
+    <p><em>Since Ant 1.7</em>.</p>
+
+    <p>Any of the various <a href="../Types/resources.html#collection">resource collection</a> types
+      can specify the resources to be concatenated.</p>
+
+    <h4>filterchain</h4>
+    <p><em>Since Ant 1.6</em>.</p>
+    <p>The task supports nested <a href="../Types/filterchain.html">FilterChain</a>s.</p>
+
+    <h4>header, footer</h4>
+    <p><em>Since Ant 1.6</em>.</p>
+    <p>Used to prepend or postpend text into the concatenated stream.</p>
+    <p>The text may be in-line or be in a file.</p>
+    <table class="attr">
+      <tr>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
+      </tr>
+      <tr>
+        <td>filtering</td>
+        <td>Whether to filter the text provided by this sub element.</td>
+        <td>No; default is <q>yes</q></td>
+      </tr>
+      <tr>
+        <td>file</td>
+        <td>A file to place at the head or tail of the concatenated text.</td>
+        <td>No</td>
+      </tr>
+      <tr>
+        <td>trim</td>
+        <td>Whether to trim the value.</td>
+        <td>No; default is <q>no</q></td>
+      </tr>
+      <tr>
+        <td>trimleading</td>
+        <td>Whether to trim leading white space on each line.</td>
+        <td>No; default is <q>no</q></td>
+      </tr>
+    </table>
+
+    <h3>Examples</h3>
+
+    <p><strong>Concatenate a string to a file:</strong></p>
+
+    <pre>&lt;concat destfile=&quot;README&quot;&gt;Hello, World!&lt;/concat&gt;</pre>
+
+    <p><strong>Concatenate a series of files to the console:</strong></p>
+
+    <pre>
+&lt;concat&gt;
+  &lt;fileset dir=&quot;messages&quot; includes=&quot;*important*&quot;/&gt;
+&lt;/concat&gt;</pre>
+
+    <p><strong>Concatenate a single file, appending if the destination file exists:</strong></p>
+
+    <pre>
+&lt;concat destfile=&quot;NOTES&quot; append=&quot;true&quot;&gt;
+  &lt;filelist dir=&quot;notes&quot; files=&quot;note.txt&quot;/&gt;
+&lt;/concat&gt;</pre>
+
+    <p><strong>Concatenate a series of files, update the destination file only if is older that all
+      the source files:</strong></p>
+
+    <pre>
+&lt;concat destfile=&quot;${docbook.dir}/all-sections.xml&quot;
+        force=&quot;no&quot;&gt;
+  &lt;filelist dir=&quot;${docbook.dir}/sections&quot;
+            files=&quot;introduction.xml,overview.xml&quot;/&gt;
+  &lt;fileset dir=&quot;${docbook.dir}&quot;
+           includes=&quot;sections/*.xml&quot;
+           excludes=&quot;introduction.xml,overview.xml&quot;/&gt;
+&lt;/concat&gt;</pre>
+
+    <p><strong>Concatenate a series of files, expanding Ant properties</strong></p>
+    <pre>
+&lt;concat destfile="${build.dir}/subs"&gt;
+  &lt;path&gt;
+    &lt;fileset dir="${src.dir}" includes="*.xml"/&gt;
+    &lt;pathelement location="build.xml"/&gt;
+  &lt;/path&gt;
+  &lt;filterchain&gt;
+    &lt;expandproperties/&gt;
+  &lt;/filterchain&gt;
+&lt;/concat&gt;</pre>
+
+    <p><strong>Filter the lines containing project from build.xml and output them to report.output,
+      prepending with a header</strong></p>
+    <pre>
+&lt;concat destfile="${build.dir}/report.output"&gt;
+  &lt;header filtering="no" trimleading="yes"&gt;
+      Lines that contain project
+      ==========================
+  &lt;/header&gt;
+  &lt;path path="build.xml"/&gt;
+  &lt;filterchain&gt;
+    &lt;linecontains&gt;
+      &lt;contains value="project"/&gt;
+    &lt;/linecontains&gt;
+  &lt;/filterchain&gt;
+&lt;/concat&gt;</pre>
+
+    <p><strong>Concatenate a number of binary files.</strong></p>
+    <pre>
+&lt;concat destfile="${build.dir}/dist.bin" binary="yes"&gt;
+  &lt;fileset file="${src.dir}/scripts/dist.sh"/&gt;
+  &lt;fileset file="${build.dir}/dist.tar.bz2"/&gt;
+&lt;/concat&gt;</pre>
 
-      
-
-    </body>
-
-  </html>
+  </body>
+</html>
diff -Nru ant-1.9.10/manual/Tasks/condition.html ant-1.10.3/manual/Tasks/condition.html
--- ant-1.9.10/manual/Tasks/condition.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/condition.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,87 +24,73 @@
 
 <body>
 
-<h2><a name="Condition">Condition</a></h2>
+<h2 id="condition">Condition</h2>
 <h3>Description</h3>
-<p>Sets a property if a certain condition holds true - this is a
-generalization of <a href="available.html">Available</a> and <a
-href="uptodate.html">Uptodate</a>.</p>
-<p>If the condition holds true, the property value is set to true by
-default; otherwise, the property is not set. You can set the value to
-something other than the default by specifying the <code>value</code>
-attribute.</p>
-<p>Conditions are specified as <a href="#nested">nested elements</a>,
-you must specify exactly one condition.</p>
+<p>Sets a property if a certain condition holds true&mdash;this is a generalization
+of <a href="available.html">Available</a> and <a href="uptodate.html">Uptodate</a>.</p>
+<p>If the condition holds true, the property value is set to <q>true</q> by default; otherwise, the
+property is not set. You can set the value to something other than the default by specifying
+the <var>value</var> attribute.</p>
+<p>Conditions are specified as <a href="#nested">nested elements</a>, you must specify exactly one
+condition.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">property</td>
-    <td valign="top">The name of the property to set.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>property</td>
+    <td>The name of the property to set.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">The value to set the property to. Defaults to
-      &quot;true&quot;.</td>
-    <td valign="top" align="center">No</td>
+    <td>value</td>
+    <td>The value to set the property to.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">else</td>
-    <td valign="top">The value to set the property to if the condition
-      evaluates to <i>false</i>. By default the property will remain unset.
-      <em>Since Apache Ant 1.6.3</em>
+    <td>else</td>
+    <td>The value to set the property to if the condition evaluates to <q>false</q>. <em>Since
+      Apache Ant 1.6.3</em>
     </td>
-    <td valign="top" align="center">No</td>
+    <td>No; by default the property will remain unset</td>
   </tr>
 </table>
-<h3><a name="nested">Parameters specified as nested elements</a></h3>
-<p>All conditions to test are specified as nested elements, for a
-complete list see <a href="conditions.html">here</a>.</p>
+<h3 id="nested">Parameters specified as nested elements</h3>
+<p>All conditions to test are specified as nested elements, for a complete list
+see <a href="conditions.html">here</a>.</p>
 
 <h3>Examples</h3>
 <pre>
-  &lt;condition property=&quot;javamail.complete&quot;&gt;
-    &lt;and&gt;
-      &lt;available classname=&quot;javax.activation.DataHandler&quot;/&gt;
-      &lt;available classname=&quot;javax.mail.Transport&quot;/&gt;
-    &lt;/and&gt;
-  &lt;/condition&gt;
-</pre>
-<p>sets the property <code>javamail.complete</code> if both the
-JavaBeans Activation Framework and JavaMail are available in the
-classpath.</p>
+&lt;condition property=&quot;javamail.complete&quot;&gt;
+  &lt;and&gt;
+    &lt;available classname=&quot;javax.activation.DataHandler&quot;/&gt;
+    &lt;available classname=&quot;javax.mail.Transport&quot;/&gt;
+  &lt;/and&gt;
+&lt;/condition&gt;</pre>
+<p>sets the property <code>javamail.complete</code> if both the JavaBeans Activation Framework and
+JavaMail are available in the classpath.</p>
 
 <pre>
-  &lt;condition property=&quot;isMacOsButNotMacOsX&quot;&gt;
-    &lt;and&gt;
-      &lt;os family=&quot;mac&quot;/&gt;
-
-      &lt;not&gt;
-        &lt;os family=&quot;unix&quot;/&gt;
-
-      &lt;/not&gt;
-    &lt;/and&gt;
-  &lt;/condition&gt;
-</pre>
-<p>sets the property <code>isMacOsButNotMacOsX</code> if the current
-operating system is MacOS, but not MacOS X - which Ant considers to be
-in the Unix family as well.</p>
+&lt;condition property=&quot;isMacOsButNotMacOsX&quot;&gt;
+  &lt;and&gt;
+    &lt;os family=&quot;mac&quot;/&gt;
+    &lt;not&gt;
+      &lt;os family=&quot;unix&quot;/&gt;
+    &lt;/not&gt;
+  &lt;/and&gt;
+&lt;/condition&gt;</pre>
+<p>sets the property <code>isMacOsButNotMacOsX</code> if the current operating system is MacOS, but
+not MacOS X/macOS&mdash;which Ant considers to be in the Unix family as well.</p>
 
 <pre>
-  &lt;condition property=&quot;isSunOSonSparc&quot;&gt;
-    &lt;os name=&quot;SunOS&quot; arch=&quot;sparc&quot;/&gt;
-
-  &lt;/condition&gt;
-</pre>
-<p>sets the property <code>isSunOSonSparc</code> if the current
-operating system is SunOS and if it is running on a sparc architecture.</p>
-
-
+&lt;condition property=&quot;isSunOSonSparc&quot;&gt;
+  &lt;os name=&quot;SunOS&quot; arch=&quot;sparc&quot;/&gt;
+&lt;/condition&gt;</pre>
+<p>sets the property <code>isSunOSonSparc</code> if the current operating system is SunOS and if it
+is running on a SPARC architecture.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/conditions.html ant-1.10.3/manual/Tasks/conditions.html
--- ant-1.9.10/manual/Tasks/conditions.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/conditions.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,951 +24,809 @@
 
 <body>
 
-<h2><a name="Conditions">Conditions</a></h2>
-  <p>Conditions are nested elements of the 
-<a href="condition.html"><code>&lt;condition&gt;</code></a> and
-<a href="waitfor.html"><code>&lt;waitfor&gt;</code></a> tasks.
-    There are core conditions and custom conditions. Custom
-    conditions are described in
-    <a href="../Types/custom-programming.html#customconditions">
-      Custom Conditions</a>.
-    Core Conditions are described below.
-  </p>
-  <h3><a name="coreconditions">Core Conditions</a></h3>
-
-<p>These are the nested elements that can be used as conditions in the
-<a href="condition.html"><code>&lt;condition&gt;</code></a> and
-<a href="waitfor.html"><code>&lt;waitfor&gt;</code></a> tasks.</p>
-
-<h4><a name="not">not</a></h4>
-<p>The <code>&lt;not&gt;</code> element expects exactly one other
-condition to be nested into this element, negating the result of the
-condition.  It doesn't have any attributes and accepts all nested
-elements of the condition task as nested elements as well.</p>
-
-<h4><a name="and">and</a></h4> <p>
-The <code>&lt;and&gt;</code> element doesn't have any attributes and
-accepts an arbitrary number of conditions as nested elements - all
-nested elements of the condition task are supported.  This condition
-is true if all of its contained conditions are, conditions will be
-evaluated in the order they have been specified in the build file.</p>
-<p>The <code>&lt;and&gt;</code> condition has the same shortcut
-semantics as the Java &amp;&amp; operator, as soon as one of the
-nested conditions is false, no other condition will be evaluated.</p>
-
-<h4><a name="or">or</a></h4> <p>
-The <code>&lt;or&gt;</code> element doesn't have any attributes and
-accepts an arbitrary number of conditions as nested elements - all
-nested elements of the condition task are supported.  This condition
-is true if at least one of its contained conditions is, conditions
-will be evaluated in the order they have been specified in the build
-file.</p> <p>The <code>&lt;or&gt;</code> condition has the same
-shortcut semantics as the Java || operator, as soon as one of the
-nested conditions is true, no other condition will be evaluated.</p>
-
-<h4><a name="xor">xor</a></h4>
-<p>The <code>&lt;xor&gt;</code> element performs an exclusive
-or on all nested elements, similar to the <code>^</code> operator
-in Java. It only evaluates to true if an odd number of nested conditions
+<h2 id="conditions">Conditions</h2>
+<p>Conditions are nested elements of the <a href="condition.html"><code>&lt;condition&gt;</code></a>
+and <a href="waitfor.html"><code>&lt;waitfor&gt;</code></a> tasks.  There are core conditions and
+custom conditions. Custom conditions are described
+in <a href="../Types/custom-programming.html#customconditions">Custom Conditions</a>.  Core
+Conditions are described below.</p>
+<h3 id="coreconditions">Core Conditions</h3>
+
+<p>These are the nested elements that can be used as conditions in
+the <a href="condition.html"><code>&lt;condition&gt;</code></a>
+and <a href="waitfor.html"><code>&lt;waitfor&gt;</code></a> tasks.</p>
+
+<h4 id="not">not</h4>
+<p>The <code>&lt;not&gt;</code> element expects exactly one other condition to be nested into this
+element, negating the result of the condition.  It doesn't have any attributes and accepts all
+nested elements of the condition task as nested elements as well.</p>
+
+<h4 id="and">and</h4>
+<p>The <code>&lt;and&gt;</code> element doesn't have any attributes and accepts an arbitrary number
+of conditions as nested elements&mdash;all nested elements of the condition task are supported.
+This condition is true if all of its contained conditions are, conditions will be evaluated in the
+order they have been specified in the build file.</p>
+<p>The <code>&lt;and&gt;</code> condition has the same shortcut semantics as the
+Java <code>&amp;&amp;</code> operator, as soon as one of the nested conditions is false, no other
+condition will be evaluated.</p>
+
+<h4 id="or">or</h4>
+<p>The <code>&lt;or&gt;</code> element doesn't have any attributes and accepts an arbitrary number
+of conditions as nested elements&mdash;all nested elements of the condition task are supported.
+This condition is true if at least one of its contained conditions is, conditions will be evaluated
+in the order they have been specified in the build file.</p>
+<p>The <code>&lt;or&gt;</code> condition has the same shortcut semantics as the Java <code>||</code>
+operator, as soon as one of the nested conditions is true, no other condition will be evaluated.</p>
+
+<h4 id="xor">xor</h4>
+<p>The <code>&lt;xor&gt;</code> element performs an exclusive or on all nested elements, similar to
+the <code>^</code> operator in Java. It only evaluates to true if an odd number of nested conditions
 are true. There is no shortcutting of evaluation, unlike the <code>&lt;and&gt;</code>
-and <code>&lt;or&gt;</code> tests.
-It doesn't have any attributes and accepts all nested
-elements of the condition task as nested elements as well.</p>
-
-<h4><a name="available">available</a></h4>
-<p>This condition is identical to the <a
-href="available.html">Available</a> task, all attributes and nested
-elements of that task are supported, the property and value attributes
-are redundant and will be ignored.</p>
-
-<h4><a name="uptodate">uptodate</a></h4>
-<p>This condition is identical to the <a
-href="uptodate.html">Uptodate</a> task, all attributes and nested
-elements of that task are supported, the property and value attributes
-are redundant and will be ignored.</p>
-
-<h4><a name="os">os</a></h4>
-<p>Test whether the current operating system is of a given type.  Each
-defined attribute is tested and the result is true only if <i>all</i>
-the tests succeed.
+and <code>&lt;or&gt;</code> tests.  It doesn't have any attributes and accepts all nested elements
+of the condition task as nested elements as well.</p>
+
+<h4 id="available">available</h4>
+<p>This condition is identical to the <a href="available.html">Available</a> task, all attributes
+and nested elements of that task are supported, the property and value attributes are redundant and
+will be ignored.</p>
+
+<h4 id="uptodate">uptodate</h4>
+<p>This condition is identical to the <a href="uptodate.html">Uptodate</a> task, all attributes and
+nested elements of that task are supported, the property and value attributes are redundant and will
+be ignored.</p>
+
+<h4 id="os">os</h4>
+<p>Test whether the current operating system is of a given type.  Each defined attribute is tested
+and the result is true only if <em>all</em> the tests succeed.
 </p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">family</td>
-    <td valign="top">The name of the operating system family to expect.</td>
-    <td valign="top" align="center">No</td>
+    <td>family</td>
+    <td>The name of the operating system family to expect.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The name of the operating system to expect.</td>
-    <td valign="top" align="center">No</td>
+    <td>name</td>
+    <td>The name of the operating system to expect.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">arch</td>
-    <td valign="top">The architecture of the operating system to expect.</td>
-    <td valign="top" align="center">No</td>
+    <td>arch</td>
+    <td>The architecture of the operating system to expect.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">version</td>
-    <td valign="top">The version of the operating system to expect.</td>
-    <td valign="top" align="center">No</td>
+    <td>version</td>
+    <td>The version of the operating system to expect.</td>
+    <td>No</td>
   </tr>
 </table>
 <p>Supported values for the family attribute are:
 <ul>
-  <li>windows (for all versions of Microsoft Windows)</li>
-  <li>dos (for all Microsoft DOS based operating systems including
-    Microsoft Windows and OS/2)</li>
-  <li>mac (for all Apple Macintosh systems)</li>
-  <li>unix (for all Unix and Unix-like operating systems)</li>
-  <li>netware (for Novell NetWare)</li>
-  <li>os/2 (for OS/2)</li>
-  <li>tandem (for HP's NonStop Kernel - formerly Tandem)</li>
-  <li>win9x for Microsoft Windows 95 and 98, ME and CE</li>
-  <li>winnt for Microsoft Windows NT-based systems, including Windows 2000, XP and
+  <li><q>windows</q>&mdash;for all versions of Microsoft Windows</li>
+  <li><q>dos</q>&mdash;for all Microsoft DOS based operating systems including Microsoft Windows and
+    OS/2</li>
+  <li><q>mac</q>&mdash;for all Apple Macintosh systems prior to Mac OS X</li>
+  <li><q>unix</q>&mdash;for all Unix(-like) operating systems, including Linux and Mac OS
+      X/macOS</li>
+  <li><q>netware</q>&mdash;for Novell NetWare</li>
+  <li><q>os/2</q>&mdash;for OS/2</li>
+  <li><q>tandem</q>&mdash;for HP's NonStop Kernel, formerly Tandem</li>
+  <li><q>win9x</q>&mdash;for Microsoft Windows 95 and 98, ME and CE</li>
+  <li><q>winnt</q>&mdash;for Microsoft Windows NT-based systems, including Windows 2000, XP and
       successors</li>
-  <li>z/os for z/OS and OS/390</li>
-  <li>os/400 for OS/400</li>
-  <li>openvms for OpenVMS</li>
+  <li><q>z/os</q>&mdash;for z/OS and OS/390</li>
+  <li><q>os/400</q>&mdash;for OS/400</li>
+  <li><q>openvms</q>&mdash;for OpenVMS</li>
 </ul>
 
-<h4><a name="equals">equals</a></h4>
+<h4 id="equals">equals</h4>
 <p>Tests whether the two given values are equal.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">arg1</td>
-    <td valign="top">First value to test.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>arg1</td>
+    <td>First value to test.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">arg2</td>
-    <td valign="top">Second value to test.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>arg2</td>
+    <td>Second value to test.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">casesensitive</td>
-    <td valign="top">Perform a case sensitive comparison.  Default is
-        true.</td>
-    <td valign="top" align="center">No</td>
+    <td>casesensitive</td>
+    <td>Perform a case sensitive comparison.</td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">trim</td>
-    <td valign="top">Trim whitespace from arguments before comparing
-        them.  Default is false.</td>
-    <td valign="top" align="center">No</td>
+    <td>trim</td>
+    <td>Trim whitespace from arguments before comparing them.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">forcestring</td>
-    <td valign="top">Force string comparison of <code>arg1/arg2</code>.
-        Default is false.  <em>Since Apache Ant 1.8.1</em>
+    <td>forcestring</td>
+    <td>Force string comparison of <var>arg1</var>/<var>arg2</var>.  <em>Since Apache Ant 1.8.1</em>
     </td>
-    <td valign="top" align="center">No</td>
+    <td>No; default is <q>false</q></td>
   </tr>
 </table>
 
-<h4><a name="isset">isset</a></h4>
+<h4 id="isset">isset</h4>
 <p>Test whether a given property has been set in this project.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">property</td>
-    <td valign="top">The name of the property to test.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>property</td>
+    <td>The name of the property to test.</td>
+    <td>Yes</td>
   </tr>
 </table>
 
-<h4><a name="checksum">checksum</a></h4>
-<p>This condition is identical to the <a href="checksum.html">Checksum</a>
-task, all attributes and nested elements of that task are supported,
-the property and overwrite attributes are redundant and will be
-ignored.</p>
+<h4 id="checksum">checksum</h4>
+<p>This condition is identical to the <a href="checksum.html">Checksum</a> task, all attributes and
+nested elements of that task are supported, the property and overwrite attributes are redundant and
+will be ignored.</p>
 
-<h4><a name="http">http</a></h4>
-<p>The <code>http</code> condition checks for a valid response from a
-web server of the specified url. By default, HTTP responses errors
-of 400 or greater are viewed as invalid.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<h4 id="http">http</h4>
+<p>The <code>http</code> condition checks for a valid response from a web server of the specified
+URL. By default, HTTP responses errors of 400 or greater are viewed as invalid.</p>
+<table class="attr">
   <tr>
-    <td width="12%" valign="top"><b>Attribute</b></td>
-    <td width="78%" valign="top"><b>Description</b></td>
-    <td width="10%" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">url</td>
-    <td valign="top">The full URL of the page to request. The web server must
-      return a status code below the value of <tt>errorsBeginAt</tt></td>
-    <td align="center">Yes.</td>
+    <td>url</td>
+    <td>The full URL of the page to request. The web server must return a status code below the
+      value of <var>errorsBeginAt</var></td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">errorsBeginAt</td>
-    <td valign="top">The lowest HTTP response code that signals an error;
-    by default '400'; server errors, not-authorized, not-found and the like
-    are detected</td>
-    <td align="center">No</td>
+    <td>errorsBeginAt</td>
+    <td>The lowest HTTP response code that signals an error; server errors, not-authorized,
+      not-found and the like are detected</td>
+    <td>No; default is <q>400</q></td>
   </tr>
   <tr>
-    <td valign="top">requestMethod</td>
-    <td valign="top">The HTTP method to be used when issuing the request.
-    Any of GET, POST, HEAD, OPTIONS, PUT, DELETEm and TRACE
-    are valid, subject to protocol restrictions. The default if not
-    specified is &quot;GET&quot;.<br/>
-      <em>since Ant 1.8.0</em></td>
-    <td align="center">No</td>
+    <td>requestMethod</td>
+    <td>The HTTP method to be used when issuing the request.  Any
+      of <q>GET</q>, <q>POST</q>, <q>HEAD</q>, <q>OPTIONS</q>, <q>PUT</q>, <q>DELETE</q>
+      and <q>TRACE</q> are valid, subject to protocol restrictions.<br/><em>since Ant
+      1.8.0</em></td>
+    <td>No; default is <q>GET</q></td>
   </tr>
   <tr>
-    <td valign="top">followRedirects</td>
-    <td valign="top">Whether redirects should be followed. The default
-      is <code>true</code><br/>
-      <em>since Ant 1.9.7</em></td>
-    <td align="center">No</td>
+    <td>followRedirects</td>
+    <td>Whether redirects should be followed.<br/><em>since Ant 1.9.7</em></td>
+    <td>No; default is <q>true</q></td>
   </tr>
 </table>
 
-<h4><a name="socket">socket</a></h4>
-<p>The <code>socket</code> condition checks for the existence of a
-TCP/IP listener at the specified host and port.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<h4 id="socket">socket</h4>
+<p>The <code>socket</code> condition checks for the existence of a TCP/IP listener at the specified
+host and port.</p>
+<table class="attr">
   <tr>
-    <td width="12%" valign="top"><b>Attribute</b></td>
-    <td width="78%" valign="top"><b>Description</b></td>
-    <td width="10%" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">server</td>
-    <td valign="top">The DNS name or IP address of the server.</td>
-    <td align="center">Yes.</td>
+    <td>server</td>
+    <td>The DNS name or IP address of the server.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">port</td>
-    <td valign="top">The port number to connect to.</td>
-    <td align="center">Yes.</td>
+    <td>port</td>
+    <td>The port number to connect to.</td>
+    <td>Yes</td>
   </tr>
 </table>
 
-<h4><a name="filesmatch">filesmatch</a></h4>
-<p>Test two files for matching. Nonexistence of one file results in "false",
-although if neither exists they are considered equal in terms of content.
-This test does a byte for byte comparison, so test time scales with
-byte size. NB: if the files are different sizes, one of them is missing
-or the filenames match the answer is so obvious the detailed test is omitted.
-
+<h4 id="filesmatch">filesmatch</h4>
+<p>Test two files for matching. Nonexistence of one file results in <q>false</q>, although if
+neither exists they are considered equal in terms of content.  This test does a byte for byte
+comparison, so test time scales with byte size. <strong>Note</strong>: if the files are different
+sizes, one of them is missing or the filenames match the answer is so obvious the detailed test is
+omitted.
 </p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td width="12%" valign="top"><b>Attribute</b></td>
-    <td width="78%" valign="top"><b>Description</b></td>
-    <td width="10%" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file1</td>
-    <td valign="top">First file to test</td>
-    <td align="center">Yes</td>
+    <td>file1</td>
+    <td>First file to test</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">file2</td>
-    <td valign="top">Second file to test</td>
-    <td align="center">Yes</td>
+    <td>file2</td>
+    <td>Second file to test</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">textfile</td>
-    <td valign="top">Whether to ignore line endings when comparing
-        files; defaults to <i>false</i> which triggers a binary
-        comparison. <b>Since Ant 1.7</b>
+    <td>textfile</td>
+    <td>Whether to ignore line endings when comparing files. <em>Since Ant 1.7</em>
     </td>
-    <td align="center">No</td>
+    <td>No; defaults to <q>false</q> which triggers a binary comparison</td>
   </tr>
 </table>
 
-<h4><a name="contains">contains</a></h4>
+<h4 id="contains">contains</h4>
 <p>Tests whether a string contains another one.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">string</td>
-    <td valign="top">The string to search in.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>string</td>
+    <td>The string to search in.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">substring</td>
-    <td valign="top">The string to search for.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>substring</td>
+    <td>The string to search for.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">casesensitive</td>
-    <td valign="top">Perform a case sensitive comparison.  Default is
-        true.</td>
-    <td valign="top" align="center">No</td>
+    <td>casesensitive</td>
+    <td>Perform a case sensitive comparison.</td>
+    <td>No; default is <q>true</q></td>
   </tr>
 </table>
 
-<h4><a name="istrue">istrue</a></h4>
-<p>Tests whether a string equals any of the ant definitions of true,
-that is "true","yes", or "on"</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<h4 id="istrue">istrue</h4>
+<p>Tests whether a string equals any of the Ant definitions of true, that
+is <q>true</q>, <q>yes</q>, or <q>on</q></p>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">value to test</td>
-    <td valign="top" align="center">Yes</td>
+    <td>value</td>
+    <td>value to test</td>
+    <td>Yes</td>
   </tr>
 </table>
-<blockquote><pre>
+<pre>
 &lt;istrue value=&quot;${someproperty}&quot;/&gt;
-&lt;istrue value=&quot;false&quot;/&gt;
-</pre></blockquote>
+&lt;istrue value=&quot;false&quot;/&gt;</pre>
 
-<h4><a name="isfalse">isfalse</a></h4>
-<p>Tests whether a string is not true, the negation of &lt;istrue&gt;
-</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<h4 id="isfalse">isfalse</h4>
+<p>Tests whether a string is not true, the negation of <code>&lt;istrue&gt;</code></p>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">value to test</td>
-    <td valign="top" align="center">Yes</td>
+    <td>value</td>
+    <td>value to test</td>
+    <td>Yes</td>
   </tr>
 </table>
-<blockquote><pre>
+<pre>
 &lt;isfalse value=&quot;${someproperty}&quot;/&gt;
-&lt;isfalse value=&quot;false&quot;/&gt;
-</pre></blockquote>
-
-<h4><a name="isreference">isreference</a></h4>
+&lt;isfalse value=&quot;false&quot;/&gt;</pre>
 
-<p>Test whether a given reference has been defined in this project and
-- optionally - is of an expected type.</p>
+<h4 id="isreference">isreference</h4>
+<p>Test whether a given reference has been defined in this project and&mdash;optionally&mdash;is of
+an expected type.</p>
 
-<p>This condition has been added in Apache Ant 1.6.</p>
+<p><em>Since Apache Ant 1.6</em>.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">refid</td>
-    <td valign="top">The id of the reference to test.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>refid</td>
+    <td>The <var>id</var> of the reference to test.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">type</td>
-    <td valign="top">Name of the data type or task this reference is
-       expected to be.</td>
-    <td valign="top" align="center">No</td>
+    <td>type</td>
+    <td>Name of the data type or task this reference is expected to be.</td>
+    <td>No</td>
   </tr>
 </table>
 
-<h4><a name="issigned">issigned</a></h4>
-  <p>
-    Test whether a jarfile is signed.
-    If the name of the
-    signature is passed, the file is checked for presence of that
-    particular signature; otherwise the file is checked for the
-    existence of any signature. It does not perform rigorous
-    signature validation; it only looks for the presence of a signature.
-  </p>
-  <p>
-    This condition was added in Apache Ant 1.7.
-  </p>
-  <table border="1" cellpadding="2" cellspacing="0">
+<h4 id="issigned">issigned</h4>
+<p>Test whether a jarfile is signed.  If the name of the signature is passed, the file is checked
+for presence of that particular signature; otherwise the file is checked for the existence of any
+signature. It does not perform rigorous signature validation; it only looks for the presence of a
+signature.</p>
+<p><em>Since Apache Ant 1.7</em>.</p>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">
-      The jarfile that is to be tested for the presence
-      of a signature.
-    </td>
-    <td valign="top" align="center">Yes</td>
+    <td>file</td>
+    <td>The jarfile that is to be tested for the presence of a signature.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top"> The signature name to check for.</td>
-    <td valign="top" align="center">No</td>
+    <td>name</td>
+    <td>The signature name to check for.</td>
+    <td>No</td>
   </tr>
-  </table>
+</table>
 
-<h4><a name="isfileselected">isfileselected</a></h4>
-  <p>
-    Test whether a file passes an embedded
-    <a href="../Types/selectors.html">selector</a>.
-  </p>
-  <p>
-    This condition was added in Apache Ant 1.6.3.
-  </p>
-  <table border="1" cellpadding="2" cellspacing="0">
+<h4 id="isfileselected">isfileselected</h4>
+<p>Test whether a file passes an embedded <a href="../Types/selectors.html">selector</a>.</p>
+<p><em>Since Apache Ant 1.6.3</em>.</p>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">
-      The file to check if is passes the embedded selector.
-    </td>
-    <td valign="top" align="center">Yes</td>
+    <td>file</td>
+    <td>The file to check if is passes the embedded selector.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">basedir</td>
-    <td valign="top">The base directory to use for name based selectors. It this is not set,
-      the project's basedirectory will be used.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  </table>
-  <p>
-    Example usage:
-  </p>
-<blockquote><pre>
+    <td>basedir</td>
+    <td>The base directory to use for name based selectors. It this is not set, the
+      project's <var>basedir</var> will be used.</td>
+    <td>No</td>
+  </tr>
+</table>
+<p>Example usage:</p>
+<pre>
 &lt;isfileselected file="a.xml"&gt;
   &lt;date datetime="06/28/2000 2:02 pm" when="equal"/&gt;
-&lt;/isfileselected&gt;
-</pre></blockquote>
+&lt;/isfileselected&gt;</pre>
 
-<h4><a name="typefound">typefound</a></h4>
+<h4 id="typefound">typefound</h4>
 
-<p>Test whether a given type is defined, and that
-its implementation class can be loaded. Types include
-tasks, datatypes, scriptdefs, macrodefs and presetdefs.</p>
+<p>Test whether a given type is defined, and that its implementation class can be loaded. Types
+include tasks, datatypes, scriptdefs, macrodefs and presetdefs.</p>
 
-<p>This condition was added in Apache Ant 1.7.</p>
+<p><em>Since Apache Ant 1.7</em>.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">name of the type</td>
-    <td valign="top" align="center">Yes</td>
+    <td>name</td>
+    <td>Name of the type</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">uri</td>
-    <td valign="top">
-      The uri that this type lives in.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>uri</td>
+    <td>The URI that this type lives in.</td>
+    <td>No</td>
   </tr>
 </table>
 
-  <p>
-    Example usages:
-  </p>
-<blockquote><pre>
+<p>Example usages:</p>
+<pre>
 &lt;typefound name="junit"/&gt;
-&lt;typefound uri="antlib:org.apache.maven.artifact.ant" name="artifact"/&gt;
-</pre></blockquote>
+&lt;typefound uri="antlib:org.apache.maven.artifact.ant" name="artifact"/&gt;</pre>
 
-<h4><a name="scriptcondition">scriptcondition</a></h4>
+<h4 id="scriptcondition">scriptcondition</h4>
 
-<p>Evaluate a condition based on a script in any
-<a href="http://jakarta.apache.org/bsf" target="_top">Apache BSF</a>
-  or
-  <a href="https://scripting.dev.java.net">JSR 223</a>
-supported language.
-</p>
-<p>
-See the <a href="../Tasks/script.html">Script</a> task for
-an explanation of scripts and dependencies.
-</p>
+<p>Evaluate a condition based on a script in any <a href="https://jakarta.apache.org/bsf"
+target="_top">Apache BSF</a>
+or <a href="https://jcp.org/aboutJava/communityprocess/maintenance/jsr223/223ChangeLog.html"
+target="_top">JSR 223</a> supported language.</p>
+<p>See the <a href="../Tasks/script.html">Script</a> task for an explanation of scripts and
+dependencies.</p>
 
-<p>This condition was added in Apache Ant 1.7.</p>
+<p><em>Since Apache Ant 1.7</em>.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">language</td>
-    <td valign="top">script language</td>
-    <td valign="top" align="center">Yes</td>
+    <td>language</td>
+    <td>script language</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">manager</td>
-    <td valign="top">
-      The script engine manager to use.
-      See the <a href="../Tasks/script.html">script</a> task
-      for using this attribute.
-    </td>
-    <td valign="top" align="center">No - default is "auto"</td>
+    <td>manager</td>
+    <td>The script engine manager to use.  See the <a href="../Tasks/script.html">script</a> task
+      for using this attribute.</td>
+    <td>No; default is <q>auto</q></td>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">default boolean value</td>
-    <td valign="top" align="center">No -default is "false"</td>
-  </tr>  
+    <td>value</td>
+    <td>default boolean value</td>
+    <td>No; default is <q>false</q></td>
+  </tr>
   <tr>
-    <td valign="top">src</td>
-    <td valign="top">filename of script source</td>
-    <td valign="top" align="center">No</td>
+    <td>src</td>
+    <td>filename of script source</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">setbeans</td>
-    <td valign="top">whether to have all properties, references and targets as
-      global variables in the script.  <em>since Ant 1.8.0</em></td>
-    <td valign="top" align="center">No, default is "true".</td>
+    <td>encoding</td>
+    <td>The encoding of the script source. <em>Since Ant 1.10.2</em>.</td>
+    <td>No; defaults to default JVM character encoding</td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">
-      The classpath to pass into the script.
-    </td>
-    <td align="center" valign="top">No</td>
+    <td>setbeans</td>
+    <td>whether to have all properties, references and targets as global variables in the
+      script.  <em>since Ant 1.8.0</em></td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">The classpath to use, given as a
-       <a href="../using.html#references">reference</a> to a path defined elsewhere.
-    <td align="center" valign="top">No</td>
+    <td>classpath</td>
+    <td>The classpath to pass into the script.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>classpathref</td>
+    <td>The classpath to use, given as a <a href="../using.html#references">reference</a> to a path
+    defined elsewhere.</td>
+    <td>No</td>
   </tr>
 </table>
 <h5>Parameters specified as nested elements</h5>
 <h6>classpath</h6>
-  <p>
-    See the <a href="../Tasks/script.html">script</a> task
-    for using this nested element.
-  </p>
+<p>See the <a href="../Tasks/script.html">script</a> task for using this nested element.</p>
 <h5>Description</h5>
-<p>
-The script supports script language inline, this script has access to the
-same beans as the <code>&lt;script&gt;</code> task, and to the <code>self</code> bean,
-which refers back to the condition itself. If the script evaluates to a boolean result,
-this is the result of the condition's evaluation (<em>since Ant 1.7.1</em>).
-Alternatively, <code>self.value</code> can be used to set the evaluation result.
-</p>
-<p>
-Example:
-</p>
-<blockquote><pre>
+<p>The script supports script language inline, this script has access to the same beans as
+the <code>&lt;script&gt;</code> task, and to the <code>self</code> bean, which refers back to the
+condition itself. If the script evaluates to a boolean result, this is the result of the condition's
+evaluation (<em>since Ant 1.7.1</em>).  Alternatively, <code>self.value</code> can be used to set
+the evaluation result.</p>
+<p>Example:</p>
+<pre>
 &lt;scriptcondition language=&quot;javascript&quot;
         value=&quot;true&quot;&gt;
     self.setValue(false);
-&lt;/scriptcondition&gt;
-</pre></blockquote>
+&lt;/scriptcondition&gt;</pre>
 
-Sets the default value of the condition to true, then in the script, 
-sets the value to false. This condition always evaluates to "false"
+<p>Sets the default value of the condition to <q>true</q>, then in the script, sets the value
+to <q>false</q>. This condition always evaluates to <q>false</q>.</p>
 
-<h4><a name="parsersupports">parsersupports</a></h4>
+<h4 id="parsersupports">parsersupports</h4>
 
-<p>Tests whether Ant's XML parser supports a given
-feature or property, as per the SAX/JAXP specifications, by
-attempting to set the appropriate property/feature/</p>
+<p>Tests whether Ant's XML parser supports a given feature or property, as per the SAX/JAXP
+specifications, by attempting to set the appropriate property/feature</p>
 
-<p>This condition was added in Apache Ant 1.7.</p>
+<p><em>Since Apache Ant 1.7</em>.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">property</td>
-    <td valign="top">property to set</td>
-    <td valign="top" align="center">one of property or feature</td>
+    <td>property</td>
+    <td>property to set</td>
+    <td rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
-    <td valign="top">feature</td>
-    <td valign="top">feature to set</td>
-    <td valign="top" align="center">one of property or feature</td>
+    <td>feature</td>
+    <td class="left">feature to set</td>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">string (property) or boolean (feature)</td>
-    <td valign="top" align="center">For property tests, but not for feature tests</td>
+    <td>value</td>
+    <td>string (property) or boolean (feature)</td>
+    <td>For property tests, but not for feature tests</td>
   </tr>
 </table>
 
-<blockquote><pre>
-&lt;parsersupports feature="http://xml.org/sax/features/namespaces"/&gt;
-</pre></blockquote>
-Check for namespace support. All SAX2 parsers should have this.
-<blockquote><pre>
+<pre>&lt;parsersupports feature="http://xml.org/sax/features/namespaces"/&gt;</pre>
+<p>Check for namespace support. All SAX2 parsers should have this.</p>
+
+<pre>
 &lt;or&gt;
   &lt;parsersupports
     feature="http://apache.org/xml/features/validation/schema"/&gt;
   &lt;parsersupports
     feature="http://java.sun.com/xml/jaxp/properties/schemaSource"/&gt;
-&lt;/or&gt;
-</pre></blockquote>
-
-Check for XML Schema support.
+&lt;/or&gt;</pre>
+<p>Check for XML Schema support.</p>
 
 <pre>
 &lt;parsersupports
   property="http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation"
-  value="document.xsd"/&gt;
-</pre>
-
-Check for Xerces-specific definition of the location of the no namespace schema.
-
-<h4><a name="isreachable">isreachable</a></h4>
-
-<p>Uses Java1.5+ networking APIs to probe for a (remote) system being
-reachable. Exactly what probe mechanisms are used is an implementation
-feature of the JVM. They may include ICMP "ping" packets, UDP or TCP connections
-to port 7 "echo service" or other means. On Java1.4 and earlier, being able
-to resolve the hostname is considered success. This means that if DNS is not
-working or a URL/hostname is bad, the test will fail, but otherwise succeed
-even if the remote host is actually absent.
-
-</p>
-<p>
-This condition turns unknown host exceptions into false conditions. This is
-because on a laptop, DNS is one of the first services when the network goes; you
-are implicitly offline.
-</p>
-<p>
- If a URL is supplied instead of a host, the hostname is extracted
- and used in the test - all other parts of the URL are discarded.
-</p>
-<p>
-The test may not work through firewalls, that is, something may be reachable
-using a protocol such as HTTP, while the lower level ICMP packets get dropped
-on the floor. Similarly, a host may detected as reachable with ICMP, but
-not reachable on other ports (i.e. port 80), because of firewalls.
-</p>
-<p>
+  value="document.xsd"/&gt;</pre>
+<p>Check for Xerces-specific definition of the location of the no namespace schema.</p>
 
-This condition was added in Apache Ant 1.7.</p>
+<h4 id="isreachable">isreachable</h4>
 
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">host</td>
-    <td valign="top">host to check for</td>
-    <td valign="top" align="center">one of url or host</td>
-  </tr>
-  <tr>
-    <td valign="top">url</td>
-    <td valign="top">URL containing hostname</td>
-    <td valign="top" align="center">one of url or host</td>
-  </tr>
-  <tr>
-    <td valign="top">timeout</td>
-    <td valign="top">timeout in seconds</td>
-    <td valign="top" align="center">no, default is 30s</td>
+<p>Uses Java 5+ networking APIs to probe for a (remote) system being reachable. Exactly what probe
+mechanisms are used is an implementation feature of the JVM. They may include ICMP "ping" packets,
+UDP or TCP connections to port 7 "echo service" or other means. On Java 1.4 and earlier, being able
+to resolve the hostname is considered success. This means that if DNS is not working or a
+URL/hostname is bad, the test will fail, but otherwise succeed even if the remote host is actually
+absent.</p>
+<p>This condition turns unknown host exceptions into false conditions. This is because on a laptop,
+DNS is one of the first services when the network goes; you are implicitly offline.</p>
+<p>If a URL is supplied instead of a <var>host</var>, the hostname is extracted and used in the
+test&mdash;all other parts of the URL are discarded.</p>
+<p>The test may not work through firewalls, that is, something may be reachable using a protocol
+such as HTTP, while the lower level ICMP packets get dropped on the floor. Similarly, a host may
+detected as reachable with ICMP, but not reachable on other ports (i.e. port 80), because of
+firewalls.</p>
+<p><em>Since Apache Ant 1.7</em>.</p>
+
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>host</td>
+    <td>host to check for</td>
+    <td rowspan="2">Exactly one of the two</td>
+  </tr>
+  <tr>
+    <td>url</td>
+    <td class="left">URL containing hostname</td>
+  </tr>
+  <tr>
+    <td>timeout</td>
+    <td>timeout in seconds</td>
+    <td>No; default is <q>30</q></td>
   </tr>
 </table>
 
-<blockquote><pre>
+<pre>
 &lt;condition property="offline"&gt;
-  &lt;isreachable url="http://ibiblio.org/maven/" /&gt;
-&lt;/condition&gt;
-</pre></blockquote>
+  &lt;isreachable url="http://ibiblio.org/maven/"/&gt;
+&lt;/condition&gt;</pre>
 
-<p>
-Probe for the maven repository being reachable.
-</p>
+<p>Probe for the Maven repository being reachable.</p>
 
-<blockquote><pre>
+<pre>
 &lt;condition property="offline"&gt;
-  &lt;isreachable host="ibiblio.org" timeout="10" /&gt;
-&lt;/condition&gt;
-</pre></blockquote>
+  &lt;isreachable host="ibiblio.org" timeout="10"/&gt;
+&lt;/condition&gt;</pre>
 
-<p>
-Probe for the maven repository being reachable using the hostname, ten second timeout..
-</p>
+<p>Probe for the Maven repository being reachable using the hostname, ten second timeout.</p>
 
-<h4><a name="length">length</a></h4>
-<p>This condition is a facet of the <a href="length.html">Length</a> task.
-  It is used to test the length of a string or one or more files.
-  <b>Since Ant 1.6.3</b>
-</p>
+<h4 id="length">length</h4>
+<p><em>Since Ant 1.6.3</em></p>
+<p>This condition is a facet of the <a href="length.html">Length</a> task. It is used to test the
+length of a string or one or more files.</p>
 
-<blockquote><pre>
-&lt;length string=" foo " trim="true" length="3" /&gt;
-</pre></blockquote>
+<pre>&lt;length string=" foo " trim="true" length="3"/&gt;</pre>
 <p>Verify a string is of a certain length.</p>
 
-<blockquote><pre>
-&lt;length file=&quot;foo&quot; when=&quot;greater&quot; length=&quot;0&quot; /&gt;
-</pre></blockquote>
-<p>Verify that file <i>foo</i> is not empty.</p>
+<pre>&lt;length file=&quot;foo&quot; when=&quot;greater&quot; length=&quot;0&quot;/&gt;</pre>
+<p>Verify that file <samp>foo</samp> is not empty.</p>
 
-<h4><a name="isfailure">isfailure</a></h4>
+<h4 id="isfailure">isfailure</h4>
+<p><em>Since Ant 1.7</em></p>
+<p>Test the return code of an executable (see the <a href="exec.html">Exec</a> task) for
+failure.</p>
 
-<p>Test the return code of an executable (see the
-<a href="exec.html">Exec</a> task) for failure. <b>Since Ant 1.7</b></p>
-
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">code</td>
-    <td valign="top">The return code to test.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>code</td>
+    <td>The return code to test.</td>
+    <td>Yes</td>
   </tr>
 </table>
 
-<h4><a name="resourcecount">resourcecount</a></h4>
-<p>This condition is a facet of the
-  <a href="resourcecount.html">ResourceCount</a> task.
-  It is used to test the size of a 
-  <a href="../Types/resources.html#collection">resource collection</a>.
-  <b>Since Ant 1.7</b>
-</p>
+<h4 id="resourcecount">resourcecount</h4>
+<p><em>Since Ant 1.7</em></p>
+<p>This condition is a facet of the <a href="resourcecount.html">ResourceCount</a> task.  It is used
+to test the size of a <a href="../Types/resources.html#collection">resource
+collection</a>.</p>
 
-<blockquote><pre>
-&lt;resourcecount refid=&quot;myresourcecollection&quot; when=&quot;greater&quot; count=&quot;0&quot; /&gt;
-</pre></blockquote>
+<pre>&lt;resourcecount refid=&quot;myresourcecollection&quot; when=&quot;greater&quot; count=&quot;0&quot;/&gt;</pre>
 <p>Verify that a resource collection is not empty.</p>
 
-<h4><a name="resourcesmatch">resourcesmatch</a></h4>
-<p>Test resources for matching. Nonexistence of one or more resources results in
-"false", although if none exists they are considered equal in terms of content.
-By default this test does a byte for byte comparison, so test time scales with
-byte size. NB: if the files are different sizes, one of them is missing
-or the filenames match the answer is so obvious the detailed test is omitted.
-The resources to check are specified as nested
-<a href="../Types/resources.html#collection">resource collections</a>,
-meaning that more than two resources can be checked; in this case all resources
-must match. <b>Since Ant 1.7</b>
-</p>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td width="12%" valign="top"><b>Attribute</b></td>
-    <td width="78%" valign="top"><b>Description</b></td>
-    <td width="10%" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">astext</td>
-    <td valign="top">Whether to ignore line endings
-        when comparing resource content; defaults to <i>false</i>,
-        while <i>true</i> triggers a binary comparison.
-    </td>
-    <td align="center">No</td>
+<h4 id="resourcesmatch">resourcesmatch</h4>
+<p><em>Since Ant 1.7</em></p>
+<p>Test resources for matching. Nonexistence of one or more resources results in <q>false</q>,
+although if none exists they are considered equal in terms of content.  By default, this test does a
+byte for byte comparison, so test time scales with byte size. <strong>Note</strong>: if the files
+are different sizes, one of them is missing or the filenames match the answer is so obvious the
+detailed test is omitted.  The resources to check are specified as
+nested <a href="../Types/resources.html#collection">resource collections</a>, meaning that more than
+two resources can be checked; in this case all resources must match.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>astext</td>
+    <td>Whether to ignore line endings when comparing resource content; <q>true</q> triggers a
+      binary comparison.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
 </table>
 
-<h4><a name="resourcecontains">resourcecontains</a></h4>
+<h4 id="resourcecontains">resourcecontains</h4>
+<p><em>Since Ant 1.7.1</em></p>
 <p>Tests whether a resource contains a given (sub)string.</p>
-<p>The resources to check are specified via references or - in the
-  case of file resources via the resource attribute.  <b>Since Ant 1.7.1</b>
-</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<p>The resources to check are specified via references or&mdash;in the case of file
+resources&mdash;via the <var>resource</var> attribute.</p>
+<table class="attr">
   <tr>
-    <td width="12%" valign="top"><b>Attribute</b></td>
-    <td width="78%" valign="top"><b>Description</b></td>
-    <td width="10%" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">resource</td>
-    <td valign="top">Name of a file that is the resource to test.
-    </td>
-    <td align="center" rowspan="2">One of the two</td>
+    <td>resource</td>
+    <td>Name of a file that is the resource to test.</td>
+    <td rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
-    <td valign="top">refid</td>
-    <td valign="top">Reference to a resource defined inside the project.</td>
+    <td>refid</td>
+    <td class="left">Reference to a resource defined inside the project.</td>
   </tr>
   <tr>
-    <td valign="top">substring</td>
-    <td valign="top">The string to search for.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>substring</td>
+    <td>The string to search for.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">casesensitive</td>
-    <td valign="top">Perform a case sensitive comparison.  Default is
-        true.</td>
-    <td valign="top" align="center">No</td>
+    <td>casesensitive</td>
+    <td>Perform a case sensitive comparison.</td>
+    <td>No; default is <q>true</q></td>
   </tr>
 </table>
 
-<h4><a name="hasmethod">hasmethod</a></h4>
+<h4 id="hasmethod">hasmethod</h4>
+<p><em>Since Ant 1.7</em></p>
+<p>Tests for a class having a method or field. If the class is not found or fails to load, the build
+fails.</p>
 
-<p> Tests for a class having a method or field. If the class is not found 
-    or fails to load, the build fails. 
-    
-    <b>Since Ant 1.7</b>
-</p>
-
-<table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-        <td width="12%" valign="top"><b>Attribute</b></td>
-        <td width="78%" valign="top"><b>Description</b></td>
-        <td width="10%" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-        <td valign="top">classname</td>
-        <td valign="top">name of the class to load</td>
-        <td align="center">yes</td>
-    </tr>
-    <tr>
-        <td valign="top">field</td>
-        <td valign="top">name of a field to look for</td>
-        <td align="center">one of field or method</td>
-    </tr>
-    <tr>
-        <td valign="top">method</td>
-        <td valign="top">name of a method to look for</td>
-        <td align="center">one of field or method</td>
-    </tr>
-    
-    <tr>
-        <td valign="top">ignoreSystemClasses</td>
-        <td valign="top">should system classes be ignored?</td>
-        <td align="center">No -default is false</td>
-    </tr>
-    <tr>
-        <td valign="top">classpath</td>
-        <td valign="top">a class path</td>
-        <td align="center">No</td>
-    </tr>
-    <tr>
-        <td valign="top">classpathref</td>
-        <td valign="top">reference to a class path</td>
-        <td align="center">No</td>
-    </tr>
-</table>
-
-<p>
-    There is also a nested &lt;classpath&gt; element, which can be used to specify 
-    a classpath.
-</p>
-<blockquote><pre>
-&lt;hasmethod classname="java.util.ArrayList" method="trimToSize"  /&gt;
-</pre></blockquote>
-
-<p>Looks for the method trimToSize in the ArrayList class.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>classname</td>
+    <td>name of the class to load</td>
+    <td>yes</td>
+  </tr>
+  <tr>
+    <td>field</td>
+    <td>name of a field to look for</td>
+    <td rowspan="2">Exactly one of the two</td>
+  </tr>
+  <tr>
+    <td>method</td>
+    <td class="left">name of a method to look for</td>
+  </tr>
+  <tr>
+    <td>ignoreSystemClasses</td>
+    <td>should system classes be ignored?</td>
+    <td>No; default is <q>false</q></td>
+  </tr>
+  <tr>
+    <td>classpath</td>
+    <td>a class path</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>classpathref</td>
+    <td>reference to a class path</td>
+    <td>No</td>
+  </tr>
+</table>
 
-<h4><a name="matches">matches</a></h4>
+<p>There is also a nested <code>&lt;classpath&gt;</code> element, which can be used to specify a
+classpath.</p>
+<pre>&lt;hasmethod classname="java.util.ArrayList" method="trimToSize"/&gt;</pre>
+<p>Looks for the method <code class="code">trimToSize()</code> in
+the <code class="code">java.util.ArrayList</code> class.</p>
 
-<p>
-  Test if the specified string matches the specified regular
-  expression pattern.
-  <b>Since Ant 1.7</b></p>
+<h4 id="matches">matches</h4>
+<p><em>Since Ant 1.7</em></p>
+<p>Test if the specified string matches the specified regular expression pattern</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">string</td>
-    <td valign="top">The string to test.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>string</td>
+    <td>The string to test.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">pattern</td>
-    <td valign="top">The regular expression pattern used to test.</td>
-    <td valign="top" align="center">Yes, unless there is a nested
-      <code>&lt;regexp&gt;</code> element.</td>
+    <td>pattern</td>
+    <td>The regular expression pattern used to test.</td>
+    <td>Yes, unless there is a nested <code>&lt;regexp&gt;</code> element</td>
   </tr>
   <tr>
-    <td valign="top">casesensitive</td>
-    <td valign="top">Perform a case sensitive match.  Default is
-        true.</td>
-    <td valign="top" align="center">No</td>
+    <td>casesensitive</td>
+    <td>Perform a case sensitive match.</td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">multiline</td>
-    <td valign="top">
-      Perform a multi line match.
-      Default is false.</td>
-    <td valign="top" align="center">No</td>
+    <td>multiline</td>
+    <td>Perform a multi line match.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">singleline</td>
-    <td valign="top">
-      This allows '.' to match new lines.
-      SingleLine is not to be confused with multiline, SingleLine is a perl
-      regex term, it corresponds to dotall in java regex.
-      Default is false.</td>
-    <td valign="top" align="center">No</td>
+    <td>singleline</td>
+    <td>This allows <q>.</q> to match new lines. <var>SingleLine</var> is not to be confused with
+      multiline, <var>SingleLine</var> is a perl regex term, it corresponds to <var>dotall</var> in
+      Java regex.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
 </table>
 
-  <p>
-    There is also an optional &lt;regexp&gt; element, which can be used to specify
-    a regular expression instead of the "pattern" attribute.
-    See <a href="../Types/regexp.html">Regexp Type</a> for the description
-    of the nested element regexp and of
-    the choice of regular expression implementation.
-  </p>
-  <p>
-    An example:
-  </p>
-<blockquote><pre>
+<p>There is also an optional <code>&lt;regexp&gt;</code> element, which can be used to specify a
+regular expression instead of the <var>pattern</var> attribute.
+See <a href="../Types/regexp.html">Regexp Type</a> for the description of the nested element regexp
+and of the choice of regular expression implementation.</p>
+<p>An example:</p>
+<pre>
 &lt;condition property="legal-password"&gt;
   &lt;matches pattern="[1-9]" string="${user-input}"/&gt;
 &lt;/condition&gt;
 &lt;fail message="Your password should at least contain one number"
-      unless="legal-password"/&gt;
-</pre></blockquote>
-  <p>
-    The following example sets the property "ok" if
-    the property "input" is three characters long, starting
-    with 'a' and ending with 'b'.
-  </p>
-<blockquote><pre>
+      unless="legal-password"/&gt;</pre>
+<p>The following example sets the property <code>ok</code> if the property <code>input</code> is
+three characters long, starting with <q>a</q> and ending with <q>b</q>.</p>
+<pre>
 &lt;condition property="ok"&gt;
   &lt;matches string="${input}" pattern="^a.b$"/&gt;
-&lt;/condition&gt;
-</pre></blockquote>
-  <p>
-    The following defines a reference regular expression for
-    matching dates and then uses antunit to check if the
-    property "today" is in the correct format:
-  </p>
-<blockquote><pre>
+&lt;/condition&gt;</pre>
+<p>The following defines a reference regular expression for matching dates and then uses antunit to
+check if the property <code>today</code> is in the correct format:</p>
+<pre>
 &lt;regexp id="date.pattern" pattern="^[0123]\d-[01]\d-[12]\d\d\d$"/&gt;
 
 &lt;au:assertTrue xmlns:au="antlib:org.apache.ant.antunit"&gt;
   &lt;matches string="${today}"&gt;
     &lt;regexp refid="date.pattern"/&gt;
   &lt;/matches&gt;
-&lt;/au:assertTrue&gt;
-</pre></blockquote>
-  <p>
-    The following example shows the use of the singleline and the casesensitive
-    flags.
-  </p>
-<blockquote><pre>
+&lt;/au:assertTrue&gt;</pre>
+<p>The following example shows the use of the <var>singleline</var> and the <var>casesensitive</var>
+flags.</p>
+<pre>
 &lt;au:assertTrue&gt;
   &lt;matches string="AB${line.separator}C" pattern="^ab.*C$"
            casesensitive="false"
@@ -978,156 +836,128 @@
   &lt;matches string="AB${line.separator}C" pattern="^ab.*C$"
            casesensitive="false"
            singleline="false"/&gt;
-&lt;/au:assertFalse&gt;
-</pre></blockquote>
-
-<h4><a name="antversion">antversion</a></h4>
-<p>This condition is identical to the <a
-href="antversion.html">Antversion</a> task, all attributes are supported, the property attribute
-is redundant and will be ignored.</p>
-
+&lt;/au:assertFalse&gt;</pre>
 
-<h4><a name="hasfreespace">hasfreespace</a></h4>
-
-<p>
-  Tests a partition to see if there is enough space.
-  <b>Since Ant 1.7.0</b></p>
-  <p>Needed attribute can be specified using standard computing terms:<br/>
-    <ul>
-      <li>K : Kilobytes (1024 bytes)</li>
-      <li>M : Megabytes (1024 K)</li>
-      <li>G : Gigabytes (1024 M)</li>
-      <li>T : Terabytes (1024 G)</li>
-      <li>P : Petabytes (1024 T)</li>
-    </ul>
-  </p>
+<h4 id="antversion">antversion</h4>
+<p>This condition is identical to the <a href="antversion.html">Antversion</a> task, all attributes
+are supported, the <var>property</var> attribute is redundant and will be ignored.</p>
+
+<h4 id="hasfreespace">hasfreespace</h4>
+<p><em>Since Ant 1.7.0</em></p>
+<p>Tests a partition to see if there is enough space.</p>
+<p>Needed attribute can be specified using standard computing terms:</p>
+<ul>
+  <li>K : Kilobytes (1024 bytes)</li>
+  <li>M : Megabytes (1024 K)</li>
+  <li>G : Gigabytes (1024 M)</li>
+  <li>T : Terabytes (1024 G)</li>
+  <li>P : Petabytes (1024 T)</li>
+</ul>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">partition</td>
-    <td valign="top">The partition or filesystem to check for freespace</td>
-    <td valign="top" align="center">Yes</td>
+    <td>partition</td>
+    <td>The partition or filesystem to check for free space</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">needed</td>
-    <td valign="top">The amount of freespace needed.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>needed</td>
+    <td>The amount of free space needed.</td>
+    <td>Yes</td>
   </tr>
 </table>
-  <p>
-    An example:
-  </p>
-<blockquote><pre>
-&lt;hasfreespace partition="c:" needed="100M"/&gt;
-</pre></blockquote>
+<p>An example:</p>
+<pre>&lt;hasfreespace partition="c:" needed="100M"/&gt;</pre>
 
-<h4><a name="islastmodified">islastmodified</a></h4>
+<h4 id="islastmodified">islastmodified</h4>
+<p><em>Since Ant 1.8.0</em></p>
+<p>Tests the last modified date of a resource.</p>
 
-<p>Tests the last modified date of a resource.  <em>Since Ant
-1.8.0</em></p>
-
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td width="12%" valign="top"><b>Attribute</b></td>
-    <td width="78%" valign="top"><b>Description</b></td>
-    <td width="10%" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">millis</td>
-    <td valign="top">Specifies the expected modification time of the resource
-      in milliseconds since midnight Jan 1 1970.</td>
-    <td valign="center" align="center" rowspan="2">Exactly one of the
-      two.</td>
+    <td>millis</td>
+    <td>Specifies the expected modification time of the resource in milliseconds since midnight Jan
+      1 1970.</td>
+    <td rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
-    <td valign="top">datetime</td>
-    <td valign="top">Specifies the expected modification time of the
-       resource. The special value &quot;now&quot; indicates the
-       current time.</td>
+    <td>datetime</td>
+    <td class="left">Specifies the expected modification time of the resource. The special
+      value <q>now</q> indicates the current time.</td>
   </tr>
   <tr>
-    <td valign="top">pattern</td>
-    <td valign="top">SimpleDateFormat-compatible pattern string.
-       Defaults to MM/DD/YYYY HH:MM AM_or_PM or MM/DD/YYYY HH:MM:SS AM_or_PM.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>pattern</td>
+    <td>SimpleDateFormat-compatible pattern string.</td>
+    <td>No; defaults to <q>MM/dd/YYYY hh:mm a</q> or <q>MM/dd/YYYY hh:mm:ss a</q></td>
   </tr>
   <tr>
-    <td valign="top">mode</td>
-    <td valign="top">How to compare the timestamp.  Accepted values
-      are "equals", "before", "not-before", "after" and "not-after".
-    <td valign="top">No, defaults to "equals".</td>
+    <td>mode</td>
+    <td>How to compare the timestamp.  Accepted values
+      are <q>equals</q>, <q>before</q>, <q>not-before</q>, <q>after</q> and <q>not-after</q>.
+    <td>No; defaults to <q>equals</q></td>
   </tr>
 </table>
 
 <p>The actual resource to test is specified as a nested element.</p>
 
-  <p>
-    An example:
-  </p>
-<blockquote><pre>
+<p>An example:</p>
+<pre>
 &lt;islastmodified dateTime="08/18/2009 04:41:19 AM" mode="not-before"&gt;
   &lt;file file="${file}"/&gt;
-&lt;/islastmodified&gt;
-</pre></blockquote>
+&lt;/islastmodified&gt;</pre>
 
-<h4><a name="resourceexists">resourceexists</a></h4>
-
-<p>Tests a resource for existence.  <em>since Ant 1.8.0</em></p>
+<h4 id="resourceexists">resourceexists</h4>
+<p><em>Since Ant 1.8.0</em></p>
+<p>Tests a resource for existence.</p>
 
 <p>The actual resource to test is specified as a nested element.</p>
 
-  <p>
-    An example:
-  </p>
-<blockquote><pre>
+<p>An example:</p>
+<pre>
 &lt;resourceexists&gt;
   &lt;file file="${file}"/&gt;
-&lt;/resourceexists&gt;
-</pre></blockquote>
-
-<h4><a name="javaversion">javaversion</a></h4>
+&lt;/resourceexists&gt;</pre>
 
-<p>Tests the version of the JVM executing Ant.  <em>Since Ant
-1.9.10</em></p>
+<h4 id="javaversion">javaversion</h4>
+<p><em>Since Ant 1.10.2</em></p>
+<p>Tests the version of the JVM executing Ant.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td width="12%" valign="top"><b>Attribute</b></td>
-    <td width="78%" valign="top"><b>Description</b></td>
-    <td width="10%" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">atleast</td>
-    <td valign="top">The version that this JVM is at least.
-      The format is major.minor.point. Starting with Java9 really
-      only the major number is determined.</td>
-    <td valign="top" align="center">No</td>
-    <td valign="top" rowspan="2" align="center">One of these.</td>
+    <td>atleast</td>
+    <td>The version that this JVM is of at least. The format
+      is <code>major.minor.point</code>. Starting with Java 9 really only the major number is
+      determined.</td>
+    <td rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
-    <td valign="top">exactly</td>
-    <td valign="top">The version that this JVM is exactly.
-      The format is <tt>major.minor.point</tt>. Starting with Java9 really
-      only the major number is determined.</td>
-    <td valign="top" align="center">No</td>
+    <td>exactly</td>
+    <td class="left">The version that this JVM is of exactly. The format
+      is <code>major.minor.point</code>. Starting with Java 9 really only the major number is
+      determined.</td>
   </tr>
 </table>
 
-  <p>
-    An example:
-  </p>
+<p>An example:</p>
 
-<blockquote><pre>
-&lt;javaversion atleast=&quot;9&quot;/&gt;
-</pre></blockquote>
+<pre>&lt;javaversion atleast=&quot;9&quot;/&gt;</pre>
 
-<p>will evaluate to true if the current JVM is Java9 or above.</p>
+<p>will evaluate to true if the current JVM is Java 9 or above.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/copydir.html ant-1.10.3/manual/Tasks/copydir.html
--- ant-1.9.10/manual/Tasks/copydir.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/copydir.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,113 +24,104 @@
 
 <body>
 
-<h2><a name="copydir">Copydir</a></h2>
-<h3><i>Deprecated</i></h3>
-<p><i>This task has been deprecated.  Use the Copy task instead.</i></p>
+<h2 id="copydir">Copydir</h2>
+<h3><em><u>Deprecated</u></em></h3>
+<p><em>This task has been <u>deprecated</u>.  Use the <code>Copy</code> task instead.</em></p>
 <h3>Description</h3>
 <p>Copies a directory tree from the source to the destination.</p>
-<p>It is possible to refine the set of files that are being copied. This can be
-done with the <i>includes</i>, <i>includesfile</i>, <i>excludes</i>, <i>excludesfile</i> and <i>defaultexcludes</i>
-attributes. With the <i>includes</i> or <i>includesfile</i> attribute you specify the files you want to
-have included by using patterns. The <i>exclude</i> or <i>excludesfile</i> attribute is used to specify
-the files you want to have excluded. This is also done with patterns. And
-finally with the <i>defaultexcludes</i> attribute, you can specify whether you
-want to use default exclusions or not. See the section on <a
-href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
+<p>It is possible to refine the set of files that are being copied. This can be done with
+the <var>includes</var>, <var>includesfile</var>, <var>excludes</var>, <var>excludesfile</var>
+and <var>defaultexcludes</var> attributes. With the <var>includes</var> or <var>includesfile</var>
+attribute you specify the files you want to have included by using patterns. The <var>exclude</var>
+or <var>excludesfile</var> attribute is used to specify the files you want to have excluded. This is
+also done with patterns. And finally with the <var>defaultexcludes</var> attribute, you can specify
+whether you want to use default exclusions or not. See the section
+on <a href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
 inclusion/exclusion of files works, and how to write patterns.</p>
-<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and
-supports most attributes of <code>&lt;fileset&gt;</code>
-(<code>dir</code> becomes <code>src</code>) as well as the nested
-<code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and
-<code>&lt;patternset&gt;</code> elements.</p>
+<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and supports most
+attributes of <code>&lt;fileset&gt;</code> (<var>dir</var> becomes <var>src</var>) as well as the
+nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code>
+and <code>&lt;patternset&gt;</code> elements.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">src</td>
-    <td valign="top">the directory to copy.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>src</td>
+    <td>the directory to copy.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">dest</td>
-    <td valign="top">the directory to copy to.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>dest</td>
+    <td>the directory to copy to.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">includes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      included. All files are included when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>includes</td>
+    <td>comma- or space-separated list of patterns of files that must be included.</td>
+    <td>No; defaults to all (<q>**</q>)</td>
   </tr>
   <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an include pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>includesfile</td>
+    <td>name of a file. Each line of this file is taken to be an include pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">excludes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      excluded. No files (except default excludes) are excluded when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>excludes</td>
+    <td>comma- or space-separated list of patterns of files that must be excluded.</td>
+    <td>No; defaults to default excludes or none if <var>defaultexcludes</var> is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an exclude pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>excludesfile</td>
+    <td>name of a file. Each line of this file is taken to be an exclude pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">defaultexcludes</td>
-    <td valign="top">indicates whether default excludes should be used or not
-      (&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>defaultexcludes</td>
+    <td>indicates whether default excludes should be used or not (<q>yes|no</q>).</td>
+    <td>No; defaults to <q>yes</q></td>
   </tr>
   <tr>
-    <td valign="top">filtering</td>
-    <td valign="top">indicates whether token filtering should take place during
-      the copy</td>
-    <td valign="top" align="center">No</td>
+    <td>filtering</td>
+    <td>indicates whether token filtering should take place during the copy</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">flatten</td>
-    <td valign="top">ignore directory structure of source directory,
-      copy all files into a single directory, specified by the <code>dest</code>
-      attribute (default is <code>false</code>).</td>
-    <td valign="top" align="center">No</td>
+    <td>flatten</td>
+    <td>ignore directory structure of source directory, copy all files into a single directory,
+      specified by the <code>dest</code> attribute.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">forceoverwrite</td>
-    <td valign="top">overwrite existing files even if the destination
-      files are newer (default is false).</td>
-    <td valign="top" align="center">No</td>
+    <td>forceoverwrite</td>
+    <td>overwrite existing files even if the destination files are newer.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
-<pre>  &lt;copydir src=&quot;${src}/resources&quot;
-           dest=&quot;${dist}&quot;
-  /&gt;</pre>
-<p>copies the directory <code>${src}/resources</code> to <code>${dist}</code>.</p>
-<pre>  &lt;copydir src=&quot;${src}/resources&quot;
-           dest=&quot;${dist}&quot;
-           includes=&quot;**/*.java&quot;
-           excludes=&quot;**/Test.java&quot;
-  /&gt;</pre>
-<p>copies the directory <code>${src}/resources</code> to <code>${dist}</code>
-recursively. All java files are copied, except for files with the name <code>Test.java</code>.</p>
-<pre>  &lt;copydir src=&quot;${src}/resources&quot;
-           dest=&quot;${dist}&quot;
-           includes=&quot;**/*.java&quot;
-           excludes=&quot;mypackage/test/**&quot;/&gt;</pre>
-<p>copies the directory <code>${src}/resources</code> to <code>${dist}</code>
-recursively. All java files are copied, except for the files under the <code>mypackage/test</code>
-directory.</p>
-
+<pre>
+&lt;copydir src=&quot;${src}/resources&quot;
+         dest=&quot;${dist}&quot;/&gt;</pre>
+<p>copies the directory <samp>${src}/resources</samp> to <samp>${dist}</samp>.</p>
+<pre>
+&lt;copydir src=&quot;${src}/resources&quot;
+         dest=&quot;${dist}&quot;
+         includes=&quot;**/*.java&quot;
+         excludes=&quot;**/Test.java&quot;/&gt;</pre>
+<p>copies the directory <samp>${src}/resources</samp> to <samp>${dist}</samp>
+recursively. All <samp>.java</samp> files are copied, except for files with the
+name <samp>Test.java</samp>.</p>
+<pre>
+&lt;copydir src=&quot;${src}/resources&quot;
+         dest=&quot;${dist}&quot;
+         includes=&quot;**/*.java&quot;
+         excludes=&quot;mypackage/test/**&quot;/&gt;</pre>
+<p>copies the directory <samp>${src}/resources</samp> to <samp>${dist}</samp>
+recursively. All <samp>.java</samp> files are copied, except for the files under
+the <samp>mypackage/test</samp> directory.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/copyfile.html ant-1.10.3/manual/Tasks/copyfile.html
--- ant-1.9.10/manual/Tasks/copyfile.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/copyfile.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,50 +24,44 @@
 
 <body>
 
-<h2><a name="copyfile">Copyfile</a></h2>
-<h3><i>Deprecated</i></h3>
-<p><i>This task has been deprecated.  Use the Copy task instead.</i></p>
+<h2 id="copyfile">Copyfile</h2>
+<h3><em><u>Deprecated</u></em></h3>
+<p><em>This task has been <em>deprecated</em>.  Use the <code>Copy</code> task instead.</em></p>
 <h3>Description</h3>
-<p>Copies a file from the source to the destination. The file is only copied if
-the source file is newer than the destination file, or when the destination file
-does not exist.</p>
+<p>Copies a file from the source to the destination. The file is only copied if the source file is
+newer than the destination file, or when the destination file does not exist.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">src</td>
-    <td valign="top">the filename of the file to copy.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>src</td>
+    <td>the filename of the file to copy.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">dest</td>
-    <td valign="top">the filename of the file where to copy to.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>dest</td>
+    <td>the filename of the file where to copy to.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">filtering</td>
-    <td valign="top">indicates whether token filtering should take place during
-      the copy</td>
-    <td valign="top" align="center">No</td>
+    <td>filtering</td>
+    <td>indicates whether token filtering should take place during the copy</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">forceoverwrite</td>
-    <td valign="top">overwrite existing files even if the destination
-      files are newer (default is false).</td>
-    <td valign="top" align="center">No</td>
+    <td>forceoverwrite</td>
+    <td>overwrite existing files even if the destination files are newer.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
-  <p><code>&lt;copyfile src=&quot;test.java&quot; dest=&quot;subdir/test.java&quot;/&gt;</code></p>
-  <p><code>&lt;copyfile src=&quot;${src}/index.html&quot; dest=&quot;${dist}/help/index.html&quot;/&gt;</code></p>
-</blockquote>
-
+<pre>
+&lt;copyfile src=&quot;test.java&quot; dest=&quot;subdir/test.java&quot;/&gt;
+&lt;copyfile src=&quot;${src}/index.html&quot; dest=&quot;${dist}/help/index.html&quot;/&gt;</pre>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/copy.html ant-1.10.3/manual/Tasks/copy.html
--- ant-1.9.10/manual/Tasks/copy.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/copy.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,353 +24,274 @@
 
 <body>
 
-<h2><a name="copy">Copy</a></h2>
+<h2 id="copy">Copy</h2>
 <h3>Description</h3>
-<p>Copies a file or resource collection to a new file or directory.  By default, files are
-only copied if the source file is newer than the destination file,
-or when the destination file does not exist.  However, you can explicitly
-overwrite files with the <code>overwrite</code> attribute.</p>
-
-<p><a href="../Types/resources.html#collection">Resource
-Collection</a>s are used to select a group of files to copy.  To use a
-resource collection, the <code>todir</code> attribute must be set.
-<strong>Note</strong> that some resources (for example
-the <a href="../Types/resources.html#file">file</a> resource)
-return absolute paths as names and the result of using them without
-using a nested mapper (or the flatten attribute) may not be what you
+<p>Copies a file or resource collection to a new file or directory.  By default, files are only
+copied if the source file is newer than the destination file, or when the destination file does not
+exist.  However, you can explicitly overwrite files with the <var>overwrite</var> attribute.</p>
+
+<p><a href="../Types/resources.html#collection">Resource collections</a> are used to select a group
+of files to copy.  To use a resource collection, the <var>todir</var> attribute must be
+set. <strong>Note</strong> that some resources (for example
+the <a href="../Types/resources.html#file">file</a> resource) return absolute paths as names and the
+result of using them without using a nested mapper (or the flatten attribute) may not be what you
 expect.</p>
 
-<p>
-<strong>Note: </strong>If you employ filters in your copy operation,
-you should limit the copy to text files. Binary files will be corrupted
-by the copy operation.
-This applies whether the filters are implicitly defined by the
-<a href="filter.html">filter</a> task or explicitly provided to the copy
-operation as <a href="../Types/filterset.html">filtersets</a>.
-  <em>See <a href="#encoding">encoding note</a></em>.
-</p>
+<p><strong>Note</strong>: If you employ filters in your copy operation, you should limit the copy to
+text files. Binary files will be corrupted by the copy operation.  This applies whether the filters
+are implicitly defined by the <a href="filter.html">filter</a> task or explicitly provided to the
+copy operation
+as <a href="../Types/filterset.html">filtersets</a>.  <em>See <a href="#encoding">encoding
+note</a></em>.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">The file to copy.</td>
-    <td valign="top" align="center">Yes, unless a nested
-    resource collection element is used.</td>
+    <td>file</td>
+    <td>The file to copy.</td>
+    <td>Yes, unless a nested resource collection element is used</td>
   </tr>
   <tr>
-    <td valign="top">preservelastmodified</td>
-    <td valign="top">Give the copied files the same last modified
-      time as the original source files.</td>
-    <td valign="top" align="center">No; defaults to false.</td>
+    <td>preservelastmodified</td>
+    <td>Give the copied files the same last modified time as the original source files.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">tofile</td>
-    <td valign="top">The file to copy to.</td>
-    <td valign="top" align="center" rowspan="2">With the <code>file</code>
-      attribute, either <code>tofile</code> or <code>todir</code> can be used.<br/>
-
-      With nested resource collection elements, if the number of
-      included resources
-      is greater than 1, or if only the <code>dir</code> attribute is
-      specified in the <code>&lt;fileset&gt;</code>, or if the
-      <code>file</code> attribute is also specified, then only
-      <code>todir</code> is allowed.<br/>
-      <em>Prior to Apache Ant 1.8.2</em> the <code>tofile</code> attribute
-      only supported filesystem resources top copy from.</td>
+    <td>tofile</td>
+    <td>The file to copy to. Prior to Apache Ant 1.8.2, the <var>tofile</var> attribute only
+      supported <a href="../Types/resources.html#file">file resources</a> to copy from.</td>
+    <td rowspan="2">With the <var>file</var> attribute, either <var>tofile</var> or <var>todir</var>
+      can be used.<br/>  With nested resource collection elements, if the number of included
+      resources is greater than 1, or if only the <var>dir</var> attribute is specified in
+      the <code>&lt;fileset&gt;</code>, or if the <var>file</var> attribute is also specified, then
+      only <var>todir</var> is allowed.<br/></td>
   </tr>
   <tr>
-    <td valign="top">todir</td>
-    <td valign="top">The directory to copy to.</td>
+    <td>todir</td>
+    <td class="left">The directory to copy to.</td>
   </tr>
   <tr>
-    <td valign="top">overwrite</td>
-    <td valign="top">Overwrite existing files even if the destination
-      files are newer.</td>
-    <td valign="top" align="center">No; defaults to false.</td>
+    <td>overwrite</td>
+    <td>Overwrite existing files even if the destination files are newer.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">force</td>
-    <td valign="top">Overwrite read-only destination
-      files.  <em>since Ant 1.8.2</em></td>
-    <td valign="top" align="center">No; defaults to false.</td>
+    <td>force</td>
+    <td>Overwrite read-only destination files.  <em>since Ant 1.8.2</em></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">filtering</td>
-    <td valign="top">Indicates whether token filtering using the <a href="../using.html#filters">global
-        build-file filters</a> should take place during the copy.
-      <em>Note</em>: Nested <code>&lt;filterset&gt;</code> elements will
-      always be used, even if this attribute is not specified, or its value is
-      <code>false</code> (<code>no</code>, or <code>off</code>).</td>
-    <td valign="top" align="center">No; defaults to false.</td>
+    <td>filtering</td>
+    <td>Indicates whether token filtering using the <a href="../using.html#filters">global
+      build-file filters</a> should take place during the copy.  <strong>Note</strong>:
+      Nested <code>&lt;filterset&gt;</code> elements will always be used, even if this attribute is
+      not specified, or its value is <q>false</q>, <q>no</q>, or <q>off</q>.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">flatten</td>
-    <td valign="top">Ignore the directory structure of the source files,
-      and copy all files into the directory specified by the <code>todir</code>
-      attribute.  Note that you can achieve the same effect by using a
-      <a href="../Types/mapper.html#flatten-mapper">flatten mapper</a>.</td>
-    <td valign="top" align="center">No; defaults to false.</td>
+    <td>flatten</td>
+    <td>Ignore the directory structure of the source files, and copy all files into the directory
+      specified by the <var>todir</var> attribute.  Note that you can achieve the same effect by
+      using a <a href="../Types/mapper.html#flatten-mapper">flatten mapper</a>.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">includeEmptyDirs</td>
-     <td valign="top">Copy any empty directories included in the FileSet(s).
-     </td>
-     <td valign="top" align="center">No; defaults to true.</td>
+    <td>includeEmptyDirs</td>
+     <td>Copy any empty directories included in the FileSet(s).</td>
+     <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-     <td valign="top">If false, log a warning message, but do not stop the
-       build, when the file to copy does not exist or one of the nested
-       filesets points to a directory that doesn't exist or an error occurs
-       while copying.
-     </td>
-     <td valign="top" align="center">No; defaults to true.</td>
+    <td>failonerror</td>
+     <td>If <q>false</q>, log a warning message, but do not stop the build, when the file to copy
+       does not exist or one of the nested filesets points to a directory that doesn't exist or an
+       error occurs while copying.</td>
+     <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">quiet</td>
-      <td valign="top">If true and failonerror is false, then do not log a
-       warning message when the file to copy does not exist or one of the nested
-       filesets points to a directory that doesn't exist or an error occurs
-       while copying. <em>since Ant 1.8.3</em>.
-     </td>
-     <td valign="top" align="center">No; defaults to false.</td>
+    <td>quiet</td>
+    <td>If <q>true</q> and <var>failonerror</var> is <q>false</q>, then do not log a warning message
+       when the file to copy does not exist or one of the nested filesets points to a directory that
+       doesn't exist or an error occurs while copying. <em>since Ant 1.8.3</em>.</td>
+     <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">verbose</td>
-     <td valign="top">Log the files that are being copied.</td>
-     <td valign="top" align="center">No; defaults to false.</td>
+    <td>verbose</td>
+     <td>Log the files that are being copied.</td>
+     <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">The encoding to assume when filter-copying the
-    files. <em>since Ant 1.5</em>.</td>
-    <td align="center">No - defaults to default JVM encoding</td>
+    <td>encoding</td>
+    <td>The encoding to assume when filter-copying the files. <em>since Ant 1.5</em>.</td>
+    <td>No; defaults to default JVM character encoding</td>
   </tr>
   <tr>
-    <td valign="top">outputencoding</td>
-    <td valign="top">The encoding to use when writing the files.
+    <td>outputencoding</td>
+    <td>The encoding to use when writing the files.
     <em>since Ant 1.6</em>.</td>
-    <td align="center">No - defaults to the value of the encoding
-    attribute if given or the default JVM encoding otherwise.</td>
+    <td>No; defaults to <var>encoding</var> if set or default JVM character encoding otherwise</td>
   </tr>
   <tr>
-    <td valign="top">enablemultiplemappings</td>
-    <td valign="top">
-      If true the task will process to all the mappings for a
-      given source path. If false the task will only process
-      the first file or directory. This attribute is only relevant
-      if there is a mapper subelement.
-      <em>since Ant 1.6</em>.</td>
-    <td align="center">No - defaults to false.</td>
-  </tr>
-  <tr>
-    <td valign="top">granularity</td>
-    <td valign="top">The number of milliseconds leeway to give before
-    deciding a file is out of date. This is needed because not every
-    file system supports tracking the last modified time to the
-    millisecond level. Default is 1 second, or 2 seconds on DOS
-    systems.  This can also be useful if source and target files live
-    on separate machines with clocks being out of sync.  <em>since Ant
-    1.6.2</em>.</td>
-    <td align="center">No</td>
+    <td>enablemultiplemappings</td>
+    <td>If <q>true</q> the task will process to all the mappings for a given source
+      path. If <q>false</q> the task will only process the first file or directory. This attribute
+      is only relevant if there is a <code>mapper</code> subelement.  <em>since Ant 1.6</em>.</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>granularity</td>
+    <td>The number of milliseconds leeway to give before deciding a file is out of date. This is
+      needed because not every file system supports tracking the last modified time to the
+      millisecond level. This can also be useful if source and target files live on separate
+      machines with clocks being out of sync. <em>since Ant 1.6.2</em>.</td>
+    <td>No; default is 1 second, or 2 seconds on DOS systems</td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 
-<h4>fileset or any other resource collection</h4>
-<p><a href="../Types/resources.html#collection">Resource
-Collection</a>s are used to select groups of files to copy.  To use a
-resource collection, the <code>todir</code> attribute must be set.</p>
-<p>Prior to Ant 1.7 only <code>&lt;fileset&gt;</code> has been
-supported as a nested element.</p>
+<h4>any filesystem based resource collection</h4>
+<p><a href="../Types/resources.html#collection">Resource collections</a> are used to select groups
+of files to copy.  To use a resource collection, the <var>todir</var> attribute must be set.</p>
+<p>Prior to Ant 1.7, only <code>&lt;fileset&gt;</code> has been supported as a nested element.</p>
 
 <h4>mapper</h4>
- <p>You can define filename transformations by using a nested <a
- href="../Types/mapper.html">mapper</a> element. The default mapper used by
- <code>&lt;copy&gt;</code> is the <a
- href="../Types/mapper.html#identity-mapper">identity mapper</a>.</p>
-  <p>
-    <em>Since Ant 1.6.3</em>,
-    one can use a filenamemapper type in place of the mapper element.
-  </p>
-
-<p>Note that the source name handed to the mapper depends on the
-resource collection you use.  If you use <code>&lt;fileset&gt;</code>
-or any other collection that provides a base directory, the name
-passed to the mapper will be a relative filename, relative to the base
-directory.  In any other case the absolute filename of the source will
-be used.</p>
+<p>You can define filename transformations by using a
+nested <a href="../Types/mapper.html">mapper</a> element. The default mapper used
+by <code>&lt;copy&gt;</code> is the <a href="../Types/mapper.html#identity-mapper">identity
+mapper</a>.</p>
+<p><em>Since Ant 1.6.3</em>, one can use a filenamemapper type in place of the mapper element.</p>
+
+<p>Note that the source name handed to the mapper depends on the resource collection you use.  If
+you use <code>&lt;fileset&gt;</code> or any other collection that provides a base directory, the
+name passed to the mapper will be a relative filename, relative to the base directory.  In any other
+case the absolute filename of the source will be used.</p>
 
 <h4>filterset</h4>
- <p><a href="../Types/filterset.html">FilterSet</a>s are used to replace
-tokens in files that are copied.
- To use a FilterSet, use the nested <code>&lt;filterset&gt;</code> element.</p>
+<p><a href="../Types/filterset.html">FilterSet</a>s are used to replace tokens in files that are
+copied.  To use a FilterSet, use the nested <code>&lt;filterset&gt;</code> element.</p>
 
 <p>It is possible to use more than one filterset.</p>
 
 <h4>filterchain</h4>
-<p>The Copy task supports nested <a href="../Types/filterchain.html">
-FilterChain</a>s.</p>
+<p>The Copy task supports nested <a href="../Types/filterchain.html">FilterChain</a>s.</p>
 
-<p>
-If <code>&lt;filterset&gt;</code> and <code>&lt;filterchain&gt;</code> elements are used inside the
-same <code>&lt;copy&gt;</code> task, all <code>&lt;filterchain&gt;</code> elements are processed first
-followed by <code>&lt;filterset&gt;</code> elements.
-</p>
+<p>If <code>&lt;filterset&gt;</code> and <code>&lt;filterchain&gt;</code> elements are used inside
+the same <code>&lt;copy&gt;</code> task, all <code>&lt;filterchain&gt;</code> elements are processed
+first followed by <code>&lt;filterset&gt;</code> elements.</p>
 
 <h3>Examples</h3>
-<p><b>Copy a single file</b></p>
-<pre>
-  &lt;copy file=&quot;myfile.txt&quot; tofile=&quot;mycopy.txt&quot;/&gt;
-</pre>
-<p><b>Copy a single file to a directory</b></p>
-<pre>
-  &lt;copy file=&quot;myfile.txt&quot; todir=&quot;../some/other/dir&quot;/&gt;
-</pre>
-<p><b>Copy a directory to another directory</b></p>
+<p><strong>Copy a single file</strong></p>
+<pre>&lt;copy file=&quot;myfile.txt&quot; tofile=&quot;mycopy.txt&quot;/&gt;</pre>
+<p><strong>Copy a single file to a directory</strong></p>
+<pre>&lt;copy file=&quot;myfile.txt&quot; todir=&quot;../some/other/dir&quot;/&gt;</pre>
+<p><strong>Copy a directory to another directory</strong></p>
 <pre>
-  &lt;copy todir=&quot;../new/dir&quot;&gt;
-    &lt;fileset dir=&quot;src_dir&quot;/&gt;
-  &lt;/copy&gt;
+&lt;copy todir=&quot;../new/dir&quot;&gt;
+  &lt;fileset dir=&quot;src_dir&quot;/&gt;
+&lt;/copy&gt;
 </pre>
-<p><b>Copy a set of files to a directory</b></p>
+<p><strong>Copy a set of files to a directory</strong></p>
 <pre>
-  &lt;copy todir=&quot;../dest/dir&quot;&gt;
-    &lt;fileset dir=&quot;src_dir&quot;&gt;
-      &lt;exclude name=&quot;**/*.java&quot;/&gt;
-    &lt;/fileset&gt;
-  &lt;/copy&gt;
-
-  &lt;copy todir=&quot;../dest/dir&quot;&gt;
-    &lt;fileset dir=&quot;src_dir&quot; excludes=&quot;**/*.java&quot;/&gt;
-  &lt;/copy&gt;
-</pre>
-<p><b>Copy a set of files to a directory, appending
-<code>.bak</code> to the file name on the fly</b></p>
+&lt;copy todir=&quot;../dest/dir&quot;&gt;
+  &lt;fileset dir=&quot;src_dir&quot;&gt;
+    &lt;exclude name=&quot;**/*.java&quot;/&gt;
+  &lt;/fileset&gt;
+&lt;/copy&gt;
+
+&lt;copy todir=&quot;../dest/dir&quot;&gt;
+  &lt;fileset dir=&quot;src_dir&quot; excludes=&quot;**/*.java&quot;/&gt;
+&lt;/copy&gt;</pre>
+<p><strong>Copy a set of files to a directory, appending <samp>.bak</samp> to the file name on the
+fly</strong></p>
 <pre>
-  &lt;copy todir=&quot;../backup/dir&quot;&gt;
-    &lt;fileset dir=&quot;src_dir&quot;/&gt;
-    &lt;globmapper from=&quot;*&quot; to=&quot;*.bak&quot;/&gt;
-  &lt;/copy&gt;
-</pre>
+&lt;copy todir=&quot;../backup/dir&quot;&gt;
+  &lt;fileset dir=&quot;src_dir&quot;/&gt;
+  &lt;globmapper from=&quot;*&quot; to=&quot;*.bak&quot;/&gt;
+&lt;/copy&gt;</pre>
 
-<p><b>Copy a set of files to a directory, replacing @TITLE@ with Foo Bar
-in all files.</b></p>
+<p><strong>Copy a set of files to a directory, replacing <code>@TITLE@</code> with <samp>Foo
+Bar</samp> in all files.</strong></p>
 <pre>
-  &lt;copy todir=&quot;../backup/dir&quot;&gt;
-    &lt;fileset dir=&quot;src_dir&quot;/&gt;
-    &lt;filterset&gt;
-      &lt;filter token=&quot;TITLE&quot; value=&quot;Foo Bar&quot;/&gt;
-    &lt;/filterset&gt;
-  &lt;/copy&gt;
-</pre>
+&lt;copy todir=&quot;../backup/dir&quot;&gt;
+  &lt;fileset dir=&quot;src_dir&quot;/&gt;
+  &lt;filterset&gt;
+    &lt;filter token=&quot;TITLE&quot; value=&quot;Foo Bar&quot;/&gt;
+  &lt;/filterset&gt;
+&lt;/copy&gt;</pre>
 
-<p><b>Collect all items from the current CLASSPATH setting into a
-destination directory, flattening the directory structure.</b></p>
+<p><strong>Collect all items from the current <code>CLASSPATH</code> setting into a destination
+directory, flattening the directory structure.</strong></p>
 <pre>
-  &lt;copy todir=&quot;dest&quot; flatten=&quot;true&quot;&gt;
-    &lt;path&gt;
-      &lt;pathelement path=&quot;${java.class.path}&quot;/&gt;
-    &lt;/path&gt;
-  &lt;/copy&gt;
-</pre>
+&lt;copy todir=&quot;dest&quot; flatten=&quot;true&quot;&gt;
+  &lt;path&gt;
+    &lt;pathelement path=&quot;${java.class.path}&quot;/&gt;
+  &lt;/path&gt;
+&lt;/copy&gt;</pre>
 
-<p><b>Copies some resources to a given directory.</b></p>
+<p><strong>Copies some resources to a given directory.</strong></p>
 <pre>
-  &lt;copy todir=&quot;dest&quot; flatten=&quot;true&quot;&gt;
-    &lt;resources&gt;
-      &lt;file file=&quot;src_dir/file1.txt&quot;/&gt;
-      &lt;url url=&quot;http://ant.apache.org/index.html&quot;/&gt;
-    &lt;/resources&gt;
-  &lt;/copy&gt;
-</pre>
+&lt;copy todir=&quot;dest&quot; flatten=&quot;true&quot;&gt;
+  &lt;resources&gt;
+    &lt;file file=&quot;src_dir/file1.txt&quot;/&gt;
+    &lt;url url=&quot;http://ant.apache.org/index.html&quot;/&gt;
+  &lt;/resources&gt;
+&lt;/copy&gt;</pre>
+
+<p>If the example above didn't use the <var>flatten</var> attribute, the <code>&lt;file&gt;</code>
+resource would have returned its full path as source and target name and would not have been copied
+at all.  In general it is a good practice to use an explicit mapper together with resources that use
+an absolute path as their names.</p>
 
-<p>If the example above didn't use the flatten attribute,
-  the <code>&lt;file&gt;</code> resource would have returned its full
-  path as source and target name and would not have been copied at
-  all.  In general it is a good practice to use an explicit mapper
-  together with resources that use an absolute path as their
-  names.</p>
-
-<p><b>Copies the two newest resources into a destination directory.</b></p>
+<p><strong>Copies the two newest resources into a destination directory.</strong></p>
 <pre>
-  &lt;copy todir=&quot;dest&quot; flatten=&quot;true&quot;&gt;
-    &lt;first count=&quot;2&quot;&gt;
-      &lt;sort&gt;
-        &lt;date xmlns=&quot;antlib:org.apache.tools.ant.types.resources.comparators&quot;/&gt;
-        &lt;resources&gt;
-          &lt;file file=&quot;src_dir/file1.txt&quot;/&gt;
-          &lt;file file=&quot;src_dir/file2.txt&quot;/&gt;
-          &lt;file file=&quot;src_dir/file3.txt&quot;/&gt;
-          &lt;url url=&quot;http://ant.apache.org/index.html&quot;/&gt;
-        &lt;/resources&gt;
-      &lt;/sort&gt;
-    &lt;/first&gt;
-  &lt;/copy&gt;
-</pre>
-
-<p>The paragraph following the previous example applies to this
-  example as well.</p>
-
-<p><strong>Unix Note:</strong> File permissions are not retained when files
-are copied; they end up with the default <code>UMASK</code> permissions
-instead. This
-is caused by the lack of any means to query or set file permissions in the
-current Java runtimes. If you need a permission-preserving copy function,
-use <code>&lt;exec executable="cp" ... &gt;</code> instead.
-</p>
-
-<p><strong>Windows Note:</strong> If you copy a file to a directory
-where that file already exists, but with different casing,
-the copied file takes on the case of the original. The workaround is to
-<a href="delete.html">delete</a>
-the file in the destination directory before you copy it.
-</p>
-  <p>
-    <strong><a name="encoding">Important Encoding Note:</a></strong>
-    The reason that binary files when filtered get corrupted is that
-    filtering involves reading in the file using a Reader class. This
-    has an encoding specifying how files are encoded. There are a number
-    of different types of encoding - UTF-8, UTF-16, Cp1252, ISO-8859-1,
-    US-ASCII and (lots) others. On Windows the default character encoding
-    is Cp1252, on Unix it is usually UTF-8. For both of these encoding
-    there are illegal byte sequences (more in UTF-8 than for Cp1252).
-  </p>
-  <p>
-    How the Reader class deals with these illegal sequences is up to the
-    implementation
-    of the character decoder. The current Sun Java implementation is to
-    map them to legal characters. Previous Sun Java (1.3 and lower) threw
-    a MalformedInputException. IBM Java 1.4 also throws this exception.
-    It is the mapping of the characters that cause the corruption.
-  </p>
-  <p>
-    On Unix, where the default is normally UTF-8, this is a <em>big</em>
-    problem, as it is easy to edit a file to contain non US Ascii characters
-    from ISO-8859-1, for example the Danish oe character. When this is
-    copied (with filtering) by Ant, the character get converted to a
-    question mark (or some such thing).
-  </p>
-  <p>
-    There is not much that Ant can do. It cannot figure out which
-    files are binary - a UTF-8 version of Korean will have lots of
-    bytes with the top bit set. It is not informed about illegal
-    character sequences by current Sun Java implementions.
-  </p>
-  <p>
-    One trick for filtering containing only US-ASCII is to
-    use the ISO-8859-1 encoding. This does not seem to contain
-    illegal character sequences, and the lower 7 bits are US-ASCII.
-    Another trick is to change the LANG environment variable from
-    something like "us.utf8" to "us".
-  </p>
-    
-
-
+&lt;copy todir=&quot;dest&quot; flatten=&quot;true&quot;&gt;
+  &lt;first count=&quot;2&quot;&gt;
+    &lt;sort&gt;
+      &lt;date xmlns=&quot;antlib:org.apache.tools.ant.types.resources.comparators&quot;/&gt;
+      &lt;resources&gt;
+        &lt;file file=&quot;src_dir/file1.txt&quot;/&gt;
+        &lt;file file=&quot;src_dir/file2.txt&quot;/&gt;
+        &lt;file file=&quot;src_dir/file3.txt&quot;/&gt;
+        &lt;url url=&quot;http://ant.apache.org/index.html&quot;/&gt;
+      &lt;/resources&gt;
+    &lt;/sort&gt;
+  &lt;/first&gt;
+&lt;/copy&gt;</pre>
+
+<p>The paragraph following the previous example applies to this example as well.</p>
+
+<p><strong>Unix Note</strong>: File permissions are not retained when files are copied; they end up
+with the default <code>UMASK</code> permissions instead. This is caused by the lack of any means to
+query or set file permissions in the current Java runtimes. If you need a permission-preserving copy
+function, use <code>&lt;exec executable="cp" ... &gt;</code> instead.</p>
+
+<p><strong>Windows Note</strong>: If you copy a file to a directory where that file already exists,
+but with different case, the copied file takes on the case of the original. The workaround is
+to <a href="delete.html">delete</a> the file in the destination directory before you copy it.</p>
+<p id="encoding"><strong>Important Encoding Note</strong>: The reason that binary files when
+filtered get corrupted is that filtering involves reading in the file using a Reader class. This has
+an encoding specifying how files are encoded. There are a number of different types of
+encoding&mdash;UTF-8, UTF-16, Cp1252, ISO-8859-1, US-ASCII and (lots of) others. On Windows the
+default character encoding is Cp1252, on Unix it is usually UTF-8. For both of these encoding there
+are illegal byte sequences (more in UTF-8 than for Cp1252).</p>
+<p>How the Reader class deals with these illegal sequences is up to the implementation of the
+character decoder. The current Sun Java implementation is to map them to legal characters. Previous
+Sun Java (1.3 and lower) threw a <code>MalformedInputException</code>. IBM Java 1.4 also throws this
+exception. It is the mapping of the characters that cause the corruption.</p>
+<p>On Unix, where the default is normally UTF-8, this is a <em>big</em> problem, as it is easy to
+edit a file to contain non US-ASCII characters from ISO-8859-1, for example the Danish &oelig;
+character. When this is copied (with filtering) by Ant, the character get converted to a question
+mark (or some such thing).</p>
+<p>There is not much that Ant can do. It cannot figure out which files are binary&mdash;a UTF-8
+version of Korean will have lots of bytes with the top bit set. It is not informed about illegal
+character sequences by current Sun Java implementations.</p>
+<p>One trick for filtering containing only US-ASCII is to use the ISO-8859-1 encoding. This does not
+seem to contain illegal character sequences, and the lower 7 bits are US-ASCII.  Another trick is to
+change the <code>LANG</code> environment variable from something like <q>us.utf8</q>
+to <q>us</q>.</p>
 
-</body></html>
+</body>
+</html>
diff -Nru ant-1.9.10/manual/Tasks/cvs.html ant-1.10.3/manual/Tasks/cvs.html
--- ant-1.9.10/manual/Tasks/cvs.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/cvs.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,134 +24,127 @@
 
 <body>
 
-<h2><a name="cvs">Cvs</a></h2>
+<h2 id="cvs">Cvs</h2>
 <h3>Description</h3>
-<p>Handles packages/modules retrieved from a
-<a href="http://www.nongnu.org/cvs/" target="_top">CVS</a> repository.</p>
-<p><b>Important:</b> This task needs &quot;<code>cvs</code>&quot; on the path. If it isn't, you will get
-an error (such as error <code>2</code> on windows). If <code>&lt;cvs&gt;</code> doesn't work, try to execute <code>cvs.exe</code>
-from the command line in the target directory in which you are working.
-Also note that this task assumes that the cvs executable is compatible
-with the Unix version from cvshome.org, this is not completely true
-for certain other cvs clients - like CVSNT for example - and some
-operation may fail when using such an incompatible client.
-</p>
-
-<p><b>CVSNT Note</b>: CVSNT prefers users to store the passwords
-inside the registry.  If the <a href="cvspass.html">cvspass task</a>
-and the passfile attribute don't seem to work for you, the most likely
-reason is that CVSNT ignores your .cvspass file completely.  See <a
-href="http://issues.apache.org/bugzilla/show_bug.cgi?id=21657#c5">bugzilla
+<p>Handles packages/modules retrieved from a <a href="https://www.nongnu.org/cvs/"
+target="_top">CVS</a> repository.</p>
+<p><strong>Important:</strong> This task needs <kbd>cvs</kbd> binary on the path. If it isn't, you
+will get an error (such as <code>error=2</code> on Windows). If <code>&lt;cvs&gt;</code> doesn't
+work, try to execute <kbd>cvs.exe</kbd> from the command line in the target directory in which you
+are working.  Also note that this task assumes that the <kbd>cvs</kbd> executable is compatible with
+the Unix version, this is not completely true for certain other CVS clients&mdash;like CVSNT for
+example&mdash;and some operation may fail when using such an incompatible client.</p>
+
+<p><strong>CVSNT Note</strong>: CVSNT prefers users to store the passwords inside the registry.  If
+the <a href="cvspass.html">cvspass task</a> and the <var>passfile</var> attribute don't seem to work
+for you, the most likely reason is that CVSNT ignores your <samp>.cvspass</samp> file completely.
+See <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=21657#c5" target="_top">bugzilla
 report 21657</a> for recommended workarounds.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">command</td>
-    <td valign="top">the CVS command to execute.</td>
-    <td align="center" valign="top">No, default &quot;checkout&quot;.</td>
+    <td>command</td>
+    <td>the CVS command to execute.</td>
+    <td>No; default is <q>checkout</q></td>
   </tr>
   <tr>
-    <td valign="top">compression</td>
-    <td valign="top"><code>true</code> or <code>false</code> - if set
-    to true, this is the same as <code>compressionlevel=&quot;3&quot;</code></td>
-    <td align="center" valign="top">No. Defaults to false.</td>
+    <td>compression</td>
+    <td><q>true</q> (equivalent to <var>compressionlevel</var>=<q>3</q>) or <q>false</q></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">compressionlevel</td>
-    <td valign="top">A number between 1 and 9 (corresponding to
-    possible values for CVS' <code>-z#</code> argument). Any
-    other value is treated as <code>compression=&quot;false&quot;</code></td>
-    <td align="center" valign="top">No. Defaults to no compression.</td>
+    <td>compressionlevel</td>
+    <td>A number between <q>1</q> and <q>9</q> (corresponding to possible values for
+      CVS <kbd>-z#</kbd> argument). Any other value is treated
+      as <var>compression</var>=<q>false</q></td>
+    <td>No; defaults to no compression</td>
   </tr>
-
   <tr>
-    <td valign="top">cvsRoot</td>
-    <td valign="top">the <code>CVSROOT</code> variable.</td>
-    <td align="center" valign="top">No</td>
+    <td>cvsRoot</td>
+    <td>the <code>CVSROOT</code> variable.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">cvsRsh</td>
-    <td valign="top">the <code>CVS_RSH</code> variable.</td>
-    <td align="center" valign="top">No</td>
+    <td>cvsRsh</td>
+    <td>the <code>CVS_RSH</code> variable.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">dest</td>
-    <td valign="top">the directory where the checked out files should
-    be placed.  Note that this is different from CVS's <code>-d</code> command line
-    switch as Apache Ant will never shorten pathnames to avoid empty
-    directories.</td>
-    <td align="center" valign="top">No, default is project's basedir.</td>
+    <td>dest</td>
+    <td>the directory where the checked out files should be placed.  Note that this is different
+      from CVS's <kbd>-d</kbd> command line switch as Apache Ant will never shorten pathnames to
+      avoid empty directories.</td>
+    <td>No; default is project's <var>basedir</var></td>
   </tr>
   <tr>
-    <td valign="top">package</td>
-    <td valign="top">the package/module to check out.  <b>Note:</b>
-      multiple attributes can be split using spaces.  Use a nested
-      &lt;module&gt; element if you want to specify a module with
-      spaces in its name.</td>
-    <td align="center" valign="top">No</td>
+    <td>package</td>
+    <td>the package/module to check out.  <strong>Note</strong>: multiple attributes can be split
+      using spaces.  Use a nested <code>&lt;module&gt;</code> element if you want to specify a
+      module with spaces in its name.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">tag</td>
-    <td valign="top">the tag of the package/module to check out.</td>
-    <td align="center" valign="top">No</td>
+    <td>tag</td>
+    <td>the tag of the package/module to check out.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">date</td>
-    <td valign="top">Use the most recent revision no later than the given date</td>
-    <td align="center" valign="top">No</td>
+    <td>date</td>
+    <td>Use the most recent revision no later than the given date</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">quiet</td>
-    <td valign="top">suppress informational messages. This is the same as <code>-q</code> on the command line.</td>
-    <td align="center" valign="top">No, default &quot;false&quot;</td>
+    <td>quiet</td>
+    <td>suppress informational messages. This is the same as <kbd>-q</kbd> on the command
+    line.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">reallyquiet</td>
-    <td valign="top">suppress all messages. This is the same as
-      <code>-Q</code> on the command line.  <em>since Ant 1.6</em>.</td>
-    <td align="center" valign="top">No, default &quot;false&quot;</td>
+    <td>reallyquiet</td>
+    <td>suppress all messages. This is the same as <kbd>-Q</kbd> on the command line.  <em>since
+      Ant 1.6</em>.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">noexec</td>
-    <td valign="top">report only, don't change any files.</td>
-    <td align="center" valign="top">No, default to &quot;false&quot;</td>
+    <td>noexec</td>
+    <td>report only, don't change any files.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">output</td>
-    <td valign="top">the file to direct standard output from the command.</td>
-    <td align="center" valign="top">No, default output to ANT Log as <code>MSG_INFO</code>.</td>
+    <td>output</td>
+    <td>the file to direct standard output from the command.</td>
+    <td>No; default is output to the log as <code>MSG_INFO</code></td>
   </tr>
   <tr>
-    <td valign="top">error</td>
-    <td valign="top">the file to direct standard error from the command.</td>
-    <td align="center" valign="top">No, default error to ANT Log as <code>MSG_WARN</code>.</td>
+    <td>error</td>
+    <td>the file to direct standard error from the command.</td>
+    <td>No; default is error to the log as <code>MSG_WARN</code></td>
   </tr>
   <tr>
-    <td valign="top">append</td>
-    <td valign="top">whether to append output/error when redirecting to a file.</td>
-    <td align="center" valign="top">No, default to &quot;false&quot;.</td>
+    <td>append</td>
+    <td>whether to append output/error when redirecting to a file.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">port</td>
-    <td valign="top">Port used by CVS to communicate with the server.</td>
-    <td align="center" valign="top">No, default port <code>2401</code>.</td>
+    <td>port</td>
+    <td>Port used by CVS to communicate with the server.</td>
+    <td>No; default is <q>2401</q></td>
   </tr>
   <tr>
-    <td valign="top">passfile</td>
-    <td valign="top">Password file to read passwords from.</td>
-    <td align="center" valign="top">No, default file <code>~/.cvspass</code>.</td>
+    <td>passfile</td>
+    <td>Password file to read passwords from.</td>
+    <td>No; default is <q>~/.cvspass</q></td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">Stop the build process if the command exits with a
-      return code other than <code>0</code>. Defaults to &quot;false&quot;</td>
-    <td align="center" valign="top">No</td>
+    <td>failonerror</td>
+    <td>Stop the build process if the command exits with a return code other than <q>0</q>.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
 </table>
 
@@ -159,39 +152,39 @@
 
 <h4>module</h4>
 
-<p>Specifies a package/module to work on, unlike the package attribute
-  modules specified using this attribute can contain spaces in their
-  name.</p>
+<p>Specifies a package/module to work on, unlike the package attribute modules specified using this
+attribute can contain spaces in their name.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The module's/package's name.</td>
-    <td align="center" valign="top">Yes.</td>
+    <td>name</td>
+    <td>The module's/package's name.</td>
+    <td>Yes</td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<pre>  &lt;cvs cvsRoot=&quot;:pserver:anoncvs@cvs.apache.org:/home/cvspublic&quot;
-       package=&quot;ant&quot;
-       dest=&quot;${ws.dir}&quot;
-  /&gt;</pre>
-<p>checks out the package/module &quot;ant&quot; from the CVS
-repository pointed to by the <code>cvsRoot</code> attribute, and stores the files in &quot;<code>${ws.dir}</code>&quot;.</p>
-<pre>  &lt;cvs dest=&quot;${ws.dir}&quot; command=&quot;update&quot;/&gt;</pre>
-<p>updates the package/module that has previously been checked out into
-&quot;<code>${ws.dir}</code>&quot;.</p>
-
-<pre>  &lt;cvs command=&quot;-q diff -u -N&quot; output=&quot;patch.txt&quot;/&gt;</pre>
-
-<p>silently (<code>-q</code>) creates a file called <code>patch.txt</code> which contains a unified (<code>-u</code>) diff which includes new files added via &quot;cvs add&quot; (<code>-N</code>) and can be used as input to patch.
-The equivalent, using  <code>&lt;commandline&gt;</code> elements, is:
-</p>
+<pre>
+&lt;cvs cvsRoot=&quot;:pserver:anoncvs@cvs.apache.org:/home/cvspublic&quot;
+     package=&quot;ant&quot;
+     dest=&quot;${ws.dir}&quot;/&gt;</pre>
+<p>checks out the package/module <samp>ant</samp> from the CVS repository pointed to by
+the <var>cvsRoot</var> attribute, and stores the files in <samp>${ws.dir}</samp>.</p>
+
+<pre>&lt;cvs dest=&quot;${ws.dir}&quot; command=&quot;update&quot;/&gt;</pre>
+<p>updates the package/module that has previously been checked out into <samp>${ws.dir}</samp>.</p>
+
+<pre>&lt;cvs command=&quot;-q diff -u -N&quot; output=&quot;patch.txt&quot;/&gt;</pre>
+
+<p>silently (<kbd>-q</kbd>) creates a file called <samp>patch.txt</samp> which contains a unified
+(<kbd>-u</kbd>) diff which includes new files added via <kbd>cvs add</kbd> (<kbd>-N</kbd>) and
+can be used as input to <kbd>patch</kbd>.  The equivalent, using <code>&lt;commandline&gt;</code>
+elements, is:</p>
 <pre>
 &lt;cvs output=&quot;patch&quot;&gt;
     &lt;commandline&gt;
@@ -200,31 +193,27 @@
         &lt;argument value=&quot;-u&quot;/&gt;
         &lt;argument value=&quot;-N&quot;/&gt;
     &lt;/commandline&gt;
-&lt;/cvs&gt;
-</pre>
-or:
+&lt;/cvs&gt;</pre>
+<p>or:</p>
 <pre>
 &lt;cvs output=&quot;patch&quot;&gt;
     &lt;commandline&gt;
         &lt;argument line=&quot;-q diff -u -N&quot;/&gt;
     &lt;/commandline&gt;
-&lt;/cvs&gt;
-</pre>
-<p>
-You may include as many <code>&lt;commandline&gt;</code> elements as you like. 
-Each will inherit the <code>failonerror</code>, <code>compression</code>, and other &quot;global&quot; parameters
-from the <code>&lt;cvs&gt;</code> element.
-</p>
-
+&lt;/cvs&gt;</pre>
+<p>You may include as many <code>&lt;commandline&gt;</code> elements as you like.  Each will inherit
+the <var>failonerror</var>, <var>compression</var>, and other &quot;global&quot; parameters from
+the <code>&lt;cvs&gt;</code> element.</p>
 
 <pre>  &lt;cvs command=&quot;update -A -d&quot;/&gt;</pre>
-<p>Updates from the head of repository ignoring sticky bits (<code>-A</code>) and creating any new directories as necessary (<code>-d</code>).</p>
-<p>Note: the text of the command is passed to cvs &quot;as-is&quot; so any cvs options should appear
-before the command, and any command options should appear after the command as in the diff example
-above. See <a href="http://ximbiot.com/cvs/wiki/index.php?title=Category:User_Documentation" target="_top">the cvs manual</a> for details,
-specifically the <a href="http://ximbiot.com/cvs/wiki/index.php?title=CVS--Concurrent_Versions_System_v1.12.12.1:_Guide_to_CVS_commands#SEC116" target="_top">Guide to CVS commands</a></p>
-
+<p>Updates from the head of repository ignoring sticky bits (<kbd>-A</kbd>) and creating any new
+directories as necessary (<kbd>-d</kbd>).</p>
+<p>Note: the text of the command is passed to <kbd>cvs</kbd> &quot;as-is&quot; so any cvs options
+should appear before the command, and any command options should appear after the command as in the
+diff example above. See <a href="http://cvsbook.red-bean.com/cvsbook.html" target="_top">the CVS
+book</a> for details, specifically
+the <a href="http://cvsbook.red-bean.com/cvsbook.html#Commands%20And%20Options" target="_top">Guide
+to CVS commands</a></p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/cvspass.html ant-1.10.3/manual/Tasks/cvspass.html
--- ant-1.9.10/manual/Tasks/cvspass.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/cvspass.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,47 +24,45 @@
 
 <body>
 
-<h2><a name="cvs">cvspass</a></h2>
+<h2 id="cvs">cvspass</h2>
 <h3>Description</h3>
-<p>Adds entries to a .cvspass file. Adding entries to this file has the same affect as a cvs login command.</p>
+<p>Adds entries to a <samp>.cvspass</samp> file. Adding entries to this file has the same affect as
+a <kbd>cvs login</kbd> command.</p>
 
-<p><b>CVSNT Note</b>: CVSNT prefers users to store the passwords
-inside the registry.  If the task doesn't seem to work for you, the
-most likely reason is that CVSNT ignores your .cvspass file
-completely.  See <a
-href="http://issues.apache.org/bugzilla/show_bug.cgi?id=21657#c5">bug
-zilla report 21657</a> for recommended workarounds.</p>
+<p><strong>CVSNT Note</strong>: CVSNT prefers users to store the passwords inside the registry.  If
+the task doesn't seem to work for you, the most likely reason is that CVSNT ignores
+your <samp>.cvspass</samp> file
+completely. See <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=21657#c5"
+target="_top">bugzilla report 21657</a> for recommended workarounds.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">cvsroot</td>
-    <td valign="top">the CVS repository to add an entry for.</td>
-    <td align="center" valign="top">Yes</td>
+    <td>cvsroot</td>
+    <td>the CVS repository to add an entry for.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">password</td>
-    <td valign="top">Password to be added to the password file.</td>
-    <td align="center" valign="top">Yes</td>
+    <td>password</td>
+    <td>Password to be added to the password file.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">passfile</td>
-    <td valign="top">Password file to add the entry to.</td>
-    <td align="center" valign="top">No, default is <code>~/.cvspass</code>.</td>
+    <td>passfile</td>
+    <td>Password file to add the entry to.</td>
+    <td>No; default is <q>~/.cvspass</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
-<pre>  &lt;cvspass cvsroot=&quot;:pserver:anoncvs@cvs.apache.org:/home/cvspublic&quot;
-       password=&quot;anoncvs&quot;
-  /&gt;</pre>
-<p>Adds an entry into the ~/.cvspass password file.</p>
-
+<pre>
+&lt;cvspass cvsroot=&quot;:pserver:anoncvs@cvs.apache.org:/home/cvspublic&quot;
+         password=&quot;anoncvs&quot;/&gt;</pre>
+<p>Adds an entry into the <samp>~/.cvspass</samp> password file.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/cvstagdiff.html ant-1.10.3/manual/Tasks/cvstagdiff.html
--- ant-1.9.10/manual/Tasks/cvstagdiff.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/cvstagdiff.html	2018-03-24 12:37:12.000000000 +0000
@@ -21,115 +21,108 @@
 <title>CvsTagDiff Task</title>
 </head>
 <body>
-<h2><a name="cvstagdiff">CvsTagDiff</a></h2>
+<h2 id="cvstagdiff">CvsTagDiff</h2>
 <h3>Description</h3>
-<p>Generates an XML-formatted report file of the changes between two tags or dates recorded in a
-<a href="http://www.nongnu.org/cvs/" target="_top">CVS</a> repository. </p>
-<p><b>Important:</b> This task needs &quot;<code>cvs</code>&quot; on the path. If it isn't, you will get
-an error (such as error <code>2</code> on windows). If <code>&lt;cvs&gt;</code> doesn't work, try to execute <code>cvs.exe</code>
-from the command line in the target directory in which you are working.
-Also note that this task assumes that the cvs executable is compatible
-with the Unix version from cvshome.org, this is not completely true
-for certain other cvs clients - like CVSNT for example - and some
-operation may fail when using such an incompatible client.
-</p>
+<p>Generates an XML-formatted report file of the changes between two tags or dates recorded in
+a <a href="https://www.nongnu.org/cvs/" target="_top">CVS</a> repository.</p>
+<p><strong>Important</strong>: This task needs <kbd>cvs</kbd> on the path. If it isn't, you will get
+an error (such as <code>error=2</code> on Windows). If <code>&lt;cvs&gt;</code> doesn't work, try to
+execute <kbd>cvs.exe</kbd> from the command line in the target directory in which you are working.
+Also note that this task assumes that the <kbd>cvs</kbd> executable is compatible with the Unix
+version, this is not completely true for certain other CVS clients&mdash;like CVSNT for
+example&mdash;and some operation may fail when using such an incompatible client.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">startTag</td>
-    <td valign="top">The earliest tag from which diffs are to be
-     included in the report.</td>
-    <td align="center" valign="top" rowspan="2">exactly one of the two.</td>
+    <td>startTag</td>
+    <td>The earliest tag from which diffs are to be included in the report.</td>
+    <td rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
-    <td valign="top">startDate</td>
-    <td valign="top">The earliest date from which diffs are to be
-     included in the report.<br>
-     accepts all formats accepted by the cvs command for -D date_spec arguments</td>
+    <td>startDate</td>
+    <td class="left">The earliest date from which diffs are to be included in the
+     report.<br/>Accepts all formats accepted by the <kbd>cvs</kbd> command for <kbd>-D
+     date_spec</kbd> arguments.</td>
   </tr>
   <tr>
-    <td valign="top">endTag</td>
-    <td valign="top">The latest tag from which diffs are to be
-     included in the report.</td>
-    <td align="center" valign="top" rowspan="2">exactly one of the two.</td>
+    <td>endTag</td>
+    <td>The latest tag from which diffs are to be included in the report.</td>
+    <td rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
-    <td valign="top">endDate</td>
-    <td valign="top">The latest date from which diffs are to be
-     included in the report.<br>
-     accepts all formats accepted by the cvs command for -D date_spec arguments</td>
+    <td>endDate</td>
+    <td class="left">The latest date from which diffs are to be included in the report.<br/>Accepts
+     all formats accepted by the <kbd>cvs</kbd> command for <kbd>-D date_spec</kbd>
+     arguments.</td>
   </tr>
   <tr>
-    <td valign="top">destfile</td>
-    <td valign="top">The file in which to write the diff report.</td>
-    <td align="center" valign="top">Yes</td>
+    <td>destfile</td>
+    <td>The file in which to write the diff report.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">ignoreRemoved</td>
-    <td valign="top">When set to true, the report will not include any
-      removed files.  <em>Since Apache Ant 1.8.0</em></td>
-    <td align="center" valign="top">No, defaults to false.</td>
+    <td>ignoreRemoved</td>
+    <td>When set to <q>true</q>, the report will not include any removed files.  <em>Since Apache
+      Ant 1.8.0</em></td>
+    <td>No; defaults to <q>false</q></td>
 </table>
 
 <h3>Parameters inherited from the <code>cvs</code> task</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">compression</td>
-    <td valign="top"><code>true</code>, <code>false</code>, or the number 1-9 (corresponding to possible values for CVS <code>-z#</code> argument). Any other value is treated as false</td>
-    <td align="center" valign="top">No. Defaults to no compression. if passed <code>true</code>, level 3 compression is assumed.</td>
+    <td>compression</td>
+    <td><q>true</q> (equivalent to <q>3</q>), <q>false</q>, or a number between <q>1</q>
+    and <q>9</q> (corresponding to possible values for CVS <kbd>-z#</kbd> argument). Any other
+    value is treated as <q>false</q></td>
+    <td>No; defaults to no compression</td>
   </tr>
   <tr>
-    <td valign="top">cvsRoot</td>
-    <td valign="top">the CVSROOT variable.</td>
-    <td align="center" valign="top">No</td>
+    <td>cvsRoot</td>
+    <td>the <code>CVSROOT</code> variable.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">cvsRsh</td>
-    <td valign="top">the CVS_RSH variable.</td>
-    <td align="center" valign="top">No</td>
+    <td>cvsRsh</td>
+    <td>the <code>CVS_RSH</code> variable.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">package</td>
-    <td valign="top">the package/module to analyze.<br>
-    Since Ant 1.6
-    multiple packages separated by spaces are possible.
-    aliases corresponding to different modules are also possible
-    Use a nested &lt;module&gt; element if you want to specify a module with
-    spaces in its name.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-    <td align="center" valign="top">Yes</td>
+    <td>package</td>
+    <td>the package/module to analyze.<br/><em>Since Ant 1.6</em> multiple packages separated by
+      spaces are possible.  aliases corresponding to different modules are also possible.  Use a
+      nested <code>&lt;module&gt;</code> element if you want to specify a module with spaces in its
+      name.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">quiet</td>
-    <td valign="top">suppress informational messages.</td>
-    <td align="center" valign="top">No, default &quot;false&quot;</td>
+    <td>quiet</td>
+    <td>suppress informational messages.</td>
+    <td>No; default <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">port</td>
-    <td valign="top">Port used by CVS to communicate with the server.</td>
-    <td align="center" valign="top">No, default port 2401.</td>
+    <td>port</td>
+    <td>Port used by CVS to communicate with the server.</td>
+    <td>No; default <q>2401</q></td>
   </tr>
   <tr>
-    <td valign="top">passfile</td>
-    <td valign="top">Password file to read passwords from.</td>
-    <td align="center" valign="top">No, default file <code>~/.cvspass</code>.</td>
+    <td>passfile</td>
+    <td>Password file to read passwords from.</td>
+    <td>No; default <q>~/.cvspass</q></td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">Stop the buildprocess if the command exits with a
-      returncode other than 0. Defaults to false</td>
-    <td align="center" valign="top">No</td>
+    <td>failonerror</td>
+    <td>Stop the build process if the command exits with a return code other than <q>0</q>.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
 </table>
 
@@ -137,93 +130,96 @@
 
 <h4>module</h4>
 
-<p>Specifies a package/module to work on, unlike the package attribute
-  modules specified using this attribute can contain spaces in their
-  name.</p>
+<p>Specifies a package/module to work on, unlike the package attribute modules specified using this
+attribute can contain spaces in their name.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The module's/package's name.</td>
-    <td align="center" valign="top">Yes.</td>
+    <td>name</td>
+    <td>Name of the module/package.</td>
+    <td>Yes</td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<pre>  &lt;cvstagdiff cvsRoot=&quot;:pserver:anoncvs@cvs.apache.org:/home/cvspublic&quot;
-                destfile=&quot;tagdiff.xml&quot;
-                package=&quot;ant&quot;
-                startTag=&quot;ANT_14&quot;
-                endTag=&quot;ANT_141&quot;
-  /&gt;</pre>
-
-<p>Generates a tagdiff report for all the changes that have been made
-in the <code>ant</code> module between the tags <code>ANT_14</code> and <code>ANT_141</code>.
-It writes these changes into the file <code>tagdiff.xml</code>.</p>
-
-<pre>  &lt;cvstagdiff
-                destfile=&quot;tagdiff.xml&quot;
-                package=&quot;ant&quot;
-                startDate=&quot;2002-01-01&quot;
-                endDate=&quot;2002-31-01&quot;
-  /&gt;</pre>
-
-<p>Generates a tagdiff report for all the changes that have been made
-in the <code>ant</code> module in january 2002. In this example <code>cvsRoot</code>
-has not been set. The current <code>cvsRoot</code> will be used (assuming the build is started
-from a folder stored in <code>cvs</code>.
-It writes these changes into the file <code>tagdiff.xml</code>.</p>
-
-<pre>  &lt;cvstagdiff
-                destfile=&quot;tagdiff.xml&quot;
-                package=&quot;ant jakarta-gump&quot;
-                startDate=&quot;2003-01-01&quot;
-                endDate=&quot;2003-31-01&quot;
-  /&gt;</pre>
-
-<p>Generates a tagdiff report for all the changes that have been made
-in the <code>ant</code> and <code>jakarta-gump</code> modules in january 2003.
-In this example <code>cvsRoot</code>
-has not been set. The current <code>cvsRoot</code> will be used (assuming the build is started
-from a folder stored in <code>cvs</code>.
-It writes these changes into the file <code>tagdiff.xml</code>.</p>
+<pre>
+&lt;cvstagdiff cvsRoot=&quot;:pserver:anoncvs@cvs.apache.org:/home/cvspublic&quot;
+            destfile=&quot;tagdiff.xml&quot;
+            package=&quot;ant&quot;
+            startTag=&quot;ANT_14&quot;
+            endTag=&quot;ANT_141&quot;/&gt;</pre>
+
+<p>Generates a <code>tagdiff</code> report for all the changes that have been made in
+the <code>ant</code> module between the tags <samp>ANT_14</samp> and <samp>ANT_141</samp>.  It
+writes these changes into the file <samp>tagdiff.xml</samp>.</p>
+
+<pre>
+&lt;cvstagdiff destfile=&quot;tagdiff.xml&quot;
+            package=&quot;ant&quot;
+            startDate=&quot;2002-01-01&quot;
+            endDate=&quot;2002-31-01&quot;/&gt;</pre>
+
+<p>Generates a <code>tagdiff</code> report for all the changes that have been made in
+the <samp>ant</samp> module in January 2002. In this example <var>cvsRoot</var> has not been
+set. The current <var>cvsRoot</var> will be used (assuming the build is started from a folder stored
+in <samp>cvs</samp>.  It writes these changes into the file <samp>tagdiff.xml</samp>.</p>
+
+<pre>
+&lt;cvstagdiff destfile=&quot;tagdiff.xml&quot;
+            package=&quot;ant jakarta-gump&quot;
+            startDate=&quot;2003-01-01&quot;
+            endDate=&quot;2003-31-01&quot;/&gt;</pre>
+
+<p>Generates a <code>tagdiff</code> report for all the changes that have been made in
+the <samp>ant</samp> and <samp>jakarta-gump</samp> modules in January 2003.  In this
+example <var>cvsRoot</var> has not been set. The current <var>cvsRoot</var> will be used (assuming
+the build is started from a folder stored in <samp>cvs</samp>.  It writes these changes into the
+file <samp>tagdiff.xml</samp>.</p>
 
 <h4>Generate Report</h4>
-<p>Ant includes a basic XSLT stylesheet that you can use to generate 
-a HTML report based on the xml output. The following example illustrates
-how to generate a HTML report from the XML report.</p>
+<p>Ant includes a basic XSLT stylesheet that you can use to generate a HTML report based on the xml
+output. The following example illustrates how to generate a HTML report from the XML report.</p>
 
 <pre>
-        &lt;style in="tagdiff.xml" 
-               out="tagdiff.html" 
-               style="${ant.home}/etc/tagdiff.xsl"&gt;
-          &lt;param name="title" expression="Ant Diff"/&gt;
-          &lt;param name="module" expression="ant"/&gt;
-          &lt;param name="cvsweb" expression="http://cvs.apache.org/viewcvs/"/&gt;
-        &lt;/style&gt;
-</pre>
+&lt;style in="tagdiff.xml"
+       out="tagdiff.html"
+       style="${ant.home}/etc/tagdiff.xsl"&gt;
+  &lt;param name="title" expression="Ant Diff"/&gt;
+  &lt;param name="module" expression="ant"/&gt;
+  &lt;param name="cvsweb" expression="http://cvs.apache.org/viewcvs/"/&gt;
+&lt;/style&gt;</pre>
 
 <h4>Output</h4>
-<p>
-The cvsroot and package attributes of the tagdiff element are new in ant 1.6.<br>
-Notes on entry attributes :
-<table border="1">
-<tr><th>Attribute</th><th>Comment</th></tr>
-<tr><td>name</td><td>when reporting on one package, the package name is removed from the output</td></tr>
-<tr><td>revision</td><td>supplied for files which exist at the end of the reporting period</td></tr>
-<tr><td>prevrevision</td><td>supplied for files which exist at the beginning of the reporting period.<br>
-Old CVS servers do not supply it for deleted files. CVS 1.12.2 supplies it.</td></tr>
+<p>The <var>cvsroot</var> and <var>package</var> attributes of the <code>tagdiff</code> element are
+new in Ant 1.6.<br/>  Notes on <code>entry</code> attributes:</p>
+<table>
+  <tr>
+    <th>Attribute</th>
+    <th>Comment</th>
+  </tr>
+  <tr>
+    <td>name</td>
+    <td>when reporting on one package, the package name is removed from the output</td>
+  </tr>
+  <tr>
+    <td>revision</td>
+    <td>supplied for files which exist at the end of the reporting period</td>
+  </tr>
+  <tr>
+    <td>prevrevision</td>
+    <td>supplied for files which exist at the beginning of the reporting period.<br/>Old CVS servers
+      do not supply it for deleted files. CVS 1.12.2 supplies it.</td>
+  </tr>
 </table>
-</p>
 <pre>
 &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
-&lt;tagdiff startTag=&quot;ANT_14&quot; endTag=&quot;ANT_141&quot; 
-cvsroot=&quot;:pserver:anoncvs@cvs.apache.org:/home/cvspublic&quot; package=&quot;ant&quot;&gt;
+&lt;tagdiff startTag=&quot;ANT_14&quot; endTag=&quot;ANT_141&quot;
+         cvsroot=&quot;:pserver:anoncvs@cvs.apache.org:/home/cvspublic&quot; package=&quot;ant&quot;&gt;
   &lt;entry&gt;
     &lt;file&gt;
       &lt;name&gt;src/main/org/apache/tools/ant/DirectoryScanner.java&lt;/name&gt;
@@ -234,8 +230,5 @@
 &lt;/tagdiff&gt;
 </pre>
 
-
-
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/cvsversion.html ant-1.10.3/manual/Tasks/cvsversion.html
--- ant-1.9.10/manual/Tasks/cvsversion.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/cvsversion.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,85 +24,78 @@
 
 <body>
 
-<h2><a name="cvs">CvsVersion</a></h2>
+<h2 id="cvs">CvsVersion</h2>
+<p><em>Since Apache Ant 1.6.1</em>.</p>
 <h3>Description</h3>
-<p>
-This task allows to retrieve a CVS client and server version.
-  <i>Since Apache Ant 1.6.1.</i>
-</p>
+<p>This task allows to retrieve a CVS client and server version.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td colspan="3">Attributes from parent Cvs task which are meaningful here</td>
+    <td colspan="3" class="left">Attributes from parent <code>&lt;cvs&gt;</code> task which are
+    meaningful here</td>
   </tr>
   <tr>
-    <td valign="top">cvsRoot</td>
-    <td valign="top">the <code>CVSROOT</code> variable.</td>
-    <td align="center" valign="top">No</td>
+    <td>cvsRoot</td>
+    <td>the <code>CVSROOT</code> variable.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">cvsRsh</td>
-    <td valign="top">the <code>CVS_RSH</code> variable.</td>
-    <td align="center" valign="top">No</td>
+    <td>cvsRsh</td>
+    <td>the <code>CVS_RSH</code> variable.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">dest</td>
-    <td valign="top">directory containing the checked out version of the project</td>
-    <td align="center" valign="top">No, default is project's basedir.</td>
+    <td>dest</td>
+    <td>directory containing the checked out version of the project</td>
+    <td>No; default is project's <var>basedir</var></td>
   </tr>
   <tr>
-    <td valign="top">package</td>
-    <td valign="top">the package/module to check out.</td>
-    <td align="center" valign="top">No</td>
+    <td>package</td>
+    <td>the package/module to check out.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">port</td>
-    <td valign="top">Port used by CVS to communicate with the server.</td>
-    <td align="center" valign="top">No, default port 2401.</td>
+    <td>port</td>
+    <td>Port used by CVS to communicate with the server.</td>
+    <td>No; default is <q>2401</q></td>
   </tr>
   <tr>
-    <td valign="top">passfile</td>
-    <td valign="top">Password file to read passwords from.</td>
-    <td align="center" valign="top">No, default file ~/.cvspass.</td>
+    <td>passfile</td>
+    <td>Password file to read passwords from.</td>
+    <td>No; default is <q>~/.cvspass</q></td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">Stop the build process if the command exits with a
-      return code other than <code>0</code>. Defaults to false</td>
-    <td align="center" valign="top">No</td>
+    <td>failonerror</td>
+    <td>Stop the build process if the command exits with a return code other than <q>0</q>.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td colspan="3">Specific attributes</td>
+    <td colspan="3" class="left">Specific attributes</td>
   </tr>
   <tr>
-    <td valign="top">clientversionproperty</td>
-    <td valign="top">Name of a property where the cvsclient version
-      should be stored</td>
-    <td align="center" valign="top">No</td>
+    <td>clientversionproperty</td>
+    <td>Name of a property where the CVS client version should be stored</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">serverversionproperty</td>
-    <td valign="top">Name of a property where the cvs server version
-      should be stored</td>
-    <td align="center" valign="top">No</td>
+    <td>serverversionproperty</td>
+    <td>Name of a property where the CVS server version should be stored</td>
+    <td>No</td>
   </tr>
 </table>
 <h3>Examples</h3>
-<pre>  &lt;cvsversion cvsRoot=&quot;:pserver:anoncvs@cvs.apache.org:/home/cvspublic&quot;
-       passfile=&quot;/home/myself/.cvspass&quot;
-       serverversionproperty=&quot;apachecvsversion&quot;
-       clientversionproperty=&quot;localcvsversion&quot;
-  /&gt;</pre>
-<p>finds out the cvs client and server versions and stores the versions in the
-properties called apachecvsversion and localcvsversion</p>
-
-
+<pre>
+&lt;cvsversion cvsRoot=&quot;:pserver:anoncvs@cvs.apache.org:/home/cvspublic&quot;
+            passfile=&quot;/home/myself/.cvspass&quot;
+            serverversionproperty=&quot;apachecvsversion&quot;
+            clientversionproperty=&quot;localcvsversion&quot;/&gt;</pre>
+<p>finds out the CVS client and server versions and stores the versions in the properties
+called <code>apachecvsversion</code> and <code>localcvsversion</code></p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/defaultexcludes.html ant-1.10.3/manual/Tasks/defaultexcludes.html
--- ant-1.9.10/manual/Tasks/defaultexcludes.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/defaultexcludes.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,42 +24,40 @@
 
 <body>
 
-<h2><a name="echo">DefaultExcludes</a></h2>
+<h2 id="defaultexcludes">DefaultExcludes</h2>
 
-<p><em>since Apache Ant 1.6</em></p>
+<p><em>Since Apache Ant 1.6</em></p>
 
 <h3>Description</h3>
-<p>Alters the default excludes for all subsequent processing in the
-build, and prints out the current default excludes if desired.
+<p>Alters the default excludes for all subsequent processing in the build, and prints out the
+current default excludes if desired.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">echo</td>
-    <td valign="top">whether or not to print out the default excludes.(defaults to false)</td>
-    <td valign="top" align="center">attribute "true" required if no
-                                    other attribute specified</td>
+    <td>echo</td>
+    <td>whether or not to print out the default excludes</td>
+    <td><q>true</q> required if no other attribute specified; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">default</td>
-    <td valign="top">go back to hard wired default excludes</td>
-    <td valign="top" align="center">attribute "true" required if no
-    if no other attribute is specified</td>
+    <td>default</td>
+    <td>go back to hard wired default excludes</td>
+    <td><q>true</q> required if no other attribute is specified</td>
   </tr>
   <tr>
-    <td valign="top">add</td>
-    <td valign="top">the pattern to add to the default excludes</td>
-    <td valign="top" align="center">if no other attribute is specified</td>
+    <td>add</td>
+    <td>the pattern to add to the default excludes</td>
+    <td>if no other attribute is specified</td>
   </tr>
   <tr>
-    <td valign="top">remove</td>
-    <td valign="top">remove the specified pattern from the default excludes</td>
-    <td valign="top" align="center">if no other attribute is specified</td>
+    <td>remove</td>
+    <td>remove the specified pattern from the default excludes</td>
+    <td>if no other attribute is specified</td>
   </tr>
 </table>
 
@@ -67,41 +65,37 @@
 
 <p>Print out the default excludes</p>
 
-<pre>  &lt;defaultexcludes echo=&quot;true&quot;/&gt;</pre>
+<pre>&lt;defaultexcludes echo=&quot;true&quot;/&gt;</pre>
 
-<p>Print out the default excludes and exclude all *.bak files in
-<strong>all</strong> further processing</p>
+<p>Print out the default excludes and exclude all <samp>*.bak</samp> files in <strong>all</strong>
+further processing</p>
 
-<pre>  &lt;defaultexcludes echo=&quot;true&quot; add=&quot;**/*.bak&quot;/&gt;</pre>
+<pre>&lt;defaultexcludes echo=&quot;true&quot; add=&quot;**/*.bak&quot;/&gt;</pre>
 
-<p>Silently allow several fileset based tasks to operate on emacs
-backup files and then restore normal behavior</p>
+<p>Silently allow several fileset based tasks to operate on emacs backup files and then restore
+normal behavior</p>
 
 <pre>
-  &lt;defaultexcludes remove=&quot;**/*~&quot;/&gt;
+&lt;defaultexcludes remove=&quot;**/*~&quot;/&gt;
 
-  (do several fileset based tasks here)
+(do several fileset based tasks here)
 
-  &lt;defaultexcludes default=&quot;true&quot;/&gt;
-</pre>
+&lt;defaultexcludes default=&quot;true&quot;/&gt;</pre>
 
 <h3>Notes</h3>
-By default the pattern <tt>**/.svn</tt> and <tt>**/.svn/**</tt> are set as default 
-excludes. With version 1.3 Subversion supports the 
-<a target="_blank" href="http://subversion.apache.org/docs/release-notes/1.3.html#_svn-hack">&quot;_svn hack&quot;</a>.
-That means, that the svn-libraries evaluate environment variables and use <i>.svn</i> 
-or <i>_svn</i> directory regarding to that value. We had chosen not to evaluate environment variables to
-get a more reliable build. Instead you have to change the settings by yourself by changing
-the exclude patterns:
+<p>By default the pattern <samp>**/.svn</samp> and <samp>**/.svn/**</samp> are set as default
+excludes. Since version 1.3, Subversion supports
+the <a href="https://subversion.apache.org/docs/release-notes/1.3.html#_svn-hack"
+target="_top">&quot;_svn hack&quot;</a>.  That means, that the svn-libraries evaluate environment
+variables and use <samp>.svn</samp> or <samp>_svn</samp> directory regarding to that value. We had
+chosen not to evaluate environment variables to get a more reliable build. Instead you have to
+change the settings by yourself by changing the exclude patterns:</p>
 <pre>
-  &lt;defaultexcludes remove=&quot;**/.svn&quot;/&gt;
-  &lt;defaultexcludes remove=&quot;**/.svn/**&quot;/&gt;
-  &lt;defaultexcludes add=&quot;**/_svn&quot;/&gt;
-  &lt;defaultexcludes add=&quot;**/_svn/**&quot;/&gt;
+&lt;defaultexcludes remove=&quot;**/.svn&quot;/&gt;
+&lt;defaultexcludes remove=&quot;**/.svn/**&quot;/&gt;
+&lt;defaultexcludes add=&quot;**/_svn&quot;/&gt;
+&lt;defaultexcludes add=&quot;**/_svn/**&quot;/&gt;
 </pre>
 
-
-
-
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/delete.html ant-1.10.3/manual/Tasks/delete.html
--- ant-1.9.10/manual/Tasks/delete.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/delete.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,205 +24,174 @@
 
 <body>
 
-<h2><a name="delete">Delete</a></h2>
+<h2 id="delete">Delete</h2>
 <h3>Description</h3>
-<p>Deletes a single file, a specified directory and all its files and
-subdirectories, or a set of files specified by one or more
-<a href="../Types/resources.html#collection">resource collection</a>s.
-The literal implication of <code>&lt;fileset&gt;</code> is that
-directories are not included; however the removal of empty directories can
-be triggered when using nested filesets by setting the
-<code>includeEmptyDirs</code> attribute to <i>true</i>. Note that this
-attribute is meaningless in the context of any of the various resource
-collection types that <i>do</i> include directories, but that no attempt
-will be made to delete non-empty directories in any case.  Whether a
-directory is empty or not is decided by looking into the filesystem -
-include or exclude patterns don't apply here.</p>
-<p>
-If you use this task to delete temporary files created by editors
-and it doesn't seem to work, read up on the
-<a href="../dirtasks.html#defaultexcludes">default exclusion set</a>
-in <strong>Directory-based Tasks</strong>, and see the
-<code>defaultexcludes</code> attribute below.
-
-<p>For historical reasons <code>&lt;delete dir="x"/&gt;</code> is
-  different from <code>&lt;delete&gt;&lt;fileset
-  dir="x"/&gt;&lt;/delete&gt;</code>, it will try to remove everything
-  inside "x" including "x" itself, not taking default excludes into
-  account, blindly following all symbolic links.  If you need more
-  control, use a nested <code>&lt;fileset&gt;</code>.</p>
+<p>Deletes a single file, a specified directory and all its files and subdirectories, or a set of
+files specified by one or more <a href="../Types/resources.html#collection">resource
+collection</a>s.  The literal implication of <code>&lt;fileset&gt;</code> is that directories are
+not included; however the removal of empty directories can be triggered when using nested filesets
+by setting the <var>includeEmptyDirs</var> attribute to <q>true</q>. Note that this attribute is
+meaningless in the context of any of the various resource collection types that <em>do</em> include
+directories, but that no attempt will be made to delete non-empty directories in any case.  Whether
+a directory is empty or not is decided by looking into the filesystem&mdash;include or exclude
+patterns don't apply here.</p>
+<p>If you use this task to delete temporary files created by editors and it doesn't seem to work,
+read up on the <a href="../dirtasks.html#defaultexcludes">default exclusion set</a>
+in <strong>Directory-based Tasks</strong>, and see the <code>defaultexcludes</code> attribute
+below.</p>
+
+<p>For historical reasons <code>&lt;delete dir="x"/&gt;</code> is different
+from <code>&lt;delete&gt;&lt;fileset dir="x"/&gt;&lt;/delete&gt;</code>; it will try to remove
+everything inside <q>x</q> including <q>x</q> itself, not taking default excludes into account,
+blindly following all symbolic links.  If you need more control, use a
+nested <code>&lt;fileset&gt;</code>.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">file</td>
-    <td valign="top">The file to delete, specified as either the simple
-     filename (if the file exists in the current base directory), a
-     relative-path filename, or a full-path filename.</td>
-    <td align="center" valign="middle" rowspan="2">At least one of the two,
-     unless nested resource collections are specified
-  </tr>
-  <tr>
-    <td valign="top">dir</td>
-    <td valign="top">The directory to delete, including all its files and
-     subdirectories.<br>
-     <b>Note:</b> <code>dir</code> is <em>not</em> used
-     to specify a directory name for <code>file</code>; <code>file</code>
-     and <code>dir</code> are independent of each other.<br>
-     <b>WARNING:</b> Do <b>not</b> set <code>dir</code> to
-     <code>&quot;.&quot;</code>, <code>&quot;${basedir}&quot;</code>,
-     or the full-pathname equivalent unless you truly <em>intend</em> to
-     recursively remove the entire contents of the current base directory
-     (and the base directory itself, if different from the current working
-     directory).</td>
-  </tr>
-  <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">Whether to show the name of each deleted file.</td>
-    <td align="center" valign="top">No, default &quot;false&quot;</i></td>
-  </tr>
-  <tr>
-    <td valign="top">quiet</td>
-    <td valign="top">If the specified file or directory does not exist,
-     do not display a diagnostic message (unless Apache Ant
-     has been invoked with the <code>-verbose</code> or
-     <code>-debug</code> switches) or modify the exit status to
-     reflect an error.
-     When set to &quot;true&quot;, if a file or directory cannot be deleted,
-     no error is reported. This setting emulates the
-     <code>-f</code> option to the Unix <em>rm</em> command.
-     Setting this to &quot;true&quot; implies setting
-     <code>failonerror</code> to &quot;false&quot;.
-    </td>
-    <td align="center" valign="top">No, default &quot;false&quot;</td>
-  </tr>
-  <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">Controls whether an error (such as a failure to
-    delete a file) stops the build or is merely reported to the screen.
-    Only relevant if <code>quiet</code> is &quot;false&quot;.</td>
-    <td align="center" valign="top">No, default &quot;true&quot;</td>
-  </tr>
-  <tr>
-    <td valign="top">includeemptydirs</td>
-    <td valign="top">Whether to delete empty directories
-                     when using filesets.</td>
-    <td align="center" valign="top">No, default &quot;false&quot;</td>
-  </tr>
-  <tr>
-    <td valign="top">includes</td>
-    <td valign="top"><em>Deprecated.</em>  Use resource collections.
-      Comma- or space-separated list of patterns of
-      files that must be deleted. All files are relative to the directory
-      specified in <code>dir</code>.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top"><em>Deprecated.</em>  Use resource collections.
-      The name of a file. Each line of
-      this file is taken to be an include pattern.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">excludes</td>
-    <td valign="top"><em>Deprecated.</em>  Use resource collections.
-      Comma- or space-separated list of patterns of
-      files that must be excluded from the deletion list.
-      All files are relative to the directory specified in <code>dir</code>.
-      No files (except default excludes) are excluded when omitted.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top"><em>Deprecated.</em>  Use resource collections.
-      The name of a file. Each line of
-      this file is taken to be an exclude pattern</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">defaultexcludes</td>
-    <td valign="top"><em>Deprecated.</em>  Use resource collections.
-      Whether to use <a href="../dirtasks.html#defaultexcludes">
-      default excludes.</a></td>
-    <td align="center" valign="top">No, default &quot;true&quot;</td>
-  </tr>
-  <tr>
-    <td valign="top">deleteonexit</td>
-    <td valign="top">
-      Indicates whether to use File#deleteOnExit() if there is a
-      failure to delete a file, this causes the jvm to attempt
-      to delete the file when the jvm process is terminating.
-      <em>Since Ant 1.6.2</em></td>
-    <td align="center" valign="top">No, default &quot;false&quot;</td>
-  </tr>
-  <tr>
-    <td valign="top">removeNotFollowedSymlinks</td>
-    <td valign="top">
-      Whether symbolic links (not the files/directories they link to)
-      should be removed if they haven't been followed because
-      followSymlinks was false or the maximum number of symbolic links
-      was too big.
-      <em>Since Ant 1.8.0</em></td>
-    <td align="center" valign="top">No, default &quot;false&quot;</td>
-  </tr>
-  <tr>
-    <td valign="top">performGCOnFailedDelete</td>
-    <td valign="top">
-      If Ant fails to delete a file or directory it will retry the
-      operation once.  If this flag is set to true it will perform a
-      garbage collection before retrying the delete.<br/>
-      Setting this flag to true is known to resolve some problems on
-      Windows (where it defaults to true) but also for directory trees
-      residing on an NFS share.
-      <em>Since Ant 1.8.3</em></td>
-    <td align="center" valign="top">No, default &quot;true&quot; on
-      Windows and &quot;true&quot; on any other OS.</td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>file</td>
+    <td>The file to delete, specified as either the simple filename (if the file exists in the
+      current base directory), a relative-path filename, or a full-path filename.</td>
+    <td rowspan="2">At least one of the two, unless nested resource collections are specified</td>
+  </tr>
+  <tr>
+    <td>dir</td>
+    <td class="left">The directory to delete, including all its files and
+     subdirectories.<br/><strong>Note</strong>: <var>dir</var> is <em>not</em> used to specify a
+     directory name for <var>file</var>; <var>file</var> and <var>dir</var> are independent of each
+     other.<br/><strong>Warning</strong>: Do <strong>not</strong> set <var>dir</var>
+     to <q>.</q>, <q>${basedir}</q>, or the full-pathname equivalent unless you
+     truly <em>intend</em> to recursively remove the entire contents of the current base directory
+     (and the base directory itself, if different from the current working directory).</td>
+  </tr>
+  <tr>
+    <td>verbose</td>
+    <td>Whether to show the name of each deleted file.</td>
+    <td>No; default <q>false</q></td>
+  </tr>
+  <tr>
+    <td>quiet</td>
+    <td>If the specified file or directory does not exist, do not display a diagnostic message
+      (unless Apache Ant has been invoked with the <kbd>-verbose</kbd> or <kbd>-debug</kbd>
+      switches) or modify the exit status to reflect an error.  When set to <q>true</q>, if a file
+      or directory cannot be deleted, no error is reported. This setting emulates
+      the <kbd>-f</kbd> option to the Unix <em>rm</em> command.  Setting this to <q>true</q>
+      implies setting <var>failonerror</var> to <q>false</q>.</td>
+    <td>No; default <q>false</q></td>
+  </tr>
+  <tr>
+    <td>failonerror</td>
+    <td>Controls whether an error (such as a failure to delete a file) stops the build or is merely
+      reported to the screen.  Only relevant if <code>quiet</code> is <q>false</q>.</td>
+    <td>No; default <q>true</q></td>
+  </tr>
+  <tr>
+    <td>includeemptydirs</td>
+    <td>Whether to delete empty directories when using filesets.</td>
+    <td>No; default <q>false</q></td>
+  </tr>
+  <tr>
+    <td>includes</td>
+    <td><em><u>Deprecated</u></em>.  Use resource collections.  Comma- or space-separated list of
+      patterns of files that must be deleted. All files are relative to the directory specified
+      in <var>dir</var>.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>includesfile</td>
+    <td><em><u>Deprecated</u></em>.  Use resource collections.  Name of a file; each line of this
+      file is taken to be an include pattern.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>excludes</td>
+    <td><em><u>Deprecated</u></em>.  Use resource collections.  Comma- or space-separated list of
+      patterns of files that must be excluded from the deletion list.  All files are relative to the
+      directory specified in <var>dir</var>.</td>
+    <td>No; defaults to default excludes or none if <var>defaultexcludes</var> is <q>no</q></td>
+  </tr>
+  <tr>
+    <td>excludesfile</td>
+    <td><em><u>Deprecated</u></em>.  Use resource collections.  Name of a file; each line of this
+      file is taken to be an exclude pattern</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>defaultexcludes</td>
+    <td><em><u>Deprecated</u></em>.  Use resource collections.  Whether to
+      use <a href="../dirtasks.html#defaultexcludes">default excludes.</a></td>
+    <td>No; default <q>true</q></td>
+  </tr>
+  <tr>
+    <td>deleteonexit</td>
+    <td>Indicates whether to use <code>File#deleteOnExit()</code> if there is a failure to delete a
+      file. This causes the JVM to attempt to delete the file when the JVM process is
+      terminating.  <em>Since Ant 1.6.2</em></td>
+    <td>No; default <q>false</q></td>
+  </tr>
+  <tr>
+    <td>removeNotFollowedSymlinks</td>
+    <td>Whether symbolic links (not the files/directories they link to) should be removed if they
+      haven't been followed because <var>followSymlinks</var> was <q>false</q> or the maximum number
+      of symbolic links was too big.  <em>Since Ant 1.8.0</em></td>
+    <td>No; default <q>false</q></td>
+  </tr>
+  <tr>
+    <td>performGCOnFailedDelete</td>
+    <td>If Ant fails to delete a file or directory it will retry the operation once.  If this flag
+      is set to <q>true</q> it will perform a garbage collection before retrying the
+      delete.<br/>Setting this flag to true is known to resolve some problems on Windows (where it
+      defaults to <q>true</q>) but also for directory trees residing on an NFS share.  <em>Since Ant
+      1.8.3</em></td>
+    <td>No; default <q>true</q> on Windows and <q>true</q> on any other OS</td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<pre>  &lt;delete file=&quot;/lib/ant.jar&quot;/&gt;</pre>
-<p>deletes the file <code>/lib/ant.jar</code>.</p>
-<pre>  &lt;delete dir=&quot;lib&quot;/&gt;</pre>
-<p>deletes the <code>lib</code> directory, including all files
-and subdirectories of <code>lib</code>.</p>
-
-<pre>  &lt;delete&gt;
-    &lt;fileset dir=&quot;.&quot; includes=&quot;**/*.bak&quot;/&gt;
-  &lt;/delete&gt;
-</pre>
-<p>deletes all files with the extension <code>.bak</code> from the current directory
-and any subdirectories.</p>
+<pre>&lt;delete file=&quot;/lib/ant.jar&quot;/&gt;</pre>
+<p>deletes the file <samp>/lib/ant.jar</samp>.</p>
 
-<pre>  &lt;delete includeEmptyDirs=&quot;true&quot;&gt;
-    &lt;fileset dir=&quot;build&quot;/&gt;
-  &lt;/delete&gt;
+<pre>&lt;delete dir=&quot;lib&quot;/&gt;</pre>
+<p>deletes the <samp>lib</samp> directory, including all files and subdirectories
+of <samp>lib</samp>.</p>
+
+<pre>
+&lt;delete&gt;
+  &lt;fileset dir=&quot;.&quot; includes=&quot;**/*.bak&quot;/&gt;
+&lt;/delete&gt;
 </pre>
-<p>deletes all files and subdirectories of <code>build</code>, including
-<code>build</code> itself.</p>
+<p>deletes all files with the extension <samp>.bak</samp> from the current directory and any
+subdirectories.</p>
 
-<pre>  &lt;delete includeemptydirs=&quot;true&quot;&gt;
-    &lt;fileset dir=&quot;build&quot; includes=&quot;**/*&quot;/&gt;
-  &lt;/delete&gt;
+<pre>
+&lt;delete includeEmptyDirs=&quot;true&quot;&gt;
+  &lt;fileset dir=&quot;build&quot;/&gt;
+&lt;/delete&gt;
 </pre>
-<p>deletes all files and subdirectories of <code>build</code>, without
-<code>build</code> itself.</p>
+<p>deletes all files and subdirectories of <samp>build</samp>, including <samp>build</samp>
+itself.</p>
 
-<pre>  &lt;delete includeemptydirs=&quot;true&quot;&gt;
-    &lt;fileset dir=&quot;src&quot; includes=&quot;**/.svn/&quot; defaultexcludes=&quot;false&quot;/&gt;
-  &lt;/delete&gt;
+<pre>
+&lt;delete includeemptydirs=&quot;true&quot;&gt;
+  &lt;fileset dir=&quot;build&quot; includes=&quot;**/*&quot;/&gt;
+&lt;/delete&gt;
 </pre>
-<p>deletes the subversion metadata directories under <code>src</code>. Because <code>.svn</code>
-is on of the <a href="../dirtasks.html#defaultexcludes">default excludes</a> you have to use the 
-<code>defaultexcludes</code> flag, otherwise Ant wont delete these directories and the files in it.</p>
-
+<p>deletes all files and subdirectories of <samp>build</samp>, without <samp>build</samp>
+itself.</p>
 
+<pre>
+&lt;delete includeemptydirs=&quot;true&quot;&gt;
+  &lt;fileset dir=&quot;src&quot; includes=&quot;**/.svn/&quot; defaultexcludes=&quot;false&quot;/&gt;
+&lt;/delete&gt;
+</pre>
+<p>deletes the subversion metadata directories under <samp>src</samp>. Because <samp>.svn</samp> is
+on of the <a href="../dirtasks.html#defaultexcludes">default excludes</a> you have to use the
+<var>defaultexcludes</var> flag, otherwise Ant won't delete these directories and the files in it.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/deltree.html ant-1.10.3/manual/Tasks/deltree.html
--- ant-1.9.10/manual/Tasks/deltree.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/deltree.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,33 +24,29 @@
 
 <body>
 
-<h2><a name="deltree">Deltree</a></h2>
-<h3><i>Deprecated</i></h3>
-<p><i>This task has been deprecated.  Use the Delete task instead.</i></p>
+<h2 id="deltree">Deltree</h2>
+<h3><em><u>Deprecated</u></em></h3>
+<p><em>This task has been <u>deprecated</u>.  Use the <code>Delete</code> task instead.</em></p>
 <h3>Description</h3>
 <p>Deletes a directory with all its files and subdirectories.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">dir</td>
-    <td valign="top">the directory to delete.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>dir</td>
+    <td>the directory to delete.</td>
+    <td>Yes</td>
   </tr>
 </table>
 <h3>Examples</h3>
-<pre>  &lt;deltree dir=&quot;dist&quot;/&gt;</pre>
-<p>deletes the directory <code>dist</code>, including its files and
-subdirectories.</p>
-<pre>  &lt;deltree dir=&quot;${dist}&quot;/&gt;</pre>
-<p>deletes the directory <code>${dist}</code>, including its files and
-subdirectories.</p>
-
+<pre>&lt;deltree dir=&quot;dist&quot;/&gt;</pre>
+<p>deletes the directory <samp>dist</samp>, including its files and subdirectories.</p>
+<pre>&lt;deltree dir=&quot;${dist}&quot;/&gt;</pre>
+<p>deletes the directory <samp>${dist}</samp>, including its files and subdirectories.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/depend.html ant-1.10.3/manual/Tasks/depend.html
--- ant-1.9.10/manual/Tasks/depend.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/depend.html	2018-03-24 12:37:12.000000000 +0000
@@ -26,191 +26,171 @@
 
 <h2>Depend</h2>
 
-A task to manage Java class file dependencies.
+<p>A task to manage Java class file dependencies.</p>
 
 <h3>Description</h3>
 
-<p>
-The depend task works by determining which classes are out of date with
-respect to their source and then removing the class files of any other
-classes which depend on the out-of-date classes.
-</p>
-
-<p> To determine the class dependencies, the depend task analyzes the class 
-files of all class files passed to it. Depend does not parse your source code in 
-any way but relies upon the class references encoded into the class files by the 
-compiler. This is generally faster than parsing the Java source.</p>
-
-<p>
-To learn more about how this information is obtained from the class files, 
-please refer to <a href="http://docs.oracle.com/javase/specs/">the Java
-Virtual Machine Specification</a>
-</p>
-
-<p> Since a class' dependencies only change when the class itself changes, the 
-depend task is able to cache dependency information. Only those class files 
-which have changed will have their dependency information re-analysed. Note that 
-if you change a class' dependencies by changing the source, it will be 
-recompiled anyway. You can examine the dependency files created to understand 
-the  dependencies of your classes. Please do not rely, however, on the format of 
-the information, as it may change in a later release. </p>
-
-<p> Once depend discovers all of the class dependencies, it &quot;inverts&quot; 
-this relation to determine, for each class, which other classes are dependent 
-upon it. This &quot;affects&quot; list is used to discover which classes are 
-invalidated by the out of date class. The class files of the invalidated 
-classes are removed, triggering the compilation of the affected classes. </p>
-
-<p> The depend task supports an attribute, &quot;closure&quot; which controls 
-whether depend will only consider direct class-class relationships or whether it 
-will also consider transitive, indirect relationships. For example, say there 
-are three classes, A, which depends on B, which in-turn depend on C. Now say 
-that class C is out of date. Without closure, only class B would be removed by 
-depend. With closure set, class A would also be removed. Normally direct 
-relationships are sufficient - it is unusual for a class to depend on another 
-without having a direct relationship. With closure set, you will notice that 
-depend typically removes far more class files. </p>
-
-<p>The classpath attribute for <code>&lt;depend&gt;</code> is optional. If it is present, 
-depend will check class dependencies against classes and jars on this classpath.
-Any classes which depend on an element from this classpath and which are older 
-than that element will be deleted. A typical example where you would use this 
-facility would be where you are building a utility jar and want to make sure 
-classes which are out of date with respect to this jar are rebuilt. You should
-<b>not</b> include jars in this classpath which you do not expect to change, 
-such as the JDK runtime jar or third party jars, since doing so will just slow 
-down the dependency check. This means that if you do use a classpath for the 
-depend task it may be different from the classpath necessary to actually 
-compile your code.</p>
-
-<h3>Performance</h3> 
-
-<p> The performance of the depend task is dependent on a 
-number of factors such as class relationship complexity and how many class files 
-are out of date. The decision about whether it is cheaper to just recompile all 
-classes or to use the depend task will depend on the size of your project and 
-how interrelated your classes are. </p>
+<p>The <code>depend</code> task works by determining which classes are out of date with respect to
+their source and then removing the class files of any other classes which depend on the out-of-date
+classes.</p>
+
+<p>To determine the class dependencies, the <code>depend</code> task analyzes the class files of all
+class files passed to it. The task does not parse your source code in any way but relies upon the
+class references encoded into the class files by the compiler. This is generally faster than parsing
+the Java source files.</p>
+
+<p>To learn more about how this information is obtained from the class files, please refer
+to <a href="https://docs.oracle.com/javase/specs/" target="_top">the Java Virtual Machine
+Specification</a></p>
+
+<p>Since a class' dependencies only change when the class itself changes, the
+<code>depend</code> task is able to cache dependency information. Only those class files which have
+changed will have their dependency information re-analysed. Note that if you change a class'
+dependencies by changing the source, it will be recompiled anyway. You can examine the dependency
+files created to understand the dependencies of your classes. Please do not rely, however, on the
+format of the information, as it may change in a later release.</p>
+
+<p>Once <code>depend</code> discovers all of the class dependencies, it &quot;inverts&quot; this
+relation to determine, for each class, which other classes are dependent upon it. This
+&quot;affects&quot; list is used to discover which classes are invalidated by the out of date
+class. The class files of the invalidated classes are removed, triggering the compilation of the
+affected classes.</p>
+
+<p>The <code>depend</code> task supports an attribute, <var>closure</var> which controls
+whether <code>depend</code> will only consider direct class-class relationships or whether it will
+also consider transitive, indirect relationships. For example, say there are three classes, A, which
+depends on B, which in-turn depend on C. Now say that class C is out of
+date. Without <var>closure</var>, only class B would be removed
+by <code>depend</code>. With <var>closure</var> set, class A would also be removed. Normally direct
+relationships are sufficient&mdash;it is unusual for a class to depend on another without having a
+direct relationship. With <var>closure</var> set, you will notice that <code>depend</code> typically
+removes far more class files.</p>
+
+<p>The <var>classpath</var> attribute for <code>&lt;depend&gt;</code> is optional. If it is
+present, <code>depend</code> will check class dependencies against classes and jars on this
+classpath.  Any classes which depend on an element from this classpath and which are older than that
+element will be deleted. A typical example where you would use this facility would be where you are
+building a utility jar and want to make sure classes which are out of date with respect to this jar
+are rebuilt. You should <strong>not</strong> include jars in this classpath which you do not expect
+to change, such as the JDK runtime jar or third party jars, since doing so will just slow down the
+dependency check. This means that if you do use a classpath for the <code>depend</code> task it may
+be different from the classpath necessary to actually compile your code.</p>
+
+<h3>Performance</h3>
+
+<p>The performance of the <code>depend</code> task is dependent on a number of factors such as class
+relationship complexity and how many class files are out of date. The decision about whether it is
+cheaper to just recompile all classes or to use the <code>depend</code> task will depend on the size
+of your project and how interrelated your classes are.</p>
 
 
 <h3>Limitations</h3>
 
-<p> There are some source dependencies which depend will not detect. </p>
+<p>There are some source dependencies which <code>depend</code> will not detect.</p>
 
 <ul>
-<li>If the Java compiler optimizes away a class relationship, 
-    there can be a source dependency without a class dependency. </li>
-    
-<li>Non public classes cause two problems. Firstly depend cannot relate
-    the class file to a source file. In the future this may be addressed
-    using the source file attribute in the classfile. Secondly, neither 
-    depend nor the compiler tasks can detect when a non public class is
-    missing. Inner classes are handled by the depend task.</li>
+<li>If the Java compiler optimizes away a class relationship, there can be a source dependency
+without a class dependency.</li>
+
+<li>Non public classes cause two problems. Firstly depend cannot relate the class file to a source
+file. In the future this may be addressed using the source file attribute in the
+classfile. Secondly, neither <code>depend</code> nor the compiler tasks can detect when a non public
+class is missing. Inner classes are handled by the <code>depend</code> task.</li>
 </ul>
 
-The most obvious example of these limitations is that the task can't tell
-which classes to recompile when a constant primitive data type exported 
-by other classes is changed. For example, a change in the definition of
-something like
+<p>The most obvious example of these limitations is that the task can't tell which classes to
+recompile when a constant primitive data type exported by other classes is changed. For example, a
+change in the definition of something like</p>
 <pre>
 public final class Constants {
-  public final static boolean DEBUG=false;
-}
-</pre> will not be picked up by other classes.
+    public final static boolean DEBUG=false;
+}</pre>
+<p>will not be picked up by other classes.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">srcDir</td>
-    <td valign="top">This is the directory where the source exists. depend
-will examine this to determine which classes are out of date. If you use multiple
-source directories you can pass this attribute a path of source directories.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>srcDir</td>
+    <td>This is the directory where the source exists. <code>depend</code> will examine this to
+      determine which classes are out of date. If you use multiple source directories you can pass
+      this attribute a path of source directories.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">destDir</td>
-    <td valign="top">This is the root directory of the class files which
-will be analysed. If this is not present, the srcdir is used.</td>
-    <td valign="top" align="center">No</td>
+    <td>destDir</td>
+    <td>This is the root directory of the class files which will be analysed.</td>
+    <td>No; defaults to <var>srcdir</var></td>
   </tr>
   <tr>
-    <td valign="top">cache</td>
-    <td valign="top">This is a directory in which depend can store and
-retrieve dependency information. If this is not present, depend will not
-use a cache </td>
-    <td valign="top" align="center">No</td>
+    <td>cache</td>
+    <td>This is a directory in which <code>depend</code> can store and retrieve dependency
+      information.</td>
+    <td>No; defaults to no cache</td>
   </tr>
   <tr>
-    <td valign="top">closure</td>
-    <td valign="top">This attribute controls whether depend only removes
-classes which directly depend on out of date classes. If this is set to true,
-depend will traverse the class dependency graph deleting all affected
-classes. Defaults to false</td>
-    <td valign="top" align="center">No</td>
+    <td>closure</td>
+    <td>This attribute controls whether <code>depend</code> only removes classes which directly
+      depend on out of date classes. If this is set to <q>true</q>, <code>depend</code> will
+      traverse the class dependency graph deleting all affected classes.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">dump</td>
-    <td valign="top">If true the dependency information will be written to the debug level log
-                     </td>
-    <td valign="top" align="center">No</td>
+    <td>dump</td>
+    <td>If true the dependency information will be written to the debug level log</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">The classpath containing jars and classes for which <code>&lt;depend&gt;</code> should also
-                     check dependencies</td>
-    <td valign="top" align="center">No</td>
+    <td>classpath</td>
+    <td>The classpath containing jars and classes for which <code>&lt;depend&gt;</code> should also
+      check dependencies</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">warnOnRmiStubs</td>
-    <td valign="top">Flag to disable warnings about files that look like rmic generated stub/skeleton
-    classes, and which have no .java source. Useful when doing rmi development. </td>
-    <td valign="top" align="center">No, default=true</td>
+    <td>warnOnRmiStubs</td>
+    <td>Flag to disable warnings about files that look like <kbd>rmic</kbd> generated
+      stub/skeleton classes and have no <samp>.java</samp> source. Useful when doing RMI
+      development.</td>
+    <td>No; default <q>true</q></td>
   </tr>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
-<p>The <code>depend</code> task's <code>classpath</code> attribute is a 
-<a href="../using.html#path">PATH-like structure</a> and can also be set
-via a nested <code>&lt;classpath&gt;</code> element.</p>
-
-<p>Additionally,
-this task forms an implicit
-<a href="../Types/fileset.html">FileSet</a>
-and supports most attributes of
-<code>&lt;fileset&gt;</code> (<code>dir</code> becomes <code>srcdir</code>),
-as well as the nested <code>&lt;include&gt;</code>,
-<code>&lt;exclude&gt;</code>, and <code>&lt;patternset&gt;</code> elements.
+<p>The <code>depend</code> task's <var>classpath</var> attribute is
+a <a href="../using.html#path">path-like structure</a> and can also be set via a
+nested <code>&lt;classpath&gt;</code> element.</p>
+
+<p>Additionally, this task forms an implicit <a href="../Types/fileset.html">FileSet</a> and
+supports most attributes of <code>&lt;fileset&gt;</code> (<var>dir</var> becomes <var>srcdir</var>),
+as well as the nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code>,
+and <code>&lt;patternset&gt;</code> elements.</p>
 
 <h3>Examples</h3>
-<pre>&lt;depend srcdir=&quot;${java.dir}&quot;
+<pre>
+&lt;depend srcdir=&quot;${java.dir}&quot;
         destdir=&quot;${build.classes}&quot;
         cache=&quot;depcache&quot;
         closure=&quot;yes&quot;/&gt;</pre>
 
-<p>removes any classes in the <code>${build.classes}</code> directory
-that depend on out-of-date classes. Classes are considered out-of-date with 
-respect to the source in the <code>${java.dir}</code> directory, using the same
-mechanism as the <code>&lt;javac&gt;</code> task. In this example, the
-<code>&lt;depend&gt;</code> task caches its dependency 
-information in the <code>depcache</code> directory. </p>
+<p>removes any classes in the <samp>${build.classes}</samp> directory that depend on out-of-date
+classes. Classes are considered out-of-date with respect to the source in
+the <samp>${java.dir}</samp> directory, using the same mechanism as the <code>&lt;javac&gt;</code>
+task. In this example, the <code>&lt;depend&gt;</code> task caches its dependency information in
+the <samp>depcache</samp> directory.</p>
 
 <pre>
 &lt;depend srcdir=&quot;${java.dir}&quot; destdir=&quot;${build.classes}&quot;
         cache=&quot;depcache&quot; closure=&quot;yes&quot;&gt;
   &lt;include name=&quot;**/*.java&quot;/&gt;
   &lt;excludesfile name=&quot;${java.dir}/build_excludes&quot;/&gt;
-&lt;/depend&gt;
-</pre>
-<p>does the same as the previous example, but explicitly includes all
-<code>.java</code> files, except those that match the list given
-in <code>${java.dir}/build_excludes</code>.</p>
-
+&lt;/depend&gt;</pre>
 
+<p>does the same as the previous example, but explicitly includes all <samp>.java</samp> files,
+except those that match the list given in <samp>${java.dir}/build_excludes</samp>.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/dependset.html ant-1.10.3/manual/Tasks/dependset.html
--- ant-1.9.10/manual/Tasks/dependset.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/dependset.html	2018-03-24 12:37:12.000000000 +0000
@@ -30,142 +30,113 @@
 
 <h3>Description</h3>
 
-<p>
-The dependset task compares a set of sources with a set of target
-files.  If any of the sources has been modified more recently than
-any of the target files, all of the target files are removed.
-</p>
-<p>
-Sources and target files are specified via nested
-<a href="../Types/resources.html#collection">Resource Collection</a>s;
-sources can be resources of any type, while targets are restricted to files
-only. At least one set of sources and one set of targets is required.
-</p>
-<p>
-Use a FileSet when you want to use wildcard include or exclude
-patterns and don't care about missing files.  Use a FileList when you
-want to consider the non-existence of a file as if it were out of
-date.  If there are any non-existing files in any source or target
-FileList, all target files will be removed.
-</p>
-<p>
-DependSet is useful to capture dependencies that are not or cannot be
-determined algorithmically.  For example, the <code>&lt;style&gt;</code> task only
-compares the source XML file and XSLT stylesheet against the target
-file to determined whether to restyle the source.  Using dependset you
-can extend this dependency checking to include a DTD or XSD file as
-well as other stylesheets imported by the main stylesheet.
-</p>
+<p>The <code>dependset</code> task compares a set of sources with a set of target files.  If any of
+the sources has been modified more recently than any of the target files, all of the target files
+are removed.</p>
+<p>Sources and target files are specified via
+nested <a href="../Types/resources.html#collection">resource collections</a>; sources can be
+resources of any type, while targets are restricted to files only. At least one set of sources and
+one set of targets is required.</p>
+<p>Use a FileSet when you want to use wildcard include or exclude patterns and don't care about
+missing files.  Use a FileList when you want to consider the non-existence of a file as if it were
+out of date.  If there are any non-existing files in any source or target FileList, all target files
+will be removed.</p>
+<p>DependSet is useful to capture dependencies that are not or cannot be determined algorithmically.
+For example, the <code>&lt;style&gt;</code> task only compares the source XML file and XSLT
+stylesheet against the target file to determined whether to restyle the source.
+Using <code>dependset</code> you can extend this dependency checking to include a DTD or XSD file as
+well as other stylesheets imported by the main stylesheet.</p>
 
 <h3>Parameters</h3>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td valign="top" align="center"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">Makes the task list all deleted targets files
-      and the reason why they get deleted.</td>
-    <td align="center" valign="top" rowspan="2">No</td>
+    <td>verbose</td>
+    <td>Makes the task list all deleted targets files and the reason why they get deleted.</td>
+    <td>No</td>
   </tr>
 </table>
 
-<h3>Parameters Specified as Nested Elements</h3>
+<h3>Parameters specified as nested elements</h3>
 
 <h4>sources</h4>
 
-<p>The <code>&lt;sources&gt;</code> element is a
-<a href="../Types/resources.html#union">Union</a> into which
-arbitrary resource collections can be nested. <b>Since Apache Ant 1.7</b>
+<p>The <code>&lt;sources&gt;</code> element is a <a href="../Types/resources.html#union">Union</a>
+into which arbitrary resource collections can be nested. <em>Since Apache Ant 1.7</em>
 </p>
 
 <h4>srcfileset</h4>
 
-<p>
-The nested <code>&lt;srcfileset&gt;</code> element specifies a <a
-href="../Types/fileset.html">FileSet</a>. All files included in
-this fileset will be compared against all files included in all of the
-<code>&lt;targetfileset&gt;</code> filesets and <code>&lt;targetfilelist&gt;</code>
-filelists.  Multiple <code>&lt;srcfileset&gt;</code> filesets may be specified.
-</p>
+<p>The nested <code>&lt;srcfileset&gt;</code> element specifies
+a <a href="../Types/fileset.html">FileSet</a>. All files included in this fileset will be compared
+against all files included in all of the <code>&lt;targetfileset&gt;</code> filesets
+and <code>&lt;targetfilelist&gt;</code> filelists.  Multiple <code>&lt;srcfileset&gt;</code>
+filesets may be specified.</p>
 
 <h4>srcfilelist</h4>
 
-<p>
-The nested <code>&lt;srcfilelist&gt;</code> element specifies a <a
-href="../Types/filelist.html">FileList</a>. All files included in
-this filelist will be compared against all files included in all of the 
-<code>&lt;targetfileset&gt;</code> filesets and <code>&lt;targetfilelist&gt;</code>
-filelists.  Multiple <code>&lt;srcfilelist&gt;</code> filelists may be specified.
-</p>
+<p>The nested <code>&lt;srcfilelist&gt;</code> element specifies
+a <a href="../Types/filelist.html">FileList</a>. All files included in this filelist will be
+compared against all files included in all of the <code>&lt;targetfileset&gt;</code> filesets
+and <code>&lt;targetfilelist&gt;</code> filelists.  Multiple <code>&lt;srcfilelist&gt;</code>
+filelists may be specified.</p>
 
 <h4>targets</h4>
 
-<p>The <code>&lt;targets&gt;</code> element is a
-<a href="../using.html#path">Path</a> and thus can
-include any filesystem-based resource. <b>Since Ant 1.7</b>
-</p>
+<p><em>Since Ant 1.7</em></p>
+
+<p>The <code>&lt;targets&gt;</code> element is a <a href="../using.html#path">Path</a> and thus can
+include any filesystem-based resource.</p>
 
 <h4>targetfileset</h4>
 
-<p>
-The nested <code>&lt;targetfileset&gt;</code> element specifies a <a
-href="../Types/fileset.html">FileSet</a>.  All files included in
-this fileset will be compared against all files included in all of the
-<code>&lt;srcfileset&gt;</code> filesets and <code>&lt;sourcefilelist&gt;</code>
-filelists, and if any are older, they are all deleted.
-Multiple <code>&lt;targetfileset&gt;</code> filesets may be specified.
-</p>
+<p>The nested <code>&lt;targetfileset&gt;</code> element specifies
+a <a href="../Types/fileset.html">FileSet</a>.  All files included in this fileset will be compared
+against all files included in all of the <code>&lt;srcfileset&gt;</code> filesets
+and <code>&lt;sourcefilelist&gt;</code> filelists, and if any are older, they are all deleted.
+Multiple <code>&lt;targetfileset&gt;</code> filesets may be specified.</p>
 
 <h4>targetfilelist</h4>
 
-<p>
-The nested <code>&lt;targetfilelist&gt;</code> element specifies a <a
-href="../Types/filelist.html">FileList</a>.  All files included in
-this filelist will be compared against all files included in all of the
-<code>&lt;srcfileset&gt;</code> filesets and <code>&lt;sourcefilelist&gt;</code>
-filelists, and if any are older, they are all deleted.
-Multiple <code>&lt;targetfilelist&gt;</code> filelists may be specified.
-</p>
+<p>The nested <code>&lt;targetfilelist&gt;</code> element specifies
+a <a href="../Types/filelist.html">FileList</a>.  All files included in this filelist will be
+compared against all files included in all of the <code>&lt;srcfileset&gt;</code> filesets
+and <code>&lt;sourcefilelist&gt;</code> filelists, and if any are older, they are all deleted.
+Multiple <code>&lt;targetfilelist&gt;</code> filelists may be specified.</p>
 
 <h3>Examples</h3>
-<blockquote> <pre>
-    &lt;dependset&gt;
-       &lt;srcfilelist
-           dir   = &quot;${dtd.dir}&quot;
-           files = &quot;paper.dtd,common.dtd&quot;/&gt;
-       &lt;srcfilelist
-           dir   = &quot;${xsl.dir}&quot;
-           files = &quot;common.xsl&quot;/&gt;
-       &lt;srcfilelist
-           dir   = &quot;${basedir}&quot;
-           files = &quot;build.xml&quot;/&gt;
-       &lt;targetfileset
-           dir      = &quot;${output.dir}&quot;
-           includes = &quot;**/*.html&quot;/&gt;
-    &lt;/dependset&gt;  </pre>
-</blockquote>
-
-<p> 
-In this example derived HTML files in the ${output.dir} directory 
-will be removed if any are out-of-date with respect to:</p>
+<pre>
+&lt;dependset&gt;
+  &lt;srcfilelist
+      dir   = &quot;${dtd.dir}&quot;
+      files = &quot;paper.dtd,common.dtd&quot;/&gt;
+  &lt;srcfilelist
+      dir   = &quot;${xsl.dir}&quot;
+      files = &quot;common.xsl&quot;/&gt;
+  &lt;srcfilelist
+      dir   = &quot;${basedir}&quot;
+      files = &quot;build.xml&quot;/&gt;
+  &lt;targetfileset
+      dir      = &quot;${output.dir}&quot;
+      includes = &quot;**/*.html&quot;/&gt;
+&lt;/dependset&gt;</pre>
+
+<p>In this example derived HTML files in the ${output.dir} directory will be removed if any are
+out-of-date with respect to:</p>
 <ol>
-<li>the DTD of their source XML files</li>
-<li>a common DTD (imported by the main DTD)</li>
-<li>a subordinate XSLT stylesheet (imported by the main stylesheet), or</li>
-<li>the buildfile</li>
+  <li>the DTD of their source XML files</li>
+  <li>a common DTD (imported by the main DTD)</li>
+  <li>a subordinate XSLT stylesheet (imported by the main stylesheet), or</li>
+  <li>the buildfile</li>
 </ol>
 
-<p>
-If any of the sources in the above example does not exist, all
-target files will also be removed.  To ignore missing sources instead,
-use filesets instead of filelists for the sources.
-</p>
-
-
+<p>If any of the sources in the above example does not exist, all target files will also be removed.
+To ignore missing sources instead, use filesets instead of filelists for the sources.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/diagnostics.html ant-1.10.3/manual/Tasks/diagnostics.html
--- ant-1.9.10/manual/Tasks/diagnostics.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/diagnostics.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,26 +24,19 @@
 
 <body>
 
-<h2><a name="diagnostics">Diagnostics</a></h2>
-<h3>Diagnostics</h3>
-<p>
-Runs Apache Ant's <code>-diagnostics</code> code inside Ant itself. This is good for 
-debugging Ant's configuration under an IDE. 
-<b>Since Ant 1.7.0</b>
-</p>
-
+<h2 id="diagnostics">Diagnostics</h2>
+<p><em>Since Ant 1.7.0</em></p>
+<h3>Description</h3>
+<p>Runs Apache Ant's <kbd>-diagnostics</kbd> code inside Ant itself. This is good for debugging
+Ant's configuration under an IDE.</p>
 
 <h3>Examples</h3>
 
 <pre>
-    &lt;target name="diagnostics" description="diagnostics"&gt;
-        &lt;diagnostics/&gt;
-    &lt;/target&gt;
-</pre>
-<p>
-    Prints out the current diagnostics dump.
-</p>
-
+&lt;target name="diagnostics" description="diagnostics"&gt;
+    &lt;diagnostics/&gt;
+&lt;/target&gt;</pre>
+<p>Prints out the current diagnostics dump.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/dirname.html ant-1.10.3/manual/Tasks/dirname.html
--- ant-1.9.10/manual/Tasks/dirname.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/dirname.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,51 +24,41 @@
 
 <body>
 
-<h2><a name="echo">Dirname</a></h2>
+<h2 id="echo">Dirname</h2>
 <h3>Description</h3>
-<p>
-Task to determine the directory path of a specified file.
-</p>
-<p> 
-When this task executes, it will set the specified property to the
-value of the specified file (or directory) up to, but not including,
-the last path element. If the specified file is a path that ends in a
-filename, the filename will be dropped. If the specified file is just
-a filename, the directory will be the current directory.
-</p>
-  <p>
-    <em>Note:</em> This is not the same as the UNIX dirname command, which is
-    defined as "strip non-directory suffix from filename". &lt;dirname&gt;
-    determines the full directory path of the specified file.
-  </p>
+<p>Task to determine the directory path of a specified file.</p>
+<p>When this task executes, it will set the specified property to the value of the specified file
+(or directory) up to, but not including, the last path element. If the specified file is a path that
+ends in a filename, the filename will be dropped. If the specified file is just a filename, the
+directory will be the current directory.</p>
+<p><strong>Note</strong>: This is not the same as the UNIX <code>dirname</code> command, which is
+defined as "strip non-directory suffix from filename". <code>&lt;dirname&gt;</code> determines the
+full directory path of the specified file.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">The path to take the dirname of.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>file</td>
+    <td>The path to take the dirname of.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">property</td>
-    <td valign="top">The name of the property to set.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>property</td>
+    <td>The name of the property to set.</td>
+    <td>Yes</td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<pre>  &lt;dirname property=&quot;antfile.dir&quot; file=&quot;${ant.file}&quot;/&gt;</pre>
-will set <code>antfile.dir</code> to the directory path for
-<code>${ant.file}</code>.
-<pre>  &lt;dirname property=&quot;foo.dirname&quot; file=&quot;foo.txt&quot;/&gt;</pre>
-will set <code>foo.dirname</code> to the project's basedir.</p>
-
+<pre>&lt;dirname property=&quot;antfile.dir&quot; file=&quot;${ant.file}&quot;/&gt;</pre>
+<p>will set <code>antfile.dir</code> to the directory path for <samp>${ant.file}</samp>.</p>
 
+<pre>&lt;dirname property=&quot;foo.dirname&quot; file=&quot;foo.txt&quot;/&gt;</pre>
+<p>will set <code>foo.dirname</code> to the project's <var>basedir</var>.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/ear.html ant-1.10.3/manual/Tasks/ear.html
--- ant-1.9.10/manual/Tasks/ear.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/ear.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,278 +24,244 @@
 
 <body>
 
-<h2><a name="ear">Ear</a></h2>
+<h2 id="ear">Ear</h2>
 <h3>Description</h3>
-<p>An extension of the <a href="jar.html">Jar</a> task with special
-treatment for files that should end up in an Enterprise Application archive.</p>
-<p>(The Ear task is a shortcut for specifying the particular layout of a EAR file. 
-The same thing can be accomplished by using the <i>prefix</i> and <i>fullpath</i>
-attributes of zipfilesets in a Zip or Jar task.)</p>
-<p>The extended zipfileset element from the zip task (with attributes <i>prefix</i>, <i>fullpath</i>, and <i>src</i>) is available in the Ear task.</p>
-
-<p><b>Please note that the zip format allows multiple files of the same
-fully-qualified name to exist within a single archive.  This has been
-documented as causing various problems for unsuspecting users.  If you wish
-to avoid this behavior you must set the <code>duplicate</code> attribute
-to a value other than its default, <code>&quot;add&quot;</code>.</b></p>
+<p>An extension of the <a href="jar.html">Jar</a> task with special treatment for files that should
+end up in an Enterprise Application archive.</p>
+<p>(The <code>Ear</code> task is a shortcut for specifying the particular layout of a EAR file.  The
+same thing can be accomplished by using the <var>prefix</var> and <var>fullpath</var> attributes of
+zipfilesets in a <code>Zip</code> or <code>Jar</code> task.)</p>
+<p>The extended zipfileset element from the <code>Zip</code> task (with
+attributes <var>prefix</var>, <var>fullpath</var>, and <var>src</var>) is available in
+the <code>Ear</code> task.</p>
+
+<p><strong>Please note that the zip format allows multiple files of the same fully-qualified name to
+exist within a single archive.  This has been documented as causing various problems for
+unsuspecting users.  If you wish to avoid this behavior you must set the <var>duplicate</var>
+attribute to a value other than its default, <q>add</q>.</strong></p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">destfile</td>
-    <td valign="top">the EAR file to create.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>destfile</td>
+    <td>the EAR file to create.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">appxml</td>
-    <td valign="top">The deployment descriptor to use (META-INF/application.xml).</td>
-    <td valign="top" align="center">Yes, unless update is set to true</td>
+    <td>appxml</td>
+    <td>The deployment descriptor to use (<samp>META-INF/application.xml</samp>).</td>
+    <td>Yes, unless <var>update</var> is set to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">basedir</td>
-    <td valign="top">the directory from which to jar the files.</td>
-    <td valign="top" align="center">No</td>
+    <td>basedir</td>
+    <td>the directory from which to jar the files.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">compress</td>
-    <td valign="top">Not only store data but also compress them,
-    defaults to true.  Unless you set the <em>keepcompression</em>
-    attribute to false, this will apply to the entire archive, not
-    only the files you've added while updating.</td>
-    <td align="center" valign="top">No</td>
+    <td>compress</td>
+    <td>Not only store data but also compress them.  Unless you set the <var>keepcompression</var>
+      attribute to <q>false</q>, this will apply to the entire archive, not only the files you've
+      added while updating.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">keepcompression</td>
-    <td valign="top">For entries coming from existing archives (like
-    nested <em>zipfileset</em>s or while updating the archive), keep
-    the compression as it has been originally instead of using the
-    <em>compress</em> attribute.  Defaults false.  <em>Since Apache Ant
-    1.6</em></td>
-    <td align="center" valign="top">No</td>
+    <td>keepcompression</td>
+    <td>For entries coming from existing archives (like nested <code>zipfileset</code>s or while
+    updating the archive), keep the compression as it has been originally instead of using the
+    <var>compress</var> attribute.  <em>Since Apache Ant 1.6</em></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">The character encoding to use for filenames
-      inside the archive.  Defaults to UTF8. <strong>It is not
-      recommended to change this value as the created archive will most
-      likely be unreadable for Java otherwise.</strong>
-      <br/>See also the <a href="zip.html#encoding">discussion in the
-      zip task page</a></td>
-    <td align="center" valign="top">No</td>
+    <td>encoding</td>
+    <td>The character encoding to use for filenames inside the archive. <strong>It is not
+      recommended to change this value as the created archive will most likely be unreadable for
+      Java otherwise.</strong>  <br/>See also the <a href="zip.html#encoding">discussion in the zip
+      task page</a></td>
+    <td>No; defaults to <q>UTF8</q></td>
   </tr>
   <tr>
-    <td valign="top">filesonly</td>
-    <td valign="top">Store only file entries, defaults to false</td>
-    <td align="center" valign="top">No</td>
+    <td>filesonly</td>
+    <td>Store only file entries.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">includes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      included. All files are included when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>includes</td>
+    <td>comma- or space-separated list of patterns of files that must be included.</td>
+    <td>No; defaults to all (<q>**</q>)</td>
   </tr>
   <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an include pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>includesfile</td>
+    <td>name of a file. Each line of this file is taken to be an include pattern.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">excludes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      excluded. No files (except default excludes) are excluded when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>excludes</td>
+    <td>comma- or space-separated list of patterns of files that must be excluded.</td>
+    <td>No; defaults to default excludes or none if <var>defaultexcludes</var> is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an exclude pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>excludesfile</td>
+    <td>name of a file. Each line of this file is taken to be an exclude pattern.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">defaultexcludes</td>
-    <td valign="top">indicates whether default excludes should be used or not
-      (&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>defaultexcludes</td>
+    <td>indicates whether default excludes should be used or not (<q>yes|no</q>).</td>
+    <td>No; defaults to <q>yes</q></td>
   </tr>
   <tr>
-    <td valign="top">manifest</td>
-    <td valign="top">the manifest file to use.</td>
-    <td valign="top" align="center">No</td>
+    <td>manifest</td>
+    <td>the manifest file to use.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">filesetmanifest</td>
-    <td valign="top">behavior when a Manifest is found in a zipfileset or zipgroupfileset file is found.  Valid values are &quot;skip&quot;, &quot;merge&quot;, and &quot;mergewithoutmain&quot;.  &quot;merge&quot; will merge all of the manifests together, and merge this into any other specified manifests.  &quot;mergewithoutmain&quot; merges everything but the Main section of the manifests.  Default value is &quot;skip&quot;.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>filesetmanifest</td>
+    <td>behavior when a manifest file is found in a <code>zipfileset</code>
+      or <code>zipgroupfileset</code> file.  Valid values are <q>skip</q>, <q>merge</q>,
+      and <q>mergewithoutmain</q>.  <q>merge</q> will merge all of the manifests together, and merge
+      this into any other specified manifests.  <q>mergewithoutmain</q> merges everything but the
+      Main section of the manifests.</td>
+    <td>No; defaults to <q>skip</q></td>
+  </tr>
+  <tr>
+    <td>whenmanifestonly</td>
+    <td>behavior when no files match.  Valid values are <q>fail</q>, <q>skip</q>,
+    and <q>create</q>.</td>
+    <td>No; defaults to <q>create</q></td>
+  </tr>
+  <tr>
+    <td>manifestencoding</td>
+    <td>The encoding used to read the JAR manifest, when a manifest file is specified.</td>
+    <td>No; defaults to default JVM character encoding</td>
+  </tr>
+  <tr>
+    <td>index</td>
+    <td>whether to create
+      an <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/jar/jar.html#JAR_Index"
+      target="_top">index list</a> to speed up classloading.  This is a JDK 1.3+ specific feature.
+      Unless you specify additional jars with
+      nested <a href="jar.html#indexjars"><code>indexjars</code></a> elements, only the contents of
+      this jar will be included in the index.</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>indexMetaInf</td>
+    <td>whether to include <samp>META-INF</samp> and its children in the index.  Doesn't have any
+      effect if <var>index</var> is false.<br/>Oracle's jar implementation used to skip
+      the <samp>META-INF</samp> directory and Ant followed that example.  The behavior has been
+      changed with <a href="https://bugs.openjdk.java.net/browse/JDK-4408526" target="_top">Java
+      5</a>.  In order to avoid problems with Ant generated jars on Java 1.4 or earlier, Ant will
+      not include <samp>META-INF</samp> unless explicitly asked to.<br/><em>Since Ant
+      1.8.0</em>.</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>update</td>
+    <td>indicates whether to update or overwrite the destination file if it already exists.</td>
+    <td>No; default is <q>false</q></td>
+  </tr>
+  <tr>
+    <td>duplicate</td>
+    <td>behavior when a duplicate file is found.  Valid values are <q>add</q>, <q>preserve</q>,
+    and <q>fail</q>.</td>
+    <td>No; default is <q>add</q></td>
+  </tr>
+  <tr>
+    <td>roundup</td>
+    <td>Whether the file modification times will be rounded up to the next even number of
+      seconds.<br/>Zip archives store file modification times with a granularity of 2 seconds, so
+      the times will either be rounded up or down.  If you round down, the archive will always seem
+      out-of-date when you rerun the task, so the default is to round up.  Rounding up may lead to a
+      different type of problems like JSPs inside a web archive that seem to be slightly more recent
+      than precompiled pages, rendering precompilation useless.<br/><em>Since Ant 1.6.2</em></td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">whenmanifestonly</td>
-    <td valign="top">behavior when no files match.  Valid values are &quot;fail&quot;, &quot;skip&quot;, and &quot;create&quot;.  Default is &quot;create&quot;.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">manifestencoding</td>
-    <td valign="top">The encoding used to read the JAR manifest, when a manifest file is specified.</td>
-    <td valign="top" align="center">No, defaults to the platform encoding.</td>
-  </tr>
-  <tr>
-    <td valign="top">index</td>
-    <td valign="top">whether to create an <A
-    HREF="http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index">index
-    list</A> to speed up classloading.  This is a JDK 1.3+ specific
-    feature.  Unless you specify additional jars with nested <a
-    href="jar.html#indexjars"><code>indexjars</code></a> elements, only the
-    contents of this jar will be included in the index.  Defaults to
-    false.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">indexMetaInf</td>
-    <td valign="top">whether to include META-INF and its children in
-      the index.  Doesn't have any effect if <em>index</em> is
-      false.<br/>
-      Oracle's jar implementation used to skip the META-INF directory and
-      Ant followed that example.  The behavior has been changed with
-      <a href="https://bugs.openjdk.java.net/browse/JDK-4408526">Java
-      5</a>.  In order to avoid problems with Ant generated jars on
-      Java 1.4 or earlier Ant will not include META-INF unless
-      explicitly asked to.<br/>
-      <em>Ant 1.8.0</em> - Defaults to false.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">update</td>
-    <td valign="top">indicates whether to update or overwrite
-      the destination file if it already exists.  Default is &quot;false&quot;.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">duplicate</td>
-    <td valign="top">behavior when a duplicate file is found.  Valid values are &quot;add&quot;, &quot;preserve&quot;, and &quot;fail&quot;.  The default value is &quot;add&quot;.  </td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">roundup</td>
-    <td valign="top">Whether the file modification times will be
-    rounded up to the next even number of seconds.<br>
-    Zip archives store file modification times with a granularity of
-    two seconds, so the times will either be rounded up or down.  If
-    you round down, the archive will always seem out-of-date when you
-    rerun the task, so the default is to round up.  Rounding up may
-    lead to a different type of problems like JSPs inside a web
-    archive that seem to be slightly more recent than precompiled
-    pages, rendering precompilation useless.<br>
-    Defaults to true.  <em>Since Ant 1.6.2</em></td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">level</td>
-    <td valign="top">Non-default level at which file compression should be
-    performed. Valid values range from 0 (no compression/fastest) to 9
-    (maximum compression/slowest). <em>Since Ant 1.7</em></td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">preserve0permissions</td>
-    <td valign="top">when updating an archive or adding entries from a
-    different archive Ant will assume that a Unix permissions value of
-    0 (nobody is allowed to do anything to the file/directory) means
-    that the permissions haven't been stored at all rather than real
-    permissions and will instead apply its own default values.<br/>
-    Set this attribute to true if you really want to preserve the
-      original permission field.<em>since Ant 1.8.0</em>
+    <td>level</td>
+    <td>Non-default level at which file compression should be performed. Valid values range
+    from <q>0</q> (no compression/fastest) to <q>9</q> (maximum compression/slowest). <em>Since Ant
+    1.7</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>preserve0permissions</td>
+    <td>when updating an archive or adding entries from a different archive Ant will assume that a
+      Unix permissions value of 0 (nobody is allowed to do anything to the file/directory) means
+      that the permissions haven't been stored at all rather than real permissions and will instead
+      apply its own default values.<br/>  Set this attribute to <q>true</q> if you really want to
+      preserve the original permission field. <em>Since Ant 1.8.0</em>
     </td>
-    <td valign="top" align="center">No, default is false</td>
+    <td>No; default is <q>false</q></td>
+  </tr>
+  <tr>
+    <td>useLanguageEncodingFlag</td>
+    <td>Whether to set the language encoding flag if the encoding is UTF-8.  This setting doesn't
+      have any effect if the encoding is not UTF-8. <em>Since Ant 1.8.0</em>.<br/>See also
+      the <a href="zip.html#encoding">discussion in the zip task page</a></td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+  <tr>
+    <td>createUnicodeExtraFields</td>
+    <td>Whether to create Unicode extra fields to store the file names a second time inside the
+      entry's metadata.<br/>Possible values are <q>never</q>, <q>always</q>
+      and <q>not-encodeable</q> which will only add Unicode extra fields if the file name cannot be
+      encoded using the specified encoding. <em>Since Ant 1.8.0</em>.  <br/>See also
+      the <a href="zip.html#encoding">discussion in the zip task page</a></td>
+    <td>No; default is <q>never</q></td>
+  </tr>
+  <tr>
+    <td>fallbacktoUTF8</td>
+    <td>Whether to use UTF-8 and the language encoding flag instead of the specified encoding if a
+      file name cannot be encoded using the specified encoding. <em>Since Ant 1.8.0</em>.<br/>See
+      also the <a href="zip.html#encoding">discussion in the zip task page</a></td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">useLanguageEncodingFlag</td>
-    <td valign="top">Whether to set the language encoding flag if the
-      encoding is UTF-8.  This setting doesn't have any effect if the
-      encoding is not UTF-8.
-      <em>Since Ant 1.8.0</em>.
-      <br/>See also the <a href="zip.html#encoding">discussion in the
-      zip task page</a></td>
-    <td valign="top" align="center">No, default is true</td>
-  </tr>
-  <tr>
-    <td valign="top">createUnicodeExtraFields</td>
-    <td valign="top">Whether to create unicode extra fields to store
-      the file names a second time inside the entry's metadata.
-      <br>Possible values are "never", "always" and "not-encodeable"
-      which will only add Unicode extra fields if the file name cannot
-      be encoded using the specified encoding.
-      <em>Since Ant 1.8.0</em>.
-      <br/>See also the <a href="zip.html#encoding">discussion in the
-      zip task page</a></td>
-    <td align="center" valign="top">No, default is "never"</td>
-  </tr>
-  <tr>
-    <td valign="top">fallbacktoUTF8</td>
-    <td valign="top">Whether to use UTF-8 and the language encoding
-      flag instead of the specified encoding if a file name cannot be
-      encoded using the specified encoding.
-      <em>Since Ant 1.8.0</em>.
-      <br/>See also the <a href="zip.html#encoding">discussion in the
-      zip task page</a></td>
-    <td align="center" valign="top">No, default is false</td>
-  </tr>
-  <tr>
-    <td valign="top">mergeClassPathAttributes</td>
-    <td valign="top">Whether to merge the Class-Path attributes found
-      in different manifests (if merging manifests).  If false, only
-      the attribute of the last merged manifest will be preserved.
-      <em>Since Ant 1.8.0</em>.
-      <br/>unless you also set flattenAttributes to true this may
-      result in manifests containing multiple Class-Path attributes
-      which violates the manifest specification.</td>
-    <td align="center" valign="top">No, default is false</td>
-  </tr>
-  <tr>
-    <td valign="top">flattenAttributes</td>
-    <td valign="top">Whether to merge attributes occurring more than
-      once in a section (this can only happen for the Class-Path
-      attribute) into a single attribute.
-      <em>Since Ant 1.8.0</em>.</td>
-    <td align="center" valign="top">No, default is false</td>
-  </tr>
-  <tr>
-    <td valign="top">zip64Mode</td>
-    <td valign="top">When to use Zip64 extensions for entries.  The
-      possible values are "never", "always" and "as-needed".
-      <em>Since Ant 1.9.1</em>.
-      <br/>See also the <a href="zip.html#zip64">discussion in the
-      zip task page</a></td>
-    <td align="center" valign="top">No, default is "never"</td>
+    <td>mergeClassPathAttributes</td>
+    <td>Whether to merge the <code>Class-Path</code> attributes found in different manifests (if
+      merging manifests).  If <q>false</q>, only the attribute of the last merged manifest will be
+      preserved.  <em>Since Ant 1.8.0</em>.<br/>unless you also set <var>flattenAttributes</var>
+      to <q>true</q> this may result in manifests containing multiple <code>Class-Path</code>
+      attributes which violates the manifest specification.</td>
+    <td>No; default is <q>false</q></td>
+  </tr>
+  <tr>
+    <td>flattenAttributes</td>
+    <td>Whether to merge attributes occurring more than once in a section (this can only happen for
+      the <code>Class-Path</code> attribute) into a single attribute.  <em>Since Ant
+      1.8.0</em>.</td>
+    <td>No; default is <q>false</q></td>
+  </tr>
+  <tr>
+    <td>zip64Mode</td>
+    <td>When to use Zip64 extensions for entries.  The possible values
+      are <q>never</q>, <q>always</q> and <q>as-needed</q>.  <em>Since Ant 1.9.1</em>.<br/>See also
+      the <a href="zip.html#zip64">discussion in the zip task page</a></td>
+    <td>No; default is <q>never</q></td>
   </tr>
 </table>
 
-<h3>Nested elements</h3>
+<h3>Parameters specified as nested elements</h3>
 
 <h4>metainf</h4>
-<p>The nested <code>metainf</code> element specifies a <a
-href="../Types/fileset.html">FileSet</a>. All files included in this fileset will
-end up in the <code>META-INF</code> directory of the ear file. If this
-fileset includes a file named <code>MANIFEST.MF</code>, the file is
-ignored and you will get a warning.</p>
+<p>The nested <code>metainf</code> element specifies
+a <a href="../Types/fileset.html">FileSet</a>. All files included in this fileset will end up in
+the <samp>META-INF</samp> directory of the ear file. If this fileset includes a file
+named <samp>MANIFEST.MF</samp>, the file is ignored and you will get a warning.</p>
 
 <h4>manifest, indexjars, service</h4>
-These are inherited from <a href="jar.html">&lt;jar&gt;</a>
+<p>These are inherited from <a href="jar.html">&lt;jar&gt;</a></p>
 
 <h2>Example</h2>
 <pre>
-    &lt;ear destfile=&quot;${build.dir}/myapp.ear&quot; appxml=&quot;${src.dir}/metadata/application.xml&quot;&gt;
-      &lt;fileset dir=&quot;${build.dir}&quot; includes=&quot;*.jar,*.war&quot;/&gt;
-    &lt;/ear&gt;
-</pre>
-
+&lt;ear destfile=&quot;${build.dir}/myapp.ear&quot; appxml=&quot;${src.dir}/metadata/application.xml&quot;&gt;
+  &lt;fileset dir=&quot;${build.dir}&quot; includes=&quot;*.jar,*.war&quot;/&gt;
+&lt;/ear&gt;</pre>
 
 </body>
 </html>
-
-
diff -Nru ant-1.9.10/manual/Tasks/echo.html ant-1.10.3/manual/Tasks/echo.html
--- ant-1.9.10/manual/Tasks/echo.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/echo.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,170 +24,147 @@
 
 <body>
 
-<h2><a name="echo">Echo</a></h2>
+<h2 id="echo">Echo</h2>
 <h3>Description</h3>
-<p>Echoes a message to the current loggers and listeners which
-means <tt>System.out</tt> unless overridden. A <tt>level</tt>
-can be specified, which controls at what logging level the message is
-filtered at.
-<p>
-The task can also echo to a file, in which case the option to append rather
-than overwrite the file is available, and the <tt>level</tt> option is
-ignored</p>
+<p>Echoes a message to the current loggers and listeners which means <code>System.out</code> unless
+overridden. A <var>level</var> can be specified, which controls at what logging level the message is
+filtered at.</p>
+<p>The task can also echo to a file, in which case the option to append rather than overwrite the
+file is available, and the <var>level</var> option is ignored</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">message</td>
-    <td valign="top">the message to echo.</td>
-    <td valign="top" align="center">No.  Text may also be included in a
-      character section within this element.  If neither is included a 
-      blank line will be emitted in the output.</td>
+    <td>message</td>
+    <td>the message to echo.</td>
+    <td>No; defaults to a blank line unless text is included in a character section within this
+      element</td>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">the file to write the message to.</td>
-    <td valign="top" align="center" rowspan="2">Optionally one of these may be specified.</td>
+    <td>file</td>
+    <td>the file to write the message to.</td>
+    <td rowspan="2">No; only one of these may be used</td>
   </tr>
   <tr>
-    <td valign="top">output</td>
-    <td valign="top">the <a href="../Types/resources.html">Resource</a>
+    <td>output</td>
+    <td class="left">the <a href="../Types/resources.html">Resource</a>
       to write the message to (see <a href="../develop.html#set-magic">note</a>).
-      <b>Since Apache Ant 1.8</b></td>
+      <em>Since Apache Ant 1.8</em></td>
   </tr>
   <tr>
-    <td valign="top">append</td>
-    <td valign="top">Append to an existing file (or
-      <a href="http://docs.oracle.com/javase/7/docs/api//java/io/FileWriter.html#FileWriter%28java.lang.String,%20boolean%29" target="_blank">
-      open a new file / overwrite an existing file</a>)? Default <i>false</i>.
+    <td>append</td>
+    <td>Append to an existing file
+      (or <a href="https://docs.oracle.com/javase/8/docs/api//java/io/FileWriter.html#FileWriter-java.lang.String-boolean-"
+      target="_top"> open a new file / overwrite an existing file</a>)?
     </td>
-    <td valign="top" align="center">No; ignored unless <i>output</i> indicates a
-      filesystem destination.</td>
+    <td>No; ignored unless <var>output</var> indicates a filesystem destination, default
+      is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">level</td>
-    <td valign="top">Control the level at which this message is reported.
-            One of "error", "warning", "info", "verbose", "debug" (decreasing order)</td>
-    <td valign="top" align="center">No - default is "warning".</td>
+    <td>level</td>
+    <td>Control the level at which this message is reported.  One
+      of <q>error</q>, <q>warning</q>, <q>info</q>, <q>verbose</q>, <q>debug</q> (decreasing
+      order)</td>
+    <td>No; default is <q>warning</q></td>
   </tr>
   <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">encoding to use, default is ""; the local system encoding. <em>since Ant 1.7</em></td>
-    <td valign="top" align="center">No</td>
+    <td>encoding</td>
+    <td>encoding to use. <em>since Ant 1.7</em></td>
+    <td>No; defaults to default JVM character encoding</td>
   </tr>
   <tr>
-    <td valign="top">force</td>
-    <td valign="top">Overwrite read-only destination
-      files.  <em>since Ant 1.8.2</em></td>
-    <td valign="top" align="center">No; defaults to false.</td>
+    <td>force</td>
+    <td>Overwrite read-only destination files.  <em>since Ant 1.8.2</em></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<pre>
-&lt;echo message=&quot;Hello, world&quot;/&gt;
-</pre>
-<pre>
-&lt;echo message=&quot;Embed a line break:${line.separator}&quot;/&gt;
-</pre>
-<pre>
-&lt;echo&gt;Embed another:${line.separator}&lt;/echo&gt;
-</pre>
-<pre>
-&lt;echo&gt;This is a longer message stretching over
+<pre>&lt;echo message=&quot;Hello, world&quot;/&gt;</pre>
+<pre>&lt;echo message=&quot;Embed a line break:${line.separator}&quot;/&gt;</pre>
+<pre>&lt;echo&gt;Embed another:${line.separator}&lt;/echo&gt;</pre>
+<pre>&lt;echo&gt;This is a longer message stretching over
 two lines.
-&lt;/echo&gt;
-</pre>
-<pre>
-&lt;echo&gt;
+&lt;/echo&gt;</pre>
+<pre>&lt;echo&gt;
 This is a longer message stretching over
 three lines; the first line is a blank
-&lt;/echo&gt;
-</pre>
-The newline immediately following the &lt;echo&gt; tag will be part of the output.<br>
-Newlines in character data within the content of an element are not discarded by XML parsers.<br>
-See <a href="http://www.w3.org/TR/2004/REC-xml-20040204/#sec-line-ends">
-W3C Recommendation 04 February 2004 / End of Line handling
-</a> for more details.
+&lt;/echo&gt;</pre>
+<p>The newline immediately following the <code>&lt;echo&gt;</code> tag will be part of the
+output. Newlines in character data within the content of an element are not discarded by XML
+parsers.<br/>See <a href="https://www.w3.org/TR/xml/#sec-line-ends" target="_top">W3C Recommendation
+26 November 2008 / End of Line handling</a> for more details.</p>
 
 <pre>&lt;echo message=&quot;Deleting drive C:&quot; level=&quot;debug&quot;/&gt;</pre>
-A message which only appears in <tt>-debug</tt> mode.
+<p>A message which only appears in <kbd>-debug</kbd> mode.</p>
 <pre>&lt;echo level=&quot;error&quot;&gt;
 Imminent failure in the antimatter containment facility.
 Please withdraw to safe location at least 50km away.
-&lt;/echo&gt;
-</pre>
-A message which appears even in <tt>-quiet</tt> mode.
+&lt;/echo&gt;</pre>
+<p>A message which appears even in <kbd>-quiet</kbd> mode.</p>
 
 <pre>&lt;echo file="runner.csh" append="false"&gt;#\!/bin/tcsh
 java-1.3.1 -mx1024m ${project.entrypoint} $$*
 &lt;/echo&gt;</pre>
-Generate a shell script by echoing to a file.
-Note the use of a double $ symbol to stop Ant
-filtering out the single $ during variable expansion
+<p>Generate a shell script by echoing to a file.  Note the use of a double <q>$</q> symbol to stop
+Ant filtering out the single <q>$</q> during variable expansion.</p>
 
-<p>Depending on the loglevel Ant runs, messages are print out or silently
-ignored:
+<p>Depending on the log level Ant runs at, messages are print out or silently ignored:</p>
 <table>
 <tr>
-  <th>Ant-Statement</th>
-  <th>-quiet, -q</th>
-  <th><i>no statement</th>
-  <th>-verbose, -v</th>
-  <th>-debug, -d</th>
+  <th>Ant command line</th>
+  <th><kbd>-quiet</kbd>, <kbd>-q</kbd></th>
+  <th><em>no switch</em></th>
+  <th><kbd>-verbose</kbd>, <kbd>-v</kbd></th>
+  <th><kbd>-debug</kbd>, <kbd>-d</kbd></th>
 </tr>
 <tr>
-  <td><pre>&lt;echo message="This is error message." level="error" /&gt;</pre></td>
-  <td align="center">ok</td>
-  <td align="center">ok</td>
-  <td align="center">ok</td>
-  <td align="center">ok</td>
+  <td><pre>&lt;echo message="This is error message." level="error"/&gt;</pre></td>
+  <td>ok</td>
+  <td>ok</td>
+  <td>ok</td>
+  <td>ok</td>
 </tr>
 <tr>
-  <td><pre>&lt;echo message="This is warning message." /&gt;</pre></td>
-  <td align="center">ok</td>
-  <td align="center">ok</td>
-  <td align="center">ok</td>
-  <td align="center">ok</td>
+  <td><pre>&lt;echo message="This is warning message."/&gt;</pre></td>
+  <td>ok</td>
+  <td>ok</td>
+  <td>ok</td>
+  <td>ok</td>
 </tr>
 <tr>
-  <td><pre>&lt;echo message="This is warning message." level="warning" /&gt;</pre></td>
-  <td align="center">ok</td>
-  <td align="center">ok</td>
-  <td align="center">ok</td>
-  <td align="center">ok</td>
+  <td><pre>&lt;echo message="This is warning message." level="warning"/&gt;</pre></td>
+  <td>ok</td>
+  <td>ok</td>
+  <td>ok</td>
+  <td>ok</td>
 </tr>
 <tr>
-  <td><pre>&lt;echo message="This is info message." level="info" /&gt;</pre></td>
-  <td align="center">not logged</td>
-  <td align="center">ok</td>
-  <td align="center">ok</td>
-  <td align="center">ok</td>
+  <td><pre>&lt;echo message="This is info message." level="info"/&gt;</pre></td>
+  <td>not logged</td>
+  <td>ok</td>
+  <td>ok</td>
+  <td>ok</td>
 </tr>
 <tr>
-  <td><pre>&lt;echo message="This is verbose message." level="verbose" /&gt;</pre></td>
-  <td align="center">not logged</td>
-  <td align="center">not logged</td>
-  <td align="center">ok</td>
-  <td align="center">ok</td>
+  <td><pre>&lt;echo message="This is verbose message." level="verbose"/&gt;</pre></td>
+  <td>not logged</td>
+  <td>not logged</td>
+  <td>ok</td>
+  <td>ok</td>
 </tr>
 <tr>
-  <td><pre>&lt;echo message="This is debug message." level="debug" /&gt;</pre></td>
-  <td align="center">not logged</td>
-  <td align="center">not logged</td>
-  <td align="center">not logged</td>
-  <td align="center">ok</td>
+  <td><pre>&lt;echo message="This is debug message." level="debug"/&gt;</pre></td>
+  <td>not logged</td>
+  <td>not logged</td>
+  <td>not logged</td>
+  <td>ok</td>
 </tr>
 </table>
 
-
-
-
-
-
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/echoproperties.html ant-1.10.3/manual/Tasks/echoproperties.html
--- ant-1.9.10/manual/Tasks/echoproperties.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/echoproperties.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,63 +24,53 @@
 
 <body>
 
-<h2><a name="echoproperties">echoproperties</a></h2>
+<h2 id="echoproperties">echoproperties</h2>
 <h3>Description</h3>
 
-<p>Displays all the current properties (or a subset of them specified
-by a nested <code>&lt;propertyset&gt;</code>) in the project.  The
-output can be sent to a file if desired.  This task can be used as a
-somewhat contrived means of returning data from an
-<tt>&lt;ant&gt;</tt> invocation, but is really for debugging build
+<p>Displays all the current properties (or a subset of them specified by a
+nested <code>&lt;propertyset&gt;</code>) in the project.  The output can be sent to a file if
+desired.  This task can be used as a somewhat contrived means of returning data from an
+<kbd>ant</kbd> invocation, but is really for debugging build
 files.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">destfile</td>
-    <td valign="top">If specified, the value indicates the name of the
-    file to send the output of the statement to.  The generated output file
-    is compatible for loading by any Java application as a property file.
-    If not specified, then the output will go to the Apache Ant log.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">prefix</td>
-    <td valign="top">
-        a prefix which is used to filter the properties
-        only those properties starting with this prefix will be echoed.
-        <P>
-    </td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">regex</td>
-    <td valign="top">
-        a regular expression which is used to filter the
-        properties
-        only those properties whose names match it will be echoed.
-    </td>
-    <td valign="top" align="center">No</td>
-  </tr>   
-  <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">By default, the "failonerror" attribute is enabled.
-    If an error occurs while writing the properties to a file, and this
-    attribute is enabled, then a BuildException will be thrown, causing the
-    build to fail.  If disabled, then IO errors will be reported as a log
-    statement, and the build will continue without failure from this task.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">format</td>
-    <td valign="top">One of <code>text</code> or <code>xml</code>.
-    Determines the output format.  Defaults to <code>text</code>.</td>
-    <td valign="top" align="center">No</td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>destfile</td>
+    <td>If specified, the value indicates the name of the file to send the output of the statement
+      to.  The generated output file is compatible for loading by any Java application as a property
+      file.</td>
+    <td>No; by default, output to the log</td>
+  </tr>
+  <tr>
+    <td>prefix</td>
+    <td>a prefix which is used to filter the properties: only properties whose names start with this
+      prefix will be echoed.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>regex</td>
+    <td>a regular expression which is used to filter the properties: only those properties whose
+      names match it will be echoed.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>failonerror</td>
+    <td>If an error occurs while writing the properties to a file, and this attribute is enabled,
+      then a <code>BuildException</code> will be thrown, causing the build to fail.  If disabled,
+      then IO errors will be reported as a log statement, and the build will continue without
+      failure from this task.</td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+  <tr>
+    <td>format</td>
+    <td>One of <q>text</q> or <q>xml</q>.  Determines the output format.</td>
+    <td>No; defaults to <q>text</q></td>
   </tr>
 </table>
 
@@ -88,59 +78,41 @@
 
 <h4>propertyset</h4>
 
-<p>You can specify subsets of properties to be echoed with <a
-href="../Types/propertyset.html">propertyset</a>s. Using
-<tt>propertyset</tt>s gives more control on which properties will be
-picked up. The attributes <tt>prefix</tt> and <tt>regex</tt> are just
-shortcuts that use <tt>propertyset</tt>s internally.
-</p>
+<p><em>Since Ant 1.6</em>.</p>
 
-<p><em>since Ant 1.6</em>.</p>
+<p>You can specify subsets of properties to be echoed
+with <a href="../Types/propertyset.html">propertyset</a>s. Using <code>propertyset</code>s gives
+more control on which properties will be picked up. The attributes <var>prefix</var>
+and <var>regex</var> are just shortcuts that use <code>propertyset</code>s internally.</p>
 
 <h3>Examples</h3>
-<blockquote><pre>
-  &lt;echoproperties/&gt;
-</pre></blockquote>
+<pre>&lt;echoproperties/&gt;</pre>
 <p>Report the current properties to the log.</p>
-<blockquote><pre>
-  &lt;echoproperties destfile="my.properties"/&gt;
-</pre></blockquote>
-<p>Report the current properties to the file "my.properties", and will
-fail the build if the file could not be created or written to.</p>
-<blockquote><pre>
-  &lt;echoproperties destfile="my.properties" failonerror="false"/&gt;
-</pre></blockquote>
-<p>Report the current properties to the file "my.properties", and will
-log a message if the file could not be created or written to, but will still
-allow the build to continue.</p>
-<blockquote><pre>
-  &lt;echoproperties prefix="java."/&gt;
-</pre></blockquote>
-<p>List all properties beginning with "java."</p>
-<blockquote><pre>
-  &lt;echoproperties&gt;
-    &lt;propertyset&gt;
-      &lt;propertyref prefix="java."/&gt;
-    &lt;/propertyset&gt;
-  &lt;/echoproperties&gt;
-</pre></blockquote>
-<p>This again lists all properties beginning with "java." using a nested
-<tt>&lt;/propertyset&gt;</tt> which is an equivalent but longer way.</p>
-<blockquote><pre>
-  &lt;echoproperties regex=".*ant.*"/&gt;
-</pre></blockquote>
-<p>Lists all properties that contain "ant" in their names.
-The equivalent snippet with <tt>&lt;/propertyset&gt;</tt> is:</p>
-<blockquote><pre>
-  &lt;echoproperties&gt;
-    &lt;propertyset&gt;
-      &lt;propertyref regex=".*ant.*"/&gt;
-    &lt;/propertyset&gt;
-  &lt;/echoproperties&gt;
-</pre></blockquote>
-
-
+<pre>&lt;echoproperties destfile="my.properties"/&gt;</pre>
+<p>Report the current properties to the file <samp>my.properties</samp>, and will fail the build if
+the file could not be created or written to.</p>
+<pre>&lt;echoproperties destfile="my.properties" failonerror="false"/&gt;</pre>
+<p>Report the current properties to the file <samp>my.properties</samp>, and will log a message if
+the file could not be created or written to, but will still allow the build to continue.</p>
+<pre>&lt;echoproperties prefix="java."/&gt;</pre>
+<p>List all properties beginning with <samp>java.</samp></p>
+<pre>
+&lt;echoproperties&gt;
+  &lt;propertyset&gt;
+    &lt;propertyref prefix="java."/&gt;
+  &lt;/propertyset&gt;
+&lt;/echoproperties&gt;</pre>
+<p>This again lists all properties beginning with <samp>java.</samp> using a
+nested <code>&lt;propertyset/&gt;</code> which is an equivalent but longer way.</p>
+<pre>&lt;echoproperties regex=".*ant.*"/&gt;</pre>
+<p>Lists all properties that contain <samp>ant</samp> in their names.  The equivalent snippet
+with <code>&lt;propertyset/&gt;</code> is:</p>
+<pre>
+&lt;echoproperties&gt;
+  &lt;propertyset&gt;
+    &lt;propertyref regex=".*ant.*"/&gt;
+  &lt;/propertyset&gt;
+&lt;/echoproperties&gt;</pre>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/echoxml.html ant-1.10.3/manual/Tasks/echoxml.html
--- ant-1.9.10/manual/Tasks/echoxml.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/echoxml.html	2018-03-24 12:37:12.000000000 +0000
@@ -25,38 +25,36 @@
 <body>
 
 <h2>EchoXML</h2>
+<p><em>Since Apache Ant 1.7</em></p>
 <h3>Description</h3>
-<p>Echo nested XML to the console or a file. <b>Since Apache Ant 1.7</b></p>
+<p>Echo nested XML to the console or a file.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">The file to receive the XML. If omitted nested
-      XML will be echoed to the log.</td>
-    <td valign="top" align="center">No</td>
+    <td>file</td>
+    <td>The file to receive the XML.</td>
+    <td>No; by default nested XML is echoed to the log</td>
   </tr>
   <tr>
-    <td valign="top">append</td>
-    <td valign="top">Whether to append <code>file</code>, if specified.</td>
-    <td valign="top" align="center">No</td>
+    <td>append</td>
+    <td>Whether to append <var>file</var>, if specified.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">namespacePolicy</td>
-    <td valign="top">Sets the namespace policy as defined
-      by <code>org.apache.tools.ant.util.DOMElementWriter.XmlNamespacePolicy</code>.
-      Valid values are <code>ignore</code>, <code>elementsOnly</code>, or <code>all</code>.
-      <strong>Since Apache Ant 1.8</strong>
-    </td>
-    <td valign="top" align="center">No, default <code>ignore</code></td>
+    <td>namespacePolicy</td>
+    <td>Sets the namespace policy as defined
+      by <code>org.apache.tools.ant.util.DOMElementWriter.XmlNamespacePolicy</code>.  Valid values
+      are <q>ignore</q>, <q>elementsOnly</q>, or <q>all</q>.  <em>Since Apache Ant 1.8</em></td>
+    <td>No; default <q>ignore</q></td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
-Nested XML content is required.
+<p>Nested XML content is required.</p>
 
 <h3>Examples</h3>
 <pre>&lt;echoxml file=&quot;subbuild.xml&quot;&gt;
@@ -65,10 +63,8 @@
       &lt;echo&gt;foo&lt;/echo&gt;
     &lt;/target&gt;
   &lt;/project&gt;
-&lt;/echoxml&gt;
-</pre>
-<p>Creates an Ant buildfile, <code>subbuild.xml</code>.</p>
+&lt;/echoxml&gt;</pre>
+<p>Creates an Ant buildfile, <samp>subbuild.xml</samp>.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/ejb.html ant-1.10.3/manual/Tasks/ejb.html
--- ant-1.9.10/manual/Tasks/ejb.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/ejb.html	2018-03-24 12:37:12.000000000 +0000
@@ -36,94 +36,93 @@
   <li>Conor MacNeill</li>
   <li>Cyrille Morvan (<a href="mailto:cmorvan@ingenosya.com">cmorvan@ingenosya.com</a>)</li>
   <li>Greg Nelson (<a href="mailto:gn@sun.com">gn@sun.com</a>)</li>
-  <li>Rob van Oostrum(<a href="mailto:rob@springwellfarms.ca">rob@springwellfarms.ca</a>)</li>
+  <li>Rob van Oostrum (<a href="mailto:rob@springwellfarms.ca">rob@springwellfarms.ca</a>)</li>
 </ul>
 
-<hr>
+<hr/>
 <h2>Table of Contents</h2>
 <ul>
   <li><a href="#introduction">Introduction</a></li>
   <li><a href="#ejbtasks">EJB Tasks</a></li>
 </ul>
 
-<hr>
-<h2><a name="introduction">Introduction</a></h2>
-<p>Ant provides a number of optional tasks for developing 1.x and 2.x
-<a href="http://www.oracle.com/technetwork/java/index-jsp-140203.html" target="_top">Enterprise Java Beans (EJBs)</a>.
-In general these tasks are specific to the particular vendor's EJB Server.</p>
+<hr/>
+<h2 id="introduction">Introduction</h2>
+<p>Ant provides a number of optional tasks for developing 1.x and
+2.x <a href="https://www.oracle.com/technetwork/java/index-jsp-140203.html" target="_top">Enterprise
+Java Beans (EJBs)</a>.  In general these tasks are specific to the particular vendor's EJB
+Server.</p>
 
-<p> The tasks support:<br>
+<p>The tasks support:</p>
 
 <ul>
-  <li><a href="http://www.borland.com">Borland </a>
-  Application Server 4.5</li>
-  <li><a href="http://www.iplanet.com">iPlanet </a>
-  Application Server 6.0</li>
-  <li><a href="http://www.jboss.org/" target="_top">
-  JBoss 2.1</a> and above EJB servers</li>
-  <li><a href="http://web.archive.org/web/20080516210506/http://www.ironflare.com/">
-  Orion Application Server</a> 2.0 <em>since 1.9.10</em></li>
-  <li><a href="http://www.bea.com" target="_top">Weblogic</a>
-   4.5.1 through to 7.0 EJB servers</li>
-  <li><a href="http://www.objectweb.org/jonas/" target="_top">JOnAS</a>
-   2.4.x and 2.5 Open Source EJB server</li>
-  <li><a href="http://www.ibm.com/websphere">IBM WebSphere</a> 4.0</li>
+  <li><a href="http://www.borland.com" target="_top">Borland</a>Application Server 4.5</li>
+  <li><a href="https://web.archive.org/web/20020202082841/http://www.iplanet.com/products/iplanet_application/home_ias.html"
+         target="_top">iPlanet</a> Application Server 6.0</li>
+  <li><a href="https://www.jboss.org/" target="_top">JBoss 2.1</a> and above EJB servers</li>
+  <li><a href="https://web.archive.org/web/20080516210506/http://www.ironflare.com/"
+         target="_top">Orion Application Server</a> 2.0 (<em>since Ant 1.10.2</em>)</li>
+  <li><a href="http://www.bea.com" target="_top">WebLogic</a> 4.5.1 through to 7.0 EJB servers</li>
+  <li><a href="https://jonas.ow2.org/" target="_top">JOnAS</a> 2.4.x and 2.5 Open Source EJB server</li>
+  <li><a href="https://www.ibm.com/websphere" target="_top">IBM WebSphere</a> 4.0</li>
 </ul>
-    Vendors such as BEA and IBM now provide custom Ant tasks to work with their
-    particular products. More importantly, EJB3.0 renders this whole process obsolete.
-    Accordingly, development of these tasks is effectively frozen. Bug reports
-    and especially patches are welcome, but there is no pressing need to add
-    support for new application servers. Nobody should be writing new EJB2.x applications
-    and definitely not new EJB2.x servers.
-</p>
-
-<hr>
-<h2><a name="ejbtasks">EJB Tasks</a></h2>
-<table border="1" cellpadding="5">
- <tr><td>Task</td><td colspan="2">Application Servers</td></tr>
- <tr><td><a href="BorlandGenerateClient.html">blgenclient</a></td><td colspan="2">Borland Application Server 4.5 and 5.x</td></tr>
- <tr><td><a href="#iplanet-ejbc">iplanet-ejbc</a></td><td colspan="2">iPlanet Application Server 6.0</td></tr>
- <tr><td rowspan="8"><a href="#ejbjar">ejbjar</a></td><td colspan="2" align="center"><b>Nested Elements</b></td></tr>
- <tr><td><a href="BorlandEJBTasks.html">borland</a></td><td>Borland Application Server 4.5 and 5.x</td></tr>
- <tr><td><a href="#ejbjar_iplanet">iPlanet</a></td><td>iPlanet Application Server 6.0</td></tr>
- <tr><td><a href="#ejbjar_jboss">jboss</a></td><td>JBoss</td></tr>
- <tr><td><a href="#ejbjar_jonas">jonas</a></td><td>JOnAS 2.4.x and 2.5</td></tr>
- <tr><td><a href="#ejbjar_weblogic">weblogic</a></td><td>Weblogic 5.1 to 7.0</td></tr>
- <tr><td><a href="#ejbjar_websphere">websphere</a></td><td>IBM WebSphere 4.0</td></tr>
- <tr><td><a href="#ejbjar_orion">orion</a></td><td>IronFlare(Oracle) Orion Application Server 2.0.6</td></tr>
-
+<p>Vendors such as BEA and IBM now provide custom Ant tasks to work with their particular
+products. More importantly, EJB 3.0 renders this whole process obsolete.  Accordingly, development
+of these tasks is effectively frozen. Bug reports and especially patches are welcome, but there is
+no pressing need to add support for new application servers. Nobody should be writing new EJB 2.x
+applications and definitely not new EJB 2.x servers.</p>
+
+<hr/>
+<h2 id="ejbtasks">EJB Tasks</h2>
+<table>
+  <tr><th>Task</th><th colspan="2">Application Servers</th></tr>
+  <tr><td><a href="BorlandGenerateClient.html">blgenclient</a></td><td colspan="2">Borland
+    Application Server 4.5 and 5.x</td></tr>
+  <tr><td><a href="#iplanet-ejbc">iplanet-ejbc</a></td><td colspan="2">iPlanet Application Server
+    6.0</td></tr>
+  <tr><td rowspan="8"><a href="#ejbjar">ejbjar</a></td><th colspan="2">Nested Elements</th></tr>
+  <tr><td><a href="BorlandEJBTasks.html">borland</a></td><td>Borland Application Server 4.5 and
+    5.x</td></tr>
+  <tr><td><a href="#ejbjar_iplanet">iPlanet</a></td><td>iPlanet Application Server 6.0</td></tr>
+  <tr><td><a href="#ejbjar_jboss">jboss</a></td><td>JBoss</td></tr>
+  <tr><td><a href="#ejbjar_jonas">jonas</a></td><td>JOnAS 2.4.x and 2.5</td></tr>
+  <tr><td><a href="#ejbjar_weblogic">weblogic</a></td><td>WebLogic 5.1 to 7.0</td></tr>
+  <tr><td><a href="#ejbjar_websphere">websphere</a></td><td>IBM WebSphere 4.0</td></tr>
+  <tr><td><a href="#ejbjar_orion">orion</a></td><td>IronFlare (Oracle) Orion Application Server
+    2.0.6</td></tr>
 </table>
 
-<hr>
-<h2><a name="ddcreator">ddcreator</a></h2>
-<h3><b>Description:</b></h3>
-<p>ddcreator will compile a set of Weblogic text-based deployment descriptors into a serialized
-EJB deployment descriptor. The selection of which of the text-based descriptors are to be compiled
-is based on the standard Ant include and exclude selection mechanisms.
-</p>
+<hr/>
+
+<h2 id="ddcreator">ddcreator</h2>
+<h3>Description</h3>
+<p><code>ddcreator</code> will compile a set of WebLogic text-based deployment descriptors into a
+serialized EJB deployment descriptor. The selection of which of the text-based descriptors are to be
+compiled is based on the standard Ant <code>include</code> and <code>exclude</code> selection
+mechanisms.</p>
 
-<h3>Parameters:</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<h3>Parameters</h3>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">descriptors</td>
-    <td valign="top">This is the base directory from which descriptors are selected.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>descriptors</td>
+    <td>This is the base directory from which descriptors are selected.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">dest</td>
-    <td valign="top">The directory where the serialized deployment descriptors will be written</td>
-    <td valign="top" align="center">Yes</td>
+    <td>dest</td>
+    <td>The directory where the serialized deployment descriptors will be written</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">This is the classpath to use to run the underlying weblogic ddcreator tool.
-                     This must include the <code>weblogic.ejb.utils.DDCreator</code> class</td>
-    <td valign="top" align="center">No</td>
+    <td>classpath</td>
+    <td>This is the classpath to use to run the underlying WebLogic <code>ddcreator</code> tool.
+      This must include the <code>weblogic.ejb.utils.DDCreator</code> class</td>
+    <td>No</td>
   </tr>
 </table>
 <h3>Examples</h3>
@@ -132,69 +131,67 @@
            dest=&quot;${gen.classes}&quot;
            classpath=&quot;${descriptorbuild.classpath}&quot;&gt;
   &lt;include name=&quot;*.txt&quot;/&gt;
-&lt;/ddcreator&gt;
-</pre>
+&lt;/ddcreator&gt;</pre>
 
-<hr>
-<h2><a name="ejbc">ejbc</a></h2>
-<h3><b>Description:</b></h3>
-<p>The ejbc task will run Weblogic's ejbc tool. This tool will take a serialized deployment descriptor,
-examine the various EJB interfaces and bean classes and then generate the required support classes
-necessary to deploy the bean in a Weblogic EJB container. This will include the RMI stubs and skeletons
-as well as the classes which implement the bean's home and remote interfaces.</p>
-<p>
-The ant task which runs this tool is able to compile several beans in a single operation. The beans to be
-compiled are selected by including their serialized deployment descriptors. The standard ant
-<code>include</code> and <code>exclude</code> constructs can be used to select the deployment descriptors
-to be included. </p>
-<p>
-Each descriptor is examined to determine whether the generated classes are out of date and need to be
-regenerated. The deployment descriptor is de-serialized to discover the home, remote and
+<hr/>
+<h2 id="ejbc">ejbc</h2>
+<h3>Description</h3>
+<p>The <code>ejbc</code> task will run WebLogic's <kbd>ejbc</kbd> tool. This tool will take a
+serialized deployment descriptor, examine the various EJB interfaces and bean classes and then
+generate the required support classes necessary to deploy the bean in a WebLogic EJB container. This
+will include the RMI stubs and skeletons as well as the classes which implement the bean's home and
+remote interfaces.</p>
+<p>The Ant task which runs this tool is able to compile several beans in a single operation. The
+beans to be compiled are selected by including their serialized deployment descriptors. The standard
+Ant <code>include</code> and <code>exclude</code> constructs can be used to select the deployment
+descriptors to be included.</p>
+<p>Each descriptor is examined to determine whether the generated classes are out of date and need
+to be regenerated. The deployment descriptor is de-serialized to discover the home, remote and
 implementation classes. The corresponding source files are determined and checked to see their
 modification times. These times and the modification time of the serialized descriptor itself are
-compared with the modification time of the generated classes. If the generated classes are not present
-or are out of date, the ejbc tool is run to generate new versions.</p>
-<h3>Parameters:</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+compared with the modification time of the generated classes. If the generated classes are not
+present or are out of date, the <kbd>ejbc</kbd> tool is run to generate new versions.</p>
+<h3>Parameters</h3>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">descriptors</td>
-    <td valign="top">This is the base directory from which the serialized deployment descriptors are selected.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>descriptors</td>
+    <td>This is the base directory from which the serialized deployment descriptors are
+      selected.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">dest</td>
-    <td valign="top">The base directory where the generated classes, RIM stubs and RMI skeletons are written</td>
-    <td valign="top" align="center">Yes</td>
+    <td>dest</td>
+    <td>The base directory where the generated classes, RIM stubs and RMI skeletons are written</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">manifest</td>
-    <td valign="top">The name of a manifest file to be written. This manifest will contain an entry for each EJB processed</td>
-    <td valign="top" align="center">Yes</td>
+    <td>manifest</td>
+    <td>The name of a manifest file to be written. This manifest will contain an entry for each EJB
+      processed</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">src</td>
-    <td valign="top">The base directory of the source tree containing the source files of the home interface,
-                     remote interface and bean implementation classes.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>src</td>
+    <td>The base directory of the source tree containing the source files of the home interface,
+      remote interface and bean implementation classes.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">This classpath must include both the <code>weblogic.ejbc</code> class and the
-                     class files of the bean, home interface, remote interface, etc of the bean being
-                     processed.</td>
-    <td valign="top" align="center">No</td>
+    <td>classpath</td>
+    <td>This classpath must include both the <code>weblogic.ejbc</code> class and the class files of
+      the bean, home interface, remote interface, etc of the bean being processed.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">keepgenerated</td>
-    <td>Controls whether ejbc will keep the
-        intermediate Java files used to build the class files. This can be
-        useful when debugging.</td>
-    <td>No, defaults to false.</td>
+    <td>keepgenerated</td>
+    <td>Controls whether <kbd>ejbc</kbd> will keep the intermediate java files used to build the
+      class files. This can be useful when debugging.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
@@ -205,113 +202,83 @@
            manifest=&quot;${build.manifest}&quot;
            classpath=&quot;${descriptorbuild.classpath}&quot;&gt;
   &lt;include name=&quot;*.ser&quot;/&gt;
-&lt;/ejbc&gt;
-</pre>
+&lt;/ejbc&gt;</pre>
+
+<hr/>
+<h2 id="iplanet-ejbc">iplanet-ejbc</h2>
+
+<h3>Description</h3>
+<p>Task to compile EJB stubs and skeletons for the iPlanet Application Server 6.0.  Given a standard
+EJB 1.1 XML descriptor as well as an iAS-specific EJB descriptor, this task will generate the stubs
+and skeletons required to deploy the EJB to iAS.  Since the XML descriptors can include multiple
+EJBs, this is a convenient way of specifying many EJBs in a single Ant task.</p>
+<p>For each EJB specified, the task will locate the three classes that comprise the EJB in the
+destination directory.  If these class files cannot be located in the destination directory, the
+task will fail. The task will also attempt to locate the EJB stubs and skeletons in this directory.
+If found, the timestamps on the stubs and skeletons will be checked to ensure they are up to
+date. Only if these files cannot be found or if they are out of date will the iAS <kbd>ejbc</kbd>
+utility be called to generate new stubs and skeletons.</p>
+<h3>Parameters</h3>
 
-<hr>
-<h2>
-<a NAME="iplanet-ejbc"></a>iplanet-ejbc</h2>
-
-<h3>
-<b>Description:</b></h3>
-Task to compile EJB stubs and skeletons for the iPlanet Application Server
-6.0.  Given a standard EJB 1.1 XML descriptor as well as an iAS-specific
-EJB descriptor, this task will generate the stubs and skeletons required
-to deploy the EJB to iAS.  Since the XML descriptors can include multiple
-EJBs, this is a convenient way of specifying many EJBs in a single Ant
-task.
-<p>For each EJB specified, the task will locate the three classes that
-comprise the EJB in the destination directory.  If these class files
-cannot be located in the destination directory, the task will fail. The
-task will also attempt to locate the EJB stubs and skeletons in this directory.
-If found, the timestamps on the stubs and skeletons will be checked to
-ensure they are up to date. Only if these files cannot be found or if they
-are out of date will the iAS ejbc utility be called to generate new stubs
-and skeletons.</p>
-<h3>
-Parameters:</h3>
-
-<table border="1" cellspacing="0" cellpadding="2">
-<tr>
-<td valign="top"><b>Attribute</b></td>
-
-<td valign="top"><b>Description</b></td>
-
-<td align="center" valign="top"><b>Required</b></td>
-</tr>
-
-<tr>
-<td valign="top">ejbdescriptor</td>
-
-<td valign="top">Standard EJB 1.1 XML descriptor (typically titled "ejb-jar.xml").</td>
-
-<td align="center" valign="top">Yes</td>
-</tr>
-
-<tr>
-<td valign="top">iasdescriptor</td>
-
-<td valign="top">iAS-specific EJB XML descriptor (typically titled "ias-ejb-jar.xml").</td>
-
-<td align="center" valign="top">Yes</td>
-</tr>
-
-<tr>
-<td valign="top">dest</td>
-
-<td valign="top">The is the base directory where the RMI stubs and skeletons
-are written. In addition, the class files for each bean (home interface,
-remote interface, and EJB implementation) must be found in this directory.</td>
-
-<td align="center" valign="top">Yes</td>
-</tr>
-
-<tr>
-<td valign="top">classpath</td>
-
-<td valign="top">The classpath used when generating EJB stubs and skeletons.
-If omitted, the classpath specified when Ant was started will be used.
-Nested "classpath" elements may also be used.</td>
-
-<td align="center" valign="top">No</td>
-</tr>
-
-<tr>
-<td valign="top">keepgenerated</td>
-
-<td valign="top">Indicates whether or not the Java source files which are
-generated by ejbc will be saved or automatically deleted. If "yes", the
-source files will be retained. If omitted, it defaults to "no". </td>
-
-<td align="center" valign="top">No</td>
-</tr>
-
-<tr>
-<td valign="top">debug</td>
-
-<td>Indicates whether or not the ejbc utility should log additional debugging
-statements to the standard output. If "yes", the additional debugging statements
-will be generated.  If omitted, it defaults to "no". </td>
-
-<td align="center" valign="top">
-<center>No</center>
-</td>
-</tr>
-
-<tr>
-<td valign="top">iashome</td>
-
-<td>May be used to specify the "home" directory for this iAS installation.
-This is used to find the ejbc utility if it isn't included in the user's
-system path. If specified, it should refer to the "[install-location]/iplanet/ias6/ias"
-directory. If omitted, the ejbc utility must be on the user's system path. </td>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+
+  <tr>
+    <td>ejbdescriptor</td>
+    <td>Standard EJB 1.1 XML descriptor (typically titled <q>ejb-jar.xml</q>).</td>
+    <td>Yes</td>
+  </tr>
 
-<td align="center" valign="top">No</td>
-</tr>
+  <tr>
+    <td>iasdescriptor</td>
+    <td>iAS-specific EJB XML descriptor (typically titled <q>ias-ejb-jar.xml</q>).</td>
+    <td>Yes</td>
+  </tr>
+
+  <tr>
+    <td>dest</td>
+    <td>The is the base directory where the RMI stubs and skeletons are written. In addition, the
+      class files for each bean (home interface, remote interface, and EJB implementation) must be
+      found in this directory.</td>
+    <td>Yes</td>
+  </tr>
+
+  <tr>
+    <td>classpath</td>
+    <td>The classpath used when generating EJB stubs and skeletons.  Nested <code>classpath</code>
+      elements may also be used.</td>
+    <td>No; defaults to the classpath specified when Ant was started</td>
+  </tr>
+
+  <tr>
+    <td>keepgenerated</td>
+    <td>Indicates whether or not the Java source files which are generated by <kbd>ejbc</kbd> will
+      be saved or automatically deleted. If <q>yes</q>, the source files will be retained.</td>
+    <td>No; defaults to <q>no</q></td>
+  </tr>
+
+  <tr>
+    <td>debug</td>
+    <td>Indicates whether or not the <kbd>ejbc</kbd> utility should log additional debugging
+      statements to the standard output. If <q>yes</q>, the additional debugging statements will be
+      generated.</td>
+    <td>No; defaults to <q>no</q></td>
+  </tr>
+
+  <tr>
+    <td>iashome</td>
+    <td>May be used to specify the "home" directory for this iAS installation.  This is used to find
+      the <kbd>ejbc</kbd> utility if it isn't included in the user's system path. If specified, it
+      should refer to the <samp>[install-location]/iplanet/ias6/ias</samp> directory.</td>
+    <td>No; by default the <kbd>ejbc</kbd> utility must be on the user's system path</td>
+  </tr>
 </table>
 
-<h3>
-Examples</h3>
+<h3>Examples</h3>
 
 <pre>
 &lt;iplanet-ejbc ejbdescriptor="ejb-jar.xml"
@@ -330,129 +297,114 @@
                   &lt;pathelement path="."/&gt;
                   &lt;pathelement path="${build.classpath}"/&gt;
               &lt;/classpath&gt;
-&lt;/iplanet-ejbc&gt;
-
-
-</pre>
+&lt;/iplanet-ejbc&gt;</pre>
 
-<hr>
-<h2><a name="wlrun">wlrun</a></h2>
-<h3><b>Description:</b></h3>
+<hr/>
+<h2 id="wlrun">wlrun</h2>
+<h3>Description</h3>
 
-<p>The <code>wlrun</code> task is used to start a weblogic server. The task runs
-a weblogic instance in a separate Java Virtual Machine. A number of parameters
-are used to control the operation of the weblogic instance. Note that the task,
-and hence ant, will not complete until the weblogic instance is stopped.</p>
+<p>The <code>wlrun</code> task is used to start a WebLogic server. The task runs a WebLogic instance
+in a separate JVM. A number of parameters are used to control the operation of the WebLogic
+instance. Note that the task, and hence Ant, will not complete until the WebLogic instance is
+stopped.</p>
 
-<h3>Parameters:</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<h3>Parameters</h3>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required for 4.5.1 and 5.1</b></td>
-    <td align="center" valign="top"><b>Required for 6.0</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required for 4.5.1 and 5.1</th>
+    <th>Required for 6.0</th>
   </tr>
   <tr>
-    <td valign="top">BEA Home</td>
-    <td valign="top">The location of the BEA Home where the server's config is defined.
-                     If this attribute is present, wlrun assumes that the server will
-                     be running under Weblogic 6.0</td>
-    <td valign="top" align="center">N/A</td>
-    <td valign="top" align="center">Yes</td>
+    <td>BEAhome</td>
+    <td>The location of the <var>BEAhome</var> where the server's config is stored.  If this
+      attribute is present, <code>wlrun</code> assumes that the server will be running under
+      WebLogic 6.0</td>
+    <td class="center">N/A</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">home</td>
-    <td valign="top">The location of the weblogic home that is to be used. This is the location
-                     where weblogic is installed.</td>
-    <td valign="top" align="center">Yes</td>
-    <td valign="top" align="center">Yes. Note this is the absolute location, not relative to
-                                    BEA home.</td>
+    <td>home</td>
+    <td>The location of the WebLogic "home" where WebLogic is installed.</td>
+    <td class="center">Yes</td>
+    <td>Yes. Note this is the absolute location, not relative to <var>BEAhome</var>.</td>
   </tr>
   <tr>
-    <td valign="top">Domain</td>
-    <td valign="top">The domain to which the server belongs.</td>
-    <td valign="top" align="center">N/A</td>
-    <td valign="top" align="center">Yes</td>
+    <td>Domain</td>
+    <td>The domain to which the server belongs.</td>
+    <td class="center">N/A</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">The classpath to be used with the Java Virtual Machine that runs the Weblogic
-                     Server. Prior to Weblogic 6.0, this is typically set to the Weblogic
-                     boot classpath. Under Weblogic 6.0 this should include all the
-                     weblogic jars</td>
-    <td valign="top" align="center">Yes</td>
-    <td valign="top" align="center">Yes</td>
+    <td>classpath</td>
+    <td>The classpath to be used with the JVM that runs the WebLogic Server. Prior to WebLogic 6.0,
+      this is typically set to the WebLogic boot classpath. Under WebLogic 6.0 this should include
+      all the WebLogic jars</td>
+    <td colspan="2">Yes</td>
   </tr>
   <tr>
-    <td valign="top">wlclasspath</td>
-    <td valign="top">The weblogic classpath used by the Weblogic Server.</td>
-    <td valign="top" align="center">No</td>
-    <td valign="top" align="center">N/A</td>
+    <td>wlclasspath</td>
+    <td>The WebLogic classpath used by the WebLogic Server.</td>
+    <td class="center">No</td>
+    <td>N/A</td>
   </tr>
   <tr>
-    <td valign="top">properties</td>
-    <td valign="top">The name of the server's properties file within the weblogic home directory
-                     used to control the weblogic instance.</td>
-    <td valign="top" align="center">Yes</td>
-    <td valign="top" align="center">N/A</td>
+    <td>properties</td>
+    <td>The name of the server's properties file within the WebLogic home directory used to control
+      the WebLogic instance.</td>
+    <td class="center">Yes</td>
+    <td>N/A</td>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The name of the weblogic server within the weblogic home which is to be run.
-                     This defaults to &quot;myserver&quot;</td>
-    <td valign="top" align="center">No</td>
-    <td valign="top" align="center">No</td>
+    <td>name</td>
+    <td>The name of the WebLogic server within the WebLogic home which is to be run.</td>
+    <td colspan="2">No; defaults to <q>myserver</q></td>
   </tr>
   <tr>
-    <td valign="top">policy</td>
-    <td valign="top">The name of the security policy file within the weblogic home directory that
-                     is to be used. If not specified, the default policy file <code>weblogic.policy</code>
-                     is used.</td>
-    <td valign="top" align="center">No</td>
-    <td valign="top" align="center">No</td>
+    <td>policy</td>
+    <td>The name of the security policy file within the WebLogic home directory that is to be
+      used.</td>
+    <td colspan="2">No; defaults to <q>weblogic.policy</q></td>
   </tr>
   <tr>
-    <td valign="top">username</td>
-    <td valign="top">The management username used to manage the server</td>
-    <td valign="top" align="center">N/A</td>
-    <td valign="top" align="center">No</td>
+    <td>username</td>
+    <td>The management username used to manage the server</td>
+    <td class="center">N/A</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">password</td>
-    <td valign="top">The server's management password</td>
-    <td valign="top" align="center">N/A</td>
-    <td valign="top" align="center">Yes</td>
+    <td>password</td>
+    <td>The server's management password</td>
+    <td class="center">N/A</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">pkPassword</td>
-    <td valign="top">The private key password so the server can decrypt the SSL
-                     private key file</td>
-    <td valign="top" align="center">N/A</td>
-    <td valign="top" align="center">No</td>
+    <td>pkPassword</td>
+    <td>The private key password so the server can decrypt the SSL private key file</td>
+    <td class="center">N/A</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">jvmargs</td>
-    <td valign="top">Additional argument string passed to the Java Virtual Machine used to run the
-                     Weblogic instance.</td>
-    <td valign="top" align="center">No</td>
-    <td valign="top" align="center">No</td>
+    <td>jvmargs</td>
+    <td>Additional argument string passed to the JVM used to run the WebLogic instance.</td>
+    <td colspan="2">No</td>
   </tr>
   <tr>
-    <td valign="top">weblogicMainClass</td>
-    <td valign="top">name of the main class for weblogic</td>
-    <td valign="top" align="center">No</td>
-    <td valign="top" align="center">No</td>
+    <td>weblogicMainClass</td>
+    <td>name of the main class for WebLogic</td>
+    <td colspan="2">No</td>
   </tr>
 </table>
 
-<h3>Nested Elements</h3>
+<h3>Parameters specified as nested elements</h3>
 
-<p>The wlrun task supports nested <code>&lt;classpath&gt;</code> and <code>&lt;wlclasspath&gt;</code>
-elements to set the respective classpaths.</p>
+<p>The <code>wlrun</code> task supports nested <code>&lt;classpath&gt;</code>
+and <code>&lt;wlclasspath&gt;</code> elements to set the respective classpaths.</p>
 
 <h3>Examples</h3>
 
-<p>This example shows the use of wlrun to run a server under Weblogic 5.1</p>
+<p>This example shows the use of <code>wlrun</code> to run a server under WebLogic 5.1</p>
 
 <pre>
     &lt;wlrun taskname=&quot;myserver&quot;
@@ -463,1354 +415,1194 @@
            properties=&quot;myserver/myserver.properties&quot;/&gt;
 </pre>
 
-<p>This example shows wlrun being used to run the petstore server under
-Weblogic 6.0</p>
+<p>This example shows <code>wlrun</code> being used to run the <samp>petstore</samp> server under
+WebLogic 6.0</p>
 
 <pre>
-    &lt;wlrun taskname=&quot;petstore&quot;
-           classpath=&quot;${weblogic.classes}&quot;
-           name=&quot;petstoreServer&quot;
-           domain=&quot;petstore&quot;
-           home=&quot;${weblogic.home}&quot;
-           password=&quot;petstorePassword&quot;
-           beahome=&quot;${bea.home}&quot;/&gt;
-</pre>
+&lt;wlrun taskname=&quot;petstore&quot;
+       classpath=&quot;${weblogic.classes}&quot;
+       name=&quot;petstoreServer&quot;
+       domain=&quot;petstore&quot;
+       home=&quot;${weblogic.home}&quot;
+       password=&quot;petstorePassword&quot;
+       beahome=&quot;${bea.home}&quot;/&gt;</pre>
 
-<hr>
-<h2><a name="wlstop">wlstop</a></h2>
-<h3><b>Description:</b></h3>
+<hr/>
+<h2 id="wlstop">wlstop</h2>
+<h3>Description</h3>
 
-<p>The <code>wlstop</code> task is used to stop a weblogic instance which is
-currently running. To shut down an instance you must supply both a username and
-a password. These will be stored in the clear in the build script used to stop
-the instance. For security reasons, this task is therefore only appropriate in a
-development environment. </p>
+<p>The <code>wlstop</code> task is used to stop a WebLogic instance which is currently running. To
+shut down an instance you must supply both a username and a password. These will be stored in the
+clear in the build script used to stop the instance. For security reasons, this task is therefore
+only appropriate in a development environment.</p>
 
-<p>This task works for most version of Weblogic, including 6.0. You need to
-specify the BEA Home to have this task work correctly under 6.0</p>
+<p>This task works for most versions of WebLogic, including 6.0. You need to specify
+the <var>BEAHome</var> to have this task work correctly under 6.0</p>
 
-<h3>Parameters:</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<h3>Parameters</h3>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">BEAHome</td>
-    <td valign="top">This attribute selects Weblogic 6.0 shutdown.</td>
-    <td valign="top" align="center">No</td>
+    <td>BEAHome</td>
+    <td>This attribute selects WebLogic 6.0 shutdown.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">The classpath to be used with the Java Virtual Machine that runs the Weblogic
-                     Shutdown command.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>classpath</td>
+    <td>The classpath to be used with the JVM that runs the WebLogic Shutdown command.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">user</td>
-    <td valign="top">The username of the account which will be used to shutdown the server</td>
-    <td valign="top" align="center">Yes</td>
+    <td>user</td>
+    <td>The username of the account which will be used to shutdown the server</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">password</td>
-    <td valign="top">The password for the account specified in the user parameter.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>password</td>
+    <td>The password for the account specified in the user parameter.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">url</td>
-    <td valign="top">The URL which describes the port to which the server is listening for T3 connections.
-                     For example, t3://localhost:7001</td>
-    <td valign="top" align="center">Yes</td>
+    <td>url</td>
+    <td>The URL which describes the port to which the server is listening for T3 connections.  For
+      example, <samp>t3://localhost:7001</samp></td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">delay</td>
-    <td valign="top">The delay in seconds after which the server will stop. This defaults to an
-                     immediate shutdown.</td>
-    <td valign="top" align="center">No</td>
+    <td>delay</td>
+    <td>The delay in seconds after which the server will stop.</td>
+    <td>No; default is <q>0</q> (immediate shutdown)</td>
   </tr>
 </table>
 
-<h3>Nested Element</h3>
+<h3>Parameters specified as nested elements</h3>
 
-<p>The classpath of the wlstop task can be set by a <code>&lt;classpath&gt;</code> nested element.</p>
+<p>The classpath of the <code>wlstop</code> task can be set by a <code>&lt;classpath&gt;</code>
+nested element.</p>
 
 <h3>Examples</h3>
 
-<p>This example show the shutdown for a Weblogic 6.0 server</p>
+<p>This example show the shutdown for a WebLogic 6.0 server</p>
 
 <pre>
-    &lt;wlstop classpath=&quot;${weblogic.classes}&quot;
-            user=&quot;system&quot;
-            url=&quot;t3://localhost:7001&quot;
-            password=&quot;foobar&quot;
-            beahome=&quot;${bea.home}&quot;/&gt;
-</pre>
-
-<hr>
-
-<h2><a name="ejbjar">ejbjar</a></h2>
-<h3><b>Description:</b></h3>
-
-<p>This task is designed to support building of EJB jar files (EJB 1.1 &amp; 2.0).
-Support is currently provided for 'vanilla' EJB jar files - i.e. those containing only
-the user generated class files and the standard deployment descriptor. Nested
-elements provide support for vendor specific deployment tools. These currently
-include: </p>
+&lt;wlstop classpath=&quot;${weblogic.classes}&quot;
+        user=&quot;system&quot;
+        url=&quot;t3://localhost:7001&quot;
+        password=&quot;foobar&quot;
+        beahome=&quot;${bea.home}&quot;/&gt;</pre>
+
+<hr/>
+<h2 id="ejbjar">ejbjar</h2>
+<h3>Description</h3>
+
+<p>This task is designed to support building of EJB jar files (EJB 1.1 &amp; 2.0).  Support is
+currently provided for 'vanilla' EJB jar files&mdash;i.e. those containing only the user generated
+class files and the standard deployment descriptor. Nested elements provide support for vendor
+specific deployment tools. These currently include:</p>
 <ul>
   <li>Borland Application Server 4.5</li>
   <li>iPlanet Application Server 6.0</li>
   <li>JBoss 2.1 and above</li>
-  <li>Weblogic 5.1/6.0 session/entity beans using the weblogic.ejbc tool</li>
+  <li>WebLogic 5.1/6.0 session/entity beans using the <code>weblogic.ejbc</code> tool</li>
   <li>IBM WebSphere 4.0</li>
   <li>TOPLink for WebLogic 2.5.1-enabled entity beans</li>
-  <li><a href="http://www.objectweb.org/jonas/">JOnAS</a> 2.4.x and 2.5 Open Source EJB server</li>
+  <li><a href="https://jonas.ow2.org/" target="_top">JOnAS</a> 2.4.x and 2.5 Open Source EJB
+    server</li>
   <li>IronFlare Orion Application Server 2.0</li>
 </ul>
 
-
-<p>The task works as a directory scanning task, and performs an action for each
-deployment descriptor found. As such the includes and excludes should be set
-to ensure that all desired EJB descriptors are found, but no application
-server descriptors are found. For each descriptor found, ejbjar will parse the
-deployment descriptor to determine the necessary class files which implement the
-bean. These files are assembled along with the deployment descriptors into a
-well formed EJB jar file. Any support files which need to be included in the
-generated jar can be added with the <code>&lt;support&gt;</code> nested element. For each
-class included in the jar, ejbjar will scan for any super classes or super
+<p>The task works as a directory scanning task, and performs an action for each deployment
+descriptor found. As such the <code>includes</code> and <code>excludes</code> should be set to
+ensure that all desired EJB descriptors are found, but no application server descriptors are
+found. For each descriptor found, <code>ejbjar</code> will parse the deployment descriptor to
+determine the necessary class files which implement the bean. These files are assembled along with
+the deployment descriptors into a well formed EJB jar file. Any support files which need to be
+included in the generated jar can be added with the <code>&lt;support&gt;</code> nested element. For
+each class included in the jar, <code>ejbjar</code> will scan for any super classes or super
 interfaces. These will be added to the generated jar.</p>
 
-<p>If no nested vendor-specific deployment elements are present, the task will
-simply generate a generic EJB jar. Such jars are typically used as the input to
-vendor-specific deployment tools. For each nested deployment element, a vendor
-specific deployment tool is run to generate a jar file ready for deployment in
-that vendor's EJB container. </p>
-
-<p>The jar files are only built if they are out of date.  Each deployment tool
-element will examine its target jar file and determine if it is out of date with
-respect to the class files and deployment descriptors that make up the bean. If
-any of these files are newer than the jar file the jar will be rebuilt otherwise
-a message is logged that the jar file is up to date.</p>
-
-<p>The task uses the
-<a href="http://commons.apache.org/bcel/">BCEL</a> <a href="../install.html#librarydependencies">library</a>
-to extract all dependent classes. This
-means that, in addition to the classes that are mentioned in the
-deployment descriptor, any classes that these depend on are also
-automatically included in the jar file.</p>
-
-
-<h3>Naming Convention</h3>
-
-Ejbjar handles the processing of multiple beans, and it uses a set of naming
-conventions to determine the name of the generated EJB jars. The naming convention
-that is used is controlled by the &quot;naming&quot; attribute. It supports the
-following values
-<ul>
-
-<li>descriptor</li>
-<p>This is the default naming scheme. The name of the generated bean is derived from the
-name of the deployment descriptor.  For an Account bean, for example, the deployment
-descriptor would be named <code>Account-ejb-jar.xml</code>. Vendor specific descriptors are
-located using the same naming convention. The weblogic bean, for example, would be named
-<code>Account-weblogic-ejb-jar.xml</code>. Under this arrangement, the deployment descriptors
+<p>If no nested vendor-specific deployment elements are present, the task will simply generate a
+generic EJB jar. Such jars are typically used as the input to vendor-specific deployment tools. For
+each nested deployment element, a vendor specific deployment tool is run to generate a jar file
+ready for deployment in that vendor's EJB container.</p>
+
+<p>The jar files are only built if they are out of date.  Each deployment tool element will examine
+its target jar file and determine if it is out of date with respect to the class files and
+deployment descriptors that make up the bean. If any of these files are newer than the jar file the
+jar will be rebuilt otherwise a message is logged that the jar file is up to date.</p>
+
+<p>The task uses the <a href="https://commons.apache.org/bcel/"
+target="_top">BCEL</a> <a href="../install.html#librarydependencies">library</a> to extract all
+dependent classes. This means that, in addition to the classes that are mentioned in the deployment
+descriptor, any classes that these depend on are also automatically included in the jar file.</p>
+
+<h3 id="naming">Naming convention</h3>
+
+<code>Ejbjar</code> handles the processing of multiple beans, and it uses a set of naming
+conventions to determine the name of the generated EJB jars. The naming convention that is used is
+controlled by the <var>naming</var> attribute. It supports the following values
+<dl>
+<dt><q>descriptor</q></dt>
+<dd><p>This is the default naming scheme. The name of the generated bean is derived from the name of
+the deployment descriptor.  For an <samp>Account</samp> bean, for example, the deployment descriptor
+would be named <samp>Account-ejb-jar.xml</samp>. Vendor specific descriptors are located using the
+same naming convention. The WebLogic bean, for example, would be
+named <samp>Account-weblogic-ejb-jar.xml</samp>. Under this arrangement, the deployment descriptors
 can be separated from the code implementing the beans, which can be useful when the same bean code
-is deployed in separate beans.
-</p>
-
-<p>This scheme is useful when you are using one bean per EJB jar and where you may be
-deploying the same bean classes in different beans, with different deployment characteristics.
-
-<li>ejb-name</li>
-<p> This naming scheme uses the <code>&lt;ejb-name&gt;</code> element from the deployment descriptor to
-determine the bean name. In this situation, the descriptors normally use the generic
-descriptor names, such as <code>ejb-jar.xml</code> along with any associated vendor specific descriptor
-names. For example, If the value of the <code>&lt;ejb-name&gt;</code> were to be given in the deployment descriptor
-as follows:
+is deployed in separate beans.</p>
+<p>This scheme is useful when you are using one bean per EJB jar and where you may be deploying the
+same bean classes in different beans, with different deployment characteristics.</p></dd>
+
+<dt><q>ejb-name</q></dt>
+<dd><p>This naming scheme uses the <code>&lt;ejb-name&gt;</code> element from the deployment
+descriptor to determine the bean name. In this situation, the descriptors normally use the generic
+descriptor names, such as <samp>ejb-jar.xml</samp> along with any associated vendor specific
+descriptor names. For example, If the value of the <code>&lt;ejb-name&gt;</code> were to be given in
+the deployment descriptor as follows:</p>
 <pre>
 &lt;ejb-jar&gt;
     &lt;enterprise-beans&gt;
         &lt;entity&gt;
             &lt;ejb-name&gt;Sample&lt;/ejb-name&gt;
-            &lt;home&gt;org.apache.ant.ejbsample.SampleHome&lt;/home&gt;
-</pre>
-
-then the name of the generated bean would be <code>Sample.jar</code>
-</p>
-<p> This scheme is useful where you want to use the standard deployment descriptor names, which may be more
-compatible with other EJB tools. This scheme must have one bean per jar.
-</p>
-<li>directory</li>
-<p>
-In this mode, the name of the generated bean jar is derived from the directory
-containing the deployment descriptors. Again the deployment descriptors typically use
-the standard filenames. For example, if the path to the deployment descriptor is
-<code>/home/user/dev/appserver/dd/sample</code>, then the generated
-bean will be named <code>sample.jar</code>
-</p>
-<p>
-This scheme is also useful when you want to use standard style descriptor names. It is often
-most useful when the  descriptors are located in the same directory as the bean source code,
-although that is not mandatory. This scheme can handle multiple beans per jar.
-</p>
-
-<li>basejarname</li>
-<p>
-The final scheme supported by the <code>&lt;ejbjar&gt;</code> task is used when you want to specify the generated
-bean jar name directly. In this case the name of the generated jar is specified by the
-&quot;basejarname&quot; attribute. Since all generated beans will have the same name, this task should
-be only used when each descriptor is in its own directory.
-</p>
-
-<p>
-This scheme is most appropriate when you are using multiple beans per jar and only process a single
-deployment descriptor. You typically want to specify the name of the jar and not derive it from the
-beans in the jar.
-</p>
-
-</ul>
+            &lt;home&gt;org.apache.ant.ejbsample.SampleHome&lt;/home&gt;</pre>
+<p>then the name of the generated bean would be <samp>Sample.jar</samp></p>
+<p>This scheme is useful where you want to use the standard deployment descriptor names, which may
+be more compatible with other EJB tools. This scheme must have one bean per jar.</p></dd>
+<dt><q>directory</q></dt>
+<dd><p>In this mode, the name of the generated bean jar is derived from the directory containing the
+deployment descriptors. Again the deployment descriptors typically use the standard filenames. For
+example, if the path to the deployment descriptor
+is <samp>/home/user/dev/appserver/dd/sample</samp>, then the generated bean will be
+named <samp>sample.jar</samp></p>
+<p>This scheme is also useful when you want to use standard style descriptor names. It is often most
+useful when the descriptors are located in the same directory as the bean source code, although that
+is not mandatory. This scheme can handle multiple beans per jar.</p></dd>
+
+<dt><q>basejarname</q></dt>
+<dd><p>The final scheme supported by the <code>&lt;ejbjar&gt;</code> task is used when you want to
+specify the generated bean jar name directly. In this case the name of the generated jar is
+specified by the <var>basejarname</var> attribute. Since all generated beans will have the same
+name, this task should be only used when each descriptor is in its own directory.</p>
+
+<p>This scheme is most appropriate when you are using multiple beans per jar and only process a
+single deployment descriptor. You typically want to specify the name of the jar and not derive it
+from the beans in the jar.</p></dd>
+</dl>
+
+<h3 id="ejbjar_deps">Dependencies</h3>
+<p>In addition to the bean classes, <code>ejbjar</code> is able to ad additional classes to the
+generated EJB jar. These classes are typically the support classes which are used by the bean's
+classes or as parameters to the bean's methods.</p>
+
+<p>In versions of Ant prior to 1.5, <code>ejbjar</code> used reflection and attempted to add the
+super classes and super interfaces of the bean classes. For this technique to work the bean classes
+had to be loaded into Ant's JVM. This was not always possible due to class dependencies.</p>
+
+<p><em>Since Ant 1.5</em> the task uses the <a href="https://commons.apache.org/bcel/"
+target="_top">BCEL</a> library to analyze the bean's class files directly, rather than loading them
+into the JVM. This also allows <code>ejbjar</code> to add all of the required support classes for a
+bean and not just super classes.</p>
 
-<a name="ejbjar_deps"><h3>Dependencies</h3></a>
-<p>In addition to the bean classes, ejbjar is able to ad additional classes to the generated
-ejbjar. These classes are typically the support classes which are used by the bean's classes or as
-parameters to the bean's methods.</p>
-
-<p>In versions of Ant prior to 1.5, ejbjar used reflection and attempted to add the super
-classes and super interfaces of the bean classes. For this technique to work the bean
-classes had to be loaded into Ant's JVM. This was not always possible due to class dependencies.
-</p>
-
-<p>The ejbjar task in Ant releases 1.5 and later uses the
-<a href="http://commons.apache.org/bcel/"> BCEL </a> library
-to analyze the bean's class
-files directly, rather than loading them into the JVM. This also allows ejbjar to add all
-of the required support classes for a bean and not just super classes.
-</p>
-
-<p>In Ant 1.5, a new attribute, <code>dependency</code> has been introduced to allow the
-buildfile to control what additional classes are added to the generated jar. It takes three
-possible values</p>
+<p><em>Since Ant 1.5</em>, a <var>dependency</var> attribute allows the buildfile to control what
+additional classes are added to the generated jar. It takes three possible values</p>
 <ul>
-<li><code>none</code> - only the bean classes and interfaces described in the bean's
-descriptor are added to the jar.</li>
-<li><code>super</code> - this is the default value and replicates the original ejbjar
-behaviour where super classes and super interfaces are added to the jar</li>
-<li><code>full</code> - In this mode all classes used by the bean's classes and interfaces
-are added to the jar</li>
+  <li><q>none</q>&mdash;only the bean classes and interfaces described in the bean's descriptor are
+    added to the jar.</li>
+  <li><q>super</q>&mdash;this is the default value and replicates the original <code>ejbjar</code>
+    behaviour where super classes and super interfaces are added to the jar</li>
+  <li><q>full</q>&mdash;In this mode all classes used by the bean's classes and interfaces are added
+    to the jar</li>
 </ul>
-<p>The <code>super</code> and <code>full</code> values require the
-<a href="http://commons.apache.org/bcel/"> BCEL </a> library
-to be available. If it is not, ejbjar will drop back to the behaviour corresponding to
-the value <code>none</code>.</p>
-
-<h3>Parameters:</h3>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">descriptordir</td>
-    <td valign="top">The base directory under which to scan for EJB
-                     deployment descriptors. If this attribute is not
-                     specified, then the deployment descriptors must be
-                     located in the directory specified by the 'srcdir'
-                     attribute.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">srcdir</td>
-    <td valign="top">The base directory containing the .class files that
-                     make up the bean. Included are the home- remote- pk-
-                     and implementation- classes and all classes, that these
-                     depend on. Note that this can be the same as the
-                     descriptordir if all files are in the same directory
-                     tree.</td>
-    <td valign="top" align="center">Yes</td>
-  </tr>
-  <tr>
-    <td valign="top">destdir</td>
-    <td valign="top">The base directory into which generated jar files are
-                     deposited. Jar files are deposited in directories
-                     corresponding to their location within the descriptordir
-                     namespace. Note that this attribute is only used if the
-                     task is generating generic jars (i.e. no vendor-specific
-                     deployment elements have been specified).</td>
-    <td valign="top" align="center">Yes, unless vendor-specific deployment elements
-    have been specified.</td>
-  </tr>
-  <tr>
-    <td valign="top">cmpversion</td>
-    <td valign="top">Either <code>1.0</code> or <code>2.0</code>.<br>
-    Default is <code>1.0</code>.<br>
-    A CMP 2.0 implementation exists currently only for JBoss.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">naming</td>
-    <td valign="top">Controls the naming convention used to name generated
-                     EJB jars. Please refer to the description above.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">basejarname</td>
-    <td valign="top">The base name that is used for the generated jar files.
-                     If this attribute is specified, the generic jar file name
-                     will use this value as the prefix (followed by the value
-                     specified in the 'genericjarsuffix' attribute) and the
-                     resultant ejb jar file (followed by any suffix specified
-                     in the nested element).</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">basenameterminator</td>
-    <td valign="top">String value used to substring out a string from the name
-                     of each deployment descriptor found, which is then used to
-                     locate related deployment descriptors (e.g. the WebLogic
-                     descriptors). For example, a basename of '.' and a
-                     deployment descriptor called 'FooBean.ejb-jar.xml' would
-                     result in a basename of 'FooBean' which would then be used
-                     to find FooBean.weblogic-ejb-jar.xml and
-                     FooBean.weblogic-cmp-rdbms-jar.xml, as well as to create
-                     the filenames of the jar files as FooBean-generic.jar and
-                     FooBean-wl.jar. This attribute is not used if the
-                     'basejarname' attribute is specified.</td>
-    <td valign="top" align="center">No, defaults to '-'.</td>
-  </tr>
-  <tr>
-    <td valign="top">genericjarsuffix</td>
-    <td valign="top">String value appended to the basename of the deployment
-                     descriptor to create the filename of the generic EJB jar
-                     file.</td>
-    <td valign="top" align="center">No, defaults to '-generic.jar'.</td>
-  </tr>
-  <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">This classpath is used when resolving classes which
-                     are to be added to the jar. Typically nested deployment
-                     tool elements will also support a classpath which
-                     will be combined with this classpath when resolving
-                     classes</td>
-    <td valign="top" align="center">No.</td>
-  </tr>
-  <tr>
-    <td valign="top">flatdestdir</td>
-    <td valign="top">Set this attribute to true if you want all generated jars
-                     to be placed in the root of the destdir, rather than
-                     according to the location of the deployment descriptor
-                     within the descriptor dir hierarchy.</td>
-    <td valign="top" align="center">No.</td>
-  </tr>
-  <tr>
-    <td valign="top">dependency</td>
-    <td valign="top">This attribute controls which additional classes and interfaces
-                     are added to the jar. Please refer to the description
-                     <a href="#ejbjar_deps">above</a></td>
-    <td valign="top" align="center">No.</td>
-  </tr>
-  <tr>
-    <td valign="top">manifest</td>
-    <td valign="top">the manifest file to use, if any.</td>
-    <td valign="top" align="center">No</td>
+<p>The <q>super</q> and <q>full</q> values require the <a href="https://commons.apache.org/bcel/"
+target="_top">BCEL</a> library to be available. If it is not, <code>ejbjar</code> will drop back to
+the behaviour corresponding to the value <q>none</q>.</p>
+
+<h3>Parameters</h3>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>descriptordir</td>
+    <td>The base directory under which to scan for EJB deployment descriptors. If this attribute is
+      not specified, then the deployment descriptors must be located in the directory specified by
+      the <var>srcdir</var> attribute.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>srcdir</td>
+    <td>The base directory containing the .class files that make up the bean. Included are
+      the <samp>home-</samp>, <samp>remote-</samp>, <samp>pk-</samp>
+      and <samp>implementation-</samp> classes and all classes that these depend on. Note that this
+      can be the same as the <var>descriptordir</var> if all files are in the same directory
+      tree.</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>destdir</td>
+    <td>The base directory into which generated jar files are deposited. Jar files are deposited in
+      directories corresponding to their location within the <var>descriptordir</var>
+      namespace. Note that this attribute is only used if the task is generating generic jars
+      (i.e. no vendor-specific deployment elements have been specified).</td>
+    <td>Yes, unless vendor-specific deployment elements have been specified.</td>
+  </tr>
+  <tr>
+    <td>cmpversion</td>
+    <td>Either <q>1.0</q> or <q>2.0</q>.<br/>A CMP 2.0 implementation exists currently only for
+    JBoss.</td>
+    <td>No; default is <q>1.0</q></td>
+  </tr>
+  <tr>
+    <td>naming</td>
+    <td>Controls the naming convention used to name generated EJB jars. Please refer to the
+      description <a href="#naming">above</a>.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>basejarname</td>
+    <td>The base name that is used for the generated jar files.  If this attribute is specified, the
+      generic jar file name will use this value as the prefix (followed by the value specified in
+      the <var>genericjarsuffix</var> attribute) and the resultant EJB jar file (followed by any
+      suffix specified in the nested element).</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>basenameterminator</td>
+    <td>String value used to substring out a string from the name of each deployment descriptor
+      found, which is then used to locate related deployment descriptors (e.g. the WebLogic
+      descriptors). For example, a basename of <q>.</q> and a deployment descriptor
+      called <samp>FooBean.ejb-jar.xml</samp> would result in a basename of <q>FooBean</q> which
+      would then be used to find <samp>FooBean.weblogic-ejb-jar.xml</samp>
+      and <samp>FooBean.weblogic-cmp-rdbms-jar.xml</samp>, as well as to create the filenames of the
+      jar files as <samp>FooBean-generic.jar</samp> and <samp>FooBean-wl.jar</samp>. This attribute
+      is not used if the <var>basejarname</var> attribute is specified.</td>
+    <td>No; defaults to <q>-</q></td>
+  </tr>
+  <tr>
+    <td>genericjarsuffix</td>
+    <td>String value appended to the basename of the deployment descriptor to create the filename of
+      the generic EJB jar file.</td>
+    <td>No; defaults to <q class="no-break">-generic.jar</q></td>
+  </tr>
+  <tr>
+    <td>classpath</td>
+    <td>This classpath is used when resolving classes which are to be added to the jar. Typically
+      nested deployment tool elements will also support a classpath which will be combined with this
+      classpath when resolving classes</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>flatdestdir</td>
+      <td>Set this attribute to <q>true</q> if you want all generated jars to be placed in the root
+        of the <var>destdir</var>, rather than according to the location of the deployment
+        descriptor within the <var>descriptordir</var> hierarchy.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>dependency</td>
+    <td>This attribute controls which additional classes and interfaces are added to the jar. Please
+      refer to the description <a href="#ejbjar_deps">above</a></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>manifest</td>
+    <td>the manifest file to use, if any.</td>
+    <td>No</td>
   </tr>
 </table>
 
-<h3>Nested Elements</h3>
+<h3>Parameters specified as nested elements</h3>
 
-<p>In addition to the vendor specific nested elements, the ejbjar task provides
-three nested elements. </p>
+<p>In addition to the vendor specific nested elements, the <code>ejbjar</code> task provides three
+nested elements.</p>
 
-<h4>Classpath</h4>
+<h4>classpath</h4>
 
-<p>The <code>&lt;classpath&gt;</code> nested element allows the classpath
-to be set. It is useful when setting the classpath from a reference path. In all
-other respects the behaviour is the same as the classpath attribute.</p>
+<p>The <code>&lt;classpath&gt;</code> nested element allows the classpath to be set. It is useful
+when setting the classpath from a reference path. In all other respects the behaviour is the same as
+the classpath attribute.</p>
 
-<a name="ejbjar-dtd"><h4>dtd</h4></a>
+<h4 id="ejbjar-dtd">dtd</h4>
 
-<p>The <code>&lt;dtd&gt;</code> element is used to specify the local location of DTDs to be
-used when parsing the EJB deployment descriptor. Using a local DTD is much
-faster than loading the DTD across the net. If you are running ejbjar behind a
-firewall you may not even be able to access the remote DTD. The supported
-vendor-specific nested elements know the location of the required DTDs within
-the vendor class hierarchy and, in general, this means <code>&lt;dtd&gt;</code> elements are
-not required. It does mean, however, that the vendor's class hierarchy must be
-available in the classpath when Ant is started. If your want to run Ant without
-requiring the vendor classes in the classpath, you would need to use a
-<code>&lt;dtd&gt;</code> element.</p>
+<p>The <code>&lt;dtd&gt;</code> element is used to specify the local location of DTDs to be used
+when parsing the EJB deployment descriptor. Using a local DTD is much faster than loading the DTD
+across the net. If you are running <code>ejbjar</code> behind a firewall you may not even be able to
+access the remote DTD. The supported vendor-specific nested elements know the location of the
+required DTDs within the vendor class hierarchy and, in general, this means <code>&lt;dtd&gt;</code>
+elements are not required. It does mean, however, that the vendor's class hierarchy must be
+available in the classpath when Ant is started. If your want to run Ant without requiring the vendor
+classes in the classpath, you would need to use a <code>&lt;dtd&gt;</code> element.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">publicId</td>
-    <td valign="top">The public Id of the DTD for which the location is being provided</td>
-    <td align="center" valign="top">Yes</td>
+    <td>publicId</td>
+    <td>The public Id of the DTD for which the location is being provided</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">location</td>
-    <td valign="top">The location of the local copy of the DTD. This can either be a
-                     file or a resource loadable from the classpath.</td>
-    <td align="center" valign="top">Yes</td>
+    <td>location</td>
+    <td>The location of the local copy of the DTD. This can either be a file or a resource loadable
+      from the classpath.</td>
+    <td>Yes</td>
   </tr>
 </table>
 
 <h4>support</h4>
 
-<p>The <code>&lt;support&gt;</code> nested element is used to supply additional classes
-(files) to be included in the generated jars. The <code>&lt;support&gt;</code> element is a
-<a href="../Types/fileset.html">FileSet</a>, so it can either reference a fileset declared elsewhere or it can be
-defined in-place with the appropriate <code>&lt;include&gt;</code> and <code>&lt;exclude&gt;</code> nested
-elements. The files in the support fileset are added into the generated EJB jar
-in the same relative location as their location within the support fileset. Note
-that when ejbjar generates more than one jar file, the support files are added
-to each one.</p>
+<p>The <code>&lt;support&gt;</code> nested element is used to supply additional classes (files) to
+be included in the generated jars. The <code>&lt;support&gt;</code> element is
+a <a href="../Types/fileset.html">FileSet</a>, so it can either reference a fileset declared
+elsewhere or it can be defined in-place with the appropriate <code>&lt;include&gt;</code>
+and <code>&lt;exclude&gt;</code> nested elements. The files in the support fileset are added into
+the generated EJB jar in the same relative location as their location within the support
+fileset. Note that when <code>ejbjar</code> generates more than one jar file, the support files are
+added to each one.</p>
 
 <h3>Vendor-specific deployment elements</h3>
 
-Each vendor-specific nested element controls the generation of a deployable jar
-specific to that vendor's EJB container. The parameters for each supported
-deployment element are detailed here.
+<p>Each vendor-specific nested element controls the generation of a deployable jar specific to that
+vendor's EJB container. The parameters for each supported deployment element are detailed here.</p>
 
+<h3 id="ejbjar_jboss">Jboss element</h3>
 
-<h3><a name="ejbjar_jboss">Jboss element</a></h3>
-
-<p>The jboss element searches for the JBoss specific deployment descriptors and adds them
-to the final ejb jar file. JBoss has two deployment descriptors:
-<ul><li>jboss.xml</li>
-<li>for container manager persistence:<br>
-<table border="1">
-<tr><td><b>CMP version</b></td><td><b>File name</b></td></tr>
-<tr><td>CMP 1.0</td><td>jaws.xml</td></tr>
-<tr><td>CMP 2.0</td><td>jbosscmp-jdbc.xml</td></tr>
-</table>
-</li>
+<p>The <code>jboss</code> element searches for the JBoss specific deployment descriptors and adds
+them to the final EJB jar file. JBoss has two deployment descriptors:</p>
+<ul>
+  <li><samp>jboss.xml</samp></li>
+  <li>for container manager persistence:
+    <table>
+      <tr><th>CMP version</th><th>File name</th></tr>
+      <tr><td>CMP 1.0</td><td><samp>jaws.xml</samp></td></tr>
+      <tr><td>CMP 2.0</td><td><samp>jbosscmp-jdbc.xml</samp></td></tr>
+    </table>
+  </li>
 </ul>
-<br>
-. The JBoss server uses hot deployment and does
-not require compilation of additional stubs and skeletons.</p>
-
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">destdir</td>
-    <td valign="top">The base directory into which the generated weblogic ready
-                     jar files are deposited. Jar files are deposited in
-                     directories corresponding to their location within the
-                     descriptordir namespace. </td>
-    <td valign="top" align="center">Yes</td>
-  </tr>
-  <tr>
-    <td valign="top">genericjarsuffix</td>
-    <td valign="top">A generic jar is generated as an intermediate step in
-                     build the weblogic deployment jar. The suffix used to
-                     generate the generic jar file is not particularly
-                     important unless it is desired to keep the generic
-                     jar file. It should not, however, be the same
-                     as the suffix setting.</td>
-    <td valign="top" align="center">No, defaults to '-generic.jar'.</td>
-  </tr>
-  <tr>
-    <td valign="top">suffix</td>
-    <td valign="top">String value appended to the basename of the deployment
-                     descriptor to create the filename of the JBoss EJB
-                     jar file.</td>
-    <td valign="top" align="center">No, defaults to '.jar'.</td>
-  </tr>
-  <tr>
-    <td valign="top">keepgeneric</td>
-    <td valign="top">This controls whether the generic file used as input to
-                     ejbc is retained.</td>
-    <td valign="top" align="center">No, defaults to false</td>
+<p>The JBoss server uses hot deployment and does not require compilation of additional stubs and
+skeletons.</p>
+
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>destdir</td>
+    <td>The base directory into which the generated JBoss ready jar files are deposited. Jar files
+      are deposited in directories corresponding to their location within
+      the <var>descriptordir</var> namespace.</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>genericjarsuffix</td>
+    <td>A generic jar is generated as an intermediate step in build the JBoss deployment jar. The
+      suffix used to generate the generic jar file is not particularly important unless it is
+      desired to keep the generic jar file. It should not, however, be the same as the suffix
+      setting.</td>
+    <td>No; defaults to <q class="no-break">-generic.jar</q></td>
+  </tr>
+  <tr>
+    <td>suffix</td>
+    <td>String value appended to the basename of the deployment descriptor to create the filename of
+      the JBoss EJB jar file.</td>
+    <td>No; defaults to <q>.jar</q></td>
+  </tr>
+  <tr>
+    <td>keepgeneric</td>
+    <td>This controls whether the generic file used as input to <kbd>ejbc</kbd> is retained.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
 </table>
 
+<h3 id="ejbjar_weblogic">WebLogic element</h3>
+
+<p>The <code>weblogic</code> element is used to control the <code>weblogic.ejbc</code> compiler for
+generating WebLogic EJB jars. Prior to Ant 1.3, the method of locating CMP descriptors was to use
+the <code>ejbjar</code> naming convention. So if your EJB jar was
+called, <samp>Customer-ejb-jar.xml</samp>, your WebLogic descriptor was
+called <samp>Customer-weblogic-ejb-jar.xml</samp> and your CMP descriptor had to
+be <samp>Customer-weblogic-cmp-rdbms-jar.xml</samp>. In addition,
+the <code>&lt;type-storage&gt;</code> element in the WebLogic descriptor had to be set to the
+standard name <samp>META-INF/weblogic-cmp-rdbms-jar.xml</samp>, as that is where the CMP descriptor
+was mapped to in the generated jar.</p>
+
+<p>There are a few problems with this scheme. It does not allow for more than one CMP descriptor to
+be defined in a jar and it is not compatible with the deployment descriptors generated by some
+tools.</p>
 
-<h3><a name="ejbjar_weblogic">Weblogic element</a></h3>
+<p>In Ant 1.3, <code>ejbjar</code> parses the WebLogic deployment descriptor to discover the CMP
+descriptors, which are then included automatically. This behaviour is controlled by
+the <var>newCMP</var> attribute. Note that if you move to the new method of determining CMP
+descriptors, you will need to update your WebLogic deployment
+descriptor's <code>&lt;type-storage&gt;</code> element. In the above example, you would define this
+as <samp>META-INF/Customer-weblogic-cmp-rdbms-jar.xml</samp>.</p>
 
-<p>The weblogic element is used to control the weblogic.ejbc compiler for
-generating weblogic EJB jars. Prior to Ant 1.3, the method of locating CMP
-descriptors was to use the ejbjar naming convention. So if your ejb-jar was
-called, Customer-ejb-jar.xml, your weblogic descriptor was called Customer-
-weblogic-ejb-jar.xml and your CMP descriptor had to be Customer-weblogic-cmp-
-rdbms-jar.xml. In addition, the <code>&lt;type-storage&gt;</code> element in the weblogic
-descriptor had to be set to the standard name META-INF/weblogic-cmp-rdbms-
-jar.xml, as that is where the CMP descriptor was mapped to in the generated
-jar.</p>
-
-<p>There are a few problems with this scheme. It does not allow for more than
-one CMP descriptor to be defined in a jar and it is not compatible with the
-deployment descriptors generated by some tools.</p>
-
-<p>In Ant 1.3, ejbjar parses the weblogic deployment descriptor to discover the
-CMP descriptors, which are then included automatically. This behaviour is
-controlled by the newCMP attribute. Note that if you move to the new method of
-determining CMP descriptors, you will need to update your weblogic deployment
-descriptor's <code>&lt;type-storage&gt;</code> element. In the above example, you would
-define this as META-INF/Customer-weblogic-cmp-rdbms-jar.xml.</p>
-
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">destdir</td>
-    <td valign="top">The base directory into which the generated weblogic ready
-                     jar files are deposited. Jar files are deposited in
-                     directories corresponding to their location within the
-                     descriptordir namespace. </td>
-    <td valign="top" align="center">Yes</td>
-  </tr>
-  <tr>
-    <td valign="top">genericjarsuffix</td>
-    <td valign="top">A generic jar is generated as an intermediate step in
-                     build the weblogic deployment jar. The suffix used to
-                     generate the generic jar file is not particularly
-                     important unless it is desired to keep the generic
-                     jar file. It should not, however, be the same
-                     as the suffix setting.</td>
-    <td valign="top" align="center">No, defaults to '-generic.jar'.</td>
-  </tr>
-  <tr>
-    <td valign="top">suffix</td>
-    <td valign="top">String value appended to the basename of the deployment
-                     descriptor to create the filename of the WebLogic EJB
-                     jar file.</td>
-    <td valign="top" align="center">No, defaults to '.jar'.</td>
-  </tr>
-  <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">The classpath to be used when running the weblogic ejbc
-                     tool. Note that this tool typically requires the classes
-                     that make up the bean to be available on the classpath.
-                     Currently, however, this will cause the ejbc tool to be
-                     run in a separate VM</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">wlclasspath</td>
-    <td valign="top">Weblogic 6.0 will give a warning if the home and remote interfaces
-                     of a bean are on the system classpath used to run weblogic.ejbc.
-                     In that case, the standard weblogic classes should be set with
-                     this attribute (or equivalent nested element) and the
-                     home and remote interfaces located with the standard classpath
-                     attribute</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">keepgeneric</td>
-    <td valign="top">This controls whether the generic file used as input to
-                     ejbc is retained.</td>
-    <td valign="top" align="center">No, defaults to false</td>
-  </tr>
-  <tr>
-    <td valign="top">compiler</td>
-    <td valign="top">This allows for the selection of a different compiler
-                     to be used for the compilation of the generated Java
-                     files. This could be set, for example, to Jikes to
-                     compile with the Jikes compiler. If this is not set
-                     and the <code>build.compiler</code> property is set
-                     to jikes, the Jikes compiler will be used. If this
-                     is not desired, the value &quot;<code>default</code>&quot;
-                     may be given to use the default compiler</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">rebuild</td>
-    <td valign="top">This flag controls whether weblogic.ejbc is always
-                     invoked to build the jar file. In certain circumstances,
-                     such as when only a bean class has been changed, the jar
-                     can be generated by merely replacing the changed classes
-                     and not rerunning ejbc. Setting this to false will reduce
-                     the time to run ejbjar.
-                     </td>
-    <td valign="top" align="center">No, defaults to true.</td>
-  </tr>
-  <tr>
-    <td valign="top">keepgenerated</td>
-    <td valign="top">Controls whether weblogic will keep the generated Java
-                     files used to build the class files added to the
-                     jar. This can be useful when debugging
-                     </td>
-    <td valign="top" align="center">No, defaults to false.</td>
-  </tr>
-  <tr>
-    <td valign="top">args</td>
-    <td valign="top">Any additional arguments to be passed to the weblogic.ejbc
-                     tool.
-                     </td>
-    <td valign="top" align="center">No.</td>
-  </tr>
-  <tr>
-    <td valign="top">weblogicdtd</td>
-    <td valign="top"><b>Deprecated</b>. Defines the location of the ejb-jar DTD in
-                     the weblogic class hierarchy. This should not be necessary if you
-                     have weblogic in your classpath. If you do not, you should use a
-                     nested <code>&lt;dtd&gt;</code> element, described above. If you do choose
-                     to use an attribute, you should use a
-                     nested <code>&lt;dtd&gt;</code> element.
-                     </td>
-    <td valign="top" align="center">No.</td>
-  </tr>
-  <tr>
-    <td valign="top">wldtd</td>
-    <td valign="top"><b>Deprecated</b>. Defines the location of the weblogic-ejb-jar
-                     DTD which covers the Weblogic specific deployment descriptors.
-                     This should not be necessary if you have weblogic in your
-                     classpath. If you do not, you should use a nested <code>&lt;dtd&gt;</code>
-                     element, described above.
-                     </td>
-    <td valign="top" align="center">No.</td>
-  </tr>
-  <tr>
-    <td valign="top">ejbdtd</td>
-    <td valign="top"><b>Deprecated</b>. Defines the location of the ejb-jar DTD in
-                     the weblogic class hierarchy. This should not be necessary if you
-                     have weblogic in your classpath. If you do not, you should use a
-                     nested <code>&lt;dtd&gt;</code> element, described above.
-                     </td>
-    <td valign="top" align="center">No.</td>
-  </tr>
-  <tr>
-    <td valign="top">newCMP</td>
-    <td valign="top">If this is set to true, the new method for locating
-                     CMP descriptors will be used.</td>
-    <td valign="top" align="center">No. Defaults to false</td>
-  </tr>
-  <tr>
-    <td valign="top">oldCMP</td>
-    <td valign="top"><b>Deprecated</b> This is an antonym for newCMP which should be used instead.</td>
-    <td valign="top" align="center">No.</td>
-  </tr>
-  <tr>
-    <td valign="top">noEJBC</td>
-    <td valign="top">If this attribute is set to true, Weblogic's ejbc will not be run on the EJB jar.
-                     Use this if you prefer to run ejbc at deployment time.</td>
-    <td valign="top" align="center">No.</td>
-  </tr>
-  <tr>
-    <td valign="top">ejbcclass</td>
-    <td valign="top">Specifies the classname of the ejbc compiler. Normally ejbjar determines
-                     the appropriate class based on the DTD used for the EJB. The EJB 2.0 compiler
-                     featured in weblogic 6 has, however, been deprecated in version 7. When
-                     using with version 7 this attribute should be set to
-                     &quot;weblogic.ejbc&quot; to avoid the deprecation warning.</td>
-    <td valign="top" align="center">No.</td>
-  </tr>
-  <tr>
-    <td valign="top">jvmargs</td>
-    <td valign="top">Any additional arguments to be passed to the Virtual Machine
-                     running weblogic.ejbc tool. For example to set the memory size,
-                     this could be jvmargs=&quot;-Xmx128m&quot;
-                     </td>
-    <td valign="top" align="center">No.</td>
-  </tr>
-  <tr>
-    <td valign="top">jvmdebuglevel</td>
-    <td valign="top">Sets the weblogic.StdoutSeverityLevel to use when running
-                     the Virtual Machine that executes ejbc. Set to 16 to avoid
-                     the warnings about EJB Home and Remotes being in the classpath
-                     </td>
-    <td valign="top" align="center">No.</td>
-  </tr>
-  <tr>
-    <td valign="top">outputdir</td>
-    <td valign="top">If set ejbc will be given this directory as the output
-                     destination rather than a jar file. This allows for the
-                     generation of &quot;exploded&quot; jars.
-                     </td>
-    <td valign="top" align="center">No.</td>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>destdir</td>
+    <td>The base directory into which the generated WebLogic ready jar files are deposited. Jar
+      files are deposited in directories corresponding to their location within
+      the <var>descriptordir</var> namespace.</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>genericjarsuffix</td>
+    <td>A generic jar is generated as an intermediate step in build the WebLogic deployment jar. The
+      suffix used to generate the generic jar file is not particularly important unless it is
+      desired to keep the generic jar file. It should not, however, be the same as the suffix
+      setting.</td>
+    <td>No; defaults to <q class="no-break">-generic.jar</q></td>
+  </tr>
+  <tr>
+    <td>suffix</td>
+    <td>String value appended to the basename of the deployment descriptor to create the filename of
+      the WebLogic EJB jar file.</td>
+    <td>No; defaults to <q>.jar</q></td>
+  </tr>
+  <tr>
+    <td>classpath</td>
+      <td>The classpath to be used when running the WebLogic <kbd>ejbc</kbd> tool. Note that this
+        tool typically requires the classes that make up the bean to be available on the classpath.
+        Currently, however, this will cause the <kbd>ejbc</kbd> tool to be run in a separate
+        JVM</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>wlclasspath</td>
+    <td>WebLogic 6.0 will give a warning if the home and remote interfaces of a bean are on the
+      system classpath used to run <code>weblogic.ejbc</code>.  In that case, the standard WebLogic
+      classes should be set with this attribute (or equivalent nested element) and the home and
+      remote interfaces located with the standard classpath attribute</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>keepgeneric</td>
+    <td>This controls whether the generic file used as input to <kbd>ejbc</kbd> is retained.</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>compiler</td>
+    <td>This allows for the selection of a different compiler to be used for the compilation of the
+      generated Java files. This could be set, for example, to <q>jikes</q> to compile with the
+      Jikes compiler. If this is not set and the <code>build.compiler</code> property is set
+      to <q>jikes</q>, the Jikes compiler will be used. If this is not desired, the
+      value <q>default</q> may be given to use the default compiler</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>rebuild</td>
+    <td>This flag controls whether <code>weblogic.ejbc</code> is always invoked to build the jar
+      file. In certain circumstances, such as when only a bean class has been changed, the jar can
+      be generated by merely replacing the changed classes and not
+      rerunning <kbd>ejbc</kbd>. Setting this to <q>false</q> will reduce the time to
+      run <code>ejbjar</code>.</td>
+    <td>No; defaults to <q>true</q></td>
+  </tr>
+  <tr>
+    <td>keepgenerated</td>
+    <td>Controls whether WebLogic will keep the generated Java files used to build the class files
+      added to the jar. This can be useful when debugging</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>args</td>
+    <td>Any additional arguments to be passed to the <code>weblogic.ejbc</code> tool.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>weblogicdtd</td>
+    <td><em><u>Deprecated</u></em>. Defines the location of the ejb-jar DTD in the WebLogic class
+      hierarchy. This should not be necessary if you have WebLogic in your classpath. If you do not,
+      you should use a nested <code>&lt;dtd&gt;</code> element, described above. If you do choose to
+      use an attribute, you should use a nested <code>&lt;dtd&gt;</code> element.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>wldtd</td>
+    <td><em><u>Deprecated</u></em>. Defines the location of the weblogic-ejb-jar DTD which covers
+      the WebLogic specific deployment descriptors.  This should not be necessary if you have
+      WebLogic in your classpath. If you do not, you should use a nested <code>&lt;dtd&gt;</code>
+      element, described above.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>ejbdtd</td>
+    <td><em><u>Deprecated</u></em>. Defines the location of the ejb-jar DTD in the WebLogic class
+      hierarchy. This should not be necessary if you have WebLogic in your classpath. If you do not,
+      you should use a nested <code>&lt;dtd&gt;</code> element, described above.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>newCMP</td>
+    <td>If this is set to <q>true</q>, the new method for locating CMP descriptors will be
+      used.</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>oldCMP</td>
+    <td><em><u>Deprecated</u></em> This is an antonym for <var>newCMP</var> which should be used
+      instead.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>noEJBC</td>
+    <td>If this attribute is set to <q>true</q>, WebLogic's <kbd>ejbc</kbd> will not be run on the
+      EJB jar.  Use this if you prefer to run <kbd>ejbc</kbd> at deployment time.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>ejbcclass</td>
+    <td>Specifies the classname of the <kbd>ejbc</kbd> compiler. Normally <code>ejbjar</code>
+      determines the appropriate class based on the DTD used for the EJB. The EJB 2.0 compiler
+      featured in WebLogic 6 has, however, been deprecated in version 7. When using with version 7
+      this attribute should be set to <q>weblogic.ejbc</q> to avoid the deprecation warning.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>jvmargs</td>
+    <td>Any additional arguments to be passed to the JVM running <code>weblogic.ejbc</code>
+      tool. For example to set the memory size, this could
+      be <var>jvmargs</var>=<q>-Xmx128m</q></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>jvmdebuglevel</td>
+    <td>Sets the <code>weblogic.StdoutSeverityLevel</code> to use when running the JVM that
+      executes <kbd>ejbc</kbd>. Set to <q>16</q> to avoid the warnings about EJB Home and Remotes
+      being in the classpath</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>outputdir</td>
+    <td>If set <kbd>ejbc</kbd> will be given this directory as the output destination rather than a
+      jar file. This allows for the generation of &quot;exploded&quot; jars.</td>
+    <td>No</td>
   </tr>
 </table>
 
-<p>The weblogic nested element supports three nested elements. The
-first two, <code>&lt;classpath&gt;</code> and <code>&lt;wlclasspath&gt;</code>, are used to set the
-respective classpaths. These nested elements are useful when setting up
-class paths using reference Ids. The last, <code>&lt;sysproperty&gt;</code>, allows
-Java system properties to be set during the compiler run. This turns out
-to be necessary for supporting CMP EJB compilation in all environments.
-</p>
+<p>The <code>weblogic</code> nested element supports three nested elements. The first
+two, <code>&lt;classpath&gt;</code> and <code>&lt;wlclasspath&gt;</code>, are used to set the
+respective classpaths. These nested elements are useful when setting up classpaths using reference
+Ids. The last, <code>&lt;sysproperty&gt;</code>, allows Java system properties to be set during the
+compiler run. This turns out to be necessary for supporting CMP EJB compilation in all
+environments.</p>
 
-<h3>TOPLink for Weblogic element</h3>
+<h3>TOPLink for WebLogic element</h3>
 
-<p><b><i>Deprecated</i></b></p>
+<p><em><u>Deprecated</u></em></p>
 
-<p>The toplink element is no longer required. Toplink beans can now be built with the standard
-weblogic element, as long as the newCMP attribute is set to &quot;true&quot;
-</p>
+<p>The <code>toplink</code> element is no longer required. Toplink beans can now be built with the
+standard <code>weblogic</code> element, as long as the <var>newCMP</var> attribute is set
+to <q>true</q></p>
 
-<p>The TopLink element is used to handle beans which use Toplink for the CMP operations. It
-is derived from the standard weblogic element so it supports the same set of attributes plus these
-additional attributes</p>
+<p>The <code>TopLink</code> element is used to handle beans which use Toplink for the CMP
+operations. It is derived from the standard <code>weblogic</code> element so it supports the same
+set of attributes plus these additional attributes</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">toplinkdescriptor</td>
-    <td valign="top">This specifies the name of the TOPLink deployment descriptor file contained in the
-                     'descriptordir' directory.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>toplinkdescriptor</td>
+    <td>This specifies the name of the TOPLink deployment descriptor file contained in
+    the <var>descriptordir</var> directory.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">toplinkdtd</td>
-    <td valign="top">This specifies the location of the TOPLink DTD file. This can be a file path or
-                     a file URL. This attribute is not required, but using a local DTD is recommended.</td>
-    <td valign="top" align="center">No, defaults to dtd file at www.objectpeople.com.</td>
+    <td>toplinkdtd</td>
+    <td>This specifies the location of the TOPLink DTD file. This can be a file path or a file
+      URL. This attribute is not required, but using a local DTD is recommended.</td>
+    <td>No; defaults to DTD file at <samp>www.objectpeople.com</samp>.</td>
   </tr>
 </table>
 
-
 <h3>Examples</h3>
 
-<p>This example shows ejbjar being used to generate deployment jars using a
-Weblogic EJB container. This example requires the naming standard to be used for
-the deployment descriptors. Using this format will create a ejb jar file for
-each variation of '*-ejb-jar.xml' that is found in the deployment descriptor
-directory.</p>
+<p>This example shows <code>ejbjar</code> being used to generate deployment jars using a WebLogic
+EJB container. This example requires the naming standard to be used for the deployment
+descriptors. Using this format will create a EJB jar file for each variation
+of <samp>*-ejb-jar.xml</samp> that is found in the deployment descriptor directory.</p>
 
 <pre>
-    &lt;ejbjar srcdir=&quot;${build.classes}&quot;
-            descriptordir=&quot;${descriptor.dir}&quot;&gt;
-      &lt;weblogic destdir=&quot;${deploymentjars.dir}&quot;
-                classpath=&quot;${descriptorbuild.classpath}&quot;/&gt;
-      &lt;include name=&quot;**/*-ejb-jar.xml&quot;/&gt;
-      &lt;exclude name=&quot;**/*weblogic*.xml&quot;/&gt;
-    &lt;/ejbjar&gt;
-</pre>
+&lt;ejbjar srcdir=&quot;${build.classes}&quot;
+        descriptordir=&quot;${descriptor.dir}&quot;&gt;
+  &lt;weblogic destdir=&quot;${deploymentjars.dir}&quot;
+            classpath=&quot;${descriptorbuild.classpath}&quot;/&gt;
+  &lt;include name=&quot;**/*-ejb-jar.xml&quot;/&gt;
+  &lt;exclude name=&quot;**/*weblogic*.xml&quot;/&gt;
+&lt;/ejbjar&gt;</pre>
 
-<p>If weblogic is not in the Ant classpath, the following example
-shows how to specify the location of the weblogic DTDs. This
-example also show the use of a nested classpath element.</p>
+<p>If WebLogic is not in the Ant classpath, the following example shows how to specify the location
+of the WebLogic DTDs. This example also show the use of a nested <code>classpath</code> element.</p>
 
 <pre>
-    &lt;ejbjar descriptordir=&quot;${src.dir}&quot; srcdir=&quot;${build.classes}&quot;&gt;
-       &lt;weblogic destdir=&quot;${deployment.webshop.dir}&quot;
-                 keepgeneric=&quot;true&quot;
-                 args=&quot;-g -keepgenerated ${ejbc.compiler}&quot;
-                 suffix=&quot;.jar&quot;
-                 oldCMP=&quot;false&quot;&gt;
-         &lt;classpath&gt;
-           &lt;pathelement path=&quot;${descriptorbuild.classpath}&quot;/&gt;
-         &lt;/classpath&gt;
-       &lt;/weblogic&gt;
-       &lt;include name=&quot;**/*-ejb-jar.xml&quot;/&gt;
-       &lt;exclude name=&quot;**/*-weblogic-ejb-jar.xml&quot;/&gt;
-       &lt;dtd publicId=&quot;-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN&quot;
-            location=&quot;${weblogic.home}/classes/weblogic/ejb/deployment/xml/ejb-jar.dtd&quot;/&gt;
-       &lt;dtd publicId=&quot;-//BEA Systems, Inc.//DTD WebLogic 5.1.0 EJB//EN&quot;
-            location=&quot;${weblogic.home}/classes/weblogic/ejb/deployment/xml/weblogic-ejb-jar.dtd&quot;/&gt;
-    &lt;/ejbjar&gt;
-</pre>
-
-
-<p>This example shows ejbjar being used to generate a single deployment jar
-using a Weblogic EJB container. This example does not require the deployment
-descriptors to use the naming standard. This will create only one ejb jar file -
-'TheEJBJar.jar'.</p>
-
+&lt;ejbjar descriptordir=&quot;${src.dir}&quot; srcdir=&quot;${build.classes}&quot;&gt;
+   &lt;weblogic destdir=&quot;${deployment.webshop.dir}&quot;
+             keepgeneric=&quot;true&quot;
+             args=&quot;-g -keepgenerated ${ejbc.compiler}&quot;
+             suffix=&quot;.jar&quot;
+             oldCMP=&quot;false&quot;&gt;
+     &lt;classpath&gt;
+       &lt;pathelement path=&quot;${descriptorbuild.classpath}&quot;/&gt;
+     &lt;/classpath&gt;
+   &lt;/weblogic&gt;
+   &lt;include name=&quot;**/*-ejb-jar.xml&quot;/&gt;
+   &lt;exclude name=&quot;**/*-weblogic-ejb-jar.xml&quot;/&gt;
+   &lt;dtd publicId=&quot;-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN&quot;
+        location=&quot;${weblogic.home}/classes/weblogic/ejb/deployment/xml/ejb-jar.dtd&quot;/&gt;
+   &lt;dtd publicId=&quot;-//BEA Systems, Inc.//DTD WebLogic 5.1.0 EJB//EN&quot;
+        location=&quot;${weblogic.home}/classes/weblogic/ejb/deployment/xml/weblogic-ejb-jar.dtd&quot;/&gt;
+&lt;/ejbjar&gt;</pre>
+
+<p>This example shows <code>ejbjar</code> being used to generate a single deployment jar using a
+WebLogic EJB container. This example does not require the deployment descriptors to use the naming
+standard. This will create only one EJB jar file&mdash;<samp>TheEJBJar.jar</samp>.</p>
 
 <pre>
-    &lt;ejbjar srcdir=&quot;${build.classes}&quot;
-            descriptordir=&quot;${descriptor.dir}&quot;
-            basejarname=&quot;TheEJBJar&quot;&gt;
-      &lt;weblogic destdir=&quot;${deploymentjars.dir}&quot;
-                classpath=&quot;${descriptorbuild.classpath}&quot;/&gt;
-      &lt;include name=&quot;**/ejb-jar.xml&quot;/&gt;
-      &lt;exclude name=&quot;**/weblogic*.xml&quot;/&gt;
-    &lt;/ejbjar&gt;
-</pre>
-
-<p>This example shows ejbjar being used to generate deployment jars for a TOPLink-enabled entity bean using a
-Weblogic EJB container. This example does not require the deployment descriptors to use the naming standard.
-This will create only one TOPLink-enabled ejb jar file - 'Address.jar'.</p>
+&lt;ejbjar srcdir=&quot;${build.classes}&quot;
+        descriptordir=&quot;${descriptor.dir}&quot;
+        basejarname=&quot;TheEJBJar&quot;&gt;
+  &lt;weblogic destdir=&quot;${deploymentjars.dir}&quot;
+            classpath=&quot;${descriptorbuild.classpath}&quot;/&gt;
+  &lt;include name=&quot;**/ejb-jar.xml&quot;/&gt;
+  &lt;exclude name=&quot;**/weblogic*.xml&quot;/&gt;
+&lt;/ejbjar&gt;</pre>
+
+<p>This example shows <code>ejbjar</code> being used to generate deployment jars for a
+TOPLink-enabled entity bean using a WebLogic EJB container. This example does not require the
+deployment descriptors to use the naming standard.  This will create only one TOPLink-enabled EJB
+jar file&mdash;<samp>Address.jar</samp>.</p>
 
 <pre>
-    &lt;ejbjar srcdir=&quot;${build.dir}&quot;
-            destdir=&quot;${solant.ejb.dir}&quot;
-            descriptordir=&quot;${descriptor.dir}&quot;
-            basejarname=&quot;Address&quot;&gt;
-            &lt;weblogictoplink destdir=&quot;${solant.ejb.dir}&quot;
-                    classpath=&quot;${java.class.path}&quot;
-                    keepgeneric=&quot;false&quot;
-                    toplinkdescriptor=&quot;Address.xml&quot;
-                    toplinkdtd=&quot;file:///dtdfiles/toplink-cmp_2_5_1.dtd&quot;
-                    suffix=&quot;.jar&quot;/&gt;
-            &lt;include name=&quot;**/ejb-jar.xml&quot;/&gt;
-            &lt;exclude name=&quot;**/weblogic-ejb-jar.xml&quot;/&gt;
-    &lt;/ejbjar&gt;
-</pre>
+&lt;ejbjar srcdir=&quot;${build.dir}&quot;
+        destdir=&quot;${solant.ejb.dir}&quot;
+        descriptordir=&quot;${descriptor.dir}&quot;
+        basejarname=&quot;Address&quot;&gt;
+        &lt;weblogictoplink destdir=&quot;${solant.ejb.dir}&quot;
+                classpath=&quot;${java.class.path}&quot;
+                keepgeneric=&quot;false&quot;
+                toplinkdescriptor=&quot;Address.xml&quot;
+                toplinkdtd=&quot;file:///dtdfiles/toplink-cmp_2_5_1.dtd&quot;
+                suffix=&quot;.jar&quot;/&gt;
+        &lt;include name=&quot;**/ejb-jar.xml&quot;/&gt;
+        &lt;exclude name=&quot;**/weblogic-ejb-jar.xml&quot;/&gt;
+&lt;/ejbjar&gt;</pre>
 
-<p>This final example shows how you would set-up ejbjar under Weblogic 6.0. It also shows the use of the
-<code>&lt;support&gt;</code> element to add support files</p>
+<p>This final example shows how you would set-up <code>ejbjar</code> under WebLogic 6.0. It also
+shows the use of the <code>&lt;support&gt;</code> element to add support files</p>
 
 <pre>
-    &lt;ejbjar descriptordir=&quot;${dd.dir}&quot; srcdir=&quot;${build.classes.server}&quot;&gt;
-       &lt;include name=&quot;**/*-ejb-jar.xml&quot;/&gt;
-       &lt;exclude name=&quot;**/*-weblogic-ejb-jar.xml&quot;/&gt;
-       &lt;support dir=&quot;${build.classes.server}&quot;&gt;
-            &lt;include name=&quot;**/*.class&quot;/&gt;
-       &lt;/support&gt;
-       &lt;weblogic destdir=&quot;${deployment.dir}&quot;
-                 keepgeneric=&quot;true&quot;
-                 suffix=&quot;.jar&quot;
-                 rebuild=&quot;false&quot;&gt;
-         &lt;classpath&gt;
-            &lt;pathelement path=&quot;${build.classes.server}&quot;/&gt;
-         &lt;/classpath&gt;
-         &lt;wlclasspath&gt;
-            &lt;pathelement path=&quot;${weblogic.classes}&quot;/&gt;
-         &lt;/wlclasspath&gt;
-       &lt;/weblogic&gt;
-    &lt;/ejbjar&gt;
-</pre>
+&lt;ejbjar descriptordir=&quot;${dd.dir}&quot; srcdir=&quot;${build.classes.server}&quot;&gt;
+   &lt;include name=&quot;**/*-ejb-jar.xml&quot;/&gt;
+   &lt;exclude name=&quot;**/*-weblogic-ejb-jar.xml&quot;/&gt;
+   &lt;support dir=&quot;${build.classes.server}&quot;&gt;
+        &lt;include name=&quot;**/*.class&quot;/&gt;
+   &lt;/support&gt;
+   &lt;weblogic destdir=&quot;${deployment.dir}&quot;
+             keepgeneric=&quot;true&quot;
+             suffix=&quot;.jar&quot;
+             rebuild=&quot;false&quot;&gt;
+     &lt;classpath&gt;
+        &lt;pathelement path=&quot;${build.classes.server}&quot;/&gt;
+     &lt;/classpath&gt;
+     &lt;wlclasspath&gt;
+        &lt;pathelement path=&quot;${weblogic.classes}&quot;/&gt;
+     &lt;/wlclasspath&gt;
+   &lt;/weblogic&gt;
+&lt;/ejbjar&gt;</pre>
 
+<h3 id="ejbjar_websphere">WebSphere element</h3>
 
-<h3><a name="ejbjar_websphere">WebSphere element</a></h3>
-
-<p>The websphere element searches for the websphere specific deployment descriptors and
-adds them to the final ejb jar file. Websphere has two specific descriptors for session
-beans:
+<p>The <code>websphere</code> element searches for the WebSphere specific deployment descriptors and
+adds them to the final EJB jar file. WebSphere has two specific descriptors for session beans:</p>
 <ul>
-   <li>ibm-ejb-jar-bnd.xmi</li>
-   <li>ibm-ejb-jar-ext.xmi</li>
+  <li><samp>ibm-ejb-jar-bnd.xmi</samp></li>
+  <li><samp>ibm-ejb-jar-ext.xmi</samp></li>
 </ul>
-and another two for container managed entity beans:
+<p>and another two for container managed entity beans:</p>
 <ul>
-   <li>Map.mapxmi</li>
-   <li>Schema.dbxmi</li>
+  <li><samp>Map.mapxmi</samp></li>
+  <li><samp>Schema.dbxmi</samp></li>
 </ul>
-In terms of WebSphere, the generation of container code and stubs is called <code>deployment</code>.
-This step can be performed by the websphere element as part of the jar generation process. If the
-switch <code>ejbdeploy</code> is on, the ejbdeploy tool from the websphere toolset is called for
-every ejb-jar. Unfortunately, this step only works, if you use the ibm jdk. Otherwise, the rmic
-(called by ejbdeploy) throws a ClassFormatError. Be sure to switch ejbdeploy off, if run ant with
-Oracle JDK or OpenJDK.
-</p>
+<p>In terms of WebSphere, the generation of container code and stubs is called <em>deployment</em>.
+This step can be performed by the <code>websphere</code> element as part of the jar generation
+process. If the switch <var>ejbdeploy</var> is on, the <kbd>ejbdeploy</kbd> tool from the
+WebSphere toolset is called for every EJB jar. Unfortunately, this step only works, if you use the
+IBM JDK. Otherwise, the <kbd>rmic</kbd> (called by <kbd>ejbdeploy</kbd>) throws
+a <code>ClassFormatError</code>. Be sure to switch <var>ejbdeploy</var> off, if Ant runs with Oracle
+JDK or OpenJDK.</p>
 
-<p>
-For the websphere element to work, you have to provide a complete classpath, that contains all
-classes, that are required to reflect the bean classes. For ejbdeploy to work, you must also provide
-the classpath of the ejbdeploy tool and set the <i>websphere.home</i> property (look at the examples below).
-</p>
+<p>For the <code>websphere</code> element to work, you have to provide a complete classpath, that
+contains all classes, that are required to reflect the bean classes. For <kbd>ejbdeploy</kbd> to
+work, you must also provide the classpath of the <kbd>ejbdeploy</kbd> tool and set
+the <code>websphere.home</code> property (look at the examples below).</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">destdir</td>
-    <td valign="top">The base directory into which the generated weblogic ready
-                     jar files are deposited. Jar files are deposited in
-                     directories corresponding to their location within the
-                     descriptordir namespace. </td>
-    <td valign="top" align="center">Yes</td>
+    <td>destdir</td>
+    <td>The base directory into which the generated WebSphere ready jar files are deposited. Jar
+      files are deposited in directories corresponding to their location within
+      the <var>descriptordir</var> namespace.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">ejbdeploy</td>
-    <td valign="top">Decides whether ejbdeploy is called. When you set this to true,
-                     be sure, to run ant with the ibm jdk.</td>
-    <td valign="top" align="center">No, defaults to true</td>
+    <td>ejbdeploy</td>
+      <td>Decides whether <kbd>ejbdeploy</kbd> is called. When you set this to <q>true</q>, be sure
+        to run Ant with the IBM JDK.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">suffix</td>
-    <td valign="top">String value appended to the basename of the deployment
-                     descriptor to create the filename of the WebLogic EJB
-                     jar file.</td>
-    <td valign="top" align="center">No, defaults to '.jar'.</td>
+    <td>suffix</td>
+    <td>String value appended to the basename of the deployment descriptor to create the filename of
+      the WebSphere EJB jar file.</td>
+    <td>No; defaults to <q>.jar</q></td>
   </tr>
   <tr>
-    <td valign="top">keepgeneric</td>
-    <td valign="top">This controls whether the generic file used as input to
-                     ejbdeploy is retained.</td>
-    <td valign="top" align="center">No, defaults to false</td>
+    <td>keepgeneric</td>
+    <td>This controls whether the generic file used as input to <kbd>ejbdeploy</kbd> is
+      retained.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">rebuild</td>
-    <td valign="top">This controls whether ejbdeploy is called although no changes
-                     have occurred.</td>
-    <td valign="top" align="center">No, defaults to false</td>
+    <td>rebuild</td>
+    <td>This controls whether <kbd>ejbdeploy</kbd> is called although no changes have occurred.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">tempdir</td>
-    <td valign="top">A directory, where ejbdeploy will write temporary files</td>
-    <td valign="top" align="center">No, defaults to '_ejbdeploy_temp'.</td>
+    <td>tempdir</td>
+    <td>A directory, where <kbd>ejbdeploy</kbd> will write temporary files</td>
+    <td>No; defaults to <q>_ejbdeploy_temp</q></td>
   </tr>
   <tr>
-    <td valign="top">dbName<br>dbSchema</td>
-    <td valign="top">These options are passed to ejbdeploy.</td>
-    <td valign="top" align="center">No</td>
+    <td>dbName<br/>dbSchema</td>
+    <td>These options are passed to <kbd>ejbdeploy</kbd>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">dbVendor</td>
-    <td valign="top">This option is passed to ejbdeploy. 
-                   <p>
-                   Valid options can be obtained by running the following command:
-                   <code>
-                   &lt;WAS_HOME&gt;/bin/EJBDeploy.[sh/bat] -help
-                   </code>
-                   </p>
-                    This is also used to determine the name of the Map.mapxmi and
-                     Schema.dbxmi files, for example Account-DB2UDBWIN_V71-Map.mapxmi
-                     and Account-DB2UDBWIN_V71-Schema.dbxmi.
-                     </td>
-    <td valign="top" align="center">No</td>
+    <td>dbVendor</td>
+    <td>This option is passed to <kbd>ejbdeploy</kbd>.  Valid options can be obtained by running the
+      following command: <pre>&lt;WAS_HOME&gt;/bin/EJBDeploy.[sh/bat] -help</pre> This is also used
+      to determine the name of the <code>Map.mapxmi</code> and <code>Schema.dbxmi</code> files, for
+      example <samp>Account-DB2UDBWIN_V71-Map.mapxmi</samp>
+      and <samp>Account-DB2UDBWIN_V71-Schema.dbxmi</samp>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">codegen<br>quiet<br>novalidate<br>noinform<br>trace<br>
-                     use35MappingRules</td>
-    <td valign="top">These options are all passed to ejbdeploy. All options
-                     except 'quiet' default to false.</td>
-    <td valign="top" align="center">No</td>
+    <td>codegen<br/>quiet<br/>novalidate<br/>noinform<br/>trace<br/>use35MappingRules</td>
+    <td>These options are all passed to <kbd>ejbdeploy</kbd>.</td>
+    <td>No; default is <q>false</q> (except for <var>quiet</var>)</td>
   </tr>
   <tr>
-    <td valign="top">rmicOptions</td>
-    <td valign="top">This option is passed to ejbdeploy and will be passed
-                     on to rmic.</td>
-    <td valign="top" align="center">No</td>
+    <td>rmicOptions</td>
+      <td>This option is passed to <kbd>ejbdeploy</kbd> and will be passed on
+        to <kbd>rmic</kbd>.</td>
+    <td>No</td>
   </tr>
 </table>
 
-<p>This example shows ejbjar being used to generate deployment jars for all deployment descriptors
-in the descriptor dir:</p>
+<p>This example shows <code>ejbjar</code> being used to generate deployment jars for all deployment
+descriptors in the <var>descriptordir</var>:</p>
 
 <pre>
-    &lt;property name=&quot;websphere.home&quot; value=&quot;${was4.home}&quot;/&gt;
-    &lt;ejbjar srcdir="${build.class}" descriptordir="etc/ejb"&gt;
-      &lt;include name="*-ejb-jar.xml"/&gt;
-      &lt;websphere dbvendor="DB2UDBOS390_V6"
-                 ejbdeploy="true"
-                 oldCMP="false"
-                 tempdir="/tmp"
-                 destdir="${dist.server}"&gt;
-        &lt;wasclasspath&gt;
-          &lt;pathelement location="${was4.home}/deploytool/itp/plugins/org.eclipse.core.boot/boot.jar"/&gt;
-          &lt;pathelement location="${was4.home}/deploytool/itp/plugins/com.ibm.etools.ejbdeploy/runtime/batch.jar"/&gt;
-          &lt;pathelement location="${was4.home}/lib/xerces.jar"/&gt;
-          &lt;pathelement location="${was4.home}/lib/ivjejb35.jar"/&gt;
-          &lt;pathelement location="${was4.home}/lib/j2ee.jar"/&gt;
-          &lt;pathelement location="${was4.home}/lib/vaprt.jar"/&gt;
-        &lt;/wasclasspath&gt;
-        &lt;classpath&gt;
-          &lt;path refid="build.classpath"/&gt;
-        &lt;/classpath&gt;
-      &lt;/websphere&gt;
-      &lt;dtd publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN"
-           location="${lib}/dtd/ejb-jar_1_1.dtd"/&gt;
-    &lt;/ejbjar&gt;
-</pre>
-
-<h3><a name="ejbjar_iplanet">iPlanet Application Server (iAS) element</a></h3>
-
-The &lt;iplanet&lt; nested element is used to build iAS-specific stubs and
-
-skeletons and construct a JAR file which may be deployed to the iPlanet
-Application Server 6.0.  The build process will always determine if
-the EJB stubs/skeletons and the EJB-JAR file are up to date, and it will
-do the minimum amount of work required.
-<p>Like the WebLogic element, a naming convention for the EJB descriptors
-is most commonly used to specify the name for the completed JAR file.
-For example, if the EJB descriptor ejb/Account-ejb-jar.xml is found in
-the descriptor directory, the iplanet element will search for an iAS-specific
-EJB descriptor file named ejb/Account-ias-ejb-jar.xml (if it isn't found,
-the task will fail) and a JAR file named ejb/Account.jar will be written
-in the destination directory.  Note that when the EJB descriptors
-are added to the JAR file, they are automatically renamed META-INF/ejb-jar.xml
-and META-INF/ias-ejb-jar.xml.</p>
-<p>Of course, this naming behaviour can be modified by specifying attributes
-in the ejbjar task (for example, basejarname, basenameterminator, and flatdestdir)
-as well as the iplanet element (for example, suffix).  Refer to the
-appropriate documentation for more details.</p>
-<h3>
-Parameters:</h3>
-
-<table border="1" cellpadding="2" cellspacing="0">
-<tr>
-<td valign="top"><b>Attribute</b></td>
-
-<td valign="top"><b>Description</b></td>
-
-<td align="center" valign="top"><b>Required</b></td>
-</tr>
-
-<tr>
-<td valign="top">destdir</td>
-
-<td valign="top">The base directory into which the generated JAR files will
-be written. Each JAR file is written in directories which correspond to
-their location within the "descriptordir" namespace.</td>
-
-<td align="center" valign="top">Yes</td>
-</tr>
-
-<tr>
-<td valign="top">classpath</td>
-
-<td valign="top">The classpath used when generating EJB stubs and skeletons.
-If omitted, the classpath specified in the "ejbjar" parent task will be
-used.  If specified, the classpath elements will be prepended to the
-classpath specified in the parent "ejbjar" task. Note that nested "classpath"
-elements may also be used.</td>
-
-<td align="center" valign="top">No</td>
-</tr>
-
-<tr>
-<td valign="top">keepgenerated</td>
-
-<td valign="top">Indicates whether or not the Java source files which are
-generated by ejbc will be saved or automatically deleted. If "yes", the
-source files will be retained.  If omitted, it defaults to "no". </td>
-
-<td align="center" valign="top">No</td>
-</tr>
-
-<tr>
-<td valign="top">debug</td>
-
-<td>Indicates whether or not the ejbc utility should log additional debugging
-statements to the standard output. If "yes", the additional debugging statements
-will be generated.  If omitted, it defaults to "no". </td>
-
-<td align="center" valign="top">No</td>
-</tr>
-
-<tr>
-<td valign="top">iashome</td>
-
-<td>May be used to specify the "home" directory for this iAS installation.
-This is used to find the ejbc utility if it isn't included in the user's
-system path.  If specified, it should refer to the [install-location]/iplanet/ias6/ias
-directory.  If omitted, the ejbc utility must be on the user's system
-path. </td>
-
-<td align="center" valign="top">No</td>
-</tr>
-
-<tr>
-<td valign="top">suffix</td>
-
-<td>String value appended to the JAR filename when creating each JAR.
-If omitted, it defaults to ".jar". </td>
-
-<td align="center" valign="top">No</td>
-</tr>
+&lt;property name=&quot;websphere.home&quot; value=&quot;${was4.home}&quot;/&gt;
+&lt;ejbjar srcdir="${build.class}" descriptordir="etc/ejb"&gt;
+  &lt;include name="*-ejb-jar.xml"/&gt;
+  &lt;websphere dbvendor="DB2UDBOS390_V6"
+             ejbdeploy="true"
+             oldCMP="false"
+             tempdir="/tmp"
+             destdir="${dist.server}"&gt;
+    &lt;wasclasspath&gt;
+      &lt;pathelement location="${was4.home}/deploytool/itp/plugins/org.eclipse.core.boot/boot.jar"/&gt;
+      &lt;pathelement location="${was4.home}/deploytool/itp/plugins/com.ibm.etools.ejbdeploy/runtime/batch.jar"/&gt;
+      &lt;pathelement location="${was4.home}/lib/xerces.jar"/&gt;
+      &lt;pathelement location="${was4.home}/lib/ivjejb35.jar"/&gt;
+      &lt;pathelement location="${was4.home}/lib/j2ee.jar"/&gt;
+      &lt;pathelement location="${was4.home}/lib/vaprt.jar"/&gt;
+    &lt;/wasclasspath&gt;
+    &lt;classpath&gt;
+      &lt;path refid="build.classpath"/&gt;
+    &lt;/classpath&gt;
+  &lt;/websphere&gt;
+  &lt;dtd publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN"
+       location="${lib}/dtd/ejb-jar_1_1.dtd"/&gt;
+&lt;/ejbjar&gt;</pre>
+
+<h3 id="ejbjar_iplanet">iPlanet Application Server (iAS) element</h3>
+
+<p>The <code>&lt;iplanet&gt;</code> nested element is used to build iAS-specific stubs and skeletons
+and construct a JAR file which may be deployed to the iPlanet Application Server 6.0.  The build
+process will always determine if the EJB stubs/skeletons and the EJB jar file are up to date, and it
+will do the minimum amount of work required.</p>
+<p>Like the <code>weblogic</code> element, a naming convention for the EJB descriptors is most
+commonly used to specify the name for the completed JAR file.  For example, if the EJB
+descriptor <samp>ejb/Account-ejb-jar.xml</samp> is found in the descriptor directory,
+the <code>iplanet</code> element will search for an iAS-specific EJB descriptor file
+named <samp>ejb/Account-ias-ejb-jar.xml</samp> (if it isn't found, the task will fail) and a JAR
+file named <samp>ejb/Account.jar</samp> will be written in the destination directory.  Note that
+when the EJB descriptors are added to the JAR file, they are automatically
+renamed <samp>META-INF/ejb-jar.xml</samp> and <samp>META-INF/ias-ejb-jar.xml</samp>.</p>
+<p>Of course, this naming behaviour can be modified by specifying attributes in
+the <code>ejbjar</code> task (for example, <var>basejarname</var>, <var>basenameterminator</var>,
+and <var>flatdestdir</var>) as well as the <code>iplanet</code> element (for
+example, <var>suffix</var>).  Refer to the appropriate documentation for more details.</p>
+
+<h3>Parameters</h3>
+
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+
+  <tr>
+    <td>destdir</td>
+    <td>The base directory into which the generated JAR files will be written. Each JAR file is
+      written in directories which correspond to their location within the <var>descriptordir</var>
+      namespace.</td>
+    <td>Yes</td>
+  </tr>
+
+  <tr>
+    <td>classpath</td>
+    <td>The classpath used when generating EJB stubs and skeletons.  If
+      specified, <var>classpath</var> will be prepended to the classpath specified in the
+      parent <code>ejbjar</code> task. Note that nested <code>classpath</code> elements may also be
+      used.</td>
+    <td>No; defaults to the classpath specified in the <code>ejbjar</code> parent task</td>
+  </tr>
+
+  <tr>
+    <td>keepgenerated</td>
+    <td>Indicates whether or not the Java source files which are generated by <kbd>ejbc</kbd> will
+      be saved or automatically deleted. If <q>yes</q>, the source files will be retained.</td>
+    <td>No; defaults to <q>no</q></td>
+  </tr>
+
+  <tr>
+    <td>debug</td>
+    <td>Indicates whether or not the <kbd>ejbc</kbd> utility should log additional debugging
+      statements to the standard output. If <q>yes</q>, the additional debugging statements will be
+      generated.</td>
+    <td>No; defaults to <q>no</q></td>
+  </tr>
+
+  <tr>
+    <td>iashome</td>
+    <td>May be used to specify the "home" directory for this iAS installation.  This is used to find
+      the <kbd>ejbc</kbd> utility if it isn't included in the user's system path.  If specified, it
+      should refer to the <samp>[install-location]/iplanet/ias6/ias</samp> directory.</td>
+    <td>No; by default, the <kbd>ejbc</kbd> utility must be on the user's system path.</td>
+  </tr>
+
+  <tr>
+    <td>suffix</td>
+    <td>String value appended to the JAR filename when creating each JAR.</td>
+    <td>No; defaults to <q>.jar</q></td>
+  </tr>
 </table>
 
-<p>As noted above, the iplanet element supports additional <code>&lt;classpath&gt;</code>
-nested elements.</p>
-<h3>
-Examples</h3>
-This example demonstrates the typical use of the <code>&lt;iplanet&gt;</code> nested element.
-It will name each EJB-JAR using the "basename" prepended to each standard
-EJB descriptor.  For example, if the descriptor named "Account-ejb-jar.xml"
-is processed, the EJB-JAR will be named "Account.jar"
+<p>As noted above, the <code>iplanet</code> element supports
+additional <code>&lt;classpath&gt;</code> nested elements.</p>
+<h3>Examples</h3>
+<p>This example demonstrates the typical use of the <code>&lt;iplanet&gt;</code> nested element.  It
+will name each EJB jar using the "basename" prepended to each standard EJB descriptor.  For example,
+if the descriptor named <samp>Account-ejb-jar.xml</samp> is processed, the EJB-JAR will be
+named <samp>Account.jar</samp></p>
 <pre>
-    &lt;ejbjar srcdir="${build.classesdir}"
-            descriptordir="${src}"&gt;
+&lt;ejbjar srcdir="${build.classesdir}"
+        descriptordir="${src}"&gt;
 
-            &lt;iplanet destdir="${assemble.ejbjar}"
-                     classpath="${ias.ejbc.cpath}"/&gt;
-            &lt;include name="**/*-ejb-jar.xml"/&gt;
-            &lt;exclude name="**/*ias-*.xml"/&gt;
-    &lt;/ejbjar&gt;</pre>
+    &lt;iplanet destdir="${assemble.ejbjar}"
+             classpath="${ias.ejbc.cpath}"/&gt;
+    &lt;include name="**/*-ejb-jar.xml"/&gt;
+    &lt;exclude name="**/*ias-*.xml"/&gt;
+&lt;/ejbjar&gt;</pre>
 
-This example demonstrates the use of a nested classpath element as well
-as some of the other optional attributes.
+<p>This example demonstrates the use of a nested <code>classpath</code> element as well as some of
+the other optional attributes.</p>
 <pre>
-    &lt;ejbjar srcdir="${build.classesdir}"
-            descriptordir="${src}"&gt;
+&lt;ejbjar srcdir="${build.classesdir}"
+        descriptordir="${src}"&gt;
+
+    &lt;iplanet destdir="${assemble.ejbjar}"
+             iashome="${ias.home}"
+             debug="yes"
+             keepgenerated="yes"&gt;
+        &lt;classpath&gt;
+            &lt;pathelement path="."/&gt;
+            &lt;pathelement path="${build.classpath}"/&gt;
+        &lt;/classpath&gt;
+    &lt;/iplanet&gt;
+    &lt;include name="**/*-ejb-jar.xml"/&gt;
+    &lt;exclude name="**/*ias-*.xml"/&gt;
+&lt;/ejbjar&gt;</pre>
+
+<p>This example demonstrates the use of <var>basejarname</var> attribute.  In this case, the
+completed EJB jar will be named <samp>HelloWorld.jar</samp>.  If multiple EJB descriptors might be
+found, care must be taken to ensure that the completed JAR files don't overwrite each other.</p>
 
-            &lt;iplanet destdir="${assemble.ejbjar}"
-                     iashome="${ias.home}"
-                     debug="yes"
-                     keepgenerated="yes"&gt;
-                     &lt;classpath&gt;
-                         &lt;pathelement path="."/&gt;
-                         &lt;pathelement path="${build.classpath}"/&gt;
-                     &lt;/classpath&gt;
-            &lt;/iplanet&gt;
-            &lt;include name="**/*-ejb-jar.xml"/&gt;
-            &lt;exclude name="**/*ias-*.xml"/&gt;
-    &lt;/ejbjar&gt;</pre>
-
-This example demonstrates the use of basejarname attribute.  In this
-case, the completed EJB-JAR will be named "HelloWorld.jar"  If multiple
-EJB descriptors might be found, care must be taken to ensure that the completed
-JAR files don't overwrite each other.
 <pre>
-    &lt;ejbjar srcdir="${build.classesdir}"
-            descriptordir="${src}"
-            basejarname="HelloWorld"&gt;
-
-            &lt;iplanet destdir="${assemble.ejbjar}"
-                     classpath="${ias.ejbc.cpath}"/&gt;
-            &lt;include name="**/*-ejb-jar.xml"/&gt;
-            &lt;exclude name="**/*ias-*.xml"/&gt;
-    &lt;/ejbjar&gt;</pre>
-This example demonstrates the use of the dtd nested element. If the local
-copies of the DTDs are included in the classpath, they will be automatically
-referenced without the nested elements.  In iAS 6.0 SP2, these local DTDs are
-found in the [iAS-install-directory]/APPS directory.  In iAS 6.0 SP3, these
-local DTDs are found in the [iAS-install-directory]/dtd directory.
+&lt;ejbjar srcdir="${build.classesdir}"
+        descriptordir="${src}"
+        basejarname="HelloWorld"&gt;
+
+    &lt;iplanet destdir="${assemble.ejbjar}"
+             classpath="${ias.ejbc.cpath}"/&gt;
+    &lt;include name="**/*-ejb-jar.xml"/&gt;
+    &lt;exclude name="**/*ias-*.xml"/&gt;
+&lt;/ejbjar&gt;</pre>
+
+<p>This example demonstrates the use of the <code>dtd</code> nested element. If the local copies of
+the DTDs are included in the classpath, they will be automatically referenced without the nested
+elements.  In iAS 6.0 SP2, these local DTDs are found in
+the <samp>[iAS-install-directory]/APPS</samp> directory.  In iAS 6.0 SP3, these local DTDs are found
+in the <samp>[iAS-install-directory]/dtd</samp> directory.</p>
+
 <pre>
-    &lt;ejbjar srcdir="${build.classesdir}"
-            descriptordir="${src}"&gt;
-            &lt;iplanet destdir="${assemble.ejbjar}"&gt;
-                     classpath="${ias.ejbc.cpath}"/&gt;
-            &lt;include name="**/*-ejb-jar.xml"/&gt;
-            &lt;exclude name="**/*ias-*.xml"/&gt;
-
-            &lt;dtd publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN"
-                 location="${ias.home}/APPS/ejb-jar_1_1.dtd"/&gt;
-            &lt;dtd publicId="-//Sun Microsystems, Inc.//DTD iAS Enterprise JavaBeans 1.0//EN"
-                 location="${ias.home}/APPS/IASEjb_jar_1_0.dtd"/&gt;
-    &lt;/ejbjar&gt;</pre>
-
-<h3><a name="ejbjar_jonas">JOnAS (Java Open Application Server) element</a></h3>
-
-<p>The <code>&lt;jonas&gt;</code> nested element is used to build JOnAS-specific stubs and
-skeletons thanks to the <code>GenIC</code> specific tool, and construct a JAR
-file which may be deployed to the JOnAS Application Server. The build process
-will always determine if the EJB stubs/skeletons and the EJB-JAR file are up to
-date, and it will do the minimum amount of work required.</p>
-
-<p>Like the WebLogic element, a naming convention for the EJB descriptors is
-most commonly used to specify the name for the completed JAR file. For example,
-if the EJB descriptor <code>ejb/Account-ejb-jar.xml</code> is found in the
-descriptor directory, the <code>&lt;jonas&gt;</code> element will search for a JOnAS-specific
-EJB descriptor file named <code>ejb/Account-jonas-ejb-jar.xml</code> and a JAR
-file named <code>ejb/Account.jar</code> will be written in the destination
-directory. But the <code>&lt;jonas&gt;</code> element can also use the JOnAS naming
-convention. With the same example as below, the EJB descriptor can also be named
-<code>ejb/Account.xml</code> (no base name terminator here) in the descriptor
-directory. Then the <code>&lt;jonas&gt;</code> element will search for a JOnAS-specific EJB
-descriptor file called <code>ejb/jonas-Account.xml</code>. This convention do
-not follow strictly the ejb-jar naming convention recommendation but is
-supported for backward compatibility with previous version of JOnAS.</p>
-
-<p>Note that when the EJB descriptors are added to the JAR file, they are
-automatically renamed <code>META-INF/ejb-jar.xml</code> and
-<code>META-INF/jonas-ejb-jar.xml</code>.</p>
+&lt;ejbjar srcdir="${build.classesdir}"
+        descriptordir="${src}"&gt;
+    &lt;iplanet destdir="${assemble.ejbjar}"&gt;
+             classpath="${ias.ejbc.cpath}"/&gt;
+    &lt;include name="**/*-ejb-jar.xml"/&gt;
+    &lt;exclude name="**/*ias-*.xml"/&gt;
+
+    &lt;dtd publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN"
+         location="${ias.home}/APPS/ejb-jar_1_1.dtd"/&gt;
+    &lt;dtd publicId="-//Sun Microsystems, Inc.//DTD iAS Enterprise JavaBeans 1.0//EN"
+         location="${ias.home}/APPS/IASEjb_jar_1_0.dtd"/&gt;
+&lt;/ejbjar&gt;</pre>
+
+<h3 id="ejbjar_jonas">JOnAS (Java Open Application Server) element</h3>
+
+<p>The <code>&lt;jonas&gt;</code> nested element is used to build JOnAS-specific stubs and skeletons
+thanks to the <code>GenIC</code> specific tool, and construct a JAR file which may be deployed to
+the JOnAS Application Server. The build process will always determine if the EJB stubs/skeletons and
+the EJB jar file are up to date, and it will do the minimum amount of work required.</p>
+
+<p>Like the WebLogic element, a naming convention for the EJB descriptors is most commonly used to
+specify the name for the completed JAR file. For example, if the EJB
+descriptor <samp>ejb/Account-ejb-jar.xml</samp> is found in the descriptor directory,
+the <code>&lt;jonas&gt;</code> element will search for a JOnAS-specific EJB descriptor file
+named <samp>ejb/Account-jonas-ejb-jar.xml</samp> and a JAR file named <samp>ejb/Account.jar</samp>
+will be written in the destination directory. But the <code>&lt;jonas&gt;</code> element can also
+use the JOnAS naming convention. With the same example as below, the EJB descriptor can also be
+named <samp>ejb/Account.xml</samp> (no base name terminator here) in the descriptor directory. Then
+the <code>&lt;jonas&gt;</code> element will search for a JOnAS-specific EJB descriptor file
+called <samp>ejb/jonas-Account.xml</samp>. This convention do not follow strictly the EJB jar naming
+convention recommendation but is supported for backward compatibility with previous version of
+JOnAS.</p>
+
+<p>Note that when the EJB descriptors are added to the JAR file, they are automatically
+renamed <samp>META-INF/ejb-jar.xml</samp> and <samp>META-INF/jonas-ejb-jar.xml</samp>.</p>
 
 <p>Of course, this naming behavior can be modified by specifying attributes in
-the ejbjar task (for example, basejarname, basenameterminator, and flatdestdir)
-as well as the iplanet element (for example, suffix). Refer to the appropriate
-documentation for more details.</p>
+the <code>ejbjar</code> task (for example, <var>basejarname</var>, <var>basenameterminator</var>,
+and <var>flatdestdir</var>) as well as the <code>iplanet</code> element (for
+example, <var>suffix</var>). Refer to the appropriate documentation for more details.</p>
 
-<h3> Parameters:</h3>
+<h3>Parameters</h3>
 
-<table border="1" cellspacing="0" cellpadding="2">
+<table class="attr">
   <tbody>
     <tr>
-      <td valign="Top"><b>Attribute</b></td>
-      <td valign="Top"><b>Description</b></td>
-      <td align="Center" valign="Top"><b>Required</b></td>
+      <th>Attribute</th>
+      <th>Description</th>
+      <th>Required</th>
     </tr>
     <tr>
-      <td valign="Top">destdir</td>
-      <td valign="Top">The base directory into which the generated JAR files
-      will be written. Each JAR file is written in directories which correspond
-      to their location within the "<code>descriptordir</code>" namespace.</td>
-      <td align="Center" valign="Top">Yes</td>
+      <td>destdir</td>
+      <td>The base directory into which the generated JAR files will be written. Each JAR file is
+        written in directories which correspond to their location within
+        the <var>descriptordir</var> namespace.</td>
+      <td>Yes</td>
     </tr>
     <tr>
-      <td valign="Top">jonasroot</td>
-      <td valign="Top">The root directory for JOnAS.</td>
-      <td valign="Top" align="Center">Yes</td>
+      <td>jonasroot</td>
+      <td>The root directory for JOnAS.</td>
+      <td>Yes</td>
     </tr>
     <tr>
-      <td valign="Top">classpath</td>
-      <td valign="Top">The classpath used when generating EJB stubs and
-      skeletons. If omitted, the classpath specified in the "ejbjar" parent
-      task will be used. If specified, the classpath elements will be prepended
-      to the classpath specified in the parent "ejbjar" task (see also the ORB
-      attribute documentation below). Note that nested "classpath" elements may
-      also be used.</td>
-      <td valign="Top" align="Center">No</td>
+      <td>classpath</td>
+      <td>The classpath used when generating EJB stubs and skeletons. If
+        specified, <var>classpath</var> will be prepended to the classpath specified in the
+        parent <code>ejbjar</code> task (see also the ORB attribute documentation below). Note that
+        nested <code>classpath</code> elements may also be used.</td>
+      <td>No; defaults to the classpath specified in the <code>ejbjar</code> parent task</td>
     </tr>
     <tr>
-      <td valign="Top">keepgenerated</td>
-      <td valign="Top"><code>true</code> if the intermediate Java
-      source files generated by GenIC must be deleted or not. If
-      omitted, it defaults to <code>false</code>.</td>
-      <td align="Center" valign="Top">No</td>
+      <td>keepgenerated</td>
+      <td><q>true</q> if the intermediate Java source files generated by GenIC must be deleted or
+      not.</td>
+      <td>No; defaults to <q>false</q></td>
     </tr>
     <tr>
-      <td valign="Top">nocompil</td>
-      <td valign="Top"><code>true</code> if the generated source files
-      must not be compiled via the java and rmi compilers. If omitted,
-      it defaults to <code>false</code>.</td>
-      <td align="Center" valign="Top">No</td>
+      <td>nocompil</td>
+      <td><q>true</q> if the generated source files must not be compiled via the Java and RMI
+      compilers.</td>
+      <td>No; defaults to <q>false</q></td>
     </tr>
     <tr>
-      <td valign="Top">novalidation</td>
-      <td valign="Top"><code>true</code> if the XML deployment descriptors must
-      be parsed without validation. If omitted, it defaults to <code>false</code>.</td>
-      <td align="Center" valign="Top">No</td>
+      <td>novalidation</td>
+      <td><q>true</q> if the XML deployment descriptors must be parsed without validation.</td>
+      <td>No; defaults to <q>false</q></td>
     </tr>
     <tr>
-      <td valign="Top">javac</td>
-      <td valign="Top">Java compiler to use. If omitted, it defaults
-      to the value of <code>build.compiler</code> property.</td>
-      <td align="Center" valign="Top">No</td>
+      <td>javac</td>
+      <td>Java compiler to use.</td>
+      <td>No; defaults
+      to the value of <code>build.compiler</code> property</td>
     </tr>
     <tr>
-      <td valign="Top">javacopts</td>
-      <td valign="Top">Options to pass to the java compiler.</td>
-      <td align="Center" valign="Top">No</td>
+      <td>javacopts</td>
+      <td>Options to pass to the Java compiler.</td>
+      <td>No</td>
     </tr>
     <tr>
-      <td valign="Top">rmicopts</td>
-      <td valign="Top">Options to pass to the rmi compiler.</td>
-      <td align="Center" valign="Top">No</td>
+      <td>rmicopts</td>
+      <td>Options to pass to the RMI compiler.</td>
+      <td>No</td>
     </tr>
     <tr>
-      <td valign="top">secpropag</td>
-      <td valign="top"><code>true</code> if the RMI Skel. and
-      Stub. must be modified to implement the implicit propagation of
-      the security context (the transactional context is always
-      provided). If omitted, it defaults to <code>false</code>.</td>
-      <td valign="top" align="center">No</td>
+      <td>secpropag</td>
+      <td><q>true</q> if the RMI skeletons and stubs must be modified to implement the implicit
+        propagation of the security context (the transactional context is always provided).</td>
+      <td>No; defaults to <q>false</q></td>
     </tr>
     <tr>
-      <td valign="Top">verbose</td>
-      <td valign="Top">Indicates whether or not to use -verbose switch. If
-      omitted, it defaults to <code>false</code>.</td>
-      <td align="Center" valign="Top">No</td>
+      <td>verbose</td>
+      <td>Indicates whether or not to use <kbd>-verbose</kbd> switch.</td>
+      <td>No; defaults to <q>false</q></td>
     </tr>
     <tr>
-      <td valign="Top">additionalargs</td>
-      <td valign="Top">Add additional args to GenIC.</td>
-      <td align="Center" valign="Top">No</td>
+      <td>additionalargs</td>
+      <td>Add additional args to GenIC.</td>
+      <td>No</td>
     </tr>
     <tr>
-      <td valign="Top">keepgeneric</td>
-      <td valign="Top"><code>true</code> if the generic JAR file used as input
-      to GenIC must be retained. If omitted, it defaults to <code>false</code>.</td>
-      <td align="Center" valign="Top">No</td>
+      <td>keepgeneric</td>
+      <td><q>true</q> if the generic JAR file used as input to GenIC must be retained.</td>
+      <td>No; defaults to <q>false</q></td>
     </tr>
     <tr>
-      <td valign="Top">jarsuffix</td>
-      <td>String value appended to the JAR filename when creating each JAR.  If
-      omitted, it defaults to ".jar". </td>
-      <td align="Center" valign="Top">No</td>
+      <td>jarsuffix</td>
+      <td>String value appended to the JAR filename when creating each JAR.</td>
+      <td>No; defaults to <q>.jar</q></td>
     </tr>
     <tr>
-      <td valign="Top">orb</td>
-      <td>Choose your ORB : RMI, JEREMIE, DAVID. If omitted, it defaults to the
-      one present in classpath. If specified, the corresponding JOnAS JAR is
-      automatically added to the classpath.</td>
-      <td align="Center" valign="Top">No</td>
+      <td>orb</td>
+      <td>Choose your ORB: <q>RMI</q>, <q>JEREMIE</q>, <q>DAVID</q>.  If specified, the
+        corresponding JOnAS JAR is automatically added to the classpath.</td>
+      <td>No; defaults to the one present in classpath</td>
     </tr>
     <tr>
-      <td valign="Top">nogenic</td>
-      <td valign="Top">If this attribute is set to <code>true</code>,
-      JOnAS's GenIC will not be run on the EJB JAR. Use this if you
-      prefer to run GenIC at deployment time. If omitted, it defaults
-      to <code>false</code>.</td>
-      <td align="Center" valign="Top">No</td>
+      <td>nogenic</td>
+      <td>If this attribute is set to <q>true</q>, JOnAS's GenIC will not be run on the EJB jar. Use
+      this if you prefer to run GenIC at deployment time.</td>
+      <td>No; defaults to <q>false</q></td>
     </tr>
     <tr>
   </tbody>
 </table>
 
-<p>As noted above, the jonas element supports additional <code>&lt;classpath&gt;</code>
+<p>As noted above, the <code>jonas</code> element supports additional <code>&lt;classpath&gt;</code>
 nested elements.</p>
 
 <h3>Examples</h3>
 
-<p>This example shows ejbjar being used to generate deployment jars using a
-JOnAS EJB container. This example requires the naming standard to be used for
-the deployment descriptors. Using this format will create a EJB JAR file for
-each variation of &nbsp;'*-jar.xml' that is found in the deployment descriptor
-directory.&nbsp;</p>
+<p>This example shows <code>ejbjar</code> being used to generate deployment jars using a JOnAS EJB
+container. This example requires the naming standard to be used for the deployment
+descriptors. Using this format will create a EJB jar file for each variation
+of <samp>*-jar.xml</samp> that is found in the deployment descriptor directory.</p>
 
 <pre>
-      &lt;ejbjar srcdir="${build.classes}"
-              descriptordir="${descriptor.dir}"&gt;
-        &lt;jonas destdir="${deploymentjars.dir}"
-             jonasroot="${jonas.root}"
-             orb="RMI"/&gt;
-        &lt;include name="**/*.xml"/&gt;
-        &lt;exclude name="**/jonas-*.xml"/&gt;
-        &lt;support dir="${build.classes}"&gt;
-             &lt;include name="**/*.class"/&gt;
-        &lt;/support&gt;
-      &lt;/ejbjar&gt;
-</pre>
-
-<p>This example shows ejbjar being used to generate a single deployment jar
-using a JOnAS EJB container. This example does require the deployment
-descriptors to use the naming standard. This will create only one ejb jar file -
-'TheEJBJar.jar'.</p>
+&lt;ejbjar srcdir="${build.classes}"
+        descriptordir="${descriptor.dir}"&gt;
+  &lt;jonas destdir="${deploymentjars.dir}"
+       jonasroot="${jonas.root}"
+       orb="RMI"/&gt;
+  &lt;include name="**/*.xml"/&gt;
+  &lt;exclude name="**/jonas-*.xml"/&gt;
+  &lt;support dir="${build.classes}"&gt;
+       &lt;include name="**/*.class"/&gt;
+  &lt;/support&gt;
+&lt;/ejbjar&gt;</pre>
+
+<p>This example shows <code>ejbjar</code> being used to generate a single deployment jar using a
+JOnAS EJB container. This example does require the deployment descriptors to use the naming
+standard. This will create only one EJB jar file&mdash;<samp>TheEJBJar.jar</samp>.</p>
 
 <pre>
-      &lt;ejbjar srcdir="${build.classes}"
-              descriptordir="${descriptor.dir}"
-              basejarname="TheEJBJar"&gt;
-        &lt;jonas destdir="${deploymentjars.dir}"
-                  jonasroot="${jonas.root}"
-                  suffix=".jar"
-                  classpath="${descriptorbuild.classpath}"/&gt;
-        &lt;include name="**/ejb-jar.xml"/&gt;
-        &lt;exclude name="**/jonas-ejb-jar.xml"/&gt;
-      &lt;/ejbjar&gt;
-</pre>
-
+&lt;ejbjar srcdir="${build.classes}"
+        descriptordir="${descriptor.dir}"
+        basejarname="TheEJBJar"&gt;
+  &lt;jonas destdir="${deploymentjars.dir}"
+            jonasroot="${jonas.root}"
+            suffix=".jar"
+            classpath="${descriptorbuild.classpath}"/&gt;
+  &lt;include name="**/ejb-jar.xml"/&gt;
+  &lt;exclude name="**/jonas-ejb-jar.xml"/&gt;
+&lt;/ejbjar&gt;</pre>
 
-<h3><a name="ejbjar_orion">Orion element</a></h3>
+<h3 id="ejbjar_orion">Orion element</h3>
 
-<p>The orion element searches for the Orion Application Server specific deployment descriptors and adds them
-to the final ejb jar file. Orion has one deployment descriptor:
-<ul><li>orion-ejb-jar.xml</li>
+<p>The <code>orion</code> element searches for the Orion Application Server specific deployment
+descriptors and adds them to the final EJB jar file. Orion has one deployment descriptor:</p>
+<ul>
+  <li><samp>orion-ejb-jar.xml</samp></li>
 </ul>
-<br>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">destdir</td>
-    <td valign="top">The base directory into which the generated
-                     jar files are deposited. Jar files are deposited in
-                     directories corresponding to their location within the
-                     descriptordir namespace. </td>
-    <td valign="top" align="center">Yes</td>
+    <td>destdir</td>
+    <td>The base directory into which the generated jar files are deposited. Jar files are deposited
+      in directories corresponding to their location within the <var>descriptordir</var>
+      namespace.</td>
+    <td>Yes</td>
   </tr>
 </table>
 
 <h3>Example</h3>
 
 <pre>
-      &lt;ejbjar srcdir="${build.classes}"
-              descriptordir="${descriptor.dir}"
-              basejarname="TheEJBJar"
-              flatdestdir="true"
-              dependency="super"
-              genericjarsuffix=".jar"&gt;
-        &lt;include name="**/*-ejb-jar.xml"/&gt;
-        &lt;orion destdir="${deploymentjars.dir}"\&gt;
-      &lt;/ejbjar&gt;
-</pre>
+&lt;ejbjar srcdir="${build.classes}"
+        descriptordir="${descriptor.dir}"
+        basejarname="TheEJBJar"
+        flatdestdir="true"
+        dependency="super"
+        genericjarsuffix=".jar"&gt;
+  &lt;include name="**/*-ejb-jar.xml"/&gt;
+  &lt;orion destdir="${deploymentjars.dir}"\&gt;
+&lt;/ejbjar&gt;</pre>
 
 </body>
-
 </html>
diff -Nru ant-1.9.10/manual/Tasks/exec.html ant-1.10.3/manual/Tasks/exec.html
--- ant-1.9.10/manual/Tasks/exec.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/exec.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,44 +24,35 @@
 
 <body>
 
-<h2><a name="exec">Exec</a></h2>
+<h2 id="exec">Exec</h2>
 <h3>Description</h3>
-<p>Executes a system command. When the <i>os</i> attribute is specified, then
-the command is only executed when Apache Ant is run on one of the specified operating
-systems.</p>
-
-<p>Note that you cannot interact with the forked program, the only way
-to send input to it is via the input and inputstring attributes. Also note that
-since Ant 1.6, any attempt to read input in the forked program will receive an
-EOF (-1). This is a change from Ant 1.5, where such an attempt would block.</p>
-
-<p>If you want to execute an executable using a path relative to the
-  project's basedir, you may need to
-  use <code>vmlauncher="false"</code> on some operating systems - but
-  even this may fail (Solaris 8/9 has been reported as problematic).
-  The <code>resolveexecutable</code> attribute should be more
-  reliable, as would be something like
+<p>Executes a system command. When the <var>os</var> attribute is specified, then the command is
+only executed when Apache Ant is run on one of the specified operating systems.</p>
+
+<p>Note that you cannot interact with the forked program, the only way to send input to it is via
+the input and inputstring attributes. Also note that <em>since Ant 1.6</em>, any attempt to read
+input in the forked program will receive an EOF (<q>-1</q>). This is a change from Ant 1.5, where
+such an attempt would block.</p>
+
+<p>If you want to execute an executable using a path relative to the project's <var>basedir</var>,
+you may need to use <var>vmlauncher</var>=<q>false</q> on some operating systems&mdash;but even this
+may fail (Solaris 8/9 has been reported as problematic).  The <var>resolveexecutable</var> attribute
+should be more reliable, as would be something like</p>
 <pre>
-  &lt;property name="executable-full-path"
-            location="../relative/path/to/executable"/&gt;
-  &lt;exec executable="${executable-full-path}" ...
-</pre>
-</p>
+&lt;property name="executable-full-path"
+          location="../relative/path/to/executable"/&gt;
+&lt;exec executable="${executable-full-path}" ...</pre>
 
 <h4>Windows Users</h4>
 <p>The <code>&lt;exec&gt;</code> task delegates to <code>Runtime.exec</code> which in turn
-apparently calls <a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dllproc/base/createprocess.asp">
-<code>::CreateProcess</code></a>. It is the latter Win32 function that defines
-the exact semantics of the call. In particular, if you do not put a file extension
-on the executable, only ".EXE" files are looked for, not ".COM", ".CMD" or other file
-types listed in the environment variable PATHEXT. That is only used by the shell.
-</p>
-  <p>
-    Note that <em>.bat</em> files cannot in general by executed directly.
-    One normally needs to execute the command shell executable <code>cmd</code>
-    using the <code>/c</code> switch.
-  </p>
-  <blockquote>
+apparently
+calls <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/ms682425(v=vs.85).aspx"
+target="_top"><code>::CreateProcess</code></a>. It is the latter Win32 function that defines the
+exact semantics of the call. In particular, if you do not put a file extension on the executable,
+only <samp>.EXE</samp> files are looked for, not <samp>.COM</samp>, <samp>.CMD</samp> or other file
+types listed in the environment variable <code>PATHEXT</code>. That is only used by the shell.</p>
+<p>Note that <samp>.bat</samp> files cannot in general by executed directly.  One normally needs to
+execute the command shell executable <kbd>cmd</kbd> using the <kbd>/c</kbd> switch.</p>
 <pre>
 &lt;target name="help"&gt;
   &lt;exec executable="cmd"&gt;
@@ -69,365 +60,303 @@
     &lt;arg value="ant.bat"/&gt;
     &lt;arg value="-p"/&gt;
   &lt;/exec&gt;
-&lt;/target&gt;
-</pre></blockquote>
-
-<p>A common problem is not having the executable on the PATH. In case you get an error
-message <tt>Cannot run program "...":CreateProcess error=2. The system cannot find
-the path specified.</tt> have a look at your PATH variable. Just type the command directly on
-the command line and if Windows finds it, Ant should do it too. (Otherwise ask on the user mailinglist for help.) If Windows can not execute the program add the directory of the program
-to the PATH (<tt>set PATH=%PATH%;dirOfProgram</tt>) or specify the absolute path in the
-<tt>executable</tt> attribute in your buildfile.
-</p>
+&lt;/target&gt;</pre>
 
+<p>A common problem is not having the executable on the <code>PATH</code>. In case you get an error
+message <code class="output">Cannot run program "...":CreateProcess error=2. The system cannot find
+the path specified.</code> have a look at your <code>PATH</code> variable. Just type the command
+directly on the command line and if Windows finds it, Ant should do it too. (Otherwise ask on the
+user mailinglist for help.) If Windows can not execute the program, add the directory of the program
+to the <code>PATH</code> (<code>set PATH=%PATH%;dirOfProgram</code>) or specify the absolute path in
+the <var>executable</var> attribute in your buildfile.</p>
 
 <h4>Cygwin Users</h4>
-<p>The <code>&lt;exec&gt;</code> task will not understand paths such as /bin/sh
-for the executable parameter.  This is because the Java VM in which Ant is
-running is a standard Windows executable and is not aware of the Cygwin
-environment (i.e., doesn't load <code>cygwin1.dll</code>).  The only
-work-around for this is to compile a JVM under Cygwin (at your own risk).
-See for instance 
-<a href="http://hg.openjdk.java.net/jdk7/build/raw-file/tip/README-builds.html#cygwin">
-OpenJDK build instructions for cygwin</a>.
-</p>
+<p>The <code>&lt;exec&gt;</code> task will not understand paths such as <q>/bin/sh</q> for
+the <var>executable</var> parameter.  This is because JVM in which Ant is running is a standard
+Windows executable and is not aware of the Cygwin environment (i.e., doesn't
+load <samp>cygwin1.dll</samp>).  The only work-around for this is to compile a JVM under Cygwin (at
+your own risk).  See for
+instance <a href="https://cdn.rawgit.com/AdoptOpenJDK/openjdk-jdk9/dev/common/doc/building.html#cygwin"
+target="_top">OpenJDK build instructions for cygwin</a>.</p>
 
 <h4>OpenVMS Users</h4>
-<p>The command specified using <code>executable</code> and
-<code>&lt;arg&gt;</code> elements is executed exactly as specified
-inside a temporary DCL script.  This has some implications:
+<p>The command specified using <var>executable</var> and <code>&lt;arg&gt;</code> elements is
+executed exactly as specified inside a temporary DCL script.  This has some implications:</p>
 <ul>
-<li>paths have to be written in VMS style</li>
-<li>if your <code>executable</code> points to a DCL script remember to
-prefix it with an <code>@</code>-sign
-(e.g. <code>executable="@[FOO]BAR.COM"</code>), just as you would in a
-DCL script</li>
+  <li>paths have to be written in VMS style</li>
+  <li>if your <var>executable</var> points to a DCL script remember to prefix it with
+    an <q>@</q>-sign (e.g. <var>executable</var>=<q>@[FOO]BAR.COM</q>), just as you would in a DCL
+    script</li>
 </ul>
-For <code>&lt;exec&gt;</code> to work in an environment with a Java VM
-older than version 1.4.1-2 it is also <i>required</i> that the logical
-<code>JAVA$FORK_SUPPORT_CHDIR</code> is set to <code>TRUE</code> in
-the job table (see the <i>JDK Release Notes</i>).</p>
-
-<p>Please note that the Java VM provided by HP doesn't follow OpenVMS'
-conventions of exit codes.  If you run a Java VM with this task, the
-task may falsely claim that an error occurred (or silently ignore an
-error).  Don't use this task to run <code>JAVA.EXE</code>, use a
-<code>&lt;java&gt;</code> task with the <code>fork</code> attribute
-set to <code>true</code> instead as this task will follow the VM's
+<p>For <code>&lt;exec&gt;</code> to work in an environment with a JVM older than version 1.4.1-2 it
+is also <em>required</em> that the logical <code>JAVA$FORK_SUPPORT_CHDIR</code> is set
+to <code>TRUE</code> in the job table (see the <em>JDK Release Notes</em>).</p>
+
+<p>Please note that JVM provided by HP doesn't follow OpenVMS' conventions of exit codes.  If you
+run a JVM with this task, the task may falsely claim that an error occurred (or silently ignore an
+error).  Don't use this task to run <kbd>JAVA.EXE</kbd>, use a <code>&lt;java&gt;</code> task with
+the <var>fork</var> attribute set to <q>true</q> instead as this task will follow the JVM's
 interpretation of exit codes.</p>
 
 <h4>RedHat S/390 Users</h4>
-
-<p>It has been <a
-href="http://listserv.uark.edu/scripts/wa.exe?A1=ind0404&L=vmesa-l#33">reported
-on the VMESA-LISTSERV</a> that shell scripts invoked via the Ant Exec
-task must have their interpreter specified, i.e., the scripts must
-start with something like:
-
-<blockquote>
-<pre>
-#!/bin/bash
-</pre>
-</blockquote>
-
-or the task will fail as follows:
-
-<blockquote>
-<pre>
+<p>It has been <a href="https://www.mail-archive.com/linux-390@vm.marist.edu/msg22223.html"
+target="_top">reported on linux-390</a> that shell scripts invoked via the Ant Exec task must have
+their interpreter specified, i.e., the scripts must start with something like:</p>
+
+<pre>#!/bin/bash</pre>
+<p>or the task will fail as follows:</p>
+<pre class="output">
 [exec] Warning: UNIXProcess.forkAndExec native error: Exec format error
-[exec] Result: 255
-</pre>
-</blockquote>
-</p>
+[exec] Result: 255</pre>
 
-<h4><a name="background">Running Ant as a background process on
-    Unix(-like) systems</a></h4>
+<h4 id="background">Running Ant as a background process on Unix(-like) systems</h4>
 
-<p>If you run Ant as a background process (like <code>ant &</code>)
-  and use the <code>&lt;exec&gt;</code> task with <code>spawn</code>
-  set to <code>false</code>, you must provide explicit input to the
-  forked process or Ant will be suspended because it tries to read
-  from the standard input.</p>
+<p>If you run Ant as a background process (like <kbd>ant &amp;</kbd>) and use
+the <code>&lt;exec&gt;</code> task with <var>spawn</var> set to <q>false</q>, you must provide
+explicit input to the forked process or Ant will be suspended because it tries to read from the
+standard input.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">command</td>
-    <td valign="top">the command to execute with all command line
-      arguments. <b>deprecated, use executable and nested
-      <code>&lt;arg&gt;</code> elements instead</b>.</td>
-    <td align="center" rowspan="2">Exactly one of the two.</td>
+    <td>command</td>
+    <td>the command to execute with all command line arguments. <em><u>Deprecated</u>,
+      use <var>executable</var> and nested <code>&lt;arg&gt;</code> elements instead</em>.</td>
+    <td rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
-    <td valign="top">executable</td>
-    <td valign="top">the command to execute without any command line
-      arguments.</td>
+    <td>executable</td>
+    <td class="left">the command to execute without any command line arguments.</td>
   </tr>
   <tr>
-    <td valign="top">dir</td>
-    <td valign="top">the directory in which the command should be executed.</td>
-    <td align="center" valign="top">No.<br/>
-      <strong>Note:</strong> the default used when dir has not been
-      specified depends on the <code>vmlauncher</code> attribute.  If
-      <code>vmlauncher</code> is <code>true</code> the task will use
-      the current working directory, otherwise it uses the project's basedir.
-    </td>
+    <td>dir</td>
+    <td>the directory in which the command should be executed.</td>
+    <td>No; if <var>vmlauncher</var> is <q>true</q>, defaults to the current working directory,
+      otherwise the project's <var>basedir</var></td>
   </tr>
   <tr>
-    <td valign="top">os</td>
-    <td valign="top">list of Operating Systems on which the command may be
-      executed. If the current OS's name is contained in this list, the command will
-      be executed. The OS's name is determined by the Java Virtual machine and is set
-      in the &quot;os.name&quot; system property.
+    <td>os</td>
+    <td>list of Operating Systems on which the command may be executed. If the current OS's name is
+      contained in this list, the command will be executed. The OS's name is determined by JVM and
+      is set in the <code>os.name</code> system property.
       </td>
-    <td align="center" valign="top">No</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">osfamily</td>
-    <td valign="top">OS family as used in the &lt;os&gt; condition.
-    <em>since Ant 1.7</em></td>
-    <td align="center" valign="top">No</td>
+    <td>osfamily</td>
+    <td>OS family as used in the <code>&lt;os&gt;</code> condition.  <em>since Ant 1.7</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">spawn</td>
-    <td valign="top">whether or not you want the command to be spawned<br>
-    Default is false.<br>
-    If you spawn a command, its output will not be logged by ant.<br>
-    The input, output, error, and result property settings are not active when spawning a process.<br>
-    <em>since Ant 1.6</em>
+    <td>spawn</td>
+    <td>whether or not you want the command to be spawned<br/>If you spawn a command, its output
+    will not be logged by Ant.<br/>The <var>input</var>, <var>output</var>, <var>error</var>,
+    and <var>result</var> property settings are not active when spawning a process.<br/><em>since
+    Ant 1.6</em>
     </td>
-    <td align="center" valign="top">No</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">output</td>
-    <td valign="top">Name of a file to which to write the output. If the error stream
-      is not also redirected to a file or property, it will appear in this output.</td>
-    <td align="center" valign="top">No</td>
+    <td>output</td>
+    <td>Name of a file to which to write the output. If the error stream is not also redirected to a
+      file or property, it will appear in this output.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">error</td>
-    <td valign="top">The file to which the standard error of the
-    command should be redirected.  <em>since Ant 1.6</em></td>
-    <td align="center" valign="top">No</td>
+    <td>error</td>
+    <td>The file to which the standard error of the command should be redirected.  <em>since Ant
+    1.6</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">logError</td>
-    <td valign="top">This attribute is used when you wish to see error output in Ant's
-                     log and you are redirecting output to a file/property. The error
-                     output will not be included in the output file/property. If you
-                     redirect error with the &quot;error&quot; or &quot;errorProperty&quot;
-                     attributes, this will have no effect.  <em>since Ant 1.6</em></td>
-    <td align="center" valign="top">No</td>
+    <td>logError</td>
+    <td>This attribute is used when you wish to see error output in Ant's log and you are
+      redirecting output to a file/property. The error output will not be included in the output
+      file/property. If you redirect error with the <var>error</var> or <var>errorProperty</var>
+      attributes, this will have no effect.  <em>since Ant 1.6</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">append</td>
-    <td valign="top">Whether output and error files should be appended to or overwritten.
-    Defaults to false.</td>
-    <td align="center" valign="top">No</td>
+    <td>append</td>
+    <td>Whether output and error files should be appended to or overwritten.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">outputproperty</td>
-    <td valign="top">The name of a property in which the output of the
-      command should be stored. Unless the error stream is redirected to a separate
-      file or stream, this property will include the error output.</td>
-    <td align="center" valign="top">No</td>
+    <td>outputproperty</td>
+    <td>The name of a property in which the output of the command should be stored. Unless the error
+      stream is redirected to a separate file or stream, this property will include the error
+      output.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">errorproperty</td>
-    <td valign="top">The name of a property in which the standard error of the
-      command should be stored.  <em>since Ant 1.6</em></td>
-    <td align="center" valign="top">No</td>
+    <td>errorproperty</td>
+    <td>The name of a property in which the standard error of the command should be
+      stored.  <em>since Ant 1.6</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">input</td>
-    <td valign="top">A file from which the executed command's standard input
-                     is taken. This attribute is mutually exclusive with the
-                     inputstring attribute.  <em>since Ant 1.6</em></td>
-    <td align="center" valign="top">No</td>
+    <td>input</td>
+    <td>A file from which the executed command's standard input is taken. This attribute is mutually
+      exclusive with the <var>inputstring</var> attribute.  <em>since Ant 1.6</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">inputstring</td>
-    <td valign="top">A string which serves as the input stream for the
-                     executed command. This attribute is mutually exclusive with the
-                     input attribute.  <em>since Ant 1.6</em></td>
-    <td align="center" valign="top">No</td>
+    <td>inputstring</td>
+    <td>A string which serves as the input stream for the executed command. This attribute is
+      mutually exclusive with the <var>input</var> attribute.  <em>since Ant 1.6</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">resultproperty</td>
-    <td valign="top">the name of a property in which the return code of the
-      command should be stored. Only of interest if failonerror=false.</td>
-    <td align="center" valign="top">No</td>
+    <td>resultproperty</td>
+    <td>the name of a property in which the return code of the command should be stored. Only of
+      interest if <var>failonerror</var>=<q>false</q>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">timeout</td>
-    <td valign="top">Stop the command if it doesn't finish within the
-      specified time (given in milliseconds).</td>
-    <td align="center" valign="top">No</td>
+    <td>timeout</td>
+    <td>Stop the command if it doesn't finish within the specified time (given in
+      milliseconds).</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">Stop the buildprocess if the command exits with a
-      return code signaling failure. Defaults to false.</td>
-    <td align="center" valign="top">No</td>
+    <td>failonerror</td>
+    <td>Stop the build process if the command exits with a return code signaling failure.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">failifexecutionfails</td>
-    <td valign="top">Stop the build if we can't start the program.
-      Defaults to true. </td>
-    <td align="center" valign="top">No</td>
-  </tr>  <tr>
-    <td valign="top">newenvironment</td>
-    <td valign="top">Do not propagate old environment when new environment
-      variables are specified.</td>
-    <td align="center" valign="top">No, default is <i>false</i></td>
+    <td>failifexecutionfails</td>
+    <td>Stop the build if we can't start the program.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">vmlauncher</td>
-    <td valign="top">Run command using the Java VM's execution facilities
-        where available. If set to false the underlying OS's shell,
-        either directly or through the antRun scripts, will be used.
-        Under some operating systems, this gives access to facilities
-        not normally available through the VM including, under Windows,
-        being able to execute scripts, rather than their associated
-        interpreter.  If you want to specify the name of the
-        executable as a relative path to the directory given by the
-        dir attribute, it may become necessary to set vmlauncher to
-        false as well.</td>
-    <td align="center" valign="top">No, default is <i>true</i></td>
+    <td>newenvironment</td>
+    <td>Do not propagate old environment when new environment variables are specified.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">resolveexecutable</td>
-    <td valign="top">When this attribute is true, the name of the executable
-                     is resolved firstly against the project basedir and
-                     if that does not exist, against the execution
-                     directory if specified. On Unix systems, if you only
-                     want to allow execution of commands in the user's path,
-                     set this to false.  <em>since Ant 1.6</em></td>
-    <td align="center" valign="top">No, default is <i>false</i></td>
+    <td>vmlauncher</td>
+    <td>Run command using the JVM's execution facilities where available. If set to <q>false</q> the
+      underlying OS's shell, either directly or through the <kbd>antRun</kbd> scripts, will be
+      used.  Under some operating systems, this gives access to facilities not normally available
+      through JVM including, under Windows, being able to execute scripts, rather than their
+      associated interpreter.  If you want to specify the name of the executable as a relative path
+      to the directory given by the <var>dir</var> attribute, it may become necessary to
+      set <var>vmlauncher</var> to <q>false</q> as well.</td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">searchpath</td>
-    <td valign="top">When this attribute is true, then
-                     system path environment variables will
-                     be searched when resolving the location
-                     of the executable. <em>since Ant 1.6.3</em></td>
-    <td align="center" valign="top">No, default is <i>false</i></td>
+    <td>resolveexecutable</td>
+    <td>When this attribute is <q>true</q>, the name of the executable is resolved firstly against
+      the project <var>basedir</var> and if that does not exist, against the execution directory if
+      specified. On Unix systems, if you only want to allow execution of commands in the user's
+      path, set this to <q>false</q>.  <em>since Ant 1.6</em></td>
+    <td>No; default is <q>false</q></td>
+  </tr>
+  <tr>
+    <td>searchpath</td>
+    <td>When this attribute is <q>true</q>, then system path environment variables will be searched
+      when resolving the location of the executable. <em>since Ant 1.6.3</em></td>
+    <td>No; default is <q>false</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
 <pre>
 &lt;exec dir=&quot;${src}&quot; executable=&quot;cmd.exe&quot; os=&quot;Windows 2000&quot; output=&quot;dir.txt&quot;&gt;
   &lt;arg line=&quot;/c dir&quot;/&gt;
 &lt;/exec&gt;</pre>
-</blockquote>
+
 <h3>Parameters specified as nested elements</h3>
 <h4>arg</h4>
-<p>Command line arguments should be specified as nested
-<code>&lt;arg&gt;</code> elements. See <a
-href="../using.html#arg">Command line arguments</a>.</p>
-<h4><a name="env">env</a></h4>
-<p>It is possible to specify environment variables to pass to the
-system command via nested <code>&lt;env&gt;</code> elements.</p>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">key</td>
-    <td valign="top">
-      The name of the environment variable.
-      <br/>
-      <em>Note: (Since Ant 1.7)</em>
-      For windows, the name is case-insensitive.
-    </td>
-    <td align="center" valign="top">Yes</td>
+<p>Command line arguments should be specified as nested <code>&lt;arg&gt;</code>
+elements. See <a href="../using.html#arg">Command line arguments</a>.</p>
+<h4 id="env">env</h4>
+<p>It is possible to specify environment variables to pass to the system command via
+nested <code>&lt;env&gt;</code> elements.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>key</td>
+    <td>The name of the environment variable.<br/><strong>Note</strong>: <em>since Ant 1.7</em>, for
+      Windows, the name is case-insensitive.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">The literal value for the environment variable.</td>
-    <td align="center" rowspan="3">Exactly one of these.</td>
+    <td>value</td>
+    <td>The literal value for the environment variable.</td>
+    <td rowspan="3">Exactly one of these</td>
   </tr>
   <tr>
-    <td valign="top">path</td>
-    <td valign="top">The value for a PATH like environment
-      variable. You can use ; or : as path separators and Ant will
-      convert it to the platform's local conventions.</td>
+    <td>path</td>
+    <td class="left">The value for a <code>PATH</code>-like environment variable. You can
+      use <q>;</q> or <q>:</q> as path separators and Ant will convert it to the platform's local
+      conventions.</td>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">The value for the environment variable. Will be
-      replaced by the absolute filename of the file by Ant.</td>
+    <td>file</td>
+    <td class="left">The value for the environment variable. Will be replaced by the absolute
+      filename of the file by Ant.</td>
   </tr>
 </table>
-<a name="redirector"><h4>redirector</h4></a>
-<i><b>Since Ant 1.6.2</b></i>
-<p>A nested <a href="../Types/redirector.html">I/O Redirector</a>
-can be specified.  In general, the attributes of the redirector behave
-as the corresponding attributes available at the task level.  The most
-notable peculiarity stems from the retention of the &lt;exec&gt;
-attributes for backwards compatibility.  Any file mapping is done
-using a <CODE>null</CODE> sourcefile; therefore not all
-<a href="../Types/mapper.html">Mapper</a> types will return
-results.  When no results are returned, redirection specifications
-will fall back to the task level attributes.  In practice this means that
-defaults can be specified for input, output, and error output files.
-</p>
+<h4 id="redirector">redirector</h4>
+<em>Since Ant 1.6.2</em>
+<p>A nested <a href="../Types/redirector.html">I/O Redirector</a> can be specified.  In general, the
+attributes of the redirector behave as the corresponding attributes available at the task level.
+The most notable peculiarity stems from the retention of the <code>&lt;exec&gt;</code> attributes
+for backwards compatibility.  Any file mapping is done using a <code>null</code> sourcefile;
+therefore not all<a href="../Types/mapper.html">Mapper</a> types will return results.  When no
+results are returned, redirection specifications will fall back to the task level attributes.  In
+practice this means that defaults can be specified for input, output, and error output files.</p>
 <h3>Errors and return codes</h3>
-By default the return code of a <code>&lt;exec&gt;</code> is ignored; when you set
-<code>failonerror="true"</code> then any return code signaling failure
-(OS specific) causes the build to fail. Alternatively, you can set
-<code>resultproperty</code> to the name of a property and have it assigned to
-the result code (barring immutability, of course).
-<p>
-If the attempt to start the program fails with an OS dependent error code,
-then <code>&lt;exec&gt;</code> halts the build unless <code>failifexecutionfails</code>
-is set to <code>false</code>. You can use that to run a program if it exists, but
-otherwise do nothing.
-<p>
-What do those error codes mean? Well, they are OS dependent. On Windows
-boxes you have to look at
-<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/debug/base/system_error_codes__0-499_.asp">
-the documentation</a>; error code 2 means 'no such program', which usually means
-it is not on the path. Any time you see such an error from any Ant task, it is
-usually not an Ant bug, but some configuration problem on your machine.
+<p>By default the return code of a <code>&lt;exec&gt;</code> is ignored; when you
+set <var>failonerror</var> to <q>true</q> then any return code signaling failure (OS specific)
+causes the build to fail. Alternatively, you can set <var>resultproperty</var> to the name of a
+property and have it assigned to the result code (barring immutability, of course).</p>
+<p>If the attempt to start the program fails with an OS dependent error code,
+then <code>&lt;exec&gt;</code> halts the build unless <var>failifexecutionfails</var> is set
+to <q>false</q>. You can use that to run a program if it exists, but otherwise do nothing.</p>
+<p>What do those error codes mean? Well, they are OS dependent. On Windows boxes you have to look
+at <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/ms681382(v=vs.85).aspx"
+target="_top">the documentation</a>; <code>error=2</code> means 'no such program', which usually
+means it is not on the path. Any time you see such an error from any Ant task, it is usually not an
+Ant bug, but some configuration problem on your machine.</p>
 
 <h3>Examples</h3>
-<blockquote><pre>
+<pre>
 &lt;exec executable=&quot;emacs&quot;&gt;
   &lt;env key=&quot;DISPLAY&quot; value=&quot;:1.0&quot;/&gt;
 &lt;/exec&gt;
-</pre></blockquote>
+</pre>
 <p>starts <code>emacs</code> on display 1 of the X Window System.</p>
 
-<blockquote><pre>
+<pre>
 &lt;property environment=&quot;env&quot;/&gt;
 &lt;exec ... &gt;
   &lt;env key=&quot;PATH&quot; path=&quot;${env.PATH}:${basedir}/bin&quot;/&gt;
 &lt;/exec&gt;
-</pre></blockquote>
-<p>adds <code>${basedir}/bin</code> to the <code>PATH</code> of the
-system command.</p>
+</pre>
+<p>adds <samp>${basedir}/bin</samp> to the <code>PATH</code> of the system command.</p>
 
-<blockquote><pre>
+<pre>
 &lt;property name="browser" location="C:/Program Files/Internet Explorer/iexplore.exe"/&gt;
 &lt;property name="file" location="ant/docs/manual/index.html"/&gt;
 
 &lt;exec executable="${browser}" spawn="true"&gt;
     &lt;arg value="${file}"/&gt;
 &lt;/exec&gt;
-</pre></blockquote>
-<p>Starts the <i>${browser}</i> with the specified <i>${file}</i> and end the
-Ant process. The browser will remain.</p>
+</pre>
+<p>Starts the <samp>${browser}</samp> with the specified <samp>${file}</samp> and end the Ant
+process. The browser will remain.</p>
 
-<blockquote><pre>
+<pre>
 &lt;exec executable=&quot;cat&quot;&gt;
     &lt;redirector outputproperty=&quot;redirector.out&quot;
                 errorproperty=&quot;redirector.err&quot;
@@ -439,27 +368,19 @@
         &lt;errormapper type=&quot;merge&quot; to=&quot;redirector.err&quot;/&gt;
     &lt;/redirector&gt;
 &lt;/exec&gt;
-</pre></blockquote>
-
-Sends the string &quot;blah before blah&quot; to the &quot;cat&quot; executable,
-using an <a href="../Types/filterchain.html">&lt;inputfilterchain&gt;</a>
-to replace &quot;before&quot; with &quot;after&quot; on the way in.
-Output is sent to the file &quot;redirector.out&quot; and stored
-in a property of the same name.  Similarly, error output is sent to
-a file and a property, both named &quot;redirector.err&quot;.
-
-
-<p><b>Note:</b> do not try to specify arguments using
-a simple arg-element and separate them by spaces. This results in
-only a single argument containing the entire string.</p>
-<p>
-<b>Timeouts: </b> If a timeout is specified, when it is reached the
-sub process is killed and a message printed to the log. The return
-value of the execution will be "-1", which will halt the build if
-<tt>failonerror=true</tt>, but be ignored otherwise.
-
-
+</pre>
 
+<p>Sends the string <q>blah before blah</q> to the <kbd>cat</kbd> executable, using
+an <a href="../Types/filterchain.html">&lt;inputfilterchain&gt;</a> to replace <q>before</q>
+with <q>after</q> on the way in.  Output is sent to the file <samp>redirector.out</samp> and stored
+in a property of the same name.  Similarly, error output is sent to a file and a property, both
+named <samp>redirector.err</samp>.</p>
+
+<p><strong>Note</strong>: do not try to specify arguments using a simple <code>arg</code>-element
+and separate them by spaces. This results in only a single argument containing the entire
+string.</p>
+<p><strong>Timeouts</strong>: If a timeout is specified, when it is reached the sub process is
+killed and a message printed to the log. The return value of the execution will be <q>-1</q>, which
+will halt the build if <var>failonerror</var>=<q>true</q>, but be ignored otherwise.</p>
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/fail.html ant-1.10.3/manual/Tasks/fail.html
--- ant-1.9.10/manual/Tasks/fail.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/fail.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,105 +24,97 @@
 
 <body>
 
-<h2><a name="fail">Fail</a></h2>
+<h2 id="fail">Fail</h2>
 <h3>Description</h3>
-<p>Exits the current build (just throwing a BuildException), optionally printing additional information.</p>
-<p>The message of the Exception can be set via the message attribute
-or character data nested into the element.</p>
+<p>Exits the current build (just throwing a BuildException), optionally printing additional
+information.</p>
+<p>The message of the Exception can be set via the message attribute or character data nested into
+the element.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">message</td>
-    <td valign="top">A message giving further information on why the build exited</td>
-    <td align="center" valign="top">No</td>
+    <td>message</td>
+    <td>A message giving further information on why the build exited</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">if</td>
-    <td valign="top">Only fail <a href="../properties.html#if+unless">if a property of the given name exists</a>
+    <td>if</td>
+    <td>Only fail <a href="../properties.html#if+unless">if a property of the given name exists</a>
       in the current project</td>
-    <td align="center" valign="top">No</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">unless</td>
-    <td valign="top">Only fail <a href="../properties.html#if+unless">if a property of the given name doesn't
+    <td>unless</td>
+    <td>Only fail <a href="../properties.html#if+unless">if a property of the given name doesn't
       exist</a> in the current project</td>
-    <td align="center" valign="top">No</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">status</td>
-    <td valign="top">Exit using the specified status code;
-      assuming the generated Exception is not caught, the
+    <td>status</td>
+    <td>Exit using the specified status code; assuming the generated Exception is not caught, the
       JVM will exit with this status. <em>Since Apache Ant 1.6.2</em></td>
-    <td align="center" valign="top">No</td>
+    <td>No</td>
   </tr>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
 
-<p>As an alternative to the <i>if</i>/<i>unless</i> attributes,
-  conditional failure can be achieved using a single nested
-  <code>&lt;condition&gt;</code> element, which should contain exactly one
-  core or custom condition.  For information about conditions, see
-  <a href="conditions.html">here</a>.<br><b>Since Ant 1.6.2</b>
+<p>As an alternative to the <var>if</var>/<var>unless</var> attributes, conditional failure can be
+achieved using a single nested <code>&lt;condition&gt;</code> element, which should contain exactly
+one core or custom condition.  For information about conditions,
+see <a href="conditions.html">here</a>.<br/><em>Since Ant 1.6.2</em>
 </p>
 
 <h3>Examples</h3>
 
-<pre>  &lt;fail/&gt;</pre>
+<pre>&lt;fail/&gt;</pre>
 <p>will exit the current build with no further information given.</p>
-<pre>
+<pre class="output">
 BUILD FAILED
 
-build.xml:4: No message
-</pre>
+build.xml:4: No message</pre>
 
-<pre>  &lt;fail message=&quot;Something wrong here.&quot;/&gt;</pre>
-<p>will exit the current build and print something
-  like the following to wherever your output goes:
-</p>
-<pre>
+<pre>&lt;fail message=&quot;Something wrong here.&quot;/&gt;</pre>
+<p>will exit the current build and print something like the following to wherever your output
+goes:</p>
+<pre class="output">
 BUILD FAILED
 
-build.xml:4: Something wrong here.
-</pre>
+build.xml:4: Something wrong here.</pre>
 
-<pre>  &lt;fail&gt;Something wrong here.&lt;/fail&gt;</pre>
+<pre>&lt;fail&gt;Something wrong here.&lt;/fail&gt;</pre>
 <p>will give the same result as above.</p>
 
-<pre>  &lt;fail unless=&quot;thisdoesnotexist&quot;/&gt;</pre>
-<p>will exit the current build and print something
-  like the following to wherever your output goes:
-</p>
-<pre>
+<pre>&lt;fail unless=&quot;thisdoesnotexist&quot;/&gt;</pre>
+<p>will exit the current build and print something like the following to wherever your output
+goes:</p>
+<pre class="output">
 BUILD FAILED
 
-build.xml:2: unless=thisdoesnotexist
-</pre>
+build.xml:2: unless=thisdoesnotexist</pre>
 
 Using a condition to achieve the same effect:
 
 <pre>
-  &lt;fail&gt;
-     &lt;condition&gt;
-       &lt;not&gt;
-         &lt;isset property=&quot;thisdoesnotexist&quot;/&gt;
-       &lt;/not&gt;
-     &lt;/condition&gt;
-   &lt;/fail&gt;
-</pre>
+&lt;fail&gt;
+    &lt;condition&gt;
+        &lt;not&gt;
+            &lt;isset property=&quot;thisdoesnotexist&quot;/&gt;
+        &lt;/not&gt;
+    &lt;/condition&gt;
+&lt;/fail&gt;</pre>
 
 <p>Output:</p>
-<pre>
+<pre class="output">
 BUILD FAILED
 
-build.xml:2: condition satisfied
-</pre>
+build.xml:2: condition satisfied</pre>
 
 <pre>
 &lt;fail message=&quot;Files are missing.&quot;&gt;
@@ -133,11 +125,9 @@
             &lt;/resourcecount&gt;
         &lt;/not&gt;
     &lt;/condition&gt;
-&lt;/fail&gt;
-</pre>
-<p>Will check that both files <i>one.txt</i> and <i>two.txt</i> are present otherwise the build
-will fail.</p>
+&lt;/fail&gt;</pre>
+<p>Will check that both files <samp>one.txt</samp> and <samp>two.txt</samp> are present otherwise
+the build will fail.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/filter.html ant-1.10.3/manual/Tasks/filter.html
--- ant-1.9.10/manual/Tasks/filter.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/filter.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,56 +24,50 @@
 
 <body>
 
-<h2><a name="filter">Filter</a></h2>
+<h2 id="filter">Filter</h2>
 <h3>Description</h3>
-<p>Sets a token filter for this project or read multiple token filter from
-an input file and sets these as filters.
-Token filters are used by all tasks that perform file copying operations
-through the Project commodity methods. See the warning
-<a href="../using.html#filters"><em>here</em></a> before using.</p>
-<p>Note 1: the token string must not contain the separators chars (@).<br>
-Note 2: Either token and value attributes must be provided, or only the
-filtersfile attribute.</p>
+<p>Sets a token filter for this project or reads a properties file as multiple token filter
+definitions and sets them.  Token filters are used by all tasks that perform file copying operations
+through the Project commodity methods. See the
+warning <a href="../using.html#filters"><em>here</em></a> before using.</p>
+<p>The task uses <q>@</q> as token separator. Token strings cannot contain separator characters;
+incorrect tokens are ignored.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">token</td>
-    <td valign="top">the token string without @</td>
-    <td align="center" valign="top">Yes*</td>
+    <td>token</td>
+    <td>the token string without the separator chars (<q>@</q>)</td>
+    <td rowspan="3">Yes; either both <var>token</var> and <var>value</var>, or
+      only <var>filtersfile</var></td>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">the string that should be put to replace the token when the 
-      file is copied</td>
-    <td align="center" valign="top">Yes*</td>
+    <td>value</td>
+    <td class="left">the string that should be put to replace the token when the file is copied</td>
   </tr>
   <tr>
-    <td valign="top">filtersfile</td>
-    <td valign="top">The file from which the filters must be read. This file must be a formatted as a property file. </td>
-    <td align="center" valign="top">Yes*</td>
+    <td>filtersfile</td>
+    <td class="left">The file from which the filters must be read. This file must be a formatted as
+      a property file.</td>
   </tr>
 </table>
-<p>* see notes 1 and 2 above parameters table.</p>
 <h3>Examples</h3>
-<pre>  &lt;filter token=&quot;year&quot; value=&quot;2000&quot;/&gt;
-  &lt;copy todir=&quot;${dest.dir}&quot; filtering=&quot;true&quot;&gt;
-    &lt;fileset dir=&quot;${src.dir}&quot;/&gt;
-  &lt;/copy&gt;</pre> 
-<p>will copy recursively all the files from the <i>src.dir</i> directory into
-the <i>dest.dir</i> directory replacing all the occurrences of the string <i>@year@</i>
-with <i>2000.</i></p>
-<pre>  &lt;filter filtersfile=&quot;deploy_env.properties&quot;/&gt;</pre>
-will read all property entries from the <i>deploy_env.properties</i> file
-and set these as filters.
-
-
+<pre>
+&lt;filter token=&quot;year&quot; value=&quot;2000&quot;/&gt;
+&lt;copy todir=&quot;${dest.dir}&quot; filtering=&quot;true&quot;&gt;
+  &lt;fileset dir=&quot;${src.dir}&quot;/&gt;
+&lt;/copy&gt;</pre>
+<p>will copy recursively all the files from the <samp>src.dir</samp> directory into
+the <samp>dest.dir</samp> directory replacing all the occurrences of the string <code>@year@</code>
+with <q>2000</q>.</p>
+<pre>&lt;filter filtersfile=&quot;deploy_env.properties&quot;/&gt;</pre>
+<p>will read all property entries from the <samp>deploy_env.properties</samp> file and set these as
+filters.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/fixcrlf.html ant-1.10.3/manual/Tasks/fixcrlf.html
--- ant-1.9.10/manual/Tasks/fixcrlf.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/fixcrlf.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,304 +24,222 @@
 
 <body>
 
-<h2><a name="fixcrlf">FixCRLF</a></h2>
+<h2 id="fixcrlf">FixCRLF</h2>
 <h3>Description</h3>
-  <p>
-    Adjusts a text file to local conventions.
-  </p>
+  <p>Adjusts a text file to local conventions.</p>
 
-  <p>
-    The set of files to be adjusted can be refined with the
-    <i>includes</i>, <i>includesfile</i>, <i>excludes</i>,
-    <i>excludesfile</i> and <i>defaultexcludes</i>
-    attributes. Patterns provided through the <i>includes</i> or
-    <i>includesfile</i> attributes specify files to be
-    included. Patterns provided through the <i>exclude</i> or
-    <i>excludesfile</i> attribute specify files to be
-    excluded. Additionally, default exclusions can be specified with
-    the <i>defaultexcludes</i> attribute. See the section on <a
-    href="../dirtasks.html#directorybasedtasks">directory-based
-    tasks</a>, for details of file inclusion/exclusion patterns
-    and their usage.
-  </p>
+  <p>The set of files to be adjusted can be refined with
+    the <var>includes</var>, <var>includesfile</var>, <var>excludes</var>, <var>excludesfile</var>
+    and <var>defaultexcludes</var> attributes. Patterns provided through the <var>includes</var>
+    or <var>includesfile</var> attributes specify files to be included. Patterns provided through
+    the <var>exclude</var> or <var>excludesfile</var> attribute specify files to be
+    excluded. Additionally, default exclusions can be specified with the <var>defaultexcludes</var>
+    attribute. See the section on <a href="../dirtasks.html#directorybasedtasks">directory-based
+    tasks</a>, for details of file inclusion/exclusion patterns and their usage.</p>
+
+  <p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and supports most
+    attributes of <code>&lt;fileset&gt;</code> (<var>dir</var> becomes <var>srcdir</var>) as well as
+    the nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code>
+    and <code>&lt;patternset&gt;</code> elements.</p>
+
+  <p>The output file is only written if it is a new file, or if it differs from the existing file.
+    This prevents spurious rebuilds based on unchanged files which have been regenerated by this
+    task.</p>
 
-  <p>
-    This task forms an implicit
-    <a href="../Types/fileset.html">FileSet</a> and
-    supports most attributes of <code>&lt;fileset&gt;</code>
-    (<code>dir</code> becomes <code>srcdir</code>) as well as the nested
-    <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and
-    <code>&lt;patternset&gt;</code> elements.
-  </p>
-
-  <p>
-    The output file is only written if it is a new file, or if it
-    differs from the existing file.  This prevents spurious
-    rebuilds based on unchanged files which have been regenerated
-    by this task.
-  </p>
-
-  <p>
-    Since <b>Apache Ant 1.7</b>, this task can be used in a
-    <a href="../Types/filterchain.html">filterchain</a>.
-  </p>
+  <p><em>Since Apache Ant 1.7</em>, this task can be used in
+    a <a href="../Types/filterchain.html">filterchain</a>.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="center" rowspan="2"><b>Attribute</b></td>
-    <td valign="center" rowspan="2"><b>Description</b></td>
-    <td align="center" valign="top" colspan="2"><b>Required</b></td>
+    <th rowspan="2">Attribute</th>
+    <th rowspan="2">Description</th>
+    <th colspan="2">Required</th>
   </tr>
   <tr>
-    <td valign="center"><b>As Task</b></td>
-    <td valign="center"><b>As Filter</b></td>
+    <th>As Task</th>
+    <th>As Filter</th>
   </tr>
   <tr>
-    <td valign="top">srcDir</td>
-    <td valign="top">Where to find the files to be fixed up.</td>
-    <td valign="top" align="center" rowspan="2">One of these</td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>srcDir</td>
+    <td>Where to find the files to be fixed up.</td>
+    <td rowspan="2" class="center">One of these</td>
+    <td rowspan="11">N/A</td>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">Name of a single file to fix. <b>Since Ant 1.7</b></td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>file</td>
+    <td class="left">Name of a single file to fix. <em>Since Ant 1.7</em></td>
   </tr>
   <tr>
-    <td valign="top">destDir</td>
-    <td valign="top">Where to place the corrected files.  Defaults to
-      srcDir (replacing the original file).</td>
-    <td valign="top" align="center">No</td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>destDir</td>
+    <td>Where to place the corrected files.</td>
+    <td class="center">No; defaults to <var>srcDir</var> (replace the original files)</td>
   </tr>
   <tr>
-    <td valign="top">includes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      included. All files are included when omitted.</td>
-    <td valign="top" align="center">No</td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>includes</td>
+    <td>comma- or space-separated list of patterns of files that must be included.</td>
+    <td class="center">No; defaults to all (<q>**</q>)</td>
   </tr>
   <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an include pattern.</td>
-    <td valign="top" align="center">No</td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>includesfile</td>
+    <td>name of a file. Each line of this file is taken to be an include pattern.</td>
+    <td class="center">No</td>
   </tr>
   <tr>
-    <td valign="top">excludes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      excluded. No files (except default excludes) are excluded when omitted.</td>
-    <td valign="top" align="center">No</td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>excludes</td>
+    <td>comma- or space-separated list of patterns of files that must be excluded.</td>
+    <td class="center">No; defaults to default excludes or none if <var>defaultexcludes</var>
+      is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an exclude pattern.</td>
-    <td valign="top" align="center">No</td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>excludesfile</td>
+    <td>name of a file. Each line of this file is taken to be an exclude pattern.</td>
+    <td class="center">No</td>
   </tr>
   <tr>
-    <td valign="top">defaultexcludes</td>
-    <td valign="top">indicates whether default excludes should be used or not
-      (&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted.
-    </td>
-    <td valign="top" align="center">No</td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>defaultexcludes</td>
+    <td>indicates whether default excludes should be used or not (<q>yes|no</q>).</td>
+    <td class="center">No; defaults to <q>yes</q></td>
   </tr>
   <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">The encoding of the files.</td>
-    <td align="center">No; defaults to default JVM encoding.</td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>encoding</td>
+    <td>The encoding of the files.</td>
+    <td class="center">No; defaults to default JVM character encoding</td>
   </tr>
   <tr>
-    <td valign="top">outputencoding</td>
-    <td valign="top">The encoding to use when writing the files.
-                     <b>Since Ant 1.7</b></td>
-    <td align="center">No; defaults to the value of the encoding attribute.</td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>outputencoding</td>
+    <td>The encoding to use when writing the files.  <em>Since Ant 1.7</em></td>
+    <td class="center">No; defaults to <var>encoding</var> if set or default JVM character encoding
+      otherwise</td>
   </tr>
   <tr>
-    <td valign="top">preservelastmodified</td>
-    <td valign="top">Whether to preserve the last modified
-                     date of source files. <b>Since Ant 1.6.3</b></td>
-    <td align="center">No; default is <i>false</i></td>
-    <td bgcolor="#CCCCCC">&nbsp;</td>
+    <td>preservelastmodified</td>
+    <td>Whether to preserve the last modified date of source files. <em>Since Ant 1.6.3</em></td>
+    <td class="center">No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">eol</td>
-    <td valign="top">
-      Specifies how end-of-line (EOL) characters are to be
-      handled.  The EOL characters are CR, LF and the pair CRLF.
-      Valid values for this property are:
+    <td>eol</td>
+    <td>Specifies how end-of-line (EOL) characters are to be handled.  The EOL characters are CR, LF
+      and the pair CRLF.  Valid values for this property are:
       <ul>
-        <li>asis: leave EOL characters alone</li>
-        <li>cr: convert all EOLs to a single CR</li>
-        <li>lf: convert all EOLs to a single LF</li>
-        <li>crlf: convert all EOLs to the pair CRLF</li>
-        <li>mac: convert all EOLs to a single CR</li>
-        <li>unix: convert all EOLs to a single LF</li>
-        <li>dos: convert all EOLs to the pair CRLF</li>
+        <li><q>asis</q>: leave EOL characters alone</li>
+        <li><q>cr</q>: convert all EOLs to a single CR</li>
+        <li><q>lf</q>: convert all EOLs to a single LF</li>
+        <li><q>crlf</q>: convert all EOLs to the pair CRLF</li>
+        <li><q>mac</q>: convert all EOLs to a single CR</li>
+        <li><q>unix</q>: convert all EOLs to a single LF</li>
+        <li><q>dos</q>: convert all EOLs to the pair CRLF</li>
       </ul>
-      Default is based on the platform on which you are running this task.
-      For Unix platforms (including Mac OS X), the default is &quot;lf&quot;.
-      For DOS-based systems (including Windows), the default is
-      &quot;crlf&quot;.
-      For Mac environments other than OS X, the default is &quot;cr&quot;.
-      <p>
-        This is the preferred method for specifying EOL.  The
-        &quot;<i><b>cr</b></i>&quot; attribute (see below) is
-        now deprecated.
-      </p>
-      <p>
-        <i>N.B.</i>: One special case is recognized. The three
-        characters CR-CR-LF are regarded as a single EOL.
-        Unless this property is specified as &quot;asis&quot;,
-        this sequence will be converted into the specified EOL
-        type.
-      </p>
+      <p>This is the preferred method for specifying EOL.  The <var>cr</var> attribute (see below)
+      is now deprecated.</p>
+      <p><strong>Note</strong>: One special case is recognized. The three characters CR-CR-LF are
+        regarded as a single EOL.  Unless this property is specified as <q>asis</q>, this sequence
+        will be converted into the specified EOL type.</p>
     </td>
-    <td valign="top" align="center" colspan="2">No</td>
+    <td colspan="2">No; default is platform-specific: <q>lf</q> for Unix platforms (including Mac OS
+    X/macOS), <q>crlf</q> for DOS-based systems (including Windows), <q>cr</q> for Mac environments
+    other than OS X</td>
   </tr>
   <tr>
-    <td valign="top">cr</td>
-    <td valign="top">
-      <i><b>Deprecated.</b></i> Specifies how CR characters are
-      to be handled at end-of-line (EOL).  Valid values for this
-      property are:
+    <td>cr</td>
+    <td><em><u>Deprecated</u></em>. Specifies how CR characters are to be handled at end-of-line
+      (EOL).  Valid values for this property are:
       <ul>
-        <li>asis: leave EOL characters alone.</li>
-        <li>
-          add: add a CR before any single LF characters. The
-          intent is to convert all EOLs to the pair CRLF.
-        </li>
-        <li>
-          remove: remove all CRs from the file.  The intent is
-          to convert all EOLs to a single LF.
-        </li>
+        <li><q>asis</q>: leave EOL characters alone.</li>
+        <li><q>add</q>: add a CR before any single LF characters. The intent is to convert all EOLs
+          to the pair CRLF.</li>
+        <li><q>remove</q>: remove all CRs from the file.  The intent is to convert all EOLs to a
+          single LF.</li>
       </ul>
-      Default is based on the platform on which you are running
-      this task.  For Unix platforms, the default is &quot;remove&quot;.
-      For DOS based systems (including Windows), the default is
-      &quot;add&quot;.
-      <p>
-        <i>N.B.</i>: One special case is recognized. The three
-        characters CR-CR-LF are regarded as a single EOL.
-        Unless this property is specified as &quot;asis&quot;,
-        this sequence will be converted into the specified EOL
-        type.
-      </p>
+      <p><strong>Note</strong>: One special case is recognized. The three characters CR-CR-LF are
+        regarded as a single EOL.  Unless this property is specified as <q>asis</q>, this sequence
+        will be converted into the specified EOL type.</p>
     </td>
-    <td valign="top" align="center" colspan="2">No</td>
+    <td colspan="2">No; default is platform-specific: <q>remove</q> for Unix platforms, <q>add</q>
+      for DOS based systems (including Windows)</td>
   </tr>
   <tr>
-    <td valign="top">javafiles</td>
-    <td valign="top">
-      Used only in association with the
-      &quot;<i><b>tab</b></i>&quot; attribute (see below), this
-      boolean attribute indicates whether the fileset is a set
-      of java source files
-      (&quot;yes&quot;/&quot;no&quot;). Defaults to
-      &quot;no&quot;.  See notes in section on &quot;tab&quot;.
-    </td>
-    <td valign="top" align="center" colspan="2">No</td>
+    <td>javafiles</td>
+    <td>Used only in association with the <var>tab</var> attribute (see below), this boolean
+      attribute indicates whether the fileset is a set of Java source files (<q>yes|no</q>). See
+      notes in section on <var>tab</var>.</td>
+    <td colspan="2">No; defaults to <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">tab</td>
-    <td valign="top">Specifies how tab characters are to be handled.  Valid
-      values for this property are:
+    <td>tab</td>
+    <td>Specifies how tab characters are to be handled.  Valid values for this property are:
       <ul>
-      <li>add: convert sequences of spaces which span a tab stop to tabs</li>
-      <li>asis: leave tab and space characters alone</li>
-      <li>remove: convert tabs to spaces</li>
+        <li><q>add</q>: convert sequences of spaces which span a tab stop to tabs</li>
+        <li><q>asis</q>: leave tab and space characters alone</li>
+        <li><q>remove</q>: convert tabs to spaces</li>
       </ul>
-      Default for this parameter is &quot;asis&quot;.
-      <p>
-        <i>N.B.</i>: When the attribute
-        &quot;<i><b>javafiles</b></i>&quot; (see above) is
-        &quot;true&quot;, literal TAB characters occurring
-        within Java string or character constants are never
-        modified.  This functionality also requires the
-        recognition of Java-style comments.
-      </p>
-      <p>
-  	<i>N.B.</i>: There is an incompatibility between this
-  	and the previous version in the handling of white
-  	space at the end of lines.  This version does
-  	<i><b>not</b></i> remove trailing whitespace on lines.
-      </p>
+      <p><strong>Note</strong>: When the attribute <var>javafiles</var> (see above) is <q>true</q>,
+        literal TAB characters occurring within Java string or character constants are never
+        modified.  This functionality also requires the recognition of Java-style comments.</p>
+      <p><strong>Note</strong>: There is an incompatibility between this and the previous version in
+        the handling of white space at the end of lines.  This version
+        does <em><strong>not</strong></em> remove trailing whitespace on lines.</p>
     </td>
-    <td valign="top" align="center" colspan="2">No</td>
+    <td colspan="2">No; default is <q>asis</q></td>
   </tr>
   <tr>
-    <td valign="top">tablength</td>
-    <td valign="top">TAB character interval. Valid values are between
-      2 and 80 inclusive.  The default for this parameter is 8.</td>
-    <td valign="top" align="center" colspan="2">No</td>
+    <td>tablength</td>
+    <td>TAB character interval. Valid values are between <q>2</q> and <q>80</q> inclusive.</td>
+    <td colspan="2">No; default is <q>8</q></td>
   </tr>
   <tr>
-    <td valign="top">eof</td>
-    <td valign="top">Specifies how DOS end of file (control-Z) characters are
-      to be handled.  Valid values for this property are:
+    <td>eof</td>
+    <td>Specifies how DOS end of file (control-Z) characters are to be handled.  Valid values for
+      this property are:
       <ul>
-      <li>add: ensure that there is an EOF character at the end of the file</li>
-      <li>asis: leave EOF characters alone</li>
-      <li>remove: remove any EOF character found at the end</li>
+        <li><q>add</q>: ensure that there is an EOF character at the end of the file</li>
+        <li><q>asis</q>: leave EOF characters alone</li>
+        <li><q>remove</q>: remove any EOF character found at the end</li>
       </ul>
-      Default is based on the platform on which you are running this task.
-      For Unix platforms, the default is remove.  For DOS based systems
-      (including Windows), the default is asis.
-      </td>
-    <td valign="top" align="center" colspan="2">No</td>
+    </td>
+    <td colspan="2">No; default is platform-specific: <q>remove</q> for Unix platforms, <q>asis</q>
+      for DOS based systems (including Windows)</td>
   </tr>
   <tr>
-    <td valign="top">fixlast</td>
-    <td valign="top">Whether to add a missing EOL to the last line
-                     of a processed file.<br/>Ignored if EOL is asis.<br/><b>Since Ant 1.6.1</b></td>
-    <td align="center" colspan="2">No; default is <i>true</i></td>
+    <td>fixlast</td>
+    <td>Whether to add a missing EOL to the last line of a processed file.<br/>Ignored
+      if <var>eof</var> is <q>asis</q>.<br/><em>Since Ant 1.6.1</em></td>
+    <td colspan="2">No; default is <q>true</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
-<pre>&lt;fixcrlf srcdir=&quot;${src}&quot; includes=&quot;**/*.sh&quot;
-         eol=&quot;lf&quot; eof=&quot;remove&quot; /&gt;</pre>
-<p>Replaces EOLs with LF characters and removes eof characters from
-  the shell scripts.  Tabs and spaces are left as is.</p>
-<pre>&lt;fixcrlf srcdir=&quot;${src}&quot;
-         includes=&quot;**/*.bat&quot; eol=&quot;crlf&quot; /&gt;</pre>
-<p>Replaces all EOLs with cr-lf pairs in the batch files.
-  Tabs and spaces are left as is.
-  EOF characters are left alone if run on
-  DOS systems, and are removed if run on Unix systems.</p>
-<pre>&lt;fixcrlf srcdir=&quot;${src}&quot;
-         includes=&quot;**/Makefile&quot; tab=&quot;add&quot; /&gt;</pre>
-<p>Sets EOLs according to local OS conventions, and
-  converts sequences of spaces and tabs to the minimal set of spaces and
-  tabs which will maintain spacing within the line.  Tabs are
-  set at 8 character intervals.  EOF characters are left alone if
-  run on DOS systems, and are removed if run on Unix systems.
-  Many versions of make require tabs prior to commands.</p>
-  <pre>&lt;fixcrlf srcdir=&quot;${src}&quot; includes=&quot;**/*.java&quot;
+<pre>
+&lt;fixcrlf srcdir=&quot;${src}&quot; includes=&quot;**/*.sh&quot;
+         eol=&quot;lf&quot; eof=&quot;remove&quot;/&gt;</pre>
+<p>Replaces EOLs with LF characters and removes eof characters from the shell scripts.  Tabs and
+spaces are left as is.</p>
+<pre>
+&lt;fixcrlf srcdir=&quot;${src}&quot;
+         includes=&quot;**/*.bat&quot; eol=&quot;crlf&quot;/&gt;</pre>
+<p>Replaces all EOLs with cr-lf pairs in the batch files.  Tabs and spaces are left as is.  EOF
+characters are left alone if run on DOS systems, and are removed if run on Unix systems.</p>
+<pre>
+&lt;fixcrlf srcdir=&quot;${src}&quot;
+         includes=&quot;**/Makefile&quot; tab=&quot;add&quot;/&gt;</pre>
+<p>Sets EOLs according to local OS conventions, and converts sequences of spaces and tabs to the
+minimal set of spaces and tabs which will maintain spacing within the line.  Tabs are set at 8
+character intervals.  EOF characters are left alone if run on DOS systems, and are removed if run on
+Unix systems.  Many versions of make require tabs prior to commands.</p>
+<pre>
+&lt;fixcrlf srcdir=&quot;${src}&quot; includes=&quot;**/*.java&quot;
          tab=&quot;remove&quot; tablength=&quot;3&quot;
-         eol=&quot;lf&quot; javafiles=&quot;yes&quot; /&gt;</pre>
-<p>
-  Converts all EOLs in the included java source files to a
-  single LF.  Replace all TAB characters except those in string
-  or character constants with spaces, assuming a tab width of 3.
-  If run on a unix system, any CTRL-Z EOF characters at the end
-  of the file are removed.  On DOS/Windows, any such EOF
-  characters will be left untouched.
+         eol=&quot;lf&quot; javafiles=&quot;yes&quot;/&gt;</pre>
+<p>Converts all EOLs in the included Java source files to a single LF.  Replace all TAB characters
+except those in string or character constants with spaces, assuming a tab width of 3.  If run on a
+Unix system, any CTRL-Z EOF characters at the end of the file are removed.  On DOS/Windows, any such
+EOF characters will be left untouched.
 </p>
-<pre>&lt;fixcrlf srcdir=&quot;${src}&quot;
-         includes=&quot;**/README*&quot; tab=&quot;remove&quot; /&gt;</pre>
-<p>Sets EOLs according to local OS conventions, and
-  converts all tabs to spaces, assuming a tab width of 8.
-  EOF characters are left alone if run on
-  DOS systems, and are removed if run on Unix systems.
-  You never know what editor a user will use to browse READMEs.</p>
-
+<pre>
+&lt;fixcrlf srcdir=&quot;${src}&quot;
+         includes=&quot;**/README*&quot; tab=&quot;remove&quot;/&gt;</pre>
+<p>Sets EOLs according to local OS conventions, and converts all tabs to spaces, assuming a tab
+width of 8.  EOF characters are left alone if run on DOS systems, and are removed if run on Unix
+systems.  You never know what editor a user will use to browse READMEs.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/ftp.html ant-1.10.3/manual/Tasks/ftp.html
--- ant-1.9.10/manual/Tasks/ftp.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/ftp.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,701 +24,576 @@
 
 <body>
 
-<h2><a name="ftp">FTP</a></h2>
+<h2 id="ftp">FTP</h2>
 <h3>Description</h3>
-<p>The ftp task implements a basic FTP client that can send, receive,
-list, delete files, and create directories.  See below for descriptions and examples of how
-to perform each task.</p>
-<p><b>Note:</b> This task depends on external libraries not included in the Apache Ant distribution.
-See <a href="../install.html#commons-net">Library Dependencies</a> for more information.
-<i>Get the latest version of this library, for the best support in Ant</i>
-
-</p>
-<p>The ftp task attempts to determine what file system is in place on the FTP server.
-Supported server types are Unix, NT, OS2, VMS, and OS400.  In addition, NT and OS400 servers
-which have been configured to display the directory in Unix style are also supported correctly.
-Otherwise, the system will default to Unix standards.
-<i>remotedir</i> must be specified in the exact syntax required by the ftp
-server. If the usual Unix conventions are not supported by the server,
-<i>separator</i> can be used to set the file separator that should be used
-instead.</p>
-<p>See the section on <a href="../dirtasks.html#directorybasedtasks">directory based
-tasks</a>, on how the inclusion/exclusion of files works, and how to
-write patterns.</p>
-<p>
-This task does not currently use the proxy information set by the
-<a href="setproxy.html"><code>&lt;setproxy&gt;</code></a> task, and cannot go through
-a firewall via socks. 
-<p>
-<b>Warning: </b> there have been problems reported concerning the ftp get with the <code>newer</code> attribute.
-Problems might be due to format of ls -l differing from what is expected by commons-net,
-for instance due to specificities of language used by the ftp server in the directory listing.
-If you encounter such a problem, please send an email including a sample directory listing
-coming from your ftp server (ls -l on the ftp prompt).
-</p>
-<p>
-If you can connect but not upload or download, try setting the <code>passive</code>
-attribute to true to use the existing (open) channel, instead of having the server
-try to set up a new connection.</p>
+<p>The <code>ftp</code> task implements a basic FTP client that can send, receive, list, delete
+files, and create directories.  See below for descriptions and examples of how to perform each
+task.</p>
+<p><strong>Note</strong>: This task depends on external libraries not included in the Apache Ant
+distribution.  See <a href="../install.html#commons-net">Library Dependencies</a> for more
+information. <em>Get the latest version of this library, for the best support in Ant.</em></p>
+<p>The <code>ftp</code> task attempts to determine what file system is in place on the FTP server.
+Supported server types are Unix, NT, OS2, VMS, and OS400.  In addition, NT and OS400 servers which
+have been configured to display the directory in Unix style are also supported correctly.
+Otherwise, the system will default to Unix standards. <var>remotedir</var> must be specified in the
+exact syntax required by the FTP server. If the usual Unix conventions are not supported by the
+server, <var>separator</var> can be used to set the file separator that should be used instead.</p>
+<p>See the section on <a href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on
+how the inclusion/exclusion of files works, and how to write patterns.</p>
+<p>This task does not currently use the proxy information set by
+the <a href="setproxy.html"><code>&lt;setproxy&gt;</code></a> task, and cannot go through a firewall
+via socks.</p>
+<p><strong>Warning</strong>: there have been problems reported concerning
+the <code>ftp</code> <q>get</q> with the <var>newer</var> attribute.  Problems might be due to
+format of <kbd>ls -l</kbd> differing from what is expected by commons-net, for instance due to
+specifics of language used by the FTP server in the directory listing.  If you encounter such a
+problem, please send an email including a sample directory listing coming from your FTP server
+(<kbd>ls -l</kbd> on the FTP prompt).</p>
+<p>If you can connect but not upload or download, try setting the <var>passive</var> attribute
+to <q>true</q> to use the existing (open) channel, instead of having the server try to set up a new
+connection.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top" width="15%"><b>Attribute</b></td>
-    <td valign="top" width="65%"><b>Description</b></td>
-    <td align="center" valign="top" width="20%"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">server</td>
-    <td valign="top">the address of the remote ftp server.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>server</td>
+    <td>the address of the remote FTP server.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">port</td>
-    <td valign="top">the port number of the remote ftp server.
-                     Defaults to port 21.</td>
-    <td valign="top" align="center">No</td>
+    <td>port</td>
+    <td>the port number of the remote FTP server.</td>
+    <td>No; defaults to <q>21</q></td>
   </tr>
   <tr>
-    <td valign="top">userid</td>
-    <td valign="top">the login id to use on the ftp server.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>userid</td>
+    <td>the login id to use on the FTP server.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">password</td>
-    <td valign="top">the login password to use on the ftp server.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>password</td>
+    <td>the login password to use on the FTP server.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">account</td>
-    <td valign="top">the account to use on the ftp server.
-        <em>since Ant 1.7</em>.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>account</td>
+    <td>the account to use on the FTP server.
+    <em>since Ant 1.7</em>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">remotedir</td>
-    <td valign="top">remote directory on the
-                     ftp server
-                     see table below for detailed usage
-                     </td>
-    <td valign="top" align="center">No</td>
+    <td>remotedir</td>
+    <td>remote directory on the FTP server see table below for detailed usage</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">action</td>
-    <td valign="top">the ftp action to perform, defaulting to "send".
-                     Currently supports "put", "get",
-                     "del", "list", "chmod",
-                     "mkdir", "rmdir", and "site".</td>
-    <td valign="top" align="center">No</td>
+    <td>action</td>
+    <td>FTP action to perform.  Currently
+    supports <q>put</q>, <q>get</q>, <q>del</q>, <q>list</q>, <q>chmod</q>, <q>mkdir</q>, <q>rmdir</q>,
+    and <q>site</q>.</td>
+    <td>No; defaults to <q>send</q></td>
   </tr>
   <tr>
-    <td valign="top">binary</td>
-    <td valign="top">selects binary-mode ("yes") or text-mode
-                     ("no") transfers.
-                     Defaults to "yes"</td>
-    <td valign="top" align="center">No</td>
+    <td>binary</td>
+    <td>selects binary-mode (<q>yes</q>) or text-mode (<q>no</q>) transfers.</td>
+    <td>No; defaults to <q>yes</q></td>
   </tr>
   <tr>
-    <td valign="top">passive</td>
-    <td valign="top">selects passive-mode ("yes") transfers, for
-                     better through-firewall connectivity, at the price
-                     of performance.
-                     Defaults to "no"</td>
-    <td valign="top" align="center">No</td>
+    <td>passive</td>
+    <td>selects passive-mode (<q>yes</q>) transfers, for better through-firewall connectivity, at
+      the price of performance.</td>
+    <td>No; defaults to <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">displays information on each file transferred if set 
-                     to "yes". Defaults to "no".</td>
-    <td valign="top" align="center">No</td>
+    <td>verbose</td>
+    <td>displays information on each file transferred if set to <q>yes</q>.</td>
+    <td>No; defaults to <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">depends</td>
-    <td valign="top">transfers only new or changed files if set to 
-                     "yes". Defaults to "no".</td>
-    <td valign="top" align="center">No</td>
+    <td>depends</td>
+    <td>transfers only new or changed files if set to <q>yes</q>.</td>
+    <td>No; defaults to <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">newer</td>
-    <td valign="top">a synonym for <i>depends</i>.
-    see timediffauto and timediffmillis</td>
-    <td valign="top" align="center">No</td>
+    <td>newer</td>
+    <td>a synonym for <var>depends</var>.  See <var>timediffauto</var>
+        and <var>timediffmillis</var></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">timediffauto</td>
-    <td valign="top">set to <code>"true"</code>
-    to make ant calculate the time difference between client and server.<br>
-    <em>requires write access in the remote directory</em><br>
-    Since ant 1.6</td>
-    <td valign="top" align="center">No</td>
+    <td>timediffauto</td>
+    <td>set to <q>true</q> to make Ant calculate the time difference between client and
+    server.<br/><em>requires write access in the remote directory</em><br/><em>Since Ant
+    1.6</em></td>
+    <td>No</td>
   </tr>
-  <a name="timestampGranularity"/>
-  <tr>
-    <td valign="top">timestampGranularity</td>
-    <td valign="top">Specify either <code>MINUTE</code>, <code>NONE</code>,
-     (or you may specify <code>""</code> which is equivalent to not specifying a value,
-     useful for property-file driven scripts).  Allows override of the typical situation 
-     in PUT and GET where local filesystem timestamps are <code>HH:mm:ss</code> 
-     and the typical FTP server's timestamps are <code>HH:mm</code>.  This can throw 
-     off uptodate calculations.  However, the default values should suffice for most
-     applications.<br>
-    Since ant 1.7
-    </td>
-    <td valign="top" align="center">No.  Only applies in "puts" and "gets" where the
-    default values are <code>MINUTE</code> for PUT and <code>NONE</code> for GET.  
-    (It is not as necessary in GET because we have the <b>preservelastmodified</b> option.)</td>
+  <tr id="timestampGranularity">
+    <td>timestampGranularity</td>
+    <td>Specify either <q>MINUTE</q> or <q>NONE</q> (you may specify <q></q> which is equivalent to
+      not specifying a value, useful for property-file driven scripts).  Allows override of the
+      typical situation in <q>put</q> and <q>get</q> where local filesystem timestamps
+      are <code>HH:mm:ss</code> and the typical FTP server's timestamps are <code>HH:mm</code>.
+      This can throw off <var>uptodate</var> calculations.  However, the default values should
+      suffice for most applications.<br/><em>Since Ant 1.7</em></td>
+    <td>No; only applies for <q>put</q> (default is <q>MINUTE</q>) and <q>get</q> (default
+      is <q>NONE</q>; not as necessary because we have the <var>preservelastmodified</var>
+      option)</td>
   </tr>
   <tr>
-    <td valign="top">timediffmillis</td>
-    <td valign="top"><b>Deprecated</b>. Number of milliseconds to add to the time on 
-    the remote machine to get the time on the local machine.  The <b>timestampGranularity</b> 
-    attribute (for which the default values should suffice in most situations), and the 
-    <b>serverTimeZoneConfig</b> option, should make this unnecessary. 
-    <b>serverTimeZoneConfig</b> does the math for you and also knows about 
-    Daylight Savings Time.<br>
-    Since ant 1.6
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>timediffmillis</td>
+    <td><em><u>Deprecated</u></em>. Number of milliseconds to add to the time on the remote machine
+      to get the time on the local machine.  The <var>timestampGranularity</var> attribute (for
+      which the default values should suffice in most situations), and
+      the <var>serverTimeZoneConfig</var> option, should make this
+      unnecessary.  <var>serverTimeZoneConfig</var> does the math for you and also knows about
+      Daylight Savings Time.<br/><em>Since Ant 1.6</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">separator</td>
-    <td valign="top">sets the file separator used on the ftp server.
-                     Defaults to "/".</td>
-    <td valign="top" align="center">No</td>
+    <td>separator</td>
+    <td>sets the file separator used on the FTP server.</td>
+    <td>No; defaults to <q>/</q></td>
   </tr>
   <tr>
-    <td valign="top">umask</td>
-    <td valign="top">sets the default file permissions for new files,
-                     unix only.</td>
-    <td valign="top" align="center">No</td>
+    <td>umask</td>
+    <td>sets the default file permissions for new files, Unix only.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">chmod</td>
-    <td valign="top">sets or changes file permissions for new or existing files,
-      unix only. If used with a put action, chmod will be issued for each file.</td>
-    <td valign="top" align="center">No</td>
+    <td>chmod</td>
+    <td>sets or changes file permissions for new or existing files, Unix only. If used with
+      a <q>put</q> action, <q>chmod</q> will be issued for each file.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">listing</td>
-    <td valign="top">the file to write results of the "list" action.
-                     Required for the "list" action, ignored otherwise.</td>
-    <td valign="top" align="center">No</td>
+    <td>listing</td>
+    <td>the file to write results of the <q>list</q> action.</td>
+    <td>Yes, for the <q>list</q> action; ignored otherwise</td>
   </tr>
   <tr>
-    <td valign="top">ignoreNoncriticalErrors</td>
-    <td valign="top">flag which permits the task to ignore some non-fatal error
-      codes sent by some servers during directory creation: wu-ftp in particular.
-      Default: false</td>
-    <td valign="top" align="center">No</td>
+    <td>ignoreNoncriticalErrors</td>
+    <td>flag which permits the task to ignore some non-fatal error codes sent by some servers during
+      directory creation: wu-ftp in particular.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">skipFailedTransfers</td>
-    <td valign="top">flag which enables unsuccessful file put, delete
-    and get operations to be skipped with a warning and the
-    remainder of the files still transferred. Default: false</td>
-    <td valign="top" align="center">No</td>
-  </tr>  
-  <tr>
-    <td valign="top">preservelastmodified</td>
-    <td valign="top">Give the copied files the same last modified
-      time as the original source files (applies to getting files only).
-      (<em>Note</em>: Ignored on Java 1.1)</td>
-    <td valign="top" align="center">No; defaults to false.</td>
+    <td>skipFailedTransfers</td>
+    <td>flag which enables unsuccessful file <q>put</q>, <q>delete</q> and <q>get</q> operations to
+      be skipped with a warning and the remainder of the files still transferred.</td>
+    <td>No; default to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">retriesAllowed</td>
-    <td valign="top">Set the number of retries allowed on an file-transfer operation.
-    If a number > 0 specified, each file transfer can fail up to that
-    many times before the operation is failed.  If -1 or "forever" specified, the
-    operation will keep trying until it succeeds.</td>
-    <td valign="top" align="center">No; defaults to 0</td>
+    <td>preservelastmodified</td>
+    <td>Give the copied files the same last modified time as the original source files (applies to
+      getting files only).  (<strong>Note</strong>: Ignored on Java 1.1)</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">siteCommand</td>
-    <td valign="top">Set the server-specific SITE command to execute if
-    the <code>action</code> attribute has been specified as <code>"site"</code>.
-    <td valign="top" align="center">No</td>
+    <td>retriesAllowed</td>
+    <td>Set the number of retries allowed on an file-transfer operation.  If a positive number is
+      specified, each file transfer can fail up to that many times before the operation is failed.
+      If <q>-1</q> or <q>forever</q> specified, the operation will keep trying until it
+      succeeds.</td>
+    <td>No; defaults to <q>0</q></td>
   </tr>
   <tr>
-    <td valign="top">initialSiteCommand</td>
-    <td valign="top">Set a server-specific SITE command to execute immediately
-      after login.</td>
-    <td valign="top" align="center">No</td>
+    <td>siteCommand</td>
+    <td>Set the server-specific <code>SITE</code> command to execute if the <var>action</var>
+      attribute has been specified as <q>site</q>.
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">enableRemoteVerification</td>
-    <td valign="top">Whether data connection should be verified to
-    connect to the same host as the control connection.  This is a
-    security measure that is enabled by default, but it may be useful
-    to disable it in certain firewall scenarios.
-      <em>since Ant 1.8.0</em></td>
-    <td valign="top" align="center">No, default is true</td>
+    <td>initialSiteCommand</td>
+    <td>Set a server-specific <code>SITE</code> command to execute immediately after login.</td>
+    <td>No</td>
   </tr>
-
-    <tr>
-    <td colspan="3">
-    <p><b>The following attributes require <a href=
-    "http://commons.apache.org/net/download_net.cgi">
-    jakarta-commons-net-1.4.0 or greater</a>.</b></p>
-    <p>
-    Use these options when the standard options don't work, because
-    <ul><li>the server is in a different timezone and you need timestamp
-    dependency checking</li>
-    <li>the default timestamp formatting doesn't match the server display and
-    list parsing therefore fails</li></ul>
-    </p><p>
-    If none of these is specified, the default mechanism of letting the system
-    auto-detect the server OS type based on the FTP SYST command and assuming
-    standard formatting for that OS type will be used.
-    </p><p>
-    To aid in property-file-based development where a build script is configured
-    with property files, for any of these attributes, a value of <code>""</code>
-    is equivalent to not specifying it.
-    </p><p>
-    Please understand that these options are incompatible with the autodetection
-    scheme.  If any of these options is specified, (other than with a value of
-    <code>""</code> ) a system type must be chosen and if systemTypeKey is not
-    specified, UNIX will be assumed. The philosophy behind this is that these
-    options are for setting non-standard formats, and a build-script author who
-    knows what system he is dealing with will know what options to need to be
-    set. Otherwise, these options should be left alone and the default
-    autodetection scheme can be used and will work in the majority of cases.
-    </p></td>
-    </tr>
   <tr>
-    <td valign="top">systemTypeKey</td>
-    <td valign="top">Specifies the type of system in use on the server.
-      Supported values are <code>"UNIX", "VMS", "WINDOWS", "OS/2", "OS/400",
-      "MVS".</code>  If not specified, (or specified as <code>""</code>) and if
-      no other xxxConfig attributes are specified, the autodetection mechanism
-      based on the FTP SYST command will be used.<br>
-      Since ant 1.7
-    </td>
-    <td valign="top" align="center">No, but if any of the following xxxConfig
-        attributes is specified, UNIX will be assumed, even if <code>""</code>
-        is specified here.
-    </td>
-   </tr>
-   <tr>
-    <td valign="top">serverTimeZoneConfig</td>
-    <td valign="top">Specify as a Java
-     <a href="http://docs.oracle.com/javase/7/docs/api//java/util/TimeZone.html">
-     TimeZone</a> identifier, (e.g. <code>GMT</code>, <code>America/Chicago</code> or
-    <code>Asia/Jakarta</code>) the timezone used by the server for timestamps.  This 
-      enables timestamp dependency checking even when the server is in a different 
-      time zone from the client. Time Zones know, also, about daylight savings time, 
-      and do not require you to calculate milliseconds of difference.  If not specified, 
-      (or specified as <code>""</code>), the time zone of the client is assumed.<br>
-      Since ant 1.7
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>enableRemoteVerification</td>
+    <td>Whether data connection should be verified to connect to the same host as the control
+      connection.  This is a security measure that is enabled by default, but it may be useful to
+      disable it in certain firewall scenarios.  <em>since Ant 1.8.0</em></td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    
-    <td valign="top">defaultDateFormatConfig</td>
-    <td valign="top">Specify in Java 
-    <a href="http://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html">
-     SimpleDateFormat</a> notation, (e.g.
-     <code>yyyy-MM-dd</code>), the date format generally used by the FTP server
-      to parse dates.  In some cases this will be the only date format used.
-      In others, (unix for example) this will be used for dates
-      older than a year old. (See <b>recentDateFormatConfig</b>).  If not specified,
-      (or specified as <code>""</code>), the default date format for the system
-      type indicated by the <b>systemTypeKey</b> attribute will be used.<br>
-      Since ant 1.7
-    </td>
-    <td valign="top" align="center">
-    No.
-    </td>
-  </tr>
-  <tr>
-    <td valign="top">recentDateFormatConfig</td>
-    <td valign="top">Specify in Java 
-    <a href="http://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html">
-     SimpleDateFormat</a> notation,
-      (e.g. <code>MMM dd hh:mm</code>) the date format used by the FTP server
-      to parse dates less than a year old.  If not specified (or specified as
-      <code>""</code>), and if the system type indicated by the system key uses
-      a recent date format, its standard format will be used.<br>
-      Since ant 1.7
-    </td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">serverLanguageCodeConfig</td>
-    <td valign="top">a <a href="http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt">
-      two-letter ISO-639 language code</a> used to specify the
-      language used by the server to format month names.  This only needs to be
-      specified when the server uses non-numeric abbreviations for months in its
-      date listings in a language other than English.  This appears to be
-      becoming rarer and rarer, as commonly distributed ftp servers seem
-      increasingly to use English or all-numeric formats.
-      Languages supported are:
+    <td colspan="3" class="left">
+      <p><strong>The following attributes
+      require <a href="https://commons.apache.org/net/download_net.cgi"
+      target="_top">jakarta-commons-net-1.4.0 or greater</a>.</strong></p>
+      <p>Use these options when the standard options don't work, because</p>
       <ul>
-      	<li>en - English</li>
-      	<li>fr - French</li>
-      	<li>de - German</li>
-      	<li>it - Italian</li>
-      	<li>es - Spanish</li>
-      	<li>pt - Portuguese</li>
-      	<li>da - Danish</li>
-      	<li>sv - Swedish</li>
-      	<li>no - Norwegian</li>
-      	<li>nl - Dutch</li>
-      	<li>ro - Romanian</li>
-      	<li>sq - Albanian</li>
-      	<li>sh - Serbo-croatian</li>
-      	<li>sk - Slovak</li>
-      	<li>sl - Slovenian</li>
+        <li>the server is in a different timezone and you need timestamp dependency checking</li>
+        <li>the default timestamp formatting doesn't match the server display and list parsing
+          therefore fails</li>
       </ul>
-      If you require a language other than the above, see also the
-      <b>shortMonthNamesConfig</b> attribute.<br>
-      Since ant 1.7
-    </td>
-
-    <td valign="top" align="center">No</td>
+      <p>If none of these is specified, the default mechanism of letting the system auto-detect the
+      server OS type based on the FTP <code>SYST</code> command and assuming standard formatting
+      for that OS type will be used.</p>
+      <p>To aid in property-file-based development where a build script is configured with property
+      files, for any of these attributes, a value of <q></q> is equivalent to not specifying it.</p>
+      <p>Please understand that these options are incompatible with the autodetection scheme.  If
+      any of these options is specified, (other than with a value of <q></q>) a system type must be
+      chosen and if <var>systemTypeKey</var> is not specified, UNIX will be assumed. The philosophy
+      behind this is that these options are for setting non-standard formats, and a build-script
+      author who knows what system he is dealing with will know what options to need to be
+      set. Otherwise, these options should be left alone and the default autodetection scheme can be
+      used and will work in the majority of cases.</p>
+    </td>
+  </tr>
+  <tr>
+    <td>systemTypeKey</td>
+    <td>Specifies the type of system in use on the server.  Supported values
+      are <q>UNIX</q>, <q>VMS</q>, <q>WINDOWS</q>, <q>OS/2</q>, <q>OS/400</q>, <q>MVS</q>. If not
+      specified, (or specified as <q></q>) and if no other <var>xxxConfig</var> attributes are
+      specified, the autodetection mechanism based on the FTP <code>SYST</code> command will be
+      used.<br/><em>Since Ant 1.7</em></td>
+    <td>No, but if any of the following <var>xxxConfig</var> attributes is specified, UNIX will be
+      assumed, even if <q></q> is specified here.
+    </td>
+  </tr>
+  <tr>
+    <td>serverTimeZoneConfig</td>
+    <td>Specify as a
+      Java <a href="https://docs.oracle.com/javase/8/docs/api/java/util/TimeZone.html"
+      target="_top">TimeZone</a> identifier, (e.g. <q>GMT</q>, <q>America/Chicago</q>
+      or <q>Asia/Jakarta</q>) the timezone used by the server for timestamps.  This enables
+      timestamp dependency checking even when the server is in a different time zone from the
+      client. Time Zones know, also, about daylight savings time, and do not require you to
+      calculate milliseconds of difference.  If not specified, (or specified as <q></q>), the time
+      zone of the client is assumed.<br/><em>Since Ant 1.7</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>defaultDateFormatConfig</td>
+    <td>Specify in
+      Java <a href="https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html"
+      target="_top">SimpleDateFormat</a> notation, (e.g. <q>yyyy-MM-dd</q>), the date format
+      generally used by the FTP server to parse dates.  In some cases this will be the only date
+      format used.  In others, (<q>unix</q> for example) this will be used for dates older than a
+      year old. (See <var>recentDateFormatConfig</var>).  When specified as <q></q>, default value
+      will be used.<br/><em>Since Ant 1.7</em></td>
+    <td>No; defaults to default date format for the system type indicated
+      by <var>systemTypeKey</var></td>
+  </tr>
+  <tr>
+    <td>recentDateFormatConfig</td>
+    <td>Specify in
+      Java <a href="https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html"
+      target="_top">SimpleDateFormat</a> notation, (e.g. <q>MMM dd hh:mm</q>) the date format used
+      by the FTP server to parse dates less than a year old.  If not specified (or specified
+      as <q></q>), and if the system type indicated by the <var>systemTypeKey</var> uses a recent
+      date format, its standard format will be used.<br/><em>Since Ant 1.7</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>serverLanguageCodeConfig</td>
+    <td>a <a href="http://www.mathguide.de/info/tools/languagecode.html" target="_top">two-letter
+      ISO-639 language code</a> used to specify the language used by the server to format month
+      names.  This only needs to be specified when the server uses non-numeric abbreviations for
+      months in its date listings in a language other than English.  This appears to be becoming
+      rarer and rarer, as commonly distributed FTP servers seem increasingly to use English or
+      all-numeric formats.  Languages supported are:
+      <ul>
+        <li><q>en</q>&mdash;English</li>
+        <li><q>fr</q>&mdash;French</li>
+        <li><q>de</q>&mdash;German</li>
+        <li><q>it</q>&mdash;Italian</li>
+        <li><q>es</q>&mdash;Spanish</li>
+        <li><q>pt</q>&mdash;Portuguese</li>
+        <li><q>da</q>&mdash;Danish</li>
+        <li><q>sv</q>&mdash;Swedish</li>
+        <li><q>no</q>&mdash;Norwegian</li>
+        <li><q>nl</q>&mdash;Dutch</li>
+        <li><q>ro</q>&mdash;Romanian</li>
+        <li><q>sq</q>&mdash;Albanian</li>
+        <li><q>sh</q>&mdash;Serbo-Croatian</li>
+        <li><q>sk</q>&mdash;Slovak</li>
+        <li><q>sl</q>&mdash;Slovenian</li>
+      </ul>
+      If you require a language other than the above, see also the <var>shortMonthNamesConfig</var>
+      attribute.<br/><em>Since Ant 1.7</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">shortMonthNamesConfig</td>
-    <td valign="top">specify the month abbreviations used on the server in file
-      timestamp dates as a pipe-delimited string for each month. For example,
-      a set of month names used by a hypothetical
-      Icelandic FTP server might conceivably be specified as
-      <code>"jan|feb|mar|apr|ma&#xED;|j&#xFA;n|j&#xFA;l|&#xE1;g&#xFA;|sep|okt|n&#xF3;v|des"</code>.
+    <td>shortMonthNamesConfig</td>
+    <td>specify the month abbreviations used on the server in file timestamp dates as a
+      pipe-delimited string for each month. For example, a set of month names used by a hypothetical
+      Icelandic FTP server might conceivably be specified
+      as <q>jan|feb|mar|apr|ma&iacute;|j&uacute;n|j&uacute;l|&aacute;g&uacute;|sep|okt|n&oacute;v|des</q>.
       This attribute exists primarily to support languages not supported by
-      the <b>serverLanguageCode</b> attribute.<br>
-      Since ant 1.7
-    </td>
-    <td valign="top" align="center">No</td>
+      the <var>serverLanguageCode</var> attribute.<br/><em>Since Ant 1.7</em></td>
+    <td>No</td>
   </tr>
 </table>
-<h3>Note about remotedir attribute</h3>
-<table  border="1" cellpadding="2" cellspacing="0"
- >
-  <tbody>
+<h3>Note about <var>remotedir</var> attribute</h3>
+<table>
+  <thead>
     <tr>
-      <td style="vertical-align: top;" width="20%">Action<br>
-      </td>
-      <td style="vertical-align: top;" width="40%">meaning of <code>remotedir</code><br>
-      </td>
-      <td style="vertical-align: top;">use of nested <code>fileset</code>
-(s)<br>
-      </td>
+      <th>Action</th>
+      <th>meaning of <var>remotedir</var></th>
+      <th>use of nested <var>fileset</var>(s)</th>
     </tr>
+  </thead>
+  <tbody>
     <tr>
-      <td style="vertical-align: top;" width="20%">send/put<br>
-      </td>
-      <td style="vertical-align: top;" width="40%">base directory to
-which the files are sent<br>
-      </td>
-      <td style="vertical-align: top;">they are used normally and
-evaluated on the local machine<br>
-      </td>
+      <td><q>send</q>/<q>put</q></td>
+      <td>base directory to which the files are sent</td>
+      <td>they are used normally and evaluated on the local machine</td>
     </tr>
     <tr>
-      <td style="vertical-align: top;" width="20%">recv/get<br>
-      </td>
-      <td style="vertical-align: top;" width="40%">base directory from
-which the files are retrieved<br>
-      </td>
-      <td style="vertical-align: top;">the remote files located under
-the <code>remotedir </code>matching the include/exclude patterns of
-the <code>fileset&nbsp;</code></td>
+      <td><q>recv</q>/<q>get</q></td>
+      <td>base directory from which the files are retrieved</td>
+      <td>the remote files located under the <var>remotedir</var> matching the include/exclude
+        patterns of the <var>fileset</var></td>
     </tr>
     <tr>
-      <td style="vertical-align: top;" width="20%">del/delete<br>
-      </td>
-      <td style="vertical-align: top;" width="40%">base directory from
-which files get deleted<br>
-      </td>
-      <td style="vertical-align: top;">the remote files located under
-the <code>remotedir </code>matching the include/exclude patterns of
-the <code>fileset <br>
-      </code></td>
+      <td><q>del</q>/<q>delete</q></td>
+      <td>base directory from which files get deleted</td>
+      <td>the remote files located under the <var>remotedir</var> matching the include/exclude
+        patterns of the <var>fileset</var></td>
     </tr>
     <tr>
-      <td style="vertical-align: top;" width="20%">list<br>
-      </td>
-      <td style="vertical-align: top;" width="40%">base directory from
-which files are listed<br>
-      </td>
-      <td style="vertical-align: top;">the remote files located under
-the <code>remotedir </code>matching the include/exclude patterns of
-the <code>fileset <br>
-      </code></td>
+      <td><q>list</q></td>
+      <td>base directory from which files are listed</td>
+      <td>the remote files located under the <var>remotedir</var> matching the include/exclude
+        patterns of the <var>fileset</var></td>
     </tr>
     <tr>
-      <td style="vertical-align: top;" width="20%">mkdir</td>
-      <td style="vertical-align: top;" width="40%">directory to create<br>
-      </td>
-      <td style="vertical-align: top;">not used<br>
-      </td>
+      <td><q>mkdir</q></td>
+      <td>directory to create</td>
+      <td><em>not used</em></td>
     </tr>
     <tr>
-      <td style="vertical-align: top;" width="20%">chmod</td>
-      <td style="vertical-align: top;" width="40%">base directory from
-which the mode of files get changed<br>
-      </td>
-      <td style="vertical-align: top;">the remote files located under
-the <code>remotedir </code>matching the include/exclude patterns of
-the <code>fileset <br>
-      </code></td>
+      <td><q>chmod</q></td>
+      <td>base directory from which the mode of files get changed</td>
+      <td>the remote files located under the <var>remotedir</var> matching the include/exclude
+        patterns of the <var>fileset</var></td>
     </tr>
     <tr>
-      <td style="vertical-align: top;" width="20%">rmdir<br>
-      </td>
-      <td style="vertical-align: top;" width="40%">base directory from
-which directories get removed<br>
-      </td>
-      <td style="vertical-align: top;">the remote directories located
-under the <code>remotedir </code>matching the include/exclude
-patterns of the <code>fileset <br>
-      </code></td>
+      <td><q>rmdir</q></td>
+      <td>base directory from which directories get removed</td>
+      <td>the remote directories located under the <var>remotedir</var> matching the include/exclude
+        patterns of the <var>fileset</var></td>
     </tr>
   </tbody>
-</table><h3>Parameters specified as nested elements</h3>
+</table>
+<h3>Parameters specified as nested elements</h3>
 <h4>fileset</h4>
-<p>The ftp task supports any number of nested <a
-href="../Types/fileset.html"><code>&lt;fileset&gt;</code></a> elements to specify
-the files to be retrieved, or deleted, or listed, or whose mode you want to change.</p>
-<p>
-The attribute <code>followsymlinks</code> of <code>fileset</code> is supported on
-local (put) as well as remote (get, chmod, delete) filesets.
-<em>Before ant 1.6 there was no support of symbolic links in remote filesets.
-In order to exclude symbolic links (preserve the behavior of ant 1.5.x and older),
-you need to explicitly set <code>followsymlinks</code> to <code>false</code>.</em>
-On remote filesets hidden files are not checked for being symbolic links. Hidden
-files are currently assumed to not be symbolic links.
-</p>
+<p>The <code>ftp</code> task supports any number of
+nested <a href="../Types/fileset.html"><code>&lt;fileset&gt;</code></a> elements to specify the
+files to be retrieved, or deleted, or listed, or whose mode you want to change.</p>
+<p>The attribute <var>followsymlinks</var> of <code>fileset</code> is supported on local
+(<q>put</q>) as well as remote (<q>get</q>, <q>chmod</q>, <q>delete</q>) filesets.  <em>Before Ant
+1.6 there was no support of symbolic links in remote filesets.  In order to exclude symbolic links
+(preserve the behavior of Ant 1.5.x and older), you need to explicitly set <var>followsymlinks</var>
+to <q>false</q>.</em>  On remote filesets hidden files are not checked for being symbolic links.
+Hidden files are currently assumed to not be symbolic links.</p>
 
-<h3>Sending Files</h3>
+<h3>Sending files</h3>
 <p>The easiest way to describe how to send files is with a couple of examples:</p>
 <pre>
-  &lt;ftp server="ftp.apache.org"
-       userid="anonymous"
-       password="me@myorg.com"&gt;
+&lt;ftp server="ftp.apache.org"
+     userid="anonymous"
+     password="me@myorg.com"&gt;
     &lt;fileset dir="htdocs/manual"/&gt;
-  &lt;/ftp&gt;
-</pre>
-<p>Logs in to <code>ftp.apache.org</code> as <code>anonymous</code> and 
-uploads all files in the <code>htdocs/manual</code> directory 
-to the default directory for that user.</p>
-<pre>  &lt;ftp server="ftp.apache.org"
-       remotedir="incoming"
-       userid="anonymous"
-       password="me@myorg.com"
-       depends="yes"&gt;
+&lt;/ftp&gt;</pre>
+<p>Logs in to <samp>ftp.apache.org</samp> as <samp>anonymous</samp> and uploads all files in
+the <samp>htdocs/manual</samp> directory to the default directory for that user.</p>
+<pre>
+&lt;ftp server="ftp.apache.org"
+     remotedir="incoming"
+     userid="anonymous"
+     password="me@myorg.com"
+     depends="yes"&gt;
     &lt;fileset dir="htdocs/manual"/&gt;
-  &lt;/ftp&gt;</pre>
-<p>Logs in to <code>ftp.apache.org</code> as <code>anonymous</code> and
-uploads all new or changed files in the <code>htdocs/manual</code> directory 
-to the <code>incoming</code> directory relative to the default directory
-for <code>anonymous</code>.</p>
-<pre>  &lt;ftp server="ftp.apache.org"
-       port="2121"
-       remotedir="/pub/incoming"
-       userid="coder"
-       password="java1"
-       passive="yes"
-       depends="yes"
-       binary="no"&gt;
+&lt;/ftp&gt;</pre>
+<p>Logs in to <samp>ftp.apache.org</samp> as <samp>anonymous</samp> and uploads all new or changed
+files in the <samp>htdocs/manual</samp> directory to the <samp>incoming</samp> directory relative to
+the default directory for <samp>anonymous</samp>.</p>
+<pre>
+&lt;ftp server="ftp.apache.org"
+     port="2121"
+     remotedir="/pub/incoming"
+     userid="coder"
+     password="java1"
+     passive="yes"
+     depends="yes"
+     binary="no"&gt;
     &lt;fileset dir="htdocs/manual"&gt;
-      &lt;include name="**/*.html"/&gt;
+        &lt;include name="**/*.html"/&gt;
     &lt;/fileset&gt;
-  &lt;/ftp&gt;</pre>
-<p>Logs in to <code>ftp.apache.org</code> at port <code>2121</code> as
-<code>coder</code> with password <code>java1</code> and uploads all new or
-changed HTML files in the <code>htdocs/manual</code> directory to the
-<code>/pub/incoming</code> directory. The files are transferred in text mode.
-Passive mode has been switched on to send files from behind a firewall.</p>
-<pre>  &lt;ftp server="ftp.hypothetical.india.org"
-       port="2121"
-       remotedir="/pub/incoming"
-       userid="coder"
-       password="java1"
-       depends="yes"
-       binary="no"
-       systemTypeKey="Windows"
-       serverTimeZoneConfig="India/Calcutta"&gt;
+&lt;/ftp&gt;</pre>
+<p>Logs in to <samp>ftp.apache.org</samp> at port <samp>2121</samp> as <samp>coder</samp> with
+password <samp>java1</samp> and uploads all new or changed HTML files in
+the <samp>htdocs/manual</samp> directory to the <samp>/pub/incoming</samp> directory. The files are
+transferred in text mode.  Passive mode has been switched on to send files from behind a
+firewall.</p>
+<pre>
+&lt;ftp server="ftp.hypothetical.india.org"
+     port="2121"
+     remotedir="/pub/incoming"
+     userid="coder"
+     password="java1"
+     depends="yes"
+     binary="no"
+     systemTypeKey="Windows"
+     serverTimeZoneConfig="India/Calcutta"&gt;
     &lt;fileset dir="htdocs/manual"&gt;
-      &lt;include name="**/*.html"/&gt;
+        &lt;include name="**/*.html"/&gt;
     &lt;/fileset&gt;
-  &lt;/ftp&gt;</pre>
-<p>Logs in to a Windows server at <code>ftp.hypothetical.india.org</code>
-at port <code>2121</code> as <code>coder</code> with password <code>java1</code>
-and uploads all new or changed (accounting for timezone differences)
-HTML files in the <code>htdocs/manual</code>
-directory to the <code>/pub/incoming</code> directory. The files are transferred
-in text mode.</p>
-<pre>  &lt;ftp server="ftp.nt.org"
-       remotedir="c:\uploads"
-       userid="coder"
-       password="java1"
-       separator="\"
-       verbose="yes"&gt;
+&lt;/ftp&gt;</pre>
+<p>Logs in to a Windows server at <samp>ftp.hypothetical.india.org</samp> at port <samp>2121</samp>
+as <samp>coder</samp> with password <samp>java1</samp> and uploads all new or changed (accounting
+for timezone differences) HTML files in the <samp>htdocs/manual</samp> directory to
+the <samp>/pub/incoming</samp> directory. The files are transferred in text mode.</p>
+<pre>
+&lt;ftp server="ftp.nt.org"
+     remotedir="c:\uploads"
+     userid="coder"
+     password="java1"
+     separator="\"
+     verbose="yes"&gt;
     &lt;fileset dir="htdocs/manual"&gt;
-      &lt;include name="**/*.html"/&gt;
+        &lt;include name="**/*.html"/&gt;
     &lt;/fileset&gt;
-  &lt;/ftp&gt;</pre><p>Logs in to the Windows-based <code>ftp.nt.org</code> as 
-<code>coder</code> with password <code>java1</code> and uploads all 
-HTML files in the <code>htdocs/manual</code> directory to the 
-<code>c:\uploads</code> directory.  Progress messages are displayed as each
-file is uploaded.</p>
-<h3>Getting Files</h3>
-<p>Getting files from an FTP server works pretty much the same way as 
-sending them does.  The only difference is that the nested filesets
-use the remotedir attribute as the base directory for the files on the
-FTP server, and the dir attribute as the local directory to put the files
-into.  The file structure from the FTP site is preserved on the local machine.</p>
-<pre>
-  &lt;ftp action="get"
-       server="ftp.apache.org"
-       userid="anonymous"
-       password="me@myorg.com"&gt;
+&lt;/ftp&gt;</pre>
+<p>Logs in to the Windows-based <samp>ftp.nt.org</samp> as <samp>coder</samp> with
+password <samp>java1</samp> and uploads all HTML files in the <samp>htdocs/manual</samp> directory
+to the <samp>c:\uploads</samp> directory.  Progress messages are displayed as each file is
+uploaded.</p>
+<h3>Getting files</h3>
+<p>Getting files from an FTP server works pretty much the same way as sending them does.  The only
+difference is that the nested filesets use the <var>remotedir</var> attribute as the base directory
+for the files on the FTP server, and the <var>dir</var> attribute as the local directory to put the
+files into.  The file structure from the FTP site is preserved on the local machine.</p>
+<pre>
+&lt;ftp action="get"
+     server="ftp.apache.org"
+     userid="anonymous"
+     password="me@myorg.com"&gt;
     &lt;fileset dir="htdocs/manual"&gt;
-      &lt;include name="**/*.html"/&gt;
+        &lt;include name="**/*.html"/&gt;
     &lt;/fileset&gt;
-  &lt;/ftp&gt;
-</pre>
-<p>Logs in to <code>ftp.apache.org</code> as <code>anonymous</code> and 
-recursively downloads all .html files from default directory for that user 
-into the <code>htdocs/manual</code> directory on the local machine.</p>
-<pre>
-  &lt;ftp action="get"
-       server="ftp.apache.org"
-       userid="anonymous"
-       password="me@myorg.com"
-       systemTypeKey="UNIX"
-       defaultDateFormatConfig="yyyy-MM-dd HH:mm"&gt;
+&lt;/ftp&gt;</pre>
+<p>Logs in to <samp>ftp.apache.org</samp> as <samp>anonymous</samp> and recursively downloads
+all <samp>.html</samp> files from default directory for that user into
+the <samp>htdocs/manual</samp> directory on the local machine.</p>
+<pre>
+&lt;ftp action="get"
+     server="ftp.apache.org"
+     userid="anonymous"
+     password="me@myorg.com"
+     systemTypeKey="UNIX"
+     defaultDateFormatConfig="yyyy-MM-dd HH:mm"&gt;
     &lt;fileset dir="htdocs/manual"&gt;
-      &lt;include name="**/*.html"/&gt;
+        &lt;include name="**/*.html"/&gt;
     &lt;/fileset&gt;
-  &lt;/ftp&gt;
-</pre>
-<p>If apache.org ever switches to a unix FTP server that uses the new all-numeric
-format for timestamps, this version would become necessary.  It would accomplish
-the same functionality as the previous example but would successfully handle the
-numeric timestamps.
-The <code>systemTypeKey</code> is not necessary here but helps clarify what is
-going on.</p>
-<pre>
-  &lt;ftp action="get"
-       server="ftp.hypthetical.fr"
-       userid="anonymous"
-       password="me@myorg.com"
-       defaultDateFormatConfig="d MMM yyyy"
-       recentDateFormatConfig="d MMM HH:mm"
-       serverLanguageCodeConfig="fr"&gt;
-     &lt;fileset dir="htdocs/manual"&gt;
-      &lt;include name="**/*.html"/&gt;
+&lt;/ftp&gt;</pre>
+<p>If <samp>apache.org</samp> ever switches to a Unix FTP server that uses the new all-numeric
+format for timestamps, this version would become necessary.  It would accomplish the same
+functionality as the previous example but would successfully handle the numeric timestamps.
+The <var>systemTypeKey</var> is not necessary here but helps clarify what is going on.</p>
+<pre>
+&lt;ftp action="get"
+     server="ftp.hypthetical.fr"
+     userid="anonymous"
+     password="me@myorg.com"
+     defaultDateFormatConfig="d MMM yyyy"
+     recentDateFormatConfig="d MMM HH:mm"
+     serverLanguageCodeConfig="fr"&gt;
+    &lt;fileset dir="htdocs/manual"&gt;
+        &lt;include name="**/*.html"/&gt;
     &lt;/fileset&gt;
-  &lt;/ftp&gt;
-</pre>
-<p>Logs into a UNIX FTP server at <code>ftp.hypothetical.fr</code> which displays
-dates with French names in Standard European format, as <code>anonymous</code>, and
-recursively downloads all .html files from default directory for that user
-into the <code>htdocs/manual</code> directory on the local machine.</p>
-
-<h3>Deleting Files</h3>
-As you've probably guessed by now, you use nested fileset elements to 
-select the files to delete from the remote FTP server.  Again, the 
-filesets are relative to the remote directory, not a local directory.  In
-fact, the dir attribute of the fileset is ignored completely.
+&lt;/ftp&gt;</pre>
+<p>Logs into a UNIX FTP server at <samp>ftp.hypothetical.fr</samp> which displays dates with French
+names in Standard European format, as <samp>anonymous</samp>, and recursively downloads
+all <samp>.html</samp> files from default directory for that user into
+the <samp>htdocs/manual</samp> directory on the local machine.</p>
+
+<h3>Deleting files</h3>
+<p>As you've probably guessed by now, you use nested fileset elements to select the files to delete
+from the remote FTP server.  Again, the filesets are relative to the remote directory, not a local
+directory.  In fact, the <var>dir</var> attribute of the fileset is ignored completely.</p>
 
 <pre>
-  &lt;ftp action="del"
-       server="ftp.apache.org"
-       userid="anonymous"
-       password="me@myorg.com"&gt;
+&lt;ftp action="del"
+     server="ftp.apache.org"
+     userid="anonymous"
+     password="me@myorg.com"&gt;
     &lt;fileset&gt;
-      &lt;include name="**/*.tmp"/&gt;
+        &lt;include name="**/*.tmp"/&gt;
     &lt;/fileset&gt;
-  &lt;/ftp&gt;
-</pre>
-<p>Logs in to <code>ftp.apache.org</code> as <code>anonymous</code> and
-tries to delete all *.tmp files from the default directory for that user.
-If you don't have permission to delete a file, a BuildException is thrown.</p>
+&lt;/ftp&gt;</pre>
+<p>Logs in to <samp>ftp.apache.org</samp> as <samp>anonymous</samp> and tries to delete
+all <samp>*.tmp</samp> files from the default directory for that user.  If you don't have permission
+to delete a file, a <code>BuildException</code> is thrown.</p>
 <h3>Listing Files</h3>
 <pre>
-  &lt;ftp action="list"
-       server="ftp.apache.org"
-       userid="anonymous"
-       password="me@myorg.com"
-       listing="data/ftp.listing"&gt;
+&lt;ftp action="list"
+     server="ftp.apache.org"
+     userid="anonymous"
+     password="me@myorg.com"
+     listing="data/ftp.listing"&gt;
     &lt;fileset&gt;
-      &lt;include name="**"/&gt;
+        &lt;include name="**"/&gt;
     &lt;/fileset&gt;
-  &lt;/ftp&gt;
-</pre>
-<p>This provides a file listing in <code>data/ftp.listing</code> of all the files on
-the FTP server relative to the default directory of the <code>anonymous</code>
-user. The listing is in whatever format the FTP server normally lists files.</p>
-
-<h3>Creating Directories</h3>
-<p>Note that with the mkdir action, the directory to create is specified using the
-remotedir attribute.</p>
-<pre>
-  &lt;ftp action="mkdir"
-       server="ftp.apache.org"
-       userid="anonymous"
-       password="me@myorg.com"
-       remotedir="some/remote/dir"/&gt;
-</pre>
-<p>This creates the directory <code>some/remote/dir</code> beneath the default root
-directory.  As with all other actions, the directory separator character must be correct
-according to the desires of the FTP server.</p>
-<h3>Removing Directories</h3>
-This action uses nested fileset elements to 
-select the directories to remove from the remote FTP server.  The 
-filesets are relative to the remote directory, not a local directory. 
-The dir attribute of the fileset is ignored completely.
-The directories to be removed must be empty, or contain only
-other directories that have been also selected to be removed by the filesets
-patterns, otherwise a BuildException will be thrown.
-Also, if you don't have permission to remove a directory, a BuildException is 
-thrown.
-
+&lt;/ftp&gt;</pre>
+<p>This provides a file listing in <samp>data/ftp.listing</samp> of all the files on the FTP server
+relative to the default directory of the <samp>anonymous</samp> user. The listing is in whatever
+format the FTP server normally lists files.</p>
+
+<h3>Creating directories</h3>
+<p>Note that with the <q>mkdir</q> action, the directory to create is specified using
+the <var>remotedir</var> attribute.</p>
 <pre>
-  &lt;ftp action="rmdir"
-       server="ftp.apache.org"
-       userid="anonymous"
-       password="me@myorg.com"
-       remotedir="/somedir" &gt;
-    &lt;fileset&gt;
-      &lt;include name="dira"/&gt;
-      &lt;include name="dirb/**"/&gt;
-    &lt;/fileset&gt;
-  &lt;/ftp&gt;
-</pre>
-<p>Logs in to <code>ftp.apache.org</code> as <code>anonymous</code> and
-tries to remove <code>/somedir/dira</code> directory and
-all the directories tree starting at, and including, <code>/somedir/dirb</code>.
-When removing the <code>/somedir/dirb</code> tree,
-it will start at the leaves moving up to the root, so that when
-it tries to remove a directory it is sure all the directories under it are
-already removed.
-Obviously all the files in the tree must have been already deleted.
-</p>
-<p>As an example suppose you want to delete everything contained into 
-<code>/somedir</code>, so invoke first the <code>&lt;ftp&gt;</code> task with
-<code>action="delete"</code>, then with
-<code>action="rmdir"</code> specifying in both cases
-<code>remotedir="/somedir"</code> and
+&lt;ftp action="mkdir"
+     server="ftp.apache.org"
+     userid="anonymous"
+     password="me@myorg.com"
+     remotedir="some/remote/dir"/&gt;</pre>
+<p>This creates the directory <samp>some/remote/dir</samp> beneath the default root directory.  As
+with all other actions, the directory separator character must be correct according to the desires
+of the FTP server.</p>
+<h3>Removing directories</h3>
+<p>This action uses nested fileset elements to select the directories to remove from the remote FTP
+server.  The filesets are relative to the remote directory, not a local directory.
+The <var>dir</var> attribute of the fileset is ignored completely.  The directories to be removed
+must be empty, or contain only other directories that have been also selected to be removed by the
+filesets patterns, otherwise a <code>BuildException</code> will be thrown.  Also, if you don't have
+permission to remove a directory, a <code>BuildException</code> is thrown.</p>
 
 <pre>
+&lt;ftp action="rmdir"
+     server="ftp.apache.org"
+     userid="anonymous"
+     password="me@myorg.com"
+     remotedir="/somedir" &gt;
     &lt;fileset&gt;
-        &lt;include name="**"/&gt;
+        &lt;include name="dira"/&gt;
+        &lt;include name="dirb/**"/&gt;
     &lt;/fileset&gt;
-</pre>
-
-The directory specified in the <code>remotedir</code> parameter is never
-selected for remove, so if you need to remove it, specify its parent in
-<code>remotedir</code> parameter and include it in the 
-<code>&lt;fileset&gt;</code> pattern, like <code>"somedir/**"</code>.
-</p>
-
+&lt;/ftp&gt;</pre>
+<p>Logs in to <samp>ftp.apache.org</samp> as <samp>anonymous</samp> and tries to
+remove <samp>/somedir/dira</samp> directory and all the directories tree starting at, and
+including, <samp>/somedir/dirb</samp>.  When removing the <samp>/somedir/dirb</samp> tree, it will
+start at the leaves moving up to the root, so that when it tries to remove a directory it is sure
+all the directories under it are already removed.  Obviously all the files in the tree must have
+been already deleted.</p>
+<p>As an example suppose you want to delete everything contained into <samp>/somedir</samp>, so
+invoke first the <code>&lt;ftp&gt;</code> task with <var>action</var>=<q>delete</q>, then
+with <var>action</var>=<q>rmdir</q> specifying in both cases <var>remotedir</var>=<q>/somedir</q>
+and</p>
+<pre>
+&lt;fileset&gt;
+    &lt;include name="**"/&gt;
+&lt;/fileset&gt;</pre>
+<p>The directory specified in the <var>remotedir</var> parameter is never selected for remove, so if
+you need to remove it, specify its parent in <var>remotedir</var> parameter and include it in the
+<code>&lt;fileset&gt;</code> pattern, like <samp>somedir/**</samp>.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/genkey.html ant-1.10.3/manual/Tasks/genkey.html
--- ant-1.9.10/manual/Tasks/genkey.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/genkey.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,92 +24,88 @@
 
 <body>
 
-<h2><a name="genkey">GenKey</a></h2>
+<h2 id="genkey">GenKey</h2>
 <h3>Description</h3>
-<p>Generates a key in a keystore. </p>
+<p>Generates a key in a keystore.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">alias</td>
-    <td valign="top">the alias to add under</td>
-    <td valign="top" align="center">Yes.</td>
+    <td>alias</td>
+    <td>the alias to add under</td>
+    <td>Yes.</td>
   </tr>
   <tr>
-    <td valign="top">storepass</td>
-    <td valign="top">password for keystore integrity. Must
-	be at least 6 characters long</td>
-    <td valign="top" align="center">Yes.</td>
+    <td>storepass</td>
+    <td>password for keystore integrity. Must be at least 6 characters long</td>
+    <td>Yes.</td>
   </tr>
   <tr>
-    <td valign="top">keystore</td>
-    <td valign="top">keystore location</td>
-    <td valign="top" align="center">No</td>
+    <td>keystore</td>
+    <td>keystore location</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">storetype</td>
-    <td valign="top">keystore type</td>
-    <td valign="top" align="center">No</td>
+    <td>storetype</td>
+    <td>keystore type</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">keypass</td>
-    <td valign="top">password for private key (if different)</td>
-    <td valign="top" align="center">No</td>
+    <td>keypass</td>
+    <td>password for private key (if different)</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">sigalg</td>
-    <td valign="top">the algorithm to use in signing</td>
-    <td valign="top" align="center">No</td>
+    <td>sigalg</td>
+    <td>the algorithm to use in signing</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">keyalg</td>
-    <td valign="top">the method to use when generating name-value pair</td>
-    <td valign="top" align="center">No</td>
+    <td>keyalg</td>
+    <td>the method to use when generating name-value pair</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">(true | false) verbose output when signing</td>
-    <td valign="top" align="center">No</td>
+    <td>verbose</td>
+    <td>(<q>true|false</q>) verbose output when signing</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">dname</td>
-    <td valign="top">The distinguished name for entity</td>
-    <td valign="top" align="center">Yes if dname element unspecified</td>
+    <td>dname</td>
+    <td>The distinguished name for entity</td>
+    <td>Yes unless <code>&lt;dname&gt;</code> element is specified</td>
   </tr>
   <tr>
-    <td valign="top">validity</td>
-    <td valign="top">(integer) indicates how many days certificate is valid</td>
-    <td valign="top" align="center">No</td>
+    <td>validity</td>
+    <td>(integer) indicates how many days certificate is valid</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">keysize</td>
-    <td valign="top">(integer) indicates the size of key generated</td>
-    <td valign="top" align="center">No</td>
+    <td>keysize</td>
+    <td>(integer) indicates the size of key generated</td>
+    <td>No</td>
   </tr>
 </table>
 
-<p>Alternatively you can specify the distinguished name by creating a
-sub-element named dname and populating it with param elements that
-have a name and a value. When using the subelement it is automatically
-encoded properly and commas (&quot;<code>,</code>&quot;) are replaced
-with &quot;<code>\,</code>&quot;.</p>
+<p>Alternatively you can specify the distinguished name by creating a <code>&lt;dname&gt;</code>
+sub-element and populating it with <code>&lt;param&gt;</code> elements that have a <var>name</var>
+and a <var>value</var>. When using the subelement, it is automatically encoded properly and commas
+(<q>,</q>) are replaced with <q>\,</q>.</p>
 
-<p>The following two examples are identical: </p>
+<p>The following two examples are identical:</p>
 
 <h3>Examples</h3>
-<blockquote><pre>
-&lt;genkey alias=&quot;apache-group&quot; storepass=&quot;secret&quot; 
-  dname=&quot;CN=Ant Group, OU=Jakarta Division, O=Apache.org, C=US&quot;/&gt;
-</pre></blockquote>
-
-<blockquote>
-  <pre>
-&lt;genkey alias=&quot;apache-group&quot; storepass=&quot;secret&quot; &gt;
+<pre>
+&lt;genkey alias=&quot;apache-group&quot; storepass=&quot;secret&quot;
+        dname=&quot;CN=Ant Group, OU=Jakarta Division, O=Apache.org, C=US&quot;/&gt;</pre>
+
+<pre>
+&lt;genkey alias=&quot;apache-group&quot; storepass=&quot;secret&quot;&gt;
   &lt;dname&gt;
     &lt;param name=&quot;CN&quot; value=&quot;Ant Group&quot;/&gt;
     &lt;param name=&quot;OU&quot; value=&quot;Jakarta Division&quot;/&gt;
@@ -117,9 +113,6 @@
     &lt;param name=&quot;C&quot;  value=&quot;US&quot;/&gt;
   &lt;/dname&gt;
 &lt;/genkey&gt;</pre>
-</blockquote>
-
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/get.html ant-1.10.3/manual/Tasks/get.html
--- ant-1.9.10/manual/Tasks/get.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/get.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,219 +24,225 @@
 
 <body>
 
-<h2><a name="get">Get</a></h2>
+<h2 id="get">Get</h2>
 <h3>Description</h3>
-<p>Gets files from URLs.  When the verbose option is &quot;on&quot;, this task
-displays a '.' for every 100 Kb retrieved. Any URL schema supported by
-the runtime is valid here, including http:, ftp: and jar:; 
-</p>
-The <i>usetimestamp</i> option enables you to control downloads so that the remote file is
-only fetched if newer than the local copy. If there is no local copy, the download always takes 
-place. When a file is downloaded, the timestamp of the downloaded file is set to the remote timestamp. 
-NB: This timestamp facility only works on downloads using the HTTP protocol. 
-<p>
-A username and password can be specified, in which case basic 'slightly encoded
-plain text' authentication is used. This is only secure over an HTTPS link.
-</p>
-
-<p><b>Proxies</b>. Since Apache Ant 1.7.0, Ant running on Java1.5 or later can
-  <a href="../proxy.html">use the proxy settings of the operating
-    system</a> if enabled with the
-  <code>-autoproxy</code> option. There is also the
-  <a href="../Tasks/setproxy.html">&lt;setproxy&gt;</a> task
-  for earlier Java versions. With proxies turned
-  on, <code>&lt;get&gt;</code> requests against localhost may not work
-  as expected, if the request is relayed to the proxy.</p>
- 
+<p>Gets files from URLs.  When the <var>verbose</var> option is <q>on</q>, this task displays
+a <q>.</q> for every 100 Kb retrieved. Any URL schema supported by the runtime is valid here,
+including <q>http:</q>, <q>ftp:</q> and <q>jar:</q>.</p>
+<p>The <var>usetimestamp</var> option enables you to control downloads so that the remote file is
+only fetched if newer than the local copy. If there is no local copy, the download always takes
+place. When a file is downloaded, the timestamp of the downloaded file is set to the remote
+timestamp.  <strong>Note</strong>: This timestamp facility only works on downloads using the HTTP
+protocol.</p>
+<p>A username and password can be specified, in which case basic ('slightly encoded plain text')
+authentication is used. This is only secure over an HTTPS link.</p>
+
+<p><strong>Proxies</strong>. <em>Since Apache Ant 1.7.0</em>, Ant running on Java 5 or later
+can <a href="../proxy.html">use the proxy settings of the operating system</a> if enabled with
+the <kbd>-autoproxy</kbd> command line option. There is also
+the <a href="../Tasks/setproxy.html">&lt;setproxy&gt;</a> task for earlier Java versions. With
+proxies turned on, <code>&lt;get&gt;</code> requests against localhost may not work as expected, if
+the request is relayed to the proxy.</p>
+
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">src</td>
-    <td valign="top">the URL from which to retrieve a file.</td>
-    <td align="center" valign="top">Yes or a nested resource collection</td>
+    <td>src</td>
+    <td>the URL from which to retrieve a file.</td>
+    <td>Yes, or a nested resource collection</td>
   </tr>
   <tr>
-    <td valign="top">dest</td>
-    <td valign="top">the file or directory where to store the
-      retrieved file(s).</td>
-    <td align="center" valign="top">Yes</td>
+    <td>dest</td>
+    <td>the file or directory where to store the retrieved file(s).</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">show verbose progress information (&quot;on&quot;/&quot;off&quot;).</td>
-    <td align="center" valign="top">No; default "false"</td>
+    <td>verbose</td>
+    <td>show verbose progress information (<q>on|off</q>).</td>
+    <td>No; default is <q>off</q></td>
   </tr>
   <tr>
-    <td valign="top">quiet</td>
-    <td valign="top">Log errors only.(&quot;true&quot;/&quot;false&quot;).</td>
-    <td align="center" valign="top">No; default "false"</td>
+    <td>quiet</td>
+    <td>Log errors only.(<q>true|false</q>).</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">ignoreerrors</td>
-    <td valign="top">Log errors but don't treat as fatal.</td>
-    <td align="center" valign="top">No; default "false"</td>
+    <td>ignoreerrors</td>
+    <td>Log errors but don't treat as fatal.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">usetimestamp</td>
-    <td valign="top">conditionally download a file based on the timestamp of the
-    local copy. HTTP only</td>
-    <td align="center" valign="top">No; default "false"</td>
+    <td>usetimestamp</td>
+    <td>conditionally download a file based on the timestamp of the local copy. HTTP only</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">username</td>
-    <td valign="top">username for 'BASIC' http authentication</td>
-    <td align="center" valign="top">if password is set</td>
-  </tr>  
+    <td>username</td>
+    <td>username for basic HTTP authentication</td>
+    <td>Yes, if <var>password</var> is set</td>
+  </tr>
   <tr>
-    <td valign="top">password</td>
-    <td valign="top">password: required </td>
-    <td align="center" valign="top">if username is set</td>
-  </tr>  
+    <td>password</td>
+    <td>password for basic HTTP authentication</td>
+    <td>Yes if <var>username</var> is set</td>
+  </tr>
   <tr>
-    <td valign="top">maxtime</td>
-    <td valign="top">Maximum time in seconds a single download may take,
-      otherwise it will be interrupted and treated like a download
-      error.  <em>Since Ant 1.8.0</em></td>
-    <td align="center" valign="top">No: default 0 which means no
-      maximum time</td>
-  </tr>  
+    <td>maxtime</td>
+    <td>Maximum time in seconds a single download may take, otherwise it will be interrupted and
+      treated like a download error.  <em>Since Ant 1.8.0</em></td>
+    <td>No; default is <q>0</q> which means
+      unlimited</td>
+  </tr>
   <tr>
-    <td valign="top">retries</td>
-    <td valign="top">The number of attempts to make for opening the URI.<br/>
-      The name of the attribute is misleading as a value of 1 means
-      "don't retry on error" and a value of 0 meant don't even try to
-      reach the URI at all.<br/>
-      <em>since Ant 1.8.0</em></td>
-    <td align="center" valign="top">No; default "3"</td>
+    <td>retries</td>
+    <td>The number of attempts to make for opening the URI.<br/>The name of the attribute is
+      misleading as a value of <q>1</q> means "don't retry on error" and a value of <q>0</q> meant
+      don't even try to reach the URI at all.<br/><em>since Ant 1.8.0</em></td>
+    <td>No; default is <q>3</q></td>
   </tr>
   <tr>
-    <td valign="top">skipexisting</td>
-    <td valign="top">skip files that already exist on the local filesystem<br/>
-      <em>since Ant 1.8.0</em></td>
-    <td align="center" valign="top">No; default "false"</td>
+    <td>skipexisting</td>
+    <td>skip files that already exist on the local filesystem<br/><em>since Ant 1.8.0</em></td>
+    <td>No; default is <q>false</q></td>
   </tr>
    <tr>
-    <td valign="top">httpusecaches</td>
-    <td valign="top">HTTP only - if true, allow caching at the
-      HttpUrlConnection level.  if false, turn caching off.<br/>
-      <b>Note</b> this is only a hint to the underlying UrlConnection
-      class, implementations and proxies are free to ignore the
-      setting.</td>
-    <td align="center" valign="top">No; default "true"</td>
-  </tr>
-  <tr>
-    <td valign="top">useragent</td>
-    <td valign="top">User-Agent HTTP header to send, starting with Ant
-      1.9.3 Ant will specify a User-Agent header of "Apache Ant VERSION"
-      unless overridden by this attribute<br/>
-      <em>since Ant 1.9.3</em></td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">tryGzipEncoding</td>
-    <td valign="top">When set to true Ant will tell the server it is
-      willing to accept gzip encoding to reduce the amount of data to
-      transfer and uncompress the content transparently.<br/>
-      Setting this to true also means Ant will uncompress
-      <code>.tar.gz</code> and similar files automatically.<br/>
-      <em>since Ant 1.9.5</em></td>
-    <td align="center" valign="top">No; default "false"</td>
+    <td>httpusecaches</td>
+    <td>HTTP only&mdash;if <q>true</q>, allow caching at the <code>HttpUrlConnection</code> level,
+    if <q>false</q>, turn caching off.<br/><strong>Note</strong> this is only a hint to the
+    underlying <code>UrlConnection</code> class, implementations and proxies are free to ignore the
+    setting.</td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+  <tr>
+    <td>useragent</td>
+    <td><code>User-Agent</code> HTTP header to send.<br/><em>since Ant 1.9.3</em></td>
+    <td>No; defaults to <q>Apache Ant VERSION</q></td>
+  </tr>
+  <tr>
+    <td>tryGzipEncoding</td>
+    <td>When set to <q>true</q>, Ant will tell the server it is willing to accept gzip encoding to
+      reduce the amount of data to transfer and uncompress the content transparently.<br/>Setting
+      this to <q>true</q> also means Ant will uncompress <code>.tar.gz</code> and similar files
+      automatically.<br/><em>since Ant 1.9.5</em></td>
+    <td>No; default is <q>false</q></td>
 </table>
 <h3>Parameters specified as nested elements</h3>
 <h4>any resource collection</h4>
 
-<p><a href="../Types/resources.html#collection">Resource
-    Collection</a>s are used to select groups of URLs to download.  If
-    the collection contains more than one resource, the dest attribute
-    must point to a directory if it exists or a directory will be
-    created if it doesn't exist.  The destination file name use the
-    last part of the path of the source URL unless you also specify a
-    mapper.</p>
+<p><a href="../Types/resources.html#collection">resource collections</a> are used to select groups
+of URLs to download.  If the collection contains more than one resource, the <var>dest</var>
+attribute must point to a directory if it exists or a directory will be created if it doesn't exist.
+The destination file name use the last part of the path of the source URL unless you also specify a
+mapper.</p>
 
 <h4>mapper</h4>
 
-<p>You can define name transformations by using a
-  nested <a href="../Types/mapper.html">mapper</a> element.  You
-  can also use any filenamemapper type in place of the mapper
-  element.</p>
-
-<p>The mapper will receive the resource's name as argument.  Any
-  resource for which the mapper returns no or more than one mapped
-  name will be skipped.  If the returned name is a relative path, it
-  will be considered relative to the <em>dest</em> attribute.</p>
+<p>You can define name transformations by using a nested <a href="../Types/mapper.html">mapper</a>
+element.  You can also use any filenamemapper type in place of the mapper element.</p>
+
+<p>The mapper will receive the resource's name as argument.  Any resource for which the mapper
+returns no or more than one mapped name will be skipped.  If the returned name is a relative path,
+it will be considered relative to the <var>dest</var> attribute.</p>
+
+<h4>header</h4>
+<p>Any arbitrary number of HTTP headers can be added to a request.<br/>The attributes of a
+nested <code>&lt;header/&gt;</code> node are as follows:</p>
+
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>name</td>
+    <td>The name or key of this header. Cannot be null or empty. Leading and trailing spaces are
+    removed</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>value</td>
+    <td>The value to assign to the header. Cannot be null or empty. Leading and trailing spaces are
+    removed</td>
+    <td>Yes</td>
+  </tr>
+</table>
 
 <h3>Examples</h3>
-<pre>  &lt;get src=&quot;http://ant.apache.org/&quot; dest=&quot;help/index.html&quot;/&gt;</pre>
-<p>Gets the index page of http://ant.apache.org/, and stores it in the file <code>help/index.html</code>.</p>
+<pre>&lt;get src=&quot;http://ant.apache.org/&quot; dest=&quot;help/index.html&quot;/&gt;</pre>
+<p>Gets the index page of <samp>http://ant.apache.org/</samp>, and stores it in the
+file <samp>help/index.html</samp>.</p>
+
+<pre>
+&lt;get src=&quot;http://www.apache.org/dist/ant/KEYS&quot;
+     dest=&quot;KEYS&quot;
+     verbose=&quot;true&quot;
+     usetimestamp=&quot;true&quot;/&gt;</pre>
+<p>Gets the PGP keys of Ant's (current and past) release managers, if the local copy is missing or
+out of date. Uses the verbose option for progress information.</p>
 
-<pre>  &lt;get src=&quot;http://www.apache.org/dist/ant/KEYS&quot; 
-    dest=&quot;KEYS&quot; 
-    verbose=&quot;true&quot;
-    usetimestamp=&quot;true&quot;/&gt;</pre>
-<p>
-Gets the PGP keys of Ant's (current and past) release managers, if the local copy
-is missing or out of date. Uses the verbose option 
-for progress information.
-</p>
-
-<pre>  &lt;get src=&quot;https://insecure-bank.org/statement/user=1214&quot; 
-    dest=&quot;statement.html&quot; 
-    username="1214";
-    password="secret"/&gt;</pre>
-<p>
-Fetches some file from a server with access control. Because https is being used the
-fact that basic auth sends passwords in plaintext is moot if you
-ignore the fact that it is part of your build file which may be
-readable by third parties.  If you need more security, consider using
+<pre>
+&lt;get src=&quot;https://insecure-bank.org/statement/user=1214&quot;
+     dest=&quot;statement.html&quot;
+     username=&quot;1214&quot;
+     password=&quot;secret&quot;/&gt;</pre>
+<p>Fetches some file from a server with access control. Because https is being used the fact that
+basic auth sends passwords in plaintext is moot if you ignore the fact that it is part of your build
+file which may be readable by third parties.  If you need more security, consider using
 the <a href="input.html">input task</a> to query for a password.</p>
 
 <p>Using a macro like the following</p>
 
 <pre>
-  &lt;macrodef name="get-and-checksum">
-    &lt;attribute name="url"/>
-    &lt;attribute name="dest"/>
-    &lt;sequential&gt;
-      &lt;local name="destdir"/&gt;
-      &lt;dirname property="destdir" file="@{dest}"/&gt;
-      &lt;get dest="${destdir}"&gt;
-        &lt;url url="@{url}"/&gt;
-        &lt;url url="@{url}.sha1"/&gt;
-        &lt;firstmatchmapper&gt;
-          &lt;globmapper from="@{url}.sha1" to="@{dest}.sha"/&gt;
-          &lt;globmapper from="@{url}" to="@{dest}"/&gt;
-        &lt;/firstmatchmapper&gt;
-      &lt;/get&gt;
-      &lt;local name="checksum.matches"/>
-      &lt;local name="checksum.matches.fail"/>
-      &lt;checksum file="@{dest}" algorithm="sha" fileext=".sha"
-                verifyproperty="checksum.matches"/>
-      &lt;condition property="checksum.matches.fail">
-        &lt;equals arg1="${checksum.matches}" arg2="false"/>
-      &lt;/condition>
-      &lt;fail if="checksum.matches.fail">Checksum error&lt;/fail>
-    &lt;/sequential>
-  &lt;/macrodef>
-</pre>
-
-<p>it is possible to download an artifacts together with its SHA1
-  checksum (assuming a certain naming convention for the checksum
-  file, of course) and validate the checksum on the fly.</p>
+&lt;macrodef name="get-and-checksum"&gt;
+  &lt;attribute name="url"/&gt;
+  &lt;attribute name="dest"/&gt;
+  &lt;sequential&gt;
+    &lt;local name="destdir"/&gt;
+    &lt;dirname property="destdir" file="@{dest}"/&gt;
+    &lt;get dest="${destdir}"&gt;
+      &lt;url url="@{url}"/&gt;
+      &lt;url url="@{url}.sha1"/&gt;
+      &lt;firstmatchmapper&gt;
+        &lt;globmapper from="@{url}.sha1" to="@{dest}.sha"/&gt;
+        &lt;globmapper from="@{url}" to="@{dest}"/&gt;
+      &lt;/firstmatchmapper&gt;
+    &lt;/get&gt;
+    &lt;local name="checksum.matches"/&gt;
+    &lt;local name="checksum.matches.fail"/&gt;
+    &lt;checksum file="@{dest}" algorithm="sha" fileext=".sha"
+              verifyproperty="checksum.matches"/&gt;
+    &lt;condition property="checksum.matches.fail"&gt;
+      &lt;equals arg1="${checksum.matches}" arg2="false"/&gt;
+    &lt;/condition&gt;
+    &lt;fail if="checksum.matches.fail"&gt;Checksum error&lt;/fail&gt;
+  &lt;/sequential&gt;
+&lt;/macrodef&gt;</pre>
+
+<p>it is possible to download an artifacts together with its SHA1 checksum (assuming a certain
+naming convention for the checksum file, of course) and validate the checksum on the fly.</p>
 
 <pre>
 &lt;get dest=&quot;downloads&quot;&gt;
-  &lt;url url=&quot;http://ant.apache.org/index.html&quot;/&gt; 
+  &lt;url url=&quot;http://ant.apache.org/index.html&quot;/&gt;
   &lt;url url=&quot;http://ant.apache.org/faq.html&quot;/&gt;
-&lt;/get&gt;
-</pre>
-<p>Gets the index and FAQ pages of http://ant.apache.org/, and stores
-  them in the directory <code>downloads</code> which will be created if
-  necessary.</p>
+&lt;/get&gt;</pre>
+
+<p>With custom HTTP headers</p>
+
+<pre>
+&lt;get src=&quot;http://ant.apache.org/index.html&quot; dest=&quot;downloads&quot;&gt;
+  &lt;header name=&quot;header1&quot; value=&quot;headerValue1&quot;/&gt;
+  &lt;header name=&quot;header2&quot; value=&quot;headerValue2&quot;/&gt;
+  &lt;header name=&quot;header3&quot; value=&quot;headerValue3&quot;/&gt;
+&lt;/get&gt;</pre>
+
+<p>Gets the index and FAQ pages of <samp>http://ant.apache.org/</samp>, and stores them in the
+directory <samp>downloads</samp> which will be created if necessary.</p>
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/gunzip.html ant-1.10.3/manual/Tasks/gunzip.html
--- ant-1.9.10/manual/Tasks/gunzip.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/gunzip.html	2018-03-24 12:37:12.000000000 +0000
@@ -23,7 +23,6 @@
 </head>
 
 <body>
-This document's new home is <A HREF="unpack.html">here</A>
+This document's new home is <a href="unpack.html">here</a>
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/gzip.html ant-1.10.3/manual/Tasks/gzip.html
--- ant-1.9.10/manual/Tasks/gzip.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/gzip.html	2018-03-24 12:37:12.000000000 +0000
@@ -23,7 +23,6 @@
 </head>
 
 <body>
-This document's new home is <A HREF="pack.html">here</A>
+This document's new home is <a href="pack.html">here</a>
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/hostinfo.html ant-1.10.3/manual/Tasks/hostinfo.html
--- ant-1.9.10/manual/Tasks/hostinfo.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/hostinfo.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,75 +24,61 @@
 
 <body>
 
-<h2><a name="hostinfo">HostInfo</a></h2>
+<h2 id="hostinfo">HostInfo</h2>
 
 <h3>Description</h3>
 <p>Sets the <code>NAME</code>, <code>DOMAIN</code>, <code>ADDR4</code>, and <code>ADDR6</code>
 properties in the current project.</p>
 <p>
-The <code>NAME</code> contains the host part of the canonical name of the host.<br/>
-If the host is not found, the host will contain the name as provided to the task,
-or <code>localhost</code> if no host was provided, and no name for the local
-host was found.<br/>
-The <code>DOMAIN</code> contains the domain part of the canonical name of the host.<br/>
- If the host is not found, the domain will contain the domain as provided to the task,
- or <code>localdomain</code> if no host / domain was provided.<br/>
-The <code>ADDR4</code> contains the IPv4 address of the host with the widest meaning.<br/>
-If no IPv4 address is found and a host has been provided the address <code>0.0.0.0</code> 
-is returned, when no host was provided the address <code>127.0.0.1</code> is returned.<br/>
-The <code>ADDR6</code> contains the IPv6 address of the host with the widest meaning.<br/> 
-If no IPv6 address is found and a host has been provided the address <code>::</code> 
-is returned, when no host was provided the address <code>::1</code> is returned.<br/>
-</p>
-
-<p>These properties can be used in the build-file, for instance, to create
-host-stamped filenames, or used to replace placeholder tags inside documents
-to indicate, for example, the host where the build was performed on.
-The best place for this task is probably in an initialization target.</p>
+The <code>NAME</code> contains the host part of the canonical name of the host.<br/>  If the host is
+not found, the host will contain the name as provided to the task, or <code>localhost</code> if no
+host was provided, and no name for the local host was found.<br/>The <code>DOMAIN</code> contains
+the domain part of the canonical name of the host.<br/>If the host is not found, the domain will
+contain the domain as provided to the task, or <code>localdomain</code> if no host / domain was
+provided.<br/>The <code>ADDR4</code> contains the IPv4 address of the host with the widest
+meaning.<br/>If no IPv4 address is found and a host has been provided the
+address <code>0.0.0.0</code> is returned, when no host was provided the
+address <code>127.0.0.1</code> is returned.<br/>The <code>ADDR6</code> contains the IPv6 address of
+the host with the widest meaning.<br/>If no IPv6 address is found and a host has been provided the
+address <code>::</code> is returned, when no host was provided the address <code>::1</code> is
+returned.</p>
+
+<p>These properties can be used in the build-file, for instance, to create host-stamped filenames,
+or used to replace placeholder tags inside documents to indicate, for example, the host where the
+build was performed on.  The best place for this task is probably in an initialization target.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">prefix</td>
-    <td valign="top">Prefix used for all properties set. The default is no prefix.</td>
-    <td align="center" valign="top">No</td>
+    <td>prefix</td>
+    <td>Prefix used for all properties set.</td>
+    <td>No; defaults to no prefix</td>
   </tr>
   <tr>
-    <td valign="top">host</td>
-    <td valign="top">
-        The host to retrieve the information for, default is to retrieve
-        information for the host the task is running on.
-    </td>
-    <td align="center" valign="top">No</td>
+    <td>host</td>
+    <td>The host to retrieve the information for.</td>
+    <td>No; default is to retrieve information for the host the task is running on</td>
   </tr>
 </table>
 
 <h3>Examples</h3>
 
-<pre>
-  &lt;hostinfo/&gt;
-</pre>
+<pre>&lt;hostinfo/&gt;</pre>
 
-<p>
-Sets the <code>NAME</code>, <code>DOMAIN</code>, <code>ADDR4</code>, and 
-<code>ADDR6</code> for the local host, using the most &quot;global&quot; address
-available.</p>
-<pre>
-  &lt;hostinfo prefix=&quot;remotehost&quot; host=&quot;www.apache.org&quot;/&gt;
-</pre>
-<p>
-Sets the properties <code>remotehost.NAME</code> to <code>eos</code>, 
-<code>remotehost.DOMAIN</code> to <code>apache.org</code>, 
-<code>remotehost.ADDR4</code> to <code>140.211.11.130</code> and 
-<code>remotehost.ADDR6</code> to <code>::</code>
-for the host with the name www.apache.org (provided the canonical name and ip 
-addresses do not change).
-</p>
+<p>Sets the <code>NAME</code>, <code>DOMAIN</code>, <code>ADDR4</code>, and <code>ADDR6</code> for
+the local host, using the most &quot;global&quot; address available.</p>
+
+<pre>&lt;hostinfo prefix=&quot;remotehost&quot; host=&quot;www.apache.org&quot;/&gt;</pre>
+<p>Sets the properties <code>remotehost.NAME</code>
+to <samp>eos</samp>, <code>remotehost.DOMAIN</code>
+to <samp>apache.org</samp>, <code>remotehost.ADDR4</code> to <samp>140.211.11.130</samp>
+and <code>remotehost.ADDR6</code> to <samp>::</samp> for the host with the
+name <samp>www.apache.org</samp> (provided the canonical name and IP addresses do not change).</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/image.html ant-1.10.3/manual/Tasks/image.html
--- ant-1.9.10/manual/Tasks/image.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/image.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,7 +24,7 @@
 
 <body>
 
-<h2><a name="image">Image</a></h2>
+<h2 id="image">Image</h2>
 <h3>Description</h3>
 <p>Applies a chain of image operations on a set of files.</p>
 <p>Requires <a href="../install.html#librarydependencies">Java Advanced Image API</a> from Sun.</p>
@@ -33,170 +33,166 @@
 <img src="image-classdiagram.gif" border="0" alt="Class-Diagram">
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top"> failonerror </td>
-    <td valign="top"> Boolean value. If false, note errors to the output but keep going. </td>
-    <td align="center"> no (defaults to <i>true</i>) </td>
+    <td>failonerror</td>
+    <td>Boolean value. If <q>false</q>, note errors to the output but keep going.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top"> srcdir </td>
-    <td valign="top"> Directory containing the images. </td>
-    <td align="center"> yes, unless nested fileset is used </td>
+    <td>srcdir</td>
+    <td>Directory containing the images.</td>
+    <td>Yes, unless nested fileset is used</td>
   </tr>
   <tr>
-    <td valign="top"> encoding </td>
-    <td valign="top"> Image encoding type. <br>
-      Valid (caseinsensitive) are: jpg, jpeg, tif, tiff
+    <td>encoding</td>
+    <td>Image encoding type.<br/>Valid (case insensitive)
+      are: <q>jpg</q>, <q>jpeg</q>, <q>tif</q>, <q>tiff</q>
     </td>
-    <td align="center"> no (defaults to <i>JPEG</i>) </td>
+    <td>No; defaults to <q>jpeg</q></td>
   </tr>
   <tr>
-    <td valign="top"> overwrite </td>
-    <td valign="top"> Boolean value. Sets whether or not to overwrite
-      a file if there is naming conflict.
-    </td>
-    <td align="center"> no (defaults to <i>false</i>) </td>
+    <td>overwrite</td>
+    <td>Boolean value. Sets whether or not to overwrite a file if there is naming conflict.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top"> gc </td>
-    <td valign="top"> Boolean value. Enables garbage collection after
-      each image processed.
-    </td>
-    <td align="center"> no (defaults to <i>false</i>) </td>
+    <td>gc</td>
+    <td>Boolean value. Enables garbage collection after each image processed.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top"> destdir </td>
-    <td valign="top"> Directory where the result images are stored. </td>
-    <td align="center"> no (defaults to value of <i>srcdir</i>) </td>
+    <td>destdir</td>
+    <td>Directory where the result images are stored.</td>
+    <td>No; defaults to value of <var>srcdir</var></td>
   </tr>
   <!-- attributes inherited from MatchingTask -->
   <tr>
-    <td valign="top">includes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      included. All files are included when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>includes</td>
+    <td>comma- or space-separated list of patterns of files that must be included.</td>
+    <td>No; defaults to all (<q>**</q>)</td>
   </tr>
   <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an include pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>includesfile</td>
+    <td>name of a file. Each line of this file is taken to be an include pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top"> excludes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      excluded. No files (except default excludes) are excluded when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>excludes</td>
+    <td>comma- or space-separated list of patterns of files that must be excluded.</td>
+    <td>No; defaults to default excludes or none if <var>defaultexcludes</var> is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an exclude pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>excludesfile</td>
+    <td>name of a file. Each line of this file is taken to be an exclude pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">defaultexcludes</td>
-    <td valign="top">indicates whether default excludes should be used or not
-      (&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>defaultexcludes</td>
+    <td>indicates whether default excludes should be used or not (<q>yes|no</q>).</td>
+    <td>No; defaults to <q>yes</q></td>
   </tr>
   <tr>
-    <td valign="top"> caseSensitive </td>
-    <td valign="top"> Boolean value. Sets case sensitivity of the file system. </td>
-    <td align="center"> no (defaults to <i>false</i>) </td>
+    <td>caseSensitive</td>
+    <td>Boolean value. Sets case sensitivity of the file system.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top"> followSymlinks </td>
-    <td valign="top"> Boolean value. Sets whether or not symbolic links should be followed. </td>
-    <td align="center"> no (defaults to <i>true</i>) </td>
+    <td>followSymlinks</td>
+    <td>Boolean value. Sets whether or not symbolic links should be followed.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
-<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and
-supports most attributes of <code>&lt;fileset&gt;</code> as well as the
-nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and
-<code>&lt;patternset&gt;</code> elements.</p>
-
+<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and supports most
+attributes of <code>&lt;fileset&gt;</code> as well as the
+nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code>
+and <code>&lt;patternset&gt;</code> elements.</p>
 
 <h4>ImageOperation</h4>
 <p>Adds an ImageOperation to chain.</p>
-<h5>Nested Elements</h5>
-ImageOperation can handle nested Rotate, Draw, Rectangle, Text and Scale objects.
+<h5>Nested elements</h5>
+<p>ImageOperation can handle
+nested <code>Rotate</code>, <code>Draw</code>, <code>Rectangle</code>, <code>Text</code>
+and <code>Scale</code> objects.</p>
 
 <h4>Rotate</h4>
 <p>Adds a Rotate ImageOperation to chain.</p>
 <h5>Parameters</h5>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top"> angle </td>
-    <td valign="top"> Float value. Sets the angle of rotation in degrees. </td>
-    <td align="center"> no (defaults to <i>0.0F</i>) </td>
+    <td>angle</td>
+    <td>Float value. Sets the angle of rotation in degrees.</td>
+    <td>No; defaults to <q>0.0F</q></td>
   </tr>
 </table>
 
 <h4>Scale</h4>
 <p>Adds a Scale ImageOperation to chain.</p>
 <h5>Parameters</h5>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-    <td valign="top"> proportions </td>
-    <td valign="top"> Sets which dimension to control proportions from. Valid values are:<ul>
-        <li>&quot;ignore&quot; -  treat the dimensions independently.</li>
-        <li>&quot;height&quot; - keep proportions based on the width.</li>
-        <li>&quot;width&quot; - keep proportions based on the height.</li>
-        <li>&quot;cover&quot; - keep proportions and fit in the supplied dimensions.</li>
-        <li>&quot;fit&quot; - keep proportions and cover the supplied dimensions.</li>
-    </ul></td>
-    <td align="center"> no (defaults to <i>ignore</i>) </td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>proportions</td>
+    <td>Sets which dimension to control proportions from. Valid values are:
+      <ul>
+        <li><q>ignore</q>&mdash; treat the dimensions independently.</li>
+        <li><q>height</q>&mdash;keep proportions based on the width.</li>
+        <li><q>width</q>&mdash;keep proportions based on the height.</li>
+        <li><q>cover</q>&mdash;keep proportions and fit in the supplied dimensions.</li>
+        <li><q>fit</q>&mdash;keep proportions and cover the supplied dimensions.</li>
+      </ul>
+    </td>
+    <td>No; defaults to <q>ignore</q></td>
+  </tr>
   <tr>
-    <td valign="top"> width </td>
-    <td valign="top"> Sets the width of the image, either as an integer or a %. </td>
+    <td>width</td>
+    <td>Sets the width of the image, either as an integer or a %.</td>
         <!-- todo: if integer, what kind? cm, px, inches, ... -->
-    <td align="center"> no (defaults to <i>100%</i>) </td>
+    <td>No; defaults to <q>100%</q></td>
   </tr>
   <tr>
-    <td valign="top"> height </td>
-    <td valign="top"> Sets the height of the image, either as an integer or a %. </td>
+    <td>height</td>
+    <td>Sets the height of the image, either as an integer or a %.</td>
         <!-- todo: if integer, what kind? cm, px, inches, ... -->
-    <td align="center"> no (defaults to <i>100%</i>) </td>
+    <td>No; defaults to <q>100%</q></td>
   </tr>
 </table>
 
 <h4>Draw</h4>
-<p>Adds a Draw ImageOperation to chain. DrawOperation DataType objects can be
-nested inside the Draw object.</p>
+<p>Adds a Draw ImageOperation to chain. DrawOperation DataType objects can be nested inside the Draw
+object.</p>
 <h5>Parameters</h5>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top"> xloc </td>
-    <td valign="top"> X-Position where to draw nested image elements. </td>
-    <td align="center"> no (defaults to <i>0</i>) </td>
+    <td>xloc</td>
+    <td>X-Position where to draw nested image elements.</td>
+    <td>No; defaults to <q>0</q></td>
   </tr>
   <tr>
-    <td valign="top"> yloc </td>
-    <td valign="top"> Y-Position where to draw nested image elements. </td>
-    <td align="center"> no (defaults to <i>0</i>) </td>
+    <td>yloc</td>
+    <td>Y-Position where to draw nested image elements.</td>
+    <td>No; defaults to <q>0</q></td>
   </tr>
 </table>
 
@@ -204,58 +200,44 @@
 <p><em>Since Apache Ant 1.8.0</em></p>
 
 <p>You can define filename transformations by using a
-  nested <a href="../Types/mapper.html">mapper</a> element. The
-  default mapper used by
-  <code>&lt;image&gt;</code> is
-  the <a href="../Types/mapper.html#identity-mapper">identity
-  mapper</a>.</p>
+nested <a href="../Types/mapper.html">mapper</a> element. The default mapper used
+by <code>&lt;image&gt;</code> is the <a href="../Types/mapper.html#identity-mapper">identity
+mapper</a>.</p>
 
-<p>You can also use a filenamemapper type in place of the mapper
-  element.</p>
+<p>You can also use a <code>filenamemapper</code> type in place of the <code>mapper</code>
+element.</p>
 
 <h3>Examples</h3>
 
-<blockquote><pre>
-&nbsp;&lt;image destdir="samples/low" overwrite="yes"&gt;
-&nbsp;&nbsp;&nbsp;&nbsp; &lt;fileset dir="samples/full"&gt;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &lt;include name="**/*.jpg"/&gt;
-&nbsp;&nbsp;&nbsp;&nbsp; &lt;/fileset&gt;
-&nbsp;&nbsp;&nbsp;&nbsp; &lt;scale width="160" height="160" proportions="fit"/&gt;
-&nbsp;&lt;/image&gt;
-</pre></blockquote>
+<pre>
+&lt;image destdir="samples/low" overwrite="yes"&gt;
+    &lt;fileset dir="samples/full"&gt;
+        &lt;include name="**/*.jpg"/&gt;
+    &lt;/fileset&gt;
+    &lt;scale width="160" height="160" proportions="fit"/&gt;
+&lt;/image&gt;</pre>
 <p>Create thumbnails of my images and make sure they all fit within the 160x160 size whether the
 image is portrait or landscape.</p>
 
-<blockquote><pre>
+<pre>
 &lt;image srcdir="src" includes="*.png"&gt;
     &lt;scale proportions="width" width="40"/&gt;
-&lt;/image&gt;
-</pre></blockquote>
-<p>Creates a thumbnail for all PNG-files in <i>src</i> in the size of 40 pixel keeping the proportions
-and stores the <i>src</i>.</p>
+&lt;/image&gt;</pre>
+<p>Creates a thumbnail for all PNG files in <samp>src</samp> of the size of 40 pixel keeping the
+proportions and stores the <samp>src</samp>.</p>
 
-<blockquote><pre>
+<pre>
 &lt;image srcdir="src" destdir="dest" includes="*.png"&gt;
     &lt;scale proportions="width" width="40"/&gt;
-&lt;/image&gt;
-</pre></blockquote>
-<p>Same as above but stores the result in <i>dest</i>.</p>
+&lt;/image&gt;</pre>
+<p>Same as above but stores the result in <samp>dest</samp>.</p>
 
-<blockquote><pre>
+<pre>
 &lt;image srcdir="src" destdir="dest" includes="*.png"&gt;
     &lt;scale proportions="width" width="40"/&gt;
     &lt;globmapper from="*" to="scaled-*"/&gt;
-&lt;/image&gt;
-</pre></blockquote>
-<p>Same as above but stores the resulting file names will be prefixed
-  by "scaled-".</p>
-
-<blockquote><pre>
-</pre></blockquote>
-
-
+&lt;/image&gt;</pre>
+<p>Same as above but stores the resulting file names will be prefixed by <samp>scaled-</samp>.</p>
 
 </body>
 </html>
-
-
diff -Nru ant-1.9.10/manual/Tasks/import.html ant-1.10.3/manual/Tasks/import.html
--- ant-1.9.10/manual/Tasks/import.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/import.html	2018-03-24 12:37:12.000000000 +0000
@@ -14,7 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
   <meta http-equiv="Content-Language" content="en-us">
@@ -22,262 +21,205 @@
   <title>Import Task</title>
 </head>
 <body>
-  <h2><a name="import">Import</a></h2>
+  <h2 id="import">Import</h2>
   <h3>Description</h3>
-  <p>
-    Imports another build file into the current project.
-  </p>
-
-  <p>
-    On execution it will select the proper ProjectHelper to parse the imported
-    file, using the same algorithm as the one executed at
-    <a href="../projecthelper.html">startup</a>. The selected ProjectHelper
-    instance will then be responsible to actually parse the imported file.
-  </p>
-
-  <p>
-    <b>Note</b> as seen above, this task heavily relies on the ProjectHelper
-    implementation and doesn't really perform any work of its own.  If
-    you have configured Apache Ant to use a ProjectHelper other than Ant's
-    default, this task may or may not work.
-  </p>
-
-  <p>
-    In the common use case where only Ant's default project helper is
-    used, it basically works like the 
-    <a href="http://ant.apache.org/faq.html#xml-entity-include">Entity
-      Includes as explained in the Ant FAQ</a>, as if the imported file was
-    contained in the importing file, minus the top <code>&lt;project&gt;</code>
-    tag.
-  </p>
-
-  <p>
-    The import task may only be used as a top-level task. This means that
-    it may not be used in a target.
-  </p>
-  <p>
-There are two further functional aspects that pertain to this task and
-that are not possible with entity includes:
-<ul>
-  <li>target overriding</li>
-  <li>special properties</li>
-</ul>
-  </p>
-<h4>Target overriding</h4>
-
-<p>If a target in the main file is also present in at least one of the
-imported files, the one from the main file takes precedence.</p>
-
-<p>So if I import for example a <i>docsbuild.xml</i> file named <b>builddocs</b>,
-that contains a &quot;<b>docs</b>&quot; target, I can redefine it in my main
-buildfile and that is the one that will be called. This makes it easy to
-keep the same target name, so that the overriding target is still called
-by any other targets--in either the main or imported buildfile(s)--for which
-it is a dependency, with a different implementation. The target from <i>docsbuild.xml</i> is
-made available by the name &quot;<b>builddocs</b><b>.docs</b>&quot;.
-This enables the new implementation to call the old target, thus
-<i>enhancing</i> it with tasks called before or after it.</p>
-
-<p>If you use the <i>as</i> attribute of the task, its value will be
-  used to prefix the overridden target's name instead of the name
-  attribute of the project tag.</p>
-
-<h4>Special Properties</h4>
-
-<p>Imported files are treated as they are present in the main
-buildfile. This makes it easy to understand, but it makes it impossible
-for them to reference files and resources relative to their path.
-Because of this, for every imported file, Ant adds a property that
-contains the path to the imported buildfile. With this path, the
-imported buildfile can keep resources and be able to reference them
-relative to its position.</p>
-
-<p>So if I import for example a <i>docsbuild.xml</i> file named <b>builddocs</b>,
-I can get its path as <b>ant.file.builddocs</b>, similarly to the <b>ant.file</b>
-property of the main buildfile.</p>
-
-<p>Note that &quot;builddocs&quot; is not the filename, but the name attribute
-present in the imported project tag.</p>
-  <p>
-    If the imported file does not have a name attribute, the ant.file.projectname
-    property will not be set.
-  </p>
-
-<p>Since Ant 1.8.0 the task can also import resources from URLs or
-  classpath resources (which are URLs, really).  If you need to know
-  whether the current build file's source has been a file or an URL
-  you can consult the
-  property <b>ant.file.type.<em>projectname</em></b> (using the same
-  example as above <b>ant.file.type.builddocs</b>) which either have
-  the value "file" or "url".</p>
-
-<h4>Resolving files against the imported file</h4>
-
-<p>Suppose your main build file called <code>importing.xml</code>
-imports a build file <code>imported.xml</code>, located anywhere on
-the file system, and <code>imported.xml</code> reads a set of
-properties from <code>imported.properties</code>:</p>
+  <p>Imports another build file into the current project.</p>
 
-<pre>&lt;!-- importing.xml --&gt;
+  <p>On execution it will select the proper ProjectHelper to parse the imported file, using the same
+    algorithm as the one executed at <a href="../projecthelper.html">startup</a>. The selected
+    ProjectHelper instance will then be responsible to actually parse the imported file.</p>
+
+  <p><strong>Note</strong> as seen above, this task heavily relies on the ProjectHelper
+    implementation and doesn't really perform any work of its own.  If you have configured Apache
+    Ant to use a ProjectHelper other than Ant's default, this task may or may not work.</p>
+
+  <p>In the common use case where only Ant's default project helper is used, it basically works like
+    the <a href="https://ant.apache.org/faq.html#xml-entity-include" target="_top">Entity Includes
+    as explained in the Ant FAQ</a>, as if the imported file was contained in the importing file,
+    minus the top <code>&lt;project&gt;</code> tag.</p>
+
+  <p>The <code>import</code> task may only be used as a top-level task. This means that it may not
+    be used in a target.</p>
+
+  <p>There are two further functional aspects that pertain to this task and that are not possible
+    with entity includes:</p>
+  <ul>
+    <li>target overriding</li>
+    <li>special properties</li>
+  </ul>
+  <h4>Target overriding</h4>
+
+  <p>If a target in the main file is also present in at least one of the imported files, the one
+    from the main file takes precedence.</p>
+
+  <p>So if I import for example a <samp>docsbuild.xml</samp> file named <q>builddocs</q>, that
+    contains a <q>docs</q> target, I can redefine it in my main buildfile and that is the one that
+    will be called. This makes it easy to keep the same target name, so that the overriding target
+    is still called by any other targets&mdash;in either the main or imported buildfile(s)&mdash;for
+    which it is a dependency, with a different implementation. The target
+    from <samp>docsbuild.xml</samp> is made available by the name <q>builddocs.docs</q>.  This
+    enables the new implementation to call the old target, thus <em>enhancing</em> it with tasks
+    called before or after it.</p>
+
+  <p>If you use the <var>as</var> attribute of the task, its value will be used to prefix the
+    overridden target's name instead of the <var>name</var> attribute of the <code>project</code>
+    tag.</p>
+
+  <h4>Special properties</h4>
+
+  <p>Imported files are treated as they are present in the main buildfile. This makes it easy to
+    understand, but it makes it impossible for them to reference files and resources relative to
+    their path.  Because of this, for every imported file, Ant adds a property that contains the
+    path to the imported buildfile. With this path, the imported buildfile can keep resources and be
+    able to reference them relative to its position.</p>
+
+  <p>So if I import for example a <samp>docsbuild.xml</samp> file named <q>builddocs</q>, I can get
+    its path as <code>ant.file.builddocs</code>, similarly to the <code>ant.file</code> property of
+    the main buildfile.</p>
+
+  <p>Note that <q>builddocs</q> is not the filename, but the <var>name</var> attribute present in
+    the imported <code>project</code> tag.</p>
+
+  <p>If the imported file does not have a <var>name</var> attribute,
+    the <code>ant.file.<i>projectname</i></code> property will not be set.</p>
+
+  <p><em>Since Ant 1.8.0</em>, the task can also import resources from URLs or classpath resources
+    (which are URLs, really).  If you need to know whether the current build file's source has been
+    a file or an URL you can consult the property <code>ant.file.type.<i>projectname</i></code>
+    (using the same example as above <code>ant.file.type.builddocs</code>) which either have the
+    value <q>file</q> or <q>url</q>.</p>
+
+  <h4>Resolving files against the imported file</h4>
+
+  <p>Suppose your main build file called <samp>importing.xml</samp> imports a build
+    file <samp>imported.xml</samp>, located anywhere on the file system,
+    and <samp>imported.xml</samp> reads a set of properties
+    from <samp>imported.properties</samp>:</p>
+
+  <pre>
+&lt;!-- importing.xml --&gt;
 &lt;project name="importing" basedir="." default="..."&gt;
-&nbsp; &lt;import file="${path_to_imported}/imported.xml"/&gt;
+  &lt;import file="${path_to_imported}/imported.xml"/&gt;
 &lt;/project&gt;
 
 &lt;!-- imported.xml --&gt;
 &lt;project name="imported" basedir="." default="..."&gt;
-&nbsp; &lt;property file="imported.properties"/&gt;
-&lt;/project&gt;
-</pre>
+  &lt;property file="imported.properties"/&gt;
+&lt;/project&gt;</pre>
 
-<p>This snippet however will resolve <code>imported.properties</code>
-against the basedir of <code>importing.xml</code>, because the basedir
-of <code>imported.xml</code> is ignored by Ant. The right way to use
-<code>imported.properties</code> is:</p>
+  <p>This snippet however will resolve <samp>imported.properties</samp> against
+  the <var>basedir</var> of <samp>importing.xml</samp>, because the <var>basedir</var>
+  of <samp>imported.xml</samp> is ignored by Ant. The right way to
+  use <samp>imported.properties</samp> is:</p>
 
-<pre>
+  <pre>
 &lt;!-- imported.xml --&gt;
 &lt;project name="imported" basedir="." default="..."&gt;
-&nbsp; &lt;dirname property="imported.basedir" file="${ant.file.imported}"/&gt;
-&nbsp; &lt;property file="${imported.basedir}/imported.properties"/&gt;
-&lt;/project&gt;
-</pre>
-
-<p>As explained above <code>${ant.file.imported}</code> stores the
-path of the build script, that defines the project called
-<code>imported</code>, (in short it stores the path to
-<code>imported.xml</code>) and <a
-href="dirname.html"><code>&lt;dirname&gt;</code></a> takes its
-directory. This technique also allows <code>imported.xml</code> to be
-used as a standalone file (without being imported in other
-project).</p>
-
-<p>The above description only works for imported files that actually
-  are imported from files and not from URLs.  For files imported from
-  URLs using resources relative to the imported file requires you to
-  use tasks that can work on non-file resources in the first place.
-  To create a relative resource you'd use something like:</p>
-
-<pre>
-  &lt;loadproperties&gt;
-    &lt;url baseUrl="${ant.file.imported}"
-         relativePath="imported.properties"/&gt;
-  &lt;/loadproperties&gt;
-</pre>
+  &lt;dirname property="imported.basedir" file="${ant.file.imported}"/&gt;
+  &lt;property file="${imported.basedir}/imported.properties"/&gt;
+&lt;/project&gt;</pre>
+
+  <p>As explained above <code>ant.file.imported</code> stores the path of the build script, that
+    defines the project called <q>imported</q>, (in short it stores the path
+    to <samp>imported.xml</samp>) and <a href="dirname.html"><code>&lt;dirname&gt;</code></a> takes
+    its directory. This technique also allows <samp>imported.xml</samp> to be used as a standalone
+    file (without being imported in other project).</p>
+
+  <p>The above description only works for imported files that actually are imported from files and
+    not from URLs.  For files imported from URLs using resources relative to the imported file
+    requires you to use tasks that can work on non-file resources in the first place.  To create a
+    relative resource you'd use something like:</p>
+
+  <pre>
+&lt;loadproperties&gt;
+  &lt;url baseUrl="${ant.file.imported}"
+       relativePath="imported.properties"/&gt;
+&lt;/loadproperties&gt;</pre>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tbody>
     <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
+      <th>Attribute</th>
+      <th>Description</th>
+      <th>Required</th>
     </tr>
     <tr>
-      <td valign="top">
-        file
-      </td>
-      <td valign="top">
-        The file to import. If this is a relative file name, the file name will be resolved
-        relative to the <i>importing</i> file. <b>Note</b>, this is unlike most other
-        ant file attributes, where relative files are resolved relative to ${basedir}.
-      </td>
-      <td valign="top" align="center">Yes or a nested resource collection</td>
+      <td>file</td>
+      <td>The file to import. If this is a relative file name, the file name will be resolved
+        relative to the <em>importing</em> file. <strong>Note</strong>: this is unlike most other
+        Ant file attributes, where relative files are resolved relative to <var>basedir</var>.</td>
+      <td>Yes or a nested resource collection</td>
     </tr>
     <tr>
-      <td valign="top">
-        optional
-      </td>
-      <td valign="top">
-        If true, do not stop the build if the file does not exist,
-        default is false.
-      </td>
-      <td valign="top" align="center">No</td>
+      <td>optional</td>
+      <td>If <q>true</q>, do not stop the build if the file does not exist.</td>
+      <td>No; default is <q>false</q></td>
     </tr>
     <tr>
-      <td valign="top">
-        as
-      </td>
-      <td valign="top">
-        Specifies the prefix prepended to the target names.  If
-        omitted, the name attribute of the project tag of the
-        imported file will be used.
-      </td>
-      <td valign="top" align="center">No</td>
+      <td>as</td>
+      <td>Specifies the prefix prepended to the target names.</td>
+      <td>No; defaults to <var>name</var> attribute of the <code>project</code> tag of the imported
+        file</td>
     </tr>
     <tr>
-      <td valign="top">
-        prefixSeparator
-      </td>
-      <td valign="top">
-        Specifies the separator to be used between the prefix and the
-        target name.  Defaults to ".".
-      </td>
-      <td valign="top" align="center">No</td>
+      <td>prefixSeparator</td>
+      <td>Specifies the separator to be used between the prefix and the target name.</td>
+      <td>No; defaults to <q>.</q></td>
     </tr>
   </tbody>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
 
-<h4>any <a href="../Types/resources.html">resource</a> or resource
-collection</h4>
-
-<p>The specified resources will be imported.  <em>Since Ant
-    1.8.0</em></p>
+<h4>any <a href="../Types/resources.html">resource</a> or resource collection</h4>
+<p><em>Since Ant 1.8.0</em></p>
+<p>The specified resources will be imported.</p>
 
 <h3>Examples</h3>
-<pre>&nbsp; &lt;import file=&quot;../common-targets.xml&quot;/&gt;
-</pre>
+<pre>&lt;import file=&quot;../common-targets.xml&quot;/&gt;</pre>
 
-<p>Imports targets from the common-targets.xml file that is in a parent
-directory.</p>
+<p>Imports targets from the <samp>common-targets.xml</samp> file that is in a parent directory.</p>
 
-<pre>&nbsp; &lt;import file=&quot;${deploy-platform}.xml&quot;/&gt;
-</pre>
+<pre>&lt;import file=&quot;${deploy-platform}.xml&quot;/&gt;</pre>
 
-<p>Imports the project defined by the property deploy-platform</p>
+<p>Imports the project defined by the property <code>deploy-platform</code></p>
 
 <pre>
-  &lt;import&gt;
-    &lt;javaresource name="common/targets.xml"&gt;
-      &lt;classpath location="common.jar"/&gt;
-    &lt;/javaresource&gt;
-  &lt;/import&gt;
-</pre>
+&lt;import&gt;
+  &lt;javaresource name="common/targets.xml"&gt;
+    &lt;classpath location="common.jar"/&gt;
+  &lt;/javaresource&gt;
+&lt;/import&gt;</pre>
+
+<p>Imports targets from the <samp>targets.xml</samp> file that is inside the
+directory <samp>common</samp> inside the jar file <samp>common.jar</samp>.</p>
+
+<h3>How is &lt;import&gt; different from <a href="include.html">&lt;include&gt;</a>?</h3>
+
+<p>The short version: Use <code>import</code> if you intend to override a target, otherwise
+use <code>include</code>.</p>
 
-<p>Imports targets from the targets.xml file that is inside the
-  directory common inside the jar file common.jar.</p>
+<p>When using <code>import</code> the imported targets are available by up to two names.  Their
+"normal" name without any prefix and potentially with a prefixed name (the value of
+the <var>as</var> attribute or the imported project's <var>name</var> attribute, if any).</p>
 
-<h3>How is &lt;import&gt; different
-  from <a href="include.html">&lt;include&gt;</a>?</h3>
+<p>When using <code>include</code> the included targets are only available in the prefixed form.</p>
 
-<p>The short version: Use import if you intend to override a target,
-  otherwise use include.</p>
+<p>When using <code>import</code>, the imported target's <var>depends</var> attribute remains
+unchanged, i.e. it uses "normal" names and allows you to override targets in the dependency
+list.</p>
 
-<p>When using import the imported targets are available by up to two
-  names.  Their "normal" name without any prefix and potentially with
-  a prefixed name (the value of the as attribute or the imported
-  project's name attribute, if any).</p>
-
-<p>When using include the included targets are only available in the
-  prefixed form.</p>
-
-<p>When using import, the imported target's depends attribute
-  remains unchanged, i.e. it uses "normal" names and allows you to
-  override targets in the dependency list.</p>
-
-<p>When using include, the included targets cannot be overridden and
-  their depends attributes are rewritten so that prefixed names are
-  used.  This allows writers of the included file to control which
-  target is invoked as part of the dependencies.</p>
-
-<p>It is possible to include the same file more than once by using
-  different prefixes, it is not possible to import the same file more
-  than once.</p>
+<p>When using <code>include</code>, the included targets cannot be overridden and
+their <var>depends</var> attributes are rewritten so that prefixed names are used.  This allows
+writers of the included file to control which target is invoked as part of the dependencies.</p>
+
+<p>It is possible to <code>include</code> the same file more than once by using different prefixes,
+it is not possible to <code>import</code> the same file more than once.</p>
 
 <h4>Examples</h4>
 
-<p><i>nested.xml</i> shall be:</p>
+<p><samp>nested.xml</samp> shall be:</p>
 
 <pre>
 &lt;project&gt;
@@ -288,10 +230,9 @@
   &lt;target name="echo" depends="setUp"&gt;
     &lt;echo&gt;prop has the value ${prop}&lt;/echo&gt;
   &lt;/target&gt;
-&lt;/project&gt;
-</pre>
+&lt;/project&gt;</pre>
 
-<p>When using import like in</p>
+<p>When using <code>import</code> like in</p>
 
 <pre>
 &lt;project default="test"&gt;
@@ -302,12 +243,11 @@
   &lt;import file="nested.xml" as="nested"/&gt;
 
   &lt;target name="test" depends="nested.echo"/&gt;
-&lt;/project&gt;
-</pre>
+&lt;/project&gt;</pre>
 
-<p>Running the build file will emit:
+<p>Running the build file will emit:</p>
 
-<pre>
+<pre class="output">
 setUp:
 
 nested.echo:
@@ -317,7 +257,7 @@
 
 </pre>
 
-<p>When using include like in</p>
+<p>When using <code>include</code> like in</p>
 
 <pre>
 &lt;project default="test"&gt;
@@ -328,12 +268,11 @@
   &lt;include file="nested.xml" as="nested"/&gt;
 
   &lt;target name="test" depends="nested.echo"/&gt;
-&lt;/project&gt;
-</pre>
+&lt;/project&gt;</pre>
 
-<p>Running the target build file will emit:
+<p>Running the target build file will emit:</p>
 
-<pre>
+<pre class="output">
 nested.setUp:
 
 nested.echo:
@@ -343,7 +282,7 @@
 
 </pre>
 
-<p>and there won't be any target named "echo" on the including build file.</p>
+<p>and there won't be any target named <q>echo</q> on the including build file.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/include.html ant-1.10.3/manual/Tasks/include.html
--- ant-1.9.10/manual/Tasks/include.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/include.html	2018-03-24 12:37:12.000000000 +0000
@@ -14,7 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
   <meta http-equiv="Content-Language" content="en-us">
@@ -22,257 +21,200 @@
   <title>Include Task</title>
 </head>
 <body>
-  <h2><a name="include">Include</a></h2>
+  <h2 id="include">Include</h2>
+  <p><em>Since Apache Ant 1.8.0</em></p>
   <h3>Description</h3>
-  <p>
-    Include another build file into the current project.
-  </p>
-
-  <p><em>since Apache Ant 1.8.0</em></p>
-
-  <p>
-    <b>Note</b> this task heavily relies on the ProjectHelper
-    implementation and doesn't really perform any work of its own.  If
-    you have configured Ant to use a ProjectHelper other than Ant's
-    default, this task may or may not work.
-  </p>
-
-  <p>
-    On execution it will read another Ant file into the same Project
-    rewriting the included target names and depends lists.  This is
-    different
-    from <a href="http://ant.apache.org/faq.html#xml-entity-include">Entity
-    Includes as explained in the Ant FAQ</a> insofar as the target
-    names get prefixed by the included project's name or the as
-    attribute and do not appear as if the file was contained in the
-    including file.
-  </p>
-  <p>
-    The include task may only be used as a top-level task. This means that
-    it may not be used in a target.
-  </p>
-  <p>
-There are two further functional aspects that pertain to this task and
-that are not possible with entity includes:
-<ul>
-  <li>target rewriting</li>
-  <li>special properties</li>
-</ul>
-  </p>
-<h4>Target rewriting</h4>
-
-<p>Any target in the included file will be renamed
-  to <i>prefix.name</i> where <i>name</i> is the original target's
-  name and <i>prefix</i> is either the value of the <i>as</i>
-  attribute or the <i>name</i> attribute of the <i>project</i> tag of
-  the included file.</p>
-
-<p>The depends attribute of all included targets is rewritten so that
-  all target names are prefixed as well.  This makes the included file
-  self-contained.</p>
-
-<p>Note that prefixes nest, so if a build file includes a file with
-  prefix "a" and the included file includes another file with prefix
-  "b", then the targets of that last build file will be prefixed by
-  "a.b.".</p>
-
-<p><code>&lt;import&gt;</code> contribute to the prefix as well, but
-  only if their <code>as</code> attribute has been specified.
-
-<h4>Special Properties</h4>
-
-<p>Included files are treated as they are present in the main
-buildfile. This makes it easy to understand, but it makes it impossible
-for them to reference files and resources relative to their path.
-Because of this, for every included file, Ant adds a property that
-contains the path to the included buildfile. With this path, the
-included buildfile can keep resources and be able to reference them
-relative to its position.</p>
-
-<p>So if I include for example a <i>docsbuild.xml</i> file named <b>builddocs</b>,
-I can get its path as <b>ant.file.builddocs</b>, similarly to the <b>ant.file</b>
-property of the main buildfile.</p>
-
-<p>Note that &quot;builddocs&quot; is not the filename, but the name attribute
-present in the included project tag.</p>
-  <p>
-    If the included file does not have a name attribute, the ant.file.projectname
-    property will not be set.
-  </p>
-
-<p>If you need to know whether the current build file's source has
-  been a file or an URL you can consult the
-  property <b>ant.file.type.<em>projectname</em></b> (using the same
-  example as above <b>ant.file.type.builddocs</b>) which either have
-  the value "file" or "url".</p>
-
-<h4>Resolving files against the included file</h4>
-
-<p>Suppose your main build file called <code>including.xml</code>
-includes a build file <code>included.xml</code>, located anywhere on
-the file system, and <code>included.xml</code> reads a set of
-properties from <code>included.properties</code>:</p>
+  <p>Include another build file into the current project.</p>
 
-<pre>&lt;!-- including.xml --&gt;
+  <p><strong>Note</strong> this task heavily relies on the ProjectHelper implementation and doesn't
+    really perform any work of its own.  If you have configured Ant to use a ProjectHelper other
+    than Ant's default, this task may or may not work.</p>
+
+  <p>On execution it will read another Ant file into the same project rewriting the included
+    target <var>name</var>s and <var>depends</var> lists.  This is different
+    from <a href="https://ant.apache.org/faq.html#xml-entity-include" target="_top">Entity Includes
+    as explained in the Ant FAQ</a> insofar as the target names get prefixed by the included
+    project's <var>name</var> or <var>as</var> attribute and do not appear as if the file was
+    contained in the including file.</p>
+
+  <p>The <code>include</code> task may only be used as a top-level task. This means that
+    it may not be used in a target.</p>
+
+  <p>There are two further functional aspects that pertain to this task and that are not possible
+    with entity includes:</p>
+  <ul>
+    <li>target rewriting</li>
+    <li>special properties</li>
+  </ul>
+  <h4>Target rewriting</h4>
+
+  <p>Any target in the included file will be renamed to <q>prefix.name</q> where <q>name</q> is the
+    original target's name and <q>prefix</q> is either the value of the <var>as</var> attribute or
+    the <var>name</var> attribute of the <code>project</code> tag of the included file.</p>
+
+  <p>The <var>depends</var> attribute of all included targets is rewritten so that all target names
+    are prefixed as well.  This makes the included file self-contained.</p>
+
+  <p>Note that prefixes nest, so if a build file includes a file with prefix <q>q</q> and the
+    included file includes another file with prefix <q>b</q>, then the targets of that last build
+    file will be prefixed by <q>a.b.</q>.</p>
+
+  <p><code>&lt;import&gt;</code> contribute to the prefix as well, but only if their <var>as</var>
+    attribute has been specified.
+
+  <h4>Special properties</h4>
+
+  <p>Included files are treated as they are present in the main buildfile. This makes it easy to
+    understand, but it makes it impossible for them to reference files and resources relative to
+    their path.  Because of this, for every included file, Ant adds a property that contains the
+    path to the included buildfile. With this path, the included buildfile can keep resources and be
+    able to reference them relative to its position.</p>
+
+  <p>So if I include for example a <samp>docsbuild.xml</samp> file named <q>builddocs</q>, I can get
+    its path as <code>ant.file.builddocs</code>, similarly to the <code>ant.file</code> property of
+    the main buildfile.</p>
+
+  <p>Note that <q>builddocs</q> is not the filename, but the <var>name</var> attribute present in
+    the included <code>project</code> tag.</p>
+  <p>If the included file does not have a <var>name</var> attribute,
+    the <code>ant.file.<i>projectname</i></code> property will not be set.</p>
+
+  <p>If you need to know whether the current build file's source has been a file or an URL you can
+    consult the property <code>ant.file.type.<i>projectname</i></code> (using the same example as
+    above <code>ant.file.type.builddocs</code>) which either have the value <q>file</q>
+    or <q>url</q>.</p>
+
+  <h4>Resolving files against the included file</h4>
+
+  <p>Suppose your main build file called <samp>including.xml</samp> includes a build
+    file <samp>included.xml</samp>, located anywhere on the file system,
+    and <samp>included.xml</samp> reads a set of properties
+    from <samp>included.properties</samp>:</p>
+
+  <pre>
+&lt;!-- including.xml --&gt;
 &lt;project name="including" basedir="." default="..."&gt;
-&nbsp; &lt;include file="${path_to_included}/included.xml"/&gt;
+  &lt;include file="${path_to_included}/included.xml"/&gt;
 &lt;/project&gt;
 
 &lt;!-- included.xml --&gt;
 &lt;project name="included" basedir="." default="..."&gt;
-&nbsp; &lt;property file="included.properties"/&gt;
-&lt;/project&gt;
-</pre>
+  &lt;property file="included.properties"/&gt;
+&lt;/project&gt;</pre>
 
-<p>This snippet however will resolve <code>included.properties</code>
-against the basedir of <code>including.xml</code>, because the basedir
-of <code>included.xml</code> is ignored by Ant. The right way to use
-<code>included.properties</code> is:</p>
+  <p>This snippet however will resolve <samp>included.properties</samp> against
+    the <var>basedir</var> of <samp>including.xml</samp>, because the <var>basedir</var>
+    of <samp>included.xml</samp> is ignored by Ant. The right way to
+    use <samp>included.properties</samp> is:</p>
 
-<pre>
+  <pre>
 &lt;!-- included.xml --&gt;
 &lt;project name="included" basedir="." default="..."&gt;
-&nbsp; &lt;dirname property="included.basedir" file="${ant.file.included}"/&gt;
-&nbsp; &lt;property file="${included.basedir}/included.properties"/&gt;
-&lt;/project&gt;
-</pre>
-
-<p>As explained above <code>${ant.file.included}</code> stores the
-path of the build script, that defines the project called
-<code>included</code>, (in short it stores the path to
-<code>included.xml</code>) and <a
-href="dirname.html"><code>&lt;dirname&gt;</code></a> takes its
-directory. This technique also allows <code>included.xml</code> to be
-used as a standalone file (without being included in other
-project).</p>
-
-<p>The above description only works for included files that actually
-  are included from files and not from URLs.  For files included from
-  URLs using resources relative to the included file requires you to
-  use tasks that can work on non-file resources in the first place.
-  To create a relative resource you'd use something like:</p>
-
-<pre>
-  &lt;loadproperties&gt;
-    &lt;url baseUrl="${ant.file.included}"
-         relativePath="included.properties"/&gt;
-  &lt;/loadproperties&gt;
-</pre>
+  &lt;dirname property="included.basedir" file="${ant.file.included}"/&gt;
+  &lt;property file="${included.basedir}/included.properties"/&gt;
+&lt;/project&gt;</pre>
+
+  <p>As explained above <code>ant.file.included</code> stores the path of the build script, that
+    defines the project called <q>included</q>, (in short it stores the path
+    to <samp>included.xml</samp>) and <a href="dirname.html"><code>&lt;dirname&gt;</code></a> takes
+    its directory. This technique also allows <samp>included.xml</samp> to be used as a standalone
+    file (without being included in other project).</p>
+
+  <p>The above description only works for included files that actually are included from files and
+    not from URLs.  For files included from URLs using resources relative to the included file
+    requires you to use tasks that can work on non-file resources in the first place.  To create a
+    relative resource you'd use something like:</p>
+
+  <pre>
+&lt;loadproperties&gt;
+  &lt;url baseUrl="${ant.file.included}"
+       relativePath="included.properties"/&gt;
+&lt;/loadproperties&gt;</pre>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tbody>
     <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
+      <th>Attribute</th>
+      <th>Description</th>
+      <th>Required</th>
     </tr>
     <tr>
-      <td valign="top">
-        file
-      </td>
-      <td valign="top">
-        The file to include. If this is a relative file name, the file name will be resolved
-        relative to the <i>including</i> file. <b>Note</b>, this is unlike most other
-        ant file attributes, where relative files are resolved relative to ${basedir}.
-      </td>
-      <td valign="top" align="center">Yes or a nested resource collection</td>
+      <td>file</td>
+      <td>The file to include. If this is a relative file name, the file name will be resolved
+        relative to the <em>including</em> file. <strong>Note</strong>, this is unlike most other
+        ant file attributes, where relative files are resolved relative to ${basedir}.</td>
+      <td>Yes or a nested resource collection</td>
     </tr>
     <tr>
-      <td valign="top">
-        optional
-      </td>
-      <td valign="top">
-        If true, do not stop the build if the file does not exist,
-        default is false.
-      </td>
-      <td valign="top" align="center">No</td>
+      <td>optional</td>
+      <td>If <q>true</q>, do not stop the build if the file does not exist.</td>
+      <td>No; default is <q>false</q></td>
     </tr>
     <tr>
-      <td valign="top">
-        as
-      </td>
-      <td valign="top">
-        Specifies the prefix prepended to the target names.  If
-        omitted, the name attribute of the project tag of the
-        included file will be used.
-      </td>
-      <td valign="top" align="center">Yes, if the included file's
-        project tag doesn't specify a name attribute.</td>
+      <td>as</td>
+      <td>Specifies the prefix prepended to the target names.</td>
+      <td>Yes, if the included file's <code>project</code> tag doesn't specify a <var>name</var>
+        attribute (which is otherwise taken as default)</td>
     </tr>
     <tr>
-      <td valign="top">
-        prefixSeparator
-      </td>
-      <td valign="top">
-        Specifies the separator to be used between the prefix and the
-        target name.  Defaults to ".".
-      </td>
-      <td valign="top" align="center">No</td>
+      <td>prefixSeparator</td>
+      <td>Specifies the separator to be used between the prefix and the target name.</td>
+      <td>No; defaults to <q>.</q></td>
     </tr>
   </tbody>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
 
-<h4>any <a href="../Types/resources.html">resource</a> or resource
-collection</h4>
+<h4>any <a href="../Types/resources.html">resource</a> or resource collection</h4>
 
 <p>The specified resources will be included.</p>
 
 <h3>Examples</h3>
-<pre>&nbsp; &lt;include file=&quot;../common-targets.xml&quot;/&gt;
-</pre>
+<pre>&lt;include file=&quot;../common-targets.xml&quot;/&gt;</pre>
 
-<p>Includes targets from the common-targets.xml file that is in a parent
-directory.</p>
+<p>Includes targets from the <samp>common-targets.xml</samp> file that is in a parent directory.</p>
 
-<pre>&nbsp; &lt;include file=&quot;${deploy-platform}.xml&quot;/&gt;
-</pre>
+<pre>&lt;include file=&quot;${deploy-platform}.xml&quot;/&gt;</pre>
 
 <p>Includes the project defined by the property deploy-platform</p>
 
 <pre>
-  &lt;include&gt;
-    &lt;javaresource name="common/targets.xml"&gt;
-      &lt;classpath location="common.jar"/&gt;
-    &lt;/javaresource&gt;
-  &lt;/include&gt;
-</pre>
+&lt;include&gt;
+  &lt;javaresource name="common/targets.xml"&gt;
+    &lt;classpath location="common.jar"/&gt;
+  &lt;/javaresource&gt;
+&lt;/include&gt;</pre>
 
-<p>Includes targets from the targets.xml file that is inside the
-  directory common inside the jar file common.jar.</p>
+<p>Includes targets from the <samp>targets.xml</samp> file that is inside the
+directory <samp>common</samp> inside the jar file <samp>common.jar</samp>.</p>
 
-<h3>How is <a href="import.html">&lt;import&gt;</a> different
-  from &lt;include&gt;?</h3>
+<h3>How is <a href="import.html">&lt;import&gt;</a> different from &lt;include&gt;?</h3>
 
-<p>The short version: Use import if you intend to override a target,
-  otherwise use include.</p>
+<p>The short version: Use <code>import</code> if you intend to override a target, otherwise
+use <code>include</code>.</p>
 
-<p>When using import the imported targets are available by up to two
-  names.  Their "normal" name without any prefix and potentially with
-  a prefixed name (the value of the as attribute or the imported
-  project's name attribute, if any).</p>
-
-<p>When using include the included targets are only available in the
-  prefixed form.</p>
-
-<p>When using import, the imported target's depends attribute
-  remains unchanged, i.e. it uses "normal" names and allows you to
-  override targets in the dependency list.</p>
-
-<p>When using include, the included targets cannot be overridden and
-  their depends attributes are rewritten so that prefixed names are
-  used.  This allows writers of the included file to control which
-  target is invoked as part of the dependencies.</p>
-
-<p>It is possible to include the same file more than once by using
-  different prefixes, it is not possible to import the same file more
-  than once.</p>
+<p>When using <code>import</code> the imported targets are available by up to two names.  Their
+"normal" name without any prefix and potentially with a prefixed name (the value of
+the <var>as</var> attribute or the imported project's <var>name</var> attribute, if any).</p>
+
+<p>When using <code>include</code> the included targets are only available in the prefixed form.</p>
+
+<p>When using <code>import</code>, the imported target's <var>depends</var> attribute remains
+unchanged, i.e. it uses "normal" names and allows you to override targets in the dependency
+list.</p>
+
+<p>When using <code>include</code>, the included targets cannot be overridden and
+their <var>depends</var> attributes are rewritten so that prefixed names are used.  This allows
+writers of the included file to control which target is invoked as part of the dependencies.</p>
+
+<p>It is possible to <code>include</code> the same file more than once by using different prefixes,
+it is not possible to <code>import</code> the same file more than once.</p>
 
 <h4>Examples</h4>
 
-<p><i>nested.xml</i> shall be:</p>
+<p><samp>nested.xml</samp> shall be:</p>
 
 <pre>
 &lt;project&gt;
@@ -283,10 +225,9 @@
   &lt;target name="echo" depends="setUp"&gt;
     &lt;echo&gt;prop has the value ${prop}&lt;/echo&gt;
   &lt;/target&gt;
-&lt;/project&gt;
-</pre>
+&lt;/project&gt;</pre>
 
-<p>When using import like in</p>
+<p>When using <code>import</code> like in</p>
 
 <pre>
 &lt;project default="test"&gt;
@@ -297,12 +238,11 @@
   &lt;import file="nested.xml" as="nested"/&gt;
 
   &lt;target name="test" depends="nested.echo"/&gt;
-&lt;/project&gt;
-</pre>
+&lt;/project&gt;</pre>
 
-<p>Running the build file will emit:
+<p>Running the build file will emit:</p>
 
-<pre>
+<pre class="output">
 setUp:
 
 nested.echo:
@@ -312,7 +252,7 @@
 
 </pre>
 
-<p>When using include like in</p>
+<p>When using <code>include</code> like in</p>
 
 <pre>
 &lt;project default="test"&gt;
@@ -323,12 +263,11 @@
   &lt;include file="nested.xml" as="nested"/&gt;
 
   &lt;target name="test" depends="nested.echo"/&gt;
-&lt;/project&gt;
-</pre>
+&lt;/project&gt;</pre>
 
-<p>Running the target build file will emit:
+<p>Running the target build file will emit:</p>
 
-<pre>
+<pre class="output">
 nested.setUp:
 
 nested.echo:
@@ -338,7 +277,7 @@
 
 </pre>
 
-<p>and there won't be any target named "echo" on the including build file.</p>
+<p>and there won't be any target named <q>echo</q> on the including build file.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/input.html ant-1.10.3/manual/Tasks/input.html
--- ant-1.9.10/manual/Tasks/input.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/input.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,175 +24,153 @@
 
 <body>
 
-<h2><a name="input">Input</a></h2>
+<h2 id="input">Input</h2>
 <h3>Description</h3>
 
-<p>Allows user interaction during the build process by prompting for
-input.  To do so, it uses the configured 
-<a href="../inputhandler.html">InputHandler</a>.</p>
-
-<p>The prompt can be set via the message attribute or as character
-data nested into the element.</p>
-
-<p>Optionally a set of valid input arguments can be defined via the
-validargs attribute. Input task will not accept a value that doesn't match
-one of the predefined.</p>
-
-<p>Optionally a property can be created from the value entered by the
-user. This property can then be used during the following build
-run. Input behaves according to <a href="property.html">property
-task</a> which means that existing properties cannot be overridden.
-Since Apache Ant 1.6, <code>&lt;input&gt;</code> will not prompt for input if
-a property should be set by the task that has already been set in the
-project (and the task wouldn't have any effect).</p>
-
-<p>Historically, a regular complaint about this task has been that it echoes
-characters to the console, this is a critical security defect, we must fix it
-immediately, etc, etc.  This problem was due to the lack in early versions of
-Java of a (fully functional) facility for handling secure console input.
-In Java 1.6 that shortcoming in Java's API was addressed and Ant versions 1.7.1
-and 1.8 have added support for Java 1.6's secure console input feature
-(see <a href="#handler.type">handler type</a>).</p>
-
-<p>
-IDE behaviour depends upon the IDE: some hang waiting for input, some let you
-type it in. For this situation, place the password in a (secured) property
-file and load in before the input task.</p>
+<p>Allows user interaction during the build process by prompting for input.  To do so, it uses the
+configured <a href="../inputhandler.html">InputHandler</a>.</p>
+
+<p>The prompt can be set via the <var>message</var> attribute or as character data nested into the
+element.</p>
+
+<p>Optionally a set of valid input arguments can be defined via the <var>validargs</var>
+attribute. <code>Input</code> task will not accept a value that doesn't match one of the
+predefined.</p>
+
+<p>Optionally a property can be created from the value entered by the user. This property can then
+be used during the following build run. <code>Input</code> then behaves
+as <a href="property.html">property task</a> which means that existing properties cannot be
+overridden.  <em>Since Apache Ant 1.6</em>, <code>&lt;input&gt;</code> will not prompt for input if
+a property should be set by the task that has already been set in the project (and the task wouldn't
+have any effect).</p>
+
+<p>Historically, a regular complaint about this task has been that it echoes characters to the
+console, this is a critical security defect, we must fix it immediately, etc, etc.  This problem was
+due to the lack in early versions of Java of a (fully functional) facility for handling secure
+console input.  In Java 6 that shortcoming in Java's API was addressed and Ant versions 1.7.1 and
+1.8 have added support for Java 6 secure console input feature (see <a href="#handler.type">handler
+type</a>).</p>
+
+<p>IDE behaviour depends upon the IDE: some hang waiting for input, some let you type it in. For
+this situation, place the password in a (secured) property file and load in before
+the <code>input</code> task.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">message</td>
-    <td valign="top">the Message which gets displayed to the user
-    during the build run.</td>
-    <td valign="top" align="center">No</td>
+    <td>message</td>
+    <td>the Message which gets displayed to the user during the build run.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">validargs</td>
-    <td valign="top">comma separated String containing valid input
-    arguments. If set, input task will reject any input not defined
-    here.  Validargs are compared case sensitive. If you want 'a' and
-    'A' to be accepted you will need to define both arguments within
-    validargs.</td>
-    <td valign="top" align="center">No</td>
+    <td>validargs</td>
+    <td>comma separated String containing valid input arguments. If set, <code>input</code> task
+      will reject any input not defined here. Comparison of input to <var>validargs</var> is case
+      sensitive. If you want <q>a</q> and
+    <q>A</q> to be accepted you will need to define both arguments within <var>validargs</var>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">addproperty</td>
-    <td valign="top">the name of a property to be created from
-    input. Behaviour is equal to <a href="property.html">property
-    task</a> which means that existing properties cannot be
-    overridden.</td>
-    <td valign="top" align="center">No</td>
+    <td>addproperty</td>
+    <td>the name of a property to be created from input. Behaviour is equal
+      to <a href="property.html">property task</a> which means that existing properties cannot be
+      overridden.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">defaultvalue</td>
-    <td valign="top">Defines the default value of the property to be
-    created from input.  Property value will be set to default if no
-    input is received.</td>
-    <td valign="top" align="center">No</td>
+    <td>defaultvalue</td>
+    <td>Defines the default value of the property to be created from input.  Property value will be
+      set to default if no input is received.</td>
+    <td>No</td>
   </tr>
 </table>
-<h3>Parameters Specified as Nested Elements</h3>
+<h3>Parameters specified as nested elements</h3>
 <h4>Handler</h4>
-<p>Since <b>Ant 1.7</b>, a nested &lt;handler&gt; element can be used to
-specify an InputHandler, so that different InputHandlers may be used
-among different Input tasks.
+<p><em>Since Ant 1.7</em>, a nested <code>&lt;handler&gt;</code> element can be used to specify
+an <code>InputHandler</code>, so that different <code>InputHandler</code>s may be used among
+different <code>Input</code> tasks.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
-  <tr>
-    <td valign="top"><a name="handler.type" />type</td>
-    <td valign="top">one of "default","propertyfile", "greedy", or "secure" (since Ant 1.8).
-    </td>
-    <td align="center" valign="top" rowspan="3">One of these</td>
+  <tr id="handler.type">
+    <td>type</td>
+    <td>one of <q>default</q>, <q>propertyfile</q>, <q>greedy</q>, or <q>secure</q> (<em>since Ant
+      1.8</em>).</td>
+    <td rowspan="3">One of these</td>
   </tr>
   <tr>
-    <td valign="top">refid</td>
-    <td valign="top">Reference to an <code>InputHandler</code>
-        defined elsewhere in the project.
-    </td>
+    <td>refid</td>
+    <td class="left">Reference to an <code>InputHandler</code> defined elsewhere in the
+      project.</td>
   </tr>
   <tr>
-    <td valign="top">classname</td>
-    <td valign="top">The name of an <code>InputHandler</code> subclass.</td>
+    <td>classname</td>
+    <td class="left">The name of an <code>InputHandler</code> subclass.</td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">The classpath to use with <i>classname</i>.</td>
-    <td valign="top">No</td>
+    <td>classpath</td>
+    <td>The classpath to use with <var>classname</var>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">The refid of a classpath to use with <i>classname</i>.</td>
-    <td valign="top">No</td>
+    <td>classpathref</td>
+    <td>The refid of a classpath to use with <var>classname</var>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">loaderref</td>
-    <td valign="top">The refid of a classloader to use with <i>classname</i>.
+    <td>loaderref</td>
+    <td>The refid of a classloader to use with <var>classname</var>.
     </td>
-    <td valign="top">No</td>
+    <td>No</td>
   </tr>
 </table>
-<br />
-The classpath can also be specified by means of one or more nested
-&lt;classpath&gt; elements.</p>
+<p>The classpath can also be specified by means of one or more nested <code>&lt;classpath&gt;</code>
+elements.</p>
 
 <h3>Examples</h3>
-<pre>  &lt;input/&gt;</pre>
-<p>Will pause the build run until return key is pressed when using the
-<a href="../inputhandler.html#defaulthandler">default
-InputHandler</a>, the concrete behavior is defined by the InputHandler
-implementation you use.</p>
-<pre>  &lt;input&gt;Press Return key to continue...&lt;/input&gt;</pre>
-<p>Will display the message &quot;Press Return key to
-continue...&quot; and pause the build run until return key is pressed
-(again, the concrete behavior is implementation dependent).</p>
-<pre>  &lt;input
-    message=&quot;Press Return key to continue...&quot;
-  /&gt;</pre>
-<p>Will display the message &quot;Press Return key to
-continue...&quot; and pause the build run until return key is pressed
-(see above).</p>
+<pre>&lt;input/&gt;</pre>
+<p>Will pause the build run until return key is pressed when using
+the <a href="../inputhandler.html#defaulthandler">default InputHandler</a>, the concrete behavior is
+defined by the <code>InputHandler</code> implementation you use.</p>
+<pre>&lt;input&gt;Press Return key to continue...&lt;/input&gt;</pre>
+<p>Will display the message <q>Press Return key to continue...</q> and pause the build run until
+return key is pressed (again, the concrete behavior is implementation dependent).</p>
+<pre>&lt;input message=&quot;Press Return key to continue...&quot;/&gt;</pre>
+<p>Will display the message <q>Press Return key to continue...</q> and pause the build run until
+return key is pressed (see above).</p>
 <pre>
-  &lt;input
-    message=&quot;All data is going to be deleted from DB continue (y/n)?&quot;
-    validargs=&quot;y,n&quot;
-    addproperty=&quot;do.delete&quot;
-  /&gt;
-  &lt;condition property=&quot;do.abort&quot;&gt;
-    &lt;equals arg1=&quot;n&quot; arg2=&quot;${do.delete}&quot;/&gt;
-  &lt;/condition&gt;
-  &lt;fail if=&quot;do.abort&quot;&gt;Build aborted by user.&lt;/fail&gt;
+&lt;input message=&quot;All data is going to be deleted from DB continue (y/n)?&quot;
+       validargs=&quot;y,n&quot;
+       addproperty=&quot;do.delete&quot;/&gt;
+&lt;condition property=&quot;do.abort&quot;&gt;
+  &lt;equals arg1=&quot;n&quot; arg2=&quot;${do.delete}&quot;/&gt;
+&lt;/condition&gt;
+&lt;fail if=&quot;do.abort&quot;&gt;Build aborted by user.&lt;/fail&gt;
 </pre>
-<p>Will display the message &quot;All data is going to be deleted from
-DB continue (y/n)?&quot; and require 'y' to continue build or 'n' to
-exit build with following message &quot;Build aborted by
-user.&quot;.</p>
-<pre>  &lt;input
-    message=&quot;Please enter db-username:&quot;
-    addproperty=&quot;db.user&quot;
-  /&gt;</pre>
-<p>Will display the message &quot;Please enter db-username:&quot; and set the
+<p>Will display the message <q>All data is going to be deleted from DB continue (y/n)?</q>  and
+require <q>y</q> to continue build or <q>n</q> to exit build with following message <q>Build aborted
+by user.</q>.</p>
+<pre>
+&lt;input message=&quot;Please enter db-username:&quot;
+       addproperty=&quot;db.user&quot;/&gt;</pre>
+<p>Will display the message <q>Please enter db-username:</q> and set the
 property <code>db.user</code> to the value entered by the user.</p>
 
-<pre>  &lt;input
-    message=&quot;Please enter db-username:&quot;
-    addproperty=&quot;db.user&quot;
-    defaultvalue=&quot;Scott-Tiger&quot;
-  /&gt;</pre>
-<p>Same as above, but will set <code>db.user</code> to the value
-<i>Scott- Tiger</i> if the user enters no value (simply types
-&lt;return&gt;).</p>
-
+<pre>
+&lt;input message=&quot;Please enter db-username:&quot;
+       addproperty=&quot;db.user&quot;
+       defaultvalue=&quot;Scott-Tiger&quot;/&gt;</pre>
+<p>Same as above, but will set <code>db.user</code> to the value <q>Scott-Tiger</q> if the user
+enters no value (simply presses <q>return</q>).</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/jar.html ant-1.10.3/manual/Tasks/jar.html
--- ant-1.9.10/manual/Tasks/jar.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/jar.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,524 +24,468 @@
 
 <body>
 
-<h2><a name="jar">Jar</a></h2>
+<h2 id="jar">Jar</h2>
 <h3>Description</h3>
 <p>Jars a set of files.</p>
-<p>The <i>basedir</i> attribute is the reference directory from where to jar.</p>
+<p>The <var>basedir</var> attribute is the reference directory from where to jar.</p>
 <p>Note that file permissions will not be stored in the resulting jarfile.</p>
-<p>It is possible to refine the set of files that are being jarred. This can be
-done with the <i>includes</i>, <i>includesfile</i>, <i>excludes</i>, <i>excludesfile</i> and <i>defaultexcludes</i>
-attributes. With the <i>includes</i> or <i>includesfile</i> attribute you specify the files you want to
-have included by using patterns. The <i>exclude</i> or <i>excludesfile</i> attribute is used to specify
-the files you want to have excluded. This is also done with patterns. And
-finally with the <i>defaultexcludes</i> attribute, you can specify whether you
-want to use default exclusions or not. See the section on <a
-href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
+
+<p>It is possible to refine the set of files that are being jarred. This can be done with
+the <var>includes</var>, <var>includesfile</var>, <var>excludes</var>, <var>excludesfile</var>
+and <var>defaultexcludes</var> attributes. With the <var>includes</var> or <var>includesfile</var>
+attribute you specify the files you want to have included by using patterns. The <var>exclude</var>
+or <var>excludesfile</var> attribute is used to specify the files you want to have excluded. This is
+also done with patterns. And finally with the <var>defaultexcludes</var> attribute, you can specify
+whether you want to use default exclusions or not. See the section
+on <a href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
 inclusion/exclusion of files works, and how to write patterns.</p>
-<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and
-supports most attributes of <code>&lt;fileset&gt;</code>
-(<code>dir</code> becomes <code>basedir</code>) as well as the nested
-<code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and
-<code>&lt;patternset&gt;</code> elements.</p>
-<p>You can also use nested file sets for more flexibility, and specify
-multiple ones to merge together different trees of files into one JAR.
-The extended fileset and groupfileset child elements from the zip task are
-also available in the jar task.
-See the <a href="zip.html">Zip</a> task for more details and examples.</p>
-
-<p>The <code>update</code> parameter controls what happens if the JAR
-file already exists. When set to <code>yes</code>, the JAR file is
-updated with the files specified. When set to <code>no</code> (the
-default) the JAR file is overwritten. An example use of this is
-provided in the <a href="zip.html">Zip task documentation</a>.  Please
-note that ZIP files store file modification times with a granularity
-of two seconds.  If a file is less than two seconds newer than the
-entry in the archive, Ant will not consider it newer.</p>
 
-<p>If the manifest is omitted, a simple one will be supplied by Apache Ant.</p>
+<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and supports most
+attributes of <code>&lt;fileset&gt;</code> (<var>dir</var> becomes <var>basedir</var>) as well as
+the nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code>
+and <code>&lt;patternset&gt;</code> elements.</p>
+<p>You can also use nested file sets for more flexibility, and specify multiple ones to merge
+together different trees of files into one JAR.  The extended <code>fileset</code>
+and <code>groupfileset</code> child elements from the <code>zip</code> task are also available in
+the <code>jar</code> task.  See the <a href="zip.html">Zip</a> task for more details and
+examples.</p>
+
+<p>The <var>update</var> parameter controls what happens if the JAR file already exists. When set
+to <q>yes</q>, the JAR file is updated with the files specified. When set to <q>no</q> (the default)
+the JAR file is overwritten. An example use of this is provided in the <a href="zip.html">Zip task
+documentation</a>.  Please note that ZIP files store file modification times with a granularity of 2
+seconds.  If a file is less than 2 seconds newer than the entry in the archive, Ant will not
+consider it newer.</p>
 
-<p>The <code>whenmanifestonly</code> parameter controls what happens when no
-files, apart from the manifest file, or nested services, match.
-If <code>skip</code>, the JAR is not created and a warning is issued.
-If <code>fail</code>, the JAR is not created and the build is halted with an error.
-If <code>create</code>, (default) an empty JAR file (only containing a manifest and services)
-is created.</p>
-
-<p>(The Jar task is a shortcut for specifying the manifest file of a JAR file.
-The same thing can be accomplished by using the <i>fullpath</i>
-attribute of a zipfileset in a Zip task. The one difference is that if the
-<i>manifest</i> attribute is not specified, the Jar task will
-include an empty one for you.)</p>
-
-<p>Manifests are processed by the Jar task according to the
-<a target="_blank" href="http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html">Jar file specification.</a>
-Note in particular that this may result in manifest lines greater than 72 bytes
-being wrapped and continued on the next line.</p>
-
-<p>The Jar task checks whether you specified package information according to the
-<a target="_blank" href="http://docs.oracle.com/javase/7/docs/technotes/guides/versioning/spec/versioning2.html#wp90779">
-versioning specification</a>.</p>
-
-<p><b>Please note that the zip format allows multiple files of the same
-fully-qualified name to exist within a single archive. This has been
-documented as causing various problems for unsuspecting users. If you wish
-to avoid this behavior you must set the <code>duplicate</code> attribute
-to a value other than its default, <code>"add"</code>.</b></p>
+<p>If the manifest is omitted, a simple one will be supplied by Apache Ant.</p>
 
-<p>To cryptographically sign your JAR file, use the <a href="signjar.html">SignJar task</a> on the JAR that you create from this task.</p>
+<p>The <var>whenmanifestonly</var> parameter controls what happens when no files, apart from the
+manifest file, or nested services, match.  If <q>skip</q>, the JAR is not created and a warning is
+issued.  If <q>fail</q>, the JAR is not created and the build is halted with an error.
+If <q>create</q> (default), an empty JAR file (only containing a manifest and services) is
+created.</p>
+
+<p>(The <code>Jar</code> task has a shortcut for specifying the manifest file of a JAR file.  The
+same thing can be accomplished by using the <var>fullpath</var> attribute of
+a <code>zipfileset</code> in a <code>Zip</code> task. The one difference is that if
+the <var>manifest</var> attribute is not specified, the <code>Jar</code> task will include an empty
+one for you.)</p>
+
+<p>Manifests are processed by the <code>Jar</code> task according to
+the <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/jar/jar.html" target="_top">Jar
+file specification.</a>  Note in particular that this may result in manifest lines greater than 72
+bytes being wrapped and continued on the next line.</p>
+
+<p>The <code>Jar</code> task checks whether you specified package information according to
+the <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/versioning/spec/versioning2.html#wp90779"
+target="_top">versioning specification</a>.</p>
+
+<p><strong>Please note that the ZIP format allows multiple files of the same fully-qualified name to
+exist within a single archive. This has been documented as causing various problems for unsuspecting
+users. If you wish to avoid this behavior you must set the <var>duplicate</var> attribute to a value
+other than its default, <q>add</q>.</strong></p>
+
+<p>To cryptographically sign your JAR file, use the <a href="signjar.html">SignJar task</a> on the
+JAR that you create from this task.</p>
+
+<p>For creating a simple version of a <a href="http://openjdk.java.net/jeps/238" target="_top">JEP
+238 multi-release jar</a>, you don't need any special tools. Just set the
+required <code>manifest</code> entry and place the files where required, as you could see in
+the <a href="#jep238-example">JEP 238 example</a>. If you want to tune this kind of jar,
+e.g. decreasing the size by deleting 'same' classes from the versions-branches, you have to do more
+...</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">destfile</td>
-    <td valign="top">the JAR file to create.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>destfile</td>
+    <td>the JAR file to create.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">basedir</td>
-    <td valign="top">the directory from which to jar the files.</td>
-    <td valign="top" align="center">No</td>
+    <td>basedir</td>
+    <td>the directory from which to jar the files.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">compress</td>
-    <td valign="top">Not only store data but also compress them,
-    defaults to true.  Unless you set the <em>keepcompression</em>
-    attribute to false, this will apply to the entire archive, not
-    only the files you've added while updating.</td>
-    <td align="center" valign="top">No</td>
+    <td>compress</td>
+    <td>Not only store data but also compress them.  Unless you set the <var>keepcompression</var>
+      attribute to <q>false</q>, this will apply to the entire archive, not only the files you've
+      added while updating.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">keepcompression</td>
-    <td valign="top">For entries coming from existing archives (like
-    nested <em>zipfileset</em>s or while updating the archive), keep
-    the compression as it has been originally instead of using the
-    <em>compress</em> attribute.  Defaults false.  <em>Since Ant
-    1.6</em></td>
-    <td align="center" valign="top">No</td>
+    <td>keepcompression</td>
+    <td>For entries coming from existing archives (like nested <code>zipfileset</code>s or while
+      updating the archive), keep the compression as it has been originally instead of using the
+    <var>compress</var> attribute.  <em>Since Ant 1.6</em></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">The character encoding to use for filenames
-      inside the archive.  Defaults to UTF8. <strong>It is not
-      recommended to change this value as the created archive will
-      most likely be unreadable for Java otherwise.</strong>
-      <br/>See also the <a href="zip.html#encoding">discussion in the
-      zip task page</a></td>
-    <td align="center" valign="top">No</td>
+    <td>encoding</td>
+    <td>The character encoding to use for filenames inside the archive. <strong>It is not
+      recommended to change this value as the created archive will most likely be unreadable for
+      Java otherwise.</strong>  <br/>See also the <a href="zip.html#encoding">discussion in the zip
+      task page</a></td>
+    <td>No; defaults to <q>UTF8</q></td>
   </tr>
   <tr>
-    <td valign="top">filesonly</td>
-    <td valign="top">Store only file entries, defaults to false</td>
-    <td align="center" valign="top">No</td>
+    <td>filesonly</td>
+    <td>Store only file entries</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">includes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      included. All files are included when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>includes</td>
+    <td>comma- or space-separated list of patterns of files that must be included</td>
+    <td>No; defaults to all (<q>**</q>)</td>
   </tr>
   <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an include pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>includesfile</td>
+    <td>name of a file. Each line of this file is taken to be an include pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">excludes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      excluded. No files (except default excludes) are excluded when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>excludes</td>
+    <td>comma- or space-separated list of patterns of files that must be excluded</td>
+    <td>No; defaults to default excludes or none if <var>defaultexcludes</var> is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an exclude pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>excludesfile</td>
+    <td>Name of a file. Each line of this file is taken to be an exclude pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">defaultexcludes</td>
-    <td valign="top">indicates whether default excludes should be used or not
-      (&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>defaultexcludes</td>
+    <td>indicates whether default excludes should be used or not (<q>yes|no</q>)</td>
+    <td>No; defaults to <q>yes</q></td>
   </tr>
   <tr>
-    <td valign="top">manifest</td>
-    <td valign="top">the manifest file to use.  This can be either the location of a manifest, or the name of a jar added through a fileset.  If its the name of an added jar, the task expects the manifest to be in the jar at META-INF/MANIFEST.MF</td>
-    <td valign="top" align="center">No</td>
+    <td>manifest</td>
+    <td>the manifest file to use.  This can be either the location of a manifest, or the name of a
+      jar added through a fileset.  If its the name of an added jar, the task expects the manifest
+      to be in the jar at <samp>META-INF/MANIFEST.MF</samp></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">filesetmanifest</td>
-    <td valign="top">behavior when a Manifest is found in a zipfileset or zipgroupfileset file is found.  Valid values are &quot;skip&quot;, &quot;merge&quot;, and &quot;mergewithoutmain&quot;.  &quot;merge&quot; will merge all of the manifests together, and merge this into any other specified manifests.  &quot;mergewithoutmain&quot; merges everything but the Main section of the manifests.  Default value is &quot;skip&quot;.
+    <td>filesetmanifest</td>
+    <td>behavior when a manifest is found in a <code>zipfileset</code>
+      or <code>zipgroupfileset</code> file.  Valid values are <q>skip</q>, <q>merge</q>,
+      and <q>mergewithoutmain</q>.  <q>merge</q> will merge all of the manifests together, and merge
+      this into any other specified manifests.  <q>mergewithoutmain</q> merges everything but the
+      Main section of the manifests.
     </td>
-    <td valign="top" align="center">No</td>
+    <td>No; defaults to <q>skip</q></td>
+  </tr>
+  <tr>
+    <td>update</td>
+    <td>indicates whether to update or overwrite the destination file if it already exists</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>whenmanifestonly</td>
+    <td>behavior when no files match.  Valid values are <q>fail</q>, <q>skip</q>,
+      and <q>create</q>.</td>
+    <td>No; defaults to <q>create</q></td>
+  </tr>
+  <tr>
+    <td>duplicate</td>
+    <td>behavior when a duplicate file is found.  Valid values are <q>add</q>, <q>preserve</q>,
+      and <q>fail</q>.</td>
+    <td>No; defaults to <q>add</q></td>
+  </tr>
+  <tr>
+    <td>index</td>
+    <td>whether to create
+      an <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/jar/jar.html#JAR_Index"
+      target="_top">index list</a> to speed up classloading.  This is a JDK 1.3+ specific feature.
+      Unless you specify additional jars with nested <a href="#indexjars"><code>indexjars</code></a>
+      elements, only the contents of this jar will be included in the index.</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>indexMetaInf</td>
+    <td>whether to include <samp>META-INF</samp> and its children in the index.  Doesn't have any
+      effect if <var>index</var> is <q>false</q>.<br/>Sun's jar implementation used to skip
+      the <samp>META-INF</samp> directory and Ant followed that example.  The behavior has been
+      changed with <a href="https://bugs.openjdk.java.net/browse/JDK-4408526" target="_top">Java
+      5</a>.  In order to avoid problems with Ant generated jars on Java 1.4 or earlier Ant will not
+      include <samp>META-INF</samp> unless explicitly asked to. <em>Since Ant 1.8.0</em></td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>manifestencoding</td>
+    <td>The encoding used to read the JAR manifest, when a manifest file is specified.  The task
+      will always use UTF-8 when writing the manifest.</td>
+    <td>No; defaults to default JVM character encoding</td>
+  </tr>
+  <tr>
+    <td>roundup</td>
+    <td>Whether the file modification times will be rounded up to the next even number of
+      seconds.<br/>Zip archives store file modification times with a granularity of 2 seconds, so
+      the times will either be rounded up or down.  If you round down, the archive will always seem
+      out-of-date when you rerun the task, so the default is to round up.  Rounding up may lead to a
+      different type of problems like JSPs inside a web archive that seem to be slightly more recent
+      than precompiled pages, rendering precompilation useless. <em>Since Ant 1.6.2</em></td>
+    <td>No; defaults to <q>true</q></td>
+  </tr>
+  <tr>
+    <td>level</td>
+    <td>Non-default level at which file compression should be performed. Valid values range
+      from <q>0</q> (no compression/fastest) to <q>9</q> (maximum compression/slowest). <em>Since
+      Ant 1.7</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>strict</td>
+    <td>Configures how to handle breaks of the packaging version specification:
+      <ul>
+        <li><q>fail</q> = throws a BuildException</li>
+        <li><q>warn</q> = logs a message on warn level</li>
+        <li><q>ignore</q> = logs a message on verbose level (default)</li>
+      </ul><em>Since Ant 1.7.1</em></td>
+    <td>No; defaults to <q>ignore</q></td>
   </tr>
   <tr>
-    <td valign="top">update</td>
-    <td valign="top">indicates whether to update or overwrite
-      the destination file if it already exists.  Default is &quot;false&quot;.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">whenmanifestonly</td>
-    <td valign="top">behavior when no files match.  Valid values are &quot;fail&quot;, &quot;skip&quot;, and &quot;create&quot;.  Default is &quot;create&quot;.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">duplicate</td>
-    <td valign="top">behavior when a duplicate file is found.  Valid values are &quot;add&quot;, &quot;preserve&quot;, and &quot;fail&quot;.  The default value is &quot;add&quot;.  </td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">index</td>
-    <td valign="top">whether to create an <A
-    HREF="http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index">index
-    list</A> to speed up classloading.  This is a JDK 1.3+ specific
-    feature.  Unless you specify additional jars with nested <a
-    href="#indexjars"><code>indexjars</code></a> elements, only the
-    contents of this jar will be included in the index.  Defaults to
-    false.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">indexMetaInf</td>
-    <td valign="top">whether to include META-INF and its children in
-      the index.  Doesn't have any effect if <em>index</em> is
-      false.<br/>
-      Sun's jar implementation used to skip the META-INF directory and
-      Ant followed that example.  The behavior has been changed with
-      <a href="https://bugs.openjdk.java.net/browse/JDK-4408526">Java
-      5</a>.  In order to avoid problems with Ant generated jars on
-      Java 1.4 or earlier Ant will not include META-INF unless
-      explicitly asked to.<br/>
-      <em>Ant 1.8.0</em> - Defaults to false.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">manifestencoding</td>
-    <td valign="top">The encoding used to read the JAR manifest, when
-      a manifest file is specified.  The task will always use UTF-8
-      when writing the manifest.</td>
-    <td valign="top" align="center">No, defaults to the platform encoding.</td>
-  </tr>
-  <tr>
-    <td valign="top">roundup</td>
-    <td valign="top">Whether the file modification times will be
-    rounded up to the next even number of seconds.<br>
-    Zip archives store file modification times with a granularity of
-    two seconds, so the times will either be rounded up or down.  If
-    you round down, the archive will always seem out-of-date when you
-    rerun the task, so the default is to round up.  Rounding up may
-    lead to a different type of problems like JSPs inside a web
-    archive that seem to be slightly more recent than precompiled
-    pages, rendering precompilation useless.<br>
-    Defaults to true.  <em>Since Ant 1.6.2</em></td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">level</td>
-    <td valign="top">Non-default level at which file compression should be
-    performed. Valid values range from 0 (no compression/fastest) to 9
-    (maximum compression/slowest). <em>Since Ant 1.7</em></td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">strict</td>
-    <td valign="top">Configures how to handle breaks of the packaging version
-    specification: <ul>
-    <li><b>fail</b> = throws a BuildException</li>
-    <li><b>warn</b> = logs a message on warn level</li>
-    <li><b>ignore</b> = logs a message on verbose level (default)</li>
-    </ul>
-    <em>Since Ant 1.7.1</em></td>
-    <td valign="top" align="center">No, defaults to <tt>ignore</tt>. </td>
-  </tr>
-  <tr>
-    <td valign="top">preserve0permissions</td>
-    <td valign="top">when updating an archive or adding entries from a
-    different archive Ant will assume that a Unix permissions value of
-    0 (nobody is allowed to do anything to the file/directory) means
-    that the permissions haven't been stored at all rather than real
-    permissions and will instead apply its own default values.<br/>
-    Set this attribute to true if you really want to preserve the
-      original permission field.<em>since Ant 1.8.0</em>
+    <td>preserve0permissions</td>
+    <td>when updating an archive or adding entries from a different archive Ant will assume that a
+      Unix permissions value of 0 (nobody is allowed to do anything to the file/directory) means
+      that the permissions haven't been stored at all rather than real permissions and will instead
+      apply its own default values.<br/>  Set this attribute to <q>true</q> if you really want to
+      preserve the original permission field. <em>since Ant 1.8.0</em>
     </td>
-    <td valign="top" align="center">No, default is false</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>useLanguageEncodingFlag</td>
+    <td>Whether to set the language encoding flag if the encoding is UTF-8.  This setting doesn't
+      have any effect if the encoding is not UTF-8. <em>Since Ant 1.8.0</em>.  <br/>See also
+      the <a href="zip.html#encoding">discussion in the zip task page</a></td>
+    <td>No; defaults to <q>true</q></td>
+  </tr>
+  <tr>
+    <td>createUnicodeExtraFields</td>
+    <td>Whether to create Unicode extra fields to store the file names a second time inside the
+      entry's metadata.<br/>Possible values are <q>never</q>, <q>always</q>
+      and <q>not-encodeable</q> which will only add Unicode extra fields if the file name
+      cannot.<br/>See also the <a href="zip.html#encoding">discussion in the zip task page</a></td>
+    <td>No; defaults to <q>never</q></td>
+  </tr>
+  <tr>
+    <td>fallbacktoUTF8</td>
+    <td>Whether to use UTF-8 and the language encoding flag instead of the specified encoding if a
+      file name cannot be encoded using the specified encoding. <em>Since Ant 1.8.0</em>.<br/>See
+      also the <a href="zip.html#encoding">discussion in the zip task page</a></td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>mergeClassPathAttributes</td>
+    <td>Whether to merge the <code>Class-Path</code> attributes found in different manifests (if
+      merging manifests).  If <q>false</q>, only the attribute of the last merged manifest will be
+      preserved.  <em>Since Ant 1.8.0</em>.<br/>Unless you also set <var>flattenAttributes</var>
+      to <q>true</q>, this may result in manifests containing multiple <code>Class-Path</code>
+      attributes which violates the manifest specification.</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>flattenAttributes</td>
+    <td>Whether to merge attributes occurring more than once in a section (this can only happen for
+      the <code>Class-Path</code> attribute) into a single attribute.  <em>Since Ant
+      1.8.0</em>.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">useLanguageEncodingFlag</td>
-    <td valign="top">Whether to set the language encoding flag if the
-      encoding is UTF-8.  This setting doesn't have any effect if the
-      encoding is not UTF-8.
-      <em>Since Ant 1.8.0</em>.
-      <br/>See also the <a href="zip.html#encoding">discussion in the
-      zip task page</a></td>
-    <td valign="top" align="center">No, default is true</td>
-  </tr>
-  <tr>
-    <td valign="top">createUnicodeExtraFields</td>
-    <td valign="top">Whether to create unicode extra fields to store
-      the file names a second time inside the entry's metadata.
-      <br>Possible values are "never", "always" and "not-encodeable"
-      which will only add Unicode extra fields if the file name cannot
-      be encoded using the specified encoding.
-      <em>Since Ant 1.8.0</em>.
-      <br/>See also the <a href="zip.html#encoding">discussion in the
-      zip task page</a></td>
-    <td align="center" valign="top">No, default is "never"</td>
-  </tr>
-  <tr>
-    <td valign="top">fallbacktoUTF8</td>
-    <td valign="top">Whether to use UTF-8 and the language encoding
-      flag instead of the specified encoding if a file name cannot be
-      encoded using the specified encoding.
-      <em>Since Ant 1.8.0</em>.
-      <br/>See also the <a href="zip.html#encoding">discussion in the
-      zip task page</a></td>
-    <td align="center" valign="top">No, default is false</td>
-  </tr>
-  <tr>
-    <td valign="top">mergeClassPathAttributes</td>
-    <td valign="top">Whether to merge the Class-Path attributes found
-      in different manifests (if merging manifests).  If false, only
-      the attribute of the last merged manifest will be preserved.
-      <em>Since Ant 1.8.0</em>.
-      <br/>unless you also set flattenAttributes to true this may
-      result in manifests containing multiple Class-Path attributes
-      which violates the manifest specification.</td>
-    <td align="center" valign="top">No, default is false</td>
-  </tr>
-  <tr>
-    <td valign="top">flattenAttributes</td>
-    <td valign="top">Whether to merge attributes occurring more than
-      once in a section (this can only happen for the Class-Path
-      attribute) into a single attribute.
-      <em>Since Ant 1.8.0</em>.</td>
-    <td align="center" valign="top">No, default is false</td>
-  </tr>
-  <tr>
-    <td valign="top">zip64Mode</td>
-    <td valign="top">When to use Zip64 extensions for entries.  The
-      possible values are "never", "always" and "as-needed".
-      <em>Since Ant 1.9.1</em>.
-      <br/>See also the <a href="zip.html#zip64">discussion in the
-      zip task page</a></td>
-    <td align="center" valign="top">No, default is "never"</td>
+    <td>zip64Mode</td>
+    <td>When to use Zip64 extensions for entries.  The possible values
+      are <q>never</q>, <q>always</q> and <q>as-needed</q>.  <em>Since Ant 1.9.1</em>.<br/>See also
+      the <a href="zip.html#zip64">discussion in the zip task page</a></td>
+    <td>No; defaults to <q>never</q></td>
   </tr>
 </table>
 
-<h3>Nested elements</h3>
+<h3>Parameters specified as nested elements</h3>
 <h4>metainf</h4>
-<p>The nested <code>metainf</code> element specifies a <a
-href="../Types/fileset.html">FileSet</a>. All files included in this fileset will
-end up in the <code>META-INF</code> directory of the jar file. If this
-fileset includes a file named <code>MANIFEST.MF</code>, the file is
-ignored and you will get a warning.</p>
+<p>The nested <code>metainf</code> element specifies
+a <a href="../Types/fileset.html">FileSet</a>. All files included in this fileset will end up in
+the <samp>META-INF</samp> directory of the jar file. If this fileset includes a file
+named <samp>MANIFEST.MF</samp>, the file is ignored and you will get a warning.</p>
 
 <h4>manifest</h4>
-<p>The manifest nested element allows the manifest for the Jar file to
-be provided inline in the build file rather than in an external
-file. This element is identical to the
-<a href="manifest.html">manifest</a> task, but the file and mode
+<p>The nested <code>manifest</code> element allows the manifest for the Jar file to be provided
+inline in the build file rather than in an external file. This element is identical to the
+<a href="manifest.html">manifest</a> task, but the <var>file</var> and <var>mode</var>
 attributes must be omitted.</p>
-<p>
-If both an inline manifest and an external file are both specified, the
-manifests are merged.
-</p>
-
-<p>When using inline manifests, the Jar task will check whether the manifest
-contents have changed (i.e. the manifest as specified is different in any way
-from the manifest that exists in the Jar, if it exists.
-If the manifest values have changed the jar will be updated or rebuilt, as
-appropriate.
-</p>
-
-<a name="indexjars"><h4>indexjars</h4></a>
-
-<p><em>since ant 1.6.2</em></p>
-
-<p>The nested <code>indexjars</code> element specifies a <a
-href="../using.html#path">PATH like structure</a>.  Its content is
-completely ignored unless you set the index attribute of the task to
-true.</p>
-
-<p>The index created by this task will contain indices for the
-archives contained in this path, the names used for the archives
-depend on your manifest:</p>
+<p>If both an inline manifest and an external file are both specified, the manifests are merged.</p>
+
+<p>When using inline manifests, the <code>Jar</code> task will check whether the manifest contents
+have changed (i.e. the manifest as specified is different in any way from the manifest that exists
+in the jar, if it exists.  If the manifest values have changed, the jar will be updated or rebuilt,
+as appropriate.</p>
+
+<h4 id="indexjars">indexjars</h4>
+
+<p><em>Since Ant 1.6.2</em></p>
+
+<p>The nested <code>indexjars</code> element specifies a <a href="../using.html#path">path-like
+structure</a>.  Its content is completely ignored unless you set the <var>index</var> attribute of
+the task to <q>true</q>.</p>
+
+<p>The index created by this task will contain indices for the archives contained in this path, the
+names used for the archives depend on your manifest:</p>
 <ul>
-  <li>If the generated jar's manifest contains no Class-Path
-  attribute, the file name without any leading directory path will be
-  used and all parts of the path will get indexed.</li>
-  <li>If the manifest contains a Class-Path attribute, this task will
-  try to guess which part of the Class-Path belongs to a given
-  archive.  If it cannot guess a name, the archive will be skipped,
-  otherwise the name listed inside the Class-Path attribute will be
-  used.</li>
+  <li>If the generated jar's manifest contains no <code>Class-Path</code> attribute, the file name
+  without any leading directory path will be used and all parts of the path will get indexed.</li>
+  <li>If the manifest contains a <code>Class-Path</code> attribute, this task will try to guess
+  which part of the <code>Class-Path</code> belongs to a given archive.  If it cannot guess a name,
+  the archive will be skipped, otherwise the name listed inside the <code>Class-Path</code>
+  attribute will be used.</li>
 </ul>
 
-<p>This task will not create any index entries for archives that are
-  empty or only contain files inside the META-INF directory unless
-  the <code>indexmetainf</code> attribute has been set
-  to <code>true</code>.</p>
-
-<a name="service"><h4>service</h4></a>
-
-<p><em>since ant 1.7.0</em></p>
-
-<p>
-  The nested <code>service</code> element specifies a service.
-  Services are described in the
-  <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#Service_Provider">service provider overview</a>.
-  The approach is to have providers JARs include files named by the service
-  provided, for example,
-  META-INF/services/javax.script.ScriptEngineFactory
-  which can include implementation class names, one per line (usually just one per JAR).
-
-  The name of the
-  service is set by the "type" attribute. The classname implementing
-  the service is the the "provider" attribute, or it one wants to
-  specify a number of classes that implement the service, by
-  "provider" nested elements.
-</p>
-<p>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">type</td>
-    <td valign="top">The name of the service.</td>
-    <td valign="top" align="center">Yes</td>
-  </tr>
-  <tr>
-    <td valign="top">provider</td>
-    <td valign="top">
-      The classname of the class implementing the service.
-    </td>
-    <td valign="top" align="center">Yes, unless there is a nested
-      <code>&lt;provider&gt;</code> element.</td>
+<p>This task will not create any index entries for archives that are empty or only contain files
+inside the <samp>META-INF</samp> directory unless the <var>indexmetainf</var> attribute has been set
+to <q>true</q>.</p>
+
+<h4 id="service">service</h4>
+
+<p><em>Since Ant 1.7.0</em></p>
+
+<p>The nested <code>service</code> element specifies a service.  Services are described in
+the <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/jar/jar.html#Service_Provider"
+target="_top">service provider overview</a>.  The approach is to have providers JARs include files
+named by the service provided, for
+example, <samp>META-INF/services/javax.script.ScriptEngineFactory</samp> which can include
+implementation class names, one per line (usually just one per JAR).</p>
+
+<p>The name of the service is set by the <var>type</var> attribute. The classname implementing the
+service is the the <var>provider</var> attribute, or if one wants to specify a number of classes
+that implement the service, by <code>provider</code> nested elements.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>The name of the service.</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>provider</td>
+    <td>The classname of the class implementing the service.</td>
+    <td>Yes, unless there is a nested <code>&lt;provider&gt;</code> element.</td>
   </tr>
 </table>
-  <p>
-    The provider classname is specified either by the "provider" attribute, or
-    by a nested &lt;provider&gt; element, which has a single "classname" attribute.
-    If a JAR file has more that one implementation of the service, a number of
-    nested &lt;provider&gt; elements may be used.
-  </p>
-  
-  
+<p>The provider classname is specified either by the <var>provider</var> attribute, or by a
+nested <code>&lt;provider&gt;</code> element, which has a single <var>classname</var> attribute.  If
+a JAR file has more that one implementation of the service, a number of
+nested <code>&lt;provider&gt;</code> elements may be used.</p>
+
 <h3>Examples</h3>
 
 <h4>Simple</h4>
-<blockquote><pre>  &lt;jar destfile=&quot;${dist}/lib/app.jar&quot; basedir=&quot;${build}/classes&quot;/&gt;</pre></blockquote>
-<p>jars all files in the <code>${build}/classes</code> directory into a file
-called <code>app.jar</code> in the <code>${dist}/lib</code> directory.</p>
-
+<pre>&lt;jar destfile=&quot;${dist}/lib/app.jar&quot; basedir=&quot;${build}/classes&quot;/&gt;</pre>
+<p>jars all files in the <samp>${build}/classes</samp> directory into a file
+called <samp>app.jar</samp> in the <samp>${dist}/lib</samp> directory.</p>
 
 <h4>With filters</h4>
 
-<blockquote><pre>  &lt;jar destfile=&quot;${dist}/lib/app.jar&quot;
-       basedir=&quot;${build}/classes&quot;
-       excludes=&quot;**/Test.class&quot;
-  /&gt;</pre></blockquote>
-<p>jars all files in the <code>${build}/classes</code> directory into a file
-called <code>app.jar</code> in the <code>${dist}/lib</code> directory. Files
-with the name <code>Test.class</code> are excluded.</p>
-
-<blockquote><pre>  &lt;jar destfile=&quot;${dist}/lib/app.jar&quot;
-       basedir=&quot;${build}/classes&quot;
-       includes=&quot;mypackage/test/**&quot;
-       excludes=&quot;**/Test.class&quot;
-  /&gt;</pre></blockquote>
-<p>jars all files in the <code>${build}/classes</code> directory into a file
-called <code>app.jar</code> in the <code>${dist}/lib</code> directory. Only
-files under the directory <code>mypackage/test</code> are used, and files with
-the name <code>Test.class</code> are excluded.</p>
+<pre>&lt;jar destfile=&quot;${dist}/lib/app.jar&quot;
+     basedir=&quot;${build}/classes&quot;
+     excludes=&quot;**/Test.class&quot;/&gt;</pre>
+<p>jars all files in the <samp>${build}/classes</samp> directory into a file
+called <samp>app.jar</samp> in the <samp>${dist}/lib</samp> directory. Files with the
+name <samp>Test.class</samp> are excluded.</p>
+
+<pre>
+&lt;jar destfile=&quot;${dist}/lib/app.jar&quot;
+     basedir=&quot;${build}/classes&quot;
+     includes=&quot;mypackage/test/**&quot;
+     excludes=&quot;**/Test.class&quot;/&gt;</pre>
+<p>jars all files in the <samp>${build}/classes</samp> directory into a file
+called <samp>app.jar</samp> in the <samp>${dist}/lib</samp> directory. Only files under the
+directory <samp>mypackage/test</samp> are used, and files with the name <samp>Test.class</samp> are
+excluded.</p>
 
 <h4>Multiple filesets</h4>
-<blockquote><pre>  &lt;jar destfile=&quot;${dist}/lib/app.jar&quot;&gt;
+<pre>
+&lt;jar destfile=&quot;${dist}/lib/app.jar&quot;&gt;
     &lt;fileset dir=&quot;${build}/classes&quot;
-             excludes=&quot;**/Test.class&quot;
-    /&gt;
+             excludes=&quot;**/Test.class&quot;/&gt;
     &lt;fileset dir=&quot;${src}/resources&quot;/&gt;
-  &lt;/jar&gt;</pre></blockquote>
-<p>jars all files in the <code>${build}/classes</code> directory and also
-in the <code>${src}/resources</code> directory together into a file
-called <code>app.jar</code> in the <code>${dist}/lib</code> directory.
-Files with the name <code>Test.class</code> are excluded.
-If there are files such as <code>${build}/classes/mypackage/MyClass.class</code>
-and <code>${src}/resources/mypackage/image.gif</code>, they will appear
-in the same directory in the JAR (and thus be considered in the same package
-by Java).</p>
+&lt;/jar&gt;</pre>
+<p>jars all files in the <samp>${build}/classes</samp> directory and also in
+the <samp>${src}/resources</samp> directory together into a file called <samp>app.jar</samp> in
+the <samp>${dist}/lib</samp> directory.  Files with the name <samp>Test.class</samp> are excluded.
+If there are files such as <samp>${build}/classes/mypackage/MyClass.class</samp>
+and <samp>${src}/resources/mypackage/image.gif</samp>, they will appear in the same directory in the
+JAR (and thus be considered in the same package by Java).</p>
 
 <h4>Merging archives</h4>
 
-<blockquote><pre> &lt;jar destfile="build/main/checksites.jar"&gt;
+<pre>
+&lt;jar destfile="build/main/checksites.jar"&gt;
     &lt;fileset dir="build/main/classes"/&gt;
     &lt;zipfileset includes="**/*.class" src="lib/main/some.jar"/&gt;
     &lt;manifest&gt;
       &lt;attribute name="Main-Class"
-            value="com.acme.checksites.Main"/&gt;
+                 value="com.acme.checksites.Main"/&gt;
     &lt;/manifest&gt;
-  &lt;/jar&gt;</pre></blockquote>
-<p>
-  Creates an executable jar file with a main class "com.acme.checksites.Main", and
-  embeds all the classes from the jar <code>lib/main/some.jar</code>.
-</p>
+&lt;/jar&gt;</pre>
+<p>Creates an executable jar file with a main class <samp>com.acme.checksites.Main</samp>, and
+embeds all the classes from the jar <samp>lib/main/some.jar</samp>.</p>
 
-<blockquote><pre> &lt;jar destfile="build/main/checksites.jar"&gt;
+<pre>
+&lt;jar destfile="build/main/checksites.jar"&gt;
     &lt;fileset dir="build/main/classes"/&gt;
     &lt;restrict&gt;
-     &lt;name name="**/*.class"/&gt;
-     &lt;archives&gt;
-       &lt;zips&gt;
-         &lt;fileset dir="lib/main" includes="**/*.jar"/&gt;
-       &lt;/zips&gt;
-     &lt;/archives&gt;
+       &lt;name name="**/*.class"/&gt;
+       &lt;archives&gt;
+           &lt;zips&gt;
+               &lt;fileset dir="lib/main" includes="**/*.jar"/&gt;
+           &lt;/zips&gt;
+       &lt;/archives&gt;
     &lt;/restrict&gt;
     &lt;manifest&gt;
-      &lt;attribute name="Main-Class"
-            value="com.acme.checksites.Main"/&gt;
+        &lt;attribute name="Main-Class"
+              value="com.acme.checksites.Main"/&gt;
     &lt;/manifest&gt;
-  &lt;/jar&gt;</pre></blockquote>
-<p>
-  Creates an executable jar file with a main class "com.acme.checksites.Main", and
-  embeds all the classes from all the jars in <code>lib/main</code>.
-</p>
+&lt;/jar&gt;</pre>
+<p>Creates an executable jar file with a main class <samp>com.acme.checksites.Main</samp>, and
+embeds all the classes from all the jars in <samp>lib/main</samp>.</p>
 
 <h4>Inline manifest</h4>
-<blockquote><pre>  &lt;jar destfile=&quot;test.jar&quot; basedir=&quot;.&quot;&gt;
+<pre>
+&lt;jar destfile=&quot;test.jar&quot; basedir=&quot;.&quot;&gt;
     &lt;include name=&quot;build&quot;/&gt;
     &lt;manifest&gt;
-      &lt;!-- If this is an Applet or Web Start application, include
-           the proper attributes from <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/index.html">http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/index.html</a> --&gt;
-      &lt;attribute name=&quot;Permissions&quot; value=&quot;sandbox&quot;/&gt;
-      &lt;attribute name=&quot;Codebase&quot; value=&quot;example.com&quot;/&gt;
-      &lt;!-- Who is building this jar? --&gt;
-      &lt;attribute name=&quot;Built-By&quot; value=&quot;${user.name}&quot;/&gt;
-      &lt;!-- Information about the program itself --&gt;
-      &lt;attribute name=&quot;Implementation-Vendor&quot; value=&quot;ACME inc.&quot;/&gt;
-      &lt;attribute name=&quot;Implementation-Title&quot; value=&quot;GreatProduct&quot;/&gt;
-      &lt;attribute name=&quot;Implementation-Version&quot; value=&quot;1.0.0beta2&quot;/&gt;
-      &lt;!-- details --&gt;
-      &lt;section name=&quot;common/MyClass.class&quot;&gt;
-        &lt;attribute name=&quot;Sealed&quot; value=&quot;false&quot;/&gt;
-      &lt;/section&gt;
+        &lt;!-- If this is an Applet or Web Start application, include
+             the proper attributes from <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/jweb/index.html" target="_top">https://docs.oracle.com/javase/8/docs/technotes/guides/jweb/index.html</a> --&gt;
+        &lt;attribute name=&quot;Permissions&quot; value=&quot;sandbox&quot;/&gt;
+        &lt;attribute name=&quot;Codebase&quot; value=&quot;example.com&quot;/&gt;
+        &lt;!-- Who is building this jar? --&gt;
+        &lt;attribute name=&quot;Built-By&quot; value=&quot;${user.name}&quot;/&gt;
+        &lt;!-- Information about the program itself --&gt;
+        &lt;attribute name=&quot;Implementation-Vendor&quot; value=&quot;ACME inc.&quot;/&gt;
+        &lt;attribute name=&quot;Implementation-Title&quot; value=&quot;GreatProduct&quot;/&gt;
+        &lt;attribute name=&quot;Implementation-Version&quot; value=&quot;1.0.0beta2&quot;/&gt;
+        &lt;!-- details --&gt;
+        &lt;section name=&quot;common/MyClass.class&quot;&gt;
+            &lt;attribute name=&quot;Sealed&quot; value=&quot;false&quot;/&gt;
+        &lt;/section&gt;
     &lt;/manifest&gt;
-  &lt;/jar&gt;</pre></blockquote>
-<p>
-This is an example of an inline manifest specification including the version of the build
-program (Implementation-Version). Note that the Built-By attribute will take the value of the Ant 
-property ${user.name}. The manifest produced by the above would look like this:
-</p>
+&lt;/jar&gt;</pre>
+<p>This is an example of an inline manifest specification including the version of the build program
+(<code>Implementation-Version</code>). Note that the <code>Built-By</code> attribute will take the
+value of the Ant property <code>user.name</code>. The manifest produced by the above would look like
+this:</p>
 
-<blockquote><pre><code>Manifest-Version: 1.0
+<pre>
+Manifest-Version: 1.0
 Permissions: sandbox
 Codebase: example.com
 Built-By: conor
@@ -551,38 +495,52 @@
 Created-By: Apache Ant 1.9.2
 
 Name: common/MyClass.class
-Sealed: false</code></pre></blockquote>
+Sealed: false</pre>
 
 <h4>Service Provider</h4>
 
-<p>
-  The following shows how to create a jar file specifying a service
-  with an implementation of the JDK6 scripting interface:
-</p>
-<blockquote><pre>&lt;jar destfile="pinky.jar"&gt;
-  &lt;fileset dir="build/classes"/&gt;
-  &lt;service type="javax.script.ScriptEngineFactory"
-           provider="org.acme.PinkyLanguage"/&gt;
-&lt;/jar&gt;
-</pre></blockquote>
-
-
-
-<p>
-  The following shows how to create a jar file specifing a service
-  with two implementations of the JDK6 scripting interface:
-</p>
-<blockquote><pre>
+<p>The following shows how to create a jar file specifying a service with an implementation of the
+JDK 6 scripting interface:</p>
+<pre>
+&lt;jar destfile="pinky.jar"&gt;
+    &lt;fileset dir="build/classes"/&gt;
+    &lt;service type="javax.script.ScriptEngineFactory"
+             provider="org.acme.PinkyLanguage"/&gt;
+&lt;/jar&gt;</pre>
+
+<p>The following shows how to create a jar file specifying a service with two implementations of the
+JDK 6 scripting interface:</p>
+<pre>
 &lt;jar destfile="pinkyandbrain.jar"&gt;
-  &lt;fileset dir="classes"/&gt;
-  &lt;service type="javax.script.ScriptEngineFactory"&gt;
-    &lt;provider classname="org.acme.PinkyLanguage"/&gt;
-    &lt;provider classname="org.acme.BrainLanguage"/&gt;
-  &lt;/service&gt;
-&lt;/jar&gt;
-</pre></blockquote>
-
-
+    &lt;fileset dir="classes"/&gt;
+    &lt;service type="javax.script.ScriptEngineFactory"&gt;
+        &lt;provider classname="org.acme.PinkyLanguage"/&gt;
+        &lt;provider classname="org.acme.BrainLanguage"/&gt;
+    &lt;/service&gt;
+&lt;/jar&gt;</pre>
+
+<h4 id="jep238-example">JEP 238 example: a Multi-Release JAR Files</h4>
+<p>Here we want to create a <em>Multi-Release JAR File</em> according the
+specification <a href="http://openjdk.java.net/jeps/238" target="_top">JEP 238</a>.  It defines on
+top of a JAR the possibility to place additional or overwriting classes in a jar, which are
+available according to the Java version you run.<br/>  Basically it says, that you have to set the
+manifest entry <code>Multi-Release: true</code> and place all additional or overwriting classes
+in <samp>META-INF/versions/<i>number</i>/package-structure</samp>,
+e.g. <samp>META-INF/versions/9/org/apache/ant/MyClass.class</samp></p>
+<p>In this example we expect that the normal classes are compiled into <samp>${java.classes}</samp>
+and the Java 9 classes are compiled into <samp>${java9.classes}</samp>.</p>
+<pre>
+&lt;jar destfile=&quot;mrjar.jar&quot;&gt;
+    &lt;manifest&gt;
+        &lt;!-- special mf-entry according to the spec --&gt;
+        &lt;attribute name=&quot;Multi-Release&quot; value=&quot;true&quot;/&gt;
+    &lt;/manifest&gt;
+    &lt;!-- directory structure according to the spec ... --&gt;
+    &lt;!-- ... default classes loadable by old (&lt;Java 9) versions --&gt;
+    &lt;fileset dir=&quot;${java.classes}&quot;/&gt;
+    &lt;!-- ... per release classes, require Java 9+ for loadable via standard ClassLoader --&gt;
+    &lt;zipfileset prefix=&quot;META-INF/versions/9/&quot; dir=&quot;${java9.classes}&quot;/&gt;
+&lt;/jar&gt;</pre>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/jarlib-available.html ant-1.10.3/manual/Tasks/jarlib-available.html
--- ant-1.9.10/manual/Tasks/jarlib-available.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/jarlib-available.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,110 +24,100 @@
 
 <body>
 
-<h2><a name="jarlib-available">jarlib-available</a></h2>
+<h2 id="jarlib-available">jarlib-available</h2>
 <h3>Description</h3>
-<p>Check whether an extension is present in a fileset or an extensionSet.
+<p>Check whether an extension is present in a <code>fileset</code> or an <code>extensionSet</code>.
 If the extension is present then a property is set.</p>
 
-<p>Note that this task
-works with extensions as defined by the "Optional Package" specification.
- For more information about optional packages, see the document
-<em>Optional Package Versioning</em> in the documentation bundle for your
-Java Standard Edition package, in file
-<code>guide/extensions/versioning.html</code> or the online
-<a target="_blank" href="http://docs.oracle.com/javase/7/docs/technotes/guides/extensions/versioning.html">
-Extension and ExtensionSet documentation</a> for further details</p>
+<p>Note that this task works with extensions as defined by the "Optional Package" specification.
+For more information about optional packages, see the document <em>Optional Package Versioning</em>
+in the documentation bundle for your Java Standard Edition package, in
+file <samp>guide/extensions/versioning.html</samp> or the
+online <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/extensions/versioning.html"
+target="_top">Extension and ExtensionSet documentation</a> for further details.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">property</td>
-    <td valign="top">The name of property to set if extensions is available.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>property</td>
+    <td>The name of property to set if extensions is available</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">The file to check for extension</td>
-    <td valign="top" align="center">No, one of file, nested
-    ExtensionSet or nested fileset must be present.</td>
+    <td>file</td>
+    <td>The file to check for extension</td>
+    <td>Yes, unless a nested
+    <code>&lt;extensionSet&gt;</code> or <code>&lt;fileset&gt;</code> is specified</td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 
 <h4>extension</h4>
- <p><a href="../Types/extension.html">Extension</a> the extension
- to search for.</p>
+<p><a href="../Types/extension.html">Extension</a> the extension to search for.</p>
 
 <h4>fileset</h4>
- <p><a href="../Types/fileset.html">FileSet</a>s are used to select
-sets of files to check for extension.</p>
+<p><a href="../Types/fileset.html">FileSet</a>s are used to select sets of files to check for
+extension.</p>
 
 <h4>extensionSet</h4>
- <p><a href="../Types/extensionset.html">ExtensionSet</a>s is the set
- of extensions to search for extension in.</p>
+<p><a href="../Types/extensionset.html">ExtensionSet</a>s is the set of extensions to search for
+extension in.</p>
 
 <h3>Examples</h3>
-<p><b>Search for extension in single file</b></p>
+<p><strong>Search for extension in single file</strong></p>
 <pre>
-  &lt;jarlib-available property=&quot;myext.present&quot; file=&quot;myfile.jar&quot;&gt;
-    &lt;extension
-      extensionName=&quot;org.apache.tools.ant&quot;
-      specificationVersion=&quot;1.4.9&quot;
-      specificationVendor=&quot;Apache Software Foundation&quot;/&gt;
-  &lt;/jarlib-available&gt;
+&lt;jarlib-available property=&quot;myext.present&quot; file=&quot;myfile.jar&quot;&gt;
+  &lt;extension extensionName=&quot;org.apache.tools.ant&quot;
+             specificationVersion=&quot;1.4.9&quot;
+             specificationVendor=&quot;Apache Software Foundation&quot;/&gt;
+&lt;/jarlib-available&gt;
 </pre>
 
-<p><b>Search for extension in single file referencing external Extension</b></p>
+<p><strong>Search for extension in single file referencing external Extension</strong></p>
 <pre>
-  &lt;extension id=&quot;myext&quot;
-    extensionName=&quot;org.apache.tools.ant&quot;
-    specificationVersion=&quot;1.4.9&quot;
-    specificationVendor=&quot;Apache Software Foundation&quot;/&gt;
-
-  &lt;jarlib-available property=&quot;myext.present&quot; file=&quot;myfile.jar&quot;&gt;
-    &lt;extension refid=&quot;myext&quot;/&gt;
-  &lt;/jarlib-available&gt;
-</pre>
-<p><b>Search for extension in fileset</b></p>
+&lt;extension id=&quot;myext&quot;
+           extensionName=&quot;org.apache.tools.ant&quot;
+           specificationVersion=&quot;1.4.9&quot;
+           specificationVendor=&quot;Apache Software Foundation&quot;/&gt;
+
+&lt;jarlib-available property=&quot;myext.present&quot; file=&quot;myfile.jar&quot;&gt;
+  &lt;extension refid=&quot;myext&quot;/&gt;
+&lt;/jarlib-available&gt;</pre>
+<p><strong>Search for extension in fileset</strong></p>
 <pre>
-  &lt;extension id=&quot;myext&quot;
-    extensionName=&quot;org.apache.tools.ant&quot;
-    specificationVersion=&quot;1.4.9&quot;
-    specificationVendor=&quot;Apache Software Foundation&quot;/&gt;
-
-  &lt;jarlib-available property=&quot;myext.present&quot;&gt;
-    &lt;extension refid=&quot;myext&quot;/&gt;
-    &lt;fileset dir="lib"&gt;
-      &lt;include name="*.jar"/&gt;
-    &lt;/fileset&gt;
-  &lt;/jarlib-available&gt;
-</pre>
-<p><b>Search for extension in extensionSet</b></p>
+&lt;extension id=&quot;myext&quot;
+           extensionName=&quot;org.apache.tools.ant&quot;
+           specificationVersion=&quot;1.4.9&quot;
+           specificationVendor=&quot;Apache Software Foundation&quot;/&gt;
+
+&lt;jarlib-available property=&quot;myext.present&quot;&gt;
+  &lt;extension refid=&quot;myext&quot;/&gt;
+  &lt;fileset dir="lib"&gt;
+    &lt;include name="*.jar"/&gt;
+  &lt;/fileset&gt;
+&lt;/jarlib-available&gt;</pre>
+<p><strong>Search for extension in extensionSet</strong></p>
 <pre>
-  &lt;extension id=&quot;myext&quot;
-    extensionName=&quot;org.apache.tools.ant&quot;
-    specificationVersion=&quot;1.4.9&quot;
-    specificationVendor=&quot;Apache Software Foundation&quot;/&gt;
-
-  &lt;jarlib-available property=&quot;myext.present&quot;&gt;
-    &lt;extension refid=&quot;myext&quot;/&gt;
-    &lt;extensionSet id=&quot;exts3&quot;&gt;
-      &lt;libfileset
-        includeUrl=&quot;false&quot;
-        includeImpl=&quot;true&quot;
-        dir=&quot;lib&quot;&gt;
-        &lt;include name=&quot;*.jar&quot;/&gt;
-      &lt;/libfileset&gt;
-    &lt;/extensionSet&gt;
-  &lt;/jarlib-available&gt;
-</pre>
-
-
+&lt;extension id=&quot;myext&quot;
+           extensionName=&quot;org.apache.tools.ant&quot;
+           specificationVersion=&quot;1.4.9&quot;
+           specificationVendor=&quot;Apache Software Foundation&quot;/&gt;
+
+&lt;jarlib-available property=&quot;myext.present&quot;&gt;
+  &lt;extension refid=&quot;myext&quot;/&gt;
+  &lt;extensionSet id=&quot;exts3&quot;&gt;
+    &lt;libfileset includeUrl=&quot;false&quot;
+                includeImpl=&quot;true&quot;
+                dir=&quot;lib&quot;&gt;
+      &lt;include name=&quot;*.jar&quot;/&gt;
+    &lt;/libfileset&gt;
+  &lt;/extensionSet&gt;
+&lt;/jarlib-available&gt;</pre>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/jarlib-display.html ant-1.10.3/manual/Tasks/jarlib-display.html
--- ant-1.9.10/manual/Tasks/jarlib-display.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/jarlib-display.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,57 +24,48 @@
 
 <body>
 
-<h2><a name="jarlib-display">jarlib-display</a></h2>
+<h2 id="jarlib-display">jarlib-display</h2>
 <h3>Description</h3>
-<p>Display the "Optional Package" and "Package Specification" information
- contained within the specified jars.</p>
+<p>Display the "Optional Package" and "Package Specification" information contained within the
+specified jars.</p>
 
-<p>Note that this task
-works with extensions as defined by the "Optional Package" specification.
- For more information about optional packages, see the document
-<em>Optional Package Versioning</em> in the documentation bundle for your
-Java Standard Edition package, in file
-<code>guide/extensions/versioning.html</code> or the online
-<a target="_blank" href="http://docs.oracle.com/javase/7/docs/technotes/guides/extensions/versioning.html">
-Extension and ExtensionSet documentation</a> for further details</p>
+<p>Note that this task works with extensions as defined by the "Optional Package" specification.
+For more information about optional packages, see the document <em>Optional Package Versioning</em>
+in the documentation bundle for your Java Standard Edition package, in
+file <samp>guide/extensions/versioning.html</samp> or the
+online <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/extensions/versioning.html"
+target="_top">Extension and ExtensionSet documentation</a> for further details.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">The file to display extension information about.</td>
-    <td valign="top" align="center">No, but one of file or fileset must be
-    present.</td>
+    <td>file</td>
+    <td>The file to display extension information about</td>
+    <td>Yes, unless a nested <code>&lt;fileset&gt;</code> is specified</td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 
 <h4>fileset</h4>
- <p><a href="../Types/fileset.html">FileSet</a>s contain list of files to
- display Extension information  about.</p>
+<p><a href="../Types/fileset.html">FileSet</a>s contain list of files to display Extension
+information about.</p>
 
 <h3>Examples</h3>
-<p><b>Display Extension info for a single file</b></p>
-<pre>
-  &lt;jarlib-display file=&quot;myfile.jar&quot;&gt;
-</pre>
+<p><strong>Display Extension info for a single file</strong></p>
+<pre>&lt;jarlib-display file=&quot;myfile.jar&quot;&gt;</pre>
 
-<p><b>Display Extension info for a fileset</b></p>
+<p><strong>Display Extension info for a fileset</strong></p>
 <pre>
-  &lt;jarlib-display&gt;
-    &lt;fileset dir="lib"&gt;
-      &lt;include name="*.jar"/&gt;
-    &lt;/fileset&gt;
-  &lt;/jarlib-display&gt;
-</pre>
-
-
+&lt;jarlib-display&gt;
+  &lt;fileset dir="lib"&gt;
+    &lt;include name="*.jar"/&gt;
+  &lt;/fileset&gt;
+&lt;/jarlib-display&gt;</pre>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/jarlib-manifest.html ant-1.10.3/manual/Tasks/jarlib-manifest.html
--- ant-1.9.10/manual/Tasks/jarlib-manifest.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/jarlib-manifest.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,78 +24,71 @@
 
 <body>
 
-<h2><a name="jarlib-manifest">jarlib-manifest</a></h2>
+<h2 id="jarlib-manifest">jarlib-manifest</h2>
 <h3>Description</h3>
-<p>Task to generate a manifest that declares all the dependencies
- in manifest. The dependencies are determined by looking in the
- specified path and searching for Extension / "Optional Package"
- specifications in the manifests of the jars.</p>
-
-<p>Note that this task
-works with extensions as defined by the "Optional Package" specification.
- For more information about optional packages, see the document
-<em>Optional Package Versioning</em> in the documentation bundle for your
-Java Standard Edition package, in file
-<code>guide/extensions/versioning.html</code> or the online
-<a target="_blank" href="http://docs.oracle.com/javase/7/docs/technotes/guides/extensions/versioning.html">
-Extension and ExtensionSet documentation</a> for further details</p>
+<p>Task to generate a manifest that declares all the dependencies in manifest. The dependencies are
+determined by looking in the specified path and searching for Extension / "Optional Package"
+specifications in the manifests of the jars.</p>
+
+<p>Note that this task works with extensions as defined by the "Optional Package" specification.
+For more information about optional packages, see the document <em>Optional Package Versioning</em>
+in the documentation bundle for your Java Standard Edition package, in
+file <code>guide/extensions/versioning.html</code> or the
+online <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/extensions/versioning.html"
+target="_top">Extension and ExtensionSet documentation</a> for further details.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">destfile</td>
-    <td valign="top">The file to generate Manifest into</td>
-    <td valign="top" align="center">Yes.</td>
+    <td>destfile</td>
+    <td>The file to generate Manifest into</td>
+    <td>Yes</td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 
 <h4>extension</h4>
- <p><a href="../Types/extension.html">Extension</a> the extension
- that this library implements.</p>
+<p><a href="../Types/extension.html">Extension</a> the extension that this library implements.</p>
 
 <h4>depends</h4>
- <p><a href="../Types/extensionset.html">ExtensionSet</a>s containing
- all dependencies for jar.</p>
+<p><a href="../Types/extensionset.html">ExtensionSet</a>s containing all dependencies for jar.</p>
 
 <h4>options</h4>
- <p><a href="../Types/extensionset.html">ExtensionSet</a>s containing
- all optional dependencies for jar. (Optional dependencies will be used if
- present else they will be ignored)</p>
+<p><a href="../Types/extensionset.html">ExtensionSet</a>s containing all optional dependencies for
+jar. (Optional dependencies will be used if present else they will be ignored)</p>
 
 <h3>Examples</h3>
-<p><b>Basic Manifest generated for single Extension</b></p>
+<p><strong>Basic Manifest generated for single Extension</strong></p>
 <pre>
 &lt;extension id=&quot;e1&quot;
-    extensionName=&quot;MyExtensions&quot;
-    specificationVersion=&quot;1.0&quot;
-    specificationVendor=&quot;Peter Donald&quot;
-    implementationVendorID=&quot;vv&quot;
-    implementationVendor=&quot;Apache&quot;
-    implementationVersion=&quot;2.0&quot;
-    implementationURL=&quot;http://somewhere.com&quot;/&gt;
+           extensionName=&quot;MyExtensions&quot;
+           specificationVersion=&quot;1.0&quot;
+           specificationVendor=&quot;Peter Donald&quot;
+           implementationVendorID=&quot;vv&quot;
+           implementationVendor=&quot;Apache&quot;
+           implementationVersion=&quot;2.0&quot;
+           implementationURL=&quot;http://somewhere.com&quot;/&gt;
 
 &lt;jarlib-manifest destfile=&quot;myManifest.txt&quot;&gt;
     &lt;extension refid=&quot;e1&quot;/&gt;
-&lt;/jarlib-manifest&gt;
-</pre>
+&lt;/jarlib-manifest&gt;</pre>
 
-<p><b>Search for extension in fileset</b></p>
-<p><b>A large example with required and optional dependencies</b></p>
+<p><strong>Search for extension in fileset</strong></p>
+<p><strong>A large example with required and optional dependencies</strong></p>
 <pre>
 &lt;extension id=&quot;e1&quot;
-    extensionName=&quot;MyExtensions&quot;
-    specificationVersion=&quot;1.0&quot;
-    specificationVendor=&quot;Peter Donald&quot;
-    implementationVendorID=&quot;vv&quot;
-    implementationVendor=&quot;Apache&quot;
-    implementationVersion=&quot;2.0&quot;
-    implementationURL=&quot;http://somewhere.com&quot;/&gt;
+           extensionName=&quot;MyExtensions&quot;
+           specificationVersion=&quot;1.0&quot;
+           specificationVendor=&quot;Peter Donald&quot;
+           implementationVendorID=&quot;vv&quot;
+           implementationVendor=&quot;Apache&quot;
+           implementationVersion=&quot;2.0&quot;
+           implementationURL=&quot;http://somewhere.com&quot;/&gt;
 
 &lt;extensionSet id=&quot;option.ext&quot;&gt;
     &lt;libfileset dir=&quot;lib/option&quot;&gt;
@@ -113,11 +106,7 @@
     &lt;extension refid=&quot;e1&quot;/&gt;
     &lt;depends refid=&quot;depends.ext&quot;/&gt;
     &lt;options refid=&quot;option.ext&quot;/&gt;
-&lt;/jarlib-manifest&gt;
-</pre>
-
-
+&lt;/jarlib-manifest&gt;</pre>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/jarlib-resolve.html ant-1.10.3/manual/Tasks/jarlib-resolve.html
--- ant-1.9.10/manual/Tasks/jarlib-resolve.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/jarlib-resolve.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,188 +24,173 @@
 
 <body>
 
-<h2><a name="jarlib-resolve">jarlib-resolve</a></h2>
+<h2 id="jarlib-resolve">jarlib-resolve</h2>
 <h3>Description</h3>
-<p>Try to locate a jar to satisfy an extension and place
- location of jar into property. The task allows you to
- add a number of resolvers that are capable of locating a
- library for a specific extension. Each resolver will be attempted
- in specified order until library is found or no resolvers are left.
- If no resolvers are left and failOnError is true then a BuildException
- will be thrown.</p>
-
-<p>Note that this task
-works with extensions as defined by the "Optional Package" specification.
- For more information about optional packages, see the document
-<em>Optional Package Versioning</em> in the documentation bundle for your
-Java2 Standard Edition package, in file
-<code>guide/extensions/versioning.html</code> or the online
-<a target="_blank" href="http://docs.oracle.com/javase/7/docs/technotes/guides/extensions/versioning.html">
-Extension and ExtensionSet documentation</a> for further details</p>
+<p>Try to locate a jar to satisfy an extension and place location of jar into property. The task
+allows you to add a number of resolvers that are capable of locating a library for a specific
+extension. Each resolver will be attempted in specified order until library is found or no resolvers
+are left.  If no resolvers are left and <var>failOnError</var> is true then
+a <code>BuildException</code> will be thrown.</p>
+
+<p>Note that this task works with extensions as defined by the "Optional Package" specification.
+For more information about optional packages, see the document <em>Optional Package Versioning</em>
+in the documentation bundle for your Java Standard Edition package, in
+file <code>guide/extensions/versioning.html</code> or the
+online <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/extensions/versioning.html"
+target="_top">Extension and ExtensionSet documentation</a> for further details.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">property</td>
-    <td valign="top">The name of property to set to library location.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>property</td>
+    <td>The name of property to set to library location.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">failOnError</td>
-    <td valign="top">True if failure to locate library should result in build exception.</td>
-    <td valign="top" align="center">No, defaults to true.</td>
+    <td>failOnError</td>
+    <td><q>true</q> if failure to locate library should result in build exception.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">checkExtension</td>
-    <td valign="top">True if libraries returned by nested resolvers should be checked to see if
-    they supply extension.</td>
-    <td valign="top" align="center">No, defaults to true.</td>
+    <td>checkExtension</td>
+    <td><q>true</q> if libraries returned by nested resolvers should be checked to see if they
+      supply extension.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 
 <h4>extension</h4>
- <p><a href="../Types/extension.html">Extension</a> the extension
- to resolve. Must be present</p>
+<p><a href="../Types/extension.html">Extension</a> the extension to resolve. Must be present</p>
 
 <h4>location</h4>
- <p>The location sub element allows you to look for a library in a
- location relative to project directory.</p>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+<p>The <code>location</code> nested element allows you to look for a library in a location relative
+to project directory.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">location</td>
-    <td valign="top">The pathname of library.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>location</td>
+    <td>The pathname of library.</td>
+    <td>Yes</td>
   </tr>
 </table>
 
 <h4>url</h4>
- <p>The url resolver allows you to download a library from a URL to a
- local file.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<p>The <code>url</code> resolver allows you to download a library from a URL to a local file.</p>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">url</td>
-    <td valign="top">The URL to download.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>url</td>
+    <td>The URL to download.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">destfile</td>
-    <td valign="top">The file to download URL into.</td>
-    <td valign="top" align="center">No, But one of destfile or
-    destdir must be present</td>
+    <td>destfile</td>
+    <td>The file to download URL into.</td>
+    <td rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
-    <td valign="top">destdir</td>
-    <td valign="top">The directory in which to place downloaded file.</td>
-    <td valign="top" align="center">No, But one of destfile or
-    destdir must be present</td>
+    <td>destdir</td>
+    <td class="left">The directory in which to place downloaded file.</td>
   </tr>
 </table>
 
 <h4>ant</h4>
- <p>The ant resolver allows you to run an Apache Ant build file to generate a library.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<p>The <code>ant</code> resolver allows you to run an Apache Ant build file to generate a
+library.</p>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">antfile</td>
-    <td valign="top">The build file.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>antfile</td>
+    <td>The build file.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">destfile</td>
-    <td valign="top">The file that the ant build creates.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>destfile</td>
+    <td>The file that the ant build creates.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">target</td>
-    <td valign="top">The target to run in build file.</td>
-    <td valign="top" align="center">No</td>
+    <td>target</td>
+    <td>The target to run in build file.</td>
+    <td>No</td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<p><b>Resolve Extension to file.</b> If file does not exist or file
-   does not implement extension then throw an exception.</p>
+<p><strong>Resolve Extension to file.</strong> If file does not exist or file does not implement
+extension then throw an exception.</p>
 <pre>
-  &lt;extension id=&quot;dve.ext&quot;
-    extensionName=&quot;org.realityforge.dve&quot;
-    specificationVersion=&quot;1.2&quot;
-    specificationVendor=&quot;Peter Donald&quot;/&gt;
-
-  &lt;jarlib-resolve property="dve.library"&gt;
-    &lt;extension refid="dve.ext"/&gt;
-    &lt;location location="/opt/jars/dve.jar"/&gt;
-  &lt;/jarlib-resolve&gt;
-</pre>
+&lt;extension id=&quot;dve.ext&quot;
+           extensionName=&quot;org.realityforge.dve&quot;
+           specificationVersion=&quot;1.2&quot;
+           specificationVendor=&quot;Peter Donald&quot;/&gt;
+
+&lt;jarlib-resolve property="dve.library"&gt;
+  &lt;extension refid="dve.ext"/&gt;
+  &lt;location location="/opt/jars/dve.jar"/&gt;
+&lt;/jarlib-resolve&gt;</pre>
 
-<p><b>Resolve Extension to url.</b> If url does not exist or can not write
-   to destfile or files does not implement extension then throw an exception.</p>
+<p><strong>Resolve Extension to URL.</strong> If URL does not exist or can not write
+to <var>destfile</var> or file does not implement extension then throw an exception.</p>
 <pre>
-  &lt;extension id=&quot;dve.ext&quot;
-    extensionName=&quot;org.realityforge.dve&quot;
-    specificationVersion=&quot;1.2&quot;
-    specificationVendor=&quot;Peter Donald&quot;/&gt;
-
-  &lt;jarlib-resolve property="dve.library"&gt;
-    &lt;extension refid="dve.ext"/&gt;
-    &lt;url url="http://www.realityforge.net/jars/dve.jar" destfile="lib/dve.jar"/&gt;
-  &lt;/jarlib-resolve&gt;
-</pre>
-
-<p><b>Resolve Extension to file produce by ant build.</b> If file does not get produced
-   or ant file is missing or build fails then throw an exception (Note does not check
-   that library implements extension).</p>
+&lt;extension id=&quot;dve.ext&quot;
+           extensionName=&quot;org.realityforge.dve&quot;
+           specificationVersion=&quot;1.2&quot;
+           specificationVendor=&quot;Peter Donald&quot;/&gt;
+
+&lt;jarlib-resolve property="dve.library"&gt;
+  &lt;extension refid="dve.ext"/&gt;
+  &lt;url url="http://www.realityforge.net/jars/dve.jar" destfile="lib/dve.jar"/&gt;
+&lt;/jarlib-resolve&gt;</pre>
+
+<p><strong>Resolve Extension to file produce by Ant build.</strong> If file does not get produced or
+Ant file is missing or build fails then throw an exception. (<strong>Note</strong>: does not check
+that library implements extension.)</p>
 <pre>
-  &lt;extension id=&quot;dve.ext&quot;
-    extensionName=&quot;org.realityforge.dve&quot;
-    specificationVersion=&quot;1.2&quot;
-    specificationVendor=&quot;Peter Donald&quot;/&gt;
-
-  &lt;jarlib-resolve property="dve.library" checkExtension="false"&gt;
-    &lt;extension refid="dve.ext"/&gt;
-    &lt;ant antfile="../dve/build.xml" target="main" destfile="lib/dve.jar"/&gt;
-  &lt;/jarlib-resolve&gt;
-</pre>
-
-<p><b>Resolve Extension via multiple methods.</b> First check local file to see if it implements
-  extension. If it does not then try to build it from source in parallel directory. If that
-  fails then finally try to download it from a website. If all steps fail then throw a build
-  exception.</p>
+&lt;extension id=&quot;dve.ext&quot;
+           extensionName=&quot;org.realityforge.dve&quot;
+           specificationVersion=&quot;1.2&quot;
+           specificationVendor=&quot;Peter Donald&quot;/&gt;
+
+&lt;jarlib-resolve property="dve.library" checkExtension="false"&gt;
+  &lt;extension refid="dve.ext"/&gt;
+  &lt;ant antfile="../dve/build.xml" target="main" destfile="lib/dve.jar"/&gt;
+&lt;/jarlib-resolve&gt;</pre>
+
+<p><strong>Resolve Extension via multiple methods.</strong> First check local file to see if it
+implements extension. If it does not then try to build it from source in parallel directory. If that
+fails then finally try to download it from a website. If all steps fail then throw a build
+exception.</p>
 <pre>
-  &lt;extension id=&quot;dve.ext&quot;
-    extensionName=&quot;org.realityforge.dve&quot;
-    specificationVersion=&quot;1.2&quot;
-    specificationVendor=&quot;Peter Donald&quot;/&gt;
-
-  &lt;jarlib-resolve property="dve.library"&gt;
-    &lt;extension refid="dve.ext"/&gt;
-    &lt;location location="/opt/jars/dve.jar"/&gt;
-    &lt;ant antfile="../dve/build.xml" target="main" destfile="lib/dve.jar"/&gt;
-    &lt;url url="http://www.realityforge.net/jars/dve.jar" destfile="lib/dve.jar"/&gt;
-  &lt;/jarlib-resolve&gt;
-</pre>
-
-
+&lt;extension id=&quot;dve.ext&quot;
+           extensionName=&quot;org.realityforge.dve&quot;
+           specificationVersion=&quot;1.2&quot;
+           specificationVendor=&quot;Peter Donald&quot;/&gt;
+
+&lt;jarlib-resolve property="dve.library"&gt;
+  &lt;extension refid="dve.ext"/&gt;
+  &lt;location location="/opt/jars/dve.jar"/&gt;
+  &lt;ant antfile="../dve/build.xml" target="main" destfile="lib/dve.jar"/&gt;
+  &lt;url url="http://www.realityforge.net/jars/dve.jar" destfile="lib/dve.jar"/&gt;
+&lt;/jarlib-resolve&gt;</pre>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/javacc.html ant-1.10.3/manual/Tasks/javacc.html
--- ant-1.9.10/manual/Tasks/javacc.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/javacc.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,187 +24,169 @@
 
 <body>
 
-<h2><a name="javacc">JavaCC</a></h2>
+<h2 id="javacc">JavaCC</h2>
 <h3>Description</h3>
-<p>
-  Invokes the <a HREF="http://javacc.dev.java.net/" target="_top">JavaCC</a> compiler
-  compiler on a grammar file.
-</p>
-<p>
-  To use the javacc task, set the <i>target</i> attribute to the name of the
-  grammar file to process.  You also need to specify the directory containing
-  the JavaCC installation using the <i>javacchome</i> attribute, so that Apache Ant
-  can find the JavaCC classes.  Optionally, you can also set the
-  <i>outputdirectory</i> to write the generated file to a specific directory.
-  Otherwise javacc writes the generated files to the directory containing
-  the grammar file.
-</p>
-<p>
-  This task only invokes JavaCC if the grammar file is newer than the generated
-  Java files.  javacc assumes that the Java class name of the generated parser
-  is the same as the name of the grammar file, ignoring the .jj.
-  If this is not the case, the javacc task will still work, but it will always
-  generate the output files.
-</p>
+<p>Invokes the <a href="https://javacc.org/" target="_top">JavaCC</a> compiler compiler on a grammar
+file.</p>
+<p>To use the <code>javacc</code> task, set the <var>target</var> attribute to the name of the
+grammar file to process.  You also need to specify the directory containing the JavaCC installation
+using the <var>javacchome</var> attribute, so that Apache Ant can find the JavaCC classes.
+Optionally, you can also set the <var>outputdirectory</var> to write the generated file to a
+specific directory.  Otherwise JavaCC writes the generated files to the directory containing the
+grammar file.</p>
+<p>This task only invokes JavaCC if the grammar file is newer than the generated <samp>.java</samp>
+files.  JavaCC assumes that the Java class name of the generated parser is the same as the name of
+the grammar file, ignoring the <samp>.jj</samp>.  If this is not the case, the <code>javacc</code>
+task will still work, but it will always generate the output files.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">target</td>
-    <td valign="top">The grammar file to process.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>target</td>
+    <td>The grammar file to process.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">javacchome</td>
-    <td valign="top">The directory containing the JavaCC distribution.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>javacchome</td>
+    <td>The directory containing the JavaCC distribution.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">outputdirectory</td>
-    <td valign="top">
-      The directory to write the generated files to.  If not set, the files
-      are written to the directory containing the grammar file.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>outputdirectory</td>
+    <td>The directory to write the generated files to.  If not set, the files are written to the
+      directory containing the grammar file.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">buildparser</td>
-    <td valign="top">Sets the BUILD_PARSER grammar option.  This is a boolean option.</td>
-    <td valign="top" align="center">No</td>
+    <td>buildparser</td>
+    <td>Sets the BUILD_PARSER grammar option.  This is a boolean option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">buildtokenmanager</td>
-    <td valign="top">Sets the BUILD_TOKEN_MANAGER grammar option.  This is a boolean option.</td>
-    <td valign="top" align="center">No</td>
+    <td>buildtokenmanager</td>
+    <td>Sets the BUILD_TOKEN_MANAGER grammar option.  This is a boolean option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">cachetokens</td>
-    <td valign="top">Sets the CACHE_TOKENS grammar option.  This is a boolean option.</td>
-    <td valign="top" align="center">No</td>
+    <td>cachetokens</td>
+    <td>Sets the CACHE_TOKENS grammar option.  This is a boolean option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">choiceambiguitycheck</td>
-    <td valign="top">Sets the CHOICE_AMBIGUITY_CHECK grammar option.  This is an integer option.</td>
-    <td valign="top" align="center">No</td>
+    <td>choiceambiguitycheck</td>
+    <td>Sets the CHOICE_AMBIGUITY_CHECK grammar option.  This is an integer option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">commontokenaction</td>
-    <td valign="top">Sets the COMMON_TOKEN_ACTION grammar option.  This is a boolean option.</td>
-    <td valign="top" align="center">No</td>
+    <td>commontokenaction</td>
+    <td>Sets the COMMON_TOKEN_ACTION grammar option.  This is a boolean option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">debuglookahead</td>
-    <td valign="top">Sets the DEBUG_LOOKAHEAD grammar option.  This is a boolean option.</td>
-    <td valign="top" align="center">No</td>
+    <td>debuglookahead</td>
+    <td>Sets the DEBUG_LOOKAHEAD grammar option.  This is a boolean option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">debugparser</td>
-    <td valign="top">Sets the DEBUG_PARSER grammar option.  This is a boolean option.</td>
-    <td valign="top" align="center">No</td>
+    <td>debugparser</td>
+    <td>Sets the DEBUG_PARSER grammar option.  This is a boolean option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">debugtokenmanager</td>
-    <td valign="top">Sets the DEBUG_TOKEN_MANAGER grammar option.  This is a boolean option.</td>
-    <td valign="top" align="center">No</td>
+    <td>debugtokenmanager</td>
+    <td>Sets the DEBUG_TOKEN_MANAGER grammar option.  This is a boolean option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">errorreporting</td>
-    <td valign="top">Sets the ERROR_REPORTING grammar option.  This is a boolean option.</td>
-    <td valign="top" align="center">No</td>
+    <td>errorreporting</td>
+    <td>Sets the ERROR_REPORTING grammar option.  This is a boolean option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">forcelacheck</td>
-    <td valign="top">Sets the FORCE_LA_CHECK grammar option.  This is a boolean option.</td>
-    <td valign="top" align="center">No</td>
+    <td>forcelacheck</td>
+    <td>Sets the FORCE_LA_CHECK grammar option.  This is a boolean option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">ignorecase</td>
-    <td valign="top">Sets the IGNORE_CASE grammar option.  This is a boolean option.</td>
-    <td valign="top" align="center">No</td>
+    <td>ignorecase</td>
+    <td>Sets the IGNORE_CASE grammar option.  This is a boolean option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">javaunicodeescape</td>
-    <td valign="top">Sets the JAVA_UNICODE_ESCAPE grammar option.  This is a boolean option.</td>
-    <td valign="top" align="center">No</td>
+    <td>javaunicodeescape</td>
+    <td>Sets the JAVA_UNICODE_ESCAPE grammar option.  This is a boolean option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">jdkversion</td>
-    <td valign="top">Sets the JDK_VERSION option. This is a string option.</td>
-    <td valign="top" align="center">No</td>
-  </tr>  <tr>
-    <td valign="top">keeplinecolumn</td>
-    <td valign="top">Sets the KEEP_LINE_COLUMN grammar option.  This is a boolean option.</td>
-    <td valign="top" align="center">No</td>
+    <td>jdkversion</td>
+    <td>Sets the JDK_VERSION option. This is a string option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">lookahead</td>
-    <td valign="top">Sets the LOOKAHEAD grammar option.  This is an integer option.</td>
-    <td valign="top" align="center">No</td>
+    <td>keeplinecolumn</td>
+    <td>Sets the KEEP_LINE_COLUMN grammar option.  This is a boolean option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">optimizetokenmanager</td>
-    <td valign="top">Sets the OPTIMIZE_TOKEN_MANAGER grammar option.  This is a boolean option.</td>
-    <td valign="top" align="center">No</td>
+    <td>lookahead</td>
+    <td>Sets the LOOKAHEAD grammar option.  This is an integer option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">otherambiguitycheck</td>
-    <td valign="top">Sets the OTHER_AMBIGUITY_CHECK grammar option.  This is an integer option.</td>
-    <td valign="top" align="center">No</td>
+    <td>optimizetokenmanager</td>
+    <td>Sets the OPTIMIZE_TOKEN_MANAGER grammar option.  This is a boolean option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">sanitycheck</td>
-    <td valign="top">Sets the SANITY_CHECK grammar option.  This is a boolean option.</td>
-    <td valign="top" align="center">No</td>
+    <td>otherambiguitycheck</td>
+    <td>Sets the OTHER_AMBIGUITY_CHECK grammar option.  This is an integer option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">static</td>
-    <td valign="top">Sets the STATIC grammar option.  This is a boolean option.</td>
-    <td valign="top" align="center">No</td>
+    <td>sanitycheck</td>
+    <td>Sets the SANITY_CHECK grammar option.  This is a boolean option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">unicodeinput</td>
-    <td valign="top">Sets the UNICODE_INPUT grammar option.  This is a boolean option.</td>
-    <td valign="top" align="center">No</td>
+    <td>static</td>
+    <td>Sets the STATIC grammar option.  This is a boolean option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">usercharstream</td>
-    <td valign="top">Sets the USER_CHAR_STREAM grammar option.  This is a boolean option.</td>
-    <td valign="top" align="center">No</td>
+    <td>unicodeinput</td>
+    <td>Sets the UNICODE_INPUT grammar option.  This is a boolean option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">usertokenmanager</td>
-    <td valign="top">Sets the USER_TOKEN_MANAGER grammar option.  This is a boolean option.</td>
-    <td valign="top" align="center">No</td>
+    <td>usercharstream</td>
+    <td>Sets the USER_CHAR_STREAM grammar option.  This is a boolean option.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">maxmemory</td>
-    <td valign="top">Max amount of memory to allocate to the forked
-      VM.  <em>since Ant 1.8.3</em></td>
-    <td align="center" valign="top">No</td>
+    <td>usertokenmanager</td>
+    <td>Sets the USER_TOKEN_MANAGER grammar option.  This is a boolean option.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>maxmemory</td>
+    <td>Max amount of memory to allocate to the forked JVM.  <em>since Ant 1.8.3</em></td>
+    <td>No</td>
   </tr>
 </table>
 <h3>Example</h3>
-<blockquote><pre>
-&lt;javacc
-    target=&quot;src/Parser.jj&quot;
-    outputdirectory=&quot;build/src&quot;
-    javacchome=&quot;c:/program files/JavaCC&quot;
-    static=&quot;true&quot;
-/&gt;
-</pre></blockquote>
-<p>
-  This invokes JavaCC on grammar file src/Parser.jj, writing the generated
-  files to build/src.  The grammar option STATIC is set to true when
-  invoking JavaCC.
-</p>
-
+<pre>
+&lt;javacc target=&quot;src/Parser.jj&quot;
+        outputdirectory=&quot;build/src&quot;
+        javacchome=&quot;c:/program files/JavaCC&quot;
+        static=&quot;true&quot;/&gt;</pre>
+<p>This invokes JavaCC on grammar file <samp>src/Parser.jj</samp>, writing the generated files
+to <samp>build/src</samp>.  The grammar option STATIC is set to <q>true</q> when invoking
+JavaCC.</p>
 
 </body>
 </html>
-
-
diff -Nru ant-1.9.10/manual/Tasks/javac.html ant-1.10.3/manual/Tasks/javac.html
--- ant-1.9.10/manual/Tasks/javac.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/javac.html	2018-03-24 12:37:12.000000000 +0000
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<html lang="en-us">
+<html>
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
@@ -24,942 +24,750 @@
 
 <body>
 
-<h2><a name="javac">Javac</a></h2>
+<h2 id="javac">Javac</h2>
 <h3>Description</h3>
 <p>Compiles a Java source tree.</p>
-<p>The source and destination directory will be recursively scanned for Java
-source files to compile. Only Java files that have no corresponding
-<code>.class</code> file
-or where the class file is older than the
-<code>.java</code> file will be compiled.</p>
-<p>Note: Apache Ant uses only the names of the source and class files to find
-the classes that need a rebuild. It will not scan the source and therefore
-will have no knowledge about nested classes, classes that are named different
-from the source file, and so on. See the
-<a href="../Tasks/depend.html"><code>&lt;depend&gt;</code></a> task
-for dependency checking based on other than just
-existence/modification times.</p>
-<p>When the source files are part of a package, the directory structure of
-the source tree should follow the package
-hierarchy.</p>
-<p>It is possible to refine the set of files that are being compiled.
-This can be done with the <code>includes</code>, <code>includesfile</code>,
-<code>excludes</code>, and <code>excludesfile</code>
-attributes. With the <code>includes</code> or
-<code>includesfile</code> attribute, you specify the files you want to
-have included.
-The <code>exclude</code> or <code>excludesfile</code> attribute is used
-to specify
-the files you want to have excluded. In both cases, the list of files
-can be specified by either the filename, relative to the directory(s) specified
-in the <code>srcdir</code> attribute or nested <code>&lt;src&gt;</code>
-element(s), or by using wildcard patterns. See the section on
-<a href="../dirtasks.html#directorybasedtasks">directory-based tasks</a>,
-for information on how the
-inclusion/exclusion of files works, and how to write wildcard patterns.</p>
-<p>It is possible to use different compilers. This can be specified by
-either setting the global <code>build.compiler</code> property, which will
-affect all <code>&lt;javac&gt;</code> tasks throughout the build, by
-setting the <code>compiler</code> attribute, specific to the current
-<code>&lt;javac&gt;</code> task or by using a nested element of any
-<a href="typedef.html">typedef</a>fed or
-<a href="componentdef.html">componentdef</a>fed type that implements
-<code>org.apache.tools.ant.taskdefs.compilers.CompilerAdapter</code>.
-<a name="compilervalues">Valid values for either the
-<code>build.compiler</code> property or the <code>compiler</code>
-attribute are:</a></p>
+<p>The source and destination directory will be recursively scanned for Java source files to
+compile. Only <code>.java</code> files that have no corresponding <samp>.class</samp> file or where
+the <code>.class</code> file is older than the <samp>.java</samp> file will be compiled.</p>
+<p><strong>Note</strong>: Apache Ant uses only the names of the source and class files to find the
+classes that need a rebuild. It will not scan the source and therefore will have no knowledge about
+nested classes, classes that are named differently from the source file, and so on. See
+the <a href="../Tasks/depend.html"><code>&lt;depend&gt;</code></a> task for dependency checking
+based on other than just existence/modification times.</p>
+<p>When the source files are part of a package, the directory structure of the source tree should
+follow the package hierarchy.</p>
+<p>It is possible to refine the set of files that are being compiled.  This can be done with
+the <var>includes</var>, <var>includesfile</var>, <var>excludes</var>, and <var>excludesfile</var>
+attributes. With the <var>includes</var> or <var>includesfile</var> attribute, you specify the files
+you want to have included.  The <var>exclude</var> or <var>excludesfile</var> attribute is used to
+specify the files you want to have excluded. In both cases, the list of files can be specified by
+either the filename, relative to the directory(s) specified in the <var>srcdir</var> attribute or
+nested <code>&lt;src&gt;</code> element(s), or by using wildcard patterns. See the section
+on <a href="../dirtasks.html#directorybasedtasks">directory-based tasks</a>, for information on how
+the inclusion/exclusion of files works, and how to write wildcard patterns.</p>
+<p id="compilervalues">It is possible to use different compilers. This can be specified by either
+setting the global <code>build.compiler</code> property, which will affect
+all <code>&lt;javac&gt;</code> tasks throughout the build, by setting the <var>compiler</var>
+attribute, specific to the current <code>&lt;javac&gt;</code> task or by using a nested element of
+any <a href="typedef.html">typedef</a>fed or <a href="componentdef.html">componentdef</a>fed type
+that implements <code>org.apache.tools.ant.taskdefs.compilers.CompilerAdapter</code>.  Valid values
+for either the <code>build.compiler</code> property or the <var>compiler</var> attribute are:</p>
 <ul>
-  <li><code>classic</code> (the standard compiler of JDK 1.1/1.2) &ndash;
-      <code>javac1.1</code> and
-      <code>javac1.2</code> can be used as aliases.</li>
-  <li><code>modern</code> (the standard compiler of JDK 1.3 and later) &ndash;
-      <code>javac1.3</code> and
-      <code>javac1.4</code> and
-      <code>javac1.5</code> and
-      <code>javac1.6</code> and
-      <code>javac1.7</code> (<em>since Ant 1.8.2</em>) and
-      <code>javac1.8</code> (<em>since Ant 1.8.3</em>) and
-      <code>javac1.9</code> (<em>since Ant 1.9.5</em>) and
-      <code>javac9</code> (<em>since Ant 1.9.8</em>) and
-      <code>javac10+</code> (<em>since Ant 1.9.10</em>) can be used as aliases.</li>
-  <li><code>jikes</code> (the <a
-    href="http://jikes.sourceforge.net/" target="_top">Jikes</a>
+  <li><q>classic</q> (the standard compiler of JDK 1.1/1.2) &ndash; <q>javac1.1</q>
+    and <q>javac1.2</q> can be used as aliases.</li>
+  <li><q>modern</q> (the standard compiler of JDK 1.3 and later)
+    &ndash; <q>javac1.3</q>, <q>javac1.4</q>, <q>javac1.5</q> and <q>javac1.6</q>, <q>javac1.7</q>
+    (<em>since Ant 1.8.2</em>), <q>javac1.8</q> (<em>since Ant 1.8.3</em>), <q>javac1.9</q>
+    (<em>since Ant 1.9.5</em>), <q>javac9</q> (<em>since Ant 1.9.8</em>) and <q>javac10+</q>
+    (<em>since Ant 1.10.2</em>) can be used as aliases.</li>
+  <li><q>jikes</q> (the <a href="http://jikes.sourceforge.net/" target="_top">Jikes</a>
     compiler).</li>
-  <li><code>jvc</code> (the Command-Line Compiler from Microsoft's SDK
-      for Java / Visual J++) &ndash; <code>microsoft</code> can be used
-      as an alias.</li>
-  <li><code>kjc</code> (the <a href="http://www.dms.at/kopi/" target="_top">kopi</a>
-    compiler).</li>
-  <li><code>gcj</code> (the gcj compiler from gcc).</li>
-  <li><code>sj</code> (Symantec java compiler) &ndash;
-      <code>symantec</code> can be used as an alias.</li>
-  <li><code>extJavac</code> (run either modern or classic in a JVM of
-      its own).</li>
+  <li><q>jvc</q> (the Command-Line Compiler from Microsoft's SDK for Java / Visual J++)
+    &ndash; <q>microsoft</q> can be used as an alias.</li>
+  <li><q>kjc</q>
+    (the <a href="https://web.archive.org/web/20050212025507/http://www.dms.at/kopi/index.html"
+    target="_top">kopi</a> compiler).</li>
+  <li><q>gcj</q> (the <code>gcj</code> compiler
+    from <a href="https://gcc.gnu.org/gcc-7/changes.html#java" target="_top">GCC</a>).</li>
+  <li><q>sj</q> (Symantec Java compiler) &ndash; <q>symantec</q> can be used as an alias.</li>
+  <li><q>extJavac</q> (run either modern or classic in a JVM of its own).</li>
 </ul>
-<p>The default is <code>javac1.x</code> with <code>x</code> depending
-on the JDK version you use while you are running Ant.
-If you wish to use a different compiler interface than those
-supplied, you can write a class that implements the CompilerAdapter interface
-(<code>package org.apache.tools.ant.taskdefs.compilers</code>). Supply the full
-classname in the <code>build.compiler</code> property or the
-<code>compiler</code> attribute.
-</p>
-<p>The fork attribute overrides the <code>build.compiler</code> property
-or <code>compiler</code> attribute setting and
-expects a JDK1.1 or higher to be set in <code>JAVA_HOME</code>.
-</p>
-<p>You can also use the <code>compiler</code> attribute to tell Ant
-which JDK version it shall assume when it puts together the command
-line switches - even if you set <code>fork=&quot;true&quot;</code>.
-This is useful if you want to run the compiler of JDK 1.1 while you
-current JDK is 1.2+.  If you use
-<code>compiler=&quot;javac1.1&quot;</code> and (for example)
-<code>depend=&quot;true&quot;</code> Ant will use the command line
-switch <code>-depend</code> instead of <code>-Xdepend</code>.</p>
-<p>This task will drop all entries that point to non-existent
-files/directories from the classpath it passes to the compiler.</p>
-<p>The working directory for a forked executable (if any) is the
-  project's base directory.</p>
-<p><strong>Windows Note:</strong>When the modern compiler is used
-in unforked mode on Windows, it locks up the files present in the
-classpath of the <code>&lt;javac&gt;</code> task, and does not release them.
-The side effect of this is that you will not be able to delete or move
-those files later on in the build.  The workaround is to fork when
-invoking the compiler.</p>
-<p>If you are using Java 8 or above and your source contains native
-  methods or fields annotated with the <code>@Native</code> annotation
-  you can set the <code>nativeheaderdir</code> attribute in order to
-  use the <code>-h</code> switch of <code>javac</code> to generate the
-  native header files. Note that the logic Ant uses to determine which
-  files to compile does not take native headers into account, i.e. if
-  the <code>.class</code> is more recent than the
-  corresponding <code>.java</code> file the file will not get compiled
-  even if a native header file generated for it would be outdated.</p>
+<p>The default is <q>javac1.x</q> with <q>x</q> depending on the JDK version you use while you are
+running Ant.  If you wish to use a different compiler interface than those supplied, you can write a
+class that implements the CompilerAdapter interface
+(package <code>org.apache.tools.ant.taskdefs.compilers</code>). Supply the full classname in
+the <code>build.compiler</code> property or the <var>compiler</var> attribute.</p>
+<p>The <var>fork</var> attribute overrides the <code>build.compiler</code> property
+or <var>compiler</var> attribute setting and expects a JDK 1.1 or higher to be set
+in <code>JAVA_HOME</code>.</p>
+<p>You can also use the <var>compiler</var> attribute to tell Ant which JDK version it shall assume
+when it puts together the command line switches&mdash;even if you set <var>fork</var>=<q>true</q>.
+This is useful if you want to run the compiler of JDK 1.1 while your current JDK is 1.2+.  If you
+use <var>compiler</var>=<q>javac1.1</q> and (for example) <var>depend</var>=<q>true</q>, Ant will
+use the command line switch <kbd>-depend</kbd> instead of <kbd>-Xdepend</kbd>.</p>
+<p>This task will drop all entries that point to non-existent files/directories from the classpath
+it passes to the compiler.</p>
+<p>The working directory for a forked executable (if any) is the project's base directory.</p>
+<p><strong>Windows Note</strong>: When the modern compiler is used in unforked mode on Windows, it
+locks up the files present in the classpath of the <code>&lt;javac&gt;</code> task, and does not
+release them.  The side effect of this is that you will not be able to delete or move those files
+later on in the build.  The workaround is to fork when invoking the compiler.</p>
+<p>If you are using Java 8 or above and your source contains native methods or fields annotated with
+the <code>@Native</code> annotation you can set the <var>nativeheaderdir</var> attribute in order to
+use the <kbd>-h</kbd> switch of <kbd>javac</kbd> to generate the native header files. Note that
+the logic Ant uses to determine which files to compile does not take native headers into account,
+i.e. if the <samp>.class</samp> is more recent than the corresponding <samp>.java</samp> file the
+file will not get compiled even if a native header file generated for it would be outdated.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>srcdir</td>
+    <td>Location of the java files. (See the <a href="#srcdirnote">note</a> below.)</td>
+    <td>Yes, unless nested <code>&lt;src&gt;</code> elements or <var>modulesourcepath</var>
+      attribute or corresponding elements are present</td>
+  </tr>
+  <tr>
+    <td>destdir</td>
+    <td>Location to store the class files.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>includes</td>
+    <td>Comma- or space-separated list of patterns of files that must be included.</td>
+    <td>No; defaults to all <samp>.java</samp> files</td>
+  </tr>
+  <tr>
+    <td>includesfile</td>
+    <td>Name of a file. Each line of this file is taken to be an include pattern.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>excludes</td>
+    <td>Comma- or space-separated list of patterns of files that must be excluded.</td>
+    <td>No; defaults to default excludes or none if <var>defaultexcludes</var> is <q>no</q></td>
+  </tr>
+  <tr>
+    <td>excludesfile</td>
+    <td>Name of a file. Each line of this file is taken to be an exclude pattern.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>defaultexcludes</td>
+    <td>Indicates whether default excludes should be used or not (<q>yes|no</q>).</td>
+    <td>No; defaults to <q>yes</q></td>
+  </tr>
+  <tr>
+    <td>classpath</td>
+    <td>The classpath to use.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>sourcepath</td>
+    <td>The sourcepath to use.  To suppress the <code>sourcepath</code> switch,
+      use <var>sourcepath</var>=<q></q>.</td>
+    <td>No; defaults to <var>srcdir</var> unless nested <code>&lt;src&gt;</code> elements are
+      specified</td>
+  </tr>
+  <tr>
+    <td>bootclasspath</td>
+    <td>Location of bootstrap class files. (See <a href="#bootstrap">below</a> for using
+      the <kbd>-X</kbd> and <kbd>-J-X</kbd> parameters for specifying the bootstrap
+      classpath).</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>classpathref</td>
+    <td>The <var>classpath</var> to use, given as a <a href="../using.html#references">reference</a>
+      to a path defined elsewhere.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>sourcepathref</td>
+    <td>The <var>sourcepath</var> to use, given as
+      a <a href="../using.html#references">reference</a> to a path defined elsewhere.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>bootclasspathref</td>
+    <td>The <var>bootstrapclasspath</var> to use, given as
+      a <a href="../using.html#references">reference</a> to a path defined elsewhere.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>extdirs</td>
+    <td>Location of installed extensions.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>encoding</td>
+    <td>Encoding of source files. (<strong>Note</strong>: <code>gcj</code> doesn't support this
+      option yet.)</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>nowarn</td>
+    <td>Indicates whether the <kbd>-nowarn</kbd> switch should be passed to the compiler.</td>
+    <td>No; defaults to <q>off</q></td>
+  </tr>
+  <tr>
+    <td>debug</td>
+    <td>Indicates whether source should be compiled with debug information.  If set
+      to <q>off</q>, <kbd>-g:none</kbd> will be passed on the command line for compilers that
+      support it (for other compilers, no command line argument will be used).  If set
+      to <q>true</q>, the value of the <var>debuglevel</var> attribute determines the command line
+      argument.</td>
+    <td>No; defaults to <q>off</q></td>
+  </tr>
+  <tr>
+    <td>debuglevel</td>
+    <td>Keyword list to be appended to the <kbd>-g</kbd> command-line switch. Legal values
+      are <q>none</q> or a comma-separated list of the following
+      keywords: <q>lines</q>, <q>vars</q>, and <q>source</q>.</td>
+    <td>No; ignored when <var>debug</var> is <q>false</q> or any implementation other
+      than <q>modern</q>, <q>javac1.2</q> and <q>jikes</q>; by default, nothing will be appended
+      to <kbd>-g</kbd></td>
+  </tr>
+  <tr>
+    <td>optimize</td>
+    <td>Indicates whether source should be compiled with optimization. <strong>Note</strong> that
+      this flag is just ignored by Sun's <kbd>javac</kbd> since JDK 1.3 (because compile-time
+      optimization is unnecessary).</td>
+    <td>No; defaults to <q>off</q></td>
+  </tr>
+  <tr>
+    <td>deprecation</td>
+    <td>Indicates whether source should be compiled with deprecation information.</td>
+    <td>No; defaults to <code>off</code></td>
+  </tr>
+  <tr>
+    <td>verbose</td>
+    <td>Asks the compiler for verbose output.</td>
+    <td>No; defaults to <q>no</q></td>
+  </tr>
+  <tr>
+    <td>depend</td>
+    <td>Enables dependency tracking for compilers that support this (<q>jikes</q>
+      and <q>classic</q>).</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>includeAntRuntime</td>
+    <td>Whether to include the Ant run-time libraries in the classpath. <em>It is usually best</em>
+      to set this to <q>false</q> so the script's behavior is not sensitive to the environment in
+      which it is run.</td>
+    <td>No; defaults to <q>yes</q>,
+      unless <a href="../sysclasspath.html"><code>build.sysclasspath</code></a> property is set</td>
+  </tr>
+  <tr>
+    <td>includeJavaRuntime</td>
+    <td>Whether to include the default run-time libraries from the executing JVM in the
+      classpath.<br/><strong>Note</strong>: In some setups the run-time libraries may be part of the
+      "Ant run-time libraries" so you may need to explicitly set <var>includeAntRuntime</var>
+      to <q>false</q> to ensure that the Java run-time libraries are not included.</td>
+    <td>No; defaults to <q>no</q></td>
+  </tr>
+  <tr>
+    <td>fork</td>
+    <td>Whether to execute <code>javac</code> using the JDK compiler externally.</td>
+    <td>No; defaults to <q>no</q></td>
+  </tr>
+  <tr>
+    <td>executable</td>
+    <td>Complete path to the <kbd>javac</kbd> executable to use in case of <var>fork</var>
+      is <q>yes</q>.<br/><em>Since Ant 1.6</em> this attribute can also be used to specify the path
+      to the executable when using <q>jikes</q>, <q>jvc</q>, <q>gcj</q> or <q>sj</q>.</td>
+    <td>No; defaults to the compiler of current JDK, ignored if <var>fork</var> is <q>no</q></td>
+  </tr>
+  <tr>
+    <td>memoryInitialSize</td>
+    <td>The initial size of the memory for the underlying JVM, if <kbd>javac</kbd> is run
+      externally.  (Examples: <q>83886080</q>, <q>81920k</q>, or <q>80m</q>)</td>
+    <td>No; defaults to the standard JVM memory setting, ignored if <var>fork</var>
+      is <q>no</q></td>
+  </tr>
+  <tr>
+    <td>memoryMaximumSize</td>
+    <td>The maximum size of the memory for the underlying JVM, if <kbd>javac</kbd> is run
+      externally; ignored otherwise.  (Examples: <q>83886080</q>, <q>81920k</q>, or <q>80m</q>)</td>
+    <td>No; defaults to the standard JVM memory setting, ignored if <var>fork</var>
+      is <q>no</q></td>
+  </tr>
+  <tr>
+    <td>failonerror</td>
+    <td>Indicates whether compilation errors will fail the build>.</td>
+    <td>No; defaults to <q>true</q></td>
+  </tr>
+  <tr>
+    <td>errorProperty</td>
+    <td>The property to set to <q>true</q> if compilation fails.  <em>Since Ant 1.7.1</em>.</td>
+    <td>No</td>
+  </tr>
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">srcdir</td>
-    <td valign="top">Location of the java files. (See the
-     <a href="#srcdirnote">note</a> below.)</td>
-    <td align="center" valign="top">Yes, unless nested <code>&lt;src&gt;</code> elements or <code>modulesourcepath</code> attribute or elements are present.</td>
-  </tr>
-  <tr>
-    <td valign="top">destdir</td>
-    <td valign="top">Location to store the class files.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">includes</td>
-    <td valign="top">Comma- or space-separated list of files (may be specified using
-      wildcard patterns) that must be
-      included; all <code>.java</code> files are included when omitted.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top">The name of a file that contains a list of files to
-      include (may be specified using wildcard patterns).</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">excludes</td>
-    <td valign="top">Comma- or space-separated list of files (may be specified using
-      wildcard patterns) that must be excluded; no files (except default
-      excludes) are excluded when omitted.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top">The name of a file that contains a list of files to
-      exclude (may be specified using wildcard patterns).</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">The classpath to use.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">sourcepath</td>
-    <td valign="top">The sourcepath to use; defaults to the value of the srcdir attribute (or nested <code>&lt;src&gt;</code> elements).
-        To suppress the sourcepath switch, use <code>sourcepath=&quot;&quot;</code>.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">bootclasspath</td>
-    <td valign="top">
-      Location of bootstrap class files. (See <a href="#bootstrap">below</a>
-      for using the -X and -J-X parameters for specifying
-      the bootstrap classpath).
-    </td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">The classpath to use, given as a
-      <a href="../using.html#references">reference</a> to a path defined elsewhere.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">sourcepathref</td>
-    <td valign="top">The sourcepath to use, given as a
-      <a href="../using.html#references">reference</a> to a path defined elsewhere.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">bootclasspathref</td>
-    <td valign="top">Location of bootstrap class files, given as a
-      <a href="../using.html#references">reference</a> to a path defined elsewhere.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">extdirs</td>
-    <td valign="top">Location of installed extensions.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">Encoding of source files. (Note: gcj doesn't support
-      this option yet.)</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">nowarn</td>
-    <td valign="top">Indicates whether the <code>-nowarn</code> switch
-      should be passed to the compiler; defaults to <code>off</code>.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">debug</td>
-    <td valign="top">Indicates whether source should be compiled with
-    debug information; defaults to <code>off</code>.  If set to
-    <code>off</code>, <code>-g:none</code> will be passed on the
-    command line for compilers that support it (for other compilers, no
-    command line argument will be used).  If set to <code>true</code>,
-    the value of the <code>debuglevel</code> attribute determines the
-    command line argument.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">debuglevel</td>
-    <td valign="top">Keyword list to be appended to the <code>-g</code>
-      command-line switch.  This will be ignored by all implementations except
-      <code>modern</code>, <code>classic(ver &gt;= 1.2)</code> and <code>jikes</code>.
-      Legal values are <code>none</code> or a comma-separated list of the
-      following keywords:
-      <code>lines</code>, <code>vars</code>, and <code>source</code>.
-      If <code>debuglevel</code> is not specified, by default,
-      nothing will be
-      appended to <code>-g</code>.  If <code>debug</code> is not turned on,
-      this attribute will be ignored.
-    </td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">optimize</td>
-    <td valign="top">
-      Indicates whether source should be compiled with
-      optimization; defaults to <code>off</code>. <strong>Note</strong>
-      that this flag is just ignored by Sun's <code>javac</code> starting
-      with JDK 1.3 (since compile-time optimization is unnecessary).
-    </td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">deprecation</td>
-    <td valign="top">Indicates whether source should be compiled with
-      deprecation information; defaults to <code>off</code>.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">target</td>
-    <td valign="top">Generate class files for specific VM version
-    (e.g., <code>1.1</code> or <code>1.2</code>). <b>Note that the
-    default value depends on the JVM that is running Ant.  In
-    particular, if you use JDK 1.4+ the generated classes will not be
-    usable for a 1.1 Java VM unless you explicitly set this attribute
-    to the value 1.1 (which is the default value for JDK 1.1 to
-    1.3).  We highly recommend to always specify this
-    attribute.</b><br>
-    A default value for this attribute can be provided using the magic
-    <a
-    href="../javacprops.html#target"><code>ant.build.javac.target</code></a>
-    property.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">Asks the compiler for verbose output; defaults to
-      <code>no</code>.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">depend</td> <td valign="top">Enables dependency-tracking
-      for compilers that support this (<code>jikes</code> and
-      <code>classic</code>).</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">includeAntRuntime</td>
-    <td valign="top">Whether to include the Ant run-time libraries in the
-      classpath; defaults to <code>yes</code>, unless
-      <a href="../sysclasspath.html"><code>build.sysclasspath</code></a> is set.
-      <em>It is usually best to set this to false</em> so the script's behavior is not
-      sensitive to the environment in which it is run.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">includeJavaRuntime</td>
-    <td valign="top">Whether to include the default run-time
-      libraries from the executing VM in the classpath;
-      defaults to <code>no</code>.<br/>
-      <b>Note:</b> In some setups the run-time libraries may be part
-      of the "Ant run-time libraries" so you may need to explicitly
-      set includeAntRuntime to false to ensure that the Java
-      run-time libraries are not included.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">fork</td>
-    <td valign="top">Whether to execute <code>javac</code> using the
-      JDK compiler externally; defaults to <code>no</code>.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">executable</td>
-    <td valign="top">Complete path to the <code>javac</code>
-      executable to use in case of <code>fork=&quot;yes&quot;</code>.
-      Defaults to the compiler of the Java version that is currently
-      running Ant.  Ignored if <code>fork=&quot;no&quot;</code>.<br>
-      Since Ant 1.6 this attribute can also be used to specify the
-      path to the executable when using jikes, jvc, gcj or sj.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">memoryInitialSize</td>
-    <td valign="top">The initial size of the memory for the underlying VM,
-      if <code>javac</code> is run externally; ignored otherwise. Defaults
-      to the standard VM memory setting.
-      (Examples: <code>83886080</code>, <code>81920k</code>, or
-      <code>80m</code>)</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">memoryMaximumSize</td>
-    <td valign="top">The maximum size of the memory for the underlying VM,
-      if <code>javac</code> is run externally; ignored otherwise. Defaults
-      to the standard VM memory setting.
-      (Examples: <code>83886080</code>, <code>81920k</code>, or
-      <code>80m</code>)</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">Indicates whether compilation errors
-        will fail the build; defaults to <code>true</code>.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">errorProperty</td>
-    <td valign="top">
-      The property to set (to the value "true") if compilation fails.
-      <em>Since Ant 1.7.1</em>.
-    </td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">source</td>
-
-    <td valign="top">Value of the <code>-source</code> command-line
-    switch; will be ignored by all implementations prior to
-    <code>javac1.4</code> (or <code>modern</code> when Ant is not
-    running in a 1.3 VM), <code>gcj</code> and <code>jikes</code>.<br>
-    If you use this attribute together with <code>gcj</code>
-    or <code>jikes</code>, you must make sure that your version
-    supports the <code>-source</code> (or <code>-fsource</code> for
-    gcj)
-    switch.  By default, no <code>-source</code> argument will be used
-    at all.<br>
-    <b>Note that the default value depends on the JVM that is running
-    Ant.  We highly recommend to always specify this
-    attribute.</b><br>
-    A default value for this attribute can be provided using the magic
-    <a
-    href="../javacprops.html#source"><code>ant.build.javac.source</code></a>
-    property.</td>
-
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">compiler</td>
-    <td valign="top">The compiler implementation to use.
-      If this attribute is not set, the value of the
-      <code>build.compiler</code> property, if set, will be used.
-      Otherwise, the default compiler for the current VM will be used.
-      (See the above <a href="#compilervalues">list</a> of valid
-      compilers.)</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">listfiles</td>
-    <td valign="top">Indicates whether the source files to be compiled will
-      be listed; defaults to <code>no</code>.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">tempdir</td>
-    <td valign="top">Where Ant should place temporary files.
-      This is only used if the task is forked and the
-      command line args length exceeds 4k.
-      <em>Since Ant 1.6</em>.</td>
-    <td align="center" valign="top">
-      No; default is <i>java.io.tmpdir</i>.
-    </td>
-  </tr>
-  <tr>
-    <td valign="top">updatedProperty</td>
-    <td valign="top">
-      The property to set (to the value "true") 
-      if compilation has taken place
-      and has been successful.
-      <em>Since Ant 1.7.1</em>.
-    </td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">includeDestClasses</td>
-    <td valign="top">
-      This attribute controls whether to include the
-      destination classes directory in the classpath
-      given to the compiler.
-      The default value of this is "true" and this
-      means that previously compiled classes are on
-      the classpath for the compiler. This means that "greedy" compilers
-      will not recompile dependent classes that are already compiled.
-      In general this is a good thing as it stops the compiler
-      for doing unnecessary work. However, for some edge cases,
-      involving generics, the javac compiler
-      needs to compile the dependent classes to get the generics
-      information. One example is documented in the bug report:
-      <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=40776">
-        Bug 40776 - a problem compiling a Java 5 project with generics</a>.
-      Setting the attribute to "false" will cause the compiler
-      to recompile dependent classes.
-      <em>Since Ant 1.7.1</em>.
-    </td>
-    <td align="center" valign="top">No - default is "true"</td>
-  </tr>
-  <tr>
-    <td valign="top">createMissingPackageInfoClass</td>
-    <td valign="top">
-      Some package level annotations in <code>package-info.java</code>
-      files don't create any <code>package-info.class</code> files so
-      Ant would recompile the same file every time.<br/>
-      Starting with Ant 1.8 Ant will create an
-      empty <code>package-info.class</code> for
-      each <code>package-info.java</code> if there isn't one created
-      by the compiler.<br/>
-      In some setups this additional class causes problems and it can
-      be suppressed by setting this attribute to "false".
-      <em>Since Ant 1.8.3</em>.
-    </td>
-    <td align="center" valign="top">No - default is "true"</td>
-  </tr>
-  <tr>
-    <td valign="top">modulepath</td>
-    <td valign="top">
-      Specify where to find application modules. A list of directories of modules, module files or exploded modules.
-      <em>since Ant 1.9.7</em>
-    </td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">modulepathref</td>
-    <td valign="top">
-      The modulepath to use, given as <a href="../using.html#references">reference</a> to a PATH defined elsewhere.
-      <em>since Ant 1.9.7</em></td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">modulesourcepath</td>
-    <td valign="top">
-      Specify where to find input source files for multiple module compilation.
-      <em>since Ant 1.9.7</em>
-    </td>
-    <td align="center" valign="top">Yes, unless <code>srcdir</code> attribute or nested <code>&lt;src&gt;</code> elements are present</td>
-  </tr>
-  <tr>
-    <td valign="top">modulesourcepathref</td>
-    <td valign="top">
-      The modulesourcepath to use, given as <a href="../using.html#references">reference</a> to a PATH defined elsewhere.
-      <em>since Ant 1.9.7</em></td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">upgrademodulepath</td>
-    <td valign="top">
-      Specify the location of modules that replace upgradeable modules in the runtime image.
-      <em>since Ant 1.9.7</em>
-    </td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">upgrademodulepathref</td>
-    <td valign="top">
-      The upgrademodulepath to use, given as <a href="../using.html#references">reference</a> to a PATH defined elsewhere.
-      <em>since Ant 1.9.7</em></td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">nativeheaderdir</td>
-    <td valign="top">
-      Specify where to place generated native header files. Ignored
-      when running on JDK &lt; 8.
-      <em>Since Ant 1.9.8</em>.
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">release</td>
-    <td valign="top">
-      Specify the value for the <code>--release</code> switch. Ignored
-      when running on JDK &lt; 9.<br>
-      When set and running on JDK &gt;= 9 the source and target
-      attributes as well as the bootclasspath will be ignored.
-      <em>Since Ant 1.9.8</em>.
-    <td align="center" valign="top">No</td>
+    <td>source</td>
+    <td>Java language features accepted by compiler, as specified by the <kbd>-source</kbd>
+      command-line switch.  Valid feature versions are <q>1.3</q>, <q>1.4</q>, <q>1.5</q>
+      or <q>5</q>, etc.  The attribute will be ignored by all implementations prior
+      to <q>javac1.4</q> (or <q>modern</q> when Ant is not running in a JVM 1.3), <q>gcj</q>
+      and <q>jikes</q>.<br/>  If you use this attribute together with <q>gcj</q> or <q>jikes</q>, you
+      must make sure that your version supports the <kbd>-source</kbd> (or <kbd>-fsource</kbd>
+      for <kbd>gcj</kbd>) switch.</td>
+    <td>No; by default, no <kbd>-source</kbd> argument will be used at all unless the magic
+      <a href="../javacprops.html#source"><code>ant.build.javac.source</code></a> property is
+      set<br/><strong>Note that the default value depends on JDK that is running Ant.  We highly
+      recommend to always specify this attribute.</strong></td>
+  </tr>
+  <tr>
+    <td>target</td>
+    <td>Generate class files for specific JVM version (cross-compile).</td>
+    <td>No; by default, no <kbd>-target</kbd> argument will be used at all unless the
+      magic <a href="../javacprops.html#target"><code>ant.build.javac.target</code></a> property is
+      set<br/><strong>Note that the default value depends on JDK that is running Ant and
+      on <var>source</var>
+      (see <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/javac.html#BHCJDCID"
+      target="_top">Cross-Compilation Options</a>).  We highly recommend to always specify this
+      attribute.</strong></td>
+  </tr>
+  <tr>
+    <td>compiler</td>
+    <td>The compiler implementation to use.  See the above <a href="#compilervalues">list</a> of
+      valid compilers.</td>
+    <td>No; defaults to the value of the <code>build.compiler</code> property, if set, or default
+      compiler for the current JDK otherwise</td>
+  </tr>
+  <tr>
+    <td>listfiles</td>
+    <td>Indicates whether the source files to be compiled will be listed.</td>
+    <td>No; defaults to <q>no</q></td>
+  </tr>
+  <tr>
+    <td>tempdir</td>
+    <td>Where Ant should place temporary files.  This is only used if the task is forked and the
+      command line args length exceeds 4 kB.  <em>Since Ant 1.6</em>.</td>
+    <td>No; default is <code>java.io.tmpdir</code></td>
+  </tr>
+  <tr>
+    <td>updatedProperty</td>
+    <td>The property to set to <q>true</q> if compilation has taken place and has been
+      successful.  <em>Since Ant 1.7.1</em>.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>includeDestClasses</td>
+    <td>This attribute controls whether to include the destination classes directory in the
+      classpath given to the compiler.  If set to <q>true</q> (default), previously compiled classes
+      are on the classpath for the compiler. This means that "greedy" compilers will not recompile
+      dependent classes that are already compiled.  In general this is a good thing as it stops the
+      compiler for doing unnecessary work. However, for some edge cases, involving generics,
+      the <kbd>javac</kbd> compiler needs to compile the dependent classes to get the generics
+      information. One example is documented in the bug
+      report: <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=40776" target="_top">Bug
+      40776 - a problem compiling a Java 5 project with generics</a>.  Setting the attribute
+      to <q>false</q> will cause the compiler to recompile dependent classes.  <em>Since Ant
+      1.7.1</em>.</td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+  <tr>
+    <td>createMissingPackageInfoClass</td>
+    <td>Some package level annotations in <samp>package-info.java</samp> files don't create
+      any <samp>package-info.class</samp> files so Ant would recompile the same file every
+      time.<br/><em>Since Ant 1.8</em>, an empty <samp>package-info.class</samp> is created for
+      each <samp>package-info.java</samp> if there isn't one created by the compiler.<br/>In some
+      setups this additional class causes problems and it can be suppressed by setting this
+      attribute to <q>false</q>.  <em>Since Ant 1.8.3</em>.</td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+  <tr>
+    <td>modulepath</td>
+    <td>Specify where to find application modules. A list of directories of modules, module files or
+    exploded modules.  <em>since Ant 1.9.7</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>modulepathref</td>
+    <td>The <var>modulepath</var> to use, given as <a href="../using.html#references">reference</a>
+    to a path defined elsewhere.  <em>since Ant 1.9.7</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>modulesourcepath</td>
+    <td>Specify where to find input source files for multiple module compilation.  <em>since Ant
+      1.9.7</em></td>
+    <td>Yes, unless <var>srcdir</var> attribute or nested <code>&lt;src&gt;</code> elements are
+      present</td>
+  </tr>
+  <tr>
+    <td>modulesourcepathref</td>
+    <td>The <var>modulesourcepath</var> to use, given
+      as <a href="../using.html#references">reference</a> to a path defined elsewhere.  <em>since
+      Ant 1.9.7</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>upgrademodulepath</td>
+    <td>Specify the location of modules that replace upgradeable modules in the runtime
+    image.  <em>since Ant 1.9.7</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>upgrademodulepathref</td>
+    <td>The <var>upgrademodulepath</var> to use, given
+    as <a href="../using.html#references">reference</a> to a path defined elsewhere.  <em>since Ant
+    1.9.7</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>nativeheaderdir</td>
+    <td>Specify where to place generated native header files.  <em>Since Ant 1.9.8</em>.
+    <td>No, ignored when running on JDK 7 or earlier</td>
+  </tr>
+  <tr>
+    <td>release</td>
+    <td>Specify the value for the <kbd>--release</kbd> switch.<br/>When set and running on JDK 9+
+      the <var>source</var> and <var>target</var> attributes as well as the <var>bootclasspath</var>
+      will be ignored.  <em>Since Ant 1.9.8</em>.
+    <td>No, ignored when running on JDK 8 or earlier</td>
   </tr>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
-<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and
-supports most attributes of <code>&lt;fileset&gt;</code>
-(<code>dir</code> becomes <code>srcdir</code>) as well as the nested
-<code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and
-<code>&lt;patternset&gt;</code> elements.</p>
-<h4><code>srcdir</code>, <code>classpath</code>, <code>sourcepath</code>,
-<code>bootclasspath</code>, <code>modulepath</code>, <code>modulesourcepath</code>,
-<code>upgrademodulepath</code> and <code>extdirs</code></h4>
-<p><code>&lt;javac&gt;</code>'s <code>srcdir</code>, <code>classpath</code>,
-<code>sourcepath</code>, <code>bootclasspath</code>,
-<code>extdirs</code>, <code>modulepath</code>, <code>modulesourcepath</code>,
-and <code>upgrademodulepath</code> attributes are
-<a href="../using.html#path">path-like structures</a>
-and can also be set via nested
-<code>&lt;src&gt;</code> (note the different name!),
-<code>&lt;classpath&gt;</code>,
-<code>&lt;sourcepath&gt;</code>,
-<code>&lt;bootclasspath&gt;</code>,
-<code>&lt;extdirs&gt;</code>,
-<code>&lt;modulepath&gt;</code>,
-<code>&lt;modulesourcepath&gt;</code> and
-<code>&lt;upgrademodulepath&gt;</code>
-elements, respectively.</p>
+<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and supports most
+attributes of <code>&lt;fileset&gt;</code> (<var>dir</var> becomes <var>srcdir</var>) as well as the
+nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code>
+and <code>&lt;patternset&gt;</code> elements.</p>
+<h4><code>srcdir</code>, <code>classpath</code>, <code>sourcepath</code>, <code>bootclasspath</code>,
+<code>modulepath</code>, <code>modulesourcepath</code>, <code>upgrademodulepath</code> and <code>extdirs</code></h4>
+<p><code>&lt;javac&gt;</code>'s <var>srcdir</var>, <var>classpath</var>, <var>sourcepath</var>,
+<var>bootclasspath</var>, <var>extdirs</var>, <var>modulepath</var>, <var>modulesourcepath</var>,
+and <var>upgrademodulepath</var> attributes are <a href="../using.html#path">path-like
+structures</a> and can also be set via nested <code>&lt;src&gt;</code> (note the different
+name!), <code>&lt;classpath&gt;</code>, <code>&lt;sourcepath&gt;</code>, <code>&lt;bootclasspath&gt;</code>,
+<code>&lt;extdirs&gt;</code>, <code>&lt;modulepath&gt;</code>, <code>&lt;modulesourcepath&gt;</code>
+and <code>&lt;upgrademodulepath&gt;</code> elements, respectively.</p>
 
 <h4>compilerarg</h4>
 
-<p>You can specify additional command line arguments for the compiler
-with nested <code>&lt;compilerarg&gt;</code> elements.  These elements
-are specified like <a href="../using.html#arg">Command-line
-Arguments</a> but have an additional attribute that can be used to
-enable arguments only if a given compiler implementation will be
-used.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<p>You can specify additional command line arguments for the compiler with
+nested <code>&lt;compilerarg&gt;</code> elements.  These elements are specified
+like <a href="../using.html#arg">Command-line Arguments</a> but have an additional attribute that
+can be used to enable arguments only if a given compiler implementation will be used.</p>
+<table class="attr">
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <th>Attribute</th>
+  <th>Description</th>
+  <th>Required</th>
 </tr>
   <tr>
-    <td valign="top">value</td>
-    <td align="center" rowspan="4">See
-    <a href="../using.html#arg">Command-line Arguments</a>.</td>
-    <td align="center" rowspan="4">Exactly one of these.</td>
+    <td>value</td>
+    <td rowspan="4">See <a href="../using.html#arg">Command-line Arguments</a>.</td>
+    <td rowspan="4">Exactly one of these</td>
   </tr>
   <tr>
-    <td valign="top">line</td>
+    <td class="var">line</td>
   </tr>
   <tr>
-    <td valign="top">file</td>
+    <td class="var">file</td>
   </tr>
   <tr>
-    <td valign="top">path</td>
+    <td class="var">path</td>
   </tr>
   <tr>
-    <td valign="top">prefix</td>
-    <td align="center" rowspan="2">See
-    <a href="../using.html#arg">Command-line Arguments</a>.
-    <em>Since Ant 1.8.</em></td>
-    <td valign="top" align="center">No</td>
+    <td>prefix</td>
+    <td rowspan="2">See <a href="../using.html#arg">Command-line Arguments</a>.  <em>Since Ant
+    1.8</em>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">suffix</td>
-    <td valign="top" align="center">No</td>
+    <td>suffix</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">compiler</td>
-    <td>Only pass the specified argument if the chosen
-      compiler implementation matches the value of this attribute.
-      Legal values are the
-      same as those in the above <a href="#compilervalues">list</a> of valid
-      compilers.)</td>
-    <td align="center">No</td>
+    <td>compiler</td>
+    <td>Only pass the specified argument if the chosen compiler implementation matches the value of
+      this attribute.  Legal values are the same as those in the
+      above <a href="#compilervalues">list</a> of valid compilers.)</td>
+    <td>No</td>
   </tr>
 </table>
 
-<h4>compilerclasspath <em>since Ant 1.8.0</em></h4>
-
-<p>A <a href="../using.html#path">PATH like structure</a> holding the
-  classpath to use when loading the compiler implementation if a
-  custom class has been specified.  Doesn't have any effect when
-  using one of the built-in compilers.</p>
-
-<h4>Any nested element of a type that implements CompilerAdapter
-  <em>since Ant 1.8.0</em></h4>
-
-<p>If a defined type implements the <code>CompilerAdapter</code>
-  interface a nested element of that type can be used as an
-  alternative to the <code>compiler</code> attribute.</p>
+<h4>compilerclasspath</h4>
+<p><em>Since Ant 1.8.0</em></p>
+<p>A <a href="../using.html#path">path-like structure</a> holding the classpath to use when loading
+the compiler implementation if a custom class has been specified.  Doesn't have any effect when
+using one of the built-in compilers.</p>
+
+<h4>Any nested element of a type that implements <code>CompilerAdapter</code></h4>
+<p><em>Since Ant 1.8.0</em></p>
+<p>If a defined type implements the <code>CompilerAdapter</code> interface a nested element of that
+type can be used as an alternative to the <var>compiler</var> attribute.</p>
 
 <h3>Examples</h3>
-<pre>  &lt;javac srcdir=&quot;${src}&quot;
-         destdir=&quot;${build}&quot;
-         classpath=&quot;xyz.jar&quot;
-         debug=&quot;on&quot;
-         source=&quot;1.4&quot;
-  /&gt;</pre>
-<p>compiles all <code>.java</code> files under the <code>${src}</code>
-directory, and stores
-the <code>.class</code> files in the <code>${build}</code> directory.
-The classpath used includes <code>xyz.jar</code>, and compiling with
-debug information is on. The source level is 1.4,
-so you can use <code>assert</code> statements.</p>
-
-<pre>  &lt;javac srcdir=&quot;${src}&quot;
-         destdir=&quot;${build}&quot;
-         fork=&quot;true&quot;
-         source=&quot;1.2&quot;
-         target=&quot;1.2&quot;
-  /&gt;</pre>
-<p>compiles all <code>.java</code> files under the <code>${src}</code>
-directory, and stores the <code>.class</code> files in the
-<code>${build}</code> directory.  This will fork off the javac
-compiler using the default <code>javac</code> executable.
-The source level is 1.2 (similar to 1.1 or 1.3) and
-the class files should be runnable under JDK 1.2+ as well.</p>
-
-<pre>  &lt;javac srcdir=&quot;${src}&quot;
-         destdir=&quot;${build}&quot;
-         fork=&quot;java$$javac.exe&quot;
-         source=&quot;1.5&quot;
-  /&gt;</pre>
-<p>compiles all <code>.java</code> files under the <code>${src}</code>
-directory, and stores the <code>.class</code> files in the
-<code>${build}</code> directory.  This will fork off the javac
-compiler, using the executable named <code>java$javac.exe</code>.  Note
-that the <code>$</code> sign needs to be escaped by a second one.
-The source level is 1.5, so you can use generics.</p>
-
-<pre>  &lt;javac srcdir=&quot;${src}&quot;
-         destdir=&quot;${build}&quot;
-         includes=&quot;mypackage/p1/**,mypackage/p2/**&quot;
-         excludes=&quot;mypackage/p1/testpackage/**&quot;
-         classpath=&quot;xyz.jar&quot;
-         debug=&quot;on&quot;
-  /&gt;</pre>
-<p>compiles <code>.java</code> files under the <code>${src}</code>
-directory, and stores the
-<code>.class</code> files in the <code>${build}</code> directory.
-The classpath used includes <code>xyz.jar</code>, and debug information is on.
-Only files under <code>mypackage/p1</code> and <code>mypackage/p2</code> are
-used. All files in and below the <code>mypackage/p1/testpackage</code>
-directory are excluded from compilation.
-You didn't specify a source or target level,
-so the actual values used will depend on which JDK you ran Ant with.</p>
-
-<pre>  &lt;javac srcdir=&quot;${src}:${src2}&quot;
-         destdir=&quot;${build}&quot;
-         includes=&quot;mypackage/p1/**,mypackage/p2/**&quot;
-         excludes=&quot;mypackage/p1/testpackage/**&quot;
-         classpath=&quot;xyz.jar&quot;
-         debug=&quot;on&quot;
-  /&gt;</pre>
-
-<p>is the same as the previous example, with the addition of a second
-source path, defined by
-the property <code>src2</code>. This can also be represented using nested
-<code>&lt;src&gt;</code> elements as follows:</p>
-
-<pre>  &lt;javac destdir=&quot;${build}&quot;
-         classpath=&quot;xyz.jar&quot;
-         debug=&quot;on&quot;&gt;
-    &lt;src path=&quot;${src}&quot;/&gt;
-    &lt;src path=&quot;${src2}&quot;/&gt;
-    &lt;include name=&quot;mypackage/p1/**&quot;/&gt;
-    &lt;include name=&quot;mypackage/p2/**&quot;/&gt;
-    &lt;exclude name=&quot;mypackage/p1/testpackage/**&quot;/&gt;
-  &lt;/javac&gt;</pre>
-
-<p>If you want to run the javac compiler of a different JDK, you
-should tell Ant, where to find the compiler and which version of JDK
-you will be using so it can choose the correct command line switches.
-The following example executes a JDK 1.1 javac in a new process and
-uses the correct command line switches even when Ant is running in a
-Java VM of a different version:</p>
-
-<pre>  &lt;javac srcdir=&quot;${src}&quot;
-         destdir=&quot;${build}&quot;
-         fork=&quot;yes&quot;
-         executable=&quot;/opt/java/jdk1.1/bin/javac&quot;
-         compiler=&quot;javac1.1&quot;
-  /&gt;</pre>
-
-<p><a name="srcdirnote"><b>Note:</b></a>
-If you wish to compile only source files located in certain packages below a
-common root, use the <code>include</code>/<code>exclude</code> attributes
-or <code>&lt;include&gt;</code>/<code>&lt;exclude&gt;</code> nested elements
-to filter for these packages. Do not include part of your package structure
-in the <code>srcdir</code> attribute
-(or nested <code>&lt;src&gt;</code> elements), or Ant will recompile your
-source files every time you run your compile target. See the
-<a href="http://ant.apache.org/faq.html#always-recompiles">Ant FAQ</a>
-for additional information.</p>
-
-<p>
-If you wish to compile only files explicitly specified and disable
-javac's default searching mechanism then you can unset the sourcepath
-attribute:
-<pre>  &lt;javac sourcepath=&quot;&quot; srcdir=&quot;${src}&quot;
-         destdir=&quot;${build}&quot; &gt;
-    &lt;include name="**/*.java"/&gt;
-    &lt;exclude name="**/Example.java"/&gt;
-  &lt;/javac&gt;</pre>
-That way the javac will compile all java source files under &quot;${src}&quot;
-directory but skip the examples. The compiler will even produce errors if some of
-the non-example files refers to them.
-</p>
-
-<p>
-If you wish to compile with a special JDK (another than the one Ant is currently using),
-set the <code>executable</code> and <code>fork</code> attribute. Using <code>taskname</code>
-could show in the log, that these settings are fix.
-<pre>  &lt;javac srcdir=&quot;&quot; 
-         destdir=&quot;&quot;
-         executable=&quot;path-to-java14-home/bin/javac&quot; 
-         fork=&quot;true&quot;
-         taskname=&quot;javac1.4&quot; /&gt;</pre>
-</p>
-
-
-<p><b>Note:</b> If you are using Ant on Windows and a new DOS window pops up
-for every use of an external compiler, this may be a problem of the JDK you are
-using.  This problem may occur with all JDKs &lt; 1.2.</p>
-
-
-<p>
-If you want to activate other compiler options like <i>lint</i> you could use
-the <tt>&lt;compilerarg&gt;</tt> element:
-<pre>  &lt;javac srcdir="${src.dir}"
-         destdir="${classes.dir}"
-         classpathref="libraries"&gt;
-    &lt;compilerarg value="-Xlint"/&gt;
-  &lt;/javac&gt; </pre>
-</p>  
-
-<p>If you want to use a custom
-  CompilerAdapter <code>org.example.MyAdapter</code> you can either
-  use the compiler attribute:</p>
+
+<pre>
+&lt;javac srcdir=&quot;${src}&quot;
+       destdir=&quot;${build}&quot;
+       classpath=&quot;xyz.jar&quot;
+       debug=&quot;on&quot;
+       source=&quot;1.4&quot;/&gt;</pre>
+
+<p>compiles all <samp>.java</samp> files under the <samp>${src}</samp> directory, and stores
+the <samp>.class</samp> files in the <samp>${build}</samp> directory.  The classpath used
+includes <samp>xyz.jar</samp>, and compiling with debug information is on. The source level
+is <q>1.4</q>, so you can use <code>assert</code> statements.</p>
+
+<pre>
+&lt;javac srcdir=&quot;${src}&quot;
+       destdir=&quot;${build}&quot;
+       fork=&quot;true&quot;
+       source=&quot;1.2&quot;
+       target=&quot;1.2&quot;/&gt;</pre>
+
+<p>compiles all <samp>.java</samp> files under the <samp>${src}</samp> directory, and stores
+the <samp>.class</samp> files in the <samp>${build}</samp> directory.  This will fork off the Java
+compiler using the default <kbd>javac</kbd> executable.  The source level is <q>1.2</q> (similar
+to <q>1.1</q> or <q>1.3</q>) and the class files should be runnable under JDK 1.2+ as well.</p>
+
+<pre>
+&lt;javac srcdir=&quot;${src}&quot;
+       destdir=&quot;${build}&quot;
+       fork=&quot;java$$javac.exe&quot;
+       source=&quot;1.5&quot;/&gt;</pre>
+
+<p>compiles all <samp>.java</samp> files under the <samp>${src}</samp> directory, and stores
+the <samp>.class</samp> files in the <samp>${build}</samp> directory.  This will fork off the Java
+compiler, using the executable named <kbd>java$javac.exe</kbd>.  Note that the <q>$</q> sign needs
+to be escaped by a second one.  The source level is <q>1.5</q>, so you can use generics.</p>
+
+<pre>
+&lt;javac srcdir=&quot;${src}&quot;
+       destdir=&quot;${build}&quot;
+       includes=&quot;mypackage/p1/**,mypackage/p2/**&quot;
+       excludes=&quot;mypackage/p1/testpackage/**&quot;
+       classpath=&quot;xyz.jar&quot;
+       debug=&quot;on&quot;/&gt;</pre>
+
+<p>compiles <samp>.java</samp> files under the <samp>${src}</samp> directory, and stores
+the <samp>.class</samp> files in the <code>${build}</code> directory.  The classpath used
+includes <samp>xyz.jar</samp>, and debug information is on.  Only files
+under <samp>mypackage/p1</samp> and <samp>mypackage/p2</samp> are used. All files in and below
+the <samp>mypackage/p1/testpackage</samp> directory are excluded from compilation.  You didn't
+specify a source or target level, so the actual values used will depend on which JDK you ran Ant
+with.</p>
+
+<pre>
+&lt;javac srcdir=&quot;${src}:${src2}&quot;
+       destdir=&quot;${build}&quot;
+       includes=&quot;mypackage/p1/**,mypackage/p2/**&quot;
+       excludes=&quot;mypackage/p1/testpackage/**&quot;
+       classpath=&quot;xyz.jar&quot;
+       debug=&quot;on&quot;/&gt;</pre>
+
+<p>is the same as the previous example, with the addition of a second source path, defined by the
+property <samp>src2</samp>. This can also be represented using nested <code>&lt;src&gt;</code>
+elements as follows:</p>
+
+<pre>
+&lt;javac destdir=&quot;${build}&quot;
+       classpath=&quot;xyz.jar&quot;
+       debug=&quot;on&quot;&gt;
+  &lt;src path=&quot;${src}&quot;/&gt;
+  &lt;src path=&quot;${src2}&quot;/&gt;
+  &lt;include name=&quot;mypackage/p1/**&quot;/&gt;
+  &lt;include name=&quot;mypackage/p2/**&quot;/&gt;
+  &lt;exclude name=&quot;mypackage/p1/testpackage/**&quot;/&gt;
+&lt;/javac&gt;</pre>
+
+<p>If you want to run the <kbd>javac</kbd> compiler of a different JDK, you should tell Ant, where
+to find the compiler and which version of JDK you will be using so it can choose the correct command
+line switches.  The following example executes a JDK 1.1 <kbd>javac</kbd> in a new process and
+uses the correct command line switches even when Ant is running in a JVM of a different version:</p>
+
+<pre>
+&lt;javac srcdir=&quot;${src}&quot;
+       destdir=&quot;${build}&quot;
+       fork=&quot;yes&quot;
+       executable=&quot;/opt/java/jdk1.1/bin/javac&quot;
+       compiler=&quot;javac1.1&quot;/&gt;</pre>
+
+<p id="srcdirnote"><strong>Note</strong>: If you wish to compile only source files located in
+certain packages below a common root, use the <var>include</var>/<var>exclude</var> attributes
+or <code>&lt;include&gt;</code>/<code>&lt;exclude&gt;</code> nested elements to filter for these
+packages. Do not include part of your package structure in the <var>srcdir</var> attribute (or
+nested <code>&lt;src&gt;</code> elements), or Ant will recompile your source files every time you
+run your compile target. See the <a href="https://ant.apache.org/faq.html#always-recompiles"
+target="_top">Ant FAQ</a> for additional information.</p>
+
+<p>If you wish to compile only files explicitly specified and disable <code>javac</code>'s default
+searching mechanism then you can unset the <var>sourcepath</var> attribute:</p>
+
+<pre>
+&lt;javac sourcepath=&quot;&quot; srcdir=&quot;${src}&quot;
+       destdir=&quot;${build}&quot; &gt;
+  &lt;include name="**/*.java"/&gt;
+  &lt;exclude name="**/Example.java"/&gt;
+&lt;/javac&gt;</pre>
+
+<p>That way the <code>javac</code> will compile all Java source files under <samp>${src}</samp>
+directory but skip the examples. The compiler will even produce errors if some of the non-example
+files refers to them.</p>
+
+<p>If you wish to compile with a special JDK (another than the one Ant is currently using), set
+the <var>executable</var> and <var>fork</var> attribute. Using <var>taskname</var> could show in the
+log, that these settings are fix.</p>
+
+<pre>
+&lt;javac srcdir=&quot;&quot;
+       destdir=&quot;&quot;
+       executable=&quot;path-to-java14-home/bin/javac&quot;
+       fork=&quot;true&quot;
+       taskname=&quot;javac1.4&quot;/&gt;</pre>
+
+<p><strong>Note</strong>: If you are using Ant on Windows and a new DOS window pops up for every use
+of an external compiler, this may be a problem of the JDK you are using.  This problem may occur
+with all JDKs prior to 1.2.</p>
+
+<p>If you want to activate other compiler options like <code>lint</code> you could use
+the <code>&lt;compilerarg&gt;</code> element:</p>
+
+<pre>
+&lt;javac srcdir="${src.dir}"
+       destdir="${classes.dir}"
+       classpathref="libraries"&gt;
+  &lt;compilerarg value="-Xlint"/&gt;
+&lt;/javac&gt;</pre>
+
+<p>If you want to use a custom CompilerAdapter <code>org.example.MyAdapter</code> you can either use
+the <var>compiler</var> attribute:</p>
+
 <pre>
 &lt;javac srcdir="${src.dir}"
        destdir="${classes.dir}"
-       compiler="org.example.MyAdapter"/&gt;
-</pre>
+       compiler="org.example.MyAdapter"/&gt;</pre>
+
 <p>or a define a type and nest this into the task like in:</p>
+
 <pre>
 &lt;componentdef classname="org.example.MyAdapter"
               name="myadapter"/&gt;
 &lt;javac srcdir="${src.dir}"
        destdir="${classes.dir}"&gt;
   &lt;myadapter/&gt;
-&lt;/javac&gt;
-</pre>
-<p>in which case your compiler adapter can support attributes and
-  nested elements of its own.</p>
-
-<pre>  &lt;javac srcdir=&quot;${src}&quot;
-         destdir=&quot;${build}&quot;
-         includeantruntime=&quot;false&quot;
-         modulepath=&quot;modules&quot;
-         source=&quot;9&quot;
-  /&gt;</pre>
-<p>compiles all <code>.java</code> files in a single module under the <code>${src}</code> directory,
-  and stores the <code>.class</code> files in the <code>${build}</code> directory. The compilation uses
-  application modules located in <code>modules</code> folder.The source level is <code>9</code> to enable modules.</p>
-
-<pre>  &lt;javac modulesourcepath=&quot;${src}/*/{gen,lin{32,64}}/classes&quot;
-         destdir=&quot;${build}&quot;
-         includeantruntime=&quot;false&quot;
-         modulepath=&quot;modules&quot;
-         source=&quot;9&quot;
-  /&gt;</pre>
-<p>compiles all <code>.java</code> files in <code>gen/classes</code>, <code>lin32/classes</code> and
-  <code>lin64/classes</code> in all source modules under the <code>${src}</code> directory.
-  Generates module directories in the <code>${build}</code> directory. Each generated module directory under
-  the <code>${build}</code> directory contains <code>.class</code> files from corresponding source module.
-  The <code>*</code> is a token representing the name of any of the modules in the compilation module set.
-  The <code>{ ... , ... }</code> express alternates for expansion.
-  The compilation uses application modules located in <code>modules</code> folder.The source level is
-  <code>9</code> to enable modules.</p>
+&lt;/javac&gt;</pre>
 
-<h3>Jikes Notes</h3>
+<p>in which case your compiler adapter can support attributes and nested elements of its own.</p>
+
+<pre>
+&lt;javac srcdir=&quot;${src}&quot;
+       destdir=&quot;${build}&quot;
+       includeantruntime=&quot;false&quot;
+       modulepath=&quot;modules&quot;
+       source=&quot;9&quot;/&gt;</pre>
+
+<p>compiles all <samp>.java</samp> files in a single module under the <samp>${src}</samp> directory,
+and stores the <samp>.class</samp> files in the <code>${build}</code> directory. The compilation
+uses application modules located in <samp>modules</samp> folder.The source level is <q>9</q> to
+enable modules.</p>
+
+<pre>
+&lt;javac modulesourcepath=&quot;${src}/*/{gen,lin{32,64}}/classes&quot;
+       destdir=&quot;${build}&quot;
+       includeantruntime=&quot;false&quot;
+       modulepath=&quot;modules&quot;
+       source=&quot;9&quot;/&gt;</pre>
+
+<p>compiles all <samp>.java</samp> files in <samp>gen/classes</samp>, <samp>lin32/classes</samp>
+and <code>lin64/classes</code> in all source modules under the <code>${src}</code> directory.
+Generates module directories in the <samp>${build}</samp> directory. Each generated module directory
+under the <samp>${build}</samp> directory contains <code>.class</code> files from corresponding
+source module.  The <samp>*</samp> is a token representing the name of any of the modules in the
+compilation module set.  The <code>{ ... , ... }</code> express alternates for expansion.  The
+compilation uses application modules located in <code>modules</code> folder.The source level
+is <q>9</q> to enable modules.</p>
+
+<h3 id="jikes">Jikes notes</h3>
 
 <p>You need Jikes 1.15 or later.</p>
 
-<p>Jikes supports some extra options, which can be set be defining
-the properties shown below prior to invoking the task. The setting
-for each property will be in affect for all <code>&lt;javac&gt;</code>
-tasks throughout the build.
-The Ant developers are aware that
-this is ugly and inflexible &ndash; expect a better solution in the future.
-All the options are boolean, and must be set to <code>true</code> or
-<code>yes</code> to be
-interpreted as anything other than false. By default,
-<code>build.compiler.warnings</code> is <code>true</code>,
-while all others are <code>false</code>.</p>
-
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Property</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Default</b></td>
-  </tr>
-  <tr>
-    <td valign="top">
-	build.compiler.emacs
-	</td>
-	<td valign="top">
-	Enable emacs-compatible error messages.
-    </td>
-    <td valign="top">
-	<code>false</code>
-	</td>
-  </tr>
-  <tr>
-    <td valign="top">
-	build.compiler.fulldepend
-	</td>
-	<td valign="top">
-	Enable full dependency checking; see<br>
-	the <code>+F</code> switch in the Jikes manual.
-    </td>
-    <td valign="top">
-	<code>false</code>
-	</td>
-  </tr>
-  <tr>
-    <td valign="top">
-	build.compiler.pedantic
-	</td>
-	<td valign="top">
-	Enable pedantic warnings.
-    </td>
-    <td valign="top">
-	<code>false</code>
-	</td>
-  </tr>
-  <tr>
-    <td valign="top">
-	build.compiler.warnings<br>
-        <strong>Deprecated</strong>. Use
-  <code>&lt;javac&gt;</code>'s <code>nowarn</code>
-  attribute instead.
-	</td>
-	<td valign="top">
-	Don't disable warning messages.
-    </td>
-    <td valign="top">
-	<code>true</code>
-	</td>
+<p>Jikes supports some extra options, which can be set be defining the properties shown below prior
+to invoking the task. The setting for each property will be in effect for
+all <code>&lt;javac&gt;</code> tasks throughout the build.  The Ant developers are aware that this
+is ugly and inflexible &ndash; expect a better solution in the future.  All the options are boolean,
+and must be set to <q>true</q> or <q>yes</q> to be interpreted as anything other
+than <q>false</q>. By default, <code>build.compiler.warnings</code> is <q>true</q>, while all others
+are <q>false</q>.</p>
+
+<table>
+  <tr>
+    <th>Property</th>
+    <th>Description</th>
+    <th>Default</th>
+  </tr>
+  <tr>
+    <td><code>build.compiler.emacs</code></td>
+    <td>Enable emacs-compatible error messages.</td>
+    <td><q>false</q></td>
+  </tr>
+  <tr>
+    <td><code>build.compiler.fulldepend</code></td>
+    <td>Enable full dependency checking; see<br/> the <code>+F</code> switch in the Jikes
+      manual.</td>
+    <td><q>false</q></td>
+  </tr>
+  <tr>
+    <td><code>build.compiler.pedantic</code></td>
+    <td>Enable pedantic warnings.</td>
+    <td><q>false</q></td>
+  </tr>
+  <tr>
+    <td><code>build.compiler.warnings</code><br/><em><u>Deprecated</u></em>.
+      Use <code>&lt;javac&gt;</code>'s <var>nowarn</var> attribute instead.</td>
+    <td>Don't disable warning messages.</td>
+    <td><q>true</q></td>
   </tr>
 </table>
 
-<h3>Jvc Notes</h3>
+<h3 id="jvc">Jvc notes</h3>
+
+<p><q>Jvc</q> will enable Microsoft extensions unless you set the
+property <code>build.compiler.jvc.extensions</code> to <q>false</q> before
+invoking <code>&lt;javac&gt;</code>.</p>
+
+<h3 id="bootstrap">Bootstrap options</h3>
+<p>The Sun <kbd>javac</kbd> compiler has a <kbd>-bootclasspath</kbd> command line
+option&mdash;this corresponds to the <var>bootclasspath</var> attribute/element of
+the <code>&lt;javac&gt;</code> task. The Sun compiler also allows more control over the boot
+classpath using the <kbd>-X</kbd> and <kbd>-J-X</kbd> attributes.  One can set these by using
+the <code>&lt;compilerarg&gt;</code>. <em>Since Ant 1.6.0</em>, there is a shortcut to convert path
+references to strings that can by used in an OS independent fashion
+(see <a href="../using.html#pathshortcut">pathshortcut</a>). For example:</p>
+
+<pre>
+&lt;path id="lib.path.ref"&gt;
+  &lt;fileset dir="lib" includes="*.jar"/&gt;
+&lt;/path&gt;
+&lt;javac srcdir="src" destdir="classes"&gt;
+  &lt;compilerarg arg="-Xbootclasspath/p:${toString:lib.path.ref}"/&gt;
+&lt;/javac&gt;</pre>
+
+<h3>OpenJDK notes</h3>
+<p>The <a href="http://openjdk.java.net/" target="_top">OpenJDK</a> project has provided
+the <code>javac</code> <a href="http://openjdk.java.net/groups/compiler/" target="_top">compiler</a>
+as an open source project. The output of this project is a <code>javac.jar</code> which contains
+the <kbd>javac</kbd> compiler.  This compiler may be used with the <code>&lt;javac&gt;</code> task
+with the use of a <kbd>-Xbootclasspath/p</kbd> Java argument. The argument needs to be given to the
+runtime system of the <kbd>javac</kbd> executable, so it needs to be prepended with a <kbd>-J</kbd>,
+for example:</p>
+
+<pre>
+&lt;property name="patched.javac.jar"
+          location="${my.patched.compiler}/dist/lib/javac.jar"/&gt;
 
-<p>Jvc will enable Microsoft extensions unless you set the property
-<code>build.compiler.jvc.extensions</code> to false before invoking
-<code>&lt;javac&gt;</code>.</p>
-
-<h3><a name="bootstrap">Bootstrap Options</h3>
-<p>
-  The Sun javac compiler has a <em>bootclasspath</em> command
-  line option - this corresponds to the "bootclasspath" attribute/element
-  of the &lt;javac&gt; task. The Sun compiler also allows more
-  control over the boot classpath using the -X and -J-X attributes.
-  One can set these by using the &lt;compilerarg&gt;. Since Ant 1.6.0,
-  there is a shortcut to convert path references to strings that
-  can by used in an OS independent fashion (see
-  <a href="../using.html#pathshortcut">pathshortcut</a>). For example:
-</p>
-<pre>
-  &lt;path id="lib.path.ref"&gt;
-    &lt;fileset dir="lib" includes="*.jar"/&gt;
-  &lt;/path&gt;
-  &lt;javac srcdir="src" destdir="classes"&gt;
-    &lt;compilerarg arg="-Xbootclasspath/p:${toString:lib.path.ref}"/&gt;
+&lt;presetdef name="patched.javac"&gt;
+  &lt;javac fork="yes"&gt;
+    &lt;compilerarg value="-J-Xbootclasspath/p:${patched.javac.jar}"/&gt;
   &lt;/javac&gt;
-</pre>
+&lt;/presetdef&gt;
+
 
-  
-</p>
+&lt;patched.javac srcdir="src/java" destdir="build/classes"
+               debug="yes"/&gt;</pre>
 
-<h3>OpenJDK Notes</h3>
-<p>
-  The <a href="https://openjdk.dev.java.net/">openjdk</a>
-  project has provided the javac
-  <a href="https://openjdk.dev.java.net/compiler/">compiler</a>
-  as an opensource project. The output of this project is a
-  <code>javac.jar</code> which contains the javac compiler.
-  This compiler may be used with the <code>&lt;javac&gt;</code> task with
-  the use of a <code>-Xbootclasspath/p</code> java argument. The argument needs
-  to be given to the runtime system of the javac executable, so it needs
-  to be prepended with a "-J". For example:
-
-<blockquote><pre>
-  &lt;property name="patched.javac.jar"
-            location="${my.patched.compiler}/dist/lib/javac.jar"/&gt;
-
-  &lt;presetdef name="patched.javac"&gt;
-    &lt;javac fork="yes"&gt;
-      &lt;compilerarg value="-J-Xbootclasspath/p:${patched.javac.jar}"/&gt;
-    &lt;/javac&gt;
-  &lt;/presetdef&gt;
-
-
-  &lt;patched.javac srcdir="src/java" destdir="build/classes"
-                 debug="yes"/&gt;
-</pre></blockquote>
-
-  <h3>Note on package-info.java</h3>
-  <p>
-    <code>package-info.java</code> files were introduced in Java5 to
-    allow package level annotations. On compilation, if the java file
-    does not contain runtime annotations, there will be no .class file
-    for the java file. Up to <b>Ant 1.7.1</b>, when the &lt;javac&gt;
-    task is run again, the
-    task will try to compile the package-info java files again.
-  </p>
-  <p>With Ant 1.7.1 a different kind of logic was introduced that
-    involved the timestamp of the directory that would normally
-    contain the .class file.  This logic turned out to lead to Ant not
-    recompiling <code>package-info.java</code> in certain setup.</p>
-  <p>Starting with Ant 1.8.0 Ant will create
-    "empty" <code>package-info.class</code> files if it compiles
-    a <code>package-info.java</code> and
-    no <code>package-info.class</code> file has been created by the
-    compiler itself.</p>
+<h3>Note on package-info.java</h3>
+<p><samp>package-info.java</samp> files were introduced in Java 5 to allow package level
+annotations. On compilation, if the <code>.java</code> file does not contain runtime annotations,
+there will be no corresponding <code>.class</code> file.  Prior to Ant 1.7.1, when
+the <code>&lt;javac&gt;</code> task is run again, the task will try to compile
+the <samp>package-info.java</samp> files again.</p>
+<p>With Ant 1.7.1, a different kind of logic was introduced that involved the timestamp of the
+directory that would normally contain the <samp>.class</samp> file.  This logic turned out to lead
+to Ant not recompiling <samp>package-info.java</samp> in certain setup.</p>
+<p><em>Since Ant 1.8.0</em>, an "empty" <samp>package-info.class</samp> file is created if Ant
+compiles a <samp>package-info.java</samp> and no <samp>package-info.class</samp> file has been
+created by the compiler itself.</p>
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/javadoc.html ant-1.10.3/manual/Tasks/javadoc.html
--- ant-1.9.10/manual/Tasks/javadoc.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/javadoc.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,613 +24,572 @@
 
 <body>
 
-<h2><a name="javadoc">Javadoc/<i>Javadoc2</i></a></h2>
+<h2 id="javadoc">Javadoc/<em>Javadoc2</em></h2>
+<p><em><u>Deprecation</u>: the <code>javadoc2</code> task simply points to the <code>javadoc</code>
+task and it's there for backwards compatibility reasons. Since this task will be removed in future
+versions, you are strongly encouraged to use <a href="javadoc.html">javadoc</a> instead.</em></p>
 <h3>Description</h3>
-<p>Generates code documentation using the javadoc tool.</p>
-<p>The source directory will be recursively scanned for Java source files to process
-but only those matching the inclusion rules, and not matching the exclusions rules
-will be passed to the javadoc tool. This
-allows wildcards to be used to choose between package names, reducing verbosity
-and management costs over time. This task, however, has no notion of
-&quot;changed&quot; files, unlike the <a href="javac.html">javac</a> task. This means
-all packages will be processed each time this task is run. In general, however,
-this task is used much less frequently.</p>
-<p>NOTE: since javadoc calls System.exit(), javadoc cannot be run inside the
-same VM as Apache Ant without breaking functionality. For this reason, this task
-always forks the VM. This overhead is not significant since javadoc is normally a heavy
-application and will be called infrequently.</p>
-<p>NOTE: the packagelist attribute allows you to specify the list of packages to
-document outside of the Ant file. It's a much better practice to include everything
-inside the <code>build.xml</code> file. This option was added in order to make it easier to
-migrate from regular makefiles, where you would use this option of javadoc.
-The packages listed in packagelist are not checked, so the task performs even
-if some packages are missing or broken. Use this option if you wish to convert from
-an existing makefile. Once things are running you should then switch to the regular
-notation. </p>
-
-<p><i><b>DEPRECATION:</b> the javadoc2 task simply points to the javadoc task and it's
-there for back compatibility reasons. Since this task will be removed in future
-versions, you are strongly encouraged to use <a href="javadoc.html">javadoc</a>
-instead.</i></p>
-
-<p>In the table below, 1.2 means available if your current Java VM is
-a 1.2 VM (but not 1.3 or later), 1.4+ for any VM of at least version 1.4, otherwise
-any VM of at least version 1.2 is acceptable. JDKs &lt;1.4 are no longer supported.
-If you specify the <code>executable</code> attribute it is up to you
-to ensure that this command supports the attributes you wish to use.</p>
-
-<p><b>Note:</b><br>When generating the JavaDocs for classes which contains annotations
-you maybe get a <tt>java.lang.ClassCastException: com.sun.tools.javadoc.ClassDocImpl</tt>.
-This is due <a href="https://bugs.openjdk.java.net/browse/JDK-6442982" target="_blank">bug-6442982</a>. The cause is that JavaDoc cannot find the implementations of used annotations.
-The workaround is providing the jars with these implementations (like JAXBs <tt>@XmlType</tt>, ...)
-to &lt;javadoc&gt; using <tt>classpath</tt>, <tt>classpathref</tt> attributes or nested
-&lt;classpath&gt; element.</p>
-
-<p><b>Note:</b> many problems with running javadoc stem from command
-  lines that have become too long - even though the error message
-  doesn't give the slightest hint this may be the problem.  If you
-  encounter problems with the task, try to set
-  the <code>useexternalfile</code> attribute to <code>true</code>
-  first.</p>
-
-<p>If you use multiple ways to specify where javadoc should be looking
-  for sources your result will be the union of all specified
-  documentations.  If you, e.g., specify a sourcepath attribute and
-  also a nested packageset both pointing at the same directory your
-  excludepackagenames attribute won't have any effect unless it agrees
-  with the exclude patterns of the packageset (and vice versa).</p>
+<p>Generates code documentation using the <kbd>javadoc</kbd> tool.</p>
+<p>The source directory will be recursively scanned for Java source files to process but only those
+matching the inclusion rules, and not matching the exclusions rules will be passed to
+the <kbd>javadoc</kbd> tool. This allows wildcards to be used to choose between package names,
+reducing verbosity and management costs over time. This task, however, has no notion of
+&quot;changed&quot; files, unlike the <a href="javac.html">javac</a> task. This means all packages
+will be processed each time this task is run. In general, however, this task is used much less
+frequently.</p>
+<p><strong>Note</strong>: since <kbd>javadoc</kbd>
+calls <code class="code">System.exit()</code>, <kbd>javadoc</kbd> cannot be run inside the same
+JVM as Apache Ant without breaking functionality. For this reason, this task always forks JVM. This
+overhead is not significant since <kbd>javadoc</kbd> is normally a heavy application and will be
+called infrequently.</p>
+<p><strong>Note</strong>: the <var>packagelist</var> attribute allows you to specify the list of
+packages to document outside of the Ant file. It's a much better practice to include everything
+inside the <code>build.xml</code> file. This option was added in order to make it easier to migrate
+from regular makefiles, where you would use this option of <kbd>javadoc</kbd>.  The packages
+listed in <var>packagelist</var> are not checked, so the task performs even if some packages are
+missing or broken. Use this option if you wish to convert from an existing makefile. Once things are
+running you should then switch to the regular notation.</p>
+
+<p>In the table below, 1.2 means available if your current JVM is exactly of version 1.2 (not 1.3 or
+later), 1.4+ for any JVM of at least version 1.4, otherwise any JVM of at least version 1.2 is
+acceptable. <em>JDKs prior to 1.4 are no longer supported.</em>  If you specify
+the <var>executable</var> attribute it is up to you to ensure that this command supports the
+attributes you wish to use.</p>
+
+<p><strong>Note</strong>: When generating the JavaDocs for classes which contains annotations you
+maybe get a <code class="output">java.lang.ClassCastException:
+com.sun.tools.javadoc.ClassDocImpl</code>.  This is
+due <a href="https://bugs.openjdk.java.net/browse/JDK-6442982" target="_top">bug 6442982</a>. The
+cause is that <kbd>javadoc</kbd> cannot find the implementations of used annotations.  The
+workaround is providing the jars with these implementations (like
+JAXBs <code class="code">@XmlType</code>, ...)  to <code>&lt;javadoc&gt;</code>
+using <var>classpath</var>, <var>classpathref</var> attributes or
+nested <code>&lt;classpath&gt;</code> element.</p>
+
+<p><strong>Note</strong>: many problems with running <kbd>javadoc</kbd> stem from command lines
+that have become too long&mdash;even though the error message doesn't give the slightest hint this
+may be the problem.  If you encounter problems with the task, try to set
+the <var>useexternalfile</var> attribute to <q>true</q> first.</p>
+
+<p>If you use multiple ways to specify where <kbd>javadoc</kbd> should be looking for sources, your
+result will be the union of all specified documentations.  If you, e.g., specify
+a <var>sourcepath</var> attribute and also a nested <code>packageset</code> both pointing at the
+same directory your <var>excludepackagenames</var> attribute won't have any effect unless it agrees
+with the <var>exclude</var> patterns of the <code>packageset</code> (and vice versa).</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Availability on Java</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Availability on Java</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">sourcepath</td>
-    <td valign="top">Specify where to find source files</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" rowspan="3">At least one of the three or nested
-    <code>&lt;sourcepath&gt;</code>, <code>&lt;fileset&gt;</code> or
-    <code>&lt;packageset&gt;</code></td>
+    <td>sourcepath</td>
+    <td>Specify where to find source files</td>
+    <td>all</td>
+    <td rowspan="3">At least one of the three or
+      nested <code>&lt;sourcepath&gt;</code>, <code>&lt;fileset&gt;</code>
+      or <code>&lt;packageset&gt;</code></td>
   </tr>
   <tr>
-    <td valign="top">sourcepathref</td>
-    <td valign="top">Specify where to find source files by <a
-      href="../using.html#references">reference</a> to a PATH defined elsewhere.</td>
-    <td align="center" valign="top">all</td>
+    <td>sourcepathref</td>
+    <td>Specify where to find source files by <a href="../using.html#references">reference</a> to a
+      <var>sourcepath</var> defined elsewhere.</td>
+    <td class="left">all</td>
   </tr>
   <tr>
-    <td valign="top">sourcefiles</td>
-    <td valign="top">Comma separated list of source files -- see also
-    the nested <code>source</code> element.</td>
-    <td align="center" valign="top">all</td>
+    <td>sourcefiles</td>
+    <td>Comma separated list of source files&mdash;see also the nested <code>source</code>
+      element.</td>
+    <td class="left">all</td>
   </tr>
   <tr>
-    <td valign="top">destdir</td>
-    <td valign="top">Destination directory for output files</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">Yes, unless a doclet has been specified.</td>
+    <td>destdir</td>
+    <td>Destination directory for output files</td>
+    <td>all</td>
+    <td>Yes, unless a <var>doclet</var> has been specified.</td>
   </tr>
   <tr>
-    <td valign="top">maxmemory</td>
-    <td valign="top">Max amount of memory to allocate to the javadoc VM</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>maxmemory</td>
+    <td>Max amount of memory to allocate to the <kbd>javadoc</kbd> JVM</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">packagenames</td>
-    <td valign="top">Comma separated list of package files (with terminating
-      wildcard) -- see also the nested <code>package</code> element.</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>packagenames</td>
+    <td>Comma separated list of package files (with terminating wildcard)&mdash;see also the
+      nested <code>package</code> element.</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">packageList</td>
-    <td valign="top">The name of a file containing the packages to process</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>packageList</td>
+    <td>The name of a file containing the packages to process</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">Specify where to find user class files</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>classpath</td>
+    <td>Specify where to find user class files</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">Bootclasspath</td>
-    <td valign="top">Override location of class files loaded by the bootstrap
-      class loader</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>Bootclasspath</td>
+    <td>Override location of class files loaded by the bootstrap class loader</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">Specify where to find user class files by <a
-      href="../using.html#references">reference</a> to a PATH defined elsewhere.</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>classpathref</td>
+    <td>Specify where to find user class files by <a href="../using.html#references">reference</a>
+      to a <var>classpath</var> defined elsewhere.</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">bootclasspathref</td>
-    <td valign="top">Override location of class files loaded by the
-      bootstrap class loader by <a href="../using.html#references">reference</a> to a
-      PATH defined elsewhere.</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>bootclasspathref</td>
+    <td>Override location of class files loaded by the bootstrap class loader
+      by <a href="../using.html#references">reference</a> to a <var>bootclasspath</var> defined
+      elsewhere.</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">Extdirs</td>
-    <td valign="top">Override location of installed extensions</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>Extdirs</td>
+    <td>Override location of installed extensions</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">Overview</td>
-    <td valign="top">Read overview documentation from HTML file</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>Overview</td>
+    <td>Read overview documentation from HTML file</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">access</td>
-    <td valign="top">Access mode: one of <code>public</code>, <code>protected</code>,
-                     <code>package</code>, or <code>private</code></td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No (default <code>protected</code>)</td>
+    <td>access</td>
+    <td>Access mode: one of <q>public</q>, <q>protected</q>, <q>package</q>, or <q>private</q></td>
+    <td>all</td>
+    <td>No; default is <q>protected</q></td>
   </tr>
   <tr>
-    <td valign="top">Public</td>
-    <td valign="top">Show only public classes and members</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>Public</td>
+    <td>Show only public classes and members</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">Protected</td>
-    <td valign="top">Show protected/public classes and members (default)</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>Protected</td>
+    <td>Show protected/public classes and members (default)</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">Package</td>
-    <td valign="top">Show package/protected/public classes and members</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>Package</td>
+    <td>Show package/protected/public classes and members</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">Private</td>
-    <td valign="top">Show all classes and members</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>Private</td>
+    <td>Show all classes and members</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">Old</td>
-    <td valign="top">Generate output using JDK 1.1 emulating
-      doclet.<br>
-      <b>Note:</b> as of Ant 1.8.0 this attribute doesn't have any
-      effect since the javadoc of Java 1.4 (required by Ant 1.8.0)
-      doesn't support the -1.1 switch anymore.</td>
-    <td align="center" valign="top">1.2</td>
-    <td align="center" valign="top">No</td>
+    <td>Old</td>
+    <td>Generate output using JDK 1.1 emulating doclet.<br/><strong>Note</strong>: <em>Since Ant
+      1.8.0</em> this attribute has no effect because <kbd>javadoc</kbd> of Java 1.4 and later
+      does not support the <kbd>-1.1</kbd> switch anymore.</td>
+    <td>1.2</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">Verbose</td>
-    <td valign="top">Output messages about what Javadoc is doing</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>Verbose</td>
+    <td>Output messages about what <kbd>javadoc</kbd> is doing</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">Locale</td>
-    <td valign="top">Locale to be used, e.g. en_US or en_US_WIN</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>Locale</td>
+    <td>Locale to be used, e.g. <q>en_US</q> or <q>en_US_WIN</q></td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">Encoding</td>
-    <td valign="top">Source file encoding name</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>Encoding</td>
+    <td>Source file encoding name</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">Version</td>
-    <td valign="top">Include @version paragraphs</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>Version</td>
+    <td>Include <code>@version</code> paragraphs</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">Use</td>
-    <td valign="top">Create class and package usage pages</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>Use</td>
+    <td>Create class and package usage pages</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">Author</td>
-    <td valign="top">Include @author paragraphs</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>Author</td>
+    <td>Include <code>@author</code> paragraphs</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">Splitindex</td>
-    <td valign="top">Split index into one file per letter</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>Splitindex</td>
+    <td>Split index into one file per letter</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">Windowtitle</td>
-    <td valign="top">Browser window title for the documentation (text)</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>Windowtitle</td>
+    <td>Browser window title for the documentation (text)</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">Doctitle</td>
-    <td valign="top">Include title for the package index(first) page (html-code)</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>Doctitle</td>
+    <td>Include title for the package index (first) page (HTML code)</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">Header</td>
-    <td valign="top">Include header text for each page (html-code)</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>Header</td>
+    <td>Include header text for each page (HTML code)</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">Footer</td>
-    <td valign="top">Include footer text for each page (html-code)</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>Footer</td>
+    <td>Include footer text for each page (HTML code)</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">bottom</td>
-    <td valign="top">Include bottom text for each page (html-code)</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>bottom</td>
+    <td>Include bottom text for each page (HTML code)</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">link</td>
-    <td valign="top">Create links to javadoc output at the given URL
-    -- see also the nested <code>link</code> element.</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>link</td>
+    <td>Create links to <code>javadoc</code> output at the given URL&mdash;see also the
+      nested <code>link</code> element.</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">linkoffline</td>
-    <td valign="top">Link to docs at <code>&lt;url&gt;</code> using package list at
-    <code>&lt;url2&gt;</code> - separate the URLs by using a space character -- see
-    also the nested <code>link</code> element.</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>linkoffline</td>
+    <td>Link to docs at <samp><em>url</em></samp> using package list
+      at <samp><em>alt-url</em></samp> by specifying a
+      value <q><em>url</em>&nbsp;<em>alt-url</em></q> (space as separator). A shorthand for the
+      nested <code>link</code> element with <var>offline</var>=<q>true</q>.</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">group</td>
-    <td valign="top">Group specified packages together in overview
-    page.  The format is as described <a
-    href="#groupattribute">below</a> -- see also the nested
-    <code>group</code> element.</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>group</td>
+    <td>Group specified packages together in overview page.  The format is as
+      described <a href="#groupattribute">below</a>&mdash;see also the nested <code>group</code>
+      element.</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">nodeprecated</td>
-    <td valign="top">Do not include @deprecated information</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>nodeprecated</td>
+    <td>Do not include <code>@deprecated</code> information</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">nodeprecatedlist</td>
-    <td valign="top">Do not generate deprecated list</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>nodeprecatedlist</td>
+    <td>Do not generate deprecated list</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">notree</td>
-    <td valign="top">Do not generate class hierarchy</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>notree</td>
+    <td>Do not generate class hierarchy</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">noindex</td>
-    <td valign="top">Do not generate index</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>noindex</td>
+    <td>Do not generate index</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">nohelp</td>
-    <td valign="top">Do not generate help link</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>nohelp</td>
+    <td>Do not generate help link</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">nonavbar</td>
-    <td valign="top">Do not generate navigation bar</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>nonavbar</td>
+    <td>Do not generate navigation bar</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">serialwarn</td>
-    <td valign="top">Generate warning about @serial tag</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>serialwarn</td>
+    <td>Generate warning about <code>@serial</code> tag</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">helpfile</td>
-    <td valign="top">Specifies the HTML help file to use</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>helpfile</td>
+    <td>Specifies the HTML help file to use</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">stylesheetfile</td>
-    <td valign="top">Specifies the CSS stylesheet to use</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>stylesheetfile</td>
+    <td>Specifies the CSS stylesheet to use</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">charset</td>
-    <td valign="top">Charset for cross-platform viewing of generated
-      documentation</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
+    <td>charset</td>
+    <td>Charset for cross-platform viewing of generated documentation</td>
+    <td>all</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">docencoding</td>
-    <td valign="top">Output file encoding name</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">doclet</td>
-    <td valign="top">Specifies the class file that starts the doclet
-    used in generating the documentation -- see also the nested
-    <code>doclet</code> element.</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">docletpath</td>
-    <td valign="top">Specifies the path to the doclet class file that is specified with the -doclet option.</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">docletpathref</td>
-    <td valign="top">Specifies the path to the doclet class file that
-      is specified with the -doclet option by <a
-      href="../using.html#references">reference</a> to a PATH defined elsewhere.</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">additionalparam</td>
-    <td valign="top">Lets you add additional parameters to the javadoc
-    command line. Useful for doclets. Parameters containing spaces
-    need to be quoted using &amp;quot; -- see also the nested
-    <code>arg</code> element.</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">Stop the buildprocess if the command exits with a
-      returncode other than 0.</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">failonwarning</td>
-    <td valign="top">Stop the buildprocess if a warning is emitted -
-    i.e. if javadoc's output contains the word "warning".  <em>since
-    Ant 1.9.4</em></td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">excludepackagenames</td>
-    <td valign="top">comma separated list of packages you don't want
-      docs for -- see also the nested <code>excludepackage</code> element.</td>
-    <td align="center" valign="top">all</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">defaultexcludes</td>
-    <td valign="top">indicates whether default excludes should be used
-      (<code>yes</code> | <code>no</code>); default excludes are used when omitted.</td>
-    <td align="center" valign="top">all</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">useexternalfile</td>
-    <td valign="top">indicates whether the sourcefile name specified
-      in srcfiles or as nested source elements should be written to a
-      temporary file to make the command line shorter. Also applies to
-      the package names specified via the packagenames attribute or
-      nested package elements.  <em>Since Ant 1.7.0</em>, also applies
-      to all the other command line options.
-      (<code>yes</code> | <code>no</code>). Default is no.</td>
-    <td align="center" valign="top">all</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">source</td>
-    <td valign="top">Necessary to enable javadoc to handle assertions
-    present in J2SE v 1.4 source code. Set this to &quot;1.4&quot; to
-    documents code that compiles using <code>&quot;javac -source
-    1.4&quot;</code>.<br>
-    A default value for this attribute can be provided using the magic
-    <a
-    href="../javacprops.html#source"><code>ant.build.javac.source</code></a>
-    property.</td>
-    <td align="center" valign="top">1.4+</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">linksource</td>
-    <td valign="top">Generate hyperlinks to source files.
-      <em>since Ant 1.6</em>.
-      (<code>yes</code> | <code>no</code>). Default is no.</td>
-    <td align="center" valign="top">1.4+</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">breakiterator</td>
-    <td valign="top">Use the new breakiterator algorithm.
-      <em>since Ant 1.6</em>.
-      (<code>yes</code> | <code>no</code>). Default is no.</td>
-    <td align="center" valign="top">1.4+</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">noqualifier</td>
-    <td valign="top">Enables the <code>-noqualifier</code> argument -
-      must be <code>all</code> or a colon separated list of packages.
-      <em>since Ant 1.6</em>.</td>
-    <td align="center" valign="top">1.4+</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">includenosourcepackages</td>
-    <td valign="top">If set to true, packages that don't contain Java
-      source but a package.html will get documented as well.
-      <em>since Ant 1.6.3</em>.</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No (default is <code>false</code>)</td>
-  </tr>
-  <tr>
-    <td valign="top">executable</td>
-    <td valign="top">Specify a particular <code>javadoc</code> executable
-      to use in place of the default binary (found in the same JDK as Ant is running in).
-      <em>since Ant 1.6.3</em>.</td>
-    <td align="center" valign="top">all</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">docfilessubdirs</td>
-    <td valign="top">Enables deep-copying of <code>doc-files</code>
-      subdirectories.  Defaults to false. <em>since Ant 1.8.0</em>.</td>
-    <td align="center" valign="top">1.4</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">excludedocfilessubdir</td>
-    <td valign="top">Colon-separated list of <code>doc-files</code>'
-      subdirectories to exclude if <code>docfilessubdirs</code> is
-      true. <em>since Ant 1.8.0</em>.</td>
-    <td align="center" valign="top">1.4</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">postProcessGeneratedJavadocs</td>
-    <td valign="top">Whether to post-process the generated javadocs in
-      order to mitigate CVE-2013-1571.  Defaults to true.  <em>Since Ant
-      1.9.2</em><br>
-      There is a frame injection attack possible in javadocs generated by Oracle
-      JDKs prior to Java7 Update 25 (<a href="http://www.oracle.com/technetwork/java/javase/7u25-relnotes-1955741.html#jpi-upt" target="_blank">details</a>).  
-      When this flag is set to true, Ant will check whether the docs are vulnerable 
-      and will try to fix them.
-    </td>
-    <td align="center" valign="top">1.4</td>
-    <td align="center" valign="top">No</td>
+    <td>docencoding</td>
+    <td>Output file encoding name</td>
+    <td>all</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>doclet</td>
+    <td>Specifies the class file that starts the doclet used in generating the
+      documentation&mdash;see also the nested <code>doclet</code> element.</td>
+    <td>all</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>docletpath</td>
+    <td>Specifies the path to the doclet class file that is specified with the <kbd>-doclet</kbd>
+      option.</td>
+    <td>all</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>docletpathref</td>
+    <td>Specifies the path to the doclet class file that is specified with the <kbd>-doclet</kbd>
+      option by <a href="../using.html#references">reference</a> to a path defined elsewhere.</td>
+    <td>all</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>additionalparam</td>
+    <td>Lets you add additional parameters to the <kbd>javadoc</kbd> command line. Useful for
+      doclets. Parameters containing spaces need to be quoted using &amp;quot;&mdash;see also the
+      nested <code>arg</code> element.</td>
+    <td>all</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>failonerror</td>
+    <td>Stop the build process if the command exits with a return code other than <q>0</q>.</td>
+    <td>all</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>failonwarning</td>
+    <td>Stop the build process if a warning is emitted&mdash;i.e. if <kbd>javadoc</kbd>'s output
+      contains the word <q>warning</q>.  <em>since Ant 1.9.4</em></td>
+    <td>all</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>excludepackagenames</td>
+    <td>comma separated list of packages you don't want docs for&mdash;see also the
+      nested <code>excludepackage</code> element.</td>
+    <td>all</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>defaultexcludes</td>
+    <td>indicates whether default excludes should be used (<q>yes|no</q>).</td>
+    <td>all</td>
+    <td>No; defaults to <q>yes</q></td>
+  </tr>
+  <tr>
+    <td>useexternalfile</td>
+    <td>indicates whether the source file names specified in <var>srcfiles</var> or as
+      nested <code>source</code> elements should be written to a temporary file to make the command
+      line shorter. Also applies to the package names specified via the <var>packagenames</var>
+      attribute or nested <code>package</code> elements.  <em>Since Ant 1.7.0</em>, also applies to
+      all the other command line options.  (<q>yes|no</q>).</td>
+    <td>all</td>
+    <td>No; default is <q>no</q></td>
+  </tr>
+  <tr>
+    <td>source</td>
+    <td>Enable <kbd>javadoc</kbd> to handle Java language features.  Set this to <q>1.4</q> to
+      document code that compiles using <kbd>javac -source 1.4</kbd>, etc.</td>
+    <td>1.4+</td>
+    <td>No; default can be provided using the magic
+    <a href="../javacprops.html#source"><code>ant.build.javac.source</code></a> property.</td>
+  </tr>
+  <tr>
+    <td>linksource</td>
+    <td>Generate hyperlinks to source files.  <em>since Ant 1.6</em>.  (<q>yes|no</q>).</td>
+    <td>1.4+</td>
+    <td>No; default is <q>no</q></td>
+  </tr>
+  <tr>
+    <td>breakiterator</td>
+    <td>Use the new break iterator algorithm.  <em>since Ant 1.6</em>.  (<q>yes|no</q>).</td>
+    <td>1.4+</td>
+    <td>No; default is <q>no</q></td>
+  </tr>
+  <tr>
+    <td>noqualifier</td>
+    <td>Enables the <kbd>-noqualifier</kbd> argument&mdash;must be <q>all</q> or a colon separated
+      list of packages.  <em>since Ant 1.6</em>.</td>
+    <td>1.4+</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>includenosourcepackages</td>
+    <td>If set to <q>true</q>, packages that don't contain Java source but
+      a <samp>package.html</samp> will get documented as well.  <em>since Ant 1.6.3</em>.</td>
+    <td>all</td>
+    <td>No; default is <q>false</q></td>
+  </tr>
+  <tr>
+    <td>executable</td>
+    <td>Specify a particular <kbd>javadoc</kbd> executable to use in place of the default binary
+      (found in the same JDK as Ant is running in).  <em>since Ant 1.6.3</em>.</td>
+    <td>all</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>docfilessubdirs</td>
+    <td>Enables deep-copying of <samp>doc-files</samp> subdirectories. <em>since Ant
+      1.8.0</em>.</td>
+    <td>1.4</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>excludedocfilessubdir</td>
+    <td>Colon-separated list of <samp>doc-files</samp> subdirectories to exclude
+      if <var>docfilessubdirs</var> is true. <em>since Ant 1.8.0</em>.</td>
+    <td>1.4</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>postProcessGeneratedJavadocs</td>
+    <td>Whether to post-process the generated javadocs in order to mitigate
+      CVE-2013-1571.  <em>Since Ant 1.9.2</em><br/> There is a frame injection attack possible in
+      javadocs generated by Oracle JDKs prior to Java 7 update 25
+      (<a href="https://www.oracle.com/technetwork/java/javase/7u25-relnotes-1955741.html#jpi-upt"
+      target="_top">details</a>).  When this flag is set to <q>true</q>, Ant will check whether the
+      docs are vulnerable and will try to fix them.</td>
+    <td>1.4</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
 </table>
 
-<h4><a name="groupattribute">Format of the group attribute</a></h4>
-<p>The arguments are comma-delimited. Each single argument is 2
-space-delimited strings, where the first one is the group's title and
-the second one a colon delimited list of packages.</p>
-<p>If you need to specify more than one group, or a group whose title
-contains a comma or a space character, using <a
-href="#groupelement">nested group elements</a> is highly
+<h4 id="groupattribute">Format of the group attribute</h4>
+<p>The arguments are comma-delimited. Each single argument is 2 space-delimited strings, where the
+first one is the group's title and the second one a colon delimited list of packages.</p>
+<p>If you need to specify more than one group, or a group whose title contains a comma or a space
+character, using <a href="#groupelement">nested <code>group</code> elements</a> is highly
 recommended.</p>
 <p>E.g.:</p>
-<pre>    group=&quot;XSLT_Packages org.apache.xalan.xslt*,XPath_Packages org.apache.xalan.xpath*&quot;</pre>
+<pre>group=&quot;XSLT_Packages org.apache.xalan.xslt*,XPath_Packages org.apache.xalan.xpath*&quot;</pre>
 
 <h3>Parameters specified as nested elements</h3>
 
 <h4>packageset</h4>
 
-<p>A <a href="../Types/dirset.html">DirSet</a>.  All matched
-directories that contain Java source files will be passed to javadoc
-as package names.  Package names are created from the directory names
-by translating the directory separator into dots.  Ant assumes the
-base directory of the packageset points to the root of a package
-hierarchy.</p>
-
-<p>The <code>packagenames</code>, <code>excludepackagenames</code> and
-<code>defaultexcludes</code> attributes of the task have no effect on
-the nested <code>&lt;packageset&gt;</code> elements.</p>
+<p>A <a href="../Types/dirset.html">DirSet</a>.  All matched directories that contain Java source
+files will be passed to <kbd>javadoc</kbd> as package names.  Package names are created from the
+directory names by translating the directory separator into dots.  Ant assumes the base directory of
+the <code>packageset</code> points to the root of a package hierarchy.</p>
+
+<p>The <var>packagenames</var>, <var>excludepackagenames</var> and <var>defaultexcludes</var>
+attributes of the task have no effect on the nested <code>&lt;packageset&gt;</code> elements.</p>
 
 <h4>fileset</h4>
 
-<p>A <a href="../Types/fileset.html">FileSet</a>.  All matched
-files will be passed to javadoc as source files.  Ant will
-automatically add the include pattern <code>**/*.java</code> (and
-<code>**/package.html</code> if includenosourcepackages is true) to
-these filesets.</p>
-
-<p>Nested filesets can be used to document sources that are in the
-default package or if you want to exclude certain files from
-documentation.  If you want to document all source files and don't use
-the default package, packagesets should be used instead as this
-increases javadocs performance.</p>
-
-<p>The <code>packagenames</code>, <code>excludepackagenames</code> and
-<code>defaultexcludes</code> attributes of the task have no effect on
-the nested <code>&lt;fileset&gt;</code> elements.</p>
+<p>A <a href="../Types/fileset.html">FileSet</a>.  All matched files will be passed
+to <kbd>javadoc</kbd> as source files.  Ant will automatically add the include
+pattern <samp>**/*.java</samp> (and <samp>**/package.html</samp>
+if <var>includenosourcepackages</var> is <q>true</q>) to these filesets.</p>
+
+<p>Nested filesets can be used to document sources that are in the default package or if you want to
+exclude certain files from documentation.  If you want to document all source files and don't use
+the default package, <code>packageset</code>s should be used instead as this increases performance
+of <kbd>javadoc</kbd>.</p>
+
+<p>The <var>packagenames</var>, <var>excludepackagenames</var> and <var>defaultexcludes</var>
+attributes of the task have no effect on the nested <code>&lt;fileset&gt;</code> elements.</p>
 
 <h4>sourcefiles</h4>
 
-<p>A container for arbitrary file system based <a
-href="../Types/resources.html#collection">resource
-collections</a>.  All files contained in any of the nested collections
-(this includes nested filesets, filelists or paths) will be passed to
-javadoc as source files.</p>
+<p>A container for arbitrary file system based <a href="../Types/resources.html#collection">resource
+collections</a>.  All files contained in any of the nested collections (this includes nested
+filesets, filelists or paths) will be passed to javadoc as source files.</p>
 
 <h4>package</h4>
-<p>Same as one entry in the list given by <code>packagenames</code>.</p>
+<p>Same as one entry in the list given by <var>packagenames</var>.</p>
 
 <h5>Parameters</h5>
-<table width="90%" border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The package name (may be a wildcard)</td>
-    <td align="center" valign="top">Yes</td>
+    <td>name</td>
+    <td>The package name (may be a wildcard)</td>
+    <td>Yes</td>
   </tr>
 </table>
 
 <h4>excludepackage</h4>
-<p>Same as one entry in the list given by <code>excludepackagenames</code>.</p>
+<p>Same as one entry in the list given by <var>excludepackagenames</var>.</p>
 
 <h5>Parameters</h5>
 Same as for <code>package</code>.
 
 <h4>source</h4>
-<p>Same as one entry in the list given by <code>sourcefiles</code>.</p>
+<p>Same as one entry in the list given by <var>sourcefiles</var>.</p>
 
 <h5>Parameters</h5>
-<table width="90%" border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">The source file to document</td>
-    <td align="center" valign="top">Yes</td>
+    <td>file</td>
+    <td>The source file to document</td>
+    <td>Yes</td>
   </tr>
 </table>
 
 <h4>doctitle</h4>
 
-<p>Same as the <code>doctitle</code> attribute, but you can nest text
-inside the element this way.</p>
+<p>Same as the <var>doctitle</var> attribute, but you can nest text inside the element this way.</p>
 
-<p>If the nested text contains line breaks, you must use the
-  useexternalfile attribute and set it to true.</p>
+<p>If the nested text contains line breaks, you must use the <var>useexternalfile</var> attribute
+and set it to <q>true</q>.</p>
 
 <h4>header</h4>
 
@@ -645,271 +604,264 @@
 <p>Similar to <code>&lt;doctitle&gt;</code>.</p>
 
 <h4>link</h4>
-<p>Create link to javadoc output at the given URL. This performs the
-same role as the link and linkoffline attributes. You can use either
-syntax (or both at once), but with the nested elements you can easily
-specify multiple occurrences of the arguments.</p>
+<p>Create link to <kbd>javadoc</kbd> output at the given URL. This performs the same role as
+the <var>link</var> and <var>linkoffline</var> attributes. You can use either syntax (or both at
+once), but with the nested elements you can easily specify multiple occurrences of the
+arguments.</p>
 
 <h5>Parameters</h5>
-<table width="90%" border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">href</td>
-    <td valign="top">The URL for the external documentation you wish
-    to link to.  This can be an absolute URL, or a relative file
-    name.</td>
-    <td align="center" valign="top">Yes</td>
+    <td>href</td>
+    <td>The URL for the external documentation you wish to link to.  This can be an absolute URL, or
+      a relative file name.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">offline</td>
-    <td valign="top">True if this link is not available online at the time of
-                     generating the documentation</td>
-    <td align="center" valign="top">No</td>
+    <td>offline</td>
+    <td><q>true</q> if this link is not available online at the time of generating the
+      documentation</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">packagelistLoc</td>
-    <td valign="top">The location to the directory containing the package-list file for
-                     the external documentation</td>
-    <td align="center" valign="top" rowspan="2">One of the two if the offline attribute is true</td>
+    <td>packagelistLoc</td>
+    <td>The location to the directory containing the package-list file for the external
+      documentation</td>
+    <td rowspan="2">One of the two if the <var>offline</var> attribute is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">packagelistURL</td>
-    <td valign="top">The URL of the the directory containing the package-list file for
-                     the external documentation</td>
+    <td>packagelistURL</td>
+    <td class="left">The URL of the the directory containing the package-list file for the external
+      documentation</td>
   </tr>
   <tr>
-    <td valign="top">resolveLink</td>
-    <td valign="top">If the link attribute is a relative file name,
-    Ant will first try to locate the file relative to the current
-    project's basedir and if it finds a file there use an absolute URL
-    for the link attribute, otherwise it will pass the file name
-    verbatim to the javadoc command.</td>
-    <td align="center" valign="top">No, default is false.</td>
+    <td>resolveLink</td>
+    <td>If the <var>link</var> attribute is a relative file name, Ant will first try to locate the
+      file relative to the current project's <var>basedir</var> and if it finds a file there use an
+      absolute URL for the <var>link</var> attribute, otherwise it will pass the file name verbatim
+      to the <kbd>javadoc</kbd> command.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
 </table>
 
-<h4><a name="groupelement">group</a></h4>
-<p>Separates packages on the overview page into whatever groups you
-specify, one group per table. This performs the same role as the group
-attribute. You can use either syntax (or both at once), but with the
-nested elements you can easily specify multiple occurrences of the
+<h4 id="groupelement">group</h4>
+<p>Separates packages on the overview page into whatever groups you specify, one group per
+table. This performs the same role as the <var>group</var> attribute. You can use either syntax (or
+both at once), but with the nested elements you can easily specify multiple occurrences of the
 arguments.</p>
 
 <h5>Parameters</h5>
-<table width="90%" border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">title</td>
-    <td valign="top">Title of the group</td>
-    <td align="center" valign="top">Yes, unless nested <code>&lt;title&gt;</code> given</td>
+    <td>title</td>
+    <td>Title of the group</td>
+    <td>Yes, unless nested <code>&lt;title&gt;</code> given</td>
   </tr>
   <tr>
-    <td valign="top">packages</td>
-    <td valign="top">List of packages to include in that group. Multiple packages are separated with ':'.</td>
-    <td align="center" valign="top">Yes, unless nested <code>&lt;package&gt;</code>s given</td>
+    <td>packages</td>
+    <td>List of packages to include in that group. Multiple packages are separated with <q>:</q>.</td>
+    <td>Yes, unless nested <code>&lt;package&gt;</code>s given</td>
   </tr>
 </table>
 
-<p>The title may be specified as a nested <code>&lt;title&gt;</code> element
-with text contents, and the packages may be listed with nested
-<code>&lt;package&gt;</code> elements as for the main task.</p>
+<p>The title may be specified as a nested <code>&lt;title&gt;</code> element with text contents, and
+the packages may be listed with nested <code>&lt;package&gt;</code> elements as for the main
+task.</p>
 
 <h4>doclet</h4>
-<p>The doclet nested element is used to specify the
-<a href="http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/doclet/overview.html">doclet</a>
-that javadoc will use to process the input source files. A number of the standard javadoc arguments
-are actually arguments of the standard doclet. If these are specified in the javadoc
-task's attributes, they will be passed to the doclet specified in the
-<code>&lt;doclet&gt;</code> nested element. Such attributes should only be specified,
-therefore, if they can be interpreted by the doclet in use.</p>
-
-<p>If the doclet requires additional parameters, these can be specified with
-<code>&lt;param&gt;</code> elements within the <code>&lt;doclet&gt;</code>
-element. These parameters are restricted to simple strings. An example usage
-of the doclet element is shown below:</p>
-
-<pre>  &lt;javadoc ... &gt;
-     &lt;doclet name=&quot;theDoclet&quot;
-             path=&quot;path/to/theDoclet&quot;&gt;
-        &lt;param name=&quot;-foo&quot; value=&quot;foovalue&quot;/&gt;
-        &lt;param name=&quot;-bar&quot; value=&quot;barvalue&quot;/&gt;
-     &lt;/doclet&gt;
-  &lt;/javadoc&gt;
-</pre>
-
-<h4><a name="tagelement">tag</a></h4>
-
-<p>If you want to specify a standard tag using a nested tag element
-because you want to determine the order the tags are output, you must
-not set the description attribute for those tags.</p>
+<p>The doclet nested element is used to specify
+the <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/javadoc/doclet/overview.html"
+target="_top">doclet</a> that <kbd>javadoc</kbd> will use to process the input source files. A
+number of the standard <kbd>javadoc</kbd> arguments are actually arguments of the standard
+doclet. If these are specified in the <code>javadoc</code> task's attributes, they will be passed to
+the doclet specified in the <code>&lt;doclet&gt;</code> nested element. Such attributes should only
+be specified, therefore, if they can be interpreted by the doclet in use.</p>
+
+<p>If the doclet requires additional parameters, these can be specified
+with <code>&lt;param&gt;</code> elements within the <code>&lt;doclet&gt;</code> element. These
+parameters are restricted to simple strings. An example usage of the <code>doclet</code> element is
+shown below:</p>
+
+<pre>
+&lt;javadoc ... &gt;
+   &lt;doclet name=&quot;theDoclet&quot;
+           path=&quot;path/to/theDoclet&quot;&gt;
+      &lt;param name=&quot;-foo&quot; value=&quot;foovalue&quot;/&gt;
+      &lt;param name=&quot;-bar&quot; value=&quot;barvalue&quot;/&gt;
+   &lt;/doclet&gt;
+&lt;/javadoc&gt;</pre>
+
+<h4 id="tagelement">tag</h4>
+
+<p>If you want to specify a standard tag using a nested <code>tag</code> element because you want to
+determine the order the tags are output, you must not set the <var>description</var> attribute for
+those tags.</p>
 
 <h5>Parameters</h5>
-<table width="90%" border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">Name of the tag (e.g. <code>todo</code>)</td>
-    <td align="center" valign="top">Yes, unless the <code>dir</code> attribute is specified.</td>
+    <td>name</td>
+    <td>Name of the tag (e.g. <q>todo</q>)</td>
+    <td>Yes, unless the <var>dir</var> attribute is specified</td>
   </tr>
   <tr>
-    <td valign="top">description</td>
-    <td valign="top">Description for tag (e.g. <code>To do:</code>)</td>
-    <td align="center" valign="top">
-      No, the javadoc executable will pick a default if this is not specified.
+    <td>description</td>
+    <td>Description for tag (e.g. <q>To do:</q>)</td>
+    <td>
+      No, the <kbd>javadoc</kbd> executable will pick a default if this is not specified
     </td>
   </tr>
   <tr>
-    <td valign="top">enabled</td>
-    <td valign="top">Whether or not the tag is enabled (defaults to <code>true</code>)</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">scope</td>
-    <td valign="top">Scope for the tag - the elements in which it can be used. This
-    is a comma separated list of some of the elements: <code>overview</code>,
-    <code>packages</code>, <code>types</code>, <code>constructors</code>,
-    <code>methods</code>, <code>fields</code> or the default, <code>all</code>.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">dir</td>
-    <td valign="top">If this attribute is specified, this element will behave as an implicit
-    <a href="../Types/fileset.html">fileset</a>. The files included by this fileset should
-    contain each tag definition on a separate line, as described in the
-    <a href="http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#javadoctags">Javadoc reference guide</a>:
-    <pre>ejb.bean:t:XDoclet EJB Tag
+    <td>enabled</td>
+    <td>Whether or not the tag is enabled</td>
+    <td>No; defaults to <q>true</q></td>
+  </tr>
+  <tr>
+    <td>scope</td>
+    <td>Scope for the tag&mdash;the elements in which it can be used. This is a comma separated list
+      of some of the
+      elements: <q>overview</q>, <q>packages</q>, <q>types</q>, <q>constructors</q>, <q>methods</q>, <q>fields</q>
+      or the default, <q>all</q>.</td>
+    <td>No; defaults to <q>all</q></td>
+  </tr>
+  <tr>
+    <td>dir</td>
+    <td>If this attribute is specified, this element will behave as an
+      implicit <a href="../Types/fileset.html">fileset</a>. The files included by this fileset
+      should contain each tag definition on a separate line, as described in
+      the <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#javadoctags"
+      target="_top">Javadoc reference guide</a>:
+      <pre>ejb.bean:t:XDoclet EJB Tag
 todo:a:To Do</pre>
-      <b>Note:</b> The  Javadoc reference quide has double quotes around
-the description part of the definition. This will not work when used in
-a file, as the definition is quoted again when given to
-the javadoc program.
-    <br/>
-      <b>Note:</b> If this attribute is specified, all the other attributes in this
-    element will be ignored.
-    </td>
-    <td align="center" valign="top">No</td>
+      <strong>Note</strong>: The Javadoc reference quide has double quotes around the description
+      part of the definition. This will not work when used in a file, as the definition is quoted
+      again when given to the <kbd>javadoc</kbd> program.<br/>
+      <strong>Note</strong>: If this attribute is specified, all the other attributes in this
+      element will be ignored.</td>
+    <td>No</td>
   </tr>
 </table>
 
-<h4><a name="tagletelement">taglet</a></h4>
-<p>The taglet nested element is used to specify custom
-  <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/taglet/overview.html">taglets</a> beyond <a href="http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javadoc.html#javadoctags" target="_blank">the default taglets</a>.</p>
+<h4 id="tagletelement">taglet</h4>
+<p>The taglet nested element is used to specify
+custom <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/javadoc/taglet/overview.html"
+target="_top">taglets</a>
+beyond <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/javadoc.html#javadoctags"
+target="_top">the default taglets</a>.</p>
 
 <h5>Parameters</h5>
-<table width="90%" border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The name of the taglet class
-              (e.g. <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/taglet/ToDoTaglet.java">
-              <code>com.sun.tools.doclets.ToDoTaglet</code></a>)</td>
-    <td align="center" valign="top">Yes</td>
+    <td>name</td>
+    <td>The name of the taglet class
+      (e.g. <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/javadoc/taglet/ToDoTaglet.java"
+      target="_top"><code>com.sun.tools.doclets.ToDoTaglet</code></a>)</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">path</td>
-    <td valign="top">A path specifying the search path for the taglet class
-            (e.g. <code>/home/taglets</code>).
-            The path may also be specified by a nested <code>&lt;path&gt;</code> element</td>
-    <td align="center" valign="top">No</td>
+    <td>path</td>
+    <td>A path specifying the search path for the taglet class (e.g. <samp>/home/taglets</samp>).
+      The path may also be specified by a nested <code>&lt;path&gt;</code> element</td>
+    <td>No</td>
   </tr>
 </table>
 
 <h4>sourcepath, classpath and bootclasspath</h4>
-<p><code>Javadoc</code>'s <i>sourcepath</i>, <i>classpath</i> and
-<i>bootclasspath</i> attributes are <a href="../using.html#path">PATH like
-structure</a> and can also be set via nested <i>sourcepath</i>,
-<i>classpath</i> and <i>bootclasspath</i> elements
+<p><code>Javadoc</code>'s <var>sourcepath</var>, <var>classpath</var> and <var>bootclasspath</var>
+attributes are <a href="../using.html#path">path-like structure</a> and can also be set via
+nested <code>sourcepath</code>, <code>classpath</code> and <code>bootclasspath</code> elements
 respectively.</p>
 
 <h4>arg</h4>
-
-<p>Use nested <code>&lt;arg&gt;</code> to specify additional
-arguments.  See <a href="../using.html#arg">Command line
-arguments</a>. <em>Since Ant 1.6</em></p>
+<p><em>Since Ant 1.6</em></p>
+<p>Use nested <code>&lt;arg&gt;</code> to specify additional arguments.
+See <a href="../using.html#arg">Command line arguments</a>.</p>
 
 <h3>Example</h3>
-<pre>  &lt;javadoc packagenames=&quot;com.dummy.test.*&quot;
-           sourcepath=&quot;src&quot;
-           excludepackagenames=&quot;com.dummy.test.doc-files.*&quot;
-           defaultexcludes=&quot;yes&quot;
-           destdir=&quot;docs/api&quot;
-           author=&quot;true&quot;
-           version=&quot;true&quot;
-           use=&quot;true&quot;
-           windowtitle=&quot;Test API&quot;&gt;
-    &lt;doctitle&gt;&lt;![CDATA[&lt;h1&gt;Test&lt;/h1&gt;]]&gt;&lt;/doctitle&gt;
-    &lt;bottom&gt;&lt;![CDATA[&lt;i&gt;Copyright &amp;#169; 2000 Dummy Corp. All Rights Reserved.&lt;/i&gt;]]&gt;&lt;/bottom&gt;
-    &lt;tag name=&quot;todo&quot; scope=&quot;all&quot; description=&quot;To do:&quot;/&gt;
-    &lt;group title=&quot;Group 1 Packages&quot; packages=&quot;com.dummy.test.a*&quot;/&gt;
-    &lt;group title=&quot;Group 2 Packages&quot; packages=&quot;com.dummy.test.b*:com.dummy.test.c*&quot;/&gt;
-    &lt;link offline=&quot;true&quot; href=&quot;http://docs.oracle.com/javase/7/docs/api/&quot; packagelistLoc=&quot;C:\tmp&quot;/&gt;
-    &lt;link href=&quot;http://docs.oracle.com/javase/7/docs/api/&quot;/&gt;
-  &lt/javadoc&gt;</pre>
+<pre>
+&lt;javadoc packagenames=&quot;com.dummy.test.*&quot;
+         sourcepath=&quot;src&quot;
+         excludepackagenames=&quot;com.dummy.test.doc-files.*&quot;
+         defaultexcludes=&quot;yes&quot;
+         destdir=&quot;docs/api&quot;
+         author=&quot;true&quot;
+         version=&quot;true&quot;
+         use=&quot;true&quot;
+         windowtitle=&quot;Test API&quot;&gt;
+  &lt;doctitle&gt;&lt;![CDATA[&lt;h1&gt;Test&lt;/h1&gt;]]&gt;&lt;/doctitle&gt;
+  &lt;bottom&gt;&lt;![CDATA[&lt;i&gt;Copyright &amp;#169; 2000 Dummy Corp. All Rights Reserved.&lt;/i&gt;]]&gt;&lt;/bottom&gt;
+  &lt;tag name=&quot;todo&quot; scope=&quot;all&quot; description=&quot;To do:&quot;/&gt;
+  &lt;group title=&quot;Group 1 Packages&quot; packages=&quot;com.dummy.test.a*&quot;/&gt;
+  &lt;group title=&quot;Group 2 Packages&quot; packages=&quot;com.dummy.test.b*:com.dummy.test.c*&quot;/&gt;
+  &lt;link offline=&quot;true&quot; href=&quot;https://docs.oracle.com/javase/8/docs/api/&quot; packagelistLoc=&quot;C:\tmp&quot;/&gt;
+  &lt;link href=&quot;https://docs.oracle.com/javase/8/docs/api/&quot;/&gt;
+&lt/javadoc&gt;</pre>
 
 <p>is the same as</p>
 
-<pre>  &lt;javadoc
-           destdir=&quot;docs/api&quot;
-           author=&quot;true&quot;
-           version=&quot;true&quot;
-           use=&quot;true&quot;
-           windowtitle=&quot;Test API&quot;&gt;
-
-    &lt;packageset dir=&quot;src&quot; defaultexcludes=&quot;yes&quot;&gt;
-      &lt;include name=&quot;com/dummy/test/**&quot;/&gt;
-      &lt;exclude name=&quot;com/dummy/test/doc-files/**&quot;/&gt;
-    &lt;/packageset&gt;
-
-    &lt;doctitle&gt;&lt;![CDATA[&lt;h1&gt;Test&lt;/h1&gt;]]&gt;&lt;/doctitle&gt;
-    &lt;bottom&gt;&lt;![CDATA[&lt;i&gt;Copyright &amp;#169; 2000 Dummy Corp. All Rights Reserved.&lt;/i&gt;]]&gt;&lt;/bottom&gt;
-    &lt;tag name=&quot;todo&quot; scope=&quot;all&quot; description=&quot;To do:&quot;/&gt;
-    &lt;group title=&quot;Group 1 Packages&quot; packages=&quot;com.dummy.test.a*&quot;/&gt;
-    &lt;group title=&quot;Group 2 Packages&quot; packages=&quot;com.dummy.test.b*:com.dummy.test.c*&quot;/&gt;
-    &lt;link offline=&quot;true&quot; href=&quot;http://docs.oracle.com/javase/7/docs/api/&quot; packagelistLoc=&quot;C:\tmp&quot;/&gt;
-    &lt;link href=&quot;http://docs.oracle.com/javase/7/docs/api/&quot;/&gt;
-  &lt/javadoc&gt;</pre>
+<pre>
+&lt;javadoc destdir=&quot;docs/api&quot;
+         author=&quot;true&quot;
+         version=&quot;true&quot;
+         use=&quot;true&quot;
+         windowtitle=&quot;Test API&quot;&gt;
+
+  &lt;packageset dir=&quot;src&quot; defaultexcludes=&quot;yes&quot;&gt;
+    &lt;include name=&quot;com/dummy/test/**&quot;/&gt;
+    &lt;exclude name=&quot;com/dummy/test/doc-files/**&quot;/&gt;
+  &lt;/packageset&gt;
+
+  &lt;doctitle&gt;&lt;![CDATA[&lt;h1&gt;Test&lt;/h1&gt;]]&gt;&lt;/doctitle&gt;
+  &lt;bottom&gt;&lt;![CDATA[&lt;i&gt;Copyright &amp;#169; 2000 Dummy Corp. All Rights Reserved.&lt;/i&gt;]]&gt;&lt;/bottom&gt;
+  &lt;tag name=&quot;todo&quot; scope=&quot;all&quot; description=&quot;To do:&quot;/&gt;
+  &lt;group title=&quot;Group 1 Packages&quot; packages=&quot;com.dummy.test.a*&quot;/&gt;
+  &lt;group title=&quot;Group 2 Packages&quot; packages=&quot;com.dummy.test.b*:com.dummy.test.c*&quot;/&gt;
+  &lt;link offline=&quot;true&quot; href=&quot;https://docs.oracle.com/javase/8/docs/api/&quot; packagelistLoc=&quot;C:\tmp&quot;/&gt;
+  &lt;link href=&quot;https://docs.oracle.com/javase/8/docs/api/&quot;/&gt;
+&lt/javadoc&gt;</pre>
 
 <p>or</p>
 
-<pre>  &lt;javadoc
-           destdir=&quot;docs/api&quot;
-           author=&quot;true&quot;
-           version=&quot;true&quot;
-           use=&quot;true&quot;
-           windowtitle=&quot;Test API&quot;&gt;
-
-    &lt;fileset dir=&quot;src&quot; defaultexcludes=&quot;yes&quot;&gt;
-      &lt;include name=&quot;com/dummy/test/**&quot;/&gt;
-      &lt;exclude name=&quot;com/dummy/test/doc-files/**&quot;/&gt;
-    &lt;/fileset&gt;
-
-    &lt;doctitle&gt;&lt;![CDATA[&lt;h1&gt;Test&lt;/h1&gt;]]&gt;&lt;/doctitle&gt;
-    &lt;bottom&gt;&lt;![CDATA[&lt;i&gt;Copyright &amp;#169; 2000 Dummy Corp. All Rights Reserved.&lt;/i&gt;]]&gt;&lt;/bottom&gt;
-    &lt;tag name=&quot;todo&quot; scope=&quot;all&quot; description=&quot;To do:&quot;/&gt;
-    &lt;group title=&quot;Group 1 Packages&quot; packages=&quot;com.dummy.test.a*&quot;/&gt;
-    &lt;group title=&quot;Group 2 Packages&quot; packages=&quot;com.dummy.test.b*:com.dummy.test.c*&quot;/&gt;
-    &lt;link offline=&quot;true&quot; href=&quot;http://docs.oracle.com/javase/7/docs/api/&quot; packagelistLoc=&quot;C:\tmp&quot;/&gt;
-    &lt;link href=&quot;http://docs.oracle.com/javase/7/docs/api/&quot;/&gt;
-  &lt/javadoc&gt;</pre>
-
-
+<pre>
+&lt;javadoc destdir=&quot;docs/api&quot;
+         author=&quot;true&quot;
+         version=&quot;true&quot;
+         use=&quot;true&quot;
+         windowtitle=&quot;Test API&quot;&gt;
+
+  &lt;fileset dir=&quot;src&quot; defaultexcludes=&quot;yes&quot;&gt;
+    &lt;include name=&quot;com/dummy/test/**&quot;/&gt;
+    &lt;exclude name=&quot;com/dummy/test/doc-files/**&quot;/&gt;
+  &lt;/fileset&gt;
+
+  &lt;doctitle&gt;&lt;![CDATA[&lt;h1&gt;Test&lt;/h1&gt;]]&gt;&lt;/doctitle&gt;
+  &lt;bottom&gt;&lt;![CDATA[&lt;i&gt;Copyright &amp;#169; 2000 Dummy Corp. All Rights Reserved.&lt;/i&gt;]]&gt;&lt;/bottom&gt;
+  &lt;tag name=&quot;todo&quot; scope=&quot;all&quot; description=&quot;To do:&quot;/&gt;
+  &lt;group title=&quot;Group 1 Packages&quot; packages=&quot;com.dummy.test.a*&quot;/&gt;
+  &lt;group title=&quot;Group 2 Packages&quot; packages=&quot;com.dummy.test.b*:com.dummy.test.c*&quot;/&gt;
+  &lt;link offline=&quot;true&quot; href=&quot;https://docs.oracle.com/javase/8/docs/api/&quot; packagelistLoc=&quot;C:\tmp&quot;/&gt;
+  &lt;link href=&quot;https://docs.oracle.com/javase/8/docs/api/&quot;/&gt;
+&lt/javadoc&gt;</pre>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/javah.html ant-1.10.3/manual/Tasks/javah.html
--- ant-1.9.10/manual/Tasks/javah.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/javah.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,233 +24,219 @@
 
 <body>
 
-<h2><a name="javah">Javah</a></h2>
+<h2 id="javah">Javah</h2>
 <h3>Description</h3>
 <p>Generates JNI headers from a Java class.</p>
-<p> When this task executes, it will generate the C header and source files that
-are needed to implement native methods. JNI operates differently depending on
-whether <a href="http://docs.oracle.com/javase/7/docs/technotes/tools/windows/javah.html">JDK1.2+</a>
-or <a href="http://java.sun.com/products/jdk/1.1/docs/tooldocs/win32/javah.html">pre-JDK1.2</a>
-systems are used.</p>
+<p>When this task executes, it will generate the C header and source files that are needed to
+implement native methods. JNI operates differently depending on
+whether <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/javah.html"
+target="_top">JDK 1.2+</a>
+or <a href="https://web.archive.org/web/20021018232717/http://java.sun.com/products/jdk/1.1/docs/tooldocs/win32/javah.html"
+target="_top">pre-1.2 JDK</a> systems are used.</p>
 
 <p>If you are building with Java 8 or above consider
-  using <a href="javac.html"><code>javac</code></a>'s <code>nativeheaderdir</code>
-  attribute instead which allows you to compile the classes and
-  generate the native header files with a single step.</p>
-
-<p><b>Note</b> the <code>javah</code> has been deprecated as of Java 9
-  and removed as of Java 10. Trying to use it with Java10 will
-  fail.</p>
-
-<p>It is possible to use different compilers. This can be selected
-with the <code>implementation</code> attribute or a nested element.  <a
-name="implementationvalues">Here are the choices of the attribute</a>:</p>
+using <a href="javac.html"><code>javac</code></a>'s <var>nativeheaderdir</var> attribute instead
+which allows you to compile the classes and generate the native header files in a single step.</p>
+
+<p><strong>Note</strong>: <code>javah</code> has been deprecated in Java 9 and removed in Java
+10. Attempts to use it with Java 10 will fail.</p>
+
+<p id="implementationvalues">It is possible to use different compilers. This can be selected with
+the <var>implementation</var> attribute or a nested element. Here are the choices of the
+attribute:</p>
 <ul>
-  <li>default - the default compiler for the platform.</li>
-  <li>sun (the standard compiler of the JDK) - default when not
-    running on Kaffee or gcj/gij or Java9.</li>
-  <li>kaffeh (the native standard compiler of <a href="http://www.kaffe.org" target="_top">Kaffe</a>)</li>
-  <li>gcjh (the native standard compiler
-  of <a href="http://gcc.gnu.org/java/"
-        target="_top">gcj and gij</a>) <em>since Apache Ant 1.8.2</em></li>
-  <li>forking - runs the javah executable via its command line
-    interface in a separate process. Default when running on
-    Java9. <em>since Ant 1.9.8</em></li>
+  <li><q>default</q>&mdash;the default compiler for the platform.</li>
+  <li><q>sun</q>&mdash;the standard compiler of the JDK.</li>
+  <li><q>kaffeh</q>&mdash;the native standard compiler of <a href="http://www.kaffe.org"
+    target="_top">Kaffe</a>.</li>
+  <li><q>gcjh</q>&mdash;the native standard compiler
+    of <a href="https://gcc.gnu.org/gcc-7/changes.html#java" target="_top">gcj and
+    gij</a>. <em>Since Apache Ant 1.8.2</em></li>
+  <li><q>forking</q>&mdash;runs the <kbd>javah</kbd> executable via its command line interface in
+    a separate process. Default when not running on Kaffe or gcj/gij <em>since Ant 1.9.8</em></li>
 </ul>
 
-<p><b>Note:</b> if you are using this task to work on multiple files
-  the command line may become too long on some operating systems.
-  Unfortunately the javah command doesn't support command argument
-  files the way javac (for example) does, so all that can be done is
-  breaking the amount of classes to compile into smaller chunks.</p>
+<p><strong>Note</strong>: if you are using this task to work on multiple files the command line may
+become too long on some operating systems.  Unfortunately the <kbd>javah</kbd> command doesn't
+support command argument files the way <kbd>javac</kbd> (for example) does, so all that can be
+done is breaking the amount of classes to compile into smaller chunks.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td valign="top" align="center"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">class</td>
-    <td valign="top">the fully-qualified name of the class (or classes,
-      separated by commas)</td>
-    <td align="center" valign="top">Yes</td>
+    <td>class</td>
+    <td>the fully-qualified name of the class (or classes, separated by commas)</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">outputFile</td>
-    <td valign="top">concatenates the resulting header or source files for all the classes listed into this file</td>
-    <td align="center" valign="middle" rowspan="2">Yes</td>
+    <td>outputFile</td>
+    <td>concatenates the resulting header or source files for all the classes listed into this
+      file</td>
+    <td rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
-    <td valign="top">destdir</td>
-    <td valign="top">sets the directory where javah saves the header files or the
-      stub files.</td>
+    <td>destdir</td>
+    <td class="left">sets the directory where <kbd>javah</kbd> saves the header files or the stub
+      files.</td>
   </tr>
   <tr>
-    <td valign="top">force</td>
-    <td valign="top">specifies that output files should always be written (JDK1.2 only)</td>
-    <td valign="top" align="center">No</td>
+    <td>force</td>
+    <td>specifies that output files should always be written (JDK 1.2 only)</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">old</td>
-    <td valign="top">specifies that old JDK1.0-style header files should be generated
-      (otherwise output file contain JNI-style native method      function prototypes) (JDK1.2 only)</td>
-    <td valign="top" align="center">No</td>
+    <td>old</td>
+    <td>specifies that old JDK 1.0-style header files should be generated (otherwise output file
+      contain JNI-style native method function prototypes) (JDK 1.2 only)</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">stubs</td>
-    <td valign="top">generate C declarations from the Java object file (used with old)</td>
-    <td valign="top" align="center">No</td>
+    <td>stubs</td>
+    <td>generate C declarations from the Java object file (used with <var>old</var>)</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">causes Javah to print a message concerning the status     of the generated files</td>
-    <td valign="top" align="center">No</td>
+    <td>verbose</td>
+    <td>causes <kbd>javah</kbd> to print a message concerning the status of the generated files</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">the classpath to use.</td>
-    <td align="center" valign="top">No</td>
+    <td>classpath</td>
+    <td>the classpath to use</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">bootclasspath</td>
-    <td valign="top">location of bootstrap class files.</td>
-    <td valign="top" align="center">No</td>
+    <td>bootclasspath</td>
+    <td>location of bootstrap class files</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">extdirs</td>
-    <td valign="top"> location of installed extensions.</td>
-    <td valign="top" align="center">No</td>
+    <td>extdirs</td>
+    <td>location of installed extensions</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">implementation</td>
-    <td valign="top">The compiler implementation to use.  If this
-    attribute is not set, the default compiler for the current VM
-    will be used.  (See the above <a
-    href="#implementationvalues">list</a> of valid compilers.)</td>
-    <td align="center" valign="top">No</td>
+    <td>implementation</td>
+    <td>The compiler implementation to use. (See the above <a href="#implementationvalues">list</a>
+      of valid compilers.)</td>
+    <td>No; defaults to default compiler for the current JDK</td>
   </tr>
 </table>
-<p>Either outputFile or destdir must be supplied, but not both.&nbsp;</p>
 
 <h3>Parameters specified as nested elements</h3>
 
 <h4>arg</h4>
 
-<p>You can specify additional command line arguments for the compiler
-with nested <code>&lt;arg&gt;</code> elements.  These elements are
-specified like <a href="../using.html#arg">Command-line Arguments</a>
-but have an additional attribute that can be used to enable arguments
-only if a given compiler implementation will be used.</p>
+<p>You can specify additional command line arguments for the compiler with
+nested <code>&lt;arg&gt;</code> elements.  These elements are specified
+like <a href="../using.html#arg">Command-line Arguments</a> but have an additional attribute that
+can be used to enable arguments only if a given compiler implementation will be used.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <th>Attribute</th>
+  <th>Description</th>
+  <th>Required</th>
 </tr>
   <tr>
-    <td valign="top">value</td>
-    <td align="center" rowspan="4">See
-    <a href="../using.html#arg">Command-line Arguments</a>.</td>
-    <td align="center" rowspan="4">Exactly one of these.</td>
+    <td>value</td>
+    <td rowspan="4">See <a href="../using.html#arg">Command-line Arguments</a>.</td>
+    <td rowspan="4">Exactly one of these</td>
   </tr>
   <tr>
-    <td valign="top">line</td>
+    <td class="var">line</td>
   </tr>
   <tr>
-    <td valign="top">file</td>
+    <td class="var">file</td>
   </tr>
   <tr>
-    <td valign="top">path</td>
+    <td class="var">path</td>
   </tr>
   <tr>
-    <td valign="top">prefix</td>
-    <td align="center" rowspan="2">See
-    <a href="../using.html#arg">Command-line Arguments</a>.
-    <em>Since Ant 1.8.</em></td>
-    <td valign="top" align="center">No</td>
+    <td>prefix</td>
+    <td rowspan="2">See <a href="../using.html#arg">Command-line Arguments</a>.  <em>Since Ant
+      1.8</em>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">suffix</td>
-    <td valign="top" align="center">No</td>
+    <td>suffix</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">implementation</td>
-    <td>Only pass the specified argument if the chosen compiler
-    implementation matches the value of this attribute.  Legal values
-    are the same as those in the above <a
-    href="#implementationvalues">list</a> of valid compilers.)</td>
-    <td align="center">No</td>
+    <td>implementation</td>
+    <td>Only pass the specified argument if the chosen compiler implementation matches the value of
+      this attribute.  Legal values are the same as those in the
+      above <a href="#implementationvalues">list</a> of valid compilers.)</td>
+    <td>No</td>
   </tr>
 </table>
 
-<h4>implementationclasspath <em>since Ant 1.8.0</em></h4>
-
-<p>A <a href="../using.html#path">PATH like structure</a> holding the
-  classpath to use when loading the compiler implementation if a
-  custom class has been specified.  Doesn't have any effect when
-  using one of the built-in compilers.</p>
-
-<h4>Any nested element of a type that implements JavahAdapter
-  <em>since Ant 1.8.0</em></h4>
-
-<p>If a defined type implements the <code>JavahAdapter</code>
-  interface a nested element of that type can be used as an
-  alternative to the <code>implementation</code> attribute.</p>
+<h4>implementationclasspath</h4>
+<p><em>Since Ant 1.8.0</em></p>
+<p>A <a href="../using.html#path">path-like structure</a> holding the classpath to use when loading
+the compiler implementation if a custom class has been specified.  Doesn't have any effect when
+using one of the built-in compilers.</p>
+
+<h4>Any nested element of a type that implements JavahAdapter</h4>
+<p><em>Since Ant 1.8.0</em></p>
+<p>If a defined type implements the <code class="code">JavahAdapter</code> interface a nested
+element of that type can be used as an alternative to the <var>implementation</var> attribute.</p>
 
 <h3>Examples</h3>
-<pre>  &lt;javah destdir=&quot;c&quot; class=&quot;org.foo.bar.Wibble&quot;/&gt;</pre>
-<p>makes a JNI header of the named class, using the JDK1.2 JNI model. Assuming
-the directory 'c' already exists, the file <tt>org_foo_bar_Wibble.h</tt>
-is created there. If this file already exists, it is left unchanged.</p>
-<pre>  &lt;javah outputFile=&quot;wibble.h&quot;&gt;
-    &lt;class name=&quot;org.foo.bar.Wibble,org.foo.bar.Bobble&quot;/&gt;
-  &lt;/javah&gt;</pre>
+<pre>&lt;javah destdir=&quot;c&quot; class=&quot;org.foo.bar.Wibble&quot;/&gt;</pre>
+<p>makes a JNI header of the named class, using the JDK 1.2 JNI model. Assuming the
+directory <samp>c</samp> already exists, the file <samp>org_foo_bar_Wibble.h</samp> is created
+there. If this file already exists, it is left unchanged.</p>
+<pre>
+&lt;javah outputFile=&quot;wibble.h&quot;&gt;
+  &lt;class name=&quot;org.foo.bar.Wibble,org.foo.bar.Bobble&quot;/&gt;
+&lt;/javah&gt;</pre>
 <p>is similar to the previous example, except the output is written to a file
-called <tt>wibble.h</tt>
-in the current directory.</p>
-<pre>  &lt;javah destdir=&quot;c&quot; force=&quot;yes&quot;&gt;
-    &lt;class name=&quot;org.foo.bar.Wibble&quot;/&gt;
-    &lt;class name=&quot;org.foo.bar.Bobble&quot;/&gt;
-    &lt;class name=&quot;org.foo.bar.Tribble&quot;/&gt;
-  &lt;/javah&gt;</pre>
-<p>writes three header files, one for each of the classes named. Because the
-force option is set, these header files are always written when the Javah task
-is invoked, even if they already exist.</p>
-<pre>  &lt;javah destdir=&quot;c&quot; verbose=&quot;yes&quot; old=&quot;yes&quot; force=&quot;yes&quot;&gt;
-    &lt;class name=&quot;org.foo.bar.Wibble&quot;/&gt;
-    &lt;class name=&quot;org.foo.bar.Bobble&quot;/&gt;
-    &lt;class name=&quot;org.foo.bar.Tribble&quot;/&gt;
-  &lt;/javah&gt;
-  &lt;javah destdir=&quot;c&quot; verbose=&quot;yes&quot; stubs=&quot;yes&quot; old=&quot;yes&quot; force=&quot;yes&quot;&gt;
-    &lt;class name=&quot;org.foo.bar.Wibble&quot;/&gt;
-    &lt;class name=&quot;org.foo.bar.Bobble&quot;/&gt;
-    &lt;class name=&quot;org.foo.bar.Tribble&quot;/&gt;
-  &lt;/javah&gt;</pre>
-<p>writes the headers for the three classes using the 'old' JNI format, then
-writes the corresponding .c stubs. The verbose option will cause Javah to
+called <samp>wibble.h</samp> in the current directory.</p>
+<pre>
+&lt;javah destdir=&quot;c&quot; force=&quot;yes&quot;&gt;
+  &lt;class name=&quot;org.foo.bar.Wibble&quot;/&gt;
+  &lt;class name=&quot;org.foo.bar.Bobble&quot;/&gt;
+  &lt;class name=&quot;org.foo.bar.Tribble&quot;/&gt;
+&lt;/javah&gt;</pre>
+<p>writes three header files, one for each of the classes named. Because the force option is set,
+these header files are always written when the <code>Javah</code> task is invoked, even if they
+already exist.</p>
+<pre>
+&lt;javah destdir=&quot;c&quot; verbose=&quot;yes&quot; old=&quot;yes&quot; force=&quot;yes&quot;&gt;
+  &lt;class name=&quot;org.foo.bar.Wibble&quot;/&gt;
+  &lt;class name=&quot;org.foo.bar.Bobble&quot;/&gt;
+  &lt;class name=&quot;org.foo.bar.Tribble&quot;/&gt;
+&lt;/javah&gt;
+&lt;javah destdir=&quot;c&quot; verbose=&quot;yes&quot; stubs=&quot;yes&quot; old=&quot;yes&quot; force=&quot;yes&quot;&gt;
+  &lt;class name=&quot;org.foo.bar.Wibble&quot;/&gt;
+  &lt;class name=&quot;org.foo.bar.Bobble&quot;/&gt;
+  &lt;class name=&quot;org.foo.bar.Tribble&quot;/&gt;
+&lt;/javah&gt;</pre>
+<p>writes the headers for the three classes using the 'old' JNI format, then writes the
+corresponding <samp>.c</samp> stubs. The <var>verbose</var> option will cause <code>Javah</code> to
 describe its progress.</p>
 
-<p>If you want to use a custom
-  JavahAdapter <code>org.example.MyAdapter</code> you can either
-  use the implementation attribute:</p>
+<p>If you want to use a
+custom <code class="code">JavahAdapter</code> <code>org.example.MyAdapter</code> you can either use
+the <var>implementation</var> attribute:</p>
 <pre>
 &lt;javah destdir="c" class="org.foo.bar.Wibble"
-       implementation="org.example.MyAdapter"/&gt;
-</pre>
+       implementation="org.example.MyAdapter"/&gt;</pre>
 <p>or a define a type and nest this into the task like in:</p>
 <pre>
 &lt;componentdef classname="org.example.MyAdapter"
               name="myadapter"/&gt;
 &lt;javah destdir="c" class="org.foo.bar.Wibble"&gt;
   &lt;myadapter/&gt;
-&lt;/javah&gt;
-</pre>
-<p>in which case your javah adapter can support attributes and
-  nested elements of its own.</p>
+&lt;/javah&gt;</pre>
+<p>in which case your <code>javah</code> adapter can support attributes and nested elements of its
+own.</p>
 
 </body>
-
 </html>
diff -Nru ant-1.9.10/manual/Tasks/java.html ant-1.10.3/manual/Tasks/java.html
--- ant-1.9.10/manual/Tasks/java.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/java.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,438 +24,385 @@
 
 <body>
 
-<h2><a name="java">Java</a></h2>
+<h2 id="java">Java</h2>
 <h3>Description</h3>
-<p>Executes a Java class within the running (Apache Ant) VM or forks another VM if
-specified.</p>
-<p>
-If odd things go wrong when you run this task, set fork="true" to use a new
-JVM.
-
-<p>As of Ant 1.6.3, you can interact with a forked VM, as well as
-sending input to it via the <code>input</code> and <code>inputstring</code>
-attributes.</p>
-
-<h4><a name="background">Running Ant as a background process on
-    Unix(-like) systems</a></h4>
-
-<p>If you run Ant as a background process (like <code>ant &</code>)
-  and use the <code>&lt;java&gt;</code> task with <code>spawn</code>
-  set to <code>false</code> and <code>fork</code>
-  to <code>true</code>, you must provide explicit input to the forked
-  process or Ant will be suspended because it tries to read from the
-  standard input.</p>
+<p>Executes a Java class within the running (Apache Ant) JVM or forks another JVM if specified.</p>
+<p>If odd things go wrong when you run this task, set <var>fork</var>=<q>true</q> to use a new
+JVM.</p>
+
+<p><em>Since Ant 1.6.3</em>, you can interact with a forked JVM, as well as sending input to it via
+the <var>input</var> and <var>inputstring</var> attributes.</p>
+
+<h4 id="background">Running Ant as a background process on Unix(-like) systems</h4>
+
+<p>If you run Ant as a background process (like <kbd>ant &amp;</kbd>) and use
+the <code>&lt;java&gt;</code> task with <var>spawn</var> set to <q>false</q> and <var>fork</var>
+to <q>true</q>, you must provide explicit input to the forked process or Ant will be suspended
+because it tries to read from the standard input.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top"><a name="classname">classname</a></td>
-    <td valign="top">the Java class to execute.</td>
-    <td align="center" valign="top">Either <tt>jar</tt>, <tt>classname</tt> or <tt>module</tt></td>
-  </tr>
-  <tr>
-    <td valign="top">jar</td>
-    <td valign="top">the location of the jar file to execute (must have a
-    Main-Class entry in the manifest). Fork must be set to true if this option is selected.
-    See notes below for more details.
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr id="classname">
+    <td>classname</td>
+    <td>the Java class to execute.</td>
+    <td rowspan="3">Exactly one of the three</td>
+  </tr>
+  <tr>
+    <td>jar</td>
+    <td class="left">the location of the jar file to execute (must have a <code>Main-Class</code>
+      entry in the manifest). <var>fork</var> must be set to <q>true</q> if this option is selected.
+      See notes <a href="#jar-execute">below</a> for more details.
     </td>
-    <td align="center" valign="top">Either <tt>jar</tt>, <tt>classname</tt> or <tt>module</tt></td>
   </tr>
   <tr>
-    <td valign="top">args</td>
-    <td valign="top">the arguments for the class that is
-      executed. <b>deprecated, use nested <code>&lt;arg&gt;</code>
-      elements instead.</b></td>
-    <td align="center" valign="top">No</td>
+    <td>module</td>
+    <td class="left">The initial or main module to resolve (must have a <code>Main-Class</code>
+      entry in the manifest).  <var>fork</var> must be set to <q>true</q> if this option is
+      selected. <em>since Ant 1.9.7</em></td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">the classpath to use.</td>
-    <td align="center" valign="top">No</td>
+    <td>args</td>
+    <td>the arguments for the class that is executed. <em><u>Deprecated</u>, use
+      nested <code>&lt;arg&gt;</code> elements instead.</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">the classpath to use, given as <a
-      href="../using.html#references">reference</a> to a PATH defined elsewhere.</td>
-    <td align="center" valign="top">No</td>
+    <td>classpath</td>
+    <td>the classpath to use.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">fork</td>
-    <td valign="top">if enabled triggers the class execution in another VM
-      (disabled by default)</td>
-    <td align="center" valign="top">No</td>
+    <td>classpathref</td>
+    <td>the classpath to use, given as <a href="../using.html#references">reference</a> to
+      a <code>Path</code> defined elsewhere.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">spawn</td>
-    <td valign="top">if enabled allows to start a process which will outlive ant.<br>
-    Requires fork=true, and not compatible
-    with timeout, input, output, error, result attributes.<br>
-      (disabled by default)</td>
-    <td align="center" valign="top">No</td>
+    <td>modulepath</td>
+    <td>Specify where to find application modules. A list of directories of modules, module files or
+      exploded modules.  <em>since Ant 1.9.7</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">jvm</td>
-    <td valign="top">the command used to invoke the Java Virtual Machine,
-      default is 'java'.  The command is resolved by java.lang.Runtime.exec().
-      Ignored if fork is disabled.
-    </td>
-    <td align="center" valign="top">No</td>
+    <td>modulepathref</td>
+    <td>The modulepath to use, given as <a href="../using.html#references">reference</a> to
+      a <code>Path</code> defined elsewhere.  <em>since Ant 1.9.7</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">jvmargs</td>
-    <td valign="top">the arguments to pass to the forked VM (ignored
-      if fork is disabled). <b>deprecated, use nested
-      <code>&lt;jvmarg&gt;</code> elements instead.</b></td>
-    <td align="center" valign="top">No</td>
+    <td>fork</td>
+    <td>if enabled triggers the class execution in another JVM.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">maxmemory</td>
-    <td valign="top">Max amount of memory to allocate to the forked VM
-      (ignored if fork is disabled)</td>
-    <td align="center" valign="top">No</td>
+    <td>spawn</td>
+    <td>if enabled allows to start a process which will outlive Ant.<br/>Requires
+      that <var>fork</var> is <q>true</q>, and not compatible
+      with <var>timeout</var>, <var>input</var>, <var>output</var>, <var>error</var>, <var>result</var>
+      attributes</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">module</td>
-    <td valign="top">The initial or main module to resolve. To specify
-    the module main class use the <a href="#classname">classname</a> attribute.
-    Fork must be set to true if this option is selected.<em>since Ant 1.9.7</em></td>
-    <td align="center" valign="top">Either <tt>jar</tt>, <tt>classname</tt> or <tt>module</tt></td>
+    <td>jvm</td>
+    <td>the command used to invoke JVM.  The command is resolved
+      by <code>java.lang.Runtime.exec()</code>.  Ignored if <var>fork</var> is <q>false</q>.
+    </td>
+    <td>No, default is <kbd>java</kbd></td>
   </tr>
   <tr>
-    <td valign="top">modulepath</td>
-    <td valign="top">Specify where to find application modules. A list of directories of modules, module files or exploded modules.<em>since Ant 1.9.7</em></td>
-    <td align="center" valign="top">No</td>
+    <td>jvmargs</td>
+    <td>the arguments to pass to the forked JVM, ignored if <var>fork</var> is
+      disabled. <em><u>Deprecated</u>, use nested <code>&lt;jvmarg&gt;</code> elements
+      instead.</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">modulepathref</td>
-    <td valign="top">The modulepath to use, given as <a
-      href="../using.html#references">reference</a> to a PATH defined elsewhere.
-      <em>since Ant 1.9.7</em></td>
-    <td align="center" valign="top">No</td>
+    <td>maxmemory</td>
+    <td>Max amount of memory to allocate to the forked JVM, ignored if <var>fork</var>
+      is <q>false</q></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">Stop the buildprocess if the command exits with a
-      returncode other than 0. Default is "false" (see <a href="#failonerror">note</a>)</td>
-    <td align="center" valign="top">No</td>
+    <td>failonerror</td>
+    <td>Stop the build process if the command exits with a return code other than <q>0</q>.</td>
+    <td>No; default is <q>false</q> (see <a href="#failonerror">note</a>)</td>
   </tr>
   <tr>
-    <td valign="top">resultproperty</td>
-    <td valign="top">The name of a property in which the return code of the
-      command should be stored. Only of interest if failonerror=false
-      and if fork=true.</td>
-    <td align="center" valign="top">No</td>
+    <td>resultproperty</td>
+    <td>The name of a property in which the return code of the command should be stored. Only of
+      interest if <var>failonerror</var> is <q>false</q> and if <var>fork</var> is <q>true</q>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">dir</td>
-    <td valign="top">The directory to invoke the VM in.  (ignored if
-      fork is disabled)</td>
-    <td align="center" valign="top">No</td>
+    <td>dir</td>
+    <td>The directory to invoke the JVM in, ignored if <var>fork</var> is <q>false</q>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">output</td>
-    <td valign="top">Name of a file to which to write the output. If the error stream
-      is not also redirected to a file or property, it will appear in this output.</td>
-    <td align="center" valign="top">No</td>
+    <td>output</td>
+    <td>Name of a file to which to write the output. If the error stream is not also redirected to a
+      file or property, it will appear in this output.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">error</td>
-    <td valign="top">The file to which the standard error of the command should be
-      redirected. </td>
-    <td align="center" valign="top">No</td>
+    <td>error</td>
+    <td>The file to which the standard error of the command should be redirected.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">logError</td>
-    <td valign="top">This attribute is used when you wish to see error output in Ant's
-                     log and you are redirecting output to a file/property. The error
-                     output will not be included in the output file/property. If you
-                     redirect error with the &quot;error&quot; or &quot;errorProperty&quot;
-                     attributes, this will have no effect.</td>
-    <td align="center" valign="top">No</td>
+    <td>logError</td>
+    <td>This attribute is used when you wish to see error output in Ant's log and you are
+      redirecting output to a file/property. The error output will not be included in the output
+      file/property. If you redirect error with the <var>error</var> or <var>errorProperty</var>
+      attributes, this will have no effect.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">append</td>
-    <td valign="top">Whether output and error files should be appended to or overwritten.
-    Defaults to false.</td>
-    <td align="center" valign="top">No</td>
+    <td>append</td>
+    <td>Whether output and error files should be appended to or overwritten.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">outputproperty</td>
-    <td valign="top">The name of a property in which the output of the
-      command should be stored. Unless the error stream is redirected to a separate
-      file or stream, this property will include the error output.</td>
-    <td align="center" valign="top">No</td>
+    <td>outputproperty</td>
+    <td>The name of a property in which the output of the command should be stored. Unless the error
+      stream is redirected to a separate file or stream, this property will include the error
+      output.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">errorproperty</td>
-    <td valign="top">The name of a property in which the standard error of the
-      command should be stored.</td>
-    <td align="center" valign="top">No</td>
+    <td>errorproperty</td>
+    <td>The name of a property in which the standard error of the command should be stored.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">input</td>
-    <td valign="top">A file from which the executed command's standard input
-                     is taken. This attribute is mutually exclusive with the
-                     inputstring attribute</td>
-    <td align="center" valign="top">No; default is to take standard input from console
-        (unless <code>spawn="true"</code>)</td>
+    <td>input</td>
+    <td>A file from which the executed command's standard input is taken. This attribute is mutually
+      exclusive with the <var>inputstring</var> attribute</td>
+    <td>No; default is to take standard input from console
+      unless <var>spawn</var> is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">inputstring</td>
-    <td valign="top">A string which serves as the input stream for the
-                     executed command. This attribute is mutually exclusive with the
-                     input attribute.</td>
-    <td align="center" valign="top">No; default is to take standard input from console
-        (unless <code>spawn="true"</code>)</td>
+    <td>inputstring</td>
+    <td>A string which serves as the input stream for the executed command. This attribute is
+      mutually exclusive with the <var>input</var> attribute.</td>
+    <td>No; default is to take standard input from console unless <var>spawn</var>
+      is <q>true</q>)</td>
   </tr>
   <tr>
-    <td valign="top">newenvironment</td>
-    <td valign="top">Do not propagate old environment when new
-      environment variables are specified. Default is &quot;false&quot;
-      (ignored if fork is disabled).</td>
-    <td align="center" valign="top">No</td>
+    <td>newenvironment</td>
+    <td>Do not propagate old environment when new environment variables are specified.</td>
+    <td>No; default is <q>false</q>, ignored if <var>fork</var> is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">timeout</td>
-    <td valign="top">Stop the command if it doesn't finish within the
-    specified time (given in milliseconds).  <strong>It is highly
-    recommended to use this feature only if fork is enabled.</strong></td>
-    <td align="center" valign="top">No</td>
+    <td>timeout</td>
+    <td>Stop the command if it doesn't finish within the specified time (given in
+      milliseconds).  <strong>It is highly recommended to use this feature only if <var>fork</var>
+      is <q>true</q>.</strong></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">clonevm</td>
-    <td valign="top">If set to true, then all system properties
-      and the bootclasspath of the forked Java Virtual Machine will be
-      the same as those of the Java VM running Ant.  Default is
-      &quot;false&quot; (ignored if fork is disabled).
-      <em>since Ant 1.7</em></td>
-    <td align="center" valign="top">No</td>
+    <td>clonevm</td>
+    <td>If set to <q>true</q>, then all system properties and the <var>bootclasspath</var> of the
+      forked JVM will be the same as those of the JVM running Ant. <em>since Ant 1.7</em></td>
+    <td>No; default is <q>false</q>, ignored if <var>fork</var> is <q>false</q></td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 <h4>arg and jvmarg</h4>
-<p>Use nested <code>&lt;arg&gt;</code> and <code>&lt;jvmarg&gt;</code>
-elements to specify arguments for the Java class and the forked VM respectively.
-See <a href="../using.html#arg">Command line arguments</a>.</p>
+<p>Use nested <code>&lt;arg&gt;</code> and <code>&lt;jvmarg&gt;</code> elements to specify arguments
+for the Java class and the forked JVM respectively.  See <a href="../using.html#arg">Command line
+arguments</a>.</p>
 <h4>sysproperty</h4>
-<p>Use nested <code>&lt;sysproperty&gt;</code>
-elements to specify system properties required by the class.
-These properties will be made available to the VM during the execution
-of the class (either ANT's VM or the forked VM). The attributes
-for this element are the same as for <a href="exec.html#env">environment
-variables</a>.</p>
+<p>Use nested <code>&lt;sysproperty&gt;</code> elements to specify system properties required by the
+class.  These properties will be made available to JVM during the execution of the class (either
+Ant's JVM or the forked JVM). The attributes for this element are the same as
+for <a href="exec.html#env">environment variables</a>.</p>
 
 <h4>syspropertyset</h4>
 
+<p><em>Since Ant 1.6</em>.</p>
+
 <p>You can specify a set of properties to be used as system properties
 with <a href="../Types/propertyset.html">syspropertyset</a>s.</p>
 
-<p><em>since Ant 1.6</em>.</p>
-
 <h4>classpath</h4>
-<p><code>Java</code>'s <i>classpath</i> attribute is a <a
-href="../using.html#path">PATH like structure</a> and can also be set via a nested
-<i>classpath</i> element.</p>
+<p><code>Java</code>'s <var>classpath</var> attribute is a <a href="../using.html#path">path-like
+structure</a> and can also be set via a nested <code>classpath</code> element.</p>
 
 <h4>bootclasspath</h4>
 
-<p>The location of bootstrap class files can be specified using this
-<a href="../using.html#path">PATH like structure</a> - will be ignored
-if <i>fork</i> is not <code>true</code> or the target VM doesn't
-support it (i.e. Java 1.1).</p>
+<p><em>Since Ant 1.6</em>.</p>
 
-<p><em>since Ant 1.6</em>.</p>
+<p>The location of bootstrap class files can be specified using
+this <a href="../using.html#path">path-like structure</a>&mdash;will be ignored if <var>fork</var>
+is not <q>true</q> or the target JVM doesn't support it (i.e. Java 1.1).</p>
 
 <h4>env</h4>
-<p>It is possible to specify environment variables to pass to the
-forked VM via nested <i>env</i> elements. See the description in the
-section about <a href="exec.html#env">exec</a></p>
-<p>Settings will be ignored if fork is disabled.</p>
+<p>It is possible to specify environment variables to pass to the forked JVM via
+nested <code>env</code> elements. See the description in the section
+about <a href="exec.html#env">exec</a></p>
+<p>Settings will be ignored if <var>fork</var> is <q>false</q>.</p>
 
 <h4>permissions</h4>
-<p>Security permissions can be revoked and granted during the execution of the
-class via a nested <i>permissions</i> element. For more information please
-see <a href="../Types/permissions.html">permissions</a></p>
-<p>When the permission RuntimePermission exitVM has not been granted (or has
-been revoked) the System.exit() call will be intercepted
-and treated like indicated in <i>failonerror</i>.</p>
-<p>Note:<br>
-If you do not specify permissions,
-a set of default permissions will be added to your Java invocation to make
-sure that the ant run will continue or terminated as indicated by
-<i>failonerror</i>. All permissions not granted per default will be
-checked by whatever security manager was already in place. exitVM will be
-disallowed.
-</p>
-<p>Settings will be ignored if fork is enabled.</p>
 
-<p><em>since Ant 1.6</em>.</p>
+<p><em>Since Ant 1.6</em>.</p>
 
-<h4>assertions</h4>
+<p>Security permissions can be revoked and granted during the execution of the class via a
+nested <code>permissions</code> element. For more information please
+see <a href="../Types/permissions.html">permissions</a>.</p>
+<p>When the permission <code>RuntimePermission exitVM</code> has not been granted (or has been
+revoked) the <code>System.exit()</code> call will be intercepted and treated like indicated
+in <var>failonerror</var>.</p>
+<p><strong>Note</strong>:<br/> If you do not specify permissions, a set of default permissions will
+be added to your Java invocation to make sure that the Ant run will continue or terminated as
+indicated by <var>failonerror</var>. All permissions not granted per default will be checked by
+whatever security manager was already in place. <code>exitVM</code> will be disallowed.</p>
+<p>Settings will be ignored if <var>fork</var> is <q>true</q>.</p>
 
-<p>You can control enablement of Java 1.4 assertions with an
-<a href="../Types/assertions.html"><tt>&lt;assertions&gt;</tt></a>
-subelement.</p>
+<h4>assertions</h4>
 
-<p>Assertion statements are currently ignored in non-forked mode.</p>
+<p><em>Since Ant 1.6</em>.</p>
 
-<p><em>since Ant 1.6.</em></p>
+<p>You can control enablement of Java 1.4 assertions with
+an <a href="../Types/assertions.html"><code>&lt;assertions&gt;</code></a> subelement.</p>
 
-<a name="redirector"><h4>redirector</h4></a>
-<i><b>Since Ant 1.6.2</b></i>
-<p>A nested <a href="../Types/redirector.html">I/O Redirector</a>
-can be specified.  In general, the attributes of the redirector behave
-as the corresponding attributes available at the task level.  The most
-notable peculiarity stems from the retention of the <code>&lt;java&gt;</code>
-attributes for backwards compatibility.  Any file mapping is done
-using a <CODE>null</CODE> sourcefile; therefore not all
-<a href="../Types/mapper.html">Mapper</a> types will return
-results.  When no results are returned, redirection specifications
-will fall back to the task level attributes.  In practice this means that
-defaults can be specified for input, output, and error output files.
-</p>
-<a name="failonerror"><h3>Errors and return codes</h3></a>
-By default the return code of a <code>&lt;java&gt;</code> is ignored.
-Alternatively, you can set <code>resultproperty</code> to the name
-of a property and have it assigned to the result code (barring immutability,
-of course).
-When you set <code>failonerror="true"</code>, the only possible value for
-<code>resultproperty</code> is 0. Any non-zero response is treated as an
-error and would mean the build exits.
-<p> Similarly, if <code>failonerror="false"</code> and <code>fork="false"</code>
-, then <code>&lt;java&gt;</code> <b>must</b> return 0 otherwise the build will
-exit, as the class was run by the build JVM.</p>
-
-<a name="modulepath"><h4>modulepath</h4>
-<i><b>Since Ant 1.9.7</b></i>
-<p><code>Java</code>'s <i>modulepath</i> attribute is a <a
-href="../using.html#path">PATH like structure</a> and can also be set via a nested
-<i>modulepath</i> element.</p>
-
-<a name="upgrademodulepath"><h4>upgrademodulepath</h4>
-<i><b>Since Ant 1.9.7</b></i>
-<p>The location of modules that replace upgradeable modules in the runtime image
-can be specified using this <a href="../using.html#path">PATH like structure</a>.</p>
-
-
-<h3>JAR file execution</h3>
-
-<p>The parameter of the <tt>jar</tt> attribute is of type <tt>File</tt>;
-that is, the parameter is resolved to an absolute file relative to the
-base directory of the project, <i>not</i> the directory in which the Java
-task is run. If you need to locate a JAR file relative to the directory
-the task will be run in, you need to explicitly create the full path
-to the JAR file.</p>
-<p>When using the <tt>jar</tt> attribute, all classpath settings are 
-ignored according to <a href="http://docs.oracle.com/javase/7/docs/technotes/tools/windows/java.html">Oracle's
-specification</a>. 
+<p>Assertion statements are currently ignored in non-forked mode.</p>
 
+<h4 id="redirector">redirector</h4>
+<em>Since Ant 1.6.2</em>
+<p>A nested <a href="../Types/redirector.html">I/O Redirector</a> can be specified.  In general, the
+attributes of the redirector behave as the corresponding attributes available at the task level.
+The most notable peculiarity stems from the retention of the <code>&lt;java&gt;</code> attributes
+for backwards compatibility.  Any file mapping is done using a <code>null</code> sourcefile;
+therefore not all <a href="../Types/mapper.html">Mapper</a> types will return results.  When no
+results are returned, redirection specifications will fall back to the task level attributes.  In
+practice this means that defaults can be specified for <var>input</var>, <var>output</var>,
+and <var>error</var> output files.</p>
+<h3 id="failonerror">Errors and return codes</h3>
+<p>By default, the return code of a <code>&lt;java&gt;</code> is ignored.  Alternatively, you can
+set <var>resultproperty</var> to the name of a property and have it assigned to the result code
+(barring immutability, of course).  When you set <var>failonerror</var>=<q>true</q>, the only
+possible value for <var>resultproperty</var> is <q>0</q>. Any non-zero response is treated as an
+error and would mean the build exits.</p>
+<p>Similarly, if <var>failonerror</var>=<q>false</q> and <var>fork</var>=<q>false</q>,
+then <code>&lt;java&gt;</code> <em>must</em> return <q>0</q> otherwise the build will exit, as the
+class was run by the build JVM.</p>
+
+<h4 id="modulepath">modulepath</h4>
+<em>Since Ant 1.9.7</em>
+<p><code>Java</code>'s <var>modulepath</var> attribute is a <a href="../using.html#path">path-like
+structure</a> and can also be set via a nested <code>modulepath</code> element.</p>
+
+<h4 id="upgrademodulepath">upgrademodulepath</h4>
+<em>Since Ant 1.9.7</em>
+<p>The location of modules that replace upgradeable modules in the runtime image can be specified
+using this <a href="../using.html#path">path-like structure</a>.</p>
+
+<h3 id="jar-execute">JAR file execution</h3>
+
+<p>The parameter of the <var>jar</var> attribute is of type <code>File</code>; that is, the
+parameter is resolved to an absolute file relative to the base directory of the
+project, <em>not</em> the directory in which the Java task is run. If you need to locate a JAR file
+relative to the directory the task will be run in, you need to explicitly create the full path to
+the JAR file.</p>
+<p>When using the <var>jar</var> attribute, all classpath settings are ignored according
+to <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/java.html"
+target="_top">Oracle's specification</a>.
 
 <h3>Examples</h3>
 <pre>
-       &lt;java classname=&quot;test.Main&quot;&gt;
-         &lt;arg value=&quot;-h&quot;/&gt;
-         &lt;classpath&gt;
-           &lt;pathelement location=&quot;dist/test.jar&quot;/&gt;
-           &lt;pathelement path=&quot;${java.class.path}&quot;/&gt;
-         &lt;/classpath&gt;
-       &lt;/java&gt;
-</pre>
+&lt;java classname=&quot;test.Main&quot;&gt;
+  &lt;arg value=&quot;-h&quot;/&gt;
+  &lt;classpath&gt;
+    &lt;pathelement location=&quot;dist/test.jar&quot;/&gt;
+    &lt;pathelement path=&quot;${java.class.path}&quot;/&gt;
+  &lt;/classpath&gt;
+&lt;/java&gt;</pre>
 Run a class in this JVM with a new jar on the classpath
 
 <pre>
-       &lt;java jar=&quot;dist/test.jar&quot;
-           fork="true"
-           failonerror="true"
-           maxmemory="128m"
-           &gt;
-         &lt;arg value=&quot;-h&quot;/&gt;
-         &lt;classpath&gt;
-           &lt;pathelement location=&quot;dist/test.jar&quot;/&gt;
-           &lt;pathelement path=&quot;${java.class.path}&quot;/&gt;
-         &lt;/classpath&gt;
-       &lt;/java&gt;
-</pre>
-Run the JAR test.jar in this project's dist/lib directory.
-using the manifest supplied entry point, forking (as required),
-and with a maximum memory of 128MB. Any non zero return code breaks the build.
+&lt;java jar=&quot;dist/test.jar&quot;
+      fork="true"
+      failonerror="true"
+      maxmemory="128m"&gt;
+  &lt;arg value=&quot;-h&quot;/&gt;
+  &lt;classpath&gt;
+    &lt;pathelement location=&quot;dist/test.jar&quot;/&gt;
+    &lt;pathelement path=&quot;${java.class.path}&quot;/&gt;
+  &lt;/classpath&gt;
+&lt;/java&gt;</pre>
+<p>Run the JAR <samp>test.jar</samp> in this project's <samp>dist/lib</samp> directory.  using the
+manifest supplied entry point, forking (as required), and with a maximum memory of 128 MB. Any non
+zero return code breaks the build.</p>
 
 <pre>
-       &lt;java
-           dir="${exec.dir}"
-           jar=&quot;${exec.dir}/dist/test.jar&quot;
-           fork="true"
-           failonerror="true"
-           maxmemory="128m"
-           &gt;
-         &lt;arg value=&quot;-h&quot;/&gt;
-         &lt;classpath&gt;
-           &lt;pathelement location=&quot;dist/test.jar&quot;/&gt;
-           &lt;pathelement path=&quot;${java.class.path}&quot;/&gt;
-         &lt;/classpath&gt;
-       &lt;/java&gt;
-</pre>
-Run the JAR dist/test.jar relative to the directory
-<tt>${exec.dir}</tt>, this being the same directory into which the JVM
-is to start up.
+&lt;java dir=&quot;${exec.dir}&quot;
+      jar=&quot;${exec.dir}/dist/test.jar&quot;
+      fork=&quot;true&quot;
+      failonerror=&quot;true&quot;
+      maxmemory=&quot;128m&quot;&gt;
+  &lt;arg value=&quot;-h&quot;/&gt;
+  &lt;classpath&gt;
+    &lt;pathelement location=&quot;dist/test.jar&quot;/&gt;
+    &lt;pathelement path=&quot;${java.class.path}&quot;/&gt;
+  &lt;/classpath&gt;
+&lt;/java&gt;</pre>
+<p>Run the JAR <samp>dist/test.jar</samp> relative to the directory <code>${exec.dir}</code>, this
+being the same directory in which JVM is to start up.</p>
 
-<pre>  &lt;java classname=&quot;test.Main&quot;/&gt;</pre>
-Runs a given class with the current classpath.
+<pre>&lt;java classname=&quot;test.Main&quot;/&gt;</pre>
+<p>Runs a given class with the current classpath.</p>
 
 <pre>
-  &lt;java classname=&quot;test.Main&quot;
-        fork=&quot;yes&quot; &gt;
-    &lt;sysproperty key=&quot;DEBUG&quot; value=&quot;true&quot;/&gt;
-    &lt;arg value=&quot;-h&quot;/&gt;
-    &lt;jvmarg value=&quot;-Xrunhprof:cpu=samples,file=log.txt,depth=3&quot;/&gt;
-  &lt;/java&gt;
-</pre>
-Add system properties and JVM-properties to the JVM as in
-<code>java ="-Xrunhprof:cpu=samples,file=log.txt,depth=3 -DDEBUG=true test.Main</code>
-
-<pre>  &lt;java classname=&quot;ShowJavaVersion&quot; classpath=&quot;.&quot;
-        jvm=&quot;path-to-java14-home/bin/java&quot; fork=&quot;true&quot;
-        taskname=&quot;java1.4&quot; &gt;
-</pre>
-Use a given Java implementation (another the one Ant is currently using) to run the class.
-For documentation in the log <code>taskname</code> is used to change the <code>[java]</code>
-log-prefix to <code>[java1.4]</code>.
+&lt;java classname=&quot;test.Main&quot;
+      fork=&quot;yes&quot; &gt;
+  &lt;sysproperty key=&quot;DEBUG&quot; value=&quot;true&quot;/&gt;
+  &lt;arg value=&quot;-h&quot;/&gt;
+  &lt;jvmarg value=&quot;-Xrunhprof:cpu=samples,file=log.txt,depth=3&quot;/&gt;
+&lt;/java&gt;</pre>
+<p>Add system properties and JVM properties to JVM as in <code>java
+-Xrunhprof:cpu=samples,file=log.txt,depth=3 -DDEBUG=true test.Main</code>
 
+<pre>
+&lt;java classname=&quot;ShowJavaVersion&quot; classpath=&quot;.&quot;
+      jvm=&quot;path-to-java14-home/bin/java&quot; fork=&quot;true&quot;
+      taskname=&quot;java1.4&quot;/&gt;</pre>
+<p>Use a given Java implementation (other than the one Ant is currently using) to run the class.
+For documentation in the log <var>taskname</var> is used to change the <q>[java]</q> log-prefix
+to <q>[java1.4]</q>.</p>
 
-<p><strong>Note</strong>: you can not specify the (highly deprecated) MSJVM, "jview.exe" as the
-JVM, as it takes different parameters for other JVMs,
+<p><strong>Note</strong>: you can not specify the (highly deprecated) MS
+JVM, <samp>jview.exe</samp>, as <var>jvm</var>, since it takes different parameters than other JVMs.
 That JVM can be started from <code>&lt;exec&gt;</code> if required.</p>
 
 <pre>
-       &lt;java
-           fork=&quot;true&quot;
-           failonerror=&quot;true&quot;
-           maxmemory=&quot;128m&quot;
-           module=&quot;TestModule&quot;
-           modulepath=&quot;lib:dist/test.jar&quot;/&gt;
-</pre>
-Runs the module TestModule resolved on the modulepath <tt>lib/:dist/test.jar</tt>
-with a maximum memory of 128MB. Any non zero return code breaks the build.
+&lt;java fork=&quot;true&quot;
+      failonerror=&quot;true&quot;
+      maxmemory=&quot;128m&quot;
+      module=&quot;TestModule&quot;
+      modulepath=&quot;lib:dist/test.jar&quot;/&gt;</pre>
+<p>Runs the module <samp>TestModule</samp> resolved on the
+modulepath <samp>lib/:dist/test.jar</samp> with a maximum memory of 128 MB. Any non zero return code
+breaks the build.</p>
 
 <pre>
-       &lt;java
-           fork=&quot;true&quot;
-           failonerror=&quot;true&quot;
-           maxmemory=&quot;128m&quot;
-           module=&quot;TestModule&quot;
-           classname=&quot;Main&quot;&gt;
-         &lt;modulepath&gt;
-           &lt;pathelement location=&quot;lib&quot;/&gt;
-           &lt;pathelement location=&quot;dist/test.jar&quot;/&gt;
-         &lt;/modulepath&gt;
-       &lt;/java&gt;
-</pre>
-Runs the class Main in module TestModule resolved on the modulepath <tt>lib/:dist/test.jar</tt>
-with a maximum memory of 128MB. Any non zero return code breaks the build.
+&lt;java fork=&quot;true&quot;
+      failonerror=&quot;true&quot;
+      maxmemory=&quot;128m&quot;
+      module=&quot;TestModule&quot;
+      classname=&quot;Main&quot;&gt;
+  &lt;modulepath&gt;
+    &lt;pathelement location=&quot;lib&quot;/&gt;
+    &lt;pathelement location=&quot;dist/test.jar&quot;/&gt;
+  &lt;/modulepath&gt;
+&lt;/java&gt;</pre>
+<p>Runs the class <samp>Main</samp> in module <samp>TestModule</samp> resolved on the
+modulepath <samp>lib/:dist/test.jar</samp> with a maximum memory of 128 MB. Any non zero return code
+breaks the build.</p>
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/jdepend.html ant-1.10.3/manual/Tasks/jdepend.html
--- ant-1.9.10/manual/Tasks/jdepend.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/jdepend.html	2018-03-24 12:37:12.000000000 +0000
@@ -14,164 +14,147 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-
 <html>
 <head>
    <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
-<title>JDepend Task</title>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <title>JDepend Task</title>
    <meta http-equiv="Content-Language" content="en-us">
 </head>
 
 <body>
 
-<h2><a NAME="JDepend"></a>JDepend</h2>
+<h2 id="jdepend">JDepend</h2>
 
 <h3>Description</h3>
 
-<P>Invokes the <a href="http://www.clarkware.com/software/JDepend.html">JDepend</a> parser.</P>
-
-<P>This parser &quot;traverses a set of Java source file directories and generates design quality metrics for each Java package&quot;.
-It allows to &quot;automatically measure the quality of a design in terms of its extensibility, reusability, and maintainability to
-effectively manage and control package dependencies.&quot;</P>
+<p>Invokes the <a href="http://www.clarkware.com/software/JDepend.html" target="_top">JDepend</a>
+parser.</p>
 
-<p>Source file directories are defined by nested
-<code>&lt;sourcespath&gt;</code>; Class file directories are defined
-by nested <code>&lt;classesespath&gt;</code>, see <a
-href="#nested">nested elements</a>.</p>
+<p>This parser &quot;traverses a set of Java source file directories and generates design quality
+metrics for each Java package&quot;.  It allows to &quot;automatically measure the quality of a
+design in terms of its extensibility, reusability, and maintainability to effectively manage and
+control package dependencies.&quot;</p>
+
+<p>Source file directories are defined by nested <code>&lt;sourcespath&gt;</code>. Class file
+directories are defined by nested <code>&lt;classespath&gt;</code>. See <a href="#nested">nested
+elements</a>.</p>
 
-<p>Optionally, you can also set the <code>outputfile</code> name where the output is stored. By default the task writes its report to the standard output.</P>
+<p>Optionally, you can also set the <var>outputfile</var> name where the output is stored. By
+default the task writes its report to the standard output.</p>
 
-<p> The task requires at least the JDepend 1.2 version. </p>
+<p>The task requires at least the JDepend 1.2 version.</p>
 
 <h3>Parameters</h3>
 
-<table BORDER=1 CELLSPACING=0 CELLPADDING=2 >
+<table class="attr">
   <tr>
-    <td VALIGN=TOP><b>Attribute</b></td>
-    <td VALIGN=TOP><b>Description</b></td>
-    <td ALIGN=CENTER VALIGN=TOP><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td VALIGN=TOP>outputfile</td>
-    <td VALIGN=TOP>The output file name. If not set, the output is printed on the standard output.</td>
-    <td ALIGN=CENTER VALIGN=TOP>No</td>
+    <td>outputfile</td>
+    <td>The output file name. If not set, the output is printed on the standard output.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td VALIGN=TOP>format</td>
-    <td VALIGN=TOP>The format to write the output in. The default is "text", the alternative is "xml"</td>
-    <td ALIGN=CENTER VALIGN=TOP>No</td>
+    <td>format</td>
+    <td>The format to write the output in,
+    either <q>text</q> (default) or <q>xml</q></td>
+    <td>No; the default is <q>text</q></td>
   </tr>
   <tr>
-    <td VALIGN=TOP>fork</td>
-    <td VALIGN=TOP>Run the tests in a separate VM.</td>
-    <td ALIGN=CENTER VALIGN=TOP>No, default is "off"</td>
+    <td>fork</td>
+    <td>Run the tests in a separate JVM.</td>
+    <td>No; default is <q>off</q></td>
   </tr>
   <tr>
-    <td VALIGN=TOP>haltonerror</td>
-    <td VALIGN=TOP>Stop the build process if an error occurs during the jdepend analysis.</td>
-    <td ALIGN=CENTER VALIGN=TOP>No, default is "off"</td>
+    <td>haltonerror</td>
+      <td>Stop the build process if an error occurs during the <code>jdepend</code> analysis.</td>
+    <td>No; default is <q>off</q></td>
   </tr>
   <tr>
-    <td VALIGN=TOP>timeout</td>
-    <td VALIGN=TOP>Cancel the operation if it doesn't finish in the given time (measured in milliseconds). (Ignored if fork is disabled.)</td>
-    <td ALIGN=CENTER VALIGN=TOP>No</td>
+    <td>timeout</td>
+    <td>Cancel the operation if it doesn't finish in the given time (measured in milliseconds).</td>
+    <td>No, ignored if <var>fork</var> is <q>false</q></td>
   </tr>
   <tr>
-    <td VALIGN=TOP>jvm</td>
-    <td VALIGN=TOP>The command used to invoke the Java Virtual Machine, default is 'java'. The command is resolved by java.lang.Runtime.exec(). (Ignored if fork is disabled.)</td>
-    <td ALIGN=CENTER VALIGN=TOP>No, default "java"</td>
+    <td>jvm</td>
+    <td>The command used to invoke JVM. The command is resolved
+      by <code>java.lang.Runtime.exec()</code>.</td>
+    <td>No; default <kbd>java</kbd>, ignored if <var>fork</var> is <q>false</q></td>
   </tr>
   <tr>
-    <td VALIGN=TOP>dir</td>
-    <td VALIGN=TOP>The directory to invoke the VM in. (Ignored if fork is disabled)</td>
-    <td ALIGN=CENTER VALIGN=TOP>No</td>
+    <td>dir</td>
+    <td>The directory to invoke JVM in.</td>
+    <td>No, ignored if <var>fork</var> is <q>false</q></td>
   </tr>
   <tr>
-    <td VALIGN=TOP>includeruntime</td>
-    <td VALIGN=TOP>Implicitly add the classes required to run jdepend
-    in forked mode. (Ignored if fork is disabled). Since Apache Ant 1.6.</td>
-    <td ALIGN=CENTER VALIGN=TOP>No, default is "no".</td>
+    <td>includeruntime</td>
+    <td>Implicitly add the classes required to run <code>jdepend</code> in forked mode. <em>Since
+      Apache Ant 1.6</em>.</td>
+    <td>No; default is <q>no</q>, ignored if <var>fork</var> is <q>false</q></td>
   </tr>
   <tr>
-    <td VALIGN=TOP>classpathref</td>
-    <td VALIGN=TOP>the classpath to use, given as reference to a PATH defined elsewhere.</td>
-    <td ALIGN=CENTER VALIGN=TOP>No</td>
+    <td>classpathref</td>
+    <td>the <var>classpath</var> to use, given as reference to a path defined elsewhere.</td>
+    <td>No</td>
   </tr>
 </table>
 
-<h3><a name="nested">Nested Elements</a></h3>
+<h3 id="nested">Parameters specified as nested elements</h3>
 
-<p><code>jdepend</code> supports four nested elements:
-<code>&lt;classpath&gt;, &lt;classespath&gt; </code> and
-<code>&lt;sourcespath&gt;</code>, that represent <a
-href="../using.html#path">PATH like structures</a>, and
-<code>&lt;exclude&gt;</code>.</p>
-
-<p><code>&lt;sourcespath&gt;</code> is used to define the paths of the
-source code to analyze, but it is deprecated. With version 2.5 of
-JDepend, only class files are analyzed. The nested element
-<code>&lt;classespath&gt;</code> replaces <code>&lt;sourcespath&gt;</code> and is used to define
-the paths of compiled class code to analyze; the <code>&lt;sourcespath&gt;</code>
-variable is still available in case you are using an earlier version
-of JDepend.  The <code>&lt;exclude&gt;</code> element can be used to set packages
-to ignore (requires JDepend 2.5 or above).</p>
+<p><code>jdepend</code> supports four nested
+elements: <code>&lt;classpath&gt;</code>, <code>&lt;classespath&gt;</code>
+and <code>&lt;sourcespath&gt;</code>, that represent <a href="../using.html#path">path-like
+structures</a>, and <code>&lt;exclude&gt;</code>.</p>
+
+<p><code>&lt;sourcespath&gt;</code> is used to define the paths of the source code to analyze, but
+it is deprecated. With version 2.5 of JDepend, only class files are analyzed. The nested
+element <code>&lt;classespath&gt;</code> replaces <code>&lt;sourcespath&gt;</code> and is used to
+define the paths of compiled class code to analyze; the <code>&lt;sourcespath&gt;</code> variable is
+still available in case you are using an earlier version of JDepend.
+The <code>&lt;exclude&gt;</code> element can be used to set packages to ignore (requires JDepend 2.5
+or above).</p>
 
 <h3>Examples</h3>
 
-<blockquote>
 <pre>
 &lt;jdepend classpathref="base.path"&gt;
-&nbsp;&nbsp;&nbsp; &lt;classespath&gt;
-&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &lt;pathelement location="build"/&gt;
-&nbsp;&nbsp;&nbsp; &lt;/classespath&gt;
-&lt;/jdepend&gt;
-
-</pre>
-</blockquote>
-
-<p>This invokes JDepend on the <code>build</code> directory, writing
-the output on the standard output. The classpath is defined using a
-classpath reference.</p>
+    &lt;classespath&gt;
+        &lt;pathelement location="build"/&gt;
+    &lt;/classespath&gt;
+&lt;/jdepend&gt;</pre>
+
+<p>This invokes JDepend on the <samp>build</samp> directory, writing the output on the standard
+output. The classpath is defined using a classpath reference.</p>
 
-<blockquote>
 <pre>
 &lt;jdepend outputfile="docs/jdepend.xml" fork="yes" format="xml"&gt;
-&nbsp;&nbsp;&nbsp; &lt;sourcespath&gt;
-&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &lt;pathelement location="src"/&gt;
-&nbsp;&nbsp;&nbsp; &lt;/sourcespath&gt;
-&nbsp;&nbsp;&nbsp; &lt;classpath&gt;
-&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &lt;pathelement location="classes"/&gt;
-&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &lt;pathelement location="lib/jdepend.jar"/&gt;
-&nbsp;&nbsp;&nbsp; &lt;/classpath&gt;
-&lt;/jdepend&gt;
-</pre>
-</blockquote>
-
-<p>This invokes JDepend in a separate VM on the <code>src</code> and
-<code>testsrc</code> directories, writing the output to the
-<code>&lt;docs/jdepend.xml&gt;</code> file in xml format. The
-classpath is defined using nested elements. </p>
+    &lt;sourcespath&gt;
+        &lt;pathelement location="src"/&gt;
+    &lt;/sourcespath&gt;
+    &lt;classpath&gt;
+        &lt;pathelement location="classes"/&gt;
+        &lt;pathelement location="lib/jdepend.jar"/&gt;
+    &lt;/classpath&gt;
+&lt;/jdepend&gt;</pre>
+
+<p>This invokes JDepend in a separate JVM on the <samp>src</samp> and <samp>testsrc</samp>
+directories, writing the output to the <samp>docs/jdepend.xml</samp> file in xml format. The
+classpath is defined using nested elements.</p>
 
-<blockquote>
 <pre>
 &lt;jdepend classpathref="base.path"&gt;
-&nbsp;&nbsp;&nbsp; &lt;exclude name="java.*&gt;
-&nbsp;&nbsp;&nbsp; &lt;exclude name="javax.*&gt;
-&nbsp;&nbsp;&nbsp; &lt;classespath&gt;
-&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &lt;pathelement location="build"/&gt;
-&nbsp;&nbsp;&nbsp; &lt;/classespath&gt;
-&lt;/jdepend&gt;
-</pre>
-</blockquote>
-
-<p>This invokes JDepend with the build directory as the base for class
-files to analyze, and will ignore all classes in the java.* and
-javax.* packages.</p>
+    &lt;exclude name="java.*&gt;
+    &lt;exclude name="javax.*&gt;
+    &lt;classespath&gt;
+        &lt;pathelement location="build"/&gt;
+    &lt;/classespath&gt;
+&lt;/jdepend&gt;</pre>
 
+<p>This invokes JDepend with the build directory as the base for class files to analyze, and will
+ignore all classes in the <samp>java.*</samp> and <samp>javax.*</samp> packages.</p>
 
 </body>
 </html>
-
-
diff -Nru ant-1.9.10/manual/Tasks/jjdoc.html ant-1.10.3/manual/Tasks/jjdoc.html
--- ant-1.9.10/manual/Tasks/jjdoc.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/jjdoc.html	2018-03-24 12:37:12.000000000 +0000
@@ -14,110 +14,86 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
 <html>
 <head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
    <meta http-equiv="Content-Language" content="en-us">
    <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
 <title>JJDoc Task</title>
 </head>
 <body>
 
-<h2>
-<a NAME="jjtree"></a>JJDoc</h2>
+<h2 id="jjtree">JJDoc</h2>
 <p><em>Since Apache Ant 1.6</em></p>
 <h3>Description</h3>
 
-<p>Invokes the <a href="http://javacc.dev.java.net/">JJDoc</a> preprocessor
-for the JavaCC compiler compiler. It takes a JavaCC parser specification
-and produces documentation for the BNF grammar.
-It can operate in three modes, determined by command line options.
-<p>To use the jjdoc task, set the <i>target</i> attribute to the name
-of the JavaCC grammar file to process. You also need to specify the directory
-containing the JavaCC installation using the <i>javacchome</i> attribute,
-so that ant can find the JavaCC classes. Optionally, you can also set the
-<i>outputfile</i> to write the generated BNF documentation file to a specific (directory and) file.
-Otherwise jjdoc writes the generated BNF documentation file as the JavaCC
-grammar file with a suffix .txt or .html.</p>
-<p>This task only invokes JJDoc if the grammar file is newer than the
-generated BNF documentation file.</p>
+<p>Invokes the <a href="https://javacc.org/" target="_top">JJDoc</a> preprocessor for the JavaCC
+compiler compiler. It takes a JavaCC parser specification and produces documentation for the BNF
+grammar.  It can operate in three modes, determined by command line options.
+<p>To use the <code>jjdoc</code> task, set the <var>target</var> attribute to the name of the JavaCC
+grammar file to process. You also need to specify the directory containing the JavaCC installation
+using the <var>javacchome</var> attribute, so that Ant can find the JavaCC classes. Optionally, you
+can also set the <var>outputfile</var> to write the generated BNF documentation file to a specific
+(directory and) file.  Otherwise <code>jjdoc</code> writes the generated BNF documentation file as
+the JavaCC grammar file with a suffix <samp>.txt</samp> or <samp>.html</samp>.</p>
+<p>This task only invokes <code>JJDoc</code> if the grammar file is newer than the generated BNF
+documentation file.</p>
 
 <h3>Parameters</h3>
 
-<table BORDER CELLSPACING=0 CELLPADDING=2 >
+<table class="attr">
 <tr>
-<td VALIGN=TOP><b>Attribute</b></td>
-
-<td VALIGN=TOP><b>Description</b></td>
-
-<td ALIGN=CENTER VALIGN=TOP><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
 </tr>
 
 <tr>
-<td VALIGN=TOP>target</td>
-
-<td VALIGN=TOP>The javacc grammar file to process.</td>
-
-<td ALIGN=CENTER VALIGN=TOP>Yes</td>
+    <td>target</td>
+    <td>The JavaCC grammar file to process.</td>
+    <td>Yes</td>
 </tr>
 
 <tr>
-<td VALIGN=TOP>javacchome</td>
-
-<td VALIGN=TOP>The directory containing the JavaCC distribution.</td>
-
-<td ALIGN=CENTER VALIGN=TOP>Yes</td>
+    <td>javacchome</td>
+    <td>The directory containing the JavaCC distribution.</td>
+    <td>Yes</td>
 </tr>
 
 <tr>
-<td VALIGN=TOP>outputfile</td>
-
-<td VALIGN=TOP>The file to write the generated BNF documentation file to. If not set,
-the file is written with the same name as the JavaCC grammar file but with a the suffix .html or .txt.&nbsp;</td>
-
-<td ALIGN=CENTER VALIGN=TOP>No</td>
+    <td>outputfile</td>
+    <td>The file to write the generated BNF documentation file to. If not set, the file is written
+      with the same name as the JavaCC grammar file but with a the suffix <samp>.html</samp>
+      or <samp>.txt</samp></td>
+    <td>No</td>
 </tr>
 
 <tr>
-<td VALIGN=TOP>text</td>
-
-<td VALIGN=TOP>Sets the TEXT BNF documentation option. This is a boolean
-option.</td>
-
-<td ALIGN=CENTER VALIGN=TOP>No</td>
+    <td>text</td>
+    <td>Sets the TEXT BNF documentation option. This is a boolean option.</td>
+    <td>No</td>
 </tr>
 
 <tr>
-<td VALIGN=TOP>onetable</td>
-
-<td VALIGN=TOP>Sets the ONE_TABLE BNF documentation option. This is a boolean option.</td>
-
-<td ALIGN=CENTER VALIGN=TOP>No</td>
+    <td>onetable</td>
+    <td>Sets the ONE_TABLE BNF documentation option. This is a boolean option.</td>
+    <td>No</td>
 </tr>
-
-  <tr>
-    <td valign="top">maxmemory</td>
-    <td valign="top">Max amount of memory to allocate to the forked
-      VM.  <em>since Ant 1.8.3</em></td>
-    <td align="center" valign="top">No</td>
+<tr>
+    <td>maxmemory</td>
+    <td>Max amount of memory to allocate to the forked JVM.  <em>since Ant 1.8.3</em></td>
+    <td>No</td>
   </tr>
 </table>
 
-<h3>
-Example</h3>
+<h3>Example</h3>
 
-<blockquote>
-<pre>&lt;jjdoc&nbsp;
-&nbsp;&nbsp;&nbsp; target="src/Parser.jj"&nbsp;
-&nbsp;&nbsp;&nbsp; outputfile="doc/ParserBNF.html"
-&nbsp;&nbsp;&nbsp; javacchome="c:/program files/JavaCC"&nbsp;
-/&gt;</pre>
-</blockquote>
-This invokes JJDoc on grammar file src/Parser.jj, writing the generated
-BNF documentation file, ParserBNF.html, file to doc.
-<br>
+<pre>
+&lt;jjdoc target="src/Parser.jj"
+       outputfile="doc/ParserBNF.html"
+       javacchome="c:/program files/JavaCC"/&gt;</pre>
+
+<p>This invokes JJDoc on grammar file <samp>src/Parser.jj</samp>, writing the generated BNF
+documentation file, <samp>ParserBNF.html</samp>, to <samp>doc</samp>.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/jjtree.html ant-1.10.3/manual/Tasks/jjtree.html
--- ant-1.9.10/manual/Tasks/jjtree.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/jjtree.html	2018-03-24 12:37:12.000000000 +0000
@@ -14,213 +14,164 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
 <html>
 <head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
    <meta http-equiv="Content-Language" content="en-us">
    <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
 <title>JJTree Task</title>
 </head>
 <body>
 
-<h2>
-<a NAME="jjtree"></a>JJTree</h2>
+<h2 id="jjtree">JJTree</h2>
 
-<h3>
-Description</h3>
-<p>Invokes the <a href="http://javacc.dev.java.net/">JJTree</a> preprocessor
-for the JavaCC compiler compiler. It inserts parse tree building actions
-at various places in the JavaCC source that it generates. The output of
-JJTree is run through JavaCC to create the parser.
-<p>To use the jjtree task, set the <i>target</i> attribute to the name
-of the JJTree grammar file to process. You also need to specify the directory
-containing the JavaCC installation using the <i>javacchome</i> attribute,
-so that Ant can find the JavaCC classes. Optionally, you can also set the
-<i>outputdirectory</i>
-to write the generated JavaCC grammar and node files to a specific directory.
-Otherwise jjtree writes the generated JavaCC grammar and node files to the directory
-containing the JJTree grammar file. As an extra option, you can also set the
-<i>outputfile</i> to write the generated JavaCC grammar file to a specific (directory and) file.
-Otherwise jjtree writes the generated JavaCC grammar file as the JJTree
-grammar file with a suffix .jj.</p>
-<p>This task only invokes JJTree if the grammar file is newer than the
-generated JavaCC file.</p>
+<h3>Description</h3>
+<p>Invokes the <a href="https://javacc.org/" target="_top">JJTree</a> preprocessor for the JavaCC
+compiler compiler. It inserts parse tree building actions at various places in the JavaCC source
+that it generates. The output of JJTree is run through JavaCC to create the parser.</p>
+<p>To use the <code>jjtree</code> task, set the <var>target</var> attribute to the name of the
+JJTree grammar file to process. You also need to specify the directory containing the JavaCC
+installation using the <var>javacchome</var> attribute, so that Ant can find the JavaCC
+classes. Optionally, you can also set the <var>outputdirectory</var> to write the generated JavaCC
+grammar and node files to a specific directory.  Otherwise <code>jjtree</code> writes the generated
+JavaCC grammar and node files to the directory containing the JJTree grammar file. As an extra
+option, you can also set the <var>outputfile</var> to write the generated JavaCC grammar file to a
+specific (directory and) file.  Otherwise <code>jjtree</code> writes the generated JavaCC grammar
+file as the JJTree grammar file with a suffix <samp>.jj</samp>.</p>
+<p>This task only invokes JJTree if the grammar file is newer than the generated JavaCC file.</p>
 
 <h3>Parameters</h3>
 
-<table BORDER CELLSPACING=0 CELLPADDING=2 >
+<table class="attr">
 <tr>
-<td VALIGN=TOP><b>Attribute</b></td>
-
-<td VALIGN=TOP><b>Description</b></td>
-
-<td ALIGN=CENTER VALIGN=TOP><b>Required</b></td>
+  <th>Attribute</th>
+  <th>Description</th>
+  <th>Required</th>
 </tr>
 
 <tr>
-<td VALIGN=TOP>target</td>
-
-<td VALIGN=TOP>The jjtree grammar file to process.</td>
-
-<td ALIGN=CENTER VALIGN=TOP>Yes</td>
+  <td>target</td>
+  <td>The JJTree grammar file to process.</td>
+  <td>Yes</td>
 </tr>
 
 <tr>
-<td VALIGN=TOP>javacchome</td>
-
-<td VALIGN=TOP>The directory containing the JavaCC distribution.</td>
-
-<td ALIGN=CENTER VALIGN=TOP>Yes</td>
+  <td>javacchome</td>
+  <td>The directory containing the JavaCC distribution.</td>
+  <td>Yes</td>
 </tr>
 
 <tr>
-<td VALIGN=TOP>outputdirectory</td>
-
-<td VALIGN=TOP>The directory to write the generated JavaCC grammar and node files to.
-If not set, the files are written to the directory containing the grammar file.&nbsp;</td>
-
-<td ALIGN=CENTER VALIGN=TOP>No</td>
+  <td>outputdirectory</td>
+  <td>The directory to write the generated JavaCC grammar and node files to.  If not set, the files
+    are written to the directory containing the grammar file.</td>
+  <td>No</td>
 </tr>
 
 <tr>
-<td VALIGN=TOP>outputfile</td>
-
-<td VALIGN=TOP>The file to write the generated JavaCC grammar file
-to. If not set, the file is written with the same name as the JJTree
-grammar file but with a the suffix <code>.jj</code>.  This is a
-filename relative to <em>outputdirectory</em> if specified, the
-project's basedir.</td>
-
-<td ALIGN=CENTER VALIGN=TOP>No</td>
+  <td>outputfile</td>
+  <td>The file to write the generated JavaCC grammar file to. If not set, the file is written with
+    the same name as the JJTree grammar file but with a the suffix <code>.jj</code>.  This is a
+    filename relative to <var>outputdirectory</var> if specified, the project's basedir.</td>
+  <td>No</td>
 </tr>
 
 <tr>
-<td VALIGN=TOP>buildnodefiles</td>
-
-<td VALIGN=TOP>Sets the BUILD_NODE_FILES grammar option. This is a boolean
-option.</td>
-
-<td ALIGN=CENTER VALIGN=TOP>No</td>
+  <td>buildnodefiles</td>
+  <td>Sets the BUILD_NODE_FILES grammar option. This is a boolean option.</td>
+  <td>No</td>
 </tr>
 
 <tr>
-<td VALIGN=TOP>multi</td>
-
-<td VALIGN=TOP>Sets the MULTI grammar option. This is a boolean option.</td>
-
-<td ALIGN=CENTER VALIGN=TOP>No</td>
+  <td>multi</td>
+  <td>Sets the MULTI grammar option. This is a boolean option.</td>
+  <td>No</td>
 </tr>
 
 <tr>
-<td VALIGN=TOP>nodedefaultvoid</td>
-
-<td VALIGN=TOP>Sets the NODE_DEFAULT_VOID grammar option. This is a boolean
-option.</td>
-
-<td ALIGN=CENTER VALIGN=TOP>No</td>
+  <td>nodedefaultvoid</td>
+  <td>Sets the NODE_DEFAULT_VOID grammar option. This is a boolean option.</td>
+  <td>No</td>
 </tr>
 
 <tr>
-<td VALIGN=TOP>nodefactory</td>
-
-<td VALIGN=TOP>Sets the NODE_FACTORY grammar option. This is boolean option.</td>
-
-<td ALIGN=CENTER VALIGN=TOP>No</td>
+  <td>nodefactory</td>
+  <td>Sets the NODE_FACTORY grammar option. This is boolean option.</td>
+  <td>No</td>
 </tr>
 
 <tr>
-<td VALIGN=TOP>nodescopehook</td>
-
-<td VALIGN=TOP>Sets the NODE_SCOPE_HOOK grammar option. This is a boolean
-option.</td>
-
-<td ALIGN=CENTER VALIGN=TOP>No</td>
+  <td>nodescopehook</td>
+  <td>Sets the NODE_SCOPE_HOOK grammar option. This is a boolean option.</td>
+  <td>No</td>
 </tr>
 
 <tr>
-<td VALIGN=TOP>nodeusesparser</td>
-
-<td VALIGN=TOP>Sets the NODE_USES_PARSER grammar option. This is a boolean
-option.</td>
-
-<td ALIGN=CENTER VALIGN=TOP>No</td>
+  <td>nodeusesparser</td>
+  <td>Sets the NODE_USES_PARSER grammar option. This is a boolean option.</td>
+  <td>No</td>
 </tr>
 
 <tr>
-<td VALIGN=TOP>static</td>
-
-<td VALIGN=TOP>Sets the STATIC grammar option. This is a boolean option.</td>
-
-<td ALIGN=CENTER VALIGN=TOP>No</td>
+  <td>static</td>
+  <td>Sets the STATIC grammar option. This is a boolean option.</td>
+  <td>No</td>
 </tr>
 
 <tr>
-<td VALIGN=TOP>visitor</td>
-
-<td VALIGN=TOP>Sets the VISITOR grammar option. This is a boolean option.</td>
-
-<td ALIGN=CENTER VALIGN=TOP>No</td>
+  <td>visitor</td>
+  <td>Sets the VISITOR grammar option. This is a boolean option.</td>
+  <td>No</td>
 </tr>
 
 <tr>
-<td VALIGN=TOP>nodepackage</td>
-
-<td VALIGN=TOP>Sets the NODE_PACKAGE grammar option. This is a string option.</td>
-
-<td ALIGN=CENTER VALIGN=TOP>No</td>
+  <td>nodepackage</td>
+  <td>Sets the NODE_PACKAGE grammar option. This is a string option.</td>
+  <td>No</td>
 </tr>
 
 <tr>
-<td VALIGN=TOP>visitorexception</td>
-
-<td VALIGN=TOP>Sets the VISITOR_EXCEPTION grammar option. This is a string
-option.</td>
-
-<td ALIGN=CENTER VALIGN=TOP>No</td>
+  <td>visitorexception</td>
+  <td>Sets the VISITOR_EXCEPTION grammar option. This is a string option.</td>
+  <td>No</td>
 </tr>
 
 <tr>
-<td VALIGN=TOP>nodeprefix</td>
-
-<td VALIGN=TOP>Sets the NODE_PREFIX grammar option. This is a string option.</td>
-
-<td ALIGN=CENTER VALIGN=TOP>No</td>
+  <td>nodeprefix</td>
+  <td>Sets the NODE_PREFIX grammar option. This is a string option.</td>
+  <td>No</td>
 </tr>
 
   <tr>
-    <td valign="top">maxmemory</td>
-    <td valign="top">Max amount of memory to allocate to the forked
-      VM.  <em>since Ant 1.8.3</em></td>
-    <td align="center" valign="top">No</td>
+    <td>maxmemory</td>
+    <td>Max amount of memory to allocate to the forked JVM.  <em>since Ant 1.8.3</em></td>
+    <td>No</td>
   </tr>
 </table>
 
-<h3>
-Example</h3>
+<h3>Example</h3>
 
-<blockquote>
-<pre>&lt;jjtree&nbsp;
-&nbsp;&nbsp;&nbsp; target="src/Parser.jjt"&nbsp;
-&nbsp;&nbsp;&nbsp; outputdirectory="build/src"
-&nbsp;&nbsp;&nbsp; javacchome="c:/program files/JavaCC"&nbsp;
-&nbsp;&nbsp;&nbsp; nodeusesparser="true"
-/&gt;</pre>
-</blockquote>
-This invokes JJTree on grammar file src/Parser.jjt, writing the generated
-grammar file, Parser.jj, file to build/src. The grammar option NODE_USES_PARSER
-is set to true when invoking JJTree.
-<br>
-
-<h3>Comparison output locations between command line JJTree and different Ant taskdef versions</h3>
-
-<table cellpadding="3" border="1">
-<tr>
-  <td><b>Command Line JJTree options</b>
-    <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>and Generated Files</i> (working directory: <code>/tmp</code>)</td>
-  <td><b>Ant 1.5.3</b> versus command line</td>
-  <td><b>Ant 1.6</b> versus command line</td>
+<pre>
+&lt;jjtree target="src/Parser.jjt"
+        outputdirectory="build/src"
+        javacchome="c:/program files/JavaCC"
+        nodeusesparser="true"/&gt;</pre>
+
+<p>This invokes JJTree on grammar file <samp>src/Parser.jjt</samp>, writing the generated grammar
+file, <samp>Parser.jj</samp>, file to <samp>build/src</samp>. The grammar option NODE_USES_PARSER is
+set to <q>true</q> when invoking JJTree.</p>
+
+<h3>Comparison of output locations between command line JJTree and different Ant <code>taskdef</code>
+versions</h3>
+
+<table>
+  <thead class="no-bold">
+<tr>
+  <th><strong>Command line JJTree options</strong> and <em>generated files</em> (working directory: <samp>/tmp</samp>)</th>
+  <th><strong>Ant 1.5.3</strong> versus command line</th>
+  <th><strong>Ant 1.6</strong> versus command line</th>
 </tr>
+  </thead>
+  <tbody>
 <tr>
   <td><pre><b>jjtree  grammar.jjt</b>
     /tmp/grammar.jj
@@ -241,7 +192,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  /tmp/absolute/grammar.jjt</b>
+  <td><pre><b>jjtree /tmp/absolute/grammar.jjt</b>
     /tmp/grammar.jj
     /tmp/&lt;generated&gt;.java</pre>
   </td>
@@ -252,7 +203,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_DIRECTORY:relative  grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_DIRECTORY:relative grammar.jjt</b>
     /tmp/relative/grammar.jj
     /tmp/relative/&lt;generated&gt;.java</pre>
   </td>
@@ -260,7 +211,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_DIRECTORY:relative  relative/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_DIRECTORY:relative relative/grammar.jjt</b>
     /tmp/relative/grammar.jj
     /tmp/relative/&lt;generated&gt;.java</pre>
   </td>
@@ -268,7 +219,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_DIRECTORY:relative  /tmp/absolute/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_DIRECTORY:relative /tmp/absolute/grammar.jjt</b>
     /tmp/relative/grammar.jj
     /tmp/relative/&lt;generated&gt;.java</pre>
   </td>
@@ -276,7 +227,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_DIRECTORY:/tmp/absolute/  grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_DIRECTORY:/tmp/absolute/ grammar.jjt</b>
     /tmp/absolute/grammar.jj
     /tmp/absolute/&lt;generated&gt;.java</pre>
   </td>
@@ -284,7 +235,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_DIRECTORY:/tmp/absolute/  relative/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_DIRECTORY:/tmp/absolute/ relative/grammar.jjt</b>
     /tmp/absolute/grammar.jj
     /tmp/absolute/&lt;generated&gt;.java</pre>
   </td>
@@ -292,7 +243,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_DIRECTORY:/tmp/absolute/  /tmp/absolute/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_DIRECTORY:/tmp/absolute/ /tmp/absolute/grammar.jjt</b>
     /tmp/absolute/grammar.jj
     /tmp/absolute/&lt;generated&gt;.java</pre>
   </td>
@@ -300,7 +251,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:output.jj  grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:output.jj grammar.jjt</b>
     /tmp/output.jj
     /tmp/&lt;generated&gt;.java</pre>
   </td>
@@ -308,7 +259,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:output.jj  relative/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:output.jj relative/grammar.jjt</b>
     /tmp/output.jj
     /tmp/&lt;generated&gt;.java</pre>
   </td>
@@ -316,7 +267,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:output.jj  /tmp/absolute/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:output.jj /tmp/absolute/grammar.jjt</b>
     /tmp/output.jj
     /tmp/&lt;generated&gt;.java</pre>
   </td>
@@ -324,7 +275,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:output.jj  -OUTPUT_DIRECTORY:relative  grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:output.jj -OUTPUT_DIRECTORY:relative grammar.jjt</b>
     /tmp/relative/output.jj
     /tmp/relative/&lt;generated&gt;.java</pre>
   </td>
@@ -332,7 +283,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:output.jj  -OUTPUT_DIRECTORY:relative  relative/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:output.jj -OUTPUT_DIRECTORY:relative relative/grammar.jjt</b>
     /tmp/relative/output.jj
     /tmp/relative/&lt;generated&gt;.java</pre>
   </td>
@@ -340,7 +291,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:output.jj  -OUTPUT_DIRECTORY:relative  /tmp/absolute/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:output.jj -OUTPUT_DIRECTORY:relative /tmp/absolute/grammar.jjt</b>
     /tmp/relative/output.jj
     /tmp/relative/&lt;generated&gt;.java</pre>
   </td>
@@ -348,7 +299,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:output.jj  -OUTPUT_DIRECTORY:/tmp/absolute/  grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:output.jj -OUTPUT_DIRECTORY:/tmp/absolute/ grammar.jjt</b>
     /tmp/absolute/output.jj
     /tmp/absolute/&lt;generated&gt;.java</pre>
   </td>
@@ -356,7 +307,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:output.jj  -OUTPUT_DIRECTORY:/tmp/absolute/  relative/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:output.jj -OUTPUT_DIRECTORY:/tmp/absolute/ relative/grammar.jjt</b>
     /tmp/absolute/output.jj
     /tmp/absolute/&lt;generated&gt;.java</pre>
   </td>
@@ -364,7 +315,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:output.jj  -OUTPUT_DIRECTORY:/tmp/absolute/  /tmp/absolute/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:output.jj -OUTPUT_DIRECTORY:/tmp/absolute/ /tmp/absolute/grammar.jjt</b>
     /tmp/absolute/output.jj
     /tmp/absolute/&lt;generated&gt;.java</pre>
   </td>
@@ -372,7 +323,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:subdir/output.jj  grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:subdir/output.jj grammar.jjt</b>
     /tmp/subdir/output.jj
     /tmp/&lt;generated&gt;.java</pre>
   </td>
@@ -380,7 +331,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:subdir/output.jj  relative/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:subdir/output.jj relative/grammar.jjt</b>
     /tmp/subdir/output.jj
     /tmp/&lt;generated&gt;.java</pre>
   </td>
@@ -388,7 +339,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:subdir/output.jj  /tmp/absolute/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:subdir/output.jj /tmp/absolute/grammar.jjt</b>
     /tmp/subdir/output.jj
     /tmp/&lt;generated&gt;.java</pre>
   </td>
@@ -396,7 +347,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:subdir/output.jj  -OUTPUT_DIRECTORY:relative  grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:subdir/output.jj -OUTPUT_DIRECTORY:relative grammar.jjt</b>
     /tmp/relative/subdir/output.jj
     /tmp/relative/&lt;generated&gt;.java</pre>
   </td>
@@ -404,7 +355,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:subdir/output.jj  -OUTPUT_DIRECTORY:relative  relative/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:subdir/output.jj -OUTPUT_DIRECTORY:relative relative/grammar.jjt</b>
     /tmp/relative/subdir/output.jj
     /tmp/relative/&lt;generated&gt;.java</pre>
   </td>
@@ -412,7 +363,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:subdir/output.jj  -OUTPUT_DIRECTORY:relative  /tmp/absolute/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:subdir/output.jj -OUTPUT_DIRECTORY:relative /tmp/absolute/grammar.jjt</b>
     /tmp/relative/subdir/output.jj
     /tmp/relative/&lt;generated&gt;.java</pre>
   </td>
@@ -420,7 +371,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:subdir/output.jj  -OUTPUT_DIRECTORY:/tmp/absolute/  grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:subdir/output.jj -OUTPUT_DIRECTORY:/tmp/absolute/ grammar.jjt</b>
     /tmp/absolute/subdir/output.jj
     /tmp/absolute/&lt;generated&gt;.java</pre>
   </td>
@@ -428,7 +379,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:subdir/output.jj  -OUTPUT_DIRECTORY:/tmp/absolute/  relative/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:subdir/output.jj -OUTPUT_DIRECTORY:/tmp/absolute/ relative/grammar.jjt</b>
     /tmp/absolute/subdir/output.jj
     /tmp/absolute/&lt;generated&gt;.java</pre>
   </td>
@@ -436,7 +387,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:subdir/output.jj  -OUTPUT_DIRECTORY:/tmp/absolute/  /tmp/absolute/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:subdir/output.jj -OUTPUT_DIRECTORY:/tmp/absolute/ /tmp/absolute/grammar.jjt</b>
     /tmp/absolute/subdir/output.jj
     /tmp/absolute/&lt;generated&gt;.java</pre>
   </td>
@@ -444,7 +395,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:/tmp/subdir/output.jj  grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:/tmp/subdir/output.jj grammar.jjt</b>
     /tmp/subdir/output.jj
     /tmp/&lt;generated&gt;.java</pre>
   </td>
@@ -452,7 +403,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:/tmp/subdir/output.jj  relative/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:/tmp/subdir/output.jj relative/grammar.jjt</b>
     /tmp/subdir/output.jj
     /tmp/&lt;generated&gt;.java</pre>
   </td>
@@ -460,39 +411,39 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:/tmp/subdir/output.jj  /tmp/absolute/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:/tmp/subdir/output.jj /tmp/absolute/grammar.jjt</b>
     /tmp/subdir/output.jj
     /tmp/&lt;generated&gt;.java</pre>
   </td>
   <td>Not Supported</td>
   <td>Same</td>
 </tr>
-<tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:<i><u>D:</u></i>/tmp/subdir/output.jj  grammar.jjt</b>
+<tr id="footnote-1-back">
+  <td><pre><b>jjtree -OUTPUT_FILE:<i>D:</i>/tmp/subdir/output.jj grammar.jjt</b>
     /tmp/subdir/output.jj
     /tmp/&lt;generated&gt;.java</pre>
   </td>
   <td>Not Supported</td>
-  <td>Not Supported *)</td>
+  <td>Not Supported<a href="#footnote-1"><sup>*</sup></a></td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:<i><u>D:</u></i>/tmp/subdir/output.jj  relative/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:<i>D:</i>/tmp/subdir/output.jj relative/grammar.jjt</b>
     /tmp/subdir/output.jj
     /tmp/&lt;generated&gt;.java</pre>
   </td>
   <td>Not Supported</td>
-  <td>Not Supported *)</td>
+  <td>Not Supported<a href="#footnote-1"><sup>*</sup></a></td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:<i><u>D:</u></i>/tmp/subdir/output.jj  /tmp/absolute/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:<i>D:</i>/tmp/subdir/output.jj /tmp/absolute/grammar.jjt</b>
     /tmp/subdir/output.jj
     /tmp/&lt;generated&gt;.java</pre>
   </td>
   <td>Not Supported</td>
-  <td>Not Supported *)</td>
+  <td>Not Supported<a href="#footnote-1"><sup>*</sup></a></td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:/tmp/subdir/output.jj  -OUTPUT_DIRECTORY:relative  grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:/tmp/subdir/output.jj -OUTPUT_DIRECTORY:relative grammar.jjt</b>
     /tmp/relative/tmp/subdir/output.jj
     /tmp/relative/&lt;generated&gt;.java</pre>
   </td>
@@ -500,7 +451,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:/tmp/subdir/output.jj  -OUTPUT_DIRECTORY:relative  relative/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:/tmp/subdir/output.jj -OUTPUT_DIRECTORY:relative relative/grammar.jjt</b>
     /tmp/relative/tmp/subdir/output.jj
     /tmp/relative/&lt;generated&gt;.java</pre>
   </td>
@@ -508,7 +459,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:/tmp/subdir/output.jj  -OUTPUT_DIRECTORY:relative  /tmp/absolute/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:/tmp/subdir/output.jj -OUTPUT_DIRECTORY:relative /tmp/absolute/grammar.jjt</b>
     /tmp/relative/tmp/subdir/output.jj
     /tmp/relative/&lt;generated&gt;.java</pre>
   </td>
@@ -516,7 +467,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:/tmp/subdir/output.jj  -OUTPUT_DIRECTORY:/tmp/absolute/  grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:/tmp/subdir/output.jj -OUTPUT_DIRECTORY:/tmp/absolute/ grammar.jjt</b>
     /tmp/absolute/tmp/subdir/output.jj
     /tmp/absolute/&lt;generated&gt;.java</pre>
   </td>
@@ -524,7 +475,7 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:/tmp/subdir/output.jj  -OUTPUT_DIRECTORY:/tmp/absolute/  relative/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:/tmp/subdir/output.jj -OUTPUT_DIRECTORY:/tmp/absolute/ relative/grammar.jjt</b>
     /tmp/absolute/tmp/subdir/output.jj
     /tmp/absolute/&lt;generated&gt;.java</pre>
   </td>
@@ -532,32 +483,30 @@
   <td>Same</td>
 </tr>
 <tr>
-  <td><pre><b>jjtree  -OUTPUT_FILE:/tmp/subdir/output.jj  -OUTPUT_DIRECTORY:/tmp/absolute/  /tmp/absolute/grammar.jjt</b>
+  <td><pre><b>jjtree -OUTPUT_FILE:/tmp/subdir/output.jj -OUTPUT_DIRECTORY:/tmp/absolute/ /tmp/absolute/grammar.jjt</b>
     /tmp/absolute/tmp/subdir/output.jj
     /tmp/absolute/&lt;generated&gt;.java</pre>
   </td>
   <td>Not Supported</td>
   <td>Same</td>
 </tr>
+  </tbody>
 </table>
 
-<p>*) <u>Footnote</u>: When running JJTree with the Ant taskdef <i>jjtree</i> the option <code>-OUTPUT_DIRECTORY</code> must always 
-be set, because the project's basedir and the Ant working directory might differ. So even if you don't specify the jjtree taskdef 
-<i>outputdirectory</i> JJTree will be called with the <code>-OUTPUT_DIRECTORY</code> set to the project's basedirectory. 
-But when the <code>-OUTPUT_DIRECTORY</code> is set, the <code>-OUTPUT_FILE</code> setting is handled as if relative to this 
-<code>-OUTPUT_DIRECTORY</code>. Thus when the <code>-OUTPUT_FILE</code> is absolute or contains a drive letter we have a 
-problem. 
-Therefore absolute <i>outputfile</i>s (when the <i>outputdirectory</i> isn't specified) are made relative to the default directory.
-And for this reason <i>outputfile</i>s that contain a drive letter can't be supported.</p>
-
-<p>By the way: specifying a drive letter in the <code>-OUTPUT_FILE</code> when the <code>-OUTPUT_DIRECTORY</code> is set, also 
-results in strange behavior when running JJTree from the command line.</p>
-
-<br>
-
-
-
+<p id="footnote-1"><a href="#footnote-1-back"><strong>Note</strong></a>: When running JJTree with
+the Ant <code>taskdef jjtree</code> the option <kbd>-OUTPUT_DIRECTORY</kbd> must always be set,
+because the project's <var>basedir</var> and the Ant working directory might differ. So even if you
+don't specify the <var>outputdirectory</var> for <code>taskdef jjtree</code>, JJTree will be called
+with the <kbd>-OUTPUT_DIRECTORY</kbd> set to the project's <var>basedir</var>.  But when
+the <kbd>-OUTPUT_DIRECTORY</kbd> is set, the <kbd>-OUTPUT_FILE</kbd> setting is handled as if
+relative to this <kbd>-OUTPUT_DIRECTORY</kbd>. Thus when the <kbd>-OUTPUT_FILE</kbd> is absolute
+or contains a drive letter we have a problem.  Therefore absolute <var>outputfile</var>s (when
+the <var>outputdirectory</var> isn't specified) are made relative to the default directory.  And for
+this reason <var>outputfile</var>s that contain a drive letter can't be supported.</p>
+
+<p>By the way: specifying a drive letter in the <kbd>-OUTPUT_FILE</kbd> when
+the <kbd>-OUTPUT_DIRECTORY</kbd> is set, also results in strange behavior when running JJTree from
+the command line.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/jlink.html ant-1.10.3/manual/Tasks/jlink.html
--- ant-1.9.10/manual/Tasks/jlink.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/jlink.html	2018-03-24 12:37:12.000000000 +0000
@@ -21,106 +21,81 @@
 </head>
 <body>
 
-<h2><a name="jlink">Jlink</a></h2>
-<h3><i>Deprecated</i></h3>
-<p><i>This task has been deprecated. Use a <a href="../Types/zipfileset.html">zipfileset</a>
- or <a href="../Tasks/zip.html#zipgroupfileset">zipgroupfileset</a> with the
- <a href="../Tasks/jar.html">Jar task</a> or <a href="../Tasks/zip.html">Zip task</a>
- instead.</i></p>
+<h2 id="jlink">Jlink</h2>
+<h3><em><u>Deprecated</u></em></h3>
+<p><em>This task has been <u>deprecated</u>. Use a <a href="../Types/zipfileset.html">zipfileset</a>
+or <a href="../Tasks/zip.html#zipgroupfileset">zipgroupfileset</a> with
+the <a href="../Tasks/jar.html">Jar task</a> or <a href="../Tasks/zip.html">Zip task</a>
+instead.</em></p>
 
-<h3><b>Description:</b></h3>
+<h3>Description</h3>
 <p>Links entries from sub-builds and libraries.</p>
 
-<p>The jlink task can be used to build jar and zip files, similar to 
-the <i>jar</i> task.
-However, jlink provides options for controlling the way entries from 
-input files
-are added to the output file. Specifically, capabilities for merging 
-entries from
-multiple zip or jar files is available.</p>
-
-<p>If a mergefile is specified directly (eg. at the top level of a 
-<i>mergefiles</i>
-pathelement) <i>and</i> the mergefile ends in &quot;.zip&quot; or 
-&quot;.jar&quot;,
-entries in the mergefile will be merged into the outfile. A file with 
-any other extension
-will be added to the output file, even if it is specified in the 
-mergefiles element.
-Directories specified in either the mergefiles or addfiles element 
-are added to the
-output file as you would expect: all files in subdirectories are 
-recursively added to
-the output file with appropriate prefixes in the output file 
-(without merging).
-</p>
-
-<p>
-In the case where duplicate entries and/or files are found among the 
-files to be merged or
-added, jlink merges or adds the first entry and ignores all subsequent entries.
-</p>
-
-<p>
-jlink ignores META-INF directories in mergefiles. Users should supply their
-own manifest information for the output file.
-</p>
-
-<p>It is possible to refine the set of files that are being jlinked. 
-This can be
-done with the <i>includes</i>, <i>includesfile</i>, <i>excludes</i>, 
-<i>excludesfile</i>,
-and <i>defaultexcludes</i> attributes on the <i>addfiles</i> and 
-<i>mergefiles</i>
-nested elements. With the <i>includes</i> or <i>includesfile</i>
-attribute you specify the files you want to have included by using patterns.
-The <i>exclude</i> or <i>excludesfile</i> attribute is used to specify
-the files you want to have excluded. This is also done with patterns. And
-finally with the <i>defaultexcludes</i> attribute, you can specify whether you
-want to use default exclusions or not. See the section on <a
-href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
-inclusion/exclusion of files works, and how to write patterns. The patterns are
-relative to the <i>base</i> directory.</p>
+<p>The <code>jlink</code> task can be used to build jar and zip files, similar to
+the <code>jar</code> task.  However, <code>jlink</code> provides options for controlling the way
+entries from input files are added to the output file. Specifically, capabilities for merging
+entries from multiple zip or jar files is available.</p>
+
+<p>If a mergefile is specified directly (eg. at the top level of a <code>mergefiles</code>
+pathelement) <em>and</em> the mergefile ends in <samp>.zip</samp> or <samp>.jar</samp>, entries in
+the mergefile will be merged into the <var>outfile</var>. A file with any other extension will be
+added to the output file, even if it is specified in the <code>mergefiles</code> element.
+Directories specified in either the <code>mergefiles</code> or <code>addfiles</code> element are
+added to the output file as you would expect: all files in subdirectories are recursively added to
+the output file with appropriate prefixes in the output file (without merging).</p>
+
+<p>In the case where duplicate entries and/or files are found among the files to be merged or
+added, <code>jlink</code> merges or adds the first entry and ignores all subsequent entries.</p>
+
+<p><code>jlink</code> ignores <samp>META-INF</samp> directories in <var>mergefiles</var>. Users
+should supply their own manifest information for the output file.</p>
+
+<p>It is possible to refine the set of files that are being jlinked.  This can be done with
+the <var>includes</var>, <var>includesfile</var>, <var>excludes</var>, <var>excludesfile</var>,
+and <var>defaultexcludes</var> attributes on the <code>addfiles</code> and <code>mergefiles</code>
+nested elements. With the <var>includes</var> or <var>includesfile</var> attribute you specify the
+files you want to have included by using patterns.  The <var>exclude</var>
+or <var>excludesfile</var> attribute is used to specify the files you want to have excluded. This is
+also done with patterns. And finally with the <var>defaultexcludes</var> attribute, you can specify
+whether you want to use default exclusions or not. See the section
+on <a href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
+inclusion/exclusion of files works, and how to write patterns. The patterns are relative to
+the <em>base</em> directory.</p>
 
-
-
-<h3>Parameters:</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<h3>Parameters</h3>
+<table class="attr">
    <tr>
-     <td valign="top"><b>Attribute</b></td>
-     <td valign="top"><b>Description</b></td>
-     <td align="center" valign="top"><b>Required</b></td>
+     <th>Attribute</th>
+     <th>Description</th>
+     <th>Required</th>
    </tr>
    <tr>
-     <td valign="top">outfile</td>
-     <td valign="top">the path of the output file.</td>
-     <td valign="top" align="center">Yes</td>
+     <td>outfile</td>
+     <td>the path of the output file.</td>
+     <td>Yes</td>
    </tr>
    <tr>
-     <td valign="top">compress</td>
-     <td valign="top">whether or not the output should be compressed. 
-<i>true</i>,
-                      <i>yes</i>, or <i>on</i> result in compressed output.
-                      If omitted, output will be uncompressed (inflated).</td>
-     <td valign="top" align="center">No</td>
+     <td>compress</td>
+     <td>whether or not the output should be compressed. <q>true</q>, <q>yes</q>, or <q>on</q>
+       result in compressed output.</td>
+     <td>No; defaults to uncompressed (inflated) output</td>
    </tr>
    <tr>
-     <td valign="top">mergefiles</td>
-     <td valign="top">files to be merged into the output, if possible.</td>
-     <td valign="middle" align="center" rowspan="2">At least one of 
-mergefiles or addfiles</td>
+     <td>mergefiles</td>
+     <td>files to be merged into the output, if possible.</td>
+     <td rowspan="2">Exactly one of the two</td>
    </tr>
    <tr>
-     <td valign="top">addfiles</td>
-     <td valign="top">files to be added to the output.</td>
+     <td>addfiles</td>
+     <td class="left">files to be added to the output.</td>
    </tr>
 </table>
 
 <h3>Examples</h3>
 
-<p>The following will merge the entries in mergefoo.jar and mergebar.jar 
-into out.jar.
-mac.jar and pc.jar will be added as single entries to out.jar.</p>
+<p>The following will merge the entries in <samp>mergefoo.jar</samp> and <samp>mergebar.jar</samp>
+into <samp>out.jar</samp>.  <samp>mac.jar</samp> and <samp>pc.jar</samp> will be added as single
+entries to <samp>out.jar</samp>.</p>
 <pre>
 &lt;jlink compress=&quot;false&quot; outfile=&quot;out.jar&quot;&gt;
    &lt;mergefiles&gt;
@@ -134,7 +109,7 @@
 &lt;/jlink&gt;
 </pre>
 
-<p><b>Non-deprecated alternative to the above:</b></p>
+<p><strong>Non-deprecated alternative to the above:</strong></p>
 <pre>
 &lt;jar compress=&quot;false&quot; destfile=&quot;out.jar&quot;&gt;
   &lt;zipgroupfileset dir=&quot;${build.dir}&quot;&gt;
@@ -148,30 +123,25 @@
 &lt;/jar&gt;
 </pre>
 
-<p>Suppose the file foo.jar contains two entries: bar.class and 
-barnone/myClass.zip.
-Suppose the path for file foo.jar is build/tempbuild/foo.jar. The 
-following example
-will provide the entry tempbuild/foo.jar in the out.jar.</p>
+<p>Suppose the file foo.jar contains two entries: <samp>bar.class</samp>
+and <samp>barnone/myClass.zip</samp>.  Suppose the path for file <samp>foo.jar</samp>
+is <samp>build/tempbuild/foo.jar</samp>. The following example will provide the
+entry <samp>tempbuild/foo.jar</samp> in the <samp>out.jar</samp>.</p>
 <pre>
 &lt;jlink compress=&quot;false&quot; outfile=&quot;out.jar&quot;&gt;
    &lt;mergefiles&gt;
      &lt;pathelement path=&quot;build/tempbuild&quot;/&gt;
    &lt;/mergefiles&gt;
-&lt;/jlink&gt;
-</pre>
+&lt;/jlink&gt;</pre>
 
-<p>However, the next example would result in two top-level entries in out.jar,
-namely bar.class and barnone/myClass.zip</p>
+<p>However, the next example would result in two top-level entries in <samp>out.jar</samp>,
+namely <samp>bar.class</samp> and <samp>barnone/myClass.zip</samp></p>
 <pre>
 &lt;jlink compress=&quot;false&quot; outfile=&quot;out.jar&quot;&gt;
    &lt;mergefiles&gt;
      &lt;pathelement path=&quot;build/tempbuild/foo.jar&quot;/&gt;
    &lt;/mergefiles&gt;
-&lt;/jlink&gt;
-</pre>
-
+&lt;/jlink&gt;</pre>
 
 </body>
-
 </html>
diff -Nru ant-1.9.10/manual/Tasks/jspc.html ant-1.10.3/manual/Tasks/jspc.html
--- ant-1.9.10/manual/Tasks/jspc.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/jspc.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,229 +24,193 @@
 
 <body>
 
-<h2><a name="jspc">jspc (deprecated)</a></h2>
+<h2 id="jspc">jspc</h2>
+<h3><em><u>Deprecated</u></em></h3>
+<p><em>If you use this task with Tomcat's Jasper JSP compiler, you should seriously consider using
+the task shipping with Tomcat instead.</em>  This task is only tested against Tomcat 4.x. There are
+known problems with Tomcat 5.x that won't get fixed in Ant, please use Tomcat's <code>jspc</code>
+task instead.<br/>  Instead of relying on container-specific JSP compilers we suggest deploying the
+raw files (<samp>*.jsp</samp>) and use the container build-in functions: after deploying run a test
+suite (e.g. with <a href="https://attic.apache.org/projects/jakarta-cactus.html"
+target="_top">Cactus</a> or <a href="http://httpunit.sourceforge.net/" target="_top">HttpUnit</a>)
+against the deployed web application. So you'll get the test result <em>and</em> the compiled
+JSPs.</p>
 <h3>Description</h3>
 
-<p> Apache Ant task to run the JSP compiler and turn JSP pages into Java source.
+<p>Apache Ant task to run the JSP compiler and turn JSP pages into Java source files.</p>
 
-<p><b>Deprecated</b> if you use this task with Tomcat's Jasper JSP
-compiler, you should seriously consider using the task shipping with
-Tomcat instead.  This task is only tested against Tomcat 4.x. There
-are known problems with Tomcat 5.x that won't get fixed in Ant, please
-use Tomcat's jspc task instead.<br/>
-Instead of relying on container specific JSP-compilers we suggest deploying 
-the raw files (*.jsp) and use the container build-in functions: after deploying run
-a test suite (e.g. with <a href="http://attic.apache.org/projects/jakarta-cactus.html">Cactus</a> or 
-<a href="http://httpunit.sourceforge.net/">HttpUnit</a>) against the deployed web 
-application. So you'll get the test result <i>and</i> the compiled JSPs.
-</p>
-
-<p>
-
-This task can be used to precompile JSP pages for fast initial invocation
-of JSP pages, deployment on a server without the full JDK installed,
-or simply to syntax check the pages without deploying them.
-In most cases, a javac task is usually the next stage in the build process.
-The task does basic dependency checking to prevent unnecessary recompilation -this
-checking compares source and destination timestamps, and does not factor
-in class or taglib dependencies, or <code>&lt;jsp:include&gt;</code> references.
-
-<p>
-By default the task uses the Jasper JSP compiler. This
-means the task needs jasper.jar and jasper-runtime.jar, which come with
-builds of Tomcat 4/Catalina from the
-<a href="http://tomcat.apache.org/">Apache Tomcat project</a>,
-and any other Jar files which may be needed in future versions (it changes)
-
-We recommend (in March 2003) Tomcat version 4.1.x for the most robust version
-of Jasper.
-
-<p>
-There are many limitations with this task which partially stem from the
-many versions of Jasper, others from implementation 'issues' in the task
-(i.e. nobody's willingness to radically change large bits of it to work
-around jasper). Because of this and the fact that JSP pages do not have
-to be portable across implementations -or versions of implementations-
-this task is better used for validating JSP pages before deployment,
-rather than precompiling them. For that, just deploy and run your httpunit
-junit tests after deployment to compile and test your pages, all in one
-go.
- 
-</p>
+<p>This task can be used to precompile JSP pages for fast initial invocation of JSP pages,
+deployment on a server without the full JDK installed, or simply to syntax check the pages without
+deploying them.  In most cases, a <code>javac</code> task is usually the next stage in the build
+process.  The task does basic dependency checking to prevent unnecessary recompilation&mdash;this
+checking compares source and destination timestamps, and does not factor in class or taglib
+dependencies, or <code>&lt;jsp:include&gt;</code> references.</p>
+
+<p>By default the task uses the Jasper JSP compiler. This means the task
+needs <samp>jasper.jar</samp> and <samp>jasper-runtime.jar</samp>, which come with builds of Tomcat
+4/Catalina from the <a href="https://tomcat.apache.org/" target="_top">Apache Tomcat project</a>,
+and any other jar files which may be needed in future versions (it changes).</p>
+
+<p>We recommend (in March 2003) Tomcat version 4.1.x for the most robust version of Jasper.</p>
+
+<p>There are many limitations with this task which partially stem from the many versions of Jasper,
+others from implementation 'issues' in the task (i.e. nobody's willingness to radically change large
+bits of it to work around Jasper). Because of this and the fact that JSP pages do not have to be
+portable across implementations&mdash;or versions of implementations&mdash;this task is better used
+for validating JSP pages before deployment, rather than precompiling them. For the latter, just
+deploy and run your HttpUnit JUnit tests after deployment to compile and test your pages, all in one
+go.</p>
 
 
 <h3>Parameters</h3>
-The Task has the following attributes:<p>
+<p>The Task has the following attributes:</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">destdir</td>
-    <td valign="top">Where to place the generated files. They are located
-    under here according to the given package name.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>destdir</td>
+    <td>Where to place the generated files. They are located under here according to the given
+      package name.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">srcdir</td>
-    <td valign="top">Where to look for source jsp files.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>srcdir</td>
+    <td>Where to look for source JSP files.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">The verbosity integer to pass to the compiler. Default="0"</td>
-    <td valign="top" align="center">No</td>
+    <td>verbose</td>
+    <td>The verbosity integer to pass to the compiler.</td>
+    <td>No; default <q>0</q></td>
   </tr>
   <tr>
-    <td valign="top">package</td>
-    <td valign="top">Name of the destination package for generated java
-    classes.</td>
-    <td valign="top" align="center">No</td>
+    <td>package</td>
+    <td>Name of the destination package for generated Java classes.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">compiler</td>
-    <td valign="top">class name of a JSP compiler adapter,
-    such as "jasper" or "jasper41"</td>
-    <td valign="top" align="center">No -defaults to "jasper"</td>
+    <td>compiler</td>
+    <td>class name of a JSP compiler adapter, such as <q>jasper</q> or <q>jasper41</q></td>
+    <td>No; defaults to <q>jasper</q></td>
   </tr>
   <tr>
-    <td valign="top">ieplugin</td>
-    <td valign="top">Java Plugin classid for Internet Explorer.</td>
-    <td valign="top" align="center">No</td>
+    <td>ieplugin</td>
+    <td>Java Plugin classid for Internet Explorer.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">mapped</td>
-    <td valign="top">(boolean) Generate separate write() calls for each HTML
-    line in the JSP.</td>
-    <td valign="top" align="center">No</td>
+    <td>mapped</td>
+    <td>(boolean) Generate separate <code>write()</code> calls for each HTML line in the JSP.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">The classpath to use to run the jsp compiler.
-    This can also be specified
-    by the nested element <code>classpath</code>
-    <a href="../using.html#path">Path</a>).</td>
-    <td valign="top" align="center">No, but it seems to work better when used</td>
+    <td>classpath</td>
+    <td>The classpath to use to run the JSP compiler.</td>
+    <td>No, but it seems to work better when used; can also be specified by the nested
+      element <a href="../using.html#path"><code>classpath</code></a></td>
   </tr>
   <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">A <a href="../using.html#references">Reference</a>. As
-    per <code>classpath</code></td>
-    <td valign="top" align="center">No</td>
+    <td>classpathref</td>
+    <td>A <a href="../using.html#references">Reference</a>. As per <var>classpath</var>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">flag to control action on compile failures: default=yes</td>
-    <td valign="top" align="center">No</td>
+    <td>failonerror</td>
+    <td>flag to control action on compile failures.</td>
+    <td>No; default <q>yes</q></td>
   </tr>
   <tr>
-    <td valign="top">uribase</td>
-    <td valign="top">
-    The uri context of relative URI
-    references in the JSP pages. If it does not
-    exist then it is derived from the location of the file
-    relative to the declared or derived value of <tt>uriroot.</tt>
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>uribase</td>
+    <td>The context of relative URI references in JSP.</td>
+    <td>No; derived from the location of the file relative to the declared or derived value
+      of <var>uriroot</var></td>
   </tr>
   <tr>
-    <td valign="top">uriroot</td>
-    <td valign="top">
-    The root directory that uri files should be resolved
-    against.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>uriroot</td>
+    <td>The root directory that URIs should be resolved against.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">compiler</td>
-    <td valign="top">
-    Class name of jsp compiler adapter to use.  Defaults to
-    the standard adapter for Jasper.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>compiler</td>
+    <td>Class name of JSP compiler adapter to use.</td>
+    <td>No; defaults to the standard adapter for Jasper</td>
   </tr>
   <tr>
-    <td valign="top">compilerclasspath</td>
-    <td valign="top">The classpath used to find the compiler adapter specified
-    by the <code>compiler</code> attribute.</td>
-    <td valign="top" align="center">No</td>
+    <td>compilerclasspath</td>
+    <td>The classpath used to find the compiler adapter specified by the <var>compiler</var>
+      attribute.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">webinc</td>
-    <td valign="top">Output file name for the fraction of web.xml that lists servlets.</td>
-    <td valign="top" align="center">No</td>
-  </tr>    
+    <td>webinc</td>
+    <td>Output file name for the fraction of <samp>web.xml</samp> that lists servlets.</td>
+    <td>No</td>
+  </tr>
   <tr>
-    <td valign="top">webxml</td>
-    <td valign="top">File name for web.xml to be generated</td>
-    <td valign="top" align="center">No</td>
-  </tr>  
-
-  </table>
-
-<P>The <tt>mapped</tt> option will, if set to true, split the JSP text content into a
-one line per call format.  There are comments above and below the mapped
-write calls to localize where in the JSP file each line of text comes
-from.  This can lead to a minor performance degradation (but it is bound
-by a linear complexity).  Without this options all adjacent writes are
-concatenated into a single write.</P>
-
-<P>The <tt>ieplugin</tt> option is used by the <tt>&lt;jsp:plugin&gt;</tt> tags.
-If the Java Plug-in COM Class-ID you want to use changes then it can be
-specified here.  This should not need to be altered.</P>
-
-<P><tt>uriroot</tt> specifies the root of the web
-application.  This is where all absolute uris will be resolved from.
-If it is not specified then the first JSP page will be used to derive
-it.  To derive it each parent directory of the first JSP page is
-searched for a <tt>WEB-INF</tt> directory, and the directory closest to
-the JSP page that has one will be used.  If none can be found then the
-directory Jasperc was called from will be used.  This only affects pages
-translated from an explicitly declared JSP file -including references
-to taglibs</P>
+    <td>webxml</td>
+    <td>File name for <samp>web.xml</samp> to be generated</td>
+    <td>No</td>
+  </tr>
+</table>
 
-<P><tt>uribase</tt> is used to establish the uri context of
-relative URI references in the JSP pages.  If it does not exist then it
-is derived from the location of the file relative to the declared or
-derived value of <tt>uriroot</tt>. This only affects pages
-translated from an explicitly declared JSP file.</P>
+<p>The <var>mapped</var> option will, if set to <q>true</q>, split the JSP text content into a one
+line per call format.  There are comments above and below the mapped write calls to localize where
+in the JSP file each line of text comes from.  This can lead to a minor performance degradation (but
+it is bound by a linear complexity).  Without this option all adjacent writes are concatenated into
+a single write.</p>
+
+<p>The <var>ieplugin</var> option is used by the <code>&lt;jsp:plugin&gt;</code> tags.  If the Java
+Plug-in COM Class-ID you want to use changes then it can be specified here.  This should not need to
+be altered.</p>
+
+<p><var>uriroot</var> specifies the root of the web application.  This is where all absolute URIs
+will be resolved from.  If it is not specified then the first JSP page will be used to derive it.
+To derive it each parent directory of the first JSP page is searched for a <samp>WEB-INF</samp>
+directory, and the directory closest to the JSP page that has one will be used.  If none can be
+found then the directory Jasperc was called from will be used.  This only affects pages translated
+from an explicitly declared JSP file&mdash;including references to taglibs.</p>
+
+<p><var>uribase</var> is used to establish the context of relative URI references in the JSP pages.
+If it does not exist then it is derived from the location of the file relative to the declared or
+derived value of <var>uriroot</var>. This only affects pages translated from an explicitly declared
+JSP file.</p>
 
 <h3>Parameters specified as nested elements</h3>
 
-This task is a <a href="../dirtasks.html">directory based task</a>, like
-<strong>javac</strong>, so the jsp files to be compiled are located as java
-files are by <strong>javac</strong>. That is, elements such as <tt>includes</tt> and
-<tt>excludes</tt> can be used directly inside the task declaration.
-
-<p>
+<p>This task is a <a href="../dirtasks.html">directory based task</a>, like <code>javac</code>, so
+the <samp>.jsp</samp> files to be compiled are located as <samp>.java</samp> files are
+by <code>javac</code>. That is, elements such as <code>includes</code> and <code>excludes</code> can
+be used directly inside the task declaration.</p>
 
-Elements specific to the jspc task are:-
+<p>Elements specific to the <code>jspc</code> task are:</p>
 
 <h4>classpath</h4>
 
-The classpath used to compile the JSP pages, specified as for any other
-classpath.
+<p>The classpath used to compile the JSP pages, specified as for any other classpath.</p>
 
 <h4>classpathref</h4>
-a reference to an existing classpath
+
+<p>a reference to an existing classpath</p>
 
 <h4>webapp</h4>
-Instructions to jasper to build an entire web application.
-The base directory must have a WEB-INF subdirectory beneath it.
-When used, the task hands off all dependency checking to the compiler.
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+
+<p>Instructions to Jasper to build an entire web application.  The base directory must have
+a <samp>WEB-INF</samp> subdirectory beneath it.  When used, the task hands off all dependency
+checking to the compiler.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">basedir</td>
-    <td valign="top">the base directory of the web application</td>
-    <td valign="top" align="center">Yes</td>
+    <td>basedir</td>
+    <td>the base directory of the web application</td>
+    <td>Yes</td>
   </tr>
 </table>
 <h3>Example</h3>
@@ -257,52 +221,39 @@
       compiler="jasper41"
       verbose="9"&gt;
   &lt;include name="**/*.jsp"/&gt;
-&lt;/jspc&gt;
-</pre>
-Build all jsp pages under src/war into the destination /gensrc, in a
-package hierarchy beginning with com.i3sp.jsp.
+&lt;/jspc&gt;</pre>
+<p>Build all <samp>.jsp</samp> files under <samp>src/war</samp> into the
+destination <samp>/gensrc</samp>, in a package hierarchy beginning
+with <samp>com.i3sp.jsp</samp>.</p>
 <pre>
-&lt;jspc
-      destdir="interim"
+&lt;jspc destdir="interim"
       verbose="1"
       srcdir="src"
       compiler="jasper41"
       package="com.i3sp.jsp"&gt;
   &lt;include name="**/*.jsp"/&gt;
 &lt;/jspc&gt;
-&lt;depend
-         srcdir="interim"
+&lt;depend srcdir="interim"
          destdir="build"
          cache="build/dependencies"
          classpath="lib/taglibs.jar"/&gt;
-&lt;javac
-         srcdir="interim"
+&lt;javac srcdir="interim"
          destdir="build"
          classpath="lib/taglibs.jar"
-         debug="on"/&gt;
-</pre>
-Generate jsp pages then javac them down to
-bytecodes. Include lib/taglib jar in the java compilation.
- Dependency checking is used to scrub the
-java files if class dependencies indicate it is needed.
-
-<p><h4>Notes</h4>
-Using the <code>package</code> attribute it is possible to identify the resulting
-java files and thus do full dependency checking - this task should only rebuild
-java files if their jsp file has been modified. However, this only works
-with some versions of jasper. By default the checking supports tomcat 4.0.x
-with the "jasper" compiler, set the compiler to "jasper41" for the tomcat4.1.x
-dependency checking.
-Even when it does work, changes in
-.TLD imports or in compile time includes do not get picked up.
-
-<p>
-Jasper generates JSP pages against the JSP1.2 specification -a copy of
-version 2.3 of the servlet specification is needed on the classpath to
-compile the Java code.
-
-
-
+         debug="on"/&gt;</pre>
+<p>Generate <samp>.java</samp> files from <samp>.jsp</samp> files then <code>javac</code> them down
+to bytecodes. Include <samp>lib/taglibs.jar</samp> in the Java compilation.  Dependency checking is
+used to scrub the <samp>.java</samp> files if class dependencies indicate it is needed.</p>
+
+<h4>Notes</h4>
+<p>Using the <var>package</var> attribute it is possible to identify the
+resulting <samp>.java</samp> files and thus do full dependency checking&mdash;this task should only
+rebuild <samp>.java</samp> files if their <samp>.jsp</samp> file has been modified. However, this
+only works with some versions of Jasper. By default the checking supports Tomcat 4.0.x with
+the <q>jasper</q> compiler, set the compiler to <q>jasper41</q> for the Tomcat 4.1.x dependency
+checking. Even when it does work, changes in <samp>.tld</samp> imports or in compile time includes
+do not get picked up.</p>
+<p>Jasper generates JSP pages against the JSP 1.2 specification&mdash;a copy of version 2.3 of the
+servlet specification is needed on the classpath to compile the Java code.</p>
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/junit.html ant-1.10.3/manual/Tasks/junit.html
--- ant-1.9.10/manual/Tasks/junit.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/junit.html	2018-03-24 12:37:12.000000000 +0000
@@ -21,281 +21,221 @@
 </head>
 <body>
 
-<h2><a name="junit">JUnit</a></h2>
+<h2 id="junit">JUnit</h2>
 <h3>Description</h3>
 
-<p>This task runs tests from the JUnit testing framework. The latest
-version of the framework can be found at
-<a href="http://www.junit.org">http://www.junit.org</a>.
-This task has been tested with JUnit 3.0 up to JUnit 3.8.2; it won't
-work with versions prior to JUnit 3.0. It also works with JUnit 4.0, including
-"pure" JUnit 4 tests using only annotations and no <code>JUnit4TestAdapter</code>.</p>
-<p><strong>Note:</strong> This task depends on external libraries not included
+<p>This task runs tests from the JUnit testing framework. The latest version of the framework can be
+found at <a href="https://junit.org" target="_top">https://junit.org</a>.  This task has been tested
+with JUnit 3.0 up to JUnit 3.8.2; it won't work with versions prior to JUnit 3.0. It also works with
+JUnit 4.x, including "pure" JUnit 4 tests using only annotations and
+no <code>JUnit4TestAdapter</code>.</p>
+<p><strong>Note</strong>: This task depends on external libraries not included
 in the Apache Ant distribution.  See <a href="../install.html#librarydependencies">
-Library Dependencies</a> for more information.
-</p>
-<p>
-<strong>Note</strong>:
-You must have <code>junit.jar</code> available.
-You can do one of:
-</p>
+Library Dependencies</a> for more information.</p>
+<p><strong>Note</strong>: You must have <samp>junit.jar</samp> available.  You can do one of:</p>
 <ol>
-<li>
-Put both <code>junit.jar</code> and <code>ant-junit.jar</code> in
-<code>ANT_HOME/lib</code>.
-</li>
-<li>
-Do not put either in <code>ANT_HOME/lib</code>, and instead
-include their locations in your <code>CLASSPATH</code> environment variable.
-</li>
-<li>
-Add both JARs to your classpath using <code>-lib</code>.
-</li>
-<li>
-Specify the locations of both JARs using
-a <code>&lt;classpath&gt;</code> element in a <code>&lt;taskdef&gt;</code> in the build file.
-</li>
-<li>
-Leave <code>ant-junit.jar</code> in its default location in <code>ANT_HOME/lib</code>
-but include <code>junit.jar</code> in the <code>&lt;classpath&gt;</code> passed
-to <code>&lt;junit&gt;</code>. <em>(since Ant 1.7)</em>
-</li>
+  <li>Put both <samp>junit.jar</samp> and <samp>ant-junit.jar</samp>
+    in <code>ANT_HOME/lib</code>.</li>
+  <li>Do not put either in <code>ANT_HOME/lib</code>, and instead include their locations in
+    your <code>CLASSPATH</code> environment variable.</li>
+  <li>Add both JARs to your classpath using <kbd>-lib</kbd>.</li>
+  <li>Specify the locations of both JARs using a <code>&lt;classpath&gt;</code> element in
+    a <code>&lt;taskdef&gt;</code> in the build file.</li>
+  <li>Leave <samp>ant-junit.jar</samp> in its default location in <code>ANT_HOME/lib</code> but
+    include <samp>junit.jar</samp> in the <code>&lt;classpath&gt;</code> passed
+    to <code>&lt;junit&gt;</code>. <em>Since Ant 1.7</em></li>
 </ol>
-<p>
-See <a href="http://ant.apache.org/faq.html#delegating-classloader" target="_top">the
-FAQ</a> for details.
-</p>
-
-<p>Tests are defined by nested <code>test</code> or
-<code>batchtest</code> tags (see <a href="#nested">nested
-elements</a>).</p>
+<p>See <a href="https://ant.apache.org/faq.html#delegating-classloader" target="_top">the FAQ</a>
+for details.</p>
+
+<p>Tests are defined by nested <code>test</code> or <code>batchtest</code> tags
+(see <a href="#nested">nested elements</a>).</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
-<tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
-</tr>
+<table class="attr">
   <tr>
-    <td valign="top">printsummary</td>
-    <td valign="top">Print one-line statistics for each testcase. Can
-      take the values <code>on</code>,
-      <code>off</code>, and
-      <code>withOutAndErr</code>.
-      <code>withOutAndErr</code> is the same
-      as <code>on</code> but also includes the output of the test
-      as written to <code>System.out</code> and <code>System.err</code>.</td>
-    <td align="center" valign="top">No; default is <code>off</code>.</td>
-  </tr>
-  <tr>
-    <td valign="top">fork</td>
-    <td valign="top">Run the tests in a separate VM.</td>
-    <td align="center" valign="top">No; default is <code>off</code>.</td>
-  </tr>
-  <tr>
-    <td valign="top">forkmode</td>
-    <td valign="top">Controls how many Java Virtual Machines get
-    created if you want to fork some tests.  Possible values are
-    &quot;perTest&quot; (the default), &quot;perBatch&quot; and
-    &quot;once&quot;.  &quot;once&quot; creates only a single Java VM
-    for all tests while &quot;perTest&quot; creates a new VM for each
-    TestCase class.  &quot;perBatch&quot; creates a VM for each nested
-    <code>&lt;batchtest&gt;</code> and one collecting all nested
-    <code>&lt;test&gt;</code>s.  Note that only tests with the same
-    settings of <code>filtertrace</code>, <code>haltonerror</code>,
-    <code>haltonfailure</code>, <code>errorproperty</code> and
-    <code>failureproperty</code> can share a VM, so even if you set
-    <code>forkmode</code> to &quot;once&quot;, Ant may have to create
-    more than a single Java VM.  This attribute is ignored for tests
-    that don't get forked into a new Java VM.  <em>since Ant 1.6.2</em></td>
-    <td align="center" valign="top">No; default is <code>perTest</code>.</td>
-  </tr>
-  <tr>
-    <td valign="top">haltonerror</td>
-    <td valign="top">Stop the build process if an error occurs during the test
-       run.</td>
-    <td align="center" valign="top">No; default is <code>off</code>.</td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
-<tr>
-    <td valign="top">errorproperty</td>
-    <td valign="top">The name of a property to set in the event of an error.</td>
-    <td align="center" valign="top">No</td>
-</tr>
   <tr>
-    <td valign="top">haltonfailure</td>
-    <td valign="top">Stop the build process if a test fails (errors are
-      considered failures as well).</td>
-    <td align="center" valign="top">No; default is <code>off</code>.</td>
+    <td>printsummary</td>
+    <td>Print one-line statistics for each testcase. Can take the values <q>on</q>, <q>off</q>,
+      and <q>withOutAndErr</q>.  <q>withOutAndErr</q> is the same as <q>on</q> but also includes the
+      output of the test as written to <code>System.out</code> and <code>System.err</code>.</td>
+    <td>No; default is <q>off</q></td>
   </tr>
-<tr>
-    <td valign="top">failureproperty</td>
-    <td valign="top">The name of a property to set in the event of a failure
-      (errors are considered failures as well).</td>
-    <td align="center" valign="top">No.</td>
-</tr>
   <tr>
-    <td valign="top">filtertrace</td>
-    <td valign="top">Filter out Junit and Ant stack frames from error and failure stack traces.</td>
-    <td align="center" valign="top">No; default is <code>on</code>.</td>
-  </tr>
-  <tr>
-    <td valign="top">timeout</td>
-    <td valign="top">Cancel the individual tests if they don't finish
-      in the given time (measured in milliseconds).  Ignored if
-      <code>fork</code> is disabled.  When running multiple tests
-      inside the same Java VM (see forkMode), timeout applies to the
-      time that all tests use together, not to an individual
-      test.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">maxmemory</td>
-    <td valign="top">Maximum amount of memory to allocate to the forked VM.
-      Ignored if <code>fork</code> is disabled. <strong>Note</strong>: 
-      If you get <code>java.lang.OutOfMemoryError: Java heap space</code>
-      in some of your tests then you need to raise the size like
-      <code>maxmemory="128m"</code></td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">jvm</td>
-    <td valign="top">The command used to invoke the Java Virtual Machine,
-      default is 'java'.  The command is resolved by
-      <code>java.lang.Runtime.exec()</code>.
-      Ignored if <code>fork</code> is disabled.</td>
-    <td align="center" valign="top">No; default is <code>java</code>.</td>
-  </tr>
-  <tr>
-    <td valign="top">dir</td>
-    <td valign="top">The directory in which to invoke the VM. Ignored if
-      <code>fork</code> is disabled.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">newenvironment</td>
-    <td valign="top">Do not propagate the old environment when new
-      environment variables are specified. Ignored if <code>fork</code> is
-      disabled.</td>
-    <td align="center" valign="top">No; default is <code>false</code>.</td>
-  </tr>
-  <tr>
-    <td valign="top">includeantruntime</td>
-    <td valign="top">Implicitly add the Ant classes required to run
-      the tests and JUnit to the classpath in forked mode.
-    </td>
-    <td align="center" valign="top">No; default is <code>true</code>.</td>
+    <td>fork</td>
+    <td>Run the tests in a separate JVM.</td>
+    <td>No; default is <q>off</q></td>
   </tr>
   <tr>
-    <td valign="top">showoutput</td>
-    <td valign="top">Send any output generated by tests to Ant's
-      logging system as well as to the formatters.  By default only the
-      formatters receive the output.</td>
-    <td align="center" valign="top">No</td>
+    <td>forkmode</td>
+    <td>Controls how many JVMs get created if you want to fork some tests.  Possible values
+      are <q>perTest</q> (the default), <q>perBatch</q> and <q>once</q>.  <q>once</q> creates only a
+      single JVM for all tests while <q>perTest</q> creates a new JVM for each TestCase
+      class.  <q>perBatch</q> creates a JVM for each nested <code>&lt;batchtest&gt;</code> and one
+      collecting all nested <code>&lt;test&gt;</code>s.  Note that only tests with the same settings
+      of <var>filtertrace</var>, <var>haltonerror</var>, <var>haltonfailure</var>, <var>errorproperty</var>
+      and <var>failureproperty</var> can share a JVM, so even if you set <var>forkmode</var>
+      to <q>once</q>, Ant may have to create more than a single JVM.  This attribute is ignored for
+      tests that don't get forked into a new JVM.  <em>Since Ant 1.6.2</em></td>
+    <td>No; default is <q>perTest</q></td>
   </tr>
   <tr>
-    <td valign="top">outputtoformatters</td>
-    <td valign="top">
-      <em>Since Ant 1.7.0.</em><br/>
-      Send any output generated by tests to the test formatters.
-      This is "true" by default.
-    </td>
-    <td align="center" valign="top">No</td>
+    <td>haltonerror</td>
+    <td>Stop the build process if an error occurs during the test run.</td>
+    <td>No; default is <q>off</q></td>
+  </tr>
+  <tr>
+    <td>errorproperty</td>
+    <td>The name of a property to set in the event of an error.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>haltonfailure</td>
+    <td>Stop the build process if a test fails (errors are considered failures as well).</td>
+    <td>No; default is <q>off</q></td>
+  </tr>
+  <tr>
+    <td>failureproperty</td>
+    <td>The name of a property to set in the event of a failure (errors are considered failures as
+      well).</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>filtertrace</td>
+    <td>Filter out JUnit and Ant stack frames from error and failure stack traces.</td>
+    <td>No; default is <q>on</q></td>
+  </tr>
+  <tr>
+    <td>timeout</td>
+    <td>Cancel the individual tests if they don't finish in the given time (measured in
+      milliseconds).  Ignored if <var>fork</var> is <q>off</q>.  When running multiple tests inside
+      the same JVM (see <var>forkMode</var>), <var>timeout</var> applies to the time that all tests
+      use together, not to an individual test.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>maxmemory</td>
+    <td>Maximum amount of memory to allocate to the forked JVM.  Ignored if <var>fork</var>
+      is <q>off</q>. <strong>Note</strong>: If you get <code>java.lang.OutOfMemoryError: Java heap
+      space</code> in some of your tests then you need to raise the size
+      like <var>maxmemory</var>=<q>128m</q></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>jvm</td>
+    <td>The command used to invoke JVM.  The command is resolved
+      by <code>java.lang.Runtime.exec()</code>.</td>
+    <td>No; default is <kbd>java</kbd>, ignored if <var>fork</var> is <q>false</q></td>
+  </tr>
+  <tr>
+    <td>dir</td>
+    <td>The directory in which to invoke JVM.</td>
+    <td>No, ignored if <var>fork</var> is <q>false</q></td>
+  </tr>
+  <tr>
+    <td>newenvironment</td>
+    <td>Do not propagate the old environment when new environment variables are specified.</td>
+    <td>No; default is <q>false</q>, ignored if <var>fork</var> is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">tempdir</td>
-    <td valign="top">Where Ant should place temporary files.
-      <em>Since Ant 1.6</em>.</td>
-    <td align="center" valign="top">No; default is the project's base
-      directory.</td>
-  </tr>
-  <tr>
-    <td valign="top">reloading</td>
-    <td valign="top">Whether or not a new classloader should be instantiated for each test case.<br>
-    Ignore if <code>fork</code> is set to true.
-      <em>Since Ant 1.6</em>.</td>
-    <td align="center" valign="top">No; default is <code>true</code>.</td>
-  </tr>
-  <tr>
-    <td valign="top">clonevm</td>
-    <td valign="top">If set to true true, then all system properties
-      and the bootclasspath of the forked Java Virtual Machine will be
-      the same as those of the Java VM running Ant.  Default is
-      &quot;false&quot; (ignored if fork is disabled).
-      <em>since Ant 1.7</em></td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">logfailedtests</td>
-    <td valign="top">When Ant executes multiple tests and doesn't stop
-      on errors or failures it will log a "FAILED" message for each
-      failing test to its logging system.  If you set this option to
-      false, the message will not be logged and you have to rely on the
-      formatter output to find the failing tests.
-      <em>since Ant 1.8.0</em></td>
-    <td align="center" valign="top">No</td>
-  </tr>    
-  <tr>
-    <td valign="top">enableTestListenerEvents</td>
-    <td valign="top">Whether Ant should send fine grained information
-      about the running tests to Ant's logging system at the verbose
-      level.  Such events may be used by custom test listeners to show
-      the progress of tests.<br/>
-      Defaults to <code>false</code>.<br/>
-      Can be overridden by a <a href="#enabletestlistenerevents">magic
-        property</a>.<br/>
-      <em>since Ant 1.8.2</em> - <strong>Ant 1.7.0 to 1.8.1 behave as
-        if this attribute was true by default.</strong></td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">threads</td>
-    <td valign="top">a number of threads to run the tests in.<br/>
-      When this attribute is specified the tests will be split arbitrarily among the threads.<br/>
-      requires that the tests be forked with the <code>perTest</code>
-      option to be operative.<br/>
-      <em>since Ant 1.9.4</em></td>
-    <td align="center" valign="top">No</td>
+    <td>includeantruntime</td>
+    <td>Implicitly add the Ant classes required to run the tests and JUnit to the classpath in
+      forked mode.</td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+  <tr>
+    <td>showoutput</td>
+    <td>Send any output generated by tests to Ant's logging system as well as to the
+      formatters.</td>
+    <td>No; by default only the formatters receive the output</td>
+  </tr>
+  <tr>
+    <td>outputtoformatters</td>
+    <td>Send any output generated by tests to the test formatters.  <em>Since Ant 1.7.0</em>.</td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+  <tr>
+    <td>tempdir</td>
+    <td>Where Ant should place temporary files.  <em>Since Ant 1.6</em>.</td>
+    <td>No; default is the project's <var>basedir</var></td>
+  </tr>
+  <tr>
+    <td>reloading</td>
+    <td>Whether or not a new classloader should be instantiated for each test case.<br/>Ignore
+      if <var>fork</var> is set to <q>true</q>.  <em>Since Ant 1.6</em>.</td>
+    <td>No; default is <code>true</code></td>
+  </tr>
+  <tr>
+    <td>clonevm</td>
+    <td>If set to <q>true</q>, then all system properties and the <var>bootclasspath</var> of the
+      forked JVM will be the same as those of the JVM running Ant.  <em>since Ant 1.7</em></td>
+    <td>No; default is <q>false</q>, ignored if <var>fork</var> is <q>false</q></td>
+  </tr>
+  <tr>
+    <td>logfailedtests</td>
+    <td>When Ant executes multiple tests and doesn't stop on errors or failures it will log a
+      "FAILED" message for each failing test to its logging system.  If you set this option
+      to <q>false</q>, the message will not be logged and you have to rely on the formatter output
+      to find the failing tests.  <em>since Ant 1.8.0</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>enableTestListenerEvents</td>
+    <td>Whether Ant should send fine grained information about the running tests to Ant's logging
+      system at the verbose level.  Such events may be used by custom test listeners to show the
+      progress of tests.<br/><em>since Ant 1.8.2</em>&mdash;<strong>Ant 1.7.0 to 1.8.1 behave as if
+      this attribute was <q>true</q> by default.</strong></td>
+    <td>No; defaults to <q>false</q>, can be overridden by
+      a <a href="#enabletestlistenerevents">magic property</a></td>
+  </tr>
+  <tr>
+    <td>threads</td>
+    <td>a number of threads to run the tests in.<br/>When this attribute is specified the tests will
+      be split arbitrarily among the threads.<br/>Requires that the tests be forked with
+      the <q>perTest</q> option to be operative.<br/><em>since Ant 1.9.4</em></td>
+    <td>No</td>
   </tr>
 </table>
 
-<p>By using the <code>errorproperty</code> and <code>failureproperty</code>
-attributes, it is possible to
-perform setup work (such as starting an external server), execute the test,
-clean up, and still fail the build in the event of a failure.</p>
-
-<p>The <code>filtertrace</code> attribute condenses error and failure
-stack traces before reporting them.
-It works with both the plain and XML formatters.  It filters out any lines
-that begin with the following string patterns:<pre>
-   "junit.framework.TestCase"
-   "junit.framework.TestResult"
-   "junit.framework.TestSuite"
-   "junit.framework.Assert."
-   "junit.swingui.TestRunner"
-   "junit.awtui.TestRunner"
-   "junit.textui.TestRunner"
-   "java.lang.reflect.Method.invoke("
-   "sun.reflect."
-   "org.apache.tools.ant."
-   "org.junit."
-   "junit.framework.JUnit4TestAdapter"
-   " more"</pre>
-
-<h3><a name="nested">Nested Elements</a></h3>
-
-<p>The <code>&lt;junit&gt;</code> task
-supports a nested <code>&lt;classpath&gt;</code>
-element that represents a <a href="../using.html#path">PATH like
-structure</a>.</p>
+<p>By using the <var>errorproperty</var> and <var>failureproperty</var> attributes, it is possible
+to perform setup work (such as starting an external server), execute the test, clean up, and still
+fail the build in the event of a failure.</p>
+
+<p>The <var>filtertrace</var> attribute condenses error and failure stack traces before reporting
+them.  It works with both the plain and XML formatters.  It filters out any lines that begin with
+the following string patterns:</p>
+
+<pre>
+   &quot;junit.framework.TestCase&quot;
+   &quot;junit.framework.TestResult&quot;
+   &quot;junit.framework.TestSuite&quot;
+   &quot;junit.framework.Assert.&quot;
+   &quot;junit.swingui.TestRunner&quot;
+   &quot;junit.awtui.TestRunner&quot;
+   &quot;junit.textui.TestRunner&quot;
+   &quot;java.lang.reflect.Method.invoke(&quot;
+   &quot;sun.reflect.&quot;
+   &quot;org.apache.tools.ant.&quot;
+   &quot;org.junit.&quot;
+   &quot;junit.framework.JUnit4TestAdapter&quot;
+   &quot; more&quot;</pre>
 
-<p>As of Ant 1.7, this classpath may be used to refer to <code>junit.jar</code>
-as well as your tests and the tested code.
+<h3 id="nested">Parameters specified as nested elements</h3>
+
+<p>The <code>&lt;junit&gt;</code> task supports a nested <code>&lt;classpath&gt;</code> element that
+represents a <a href="../using.html#path">path-like structure</a>.</p>
+
+<p><em>Since Ant 1.7</em>, this classpath may be used to refer to <samp>junit.jar</samp> as well as
+your tests and the tested code.</p>
 
 <h4>jvmarg</h4>
 
-<p>If <code>fork</code> is enabled, additional parameters may be passed to
-the new VM via nested <code>&lt;jvmarg&gt;</code> elements. For example:</p>
+<p>If <var>fork</var> is <q>true</q>, additional parameters may be passed to the new JVM via
+nested <code>&lt;jvmarg&gt;</code> elements. For example:</p>
 
 <pre>
 &lt;junit fork=&quot;yes&quot;&gt;
@@ -304,18 +244,17 @@
 &lt;/junit&gt;
 </pre>
 
-<p>would run the test in a VM without JIT.</p>
+<p>would run the test in a JVM without JIT.</p>
 
-<p><code>&lt;jvmarg&gt;</code> allows all attributes described in <a
-href="../using.html#arg">Command-line Arguments</a>.</p>
+<p><code>&lt;jvmarg&gt;</code> allows all attributes described
+in <a href="../using.html#arg">Command-line Arguments</a>.</p>
 
 <h4>sysproperty</h4>
 
-<p>Use nested <code>&lt;sysproperty&gt;</code> elements to specify system
-properties required by the class. These properties will be made available
-to the VM during the execution of the test (either ANT's VM or the forked VM,
-if <code>fork</code> is enabled).
-The attributes for this element are the same as for <a href="../Tasks/exec.html#env">environment variables</a>.</p>
+<p>Use nested <code>&lt;sysproperty&gt;</code> elements to specify system properties required by the
+class. These properties will be made available to JVM during the execution of the test (either Ant's
+JVM or the forked JVM, if <var>fork</var>=<q>true</q>).  The attributes for this element are the
+same as for <a href="../Tasks/exec.html#env">environment variables</a>.</p>
 
 <pre>
 &lt;junit fork=&quot;no&quot;&gt;
@@ -324,369 +263,351 @@
 &lt;/junit&gt;
 </pre>
 
-<p>would run the test in ANT's VM and make the <code>basedir</code> property
-available to the test.</p>
+<p>would run the test in Ant's JVM and make the <code>basedir</code> property available to the
+test.</p>
 
 <h4>syspropertyset</h4>
 
+<p><em>Since Ant 1.6</em></p>
+
 <p>You can specify a set of properties to be used as system properties
 with <a href="../Types/propertyset.html">syspropertyset</a>s.</p>
 
-<p><em>since Ant 1.6</em>.</p>
-
 <h4>env</h4>
 
-<p>It is possible to specify environment variables to pass to the
-forked VM via nested <code>&lt;env&gt;</code> elements. For a description
-of the <code>&lt;env&gt;</code> element's attributes, see the
-description in the <a href="../Tasks/exec.html#env">exec</a> task.</p>
+<p>It is possible to specify environment variables to pass to the forked JVM via
+nested <code>&lt;env&gt;</code> elements. For a description of the <code>&lt;env&gt;</code>
+element's attributes, see the description in the <a href="../Tasks/exec.html#env">exec</a> task.</p>
 
-<p>Settings will be ignored if <code>fork</code> is disabled.</p>
+<p>Settings will be ignored if <var>fork</var>=<q>false</q>.</p>
 
 <h4>bootclasspath</h4>
 
-<p>The location of bootstrap class files can be specified using this
-<a href="../using.html#path">PATH like structure</a> - will be ignored
-if <i>fork</i> is not <code>true</code> or the target VM doesn't
-support it (i.e. Java 1.1).</p>
+<p><em>Since Ant 1.6</em>.</p>
 
-<p><em>since Ant 1.6</em>.</p>
+<p>The location of bootstrap class files can be specified using
+this <a href="../using.html#path">path-like structure</a>&mdash;will be ignored if <var>fork</var>
+is <q>false</q> or the target JVM doesn't support it (i.e. Java 1.1).</p>
 
 <h4>permissions</h4>
-<p>Security permissions can be revoked and granted during the execution of the 
-class via a nested <i>permissions</i> element. For more information please
+
+<p><em>Since Ant 1.6</em>.</p>
+
+<p>Security permissions can be revoked and granted during the execution of the class via a
+nested <code>permissions</code> element. For more information please
 see <a href="../Types/permissions.html">permissions</a></p>
 
-<p>Settings will be ignored if fork is enabled.</p>
+<p>Settings will be ignored if <var>fork</var>=<q>true</q>.</p>
 
-<p><em>since Ant 1.6</em>.</p>
- 
 <h4>assertions</h4>
 
-<p>You can control enablement of Java 1.4 assertions with an
-<a href="../Types/assertions.html"><tt>&lt;assertions&gt;</tt></a>
-subelement.</p>
- 
-<p>Assertion statements are currently ignored in non-forked mode.</p>
+<p><em>Since Ant 1.6</em>.</p>
+
+<p>You can control enablement of Java 1.4 assertions with
+an <a href="../Types/assertions.html"><code>&lt;assertions&gt;</code></a> subelement.</p>
 
-<p><em>since Ant 1.6.</em></p>
+<p>Assertion statements are currently ignored in non-forked mode.</p>
 
 <h4>modulepath</h4>
 
-<p>The location of modules can be specified using this <a href="../using.html#path">PATH like structure</a>.<br/>
-The modulepath requires <i>fork</i> to be set to <code>true</code>.
+<p><em>Since Ant 1.9.8</em></p>
 
-<p><em>since Ant 1.9.8</em></p>
+<p>The location of modules can be specified using this <a href="../using.html#path">path-like
+structure</a>.<br/>The <code>modulepath</code> requires <var>fork</var> to be set to <q>true</q>.
 
 <h4>upgrademodulepath</h4>
 
-<p>The location of modules that replace upgradeable modules in the runtime image
-can be specified using this <a href="../using.html#path">PATH like structure</a>.<br/>
-The upgrademodulepath requires <i>fork</i> to be set to <code>true</code>.
+<p><em>Since Ant 1.9.8</em></p>
 
-<p><em>since Ant 1.9.8</em></p>
+<p>The location of modules that replace upgradeable modules in the runtime image can be specified
+using this <a href="../using.html#path">path-like
+structure</a>.<br/>The <code>upgrademodulepath</code> requires <var>fork</var> to be set
+to <q>true</q>.</p>
 
 <h4>formatter</h4>
 
-<p>The results of the tests can be printed in different
-formats. Output will always be sent to a file, unless you set the
-<code>usefile</code> attribute to <code>false</code>.
-The name of the file is determined by the
-name of the test and can be set by the <code>outfile</code> attribute
+<p>The results of the tests can be printed in different formats. Output will always be sent to a
+file, unless you set the <var>usefile</var> attribute to <q>false</q>.  The name of the file is
+determined by the name of the test and can be set by the <var>outfile</var> attribute
 of <code>&lt;test&gt;</code>.</p>
 
-<p>There are four predefined formatters - one prints the test results
-in XML format, the other emits plain text.  The formatter named
-<code>brief</code> will only print detailed information for testcases
-that failed, while <code>plain</code> gives a little statistics line
-for all test cases.  Custom formatters that need to implement
-<code>org.apache.tools.ant.taskdefs.optional.junit.JUnitResultFormatter</code>
+<p>There are four predefined formatters&mdash;one prints the test results in XML format, the other
+emits plain text.  The formatter named <q>brief</q> will only print detailed information for test
+cases that failed, while <q>plain</q> gives a little statistics line for all test cases.  Custom
+formatters that need to
+implement <code class="code">org.apache.tools.ant.taskdefs.optional.junit.JUnitResultFormatter</code>
 can be specified.</p>
 
-<p>If you use the XML formatter, it may not include the same output
-that your tests have written as some characters are illegal in XML
-documents and will be dropped.</p>
-
-<p>The fourth formatter named <code>failure</code> (since Ant 1.8.0) 
-collects all failing <code>testXXX()</code>
-methods and creates a new <code>TestCase</code> which delegates only these
-failing methods. The name and the location can be specified via Java System property or Ant property
-<code>ant.junit.failureCollector</code>. The value has to point to the directory and 
-the name of the resulting class (without suffix). It defaults to <i>java-tmp-dir</i>/FailedTests.</p>
+<p>If you use the XML formatter, it may not include the same output that your tests have written as
+some characters are illegal in XML documents and will be dropped.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<p>The fourth formatter named <q>failure</q> (<em>since Ant 1.8.0</em>) collects all
+failing <code class="code">testXXX()</code> methods and creates a
+new <code class="code">TestCase</code> which delegates only these failing methods. The name and the
+location can be specified via Java system property or Ant
+property <code>ant.junit.failureCollector</code>. The value has to point to the directory and the
+name of the resulting class (without suffix). It defaults
+to <samp><i>java-tmp-dir</i>/FailedTests</samp>.</p>
+
+<table class="attr">
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <th>Attribute</th>
+  <th>Description</th>
+  <th>Required</th>
 </tr>
   <tr>
-    <td valign="top">type</td>
-    <td valign="top">Use a predefined formatter (either
-      <code>xml</code>, <code>plain</code>, <code>brief</code> or <code>failure</code>).</td>
-    <td align="center" rowspan="2">Exactly one of these.</td>
+    <td>type</td>
+    <td>Use a predefined formatter (either <q>xml</q>, <q>plain</q>, <q>brief</q>
+      or <q>failure</q>).</td>
+    <td rowspan="2">Exactly one of these</td>
   </tr>
   <tr>
-    <td valign="top">classname</td>
-    <td valign="top">Name of a custom formatter class.</td>
+    <td>classname</td>
+    <td class="left">Name of a custom formatter class.</td>
   </tr>
   <tr>
-    <td valign="top">extension</td>
-    <td valign="top">Extension to append to the output filename.</td>
-    <td align="center">Yes, if <code>classname</code> has been used.</td>
+    <td>extension</td>
+    <td>Extension to append to the output filename.</td>
+    <td>Yes, if <var>classname</var> has been used</td>
   </tr>
   <tr>
-    <td valign="top">usefile</td>
-    <td valign="top">Boolean that determines whether output should be
-      sent to a file.</td>
-    <td align="center">No; default is <code>true</code>.</td>
+    <td>usefile</td>
+    <td>Boolean that determines whether output should be sent to a file.</td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">if</td>
-    <td valign="top">Only use formatter <a href="../properties.html#if+unless">if the named property is set</a>.</td>
-    <td align="center">No; default is <code>true</code>.</td>
+    <td>if</td>
+    <td>Only use formatter <a href="../properties.html#if+unless">if the named property is
+      set</a>.</td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">unless</td>
-    <td valign="top">Only use formatter <a href="../properties.html#if+unless">if the named property is <b>not</b> set</a>.</td>
-    <td align="center">No; default is <code>true</code>.</td>
-  </tr>  
+    <td>unless</td>
+    <td>Only use formatter <a href="../properties.html#if+unless">if the named property
+      is <strong>not</strong> set</a>.</td>
+    <td>No; default is <q>true</q></td>
+  </tr>
 </table>
 
 <h4>test</h4>
 
 <p>Defines a single test class.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
-<tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
-</tr>
+<table class="attr">
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">Name of the test class.</td>
-    <td align="center">Yes</td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">methods</td>
-    <td valign="top">Comma-separated list of names of test case methods to execute.
-      <em>Since 1.8.2</em>
-      <p>The <code>methods</code> attribute can be useful in the following scenarios:</p>
+    <td>name</td>
+    <td>Name of the test class.</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>methods</td>
+    <td>Comma-separated list of names of test case methods to execute.  <em>Since 1.8.2</em>
+      <p>The <var>methods</var> attribute can be useful in the followiang scenarios:</p>
       <ul>
-        <li>A test method has failed and you want to re-run the test method
-            to test a fix or re-run the test under the Java debugger without
-            having to wait for the other (possibly long running) test methods
-            to complete.</li>
-        <li>One or more test methods are running slower than expected and you
-            want to re-run them under a Java profiler (without the overhead
-            of running the profiler whilst other test methods are being
-            executed).</li>
+        <li>A test method has failed and you want to re-run the test method to test a fix or re-run
+          the test under the Java debugger without having to wait for the other (possibly long
+          running) test methods to complete.</li>
+        <li>One or more test methods are running slower than expected and you want to re-run them
+          under a Java profiler (without the overhead of running the profiler whilst other test
+          methods are being executed).</li>
       </ul>
-      <p>If the <code>methods</code> attribute is used but no test method
-      is specified, then no test method from the suite will be executed.</p>
+      <p>If the <var>methods</var> attribute is used but no test method is specified, then no test
+        method from the suite will be executed.</p>
     </td>
-    <td align="center">No; default is to run all test methods in the suite.</td>
-  </tr>  
+    <td>No; default is to run all test methods in the suite</td>
+  </tr>
   <tr>
-    <td valign="top">fork</td>
-    <td valign="top">Run the tests in a separate VM.
-      Overrides value set in <code>&lt;junit&gt;</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>fork</td>
+    <td>Run the tests in a separate JVM.  Overrides value set in <code>&lt;junit&gt;</code>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">haltonerror</td>
-    <td valign="top">Stop the build process if an error occurs during the test
-       run. Overrides value set in <code>&lt;junit&gt;</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>haltonerror</td>
+    <td>Stop the build process if an error occurs during the test run. Overrides value set
+       in <code>&lt;junit&gt;</code>.</td>
+    <td>No</td>
   </tr>
-<tr>
-    <td valign="top">errorproperty</td>
-    <td valign="top">The name of a property to set in the event of an error.
-      Overrides value set in <code>&lt;junit&gt;</code>.</td>
-    <td align="center" valign="top">No</td>
-</tr>
   <tr>
-    <td valign="top">haltonfailure</td>
-    <td valign="top">Stop the build process if a test fails (errors are
-      considered failures as well).  Overrides value set in
-      <code>&lt;junit&gt;</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>errorproperty</td>
+    <td>The name of a property to set in the event of an error.  Overrides value set
+      in <code>&lt;junit&gt;</code>.</td>
+    <td>No</td>
   </tr>
-<tr>
-    <td valign="top">failureproperty</td>
-    <td valign="top">The name of a property to set in the event of a failure
-      (errors are considered failures as well). Overrides value set in
-      <code>&lt;junit&gt;</code>.</td>
-    <td align="center" valign="top">No</td>
-</tr>
   <tr>
-    <td valign="top">filtertrace</td>
-    <td valign="top">Filter out Junit and Ant stack frames from error and failure stack
-    traces.  Overrides value set in <code>&lt;junit&gt;</code>.</td>
-    <td align="center" valign="top">No; default is <code>on</code>.</td>
-  </tr>
-  <tr>
-    <td valign="top">todir</td>
-    <td valign="top">Directory to write the reports to.</td>
-    <td align="center" valign="top">No; default is the current directory.</td>
-  </tr>
-  <tr>
-    <td valign="top">outfile</td>
-    <td valign="top">Base name of the test result. The full filename is
-      determined by this attribute and the extension of
-      <code>formatter</code>.</td>
-    <td align="center" valign="top">No; default is
-      <code>TEST-</code><em>name</em>, where <em>name</em> is the name of
-      the test specified in the <code>name</code> attribute.</td>
-  </tr>
-  <tr>
-    <td valign="top">if</td>
-    <td valign="top">Only run test <a href="../properties.html#if+unless">if the named property is set</a>.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">unless</td>
-    <td valign="top">Only run test <a href="../properties.html#if+unless">if the named property is <b>not</b> set</a>.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">skipNonTests</td>
-    <td valign="top">Do not pass any classes that do not contain JUnit tests to the test runner.
-          This prevents non tests from appearing as test errors in test results.<br />
-          Tests are identified by looking for the <code>@Test</code> annotation on any methods in concrete classes
-          that don't extend <code>junit.framework.TestCase</code>, or for public/protected methods with
-          names starting with 'test' in concrete classes that extend <code>junit.framework.TestCase</code>.
-          Classes marked with the JUnit4 <code>org.junit.runner.RunWith</code> or
-          <code>org.junit.runner.Suite.SuiteClasses</code> annotations are also passed to JUnit for execution,
-          as is any class with a public/protected no-argument <code>suite</code> method.</td>
-    <td align="center" valign="top">No. Default is false.</td>
+    <td>haltonfailure</td>
+    <td>Stop the build process if a test fails (errors are considered failures as well).  Overrides
+      value set in <code>&lt;junit&gt;</code>.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>failureproperty</td>
+    <td>The name of a property to set in the event of a failure (errors are considered failures as
+      well). Overrides value set in <code>&lt;junit&gt;</code>.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>filtertrace</td>
+    <td>Filter out JUnit and Ant stack frames from error and failure stack traces.  Overrides value
+      set in <code>&lt;junit&gt;</code>.</td>
+    <td>No; default is <q>on</q></td>
+  </tr>
+  <tr>
+    <td>todir</td>
+    <td>Directory to write the reports to.</td>
+    <td>No; default is the current directory</td>
+  </tr>
+  <tr>
+    <td>outfile</td>
+    <td>Base name of the test result. The full filename
+    is <var>outfile</var>.<var>formatter</var>.</td>
+    <td>No; default is <samp>TEST-</samp><var>name</var></td>
+  </tr>
+  <tr>
+    <td>if</td>
+    <td>Only run test <a href="../properties.html#if+unless">if the named property is set</a>.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>unless</td>
+    <td>Only run test <a href="../properties.html#if+unless">if the named property
+    is <strong>not</strong> set</a>.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>skipNonTests</td>
+    <td>Do not pass any classes that do not contain JUnit tests to the test runner.  This prevents
+      non tests from appearing as test errors in test results.<br/>Tests are identified by looking
+      for the <code>@Test</code> annotation on any methods in concrete classes that don't
+      extend <code>junit.framework.TestCase</code>, or for public/protected methods with names
+      starting with <q>test</q> in concrete classes that
+      extend <code>junit.framework.TestCase</code>.  Classes marked with the JUnit
+      4 <code>org.junit.runner.RunWith</code> or <code>org.junit.runner.Suite.SuiteClasses</code>
+      annotations are also passed to JUnit for execution, as is any class with a public/protected
+      no-argument <code>suite()</code> method.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
 </table>
 
-<p>Tests can define their own formatters via nested
-<code>&lt;formatter&gt;</code> elements.</p>
+<p>Tests can define their own formatters via nested <code>&lt;formatter&gt;</code> elements.</p>
 
 <h4>batchtest</h4>
 
 <p>Define a number of tests based on pattern matching.</p>
 
-<p><code>batchtest</code> collects the included <a href="../Types/resources.html">resources</a> from any number
-of nested <a
-href="../Types/resources.html#collection">Resource Collection</a>s. It then
-generates a test class name for each resource that ends in
-<code>.java</code> or <code>.class</code>.</p>
-
-<p>Any type of Resource Collection is supported as a nested element,
-prior to Ant 1.7 only <code>&lt;fileset&gt;</code> has been
-supported.</p>
+<p><code>batchtest</code> collects the included <a href="../Types/resources.html">resources</a> from
+any number of nested <a href="../Types/resources.html#collection">resource collections</a>. It then
+generates a test class name for each resource that ends in <samp>.java</samp>
+or <samp>.class</samp>.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
-<tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
-</tr>
+<p>Any type of resource collection is supported as a nested element, prior to Ant 1.7
+only <code>&lt;fileset&gt;</code> has been supported.</p>
+
+<table class="attr">
   <tr>
-    <td valign="top">fork</td>
-    <td valign="top">Run the tests in a separate VM.
-      Overrides value set in <code>&lt;junit&gt;</code>.</td>
-    <td align="center" valign="top">No</td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">haltonerror</td>
-    <td valign="top">Stop the build process if an error occurs during the test
-       run. Overrides value set in <code>&lt;junit&gt;</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>fork</td>
+    <td>Run the tests in a separate JVM.  Overrides value set in <code>&lt;junit&gt;</code>.</td>
+    <td>No</td>
   </tr>
-<tr>
-    <td valign="top">errorproperty</td>
-    <td valign="top">The name of a property to set in the event of an error.
-      Overrides value set in <code>&lt;junit&gt;</code>.</td>
-    <td align="center" valign="top">No</td>
-</tr>
   <tr>
-    <td valign="top">haltonfailure</td>
-    <td valign="top">Stop the build process if a test fails (errors are
-      considered failures as well).  Overrides value set in
-      <code>&lt;junit&gt;</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>haltonerror</td>
+    <td>Stop the build process if an error occurs during the test run. Overrides value set
+      in <code>&lt;junit&gt;</code>.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>errorproperty</td>
+    <td>The name of a property to set in the event of an error.  Overrides value set
+      in <code>&lt;junit&gt;</code>.</td>
+    <td>No</td>
   </tr>
-<tr>
-    <td valign="top">failureproperty</td>
-    <td valign="top">The name of a property to set in the event of a failure
-      (errors are considered failures as well). Overrides value set in
-      <code>&lt;junit&gt;</code></td>
-    <td align="center" valign="top">No</td>
-</tr>
   <tr>
-    <td valign="top">filtertrace</td>
-    <td valign="top">Filter out Junit and Ant stack frames from error and failure stack
-    traces.  Overrides value set in <code>&lt;junit&gt;</code>.</td>
-    <td align="center" valign="top">No; default is <code>on</code>.</td>
+    <td>haltonfailure</td>
+    <td>Stop the build process if a test fails (errors are considered failures as well).  Overrides
+      value set in <code>&lt;junit&gt;</code>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">todir</td>
-    <td valign="top">Directory to write the reports to.</td>
-    <td align="center" valign="top">No; default is the current directory.</td>
+    <td>failureproperty</td>
+    <td>The name of a property to set in the event of a failure (errors are considered failures as
+      well). Overrides value set in <code>&lt;junit&gt;</code></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">if</td>
-    <td valign="top">Only run tests <a href="../properties.html#if+unless">if the named property is set</a>.</td>
-    <td align="center" valign="top">No</td>
+    <td>filtertrace</td>
+    <td>Filter out JUnit and Ant stack frames from error and failure stack traces.  Overrides value
+      set in <code>&lt;junit&gt;</code>.</td>
+    <td>No; default is <q>on</q></td>
   </tr>
   <tr>
-    <td valign="top">unless</td>
-    <td valign="top">Only run tests <a href="../properties.html#if+unless">if the named property is <strong>not</strong> set</a>.</td>
-    <td align="center" valign="top">No</td>
+    <td>todir</td>
+    <td>Directory to write the reports to.</td>
+    <td>No; default is the current directory</td>
   </tr>
   <tr>
-      <td valign="top">skipNonTests</td>
-      <td valign="top">Do not pass any classes that do not contain JUnit tests to the test runner.
-                          This prevents non tests from appearing as test errors in test results.<br />
-                          Tests are identified by looking for the <code>@Test</code> annotation on any methods in concrete classes
-                          that don't extend <code>junit.framework.TestCase</code>, or for public/protected methods with
-                          names starting with 'test' in concrete classes that extend <code>junit.framework.TestCase</code>.
-                          Classes marked with the JUnit4 <code>org.junit.runner.RunWith</code> or
-                          <code>org.junit.runner.Suite.SuiteClasses</code> annotations are also passed to JUnit for execution,
-                          as is any class with a public/protected no-argument <code>suite</code> method.</td>
-      <td align="center" valign="top">No. Default is false.</td>
+    <td>if</td>
+    <td>Only run tests <a href="../properties.html#if+unless">if the named property is set</a>.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>unless</td>
+    <td>Only run tests <a href="../properties.html#if+unless">if the named property
+      is <strong>not</strong> set</a>.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>skipNonTests</td>
+    <td>Do not pass any classes that do not contain JUnit tests to the test runner.  This prevents
+      non tests from appearing as test errors in test results.<br/>Tests are identified by looking
+      for the <code>@Test</code> annotation on any methods in concrete classes that don't
+      extend <code>junit.framework.TestCase</code>, or for public/protected methods with names
+      starting with <q>test</q> in concrete classes that
+      extend <code>junit.framework.TestCase</code>.  Classes marked with the JUnit
+      4 <code>org.junit.runner.RunWith</code> or <code>org.junit.runner.Suite.SuiteClasses</code>
+      annotations are also passed to JUnit for execution, as is any class with a public/protected
+      no-argument <code>suite()</code> method.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
 </table>
 
-<p>Batchtests can define their own formatters via nested
-<code>&lt;formatter&gt;</code> elements.</p>
+<p>Batch tests can define their own formatters via nested <code>&lt;formatter&gt;</code>
+elements.</p>
 
-<h3>Forked tests and <code>tearDown</code></h3>
+<h3>Forked tests and <code>tearDown()</code></h3>
 
-<p>If a forked test runs into a timeout, Ant will terminate the Java
-  VM process it has created, which probably means the
-  test's <code>tearDown</code> method will never be called.  The same
-  is true if the forked VM crashes for some other reason.</p>
-
-<p>Starting with Ant 1.8.0, a special formatter is distributed with
-  Ant that tries to load the testcase that was in the forked VM and
-  invoke that class' <code>tearDown</code> method.  This formatter has
-  the following limitations:</p>
+<p>If a forked test runs into a timeout, Ant will terminate the JVM process it has created, which
+probably means the test's <code class="code">tearDown()</code> method will never be called.  The
+same is true if the forked JVM crashes for some other reason.</p>
+
+<p><em>Since Ant 1.8.0</em>, a special formatter is distributed with Ant that tries to load the
+testcase that was in the forked JVM and invoke that class' <code class="code">tearDown()</code>
+method.  This formatter has the following limitations:</p>
 
 <ul>
-  <li>It runs in the same Java VM as Ant itself, this is a different
-    Java VM than the one that was executing the test and it may see a
-    different classloader (and thus may be unable to load the test
+  <li>It runs in the same JVM as Ant itself, this is a different JVM than the one that was executing
+    the test and it may see a different classloader (and thus may be unable to load the test
     class).</li>
-  <li>It cannot determine which test was run when the timeout/crash
-    occurred if the forked VM was running multiple test.  I.e. the
-    formatter cannot work with any <code>forkMode</code> other
-    than <code>perTest</code> and it won't do anything if the test
-    class contains a <code>suite()</code> method.</li>
+  <li>It cannot determine which test was run when the timeout/crash occurred if the forked JVM was
+    running multiple tests.  I.e. the formatter cannot work with any <var>forkMode</var> other
+    than <q>perTest</q> and it won't do anything if the test class contains
+    a <code class="code">suite()</code> method.</li>
 </ul>
 
-<p>If the formatter recognizes an incompatible <code>forkMode</code>
-  or a <code>suite</code> method or fails to load the test class it
-  will silently do nothing.</p>
+<p>If the formatter recognizes an incompatible <var>forkMode</var> or
+a <code class="code">suite()</code> method or fails to load the test class it will silently do
+nothing.</p>
 
-<p>The formatter doesn't have any effect on tests that were not
-  forked or didn't cause timeouts or VM crashes.</p>
+<p>The formatter doesn't have any effect on tests that were not forked or didn't cause timeouts or
+JVM crashes.</p>
 
 <p>To enable the formatter, add a <code>formatter</code> like</p>
 
@@ -697,76 +618,64 @@
 
 <p>to your <code>junit</code> task.</p>
 
-<h3><a name="enabletestlistenerevents"><code>ant.junit.enabletestlistenerevents</code></a>
-  magic property</h3>
+<h3 id="enabletestlistenerevents"><code>ant.junit.enabletestlistenerevents</code> magic property</h3>
 
-<p><em>Since Ant 1.8.2</em> the <code>enableTestListenerEvents</code>
-  attribute of the task controls whether fine grained logging messages
-  will be sent to the task's verbose log.  In addition to this
-  attribute Ant will consult the
-  property <code>ant.junit.enabletestlistenerevents</code> and the
-  value of the property overrides the setting of the attribute.</p>
-
-<p>This property exists so that containers running Ant that depend on
-  the additional logging events can ensure they will be generated even
-  if the build file disables them.</p>
+<p><em>Since Ant 1.8.2</em> the <var>enableTestListenerEvents</var> attribute of the task controls
+whether fine grained logging messages will be sent to the task's verbose log.  In addition to this
+attribute Ant will consult the property <code>ant.junit.enabletestlistenerevents</code> and the
+value of the property overrides the setting of the attribute.</p>
+
+<p>This property exists so that containers running Ant that depend on the additional logging events
+can ensure they will be generated even if the build file disables them.</p>
 
 <h3>Examples</h3>
 
 <pre>
 &lt;junit&gt;
-  &lt;test name="my.test.TestCase"/&gt;
-&lt;/junit&gt;
-</pre>
+    &lt;test name="my.test.TestCase"/&gt;
+&lt;/junit&gt;</pre>
 
-<p>Runs the test defined in <code>my.test.TestCase</code> in the same
-VM. No output will be generated unless the test fails.</p>
+<p>Runs the test defined in <code>my.test.TestCase</code> in the same VM. No output will be
+generated unless the test fails.</p>
 
 <pre>
 &lt;junit printsummary="yes" fork="yes" haltonfailure="yes"&gt;
-  &lt;formatter type="plain"/&gt;
-  &lt;test name="my.test.TestCase"/&gt;
-&lt;/junit&gt;
-</pre>
-
-<p>Runs the test defined in <code>my.test.TestCase</code> in a
-separate VM.  At the end of the test, a one-line summary will be
-printed. A detailed report of the test can be found in
-<code>TEST-my.test.TestCase.txt</code>. The build process will be
-stopped if the test fails.</p>
+    &lt;formatter type="plain"/&gt;
+    &lt;test name="my.test.TestCase"/&gt;
+&lt;/junit&gt;</pre>
+
+<p>Runs the test defined in <code>my.test.TestCase</code> in a separate JVM.  At the end of the
+test, a one-line summary will be printed. A detailed report of the test can be found
+in <samp>TEST-my.test.TestCase.txt</samp>. The build process will be stopped if the test fails.</p>
 
 <pre>
 &lt;junit printsummary="yes" haltonfailure="yes"&gt;
-  &lt;classpath&gt;
-    &lt;pathelement location="${build.tests}"/&gt;
-    &lt;pathelement path="${java.class.path}"/&gt;
-  &lt;/classpath&gt;
-
-  &lt;formatter type="plain"/&gt;
-
-  &lt;test name="my.test.TestCase" haltonfailure="no" outfile="result"&gt;
-    &lt;formatter type="xml"/&gt;
-  &lt;/test&gt;
-
-  &lt;batchtest fork="yes" todir="${reports.tests}"&gt;
-    &lt;fileset dir="${src.tests}"&gt;
-      &lt;include name="**/*Test*.java"/&gt;
-      &lt;exclude name="**/AllTests.java"/&gt;
-    &lt;/fileset&gt;
-  &lt;/batchtest&gt;
-&lt;/junit&gt;
-</pre>
-
-<p>Runs <code>my.test.TestCase</code> in the same VM, ignoring the
-given CLASSPATH; only a warning is printed if this test fails. In
-addition to the plain text test results, for this test a XML result
-will be output to <code>result.xml</code>.  
-Then, for each matching file in the directory defined for
-<code>${src.tests}</code> a
-test is run in a separate VM. If a test fails, the build process is
-aborted. Results are collected in files named
-<code>TEST-</code><em>name</em><code>.txt</code> and written to
-<code>${reports.tests}</code>.</p>
+    &lt;classpath&gt;
+        &lt;pathelement location="${build.tests}"/&gt;
+        &lt;pathelement path="${java.class.path}"/&gt;
+    &lt;/classpath&gt;
+
+    &lt;formatter type="plain"/&gt;
+
+    &lt;test name="my.test.TestCase" haltonfailure="no" outfile="result"&gt;
+        &lt;formatter type="xml"/&gt;
+    &lt;/test&gt;
+
+    &lt;batchtest fork="yes" todir="${reports.tests}"&gt;
+        &lt;fileset dir="${src.tests}"&gt;
+            &lt;include name="**/*Test*.java"/&gt;
+            &lt;exclude name="**/AllTests.java"/&gt;
+        &lt;/fileset&gt;
+    &lt;/batchtest&gt;
+&lt;/junit&gt;</pre>
+
+<p>Runs <code>my.test.TestCase</code> in the same JVM, ignoring the given <code>CLASSPATH</code>;
+only a warning is printed if this test fails. In addition to the plain text test results, for this
+test a XML result will be output to <samp>result.xml</samp>.  Then, for each matching file in the
+directory defined for <samp>${src.tests}</samp> a test is run in a separate JVM. If a test fails,
+the build process is aborted. Results are collected in files
+named <samp>TEST-</samp><var>name</var><samp>.txt</samp> and written
+to <samp>${reports.tests}</samp>.</p>
 
 <pre>
 &lt;target name=&quot;test&quot;&gt;
@@ -776,7 +685,7 @@
     &lt;delete&gt;
         &lt;fileset dir=&quot;${collector.dir}&quot; includes=&quot;${collector.class}*.class&quot;/&gt;
     &lt;/delete&gt;
-    &lt;!-- compile the FailedTests class if present --&gt; 
+    &lt;!-- compile the FailedTests class if present --&gt;
     &lt;javac srcdir=&quot;${collector.dir}&quot; destdir=&quot;${collector.dir}&quot;/&gt;
     &lt;available file=&quot;${collector.dir}/${collector.class}.class&quot; property=&quot;hasFailingTests&quot;/&gt;
     &lt;junit haltonerror=&quot;false&quot; haltonfailure=&quot;false&quot;&gt;
@@ -798,60 +707,60 @@
             &lt;formatter type=&quot;plain&quot; usefile=&quot;false&quot;/&gt;
         &lt;/test&gt;
     &lt;/junit&gt;
-&lt;/target&gt;
-</pre>
+&lt;/target&gt;</pre>
 <p>On the first run all tests are collected via the <code>&lt;batchtest/&gt;</code>
-element. Its <code>plain</code> formatter shows the output on the console. The
-<code>failure</code> formatter creates a java source file in 
-<code>${build.dir}/failingTests/FailedTests.java</code> which extends 
-<code>junit.framework.TestCase</code> and returns from a <code>suite()</code>
-method a test suite for the failing tests. <br/>
-On a second run the collector class exists and instead of the <code>&lt;batchtest/&gt;</code>
-the single <code>&lt;test/&gt;</code> will run. So only the failing test cases are re-run.
-The two nested formatters are for displaying (for the user) and for updating the collector
-class.
-</p>
+element. Its <var>plain</var> formatter shows the output on the console. The <var>failure</var>
+formatter creates a Java source file in <samp>${build.dir}/failingTests/FailedTests.java</samp>
+which extends <code>junit.framework.TestCase</code> and returns from a <code>suite()</code> method a
+test suite for the failing tests.<br/>  On a second run the collector class exists and instead of
+the <code>&lt;batchtest/&gt;</code> the single <code>&lt;test/&gt;</code> will run. So only the
+failing test cases are re-run.  The two nested formatters are for displaying (for the user) and for
+updating the collector class.</p>
 <pre>
-    &lt;junit fork="true"
-        jvm="${platform.java}"&gt;
-        &lt;jvmarg line="--patch-module ${module.name}=${build.test.classes}"/&gt;
-        &lt;jvmarg line="--add-modules ${module.name}"/&gt;
-        &lt;jvmarg line="--add-reads ${module.name}=ALL-UNNAMED"/&gt;
-        &lt;jvmarg line="--add-exports ${module.name}/my.test=ALL-UNNAMED"/&gt;
-        &lt;classpath&gt;
-            &lt;pathelement path="${libs.junit}"/&gt;
-        &lt;/classpath&gt;
-        &lt;modulepath&gt;
-            &lt;pathelement path="${modules}:${build.classes}"/&gt;
-        &lt;/modulepath&gt;
-        &lt;formatter type="plain"/&gt;
-        &lt;test name="my.test.TestCase"/&gt;
-    &lt;/junit&gt;
+&lt;junit fork="true"
+       jvm="${platform.java}"&gt;
+    &lt;jvmarg line="--patch-module ${module.name}=${build.test.classes}"/&gt;
+    &lt;jvmarg line="--add-modules ${module.name}"/&gt;
+    &lt;jvmarg line="--add-reads ${module.name}=ALL-UNNAMED"/&gt;
+    &lt;jvmarg line="--add-exports ${module.name}/my.test=ALL-UNNAMED"/&gt;
+    &lt;classpath&gt;
+        &lt;pathelement path="${libs.junit}"/&gt;
+    &lt;/classpath&gt;
+    &lt;modulepath&gt;
+        &lt;pathelement path="${modules}:${build.classes}"/&gt;
+    &lt;/modulepath&gt;
+    &lt;formatter type="plain"/&gt;
+    &lt;test name="my.test.TestCase"/&gt;
+&lt;/junit&gt;
 </pre>
-<p>Runs my.test.TestCase as a white-box test in the forked VM given by the <code>platform.java</code> property.
-The junit library is a part of an unnamed module while the tested project and required modules are on the module path. The tests
-do not have module-info file and are executed in the project module given by <code>module.name</code> property.<br/>
-The <code>--patch-module</code> java option executes the tests built into <code>${build.test.classes}</code> in a module given
-by <code>module.name</code> property.<br/>
-The <code>--add-modules</code> java option enables the tested module.<br/>
-The <code>--add-reads</code> java option makes the unnamed module containing the junit readable by tested module.<br/>
-The <code>--add-exports</code> java option makes the non-exported test package <code>my.test</code> accessible from the unnamed module containing the junit.<br/>
+<p>Runs <code>my.test.TestCase</code> as a white-box test in the forked JVM given by
+the <code>platform.java</code> property.  The JUnit library is a part of an unnamed module while the
+tested project and required modules are on the module path. The tests do not have module-info file
+and are executed in the project module given by <code>module.name</code> property.<br/>
+The <kbd>--patch-module</kbd> Java option executes the tests built
+into <samp>${build.test.classes}</samp> in a module given by <code>module.name</code> property.<br/>
+The <kbd>--add-modules</kbd> Java option enables the tested module.<br/>
+The <kbd>--add-reads</kbd> Java option makes the unnamed module containing JUnit readable by
+tested module.<br/>  The <kbd>--add-exports</kbd> Java option makes the non-exported test
+package <code>my.test</code> accessible from the unnamed module containing JUnit.</p>
 <pre>
-    &lt;junit fork="true"
-        jvm="${platform.java}"&gt;
-        &lt;jvmarg line="--add-modules ${test.module.name}"/&gt;
-        &lt;jvmarg line="--add-exports ${test.module.name}/my.test=junit,ALL-UNNAMED"/&gt;
-        &lt;modulepath&gt;
-            &lt;pathelement path="${modules}:${build.classes}:${libs.junit}"/&gt;
-        &lt;/modulepath&gt;
-        &lt;formatter type="plain"/&gt;
-        &lt;test name="my.test.TestCase"/&gt;
-    &lt;/junit&gt;
+&lt;junit fork="true"
+       jvm="${platform.java}"&gt;
+    &lt;jvmarg line="--add-modules ${test.module.name}"/&gt;
+    &lt;jvmarg line="--add-exports ${test.module.name}/my.test=junit,ALL-UNNAMED"/&gt;
+    &lt;modulepath&gt;
+        &lt;pathelement path="${modules}:${build.classes}:${libs.junit}"/&gt;
+    &lt;/modulepath&gt;
+    &lt;formatter type="plain"/&gt;
+    &lt;test name="my.test.TestCase"/&gt;
+&lt;/junit&gt;
 </pre>
-<p>Runs my.test.TestCase as a black-box test in the forked VM given by the <code>platform.java</code> property.
-The junit library is used as an automatic module. The tests module-info requires the tested module and junit.<br/>
-The <code>--add-modules</code> java option enables the test module.<br/>
-The <code>--add-exports</code> java option makes the non-exported test package <code>my.test</code> accessible from the junit module and Ant's test runner.
-Another possibility is to export the test package in the tests module-info by <code>exports my.test</code> directive.<br/>
+<p>Runs <code>my.test.TestCase</code> as a black-box test in the forked JVM given by
+the <code>platform.java</code> property.  The JUnit library is used as an automatic module. The
+tests' module-info requires the tested module and JUnit.<br/>  The <kbd>--add-modules</kbd> Java
+option enables the test module.<br/>  The <kbd>--add-exports</kbd> Java option makes the
+non-exported test package <code>my.test</code> accessible from the JUnit module and Ant's test
+runner.  Another possibility is to export the test package in the tests' module-info
+by <code>exports my.test</code> directive.</p>
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/junitlauncher.html ant-1.10.3/manual/Tasks/junitlauncher.html
--- ant-1.9.10/manual/Tasks/junitlauncher.html	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/manual/Tasks/junitlauncher.html	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,476 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<html>
+<head>
+    <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
+    <title>JUnitLauncher Task</title>
+</head>
+<body>
+
+<h2 id="junitlauncher">JUnitLauncher</h2>
+<h3>Description</h3>
+
+<p>
+    This task allows tests to be launched and run using the JUnit 5 framework.
+</p>
+<p>
+    JUnit 5 introduced a newer set of APIs to write and launch tests. It also introduced the concept
+    of test engines. Test engines decide which classes are considered as testcases and how they are
+    executed. JUnit 5 supports running tests that have been written using JUnit 4 constructs as well
+    as tests that have been written using JUnit 5 constructs.  For more details about JUnit 5
+    itself, please refer to the JUnit 5 project's documentation
+    at <a href="https://junit.org/junit5/">https://junit.org/junit5/</a>.
+</p>
+<p>
+    The goal of this <code>junitlauncher</code> task is to allow launching the JUnit 5 test launcher
+    and building the test requests so that the selected tests can then be parsed and executed by the
+    test engine(s) supported by JUnit 5. This task in itself does <i>not</i> understand what a test
+    case is nor does it execute the tests itself.
+</p>
+<p>
+    <strong>Note</strong>: This task depends on external libraries not included in the Apache Ant
+    distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a> for
+    more information.
+</p>
+<p>
+    <strong>Note</strong>: You must have the necessary JUnit 5 libraries in the classpath of the
+    tests. At the time of writing this documentation, the list of JUnit 5 platform libraries that
+    are necessary to run the tests are:
+</p>
+
+<ul>
+    <li>
+        <samp>junit-platform-commons.jar</samp>
+    </li>
+    <li>
+        <samp>junit-platform-engine.jar</samp>
+    </li>
+    <li>
+        <samp>junit-platform-launcher.jar</samp>
+    </li>
+</ul>
+
+<p>
+    Depending on the test engine(s) that you want to use in your tests, you will further need the
+    following libraries in the classpath
+</p>
+
+<p>
+    For <q>junit-vintage</q> engine:
+</p>
+
+<ul>
+    <li>
+        <samp>junit-vintage-engine.jar</samp>
+    </li>
+    <li>
+        <samp>junit.jar</samp> (JUnit 4.x version)
+    </li>
+</ul>
+
+<p>
+    For <q>junit-jupiter</q> engine:
+</p>
+
+<ul>
+    <li>
+        <samp>junit-jupiter-api.jar</samp>
+    </li>
+    <li>
+        <samp>junit-jupiter-engine.jar</samp>
+    </li>
+    <li>
+        <samp>opentest4j.jar</samp>
+    </li>
+</ul>
+
+<p>
+    To have these in the test classpath, you can follow <em>either</em> of the following approaches:
+</p>
+
+<ul>
+    <li>Put all these relevant jars along with the <samp>ant-junitlauncher.jar</samp>
+        in <samp>ANT_HOME/lib</samp> directory</li>
+    <li>OR Leave <samp>ant-junitlauncher.jar</samp> in the <samp>ANT_HOME/lib</samp> directory and
+        include all other relevant jars in the classpath by passing them as a <kbd>-lib</kbd>
+        option, while invoking Ant</li>
+</ul>
+
+<p>
+    Tests are defined by nested elements like <code>test</code>, <code>testclasses</code> tags
+    (see <a href="#nested">nested elements</a>).
+</p>
+
+<h3>Parameters</h3>
+<table class="attr">
+    <tr>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>haltOnFailure</td>
+        <td>A value of <q>true</q> implies that build has to stop if any failure occurs in any of
+            the tests. JUnit 4+ classifies failures as both assertion failures as well as exceptions
+            that get thrown during test execution. As such, this task too considers both these cases
+            as failures and doesn't distinguish one from another.
+        </td>
+        <td>No; default is <q>false</q></td>
+    </tr>
+    <tr>
+        <td>failureProperty</td>
+        <td>The name of a property to set in the event of a failure
+            (exceptions in tests are considered failures as well).
+        </td>
+        <td>No</td>
+    </tr>
+</table>
+
+<h3 id="nested">Nested Elements</h3>
+
+<h4>classpath</h4>
+<p>
+    The nested <code>&lt;classpath&gt;</code> element that represents
+    a <a href="../using.html#path">PATH like structure</a> can be used to configure the task to use
+    this classpath for finding and running the tests. This classpath will be used for:
+</p>
+<ul>
+    <li>Finding the test classes to execute</li>
+</ul>
+<p>
+    If the <code>classpath</code> element isn't configured for the task, then the classpath of Ant
+    itself will be used for finding the test classes.
+</p>
+
+<h4>listener</h4>
+
+<p>
+    The <code>junitlauncher</code> task can be configured with <code>listener</code>(s) to listen to
+    test execution events (such as a test execution starting, completing etc...). The listener is
+    expected to be a class which implements
+    the <code class="code">org.junit.platform.launcher.TestExecutionListener</code>.
+    This <code class="code">TestExecutionListener</code> interface is an API exposed by the JUnit 5
+    platform APIs and isn't specific to Ant. As such, you can use any existing implementation
+    of <code class="code">TestExecutionListener</code> in this task.
+</p>
+
+<h5>Test result formatter</h5>
+<p>
+    <code>junitlauncher</code> provides a way where the test execution results can be formatted and
+    presented in a way that's customizable. The task allows for configuring test result formatters,
+    through the use of <code>listener</code> element. As noted previously, the <code>listener</code>
+    element expects the listener to implement
+    the <code class="code">org.junit.platform.launcher.TestExecutionListener</code>
+    interface. Typically, result formatters need a bit more configuration details to be fed to them,
+    during the test execution&mdash;details like where to write out the formatted result. Any such
+    listener can optionally implement
+    the <code class="code">org.apache.tools.ant.taskdefs.optional.junitlauncher.TestResultFormatter</code>
+    interface. This interface is specific to Ant <code>junitlauncher</code> task and it extends
+    the <code class="code">org.junit.platform.launcher.TestExecutionListener</code> interface
+</p>
+<p>
+    The <code>junitlauncher</code> task comes with the following pre-defined test result formatter
+    types:
+</p>
+<ul>
+    <li>
+        <q>legacy-plain</q> : This formatter prints a short statistics line for all test
+        cases.
+    </li>
+    <li>
+        <q>legacy-brief</q> : This formatter prints information for tests that failed or were
+        skipped.
+    </li>
+    <li>
+        <q>legacy-xml</q> : This formatter prints statistics for the tests in XML format.
+    </li>
+</ul>
+<p>
+    <strong>Note</strong>: Each of these formatters named <q>legacy</q> try to format the results
+    similar to what the <code>junit</code> task's formatters used to do. Furthermore,
+    the <q>legacy-xml</q> formatter generates the XML to comply with the same schema that
+    the <code>junit</code> task's XML formatter used to follow.  As a result, the XML generated by
+    this formatter, can be used as-is by the <code>junitreport</code> task.
+</p>
+<p>
+    The <code>listener</code> element supports the following attributes:
+</p>
+<table class="attr">
+    <tr>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>type</td>
+        <td>Use a predefined formatter (either <q>legacy-xml</q>, <q>legacy-plain</q>
+            or <q>legacy-brief</q>).</td>
+        <td rowspan="2">Exactly one of these</td>
+    </tr>
+    <tr>
+        <td>classname</td>
+        <td class="left">Name of a listener class which
+            implements <code>org.junit.platform.launcher.TestExecutionListener</code> or
+            the <code>org.apache.tools.ant.taskdefs.optional.junitlauncher.TestResultFormatter</code>
+            interface
+        </td>
+    </tr>
+    <tr>
+        <td>resultFile</td>
+        <td>
+            The file name to which the formatted result needs to be written to. This attribute is
+            only relevant when the listener class implements
+            the <code>org.apache.tools.ant.taskdefs.optional.junitlauncher.TestResultFormatter</code>
+            interface.
+            <p>
+                If no value is specified for this attribute and the listener implements
+                the <code>org.apache.tools.ant.taskdefs.optional.junitlauncher.TestResultFormatter</code>
+                then the file name will be defaulted to and will be of the
+                form <code>TEST-<i>testname</i>.<i>formatter-specific-extension</i></code>
+                (ex: <samp>TEST-org.myapp.SomeTest.xml</samp> for the <q>legacy-xml</q> type
+                formatter)
+            </p>
+        </td>
+        <td>No</td>
+    </tr>
+    <tr>
+        <td>sendSysOut</td>
+        <td>If set to <q>true</q> then the listener will be passed the <code>stdout</code> content
+            generated by the test(s). This attribute is relevant only if the listener class
+            implements
+            the <code>org.apache.tools.ant.taskdefs.optional.junitlauncher.TestResultFormatter</code>
+            interface.</td>
+        <td>No; defaults to <q>false</q></td>
+    </tr>
+    <tr>
+        <td>sendSysErr</td>
+        <td>If set to <q>true</q> then the listener will be passed the <code>stderr</code> content
+            generated by the test(s). This attribute is relevant only if the listener class
+            implements
+            the <code>org.apache.tools.ant.taskdefs.optional.junitlauncher.TestResultFormatter</code>
+            interface.</td>
+        <td>No; defaults to <q>false</q></td>
+    </tr>
+    <tr>
+        <td>if</td>
+        <td>Only use this listener <a href="../properties.html#if+unless">if the named property is
+            set</a>.</td>
+        <td>No</td>
+    </tr>
+    <tr>
+        <td>unless</td>
+        <td>Only use this listener <a href="../properties.html#if+unless">if the named property
+            is <strong>not</strong> set</a>.</td>
+        <td>No</td>
+    </tr>
+</table>
+
+<h4>test</h4>
+
+<p>Defines a single test class.</p>
+
+<table class="attr">
+    <tr>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>name</td>
+        <td>Fully qualified name of the test class.</td>
+        <td>Yes</td>
+    </tr>
+    <tr>
+        <td>methods</td>
+        <td>Comma-separated list of names of test case methods to execute.  If this is specified,
+            then only these test methods from the test class will be executed.</td>
+        <td>No</td>
+    </tr>
+    <tr>
+        <td>haltOnFailure</td>
+        <td>Stop the build process if a failure occurs during the test run (exceptions are
+            considered as failures too).  Overrides value set on <code>junitlauncher</code>
+            element.</td>
+        <td>No</td>
+    </tr>
+    <tr>
+        <td>failureProperty</td>
+        <td>The name of a property to set in the event of a failure (exceptions are considered
+            failures as well). Overrides value set on <code>junitlauncher</code> element.</td>
+        <td>No</td>
+    </tr>
+    <tr>
+        <td>outputDir</td>
+        <td>Directory to write the reports to.</td>
+        <td>No; default is the base directory of the project.</td>
+    </tr>
+    <tr>
+        <td>if</td>
+        <td>Only run this test <a href="../properties.html#if+unless">if the named property is
+            set</a>.</td>
+        <td>No</td>
+    </tr>
+    <tr>
+        <td>unless</td>
+        <td>Only run this test <a href="../properties.html#if+unless">if the named property
+            is <strong>not</strong> set</a>.</td>
+        <td>No</td>
+    </tr>
+</table>
+
+<p>
+    Tests can define their own listeners via nested <code>listener</code> elements.
+</p>
+
+<h4>testclasses</h4>
+
+<p>Define a number of tests based on pattern matching.</p>
+
+<p>
+    <code>testclasses</code> collects the included <a href="../Types/resources.html">resources</a>
+    from any number of nested <a href="../Types/resources.html#collection">Resource
+    Collection</a>s. It then selects each resource whose name ends in <code>.class</code>. These
+    classes are then passed on to the JUnit 5 platform for it to decide and run them as tests.
+</p>
+
+<table class="attr">
+    <tr>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
+    </tr>
+    <tr>
+        <td>haltOnFailure</td>
+        <td>Stop the build process if a failure occurs during the test run (exceptions are
+            considered as failures too).  Overrides value set on <code>junitlauncher</code>
+            element.</td>
+        <td>No</td>
+    </tr>
+    <tr>
+        <td>failureProperty</td>
+        <td>The name of a property to set in the event of a failure (exceptions are considered
+            failures as well). Overrides value set on <code>junitlauncher</code> element.</td>
+        <td>No</td>
+    </tr>
+    <tr>
+        <td>outputDir</td>
+        <td>Directory to write the reports to.</td>
+        <td>No; default is the base directory of the project.</td>
+    </tr>
+    <tr>
+        <td>if</td>
+        <td>Only run the tests <a href="../properties.html#if+unless">if the named property is
+            set</a>.</td>
+        <td>No</td>
+    </tr>
+    <tr>
+        <td>unless</td>
+        <td>Only run the tests <a href="../properties.html#if+unless">if the named property
+            is <strong>not</strong> set</a>.</td>
+        <td>No</td>
+    </tr>
+</table>
+
+<p>
+    <code>testclasses</code> can define their own listeners via nested <code>listener</code>
+    elements.
+</p>
+
+<h3>Examples</h3>
+
+<pre>
+&lt;path id="test.classpath"&gt;
+    ...
+&lt;/path&gt;
+
+&lt;junitlauncher&gt;
+    &lt;classpath refid="test.classpath"/&gt;
+    &lt;test name="org.myapp.SimpleTest"/&gt;
+&lt;/junitlauncher&gt;</pre>
+
+<p>
+    Launches the JUnit 5 platform to run the <samp>org.myapp.SimpleTest</samp> test
+</p>
+
+<pre>
+&lt;junitlauncher&gt;
+    &lt;classpath refid="test.classpath"/&gt;
+    &lt;test name="org.myapp.SimpleTest" haltOnFailure="true"/&gt;
+    &lt;test name="org.myapp.AnotherTest"/&gt;
+&lt;/junitlauncher&gt;
+</pre>
+
+<p>
+    Launches the JUnit 5 platform to run the <samp>org.myapp.SimpleTest</samp> and
+    the <samp>org.myapp.AnotherTest</samp> tests. The build process will be stopped if any test, in
+    the <samp>org.myapp.SimpleTest</samp>, fails.
+</p>
+
+<pre>
+&lt;junitlauncher&gt;
+    &lt;classpath refid="test.classpath"/&gt;
+    &lt;test name="org.myapp.SimpleTest" methods="testFoo, testBar"/&gt;
+&lt;/junitlauncher&gt;</pre>
+
+<p>
+    Launches the JUnit 5 platform to run only the <samp>testFoo</samp> and <samp>testBar</samp>
+    methods of the <samp>org.myapp.SimpleTest</samp> test class.
+</p>
+
+<pre>
+&lt;junitlauncher&gt;
+    &lt;classpath refid="test.classpath"/&gt;
+
+    &lt;testclasses outputdir="${output.dir}"&gt;
+        &lt;fileset dir="${build.classes.dir}"&gt;
+            &lt;include name="org/example/**/tests/**/"/&gt;
+        &lt;/fileset&gt;
+    &lt;/testclasses&gt;
+&lt;/junitlauncher&gt;</pre>
+
+<p>
+    Selects any <samp>.class</samp> files that match
+    the <samp>org/example/**/tests/**/</samp> <code>fileset</code> filter, under
+    the <samp>${build.classes.dir}</samp> and passes those classes to the JUnit 5 platform for
+    execution as tests.
+</p>
+
+<pre>
+&lt;junitlauncher&gt;
+    &lt;classpath refid="test.classpath"/&gt;
+
+    &lt;testclasses outputdir="${output.dir}"&gt;
+        &lt;fileset dir="${build.classes.dir}"&gt;
+            &lt;include name="org/example/**/tests/**/"/&gt;
+        &lt;/fileset&gt;
+        &lt;listener type="legacy-xml" sendSysOut="true" sendSysErr="true"/&gt;
+        &lt;listener type="legacy-plain" sendSysOut="true" /&gt;
+    &lt;/testclasses&gt;
+&lt;/junitlauncher&gt;</pre>
+<p>
+    Selects any <samp>.class</samp> files that match
+    the <samp>org/example/**/tests/**/</samp> <code>fileset</code> filter, under
+    the <samp>${build.classes.dir}</samp> and passes those classes to the JUnit 5 platform for
+    execution as tests. Test results will be written out to the <samp>${output.dir}</samp> by
+    the <q>legacy-xml</q> and <q>legacy-plain</q> formatters, in separate files.  Furthermore, both
+    the <q>legacy-xml</q> and the <q>legacy-plain</q> listeners, above, are configured to receive
+    the standard output content generated by the tests.  The <q>legacy-xml</q> listener is
+    configured to receive standard error content as well.
+</p>
+
+</body>
+</html>
diff -Nru ant-1.9.10/manual/Tasks/junitreport.html ant-1.10.3/manual/Tasks/junitreport.html
--- ant-1.9.10/manual/Tasks/junitreport.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/junitreport.html	2018-03-24 12:37:12.000000000 +0000
@@ -22,195 +22,189 @@
 
 <body>
 
-<h2><a name="junitreport">JUnitReport</a></h2>
+<h2 id="junitreport">JUnitReport</h2>
 <h3>Description</h3>
-Merge the individual XML files generated by the JUnit task and eventually apply
-a stylesheet on the resulting merged document to provide a browsable report of
-the testcases results.
-
-<p><strong>Note:</strong> This task depends on external libraries not
-included in the Apache Ant distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a>
-for more information.</p>
+<p>Merge the individual XML files generated by the <code>JUnit</code> task and eventually apply a
+stylesheet on the resulting merged document to provide a browsable report of the testcases
+results.</p>
+
+<p><strong>Note</strong>: This task depends on external libraries not included in the Apache Ant
+distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a> for more
+information.</p>
 
 <h3>Requirements</h3>
 
-<p>The task needs Apache <a
-href="http://xml.apache.org/xalan-j/">Xalan 2.4.1+ or Xalan XSLTC</a>
-(JDK 1.4 contains a version of Xalan-J 2.x while JDK 1.5 ships with a
-version of XSLTC). Starting from JDK 1.4.2-01 it ships with a bundled
-Xalan-J 2.4.1+, meaning that JDK version prior to 1.4.2-01 won't work
-out of the box. The table below summarize the compatibility status. 
-</p>
-<table border="1" cellpadding="2" cellspacing="0">
-<tr><th>Xalan</th><th>Sun JDK Bundle</th><th>Status<th></tr> 
+<p>The task needs Apache <a href="https://xml.apache.org/xalan-j/" target="_top">Xalan 2.4.1+ or
+Xalan XSLTC</a> (JDK 1.4 contains a version of Xalan 2.x, while JDK 1.5 ships with a version of
+XSLTC). JDK 1.4.2-01 and later ships with a bundled Xalan 2.4.1+, meaning that JDKs prior to version
+1.4.2-01 won't work out of the box. The table below summarize the compatibility status.</p>
+<table>
+<tr><th>Xalan</th><th>Sun JDK Bundle</th><th>Status<th></tr>
 <tr><td>2.4.1+</td><td>JDK 1.4.2-01+</td><td>OK</td></tr>
 <tr><td>XSLTC</td><td>JDK 1.5.x</td><td>OK</td></tr>
-<tr><td>2.x</td><td>JDK 1.4.x</td><td>DEPRECATED<br><i>Use ${ant.home}/etc/junit-frames-xalan1.xsl
-<br> Upgrade Xalan using the JDK endorsement mechanism</i></td></tr>
+<tr><td>2.x</td><td>JDK 1.4.x</td><td><em><u>Deprecated</u>,
+use <samp>${ant.home}/etc/junit-frames-xalan1.xsl</samp><br/>Upgrade Xalan using the JDK endorsement
+mechanism</em></td></tr>
 </table>
 
-<p>With Ant 1.6.2 we had to decide between supporting Xalan-J 1/Xalan J 2.4.1-
-and Xalan 2.4.1+/XSLTC, since there was no way to support both couples at the same
-time.</p>
-<p>With Ant 1.7 we had to drop support Xalan-J 1, since Xalan-J 1 has not 
-available anymore for quite some time.</p>
+<p>In Ant 1.6.2, we had to decide between supporting Xalan 1/Xalan 2.4.1- and Xalan 2.4.1+/XSLTC,
+because there was no way to support both couples at the same time.</p>
+<p><em>Since Ant 1.7</em>, we dropped support for Xalan 1, because Xalan 1 was not available anymore
+for quite some time.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td width="12%" valign="top"><b>Attribute</b></td>
-    <td width="78%" valign="top"><b>Description</b></td>
-    <td width="10%" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">tofile</td>
-    <td valign="top">The name of the XML file that will aggregate all individual
-      XML testsuite previously generated by the JUnit task.</td>
-    <td align="center" valign="top">No. Default to TESTS-TestSuites.xml</td>
+    <td>tofile</td>
+    <td>The name of the XML file that will aggregate all individual XML testsuites previously
+      generated by the <code>JUnit</code> task.</td>
+    <td>No; defaults to <samp>TESTS-TestSuites.xml</samp></td>
   </tr>
   <tr>
-    <td valign="top">todir</td>
-    <td valign="top">The directory where should be written the file resulting
-      from the individual XML testsuite aggregation.</td>
-    <td align="center" valign="top">No. Default to current directory</td>
+    <td>todir</td>
+    <td>The directory where the file resulting from the individual XML testsuite aggregation should
+      be written.</td>
+    <td>No; defaults to current directory</td>
   </tr>
 </table>
-<h3><a name="nested">Nested Elements</a></h3>
+<h3 id="nested">Parameters specified as nested elements</h3>
 <h4>fileset</h4>
-<p><code>junitreport</code> collects individual xml files generated by the JUnit
-task using the nested <a href="../Types/fileset.html"><code>&lt;FileSet&gt;</code></a>
-element.</p>
+<p><code>junitreport</code> collects individual xml files generated by the <code>JUnit</code> task
+using the nested <a href="../Types/fileset.html"><code>&lt;FileSet&gt;</code></a> element.</p>
 <h4>report</h4>
 <p>Generate a browsable report based on the document created by the merge.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td width="12%" valign="top"><b>Attribute</b></td>
-    <td width="78%" valign="top"><b>Description</b></td>
-    <td width="10%" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">format</td>
-    <td valign="top">The format of the generated report. Must be &quot;noframes&quot;
-      or &quot;frames&quot;.</td>
-    <td align="center" valign="top">No, default to &quot;frames&quot;</td>
+    <td>format</td>
+    <td>The format of the generated report. Must be either <q>noframes</q> or <q>frames</q>.</td>
+    <td>No; defaults to <q>frames</q></td>
   </tr>
   <tr>
-    <td valign="top">styledir</td>
-    <td valign="top">The directory where the stylesheets are defined. They must
-      be conforming to the following conventions:
+    <td>styledir</td>
+    <td>The directory where the stylesheets are defined. They must be conforming to the following
+      conventions:
       <ul>
-        <li>frames format: the stylesheet must be named <i>junit-frames.xsl</i>.</li>
-        <li>noframes format: the stylesheet must be named <i>junit-noframes.xsl</i>.</li>
+        <li><q>frames</q> format: the stylesheet must be named <samp>junit-frames.xsl</samp>,
+          or <samp>junit-frames-saxon.xsl</samp> if you are using Saxon 9+.</li>
+        <li><q>noframes</q> format: the stylesheet must be named <samp>junit-noframes.xsl</samp>,
+          or <samp>junit-noframes-saxon.xsl</samp> if you are using Saxon 9+.</li>
       </ul>
     </td>
-    <td align="center" valign="top">No. Default to embedded stylesheets.</td>
+    <td>No; defaults to embedded stylesheets</td>
   </tr>
   <tr>
-    <td valign="top">todir</td>
-    <td valign="top">The directory where the files resulting from the
-      transformation should be written to.</td>
-    <td align="center" valign="top">No. Default to current directory</td>
+    <td>todir</td>
+    <td>The directory where the files resulting from the transformation should be written to.</td>
+    <td>No; defaults to current directory</td>
   </tr>
 </table>
-<p> Ant assumes the following concerning the <tt>frames</tt> and <tt>noframes</tt> formats :</p>
-<p>The <tt>frames</tt> format uses
-a stylesheet which is generating output <em>only</em> by redirecting.</p>
-<p>The
-<tt>noframes</tt> format does not use redirecting and generates one
-file called <tt>junit-noframes.html</tt>.</p>
-<p>Custom versions of <tt>junit-frames.xsl</tt> or <tt>junit-noframes.xsl</tt> must adhere to the above conventions.</p>
+<p>Ant assumes the following concerning the <q>frames</q> and <q>noframes</q> formats:</p>
+<ul>
+  <li>The <q>frames</q> format uses a stylesheet which is generating output <em>only</em> by
+    redirecting.</li>
+  <li>The <q>noframes</q> format does not use redirecting and generates one file
+    called <samp>junit-noframes.html</samp>.</li>
+</ul>
+<p>Custom versions of <samp>junit-frames.xsl</samp> or <samp>junit-noframes.xsl</samp> must adhere
+to the above conventions.</p>
 
-<h3>Nested Element of the report tag</h3>
+<h3>Nested element of the report tag</h3>
 <h4>param</h4>
-<em>Since Ant 1.7</em>the report tag supports nested param tags.
-These tags can pass XSL parameters to the stylesheet.
+<p><em>Since Ant 1.7</em>, the <var>report</var> tag supports nested <code>param</code> tags.  These
+tags can pass XSL parameters to the stylesheet.</p>
 <h3>Parameters</h3>
-<table width="60%" border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">Name of the XSL parameter</td>
-    <td align="center" valign="top">Yes</td>
+    <td>name</td>
+    <td>Name of the XSL parameter</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">expression</td>
-    <td valign="top">Text value to be placed into the param.<br>
-    Was originally intended to be an XSL expression.</td>
-    <td align="center" valign="top">Yes</td>
+    <td>expression</td>
+    <td>Text value to be placed into the <code>param</code>.<br/>Was originally intended to be an
+      XSL expression.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">if</td>
-    <td valign="top">The param will only be passed <a href="../properties.html#if+unless">if this property is set</a>.</td>
-    <td align="center" valign="top">No</td>
+    <td>if</td>
+    <td>The <code>param</code> will only be passed <a href="../properties.html#if+unless">if this
+      property is set</a>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">unless</td>
-    <td valign="top">The param will not be passed <a href="../properties.html#if+unless">if this property is set</a>.</td>
-    <td align="center" valign="top">No</td>
+    <td>unless</td>
+    <td>The <code>param</code> will not be passed <a href="../properties.html#if+unless">if this
+      property is set</a>.</td>
+    <td>No</td>
   </tr>
 </table>
 
 <p>The built-in stylesheets support the following parameters:</p>
-<table width="60%" border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
-    <td valign="top"><b>XSL-Parameter</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>XSL Parameter</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">TITLE</td>
-    <td valign="top">Title used in &lt;title&gt; and &lt;h1&gt; tags</td>
-    <td align="center" valign="top">No. Defaults to <i>Unit Test Results.</i></td>
+    <td>TITLE</td>
+    <td>Title used in <code>&lt;title&gt;</code> and <code>&lt;h1&gt;</code> tags</td>
+    <td>No; defaults to <q>Unit Test Results</q></td>
   </tr>
 </table>
 
 <h4>classpath</h4>
-<p><em>Since Ant 1.9.5.</em>
-Like for the <a href="../CoreTasks/style.html#classpath">XSLT task</a>,
-a nested &lt;classpath&gt; will be used to load the processor.</p>
+<p><em>Since Ant 1.9.5</em>. Like for the <a href="../Tasks/style.html#classpath">XSLT task</a>, a
+nested <code>&lt;classpath&gt;</code> will be used to load the processor.</p>
 
 <h4>factory</h4>
-<p><em>Since Ant 1.9.5.</em>
-Like for the <a href="../CoreTasks/style.html#factory">XSLT task</a>,
-a nested &lt;factory&gt; can be used to specify factory settings.</p>
-
+<p><em>Since Ant 1.9.5</em>. Like for the <a href="../Tasks/style.html#factory">XSLT task</a>, a
+nested <code>&lt;factory&gt;</code> can be used to specify factory settings.</p>
 
 <h3>Example of report</h3>
-<blockquote>
-  <pre>&lt;junitreport todir=&quot;./reports&quot;&gt;
-  &lt;fileset dir=&quot;./reports&quot;&gt;
-    &lt;include name=&quot;TEST-*.xml&quot;/&gt;
-  &lt;/fileset&gt;
-  &lt;report format=&quot;frames&quot; todir=&quot;./report/html&quot;/&gt;
-&lt;/junitreport&gt;
-</pre>
-</blockquote>
-<p>would generate a <tt>TESTS-TestSuites.xml</tt> file in the directory <tt>reports</tt> and
-generate the default framed report in the directory <tt>report/html</tt>.</p>
-<h3>Example of report with xsl params</h3>
-<blockquote>
-  <pre>
+<pre>
+&lt;junitreport todir=&quot;./reports&quot;&gt;
+    &lt;fileset dir=&quot;./reports&quot;&gt;
+        &lt;include name=&quot;TEST-*.xml&quot;/&gt;
+    &lt;/fileset&gt;
+    &lt;report format=&quot;frames&quot; todir=&quot;./report/html&quot;/&gt;
+&lt;/junitreport&gt;</pre>
+
+<p>would generate a <samp>TESTS-TestSuites.xml</samp> file in the directory <samp>reports</samp> and
+generate the default framed report in the directory <samp>report/html</samp>.</p>
+
+<h3>Example of report with XSL params</h3>
+<pre>
 &lt;junitreport todir="${outputdir}"&gt;
     &lt;fileset dir="${jrdir}"&gt;
         &lt;include name="TEST-*.xml"/&gt;
     &lt;/fileset&gt;
     &lt;report todir="${outputdir}/html"
-        styledir="junitreport"
-        format="frames"&gt;
+            styledir="junitreport"
+            format="frames"&gt;
         &lt;param name="key1" expression="value1"/&gt;
         &lt;param name="key2" expression="value2"/&gt;
     &lt;/report&gt;
-&lt;/junitreport&gt;
-  </pre>
-  </blockquote>
-<p>This example requires a file called <tt>junitreport/junit-frames.xsl</tt>.
-    The XSL parameters key1 and key2 will be passed to the XSL transformation.</p>
+&lt;/junitreport&gt;</pre>
 
-</body>
+<p>This example requires a file called <samp>junitreport/junit-frames.xsl</samp>.  The XSL
+parameters <q>key1</q> and <q>key2</q> will be passed to the XSL transformation.</p>
 
+</body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/length.html ant-1.10.3/manual/Tasks/length.html
--- ant-1.9.10/manual/Tasks/length.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/length.html	2018-03-24 12:37:12.000000000 +0000
@@ -25,103 +25,102 @@
 <body>
 
 <h2>Length</h2>
+<p><em>Since Apache Ant 1.6.3</em></p>
 <h3>Description</h3>
-<p>Display or set a property containing length information for
-   a string, a file, or one or more nested
-   <a href="../Types/resources.html#collection">Resource Collection</a>s.
-   Can also be used as a condition. <b>Since Apache Ant 1.6.3</b></p>
+<p>Display or set a property containing length information for a string, a file, or one or more
+nested <a href="../Types/resources.html#collection">resource collections</a>.  Can also be used as
+a <code>condition</code>.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th rowspan="2">Attribute</th>
+    <th rowspan="2">Description</th>
+    <th colspan="2">Required</th>
   </tr>
   <tr>
-    <td valign="top">property</td>
-    <td valign="top">The property to set.  If omitted
-      the results are written to the log. Ignored when
-      processing as a condition.</td>
-    <td valign="top" align="center">No</td>
+    <th>Task</th>
+    <th>Condition</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">Single file whose length to report.</td>
-    <td valign="top" align="center" rowspan="3">One of these,
-      or one or more nested filesets</td>
+    <td>property</td>
+    <td>The property to set.</td>
+    <td class="center">No; by default, output value to the log</td>
+    <td>Ignored</td>
   </tr>
   <tr>
-    <td valign="top">resource</td>
-    <td valign="top">Single resource whose length to report (using extended
-      <a href="../properties.html#propertyHelper">properties handling</a>).
-      <em>Since Ant 1.8.1</em>
-    </td>
+    <td>mode</td>
+    <td>File length mode; when <q>all</q> the resulting value is the sum of all included resources'
+      lengths; when <q>each</q> the task outputs the absolute path and length of each included
+      resource, one per line.</td>
+    <td class="center">No; default is <q>all</q></td>
+    <td>Ignored</td>
+  </tr>
+  <tr>
+    <td>file</td>
+    <td>Single file whose length to report.</td>
+    <td rowspan="3" colspan="2">One of these, or one or more nested filesets</td>
   </tr>
   <tr>
-    <td valign="top">string</td>
-    <td valign="top">The string whose length to report.</td>
+    <td>resource</td>
+    <td class="left">Single resource whose length to report (using
+      extended <a href="../properties.html#propertyHelper">properties handling</a>).  <em>Since Ant
+      1.8.1</em>
+    </td>
   </tr>
   <tr>
-    <td valign="top">mode</td>
-    <td valign="top">File length mode; when &quot;all&quot; the resulting
-      value is the sum of all included resources' lengths; when &quot;each&quot;
-      the task outputs the absolute path and length of each included resource,
-      one per line. Ignored when processing as a condition.</td>
-    <td valign="top" align="center">No; default is &quot;all&quot;</td>
+    <td>string</td>
+    <td class="left">The string whose length to report.</td>
   </tr>
   <tr>
-    <td valign="top">trim</td>
-    <td valign="top">Whether to trim when operating on a string. Default <i>false</i>.</td>
-    <td valign="top" align="center">No; only valid when string is set</td>
+    <td>trim</td>
+    <td>Whether to trim when operating on a string.</td>
+    <td colspan="2">No; default is <q>false</q>, ignored unless <var>string</var> is set</td>
   </tr>
   <tr>
-    <td valign="top">length</td>
-    <td valign="top">Comparison length for processing as a condition.</td>
-    <td valign="top" align="center">Yes, in condition mode</td>
+    <td>length</td>
+    <td>Comparison length.</td>
+    <td class="center">Ignored</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">when</td>
-    <td valign="top">Comparison type: "equal", "eq", "greater", "gt", "less",
-      "lt", "ge" (greater or equal), "ne" (not equal), "le" (less or equal)
-      for use when operating as a condition.</td>
-    <td valign="top" align="center">No; default is "equal"</td>
+    <td>when</td>
+    <td>Comparison
+      type: <q>equal</q>, <q>eq</q>, <q>greater</q>, <q>gt</q>, <q>less</q>, <q>lt</q>, <q>ge</q>
+      (greater or equal), <q>ne</q> (not equal), <q>le</q> (less or equal).</td>
+    <td class="center">Ignored</td>
+    <td>No; default is <q>equal</q></td>
   </tr>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
 
-<h4>Resource Collections</h4>
-<p>You can include resources via nested
-  <a href="../Types/resources.html#collection">Resource Collection</a>s.</p>
+<h4>resource collections</h4>
+<p>You can include resources via nested <a href="../Types/resources.html#collection">resource
+collection</a>s.</p>
 
 <h3>Examples</h3>
 
-<pre>&lt;length string=&quot;foo&quot; property=&quot;length.foo&quot; /&gt;
-</pre>
-<p>Stores the length of the string &quot;foo&quot; in the property named
-<i>length.foo</i>.</p>
+<pre>&lt;length string=&quot;foo&quot; property=&quot;length.foo&quot;/&gt;</pre>
+<p>Stores the length of the string <q>foo</q> in the property named <code>length.foo</code>.</p>
 
-<pre>&lt;length file=&quot;bar&quot; property=&quot;length.bar&quot; /&gt;
-</pre>
-<p>Stores the length of file &quot;bar&quot; in the property named
-<i>length.bar</i>.</p>
+<pre>&lt;length file=&quot;bar&quot; property=&quot;length.bar&quot;/&gt;</pre>
+<p>Stores the length of file <samp>bar</samp> in the property named <code>length.bar</code>.</p>
 
 <pre>
 &lt;length property=&quot;length&quot; mode=&quot;each&quot;&gt;
     &lt;fileset dir=&quot;.&quot; includes=&quot;foo,bar&quot;/&gt;
 &lt;/length&gt;
 </pre>
-<p>Writes the file paths of <i>foo</i> and <i>bar</i> and their length into 
-the property <i>length</i>.</p>
+<p>Writes the file paths of <samp>foo</samp> and <samp>bar</samp> and their length into the
+property <code>length</code>.</p>
 
 <pre>
 &lt;length property=&quot;length&quot; mode=&quot;all&quot;&gt;
     &lt;fileset dir=&quot;.&quot; includes=&quot;foo,bar&quot;/&gt;
 &lt;/length&gt;
 </pre>
-<p>Adds the length of <i>foo</i> and <i>bar</i> and stores the result in property <i>length</i>.</p>
-
+<p>Adds the length of <samp>foo</samp> and <samp>bar</samp> and stores the result in
+property <code>length</code>.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/loadfile.html ant-1.10.3/manual/Tasks/loadfile.html
--- ant-1.9.10/manual/Tasks/loadfile.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/loadfile.html	2018-03-24 12:37:12.000000000 +0000
@@ -22,112 +22,96 @@
 
 <body>
 
-
-<h2><a name="loadfile">LoadFile</a></h2>
+<h2 id="loadfile">LoadFile</h2>
 <h3>Description</h3>
-<p>
-Specialization of <a href="loadresource.html">loadresource</a> that
-works on files exclusively and provides a srcFile attribute for
-convenience.  Unless an encoding is specified, the encoding of the
-current locale is used.
-</p>
-<p>If the resource content is empty (maybe after processing a filterchain) 
-the property is not set.</p>
-
+<p>Specialization of <a href="loadresource.html">loadresource</a> that works on files exclusively
+and provides a <var>srcFile</var> attribute for convenience.  Unless an <var>encoding</var> is
+specified, the encoding of the current locale is used.</p>
+<p>If the resource content is empty (maybe after processing a <code>filterchain</code>) the property
+is not set.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">srcFile</td>
-    <td valign="top">source file</td>
-    <td valign="top" align="center">Yes</td>
+    <td>srcFile</td>
+    <td>source file</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">property</td>
-    <td valign="top">property to save to</td>
-    <td valign="top" align="center">Yes</td>
+    <td>property</td>
+    <td>property to save to</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">encoding to use when loading the file</td>
-    <td align="center" valign="top">No</td>
+    <td>encoding</td>
+    <td>encoding to use when loading the file</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">Whether to halt the build on failure</td>
-    <td align="center" valign="top">No, default "true"</td>
+    <td>failonerror</td>
+    <td>Whether to halt the build on failure</td>
+    <td>No; default <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">quiet</td>
-    <td valign="top">Do not display a diagnostic message (unless Apache Ant has been 
-    invoked with the <code>-verbose</code> or <code>-debug</code>
-    switches) or modify the exit status to reflect an error. Setting this to 
-    "true" implies setting failonerror to "false".
-      <em>Since Ant 1.7.0.</em>
+    <td>quiet</td>
+    <td>Do not display a diagnostic message (unless Apache Ant has been invoked with
+      the <kbd>-verbose</kbd> or <kbd>-debug</kbd> switches) or modify the exit status to
+      reflect an error. Setting this to <q>true</q> implies setting <var>failonerror</var>
+      to <q>false</q>. <em>Since Ant 1.7.0</em>.
     </td>
-    <td align="center" valign="top">No, default "false"</td>
+    <td>No; default <q>false</q></td>
   </tr>
 
 </table>
-<p>
-The LoadFile task supports nested <a href="../Types/filterchain.html">
-FilterChain</a>s.
+<p>The LoadFile task supports nested <a href="../Types/filterchain.html">FilterChain</a>s.</p>
 
 <h3>Examples</h3>
-<pre>    &lt;loadfile property="message"
-      srcFile="message.txt"/&gt;
-</pre>
-Load file message.txt into property "message"; an <tt>&lt;echo&gt;</tt>
-can print this.  This is identical to
-<pre>    &lt;loadresource property="message"&gt;
-       &lt;file file="message.txt"/&gt;
-    &lt;/loadresource&gt;
-</pre>
-</p>
-
-<pre>    &lt;loadfile property="encoded-file"
-      srcFile="loadfile.xml"
-      encoding="ISO-8859-1"/&gt;
-</pre>
-Load a file using the latin-1 encoding
-
-<pre>    &lt;loadfile
-      property="optional.value"
-      srcFile="optional.txt"
-      failonerror="false"/&gt;
-</pre>
-Load a file, don't fail if it is missing (a message is printed, though)
-
-<pre>    &lt;loadfile
-      property="mail.recipients"
-      srcFile="recipientlist.txt"&gt;
-      &lt;filterchain&gt;
+<pre>
+&lt;loadfile property="message"
+          srcFile="message.txt"/&gt;</pre>
+<p>Load file message.txt into property <code>message</code>; an <code>&lt;echo&gt;</code> can print
+this.  This is identical to</p>
+<pre>
+&lt;loadresource property="message"&gt;
+    &lt;file file="message.txt"/&gt;
+&lt;/loadresource&gt;</pre>
+
+<pre>
+&lt;loadfile property="encoded-file"
+          srcFile="loadfile.xml"
+          encoding="ISO-8859-1"/&gt;</pre>
+<p>Load a file using the Latin-1 encoding</p>
+
+<pre>
+&lt;loadfile property="optional.value"
+          srcFile="optional.txt"
+          failonerror="false"/&gt;</pre>
+<p>Load a file, don't fail if it is missing (a message is printed, though)</p>
+
+<pre>
+&lt;loadfile property="mail.recipients"
+          srcFile="recipientlist.txt"&gt;
+    &lt;filterchain&gt;
         &lt;<a href="../Types/filterchain.html#striplinebreaks">striplinebreaks</a>/&gt;
-      &lt;/filterchain&gt;
-    &lt;/loadfile&gt;
-</pre>
-Load a property which can be used as a parameter for another task (in this case mail),
-merging lines to ensure this happens.
-
-<pre>    &lt;loadfile
-      property="system.configuration.xml"
-      srcFile="configuration.xml"&gt;
-        &lt;filterchain&gt;
-          &lt;<a href="../Types/filterchain.html#expandproperties">expandproperties</a>/&gt;
-        &lt;/filterchain&gt;
-    &lt;/loadfile&gt;
-</pre>
-Load an XML file into a property, expanding all properties declared
-in the file in the process.
-
-
-
+    &lt;/filterchain&gt;
+&lt;/loadfile&gt;</pre>
+<p>Load a property which can be used as a parameter for another task (in this
+case <code>mail</code>), merging lines to ensure this happens.</p>
+
+<pre>
+&lt;loadfile property="system.configuration.xml"
+          srcFile="configuration.xml"&gt;
+    &lt;filterchain&gt;
+        &lt;<a href="../Types/filterchain.html#expandproperties">expandproperties</a>/&gt;
+    &lt;/filterchain&gt;
+&lt;/loadfile&gt;</pre>
+<p>Load an XML file into a property, expanding all properties declared in the file in the
+process.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/loadproperties.html ant-1.10.3/manual/Tasks/loadproperties.html
--- ant-1.9.10/manual/Tasks/loadproperties.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/loadproperties.html	2018-03-24 12:37:12.000000000 +0000
@@ -23,68 +23,60 @@
 <body>
 
 
-<h2><a name="loadproperties">LoadProperties</a></h2>
+<h2 id="loadproperties">LoadProperties</h2>
 <h3>Description</h3>
-<p>
-Load a file's contents as Apache Ant properties.  This is equivalent
-to <code>&lt;property file|resource=&quot;...&quot;/&gt;</code> except that it
-supports nested <code>&lt;filterchain&gt;</code> elements.
-Also if the file is missing, the build is halted with an error, rather
-than a warning being printed.
-</p>
-
-<p><strong>Note:</strong> the default value of this
-task's <code>prefixValues</code> attribute is different from the
-default value of the same attribute in
-the <a href="property.html"><code>&lt;property&gt;</code></a>
-task.</p>
+<p>Load a file's contents as Apache Ant properties.  This is equivalent to <code>&lt;property
+file|resource=<q>...</q>/&gt;</code> except that it supports nested <code>&lt;filterchain&gt;</code>
+elements.  Also if the file is missing, the build is halted with an error, rather than a warning
+being printed.</p>
+
+<p><strong>Note</strong>: the default value of this task's <var>prefixValues</var> attribute is
+different from the default value of the same attribute in
+the <a href="property.html"><code>&lt;property&gt;</code></a> task.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">srcFile</td>
-    <td valign="top">source file</td>
-    <td valign="top" rowspan="2" align="center">One of these or a
-          nested resource</td>
+    <td>srcFile</td>
+    <td>source file</td>
+    <td rowspan="2">One of these or a nested resource</td>
   </tr>
   <tr>
-    <td valign="top">resource</td>
-    <td valign="top">the resource name of the property file</td>
+    <td>resource</td>
+    <td class="left">the resource name of the property file</td>
   </tr>
   <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">encoding to use when loading the file</td>
-    <td align="center" valign="top">No</td>
+    <td>encoding</td>
+    <td>encoding to use when loading the file</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">the classpath to use when looking up a resource.</td>
-    <td align="center" valign="top">No</td>
+    <td>classpath</td>
+    <td>the classpath to use when looking up a resource.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">the classpath to use when looking up a resource,
-      given as <a href="../using.html#references">reference</a>
-      to a <code>&lt;path&gt;</code> defined elsewhere..</td>
-    <td align="center" valign="top">No</td>
+    <td>classpathref</td>
+    <td>the classpath to use when looking up a resource, given
+      as <a href="../using.html#references">reference</a> to a <code>&lt;path&gt;</code> defined
+      elsewhere.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">prefix</td>
-    <td valign="top">Prefix to apply to loaded properties;
-      a "." is appended to the prefix if not specified. <em>Since Ant 1.8.1</em></td>
-    <td align="center" valign="top">No</td>
+    <td>prefix</td>
+    <td>Prefix to apply to loaded properties. <em>Since Ant 1.8.1</em></td>
+    <td>No; default is <q>.</q></td>
   </tr>
   <tr>
-    <td valign="top">prefixValues</td>
-    <td valign="top">Whether to apply the prefix when expanding the
-      right hand side of the properties.
-      <em>Since Ant 1.8.2</em></td>
-    <td align="center" valign="top">No (default=<tt>true</tt>)</td>
+    <td>prefixValues</td>
+    <td>Whether to apply the prefix when expanding the right hand side of the properties.  <em>Since
+      Ant 1.8.2</em></td>
+    <td>No; default is <q>true</q></td>
   </tr>
 </table>
 
@@ -93,48 +85,44 @@
 <h4>any <a href="../Types/resources.html">resource</a> or single element
 resource collection</h4>
 
-<p>The specified resource will be used as src. <em>Since Ant 1.7</em></p>
+<p><em>Since Ant 1.7</em></p>
+
+<p>The specified resource will be used as <var>srcFile</var> or <var>resource</var>.</p>
 
 <h4><a href="../Types/filterchain.html">FilterChain</a></h4>
 
 <h4>classpath</h4>
 
-<p>for use with the <i>resource</i> attribute.</p>
+<p>for use with the <var>resource</var> attribute.</p>
 
 <h3>Examples</h3>
-<pre>    &lt;loadproperties srcFile="file.properties"/&gt;
-</pre>
-or
+<pre>&lt;loadproperties srcFile="file.properties"/&gt;</pre>
+<p>or</p>
 <pre>
-    &lt;loadproperties&gt;
-      &lt;file file="file.properties"/&gt;
-    &lt;/loadproperties&gt;
-</pre>
-Load contents of file.properties as Ant properties.
+&lt;loadproperties&gt;
+    &lt;file file="file.properties"/&gt;
+&lt;/loadproperties&gt;</pre>
+<p>Load contents of file.properties as Ant properties.</p>
 
-<pre>    &lt;loadproperties srcFile="file.properties"&gt;
-      &lt;filterchain&gt;
+<pre>
+&lt;loadproperties srcFile="file.properties"&gt;
+    &lt;filterchain&gt;
         &lt;<a href="../Types/filterchain.html#linecontains">linecontains</a>&gt;
-          &lt;contains value=&quot;import.&quot;/&gt;
+            &lt;contains value=&quot;import.&quot;/&gt;
         &lt;/linecontains&gt;
-      &lt;/filterchain&gt;
-    &lt;/loadproperties&gt;
-</pre>
-Read the lines that contain the string &quot;import.&quot;
-from the file &quot;file.properties&quot; and load them as
-Ant properties.
+    &lt;/filterchain&gt;
+&lt;/loadproperties&gt;</pre>
+<p>Read the lines that contain the string <q>import.</q>  from the file <samp>file.properties</samp>
+and load them as Ant properties.</p>
 
 <pre>
-    &lt;loadproperties&gt;
-      &lt;<a href="../Types/resources.html#gzipresource">gzipresource</a>&gt;
+&lt;loadproperties&gt;
+    &lt;<a href="../Types/resources.html#gzipresource">gzipresource</a>&gt;
         &lt;<a href="../Types/resources.html#url">url</a> url="http://example.org/url.properties.gz"/&gt;
-      &lt;/gzipresource&gt;
-    &lt;/loadproperties&gt;
-</pre>
-Load contents of http://example.org/url.properties.gz, uncompress it
-on the fly and load the contents as Ant properties.
-
-
+    &lt;/gzipresource&gt;
+&lt;/loadproperties&gt;</pre>
+<p>Load contents of <samp>http://example.org/url.properties.gz</samp>, uncompress it on the fly and
+load the contents as Ant properties.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/loadresource.html ant-1.10.3/manual/Tasks/loadresource.html
--- ant-1.9.10/manual/Tasks/loadresource.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/loadresource.html	2018-03-24 12:37:12.000000000 +0000
@@ -23,71 +23,61 @@
 <body>
 
 
-<h2><a name="loadresource">LoadResource</a></h2>
+<h2 id="loadresource">LoadResource</h2>
 
 <p><em>Since Apache Ant 1.7</em></p>
 
 <h3>Description</h3>
-<p>
-Load a text resource into a single property. Unless an encoding is
-specified, the encoding of the current locale is used.  Resources to
-load are specified as nested <a
-href="../Types/resources.html">resource</a> elements or single
-element resource collections. If the resource content is empty (maybe after
-processing a filterchain) the property is not set.
-</p>
+<p>Load a text resource into a single property. Unless an encoding is specified, the encoding of the
+current locale is used.  Resources to load are specified as
+nested <a href="../Types/resources.html">resource</a> elements or single element resource
+collections. If the resource content is empty (maybe after processing a <code>filterchain</code>)
+the property is not set.</p>
 
-<p>Since properties are immutable, the task will not change the value
-  of an existing property.</p>
+<p>Since properties are immutable, the task will not change the value of an existing property.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">property</td>
-    <td valign="top">property to save to</td>
-    <td valign="top" align="center">Yes</td>
+    <td>property</td>
+    <td>property to save to</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">encoding to use when loading the resource</td>
-    <td align="center" valign="top">No</td>
+    <td>encoding</td>
+    <td>encoding to use when loading the resource</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">Whether to halt the build on failure</td>
-    <td align="center" valign="top">No, default "true"</td>
+    <td>failonerror</td>
+    <td>Whether to halt the build on failure</td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">quiet</td>
-    <td valign="top">Do not display a diagnostic message (unless Ant has been 
-    invoked with the <code>-verbose</code> or <code>-debug</code>
-    switches) or modify the exit status to reflect an error. Setting this to 
-    "true" implies setting failonerror to "false".
-    </td>
-    <td align="center" valign="top">No, default "false"</td>
+    <td>quiet</td>
+    <td>Do not display a diagnostic message (unless Ant has been invoked with
+      the <kbd>-verbose</kbd> or <kbd>-debug</kbd> switches) or modify the exit status to
+      reflect an error. Setting this to <q>true</q> implies setting <var>failonerror</var>
+      to <q>false</q>.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
 </table>
-<p>
-The LoadResource task supports nested <a href="../Types/filterchain.html">
-FilterChain</a>s.
+<p>The LoadResource task supports nested <a href="../Types/filterchain.html">FilterChain</a>s.</p>
 
 <h3>Examples</h3>
 <pre>
 &lt;loadresource property="homepage"&gt;
-  &lt;url url="http://ant.apache.org/index.html"/&gt;
-&lt;/loadresource&gt;
-</pre>
-Load the entry point of Ant's homepage into property "homepage"; an
-<tt>&lt;echo&gt;</tt> can print this.
+    &lt;url url="http://ant.apache.org/index.html"/&gt;
+&lt;/loadresource&gt;</pre>
+<p>Load the entry point of Ant's homepage into property <code>homepage</code>;
+an <code>&lt;echo&gt;</code> can print this.</p>
 
 <p>For more examples see the <a href="loadfile.html">loadfile</a> task.</p>
 
-
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/local.html ant-1.10.3/manual/Tasks/local.html
--- ant-1.9.10/manual/Tasks/local.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/local.html	2018-03-24 12:37:12.000000000 +0000
@@ -25,31 +25,31 @@
 <body>
 
 <h2>Local</h2>
+<p><em>Since Ant 1.8</em></p>
 <h3>Description</h3>
-<p>Adds a local property to the current scope. Property scopes exist at Apache Ant's
-various "block" levels. These include targets as well as the
-<a href="parallel.html">Parallel</a> and <a href="sequential.html">Sequential</a>
-task containers (including <a href="macrodef.html">Macrodef</a> bodies). A local
-property at a given scope "shadows" properties of the same name at higher scopes,
-including the global scope. Note that using the Local task at the global
-level effectively makes the property local to the "anonymous target" in which
-top-level operations are carried out; it will not be defined for other targets
-in the buildfile. <b>Since Ant 1.8</b></p>
+<p>Adds a local property to the current scope. Property scopes exist at Apache Ant's various "block"
+levels. These include targets as well as the <a href="parallel.html">Parallel</a>
+and <a href="sequential.html">Sequential</a> task containers
+(including <a href="macrodef.html">Macrodef</a> bodies). A local property at a given scope "shadows"
+properties of the same name at higher scopes, including the global scope. Note that using
+the <code>Local</code> task at the global level effectively makes the property local to the
+"anonymous target" in which top-level operations are carried out; it will not be defined for other
+targets in the buildfile.</p>
 
-<p>A property is made local if the <code>&lt;local&gt;</code> task
-  precedes its definition.  See the examples section.</p>
+<p>A property is made local if the <code>&lt;local&gt;</code> task precedes its definition.  See the
+examples section.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0"> 
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The property to declare in the current scope</td>
-    <td valign="top" align="center">Yes</td>
+    <td>name</td>
+    <td>The property to declare in the current scope</td>
+    <td>Yes</td>
   </tr>
 </table>
 
@@ -58,129 +58,118 @@
 <h4>Temporarily shadow a global property's value</h4>
 
 <pre>
-    &lt;property name="foo" value="foo"/&gt;
+&lt;property name="foo" value="foo"/&gt;
 
-    &lt;target name="step1"&gt;
-        &lt;echo&gt;Before local: foo is ${foo}&lt;/echo&gt;
-        &lt;local name="foo"/&gt;
-        &lt;property name="foo" value="bar"/&gt;
-        &lt;echo&gt;After local: foo is ${foo}&lt;/echo&gt;
-    &lt;/target&gt;
-
-    &lt;target name="step2" depends="step1"&gt;
-        &lt;echo&gt;In step2: foo is ${foo}&lt;/echo&gt;
-    &lt;/target&gt;
-</pre>
+&lt;target name="step1"&gt;
+    &lt;echo&gt;Before local: foo is ${foo}&lt;/echo&gt;
+    &lt;local name="foo"/&gt;
+    &lt;property name="foo" value="bar"/&gt;
+    &lt;echo&gt;After local: foo is ${foo}&lt;/echo&gt;
+&lt;/target&gt;
+
+&lt;target name="step2" depends="step1"&gt;
+    &lt;echo&gt;In step2: foo is ${foo}&lt;/echo&gt;
+&lt;/target&gt;</pre>
 
 <p>outputs</p>
 
-<pre>
+<pre class="output">
 step1:
      [echo] Before local: foo is foo
      [echo] After local: foo is bar
 
 step2:
-     [echo] In step2: foo is foo
-</pre>
+     [echo] In step2: foo is foo</pre>
 
-<p>here the local-task shadowed the global definition
-  of <code>foo</code> for the remainder of the target step1.</p>
+<p>here the <code>local</code> task shadowed the global definition of <code>foo</code> for the
+remainder of the target <q>step1</q>.</p>
 
 <h4>Creating thread local properties</h4>
 
 <pre>
-    &lt;property name="foo" value="foo"/&gt;
+&lt;property name="foo" value="foo"/&gt;
 
-    &lt;parallel&gt;
-        &lt;echo&gt;global 1: foo is ${foo}&lt;/echo&gt;
-        &lt;sequential&gt;
-            &lt;local name="foo"/&gt;
-            &lt;property name="foo" value="bar.1"/&gt;
-            &lt;echo&gt;First sequential: foo is ${foo}&lt;/echo&gt;
-        &lt;/sequential&gt;
-        &lt;sequential&gt;
-            &lt;sleep seconds="1"/&gt;
-            &lt;echo&gt;global 2: foo is ${foo}&lt;/echo&gt;
-        &lt;/sequential&gt;
-        &lt;sequential&gt;
-            &lt;local name="foo"/&gt;
-            &lt;property name="foo" value="bar.2"/&gt;
-            &lt;echo&gt;Second sequential: foo is ${foo}&lt;/echo&gt;
-        &lt;/sequential&gt;
-        &lt;echo&gt;global 3: foo is ${foo}&lt;/echo&gt;
-    &lt;/parallel&gt;
-</pre>
+&lt;parallel&gt;
+    &lt;echo&gt;global 1: foo is ${foo}&lt;/echo&gt;
+    &lt;sequential&gt;
+        &lt;local name="foo"/&gt;
+        &lt;property name="foo" value="bar.1"/&gt;
+        &lt;echo&gt;First sequential: foo is ${foo}&lt;/echo&gt;
+    &lt;/sequential&gt;
+    &lt;sequential&gt;
+        &lt;sleep seconds="1"/&gt;
+        &lt;echo&gt;global 2: foo is ${foo}&lt;/echo&gt;
+    &lt;/sequential&gt;
+    &lt;sequential&gt;
+        &lt;local name="foo"/&gt;
+        &lt;property name="foo" value="bar.2"/&gt;
+        &lt;echo&gt;Second sequential: foo is ${foo}&lt;/echo&gt;
+    &lt;/sequential&gt;
+    &lt;echo&gt;global 3: foo is ${foo}&lt;/echo&gt;
+&lt;/parallel&gt;</pre>
 
 <p>outputs something similar to</p>
 
-<pre>
-     [echo] global 3: foo is foo
-     [echo] global 1: foo is foo
-     [echo] First sequential: foo is bar.1
-     [echo] Second sequential: foo is bar.2
-     [echo] global 2: foo is foo
-</pre>
-
-<h4>Use inside macrodef</h4>
-
-<p>This probably is where local can be applied in the most useful
-  way.  If you needed a "temporary property" inside a macrodef in Ant
-  prior to Ant 1.8.0 you had to try to come up with a property name
-  that would be unique across macro invocations.</p>
-
-<p>Say you wanted to write a macro that created the parent directory
-  of a given file.  A naive approach would be:</p>
-
-<pre>
-    &lt;macrodef name="makeparentdir"&gt;
-        &lt;attribute name="file"/&gt;
-        &lt;sequential&gt;
-            &lt;dirname property="parent" file="@{file}"/&gt;
-            &lt;mkdir dir="${parent}"/&gt;
-        &lt;/sequential&gt;
-    &lt;/macrodef&gt;
-    &lt;makeparentdir file="some-dir/some-file"/&gt;
-</pre>
-
-<p>but this would create a global property "parent" on the first
-  invocation - and since properties are not mutable, any subsequent
-  invocation will see the same value and try to create the same
-  directory as the first invocation.</p>
-
-<p>The recommendation prior to Ant 1.8.0 was to use a property name
-  based on one of the macro's attributes, like</p>
-
-<pre>
-    &lt;macrodef name="makeparentdir"&gt;
-        &lt;attribute name="file"/&gt;
-        &lt;sequential&gt;
-            &lt;dirname property="parent.@{file}" file="@{file}"/&gt;
-            &lt;mkdir dir="${parent.@{file}}"/&gt;
-        &lt;/sequential&gt;
-    &lt;/macrodef&gt;
-</pre>
-
-<p>Now invocations for different files will set different properties
-  and the directories will get created.  Unfortunately this "pollutes"
-  the global properties space.  In addition it may be hard to come up
-  with unique names in some cases.</p>
+<pre class="output">
+    [echo] global 3: foo is foo
+    [echo] global 1: foo is foo
+    [echo] First sequential: foo is bar.1
+    [echo] Second sequential: foo is bar.2
+    [echo] global 2: foo is foo</pre>
+
+<h4>Use inside <code>macrodef</code></h4>
+
+<p>This probably is where <code>local</code> can be applied in the most useful way.  If you needed a
+"temporary property" inside a <code>macrodef</code> in Ant prior to Ant 1.8.0 you had to try to come
+up with a property name that would be unique across macro invocations.</p>
+
+<p>Say you wanted to write a macro that created the parent directory of a given file.  A naive
+approach would be:</p>
+
+<pre>
+&lt;macrodef name="makeparentdir"&gt;
+    &lt;attribute name="file"/&gt;
+    &lt;sequential&gt;
+        &lt;dirname property="parent" file="@{file}"/&gt;
+        &lt;mkdir dir="${parent}"/&gt;
+    &lt;/sequential&gt;
+&lt;/macrodef&gt;
+&lt;makeparentdir file="some-dir/some-file"/&gt;</pre>
+
+<p>but this would create a global property <code>parent</code> on the first invocation&mdash;and
+since properties are not mutable, any subsequent invocation will see the same value and try to
+create the same directory as the first invocation.</p>
+
+<p>The recommendation prior to Ant 1.8.0 was to use a property name based on one of the macro's
+attributes, like</p>
+
+<pre>
+&lt;macrodef name="makeparentdir"&gt;
+    &lt;attribute name="file"/&gt;
+    &lt;sequential&gt;
+        &lt;dirname property="parent.@{file}" file="@{file}"/&gt;
+        &lt;mkdir dir="${parent.@{file}}"/&gt;
+    &lt;/sequential&gt;
+&lt;/macrodef&gt;</pre>
+
+<p>Now invocations for different files will set different properties and the directories will get
+created.  Unfortunately this "pollutes" the global properties space.  In addition, it may be hard to
+come up with unique names in some cases.</p>
 
 <p>Enter <code>&lt;local&gt;</code>:</p>
 
 <pre>
-    &lt;macrodef name="makeparentdir"&gt;
-        &lt;attribute name="file"/&gt;
-        &lt;sequential&gt;
-            &lt;local name="parent"/&gt;
-            &lt;dirname property="parent" file="@{file}"/&gt;
-            &lt;mkdir dir="${parent}"/&gt;
-        &lt;/sequential&gt;
-    &lt;/macrodef&gt;
-</pre>
+&lt;macrodef name="makeparentdir"&gt;
+    &lt;attribute name="file"/&gt;
+    &lt;sequential&gt;
+        &lt;local name="parent"/&gt;
+        &lt;dirname property="parent" file="@{file}"/&gt;
+        &lt;mkdir dir="${parent}"/&gt;
+    &lt;/sequential&gt;
+&lt;/macrodef&gt;</pre>
 
-<p>Each invocation gets its own property name "parent" and there will
-  be no global property of that name at all.</p>
+<p>Each invocation gets its own property named <code>parent</code> and there will be no global
+property of that name at all.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/macrodef.html ant-1.10.3/manual/Tasks/macrodef.html
--- ant-1.9.10/manual/Tasks/macrodef.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/macrodef.html	2018-03-24 12:37:12.000000000 +0000
@@ -17,281 +17,213 @@
 <html>
 
   <head>
-    <meta http-equiv="Content-Language" content="en-us"></meta>
+    <meta http-equiv="Content-Language" content="en-us">
     <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
     <title>MacroDef Task</title>
   </head>
 
   <body>
 
-    <h2><a name="macrodef">MacroDef</a></h2>
+    <h2 id="macrodef">MacroDef</h2>
+    <p><em>Since Apache Ant 1.6</em></p>
     <h3>Description</h3>
-    <p>
-      This defines a new task using a <code>&lt;sequential&gt;</code>
-      nested task as a template. Nested elements <code>&lt;attribute&gt;</code> and
-      <code>&lt;element&gt;</code> are used to specify attributes and elements of
-      the new task. These get substituted into the <code>&lt;sequential&gt;</code>
-      task when the new task is run.
-    </p>
+    <p>This defines a new task using a <code>&lt;sequential&gt;</code> nested task as a
+      template. Nested elements <code>&lt;attribute&gt;</code> and <code>&lt;element&gt;</code> are
+      used to specify attributes and elements of the new task. These get substituted into
+      the <code>&lt;sequential&gt;</code> task when the new task is run.</p>
     <h3>Note</h3>
-    <p>
-      You can also use <i>prior defined</i> attributes for default-values in
-      other attributes. See the examples.
-    </p>
-    <p>
-      <em>since Apache Ant 1.6</em>
-    </p>
+    <p>You can also use <em>prior defined</em> attributes for <var>default</var> values in other
+      attributes. See the examples.</p>
     <h3>Parameters</h3>
-    <table border="1" cellpadding="2" cellspacing="0">
+    <table class="attr">
       <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
       <tr>
-        <td valign="top">name</td>
-        <td valign="top">The name of the new definition.</td>
-        <td valign="top" align="center">Yes</td>
+        <td>name</td>
+        <td>The name of the new definition.</td>
+        <td>Yes</td>
       </tr>
       <tr>
-        <td valign="top">uri</td>
-        <td valign="top">
+        <td>uri</td>
+        <td>
           The uri that this definition should live in.
         </td>
-        <td valign="top" align="center">No</td>
+        <td>No</td>
       </tr>
       <tr>
-        <td valign="top">description</td>
-        <td valign="top">A description of the macrodef
+        <td>description</td>
+        <td>A description of the macrodef
           (for documentation purposes only).
         </td>
-        <td valign="top" align="center">No</td>
+        <td>No</td>
       </tr>
       <tr>
-        <td valign="top">backtrace</td>
-        <td valign="top">
-          This controls the error traceback if there is an
-          error detected when running the macro. If this is
-          set to true, there will be an error trackback, if false
-          there will not be one. <em>Since Ant 1.7</em>.
-        </td>
-        <td valign="top" align="center">No; default <em>true</em></td>
+        <td>backtrace</td>
+        <td>This controls the error traceback if there is an error detected when running the
+          macro. If this is set to <q>true</q>, there will be an error trackback, if <q>false</q>
+          there will be none. <em>Since Ant 1.7</em>.</td>
+        <td>No; default <q>true</q></td>
       </tr>
     </table>
-      <h3>Parameters specified as nested elements</h3>
+    <h3>Parameters specified as nested elements</h3>
     <h4>attribute</h4>
-    <p>
-      This is used to specify attributes of the new task. The values
-      of the attributes get substituted into the templated task.
-      The attributes will be required attributes unless a default
-      value has been set.
-    </p>
-    <p>
-      This attribute is placed in the body of the templated
-      task using a notation similar to the ant property notation
-      - @{attribute name}. (May be remembered as "put the substitution
-      AT this location").
-    </p>
-    <p>
-      The escape sequence @@ is used to escape @. This allows @{x} to be
-      placed in the text without substitution of x by using @@{x}.
-      This corresponds to the $$ escape sequence for properties.
-    </p>
-    <p>
-      The case of the attribute is ignored, so @{myAttribute} is treated the
-      same as @{MyAttribute}.
-    </p>
-    <h3>Parameters</h3>
-    <table border="1" cellpadding="2" cellspacing="0">
-      <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
-      </tr>
-      <tr>
-        <td valign="top">name</td>
-        <td valign="top">The name of the new attribute</td>
-        <td valign="top" align="center">Yes</td>
-      </tr>
-      <tr>
-        <td valign="top">default</td>
-        <td valign="top">
-          The default value of the attribute.
-        </td>
-        <td valign="top" align="center">No</td>
-      </tr>
-      <tr>
-        <td valign="top">description</td>
-        <td valign="top">
-          This contains a description of the attribute.
-          <em>since ant 1.6.1</em>
-        </td>
-        <td valign="top" align="center">No</td>
-      </tr>
-      <tr>
-        <td valign="top">doubleexpanding</td>
-        <td valign="top">
-          Controls whether or not property references in the attribute are expanded twice or just once.
-          See the <a href="http://ant.apache.org/faq.html#macrodef-property-expansion">FAQ</a> for details.
-          <em>since Ant 1.8.3</em>
-        </td>
-        <td valign="top" align="center">No; default true</td>
+    <p>This is used to specify attributes of the new task. The values of the attributes get
+      substituted into the templated task.  The attributes will be required attributes unless a
+      default value has been set.</p>
+    <p>This attribute is placed in the body of the templated task using a notation similar to the
+      Ant property notation&mdash;<code>@{attribute name}</code>. (May be remembered as "put the
+      substitution AT this location").</p>
+    <p>The escape sequence <code>@@</code> is used to escape <code>@</code>. This
+      allows <code>@{x}</code> to be placed in the text without substitution of <code>x</code> by
+      using <code>@@{x}</code>.  This corresponds to the <code>$$</code> escape sequence for
+      properties.</p>
+    <p>The case of the attribute is ignored, so <code>@{myAttribute}</code> is treated the same
+      as <code>@{MyAttribute}</code>.</p>
+    <h5>Parameters</h5>
+    <table class="attr">
+      <tr>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
+      </tr>
+      <tr>
+        <td>name</td>
+        <td>The name of the new attribute</td>
+        <td>Yes</td>
+      </tr>
+      <tr>
+        <td>default</td>
+        <td>The default value of the attribute.</td>
+        <td>No</td>
+      </tr>
+      <tr>
+        <td>description</td>
+        <td>This contains a description of the attribute.  <em>Since Ant 1.6.1</em></td>
+        <td>No</td>
+      </tr>
+      <tr>
+        <td>doubleexpanding</td>
+        <td>Controls whether or not property references in the attribute are expanded twice or just
+          once.  See the <a href="https://ant.apache.org/faq.html#macrodef-property-expansion"
+          target="_top">FAQ</a> for details.  <em>Since Ant 1.8.3</em></td>
+        <td>No; default is <q>true</q></td>
       </tr>
     </table>
     <h4>element</h4>
-    <p>
-      This is used to specify nested elements of the new task.
-      The contents of the nested elements of the task instance
-      are placed in the templated task at the tag name.
-    </p>
-    <p>
-      The case of the element name is ignored.
-    </p>
-    <h3>Parameters</h3>
-    <table border="1" cellpadding="2" cellspacing="0">
+    <p>This is used to specify nested elements of the new task.  The contents of the nested elements
+      of the task instance are placed in the templated task at the tag name.</p>
+    <p>The case of the <code>element</code> name is ignored.</p>
+    <h5>Parameters</h5>
+    <table class="attr">
       <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
       <tr>
-        <td valign="top">name</td>
-        <td valign="top">The name of the element</td>
-        <td valign="top" align="center">Yes</td>
+        <td>name</td>
+        <td>The name of the element.</td>
+        <td>Yes</td>
       </tr>
       <tr>
-        <td valign="top">optional</td>
-        <td valign="top">
-          If true this nested element is optional. Default is
-          false - i.e the nested element is required in
-          the new task.
-        </td>
-        <td valign="top" align="center">No</td>
+        <td>optional</td>
+        <td>If <q>true</q> this nested element is optional.</td>
+        <td>No; default is <q>false</q>&mdash;the nested element is required in the new task</td>
       </tr>
       <tr>
-        <td valign="top">implicit</td>
-        <td valign="top">
-          If true this nested element is implicit. This means that
-          any nested elements of the macrodef instance will be placed
-          in the element indicated by the name of this element.
-          There can only be one element if an element is implicit.
-          The default value is false. <em>since ant 1.6.2</em>
-        </td>
-        <td valign="top" align="center">No</td>
+        <td>implicit</td>
+        <td>If <q>true</q> this nested element is implicit. This means that any nested elements of
+          the <code>macrodef</code> instance will be placed in the element indicated by the name of
+          this element.  There can only be one element if an element is implicit.  <em>Since Ant
+          1.6.2</em></td>
+        <td>No; default is <q>false</q></td>
       </tr>
       <tr>
-        <td valign="top">description</td>
-        <td valign="top">
-          This contains a description
-          informing the user what the contents of the element are expected to be.
-          <em>since ant 1.6.1</em>
-        </td>
-        <td valign="top" align="center">No</td>
+        <td>description</td>
+        <td>This contains a description informing the user what the contents of the element are
+          expected to be.  <em>Since Ant 1.6.1</em></td>
+        <td>No</td>
       </tr>
     </table>
     <h4>text</h4>
-    <p>
-      This is used to specify the treatment of text contents of the macro invocation.
-      If this element is not present, then any nested text in the macro invocation
-      will be an error. If the text element is present, then the name
-      becomes an attribute that gets set to the nested text of the macro invocation.
-      <em>Since ant 1.6.1.</em>
-    </p>
-    <p>
-      The case of the text name is ignored.
-    </p>
-    <h3>Parameters</h3>
-    <table border="1" cellpadding="2" cellspacing="0">
+    <p>This is used to specify the treatment of text contents of the macro invocation.  If this
+      element is not present, then any nested text in the macro invocation will be an error. If
+      the <code>text</code> element is present, then the name becomes an attribute that gets set to
+      the nested text of the macro invocation.  <em>Since Ant 1.6.1</em>.</p>
+    <p>The case of the <code>text</code> name is ignored.</p>
+    <h5>Parameters</h5>
+    <table class="attr">
       <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
       <tr>
-        <td valign="top">name</td>
-        <td valign="top">The name of the text attribute</td>
-        <td valign="top" align="center">Yes</td>
+        <td>name</td>
+        <td>The name of the text attribute.</td>
+        <td>Yes</td>
       </tr>
       <tr>
-        <td valign="top">optional</td>
-        <td valign="top">
-          If true nested text in the macro is optional, default is "false".
-        </td>
-        <td valign="top" align="center">No</td>
+        <td>optional</td>
+        <td>If <q>true</q> nested text in the macro is optional.</td>
+        <td>No; default is <q>false</q></td>
       </tr>
       <tr>
-        <td valign="top">trim</td>
-        <td valign="top">
-          If true, the nested text is trimmed of white space,
-          default is "false".
-        </td>
-        <td valign="top" align="center">No</td>
+        <td>trim</td>
+        <td>If <q>true</q>, the nested text is trimmed of white space.</td>
+        <td>No; default is <q>false</q></td>
       </tr>
       <tr>
-        <td valign="top">description</td>
-        <td valign="top">
-          This contains a description
-          informing the user what the nested text of the macro is expected
-          to be.
-        </td>
-        <td valign="top" align="center">No</td>
+        <td>description</td>
+        <td>This contains a description informing the user what the nested text of the macro is
+          expected to be.</td>
+        <td>No</td>
       </tr>
     </table>
 
     <h3>Examples</h3>
-    <p>
-      The following example defined a task called testing and
-      runs it.
-    </p>
-    <blockquote>
-<pre class=code>
+    <p>The following example defined a task called testing and runs it.</p>
+    <pre>
 &lt;macrodef name="testing"&gt;
-   &lt;attribute name="v" default="NOT SET"/&gt;
-   &lt;element name="some-tasks" optional="yes"/&gt;
-   &lt;sequential&gt;
-      &lt;echo&gt;v is @{v}&lt;/echo&gt;
-      &lt;some-tasks/&gt;
-   &lt;/sequential&gt;
+    &lt;attribute name="v" default="NOT SET"/&gt;
+    &lt;element name="some-tasks" optional="yes"/&gt;
+    &lt;sequential&gt;
+        &lt;echo&gt;v is @{v}&lt;/echo&gt;
+        &lt;some-tasks/&gt;
+    &lt;/sequential&gt;
 &lt;/macrodef&gt;
 
 &lt;testing v="This is v"&gt;
-   &lt;some-tasks&gt;
-      &lt;echo&gt;this is a test&lt;/echo&gt;
-   &lt;/some-tasks&gt;
-&lt;/testing&gt;
-</pre>
-    </blockquote>
-    <p>
-      The following fragment defines a task called <code>&lt;call-cc&gt;</code> which
-      take the attributes "target", "link" and "target.dir" and the
-      nested element "cc-elements". The body of the task
-      uses the <code>&lt;cc&gt;</code> task from the
-      <a href="http://ant-contrib.sourceforge.net/">ant-contrib</a> project.
-    </p>
-    <blockquote>
-<pre class="code">
+    &lt;some-tasks&gt;
+        &lt;echo&gt;this is a test&lt;/echo&gt;
+    &lt;/some-tasks&gt;
+&lt;/testing&gt;</pre>
+    <p>The following fragment defines a task called <code>&lt;call-cc&gt;</code> which take the
+      attributes <var>target</var>, <var>link</var> and <var>target.dir</var> and the nested
+      element <code>cc-elements</code>. The body of the task uses the <code>&lt;cc&gt;</code> task
+      from the <a href="http://ant-contrib.sourceforge.net/" target="_top">ant-contrib</a>
+      project.</p>
+    <pre>
 &lt;macrodef name="call-cc"&gt;
-   &lt;attribute name="target"/&gt;
-   &lt;attribute name="link"/&gt;
-   &lt;attribute name="target.dir"/&gt;
-   &lt;element name="cc-elements"/&gt;
-   &lt;sequential&gt;
-      &lt;mkdir dir="${obj.dir}/@{target}"/&gt;
-      &lt;mkdir dir="@{target.dir}"/&gt;
-         &lt;cc link="@{link}" objdir="${obj.dir}/@{target}"
-             outfile="@{target.dir}/@{target}"&gt;
+    &lt;attribute name="target"/&gt;
+    &lt;attribute name="link"/&gt;
+    &lt;attribute name="target.dir"/&gt;
+    &lt;element name="cc-elements"/&gt;
+    &lt;sequential&gt;
+        &lt;mkdir dir="${obj.dir}/@{target}"/&gt;
+        &lt;mkdir dir="@{target.dir}"/&gt;
+        &lt;cc link="@{link}" objdir="${obj.dir}/@{target}"
+            outfile="@{target.dir}/@{target}"&gt;
             &lt;compiler refid="compiler.options"/&gt;
             &lt;cc-elements/&gt;
-         &lt;/cc&gt;
-      &lt;/sequential&gt;
-&lt;/macrodef&gt;
-</pre>
-    </blockquote>
-    <p>
-      This then can be used as follows:
-    </p>
-    <blockquote>
-<pre class="code">
+        &lt;/cc&gt;
+    &lt;/sequential&gt;
+&lt;/macrodef&gt;</pre>
+    <p>This then can be used as follows:</p>
+    <pre>
 &lt;call-cc target="unittests" link="executable"
          target.dir="${build.bin.dir}"&gt;
    &lt;cc-elements&gt;
@@ -301,16 +233,11 @@
       &lt;fileset dir="${gen.dir}" includes = "*.cpp"/&gt;
       &lt;linker refid="linker-libs"/&gt;
    &lt;/cc-elements&gt;
-&lt;/call-cc&gt;
-</pre>
-    </blockquote>
-    <p>
-      The following fragment shows &lt;call-cc&gt;, but this time
-      using an implicit element and with the link and target.dir arguments
-      having default values.
-    </p>
-    <blockquote>
-<pre class="code">
+&lt;/call-cc&gt;</pre>
+    <p>The following fragment shows <code>&lt;call-cc&gt;</code>, but this time using an implicit
+      element and with the <var>link</var> and <var>target.dir</var> arguments having default
+      values.</p>
+    <pre>
 &lt;macrodef name="call-cc"&gt;
    &lt;attribute name="target"/&gt;
    &lt;attribute name="link" default="executable"/&gt;
@@ -321,19 +248,14 @@
       &lt;mkdir dir="@{target.dir}"/&gt;
          &lt;cc link="@{link}" objdir="${obj.dir}/@{target}"
              outfile="@{target.dir}/@{target}"&gt;
-            &lt;compiler refid="compiler.options"/&gt;
-            &lt;cc-elements/&gt;
+             &lt;compiler refid="compiler.options"/&gt;
+             &lt;cc-elements/&gt;
          &lt;/cc&gt;
       &lt;/sequential&gt;
-&lt;/macrodef&gt;
-</pre>
-    </blockquote>
-    <p>
-      This then can be used as follows, note that &lt;cc-elements&gt;
-      is not specified.
-    </p>
-    <blockquote>
-<pre class="code">
+&lt;/macrodef&gt;</pre>
+    <p>This then can be used as follows, note that <code>&lt;cc-elements&gt;</code> is not
+    specified.</p>
+    <pre>
 &lt;call-cc target="unittests"&gt;
    &lt;includepath location="${gen.dir}"/&gt;
    &lt;includepath location="test"/&gt;
@@ -341,13 +263,9 @@
    &lt;fileset dir="${gen.dir}" includes = "*.cpp"/&gt;
    &lt;linker refid="linker-libs"/&gt;
 &lt;/call-cc&gt;
-</pre>
-    </blockquote>
-    <p>
-      The following shows the use of the <code>text</code> element.
-    </p>
-    <blockquote>
-<pre class="code">
+    </pre>
+    <p>The following shows the use of the <code>text</code> element.</p>
+    <pre>
 &lt;macrodef name="echotest"&gt;
    &lt;text name="text"/&gt;
    &lt;sequential&gt;
@@ -357,29 +275,20 @@
 &lt;echotest&gt;
    Hello world
 &lt;/echotest&gt;
-</pre>
-    </blockquote>
-    <p>
-      The following uses a prior defined attribute for setting the
-      default value of another. The output would be
-      <tt>one=test two=test</tt>. If you change the order of lines
-      *1 and *2 the output would be <tt>one=test two=@{one}</tt>,
-      because while processing the <i>two</i>-line the value for
-      <i>one</i> is not set.
-    </p>
-    <blockquote>
-<pre class="code">
+    </pre>
+    <p>The following uses a prior defined attribute for setting the default value of another. The
+      output would be <code class="output">one=test two=test</code>. If you change the order of
+      lines *1 and *2 the output would be <code class="output">one=test two=@{one}</code>, because
+      while processing the <var>two</var>-line the value for <var>one</var> is not set.</p>
+    <pre>
 &lt;macrodef name="test"&gt;
-   &lt;attribute name="one"/&gt;                     <b>*1</b>
-   &lt;attribute name="two" default="@{one}"/&gt;    <b>*2</b>
+   &lt;attribute name="one"/&gt;                     <strong>*1</strong>
+   &lt;attribute name="two" default="@{one}"/&gt;    <strong>*2</strong>
    &lt;sequential&gt;
       &lt;echo&gt;one=@{one}   two=@{two}&lt;/echo&gt;
    &lt;/sequential&gt;
 &lt;/macrodef&gt;
-&lt;test one="test"/&gt;
-</pre>
-    </blockquote>
-
+&lt;test one="test"/&gt;</pre>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/mail.html ant-1.10.3/manual/Tasks/mail.html
--- ant-1.9.10/manual/Tasks/mail.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/mail.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,304 +24,266 @@
 
 <body>
 
-<h2><a name="mail">Mail</a></h2>
+<h2 id="mail">Mail</h2>
 <h3>Description</h3>
-  <p>
-    A task to send SMTP email.
-  </p>
-  <p>
-    This task can send mail using either plain
-    text, UU encoding, or MIME format mail, depending on what is available.
-  </p>
-  <p>
-    SMTP auth and SSL/TLS require JavaMail and are only available in MIME format.
-  </p>
-  <p>
-    Attachments may be sent using nested
-    <code>&lt;attachments&gt;</code> elements, which are <a
-    href="../using.html#path">path-like structures</a>.  This means
-    any filesystem based <a
-    href="../Types/resources.html">resource</a> or resource
-    collection can be used to point to attachments.  Prior to Apache Ant 1.7
-    only <code>&lt;fileset&gt;</code> has been supported as a nested
-    element, you can still use this directly without an
-    <code>&lt;attachments&gt;</code> container.
-  </p>
-  <p>
-    <strong>Note:</strong> This task may depend on external libraries
-    that are not included in the Ant distribution. 
-    See <a href="../install.html#librarydependencies">Library Dependencies</a>
-    for more information.
-  </p>
+<p>A task to send SMTP email.</p>
+<p>This task can send mail using either plain text, UU encoding, or MIME format mail, depending on
+what is available.</p>
+<p>SMTP auth and SSL/TLS require JavaMail and are only available in MIME format.</p>
+<p>Attachments may be sent using nested <code>&lt;attachments&gt;</code> elements, which
+are <a href="../using.html#path">path-like structures</a>.  This means any filesystem
+based <a href="../Types/resources.html">resource</a> or resource collection can be used to point to
+attachments.  Prior to Apache Ant 1.7 only <code>&lt;fileset&gt;</code> has been supported as a
+nested element, you can still use this directly without an <code>&lt;attachments&gt;</code>
+container.</p>
+<p><strong>Note</strong>: This task may depend on external libraries that are not included in the
+Ant distribution.  See <a href="../install.html#librarydependencies">Library Dependencies</a> for
+more information.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">from</td>
-    <td valign="top">Email address of sender.</td>
-    <td align="center" valign="top">Either a <code>from</code> attribute, or a <code>&lt;from&gt;</code>
-    element.</td>
+    <td>from</td>
+    <td>Email address of sender.</td>
+    <td>Either a <var>from</var> attribute, or a <code>&lt;from&gt;</code> element.</td>
   </tr>
   <tr>
-    <td valign="top">replyto</td>
-    <td valign="top">Replyto email address.</td>
-    <td align="center" valign="top">No</td>
+    <td>replyto</td>
+    <td>Reply-to email address.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">tolist</td>
-    <td valign="top">Comma-separated list of recipients.</td>
-    <td align="center" valign="middle" rowspan="3">At least one of these, or the
-       equivalent elements.</td>
+    <td>tolist</td>
+    <td>Comma-separated list of recipients.</td>
+    <td rowspan="3">At least one of these, or the equivalent nested elements</td>
   </tr>
   <tr>
-    <td valign="top">cclist</td>
-    <td valign="top">Comma-separated list of recipients to carbon copy</td>
+    <td>cclist</td>
+    <td class="left">Comma-separated list of recipients to carbon copy</td>
     </tr>
   <tr>
-    <td valign="top">bcclist</td>
-    <td valign="top">Comma-separated list of recipients to blind carbon copy
+    <td>bcclist</td>
+    <td class="left">Comma-separated list of recipients to blind carbon copy
     </td>
   </tr>
   <tr>
-    <td valign="top">message</td>
-    <td valign="top">Message to send in the body of the email.</td>
-    <td align="center" valign="middle" rowspan="2">One of these or a
-    <code>&lt;message&gt;</code> element.</td>
-  </tr>
-  <tr>
-    <td valign="top">messagefile</td>
-    <td valign="top">File to send as the body of the email. Property
-    values in the file will be expanded.</td>
-  </tr>
-  <tr>
-    <td valign="top">messagefileinputencoding</td>
-    <td valign="top">
-      Specifies the encoding of the input file. Please see
-      <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html">
-        Supported Encodings</a> for a list of possible
-      values. Defaults to the platform's default character
-      encoding. <em>Since Ant 1.9.4</em>
+    <td>message</td>
+    <td>Message to send in the body of the email.</td>
+    <td rowspan="2">One of these or a <code>&lt;message&gt;</code> element.</td>
+  </tr>
+  <tr>
+    <td>messagefile</td>
+    <td class="left">File to send as the body of the email. Property values in the file will be
+      expanded.</td>
+  </tr>
+  <tr>
+    <td>messagefileinputencoding</td>
+    <td>Specifies the encoding of the input file. Please
+      see <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html"
+      target="_top">Supported Encodings</a> for a list of possible values. <em>Since Ant 1.9.4</em>
     </td>
-    <td valign="top" align="center">No</td>
+    <td>No; defaults to default JVM character encoding</td>
   </tr>
   <tr>
-    <td valign="top">messagemimetype</td>
-    <td valign="top">The content type of the message.  The default is
-    <code>text/plain</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>messagemimetype</td>
+    <td>The content type of the message.</td>
+    <td>No; default is <q>text/plain</q></td>
   </tr>
   <tr>
-    <td valign="top">files</td>
-    <td valign="top">Files to send as attachments to the email.  Separate multiple
-    file names using a comma or space.  You can also use <code>&lt;fileset&gt;</code>
-    elements to specify files.</td>
-    <td align="center" valign="top">No</td>
+    <td>files</td>
+    <td>Files to send as attachments to the email.  Separate multiple file names using a comma or
+      space.  You can also use <code>&lt;fileset&gt;</code> elements to specify files.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">flag to indicate whether to halt the build on
-    any error.  The default value is <code>true</code>.</td>
-    <td align="center" valign="top">No.</td>
+    <td>failonerror</td>
+    <td>flag to indicate whether to halt the build on any error.</td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">includefilenames</td>
-    <td valign="top">Include filename(s) before file contents.
-    Valid only when the <code>plain</code> encoding is used.  The default
-    value is <code>false</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>includefilenames</td>
+    <td>Include filename(s) before file contents.</td>
+    <td>No; default is <q>false</q>, ignored unless <q>plain</q> encoding is used</td>
   </tr>
   <tr>
-    <td valign="top">mailhost</td>
-    <td valign="top">Host name of the SMTP server.  The default value is
-    <code>localhost</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>mailhost</td>
+    <td>Host name of the SMTP server.</td>
+    <td>No; default is <q>localhost</q></td>
   </tr>
   <tr>
-    <td valign="top">mailport</td>
-    <td valign="top">TCP port of the SMTP server.  The default value is 25.</td>
-    <td align="center" valign="top">No</td>
+    <td>mailport</td>
+    <td>TCP port of the SMTP server.</td>
+    <td>No; default is <q>25</q></td>
   </tr>
   <tr>
-    <td valign="top">user</td>
-    <td valign="top">user name for SMTP auth</td>
-    <td valign="center">Yes, if SMTP auth is required on your SMTP server<br></br>
-    the email message will be then sent using Mime and requires JavaMail</td>
+    <td>user</td>
+    <td>user name for SMTP auth</td>
+    <td>Yes, if SMTP auth is required on your SMTP server;<br/>the email message will be then sent
+      using MIME and requires JavaMail</td>
   </tr>
   <tr>
-    <td valign="top">password</td>
-    <td valign="top">password for SMTP auth</td>
-    <td valign="center">Yes, if SMTP auth is required on your SMTP server<br></br>
-    the email message will be then sent using Mime and requires JavaMail</td>
+    <td>password</td>
+    <td>password for SMTP auth</td>
+    <td>Yes, if SMTP auth is required on your SMTP server;<br/>the email message will be then sent
+      using MIME and requires JavaMail</td>
   </tr>
   <tr>
-    <td valign="top">ssl</td>
-    <td valign="top">"true", "on" or "yes" accepted here<br></br>
-    indicates whether you need TLS/SSL</td>
-    <td align="center" valign="top">No</td>
+    <td>ssl</td>
+    <td><q>true</q>, <q>on</q>, or <q>yes</q> accepted here<br/>indicates whether you need
+      TLS/SSL</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">Specifies the encoding to use for the content of the email.
-    Values are <code>mime</code>, <code>uu</code>, <code>plain</code>, or
-      <code>auto</code>.  The default value is <code>auto</code>.
-      <code>uu</code> or <code>plain</code> are not compatible with SMTP auth</td>
-    <td align="center" valign="top">No</td>
+    <td>encoding</td>
+    <td>Specifies the encoding to use for the content of the email.  Values
+      are <q>mime</q>, <q>uu</q>, <q>plain</q>, or <q>auto</q>. <q>uu</q> or <q>plain</q> are not
+      compatible with SMTP auth</td>
+    <td>No; default is <q>auto</q></td>
   </tr>
   <tr>
-    <td valign="top">charset</td>
-    <td valign="top">Character set of the email.<br>
-    You can also set the charset in the message nested element.<br>
-    These options are mutually exclusive.</td>
-    <td align="center" valign="top">No</td>
+    <td>charset</td>
+    <td>Character set of the email.<br/>You can also set the <var>charset</var> in
+      the <code>message</code> nested element.<br/>  These options are mutually exclusive.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">subject</td>
-    <td valign="top">Email subject line.</td>
-    <td align="center" valign="top">No</td>
+    <td>subject</td>
+    <td>Email subject line.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">ignoreInvalidRecipients</td>
-    <td valign="top">Boolean.  Whether the task should try to send
-      the message to as many recipients as possible and should only
-      fail if neither is reachable.  <em>Since Ant 1.8.0</em>.</td>
-    <td align="center" valign="top">No, default is false</td>
+    <td>ignoreInvalidRecipients</td>
+    <td>(boolean) Whether the task should try to send the message to as many recipients as possible
+      and should only fail if neither is reachable.  <em>Since Ant 1.8.0</em>.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">enableStartTLS</td>
-    <td valign="top">"true", "on" or "yes" accepted here<br></br>
-      whether the STARTTLS command used to switch to an encrypted
-      connection for authentication should be supported.  Requires
-      JavaMail.  <em>Since Ant 1.8.0</em></td>
-    <td align="center" valign="top">No</td>
+    <td>enableStartTLS</td>
+    <td>(boolean) Whether the <code>STARTTLS</code> command used to switch to an encrypted
+      connection for authentication should be supported.  Requires JavaMail.  <em>Since Ant
+      1.8.0</em></td>
+    <td>No</td>
   </tr>
 </table>
 
 <h3>Note regarding the attributes containing email addresses</h3>
-Since Ant 1.6, the attributes from, replyto, tolist, cclist, bcclist
-can contain email addresses of the form :
+<p><em>Since Ant 1.6</em>, the
+attributes <var>from</var>, <var>replyto</var>, <var>tolist</var>, <var>cclist</var>, <var>bcclist</var>
+can contain email addresses of the form:</p>
 <ul>
-<li>address@xyz.com</li>
-<li>name &lt;address@xyz.com&gt;</li>
-<li>&lt;address@xyz.com&gt; name</li>
-<li>(name) address@xyz.com</li>
-<li>address@xyz.com (name)</li>
+  <li><samp>address@xyz.com</samp></li>
+  <li><samp>name &lt;address@xyz.com&gt;</samp></li>
+  <li><samp>&lt;address@xyz.com&gt; name</samp></li>
+  <li><samp>(name) address@xyz.com</samp></li>
+  <li><samp>address@xyz.com (name)</samp></li>
 </ul>
-<p>You need to enter the angle brackets as XML entities
-<code>&amp;gt;</code> and <code>&amp;lt;</code>.</p>
+<p>You need to enter the angle brackets as XML entities <q>&amp;gt;</q> and <q>&amp;lt;</q>.</p>
 
 <h3>Parameters specified as nested elements</h3>
 
-<h4>to / cc / bcc / from/ replyto </h4>
+<h4>to / cc / bcc / from/ replyto</h4>
 <p>Adds an email address element.  It takes the following attributes:</p>
 
-<table width="60%" border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The display name for the address.</td>
-    <td align="center" valign="top">No</td>
+    <td>name</td>
+    <td>The display name for the address.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">address</td>
-    <td valign="top">The email address.</td>
-    <td align="center" valign="top">Yes</td>
+    <td>address</td>
+    <td>The email address.</td>
+    <td>Yes</td>
   </tr>
 </table>
 
 <h4>message</h4>
 
-<p>Specifies the message to include in the email body.  It takes the following
-attributes:</p>
+<p>Specifies the message to include in the email body.  It takes the following attributes:</p>
 
-<table width="60%" border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">src</td>
-    <td valign="top">The file to use as the message.</td>
-    <td align="center" valign="top">No</td>
+    <td>src</td>
+    <td>The file to use as the message.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">mimetype</td>
-    <td valign="top">The content type to use for the message.</td>
-    <td align="center" valign="top">No</td>
+    <td>mimetype</td>
+    <td>The content type to use for the message.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">charset</td>
-    <td valign="top">Character set of the message<br>
-    You can also set the charset as attribute of the enclosing mail task.<br>
-    These options are mutually exclusive.</td>
-    <td align="center" valign="top">No</td>
+    <td>charset</td>
+    <td>Character set of the message<br/>You can also set the <var>charset</var> as attribute of the
+      enclosing <code>mail</code> task.<br/>  These options are mutually exclusive.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">inputencoding</td>
-    <td valign="top">
-      Specifies the encoding of the input file. Please see
-      <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html">
-        Supported Encodings</a> for a list of possible
-      values. Defaults to the platform's default character
-      encoding. <em>Since Ant 1.9.4</em>
+    <td>inputencoding</td>
+    <td>
+      Specifies the encoding of the input file. Please
+      see <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html"
+      target="_top">Supported Encodings</a> for a list of possible values. <em>Since Ant 1.9.4</em>
     </td>
-    <td valign="top" align="center">No</td>
+    <td>No; defaults to default JVM character encoding</td>
   </tr>
 </table>
 
-<p>If the <code>src</code> attribute is not specified, then text can be added
-inside the <code>&lt;message&gt;</code> element. Property expansion will occur
-in the message, whether it is specified as an external file or as text within
-the <code>&lt;message&gt;</code> element.</p>
+<p>If the <var>src</var> attribute is not specified, then text can be added inside
+the <code>&lt;message&gt;</code> element. Property expansion will occur in the message, whether it
+is specified as an external file or as text within the <code>&lt;message&gt;</code> element.</p>
 
 <h4>header</h4>
-<p><strong>Since Ant 1.7</strong>, arbitrary mail headers can be added by
-  specifying these attributes on one or more nested header elements:</p>
+<p><em>Since Ant 1.7</em>, arbitrary mail headers can be added by specifying these attributes on one
+or more nested header elements:</p>
 
-<table width="60%" border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The name associated with this mail header.</td>
-    <td align="center" valign="top">Yes</td>
+    <td>name</td>
+    <td>The name associated with this mail header.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">The value to assign to this mail header.</td>
-    <td align="center" valign="top">Yes</td>
+    <td>value</td>
+    <td>The value to assign to this mail header.</td>
+    <td>Yes</td>
   </tr>
 </table>
 
-<p>It is permissible to duplicate the name attribute amongst multiple headers.
-</p>
+<p>It is permissible to duplicate the name attribute amongst multiple headers.</p>
 
 <h3>Examples</h3>
 
-<blockquote><pre>
+<pre>
 &lt;mail from=&quot;me&quot;
       tolist=&quot;you&quot;
       subject=&quot;Results of nightly build&quot;
-      files=&quot;build.log&quot;/&gt;
-</pre></blockquote>
+      files=&quot;build.log&quot;/&gt;</pre>
 
-<p>Sends an email from <i>me</i> to <i>you</i> with a subject of
-<i>Results of nightly build</i> and includes the contents of the file
-<i>build.log</i> in the body of the message.</p>
+<p>Sends an email from <q>me</q> to <q>you</q> with a subject of <q>Results of nightly build</q> and
+includes the contents of the file <samp>build.log</samp> in the body of the message.</p>
 
-<blockquote><pre>
+<pre>
 &lt;mail mailhost=&quot;smtp.myisp.com&quot; mailport=&quot;1025&quot; subject=&quot;Test build&quot;&gt;
   &lt;from address=&quot;config@myisp.com&quot;/&gt;
   &lt;replyto address=&quot;me@myisp.com&quot;/&gt;
@@ -332,17 +294,16 @@
       &lt;include name=&quot;**/*.zip&quot;/&gt;
     &lt;/fileset&gt;
   &lt;/attachments&gt;
-&lt;/mail&gt;
-</pre></blockquote>
+&lt;/mail&gt;</pre>
 
-<p>Sends an eMail from <i>config@myisp.com</i> to <i>all@xyz.com</i> with a subject of
-<i>Test Build</i>. Replies to this email will go to <i>me@myisp.com</i>.
-Any zip files from the dist directory are attached.&nbsp; The
-task will attempt to use JavaMail and fall back to UU encoding or no encoding in
-that order depending on what support classes are available. <code>${buildname}</code>
-will be replaced with the <code>buildname</code> property's value.</p>
+<p>Sends an eMail from <q>config@myisp.com</q> to <q>all@xyz.com</q> with a subject of <q>Test
+Build</q>. Replies to this email will go to <q>me@myisp.com</q>.  Any zip files from
+the <samp>dist</samp> directory are attached. The task will attempt to use JavaMail and fall back to
+UU encoding or no encoding in that order depending on what support classes are
+available. <samp>${buildname}</samp> will be replaced with the <code>buildname</code> property's
+value.</p>
 
-<blockquote><pre>
+<pre>
 &lt;property name=&quot;line2&quot; value=&quot;some_international_message&quot;/&gt;
 &lt;echo message=&quot;${line2}&quot;/&gt;
 
@@ -350,13 +311,10 @@
   &lt;from address=&quot;me@myist.com&quot;/&gt;
   &lt;to address=&quot;all@xyz.com&quot;/&gt;
   &lt;message&gt;some international text:${line2}&lt;/message&gt;
-&lt;/mail&gt;
-</pre></blockquote>
-
-<p>Sends an eMail from <i>me@myisp.com</i> to <i>all@xyz.com</i> with a subject of
-<i>Test Build</i>, the message body being coded in UTF-8
-
+&lt;/mail&gt;</pre>
 
+<p>Sends an eMail from <q>me@myisp.com</q> to <q>all@xyz.com</q> with a subject of <q>Test
+Build</q>, the message body being coded in UTF-8.
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/makeurl.html ant-1.10.3/manual/Tasks/makeurl.html
--- ant-1.9.10/manual/Tasks/makeurl.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/makeurl.html	2018-03-24 12:37:12.000000000 +0000
@@ -14,221 +14,71 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-    
+
 <html>
 <head>
   <meta http-equiv="Content-Language" content="en-us">
+  <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
   <title>Makeurl Task</title>
 </head>
 
-<body bgcolor="#ffffff" text="#000000" link="#525D76"
-      alink="#525D76" vlink="#525D76">
-
-<table border="0" width="100%" cellspacing="4">
+<body>
 
-  <!-- PAGE HEADER -->
+<h2>Makeurl Task</h2>
+<h3 id="description">Description</h3>
+<p>This task takes one or more filenames and turns them into URLs, which it then assigns to a
+property.  Useful when setting up RMI or JNLP codebases, for example.  Nested filesets are
+supported; if present, these are turned into the URLs with the supplied <var>separator</var> between
+them.</p>
+<h3 id="attributes">Parameters</h3>
+<table class="attr">
   <tr>
-    <td>
-      <table border="0" width="100%"><tr>
-          <td valign="bottom">
-            <font size="+3" face="arial,helvetica,sanserif"><strong>Makeurl Task</strong></font>
-          </td>
-          <td>
-            <!-- PROJECT LOGO -->
-            <a href="http://ant.apache.org/">
-              <img src="../images/ant_logo_large.gif" align="right" alt="Apache Ant" border="0"/>
-            </a>
-          </td>
-      </tr></table>
-    </td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Type</th>
+    <th>Required</th>
   </tr>
-
-  <!-- START RIGHT SIDE MAIN BODY -->
   <tr>
-    <td  valign="top" align="left">
-
-          <!-- Applying task/long-description -->
-    <!-- Start Description -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-
-      <tr><td bgcolor="#525D76">
-        <font color="#ffffff" face="arial,helvetica.sanserif">
-          <a name="description">
-          <strong>Description</strong></a></font>
-      </td></tr>
-
-      <tr><td><blockquote>
-This task takes one or more filenames and turns them into URLs, which it then assigns to a property.
-Useful when setting up RMI or JNLP codebases, for example.
-Nested filesets are supported; if present, these are turned into the URLs with the supplied separator between them (default: space).
-<p/>
-<p>Examples:</p>
-<pre>
-&lt;makeurl file="${user.home}/.m2/repository" property="m2.repository.url"/&gt;
-</pre>
-Sets the property <code>m2.repository.url</code> to the file: URL of the local Maven2 repository.
-<pre>
-&lt;makeurl property="codebase"&gt;&lt;fileset dir="lib includes="*.jar"/&gt;&lt;/makeurl&gt;
-</pre>
-Set the property <code>codebase</code> to the three URLs of the files provided as nested elements.
-      </blockquote></td></tr>
-
-    </table>
-    <!-- End Description -->
-
- <!-- Ignore -->
-
-
-
-    <!-- Start Attributes -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-      <tr><td bgcolor="#525D76">
-        <font color="#ffffff" face="arial,helvetica.sanserif">
-          <a name="attributes">
-          <strong>Parameters</strong></a></font>
-      </td></tr>
-      <tr><td><blockquote>
-        <table>
-          <tr>
-        <td bgcolor="#cccccc" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Attribute</b></font>
-        </td>
-        <td bgcolor="#cccccc" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Description</b></font>
-        </td>
-        <td bgcolor="#cccccc" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Type</b></font>
-        </td>
-        <td bgcolor="#cccccc" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Requirement</b></font>
-        </td>
-          </tr>
-    <!-- Attribute Group -->    
-    
-    <!-- Attribute Group -->    
-        <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">file</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">name of a file to be converted into a URL</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">File</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">optional, if a nested fileset or path is supplied</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">property</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">name of a property to set to the URL</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">String</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">required</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">separator</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">separator for the multi-URL option</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">String</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">optional</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">validate</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">validate that every named file exists</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">boolean</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">optional; default: true</font>
-        </td>
-    </tr>
-
-
-        </table>
-      </blockquote></td></tr>
-
-    </table>
-    <!-- End Attributes -->
-
-    <!-- Start Elements -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-
-      <tr><td bgcolor="#525D76">
-        <font color="#ffffff" face="arial,helvetica.sanserif">
-          <a name="elements">
-          <strong>Parameters as nested elements</strong></a></font>
-      </td></tr>
-
-      <tr><td><blockquote>
-    <!-- Start Element -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-      <tr><td bgcolor="#828DA6">
-        <font color="#ffffff" face="arial,helvetica.sanserif" size="-1">
-          <strong>fileset</strong> (org.apache.tools.ant.types.FileSet)</font>
-      </td></tr>
-      <tr><td><blockquote>
-        A fileset of JAR files to include in the URL list, each separated by the separator.
- <!-- Ignore -->
- <!-- Ignore -->
-
-      </blockquote></td></tr>
-    </table>
-    <!-- End Element -->
-    <!-- Start Element -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-      <tr><td bgcolor="#828DA6">
-        <font color="#ffffff" face="arial,helvetica.sanserif" size="-1">
-          <strong>path</strong> (org.apache.tools.ant.types.Path)</font>
-      </td></tr>
-      <tr><td><blockquote>
-        Add a path to the URL. All elements in the path will be converted to individual URL entries.
- <!-- Ignore -->
- <!-- Ignore -->
-
-      </blockquote></td></tr>
-    </table>
-    <!-- End Element -->
-
-      </blockquote></td></tr>
-
-    </table>
-    <!-- End Elements -->
-
-
-    </td>
+    <td>file</td>
+    <td>name of a file to be converted into a URL</td>
+    <td>File</td>
+    <td>No, if a nested fileset or path is supplied</td>
+  </tr>
+  <tr>
+    <td>property</td>
+    <td>name of a property to set to the URL</td>
+    <td>String</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>separator</td>
+    <td>separator for the multi-URL option</td>
+    <td>String</td>
+    <td>No; default is space</td>
+  </tr>
+  <tr>
+    <td>validate</td>
+    <td>validate that every named file exists</td>
+    <td>boolean</td>
+    <td>No; default is <q>true</q></td>
   </tr>
-  <!-- END RIGHT SIDE MAIN BODY -->
-
 </table>
+<h3 id="elements">Parameters as nested elements</h3>
+<h4><strong>fileset</strong> (org.apache.tools.ant.types.FileSet)</h4>
+
+<p>A fileset of JAR files to include in the URL list, each separated by the separator.</p>
+
+<h4><strong>path</strong> (org.apache.tools.ant.types.Path)</h4>
 
+<p>Add a path to the URL. All elements in the path will be converted to individual URL entries.</p>
+<h3>Examples</h3>
+<pre>&lt;makeurl file="${user.home}/.m2/repository" property="m2.repository.url"/&gt;</pre>
+<p>Sets the property <code>m2.repository.url</code> to the file: URL of the local Maven2
+repository.</p>
+<pre>&lt;makeurl property="codebase"&gt;
+  &lt;fileset dir="lib includes="*.jar"/&gt;
+&lt;/makeurl&gt;</pre>
+<p>Set the property <code>codebase</code> to the three URLs of the files provided as nested
+elements.</p>
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/manifestclasspath.html ant-1.10.3/manual/Tasks/manifestclasspath.html
--- ant-1.9.10/manual/Tasks/manifestclasspath.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/manifestclasspath.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,94 +24,75 @@
 
 <body>
 
-<h2><a name="manifestclasspath">Manifestclasspath</a></h2>
+<h2 id="manifestclasspath">Manifestclasspath</h2>
+<p><em>Since Apache Ant 1.7</em></p>
 
 <h3>Description</h3>
-<p>Converts a <a href="../using.html#path">Path</a> into a property
-whose value is appropriate for a <a href="manifest.html">Manifest</a>'s
-<code>Class-Path</code> attribute.</p>
-
-<p>This task is often used to work around command line limitations on Windows
-when using very long class paths when launching an application. The long class
-path normally specified on the command line is replaced by a single (possibly
-empty) jar file which an in-manifest Class-Path attribute whose value lists
-all the jar and zip files the class path should contain. The files referenced
-from this attribute must be found relatively to the jar file itself, usually
-in the same directory. The Java VM automically uses all file entries listed
-in the Class-Path attributes of a jar to locate/load classes. Note though that
-it silently ignores entries for which it cannot find any corresponding file.</p>
-
-<p>Note that the property value created may be longer than a manifest's maximum
-72 characters per line, but will be properly wrapped as per the Jar
-specification by the <code>&lt;manifest&gt;</code> element, where the
-defined property is re-referenced.</p>
-
-<p>For this task to work properly the relative path from the file
-  given in the <code>jarfile</code> attribute to the elements of the
-  nested <code>classpath</code> must be the same as you expect them to
-  be when deploying the jar.</p>
+<p>Converts a <a href="../using.html#path">Path</a> into a property whose value is appropriate for
+a <a href="manifest.html">Manifest</a>'s <code>Class-Path</code> attribute.</p>
 
-<p><em>since Apache Ant 1.7</em></p>
+<p>This task is often used to work around command line limitations on Windows when using very long
+class paths when launching an application. The long class path normally specified on the command
+line is replaced by a single (possibly empty) jar file which an in-manifest <code>Class-Path</code>
+attribute whose value lists all the jar and zip files the classpath should contain. The files
+referenced from this attribute must be found relatively to the jar file itself, usually in the same
+directory. JVM automatically uses all file entries listed in the <code>Class-Path</code> attributes
+of a jar to locate/load classes. Note though that it silently ignores entries for which it cannot
+find any corresponding file.</p>
+
+<p>Note that the property value created may be longer than a manifest's maximum 72 characters per
+line, but will be properly wrapped as per the Jar specification by the <code>&lt;manifest&gt;</code>
+element, where the defined property is re-referenced.</p>
+
+<p>For this task to work properly the relative path from the file given in the <code>jarfile</code>
+attribute to the elements of the nested <code>classpath</code> must be the same as you expect them
+to be when deploying the jar.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">property</td>
-    <td valign="top">the name of the property to set. This property must
-                     not already be set.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>property</td>
+    <td>the name of the property to set. This property must not already be set.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">jarfile</td>
-    <td valign="top">
-      the filename for the Jar which will contain the manifest that will
-      use the property this task will set. This file need not exist yet,
-      but its parent directory must exist.
-    </td>
-    <td valign="top" align="center">Yes</td>
+    <td>jarfile</td>
+    <td>the filename for the Jar which will contain the manifest that will use the property this
+      task will set. This file need not exist yet, but its parent directory must exist.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">maxParentLevels</td>
-    <td valign="top">
-      The maximum number of parent directories one is allowed to traverse
-      to navigate from the jar file to the path entry. Put differently, the
-      maximum number of .. which is allowed in the relative path from the
-      jar file to a given class path entry. Specify 0 to enforce a path
-      entry to be in the same directory (or one of its sub-directories)
-      as the jar file itself.  Defaults to 2 levels.</td>
-    <td valign="top" align="center">No</td>
+    <td>maxParentLevels</td>
+    <td>The maximum number of parent directories one is allowed to traverse to navigate from the jar
+      file to the path entry. Put differently, the maximum number of <q>..</q> which is allowed in
+      the relative path from the jar file to a given class path entry. Specify <q>0</q> to enforce a
+      path entry to be in the same directory (or one of its sub-directories) as the jar file
+      itself.</td>
+    <td>No; defaults to <q>2</q></td>
   </tr>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
 <h4>classpath</h4>
-<p>A <a href="../using.html#path">Path-like</a> element, which can be
-defined in-place, or refer to a path defined elsewhere using the
-<code>&lt;classpath refid="<em>pathid</em>" /&gt;</code> syntax.
+<p>A <a href="../using.html#path">path-like</a> element, which can be defined in-place, or refer to
+a path defined elsewhere using the <code>&lt;classpath refid=&quot;pathid&quot;/&gt;</code> syntax.
 This classpath must not be empty, and is required.</p>
 
 <h3>Examples</h3>
-<div id="example1">
-  <blockquote><pre>
-    &lt;manifestclasspath property="jar.classpath"
-                       jarfile="build/acme.jar"&gt;
-      &lt;classpath refid="classpath" /&gt;
-    &lt;/manifestclasspath&gt;
-  </pre></blockquote>
-  <p>Assuming a path of id "classpath" was already defined, convert this
-  path relatively to the build/ directory that will contain acme.jar, which
-  can later be created with <code>&lt;jar&gt;</code> with a nested 
-  <code>&lt;manifest&gt;</code> element that lists an
-  <code>&lt;attribute name="Class-Path" value="${jar.classpath}" /&gt;</code>.
-  </p>
-</div>
-
-
+<pre>
+&lt;manifestclasspath property="jar.classpath"
+                   jarfile="build/acme.jar"&gt;
+    &lt;classpath refid="classpath"/&gt;
+&lt;/manifestclasspath&gt;</pre>
+<p>Assuming a path with <var>id</var> <q>classpath</q> was already defined, convert this path
+relatively to the <samp>build/</samp> directory that will contain <samp>acme.jar</samp>, which can
+later be created with <code>&lt;jar&gt;</code> with a nested <code>&lt;manifest&gt;</code> element
+that lists an <code>&lt;attribute name="Class-Path" value="${jar.classpath}"/&gt;</code>.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/manifest.html ant-1.10.3/manual/Tasks/manifest.html
--- ant-1.9.10/manual/Tasks/manifest.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/manifest.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,157 +24,140 @@
 
 <body>
 
-<h2><a name="manifest">Manifest</a></h2>
+<h2 id="manifest">Manifest</h2>
 <h3>Description</h3>
 <p>Creates a manifest file.</p>
 
-<p>This task can be used to write a Manifest file, optionally
-replacing or updating an existing file.</p>
-
-
-
-<p>Manifests are processed according to the 
-<a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html">Jar
-file specification.</a>. Specifically, a manifest element consists of
-a set of attributes and sections. These sections in turn may contain
-attributes. Note in particular that this may result in manifest lines
-greater than 72 bytes being wrapped and continued on the next
-line.</p>
-
-<p>
-  The Apache Ant team regularly gets complaints that this task in generating invalid
-  manifests. By and large, this is not the case: we believe that we are following
-  the specification to the letter. The usual problem is that some third party
-  manifest reader is not following the same specification as well as they think
-  they should; we cannot generate invalid manifest files just because one
-  single application is broken. J2ME runtimes appear to be particularly troublesome.
-</p>
-
-<p>
-  If you find that Ant generates manifests incompatible with your runtime, take
-  a manifest it has built, fix it up however you need and switch to using the &lt;zip&gt
-  task to create the JAR, feeding in the hand-crafted manifest.
-</p>
-
+<p>This task can be used to write a Manifest file, optionally replacing or updating an existing
+file.</p>
 
+<p>Manifests are processed according to
+the <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/jar/jar.html" target="_top">Jar
+file specification</a>. Specifically, a manifest element consists of a set of attributes and
+sections. These sections in turn may contain attributes. Note in particular that this may result in
+manifest lines greater than 72 bytes being wrapped and continued on the next line.</p>
+
+<p>The Apache Ant team regularly gets complaints that this task in generating invalid manifests. By
+and large, this is not the case: we believe that we are following the specification to the
+letter. The usual problem is that some third party manifest reader is not following the same
+specification as well as they think they should; we cannot generate invalid manifest files just
+because one single application is broken. Java ME runtimes appear to be particularly
+troublesome.</p>
+
+<p>If you find that Ant generates manifests incompatible with your runtime, take a manifest it has
+built, fix it up however you need and switch to using the <a href="zip.html">zip</a> task to create
+the JAR, feeding in the hand-crafted manifest.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">the manifest-file to create/update.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>file</td>
+    <td>the manifest-file to create/update.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">mode</td>
-    <td valign="top">One of "update" or "replace", default is "replace".</td>
-    <td valign="top" align="center">No</td>
+    <td>mode</td>
+    <td>One of <q>update</q> or <q>replace</q>.</td>
+    <td>No; default is <q>replace</q></td>
   </tr>
   <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">The encoding used to read the existing manifest
-      when updating.  The task will always use UTF-8 when writing the
-      manifest.</td>
-    <td valign="top" align="center">No, defaults to UTF-8 encoding.</td>
+    <td>encoding</td>
+    <td>The encoding used to read the existing manifest when updating.  The task will always use
+      UTF-8 when writing the manifest.</td>
+    <td>No; defaults to UTF-8 encoding</td>
   </tr>
   <tr>
-    <td valign="top">mergeClassPathAttributes</td>
-    <td valign="top">Whether to merge the Class-Path attributes found
-      in different manifests (if updating).  If false, only the
-      attribute of the most recent manifest will be preserved.
-      <em>Since Ant 1.8.0</em>.
-      <br/>unless you also set flattenAttributes to true this may
-      result in manifests containing multiple Class-Path attributes
-      which violates the manifest specification.</td>
-    <td align="center" valign="top">No, default is false</td>
+    <td>mergeClassPathAttributes</td>
+    <td>Whether to merge the <code>Class-Path</code> attributes found in different manifests (if
+      updating).  If <q>false</q>, only the attribute of the most recent manifest will be
+      preserved.  <em>Since Ant 1.8.0</em>.<br/>Unless you also set <var>flattenAttributes</var>
+      to <q>true</q> this may result in manifests containing multiple <code>Class-Path</code>
+      attributes which violates the manifest specification.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">flattenAttributes</td>
-    <td valign="top">Whether to merge attributes occurring more than
-      once in a section (this can only happen for the Class-Path
-      attribute) into a single attribute.
-      <em>Since Ant 1.8.0</em>.</td>
-    <td align="center" valign="top">No, default is false</td>
+    <td>flattenAttributes</td>
+    <td>Whether to merge attributes occurring more than once in a section (this can only happen for
+      the <code>Class-Path</code> attribute) into a single attribute.  <em>Since Ant
+      1.8.0</em>.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
 </table>
 
-<h3>Nested elements</h3>
-<h4><a name="attribute">attribute</a></h4>
-<p>One attribute for the manifest file.  Those attributes that are
-not nested into a section will be added to the "Main" section.</p>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+<h3>Parameters specified as nested elements</h3>
+<h4 id="attribute">attribute</h4>
+<p>One attribute for the manifest file.  Those attributes that are not nested into a section will be
+added to the main section.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">the name of the attribute, <br>
-        must match the regexp <tt>[A-Za-z0-9][A-Za-z0-9-_]*</tt>.
+    <td>name</td>
+    <td>the name of the attribute, must match the regexp <q>[A-Za-z0-9][A-Za-z0-9-_]*</q>.
     </td>
-    <td valign="top" align="center">Yes</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">the value of the attribute.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>value</td>
+    <td>the value of the attribute.</td>
+    <td>Yes</td>
   </tr>
 </table>
 
-
 <h4>section</h4>
-<p>A manifest section - you can nest <a
-href="#attribute">attribute</a> elements into sections.</p>
+<p>A manifest section&mdash;you can nest <a href="#attribute">attribute</a> elements into
+sections.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">the name of the section.</td>
-    <td valign="top" align="center">No, if omitted it will be assumed
-       to be the main section.</td>
+    <td>name</td>
+    <td>the name of the section.</td>
+    <td>No, defaults to the main section</td>
   </tr>
 </table>
 
 <h3>Examples</h3>
 
 <pre>
-  &lt;manifest file=&quot;MANIFEST.MF&quot;&gt;
-    &lt;attribute name=&quot;Built-By&quot; value=&quot;${user.name}&quot;/&gt;
-    &lt;section name=&quot;common&quot;&gt;
-      &lt;attribute name=&quot;Specification-Title&quot; value=&quot;Example&quot;/&gt;
-      &lt;attribute name=&quot;Specification-Version&quot; value=&quot;${version}&quot;/&gt;
-      &lt;attribute name=&quot;Specification-Vendor&quot; value=&quot;Example Organization&quot;/&gt;
-      &lt;attribute name=&quot;Implementation-Title&quot; value=&quot;common&quot;/&gt;
-      &lt;attribute name=&quot;Implementation-Version&quot; value=&quot;${version} ${TODAY}&quot;/&gt; 
-      &lt;attribute name=&quot;Implementation-Vendor&quot; value=&quot;Example Corp.&quot;/&gt;
-    &lt;/section&gt;
-    &lt;section name=&quot;common/class1.class&quot;&gt;
-      &lt;attribute name=&quot;Sealed&quot; value=&quot;false&quot;/&gt;
-    &lt;/section&gt;
-  &lt;/manifest&gt;
-</pre>
-
-<p>Creates or replaces the file MANIFEST.MF.  Note that the Built-By
-attribute will take the value of the Ant property ${user.name}.  The
-same is true for the ${version} and ${TODAY} properties.  This example
-produces a MANIFEST.MF that contains 
-<a href="http://docs.oracle.com/javase/7/docs/technotes/guides/versioning/spec/versioning2.html#wp90779">package
-version identification</a> for the package <code>common</code>.</p>
+&lt;manifest file=&quot;MANIFEST.MF&quot;&gt;
+  &lt;attribute name=&quot;Built-By&quot; value=&quot;${user.name}&quot;/&gt;
+  &lt;section name=&quot;common&quot;&gt;
+    &lt;attribute name=&quot;Specification-Title&quot; value=&quot;Example&quot;/&gt;
+    &lt;attribute name=&quot;Specification-Version&quot; value=&quot;${version}&quot;/&gt;
+    &lt;attribute name=&quot;Specification-Vendor&quot; value=&quot;Example Organization&quot;/&gt;
+    &lt;attribute name=&quot;Implementation-Title&quot; value=&quot;common&quot;/&gt;
+    &lt;attribute name=&quot;Implementation-Version&quot; value=&quot;${version} ${TODAY}&quot;/&gt;
+    &lt;attribute name=&quot;Implementation-Vendor&quot; value=&quot;Example Corp.&quot;/&gt;
+  &lt;/section&gt;
+  &lt;section name=&quot;common/class1.class&quot;&gt;
+    &lt;attribute name=&quot;Sealed&quot; value=&quot;false&quot;/&gt;
+  &lt;/section&gt;
+&lt;/manifest&gt;</pre>
+
+<p>Creates or replaces the file <samp>MANIFEST.MF</samp>.  Note that the <code>Built-By</code>
+attribute will take the value of the Ant property <code>${user.name}</code>.  The same is true for
+the <code>${version}</code> and <code>${TODAY}</code> properties.  This example produces
+a <samp>MANIFEST.MF</samp> that
+contains <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/versioning/spec/versioning2.html#wp90779"
+target="_top">package version identification</a> for the package <samp>common</samp>.</p>
 
 <p>The manifest produced by the above would look like this:</p>
 
-<pre><code>Manifest-Version: 1.0
+<pre>
+Manifest-Version: 1.0
 Built-By: bodewig
 Created-By: Apache Ant 1.9
 
@@ -187,11 +170,7 @@
 Implementation-Title: common
 
 Name: common/class1.class
-Sealed: false
-
-</code></pre>
-
+Sealed: false</pre>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/mimemail.html ant-1.10.3/manual/Tasks/mimemail.html
--- ant-1.9.10/manual/Tasks/mimemail.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/mimemail.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,92 +24,85 @@
 
 <body>
 
-<h2><a name="mimemail">MimeMail</a></h2>
+<h2 id="mimemail">MimeMail</h2>
 
-<h3><i>Deprecated</i></h3>
-<p><i>This task has been deprecated.  Use the <a href="../Tasks/mail.html">mail</a> task instead.</i></p>
+<h3><em><u>Deprecated</u></em></h3>
+<p><em>This task has been <u>deprecated</u>.  Use the <a href="../Tasks/mail.html">mail</a> task instead.</em></p>
 
 <h3>Description</h3>
-<p>Sends SMTP mail with MIME attachments.
-<a href="http://www.oracle.com/technetwork/java/index-138643.html">JavaMail</a>
-and <a href="http://www.oracle.com/technetwork/java/javase/jaf-135115.html">Java
+<p>Sends SMTP mail with MIME
+attachments.  <a href="https://www.oracle.com/technetwork/java/index-138643.html"
+target="_top">JavaMail</a>
+and <a href="https://www.oracle.com/technetwork/java/javase/jaf-135115.html" target="_top">Java
 Activation Framework</a> are required for this task.</p>
 <p>Multiple files can be attached using <a href="../Types/fileset.html">FileSets.</a></p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">message</td>
-    <td valign="top">The message body</td>
-    <td valign="top" align="center" rowspan="2">No, but only one of of 'message' or
-      'messageFile' may be specified.&nbsp; If not specified, a fileset must be
-      provided.</td>
+    <td>message</td>
+    <td>The message body</td>
+    <td rowspan="2">Exactly one of these, or a nested fileset</td>
   </tr>
   <tr>
-    <td valign="top">messageFile</td>
-    <td valign="top">A filename to read and used as the message body</td>
+    <td>messageFile</td>
+    <td class="left">A filename to read and used as the message body</td>
   </tr>
   <tr>
-    <td valign="top">messageMimeType</td>
-    <td valign="top">MIME type to use for 'message' or 'messageFile' when
-      attached.</td>
-    <td align="center" valign="top">No, defaults to "text/plain"</td>
+    <td>messageMimeType</td>
+    <td>MIME type to use for <var>message</var> or <var>messageFile</var> when attached.</td>
+    <td>No; defaults to <q>text/plain</q></td>
   </tr>
   <tr>
-    <td valign="top">tolist</td>
-    <td valign="top">Comma-separated list of To: recipients</td>
-    <td valign="top" align="center" rowspan="3">Yes, at least one of 'tolist', 'cclist',
-      or 'bcclist' must be specified.</td>
+    <td>tolist</td>
+    <td>Comma-separated list of <code>To:</code> recipients</td>
+    <td rowspan="3">Yes, at least one of these</td>
   </tr>
   <tr>
-    <td valign="top">cclist</td>
-    <td valign="top">Comma-separated list of CC: recipients</td>
-    <td valign="top" align="center">&nbsp;</td>
+    <td>cclist</td>
+    <td class="left">Comma-separated list of <code>CC:</code> recipients</td>
   </tr>
   <tr>
-    <td valign="top">bcclist</td>
-    <td valign="top">Comma-separated list of BCC: recipients</td>
-    <td valign="top" align="center">&nbsp;</td>
+    <td>bcclist</td>
+    <td class="left">Comma-separated list of <code>BCC:</code> recipients</td>
   </tr>
   <tr>
-    <td valign="top">mailhost</td>
-    <td valign="top">Host name of the mail server.</td>
-    <td valign="top" align="center">No, default to &quot;localhost&quot;</td>
+    <td>mailhost</td>
+    <td>Host name of the mail server.</td>
+    <td>No; default to <q>localhost</q></td>
   </tr>
   <tr>
-    <td valign="top">subject</td>
-    <td valign="top">Email subject line.</td>
-    <td valign="top" align="center">No</td>
+    <td>subject</td>
+    <td>Email subject line.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">from</td>
-    <td valign="top">Email address of sender.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>from</td>
+    <td>Email address of sender.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">Stop the build process if an error occurs sending the
-      e-mail.</td>
-    <td valign="top" align="center">No, default to &quot;true&quot;</td>
+    <td>failonerror</td>
+    <td>Stop the build process if an error occurs sending the e-mail.</td>
+    <td>No; default to <q>true</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
-<p><b>Send a single HTML file as the body of a message</b></p>
-<pre>    &lt;mimemail messageMimeType=&quot;text/html&quot; messageFile=&quot;overview-summary.html&quot;
-        tolist=&quot;you&quot; subject=&quot;JUnit Test Results: ${TODAY}&quot; from=&quot;me&quot;/&gt;</pre>
-<p><b>Sends all files in a directory as attachments</b></p>
-<pre>    &lt;mimemail message=&quot;See attached files&quot; tolist=&quot;you&quot; subject=&quot;Attachments&quot; from=&quot;me&quot;&gt;
-        &lt;fileset dir=&quot;.&quot;&gt;
-            &lt;include name=&quot;dist/*.*&quot;/&gt;
-        &lt;/fileset&gt;
-    &lt;/mimemail&gt;
-</pre>
-
+<p><strong>Send a single HTML file as the body of a message</strong></p>
+<pre>
+&lt;mimemail messageMimeType=&quot;text/html&quot; messageFile=&quot;overview-summary.html&quot;
+          tolist=&quot;you&quot; subject=&quot;JUnit Test Results: ${TODAY}&quot; from=&quot;me&quot;/&gt;</pre>
+<p><strong>Sends all files in a directory as attachments</strong></p>
+<pre>
+&lt;mimemail message=&quot;See attached files&quot; tolist=&quot;you&quot; subject=&quot;Attachments&quot; from=&quot;me&quot;&gt;
+    &lt;fileset dir=&quot;.&quot;&gt;
+       &lt;include name=&quot;dist/*.*&quot;/&gt;
+    &lt;/fileset&gt;
+&lt;/mimemail&gt;</pre>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/mkdir.html ant-1.10.3/manual/Tasks/mkdir.html
--- ant-1.9.10/manual/Tasks/mkdir.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/mkdir.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,21 +24,21 @@
 
 <body>
 
-<h2><a name="mkdir">Mkdir</a></h2>
+<h2 id="mkdir">Mkdir</h2>
 <h3>Description</h3>
-<p>Creates a directory. Also non-existent parent directories are created, when
-necessary. Does nothing if the directory already exist.</p>
+<p>Creates a directory. Also non-existent parent directories are created, when necessary. Does
+nothing if the directory already exist.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">dir</td>
-    <td valign="top">the directory to create.</td>
-    <td align="center" valign="top">Yes</td>
+    <td>dir</td>
+    <td>the directory to create.</td>
+    <td>Yes</td>
   </tr>
 </table>
 <h3>Examples</h3>
@@ -47,6 +47,5 @@
 <pre>&lt;mkdir dir=&quot;${dist}/lib&quot;/&gt;</pre>
 <p>creates a directory <code>${dist}/lib</code>.</p>
 
-
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/move.html ant-1.10.3/manual/Tasks/move.html
--- ant-1.9.10/manual/Tasks/move.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/move.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,235 +24,187 @@
 
 <body>
 
-<h2><a name="move">Move</a></h2>
+<h2 id="move">Move</h2>
 <h3>Description</h3>
-<p>Moves a file to a new file or directory, or collections of files to
-a new directory.  By default, the
-destination file is overwritten if it already exists.  When <var>overwrite</var> is
-turned off, then files are only moved if the source file is newer than
-the destination file, or when the destination file does not exist.</p>
-
-<p><a href="../Types/resources.html#collection">Resource
-Collection</a>s are used to select a group of files to move.  Only
-file system based resource collections are supported, this includes <a
-href="../Types/fileset.html">fileset</a>s, <a
-href="../Types/filelist.html">filelist</a> and <a
-href="../using.html#path">path</a>.  Prior to Apache Ant 1.7 only
-<code>&lt;fileset&gt;</code> has been supported as a nested element.
-To use a resource collection, the <code>todir</code> attribute must be
-set.</p>
-
-<p><b>Since Ant 1.6.3</b>, the <i>file</i> attribute may be used to move
-(rename) an entire directory.  If <i>tofile</i> denotes an existing file, or
-there is a directory by the same name in <i>todir</i>, the action will fail.
-</p>
+<p>Moves a file to a new file or directory, or collections of files to a new directory.  By default,
+the destination file is overwritten if it already exists.  When <var>overwrite</var> is turned off,
+then files are only moved if the source file is newer than the destination file, or when the
+destination file does not exist.</p>
+
+<p><a href="../Types/resources.html#collection">Resource collections</a> are used to select a group
+of files to move.  Only file system based resource collections are supported, this
+includes <a href="../Types/fileset.html">fileset</a>s, <a href="../Types/filelist.html">filelist</a>
+and <a href="../using.html#path">path</a>.  Prior to Apache Ant 1.7
+only <code>&lt;fileset&gt;</code> has been supported as a nested element.  To use a resource
+collection, the <var>todir</var> attribute must be set.</p>
+
+<p><em>Since Ant 1.6.3</em>, the <var>file</var> attribute may be used to move (rename) an entire
+directory.  If <var>tofile</var> denotes an existing file, or there is a directory by the same name
+in <var>todir</var>, the action will fail.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">the file or directory to move</td>
-    <td valign="top" align="center">One of <var>file</var> or
-     at least one nested resource collection element</td>
+    <td>file</td>
+    <td>the file or directory to move</td>
+    <td>One of <var>file</var> or at least one nested resource collection element</td>
   </tr>
   <tr>
-    <td valign="top">preservelastmodified</td>
-    <td valign="top">Give the moved files the same last modified
-      time as the original source files.
-      (<em>Note</em>: Ignored on Java 1.1)</td>
-    <td valign="top" align="center">No; defaults to false.</td>
+    <td>preservelastmodified</td>
+    <td>Give the moved files the same last modified time as the original source files.
+      (<strong>Note</strong>: Ignored on Java 1.1)</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">tofile</td>
-    <td valign="top">the file to move to</td>
-    <td valign="top" align="center" rowspan="2">With the <var>file</var> attribute,
-    either <var>tofile</var> or <var>todir</var> can be used.  With nested filesets,
-    if the fileset size is greater than 1 or if the only entry in the fileset is a
-    directory or if the <var>file</var> attribute is already specified, only
-    <var>todir</var> is allowed</td>
+    <td>tofile</td>
+    <td>the file to move to</td>
+    <td rowspan="2">With the <var>file</var> attribute, either <var>tofile</var> or <var>todir</var>
+      can be used.  With nested filesets, if the fileset size is greater than 1 or if the only entry
+      in the fileset is a directory or if the <var>file</var> attribute is already specified,
+      only <var>todir</var> is allowed</td>
   </tr>
   <tr>
-    <td valign="top">todir</td>
-    <td valign="top">the directory to move to</td>
+    <td>todir</td>
+    <td class="left">the directory to move to</td>
   </tr>
   <tr>
-    <td valign="top">overwrite</td>
-    <td valign="top">overwrite existing files even if the destination
-      files are newer (default is &quot;true&quot;)</td>
-    <td valign="top" align="center">No</td>
+    <td>overwrite</td>
+    <td>overwrite existing files even if the destination files are newer</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">force</td>
-    <td valign="top">Overwrite read-only destination
-      files.  <em>since Ant 1.8.2</em></td>
-    <td valign="top" align="center">No; defaults to false.</td>
+    <td>force</td>
+    <td>Overwrite read-only destination files.  <em>since Ant 1.8.2</em></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">filtering</td>
-    <td valign="top">indicates whether token filtering should take place during
-      the move.  See the <a href="filter.html">filter</a> task for a description of
-      how filters work.</td>
-    <td valign="top" align="center">No</td>
+    <td>filtering</td>
+    <td>indicates whether token filtering should take place during the move.  See
+      the <a href="filter.html">filter</a> task for a description of how filters work.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">flatten</td>
-    <td valign="top">ignore directory structure of source directory,
-      copy all files into a single directory, specified by the <var>todir</var>
-      attribute (default is &quot;false&quot;).Note that you can achieve the
-      same effect by using a <a href="../Types/mapper.html#flatten-mapper">flatten mapper</a></td>
-    <td valign="top" align="center">No</td>
+    <td>flatten</td>
+    <td>ignore directory structure of source directory, copy all files into a single directory,
+      specified by the <var>todir</var> attribute. Note that you can achieve the same effect by
+      using a <a href="../Types/mapper.html#flatten-mapper">flatten mapper</a></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">includeEmptyDirs</td>
-	 <td valign="top">Copy empty directories included with the nested FileSet(s).
-	   Defaults to &quot;yes&quot;.</td>
-	 <td valign="top" align="center">No</td>
+    <td>includeEmptyDirs</td>
+    <td>Copy empty directories included with the nested FileSet(s).</td>
+    <td>No; defaults to <q>yes</q></td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-     <td valign="top">If false, log a warning message, but do not stop the
-       build, when the file to copy does not exist or one of the nested
-       filesets points to a directory that doesn't exist or an error occurs
-       while moving.
-     </td>
-     <td valign="top" align="center">No; defaults to true.</td>
+    <td>failonerror</td>
+    <td>If false, log a warning message, but do not stop the build, when the file to copy does not
+      exist or one of the nested filesets points to a directory that doesn't exist or an error
+      occurs while moving.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">quiet</td>
-      <td valign="top">If true and failonerror is false, then do not log a
-       warning message when the file to copy does not exist or one of the nested
-       filesets points to a directory that doesn't exist or an error occurs
-       while copying. <em>since Ant 1.8.3</em>.
-     </td>
-     <td valign="top" align="center">No; defaults to false.</td>
+    <td>quiet</td>
+    <td>If <q>true</q> and <var>failonerror</var> is <q>false</q>, then do not log a warning message
+      when the file to copy does not exist or one of the nested filesets points to a directory that
+      doesn't exist or an error occurs while copying. <em>since Ant 1.8.3</em>.</td>
+     <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">verbose</td>
-     <td valign="top">Log the files that are being moved.</td>
-     <td valign="top" align="center">No; defaults to false.</td>
+    <td>verbose</td>
+    <td>Log the files that are being moved.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">The encoding to assume when filter-copying the
-    files. <em>since Ant 1.5</em>.</td>
-    <td align="center">No - defaults to default JVM encoding</td>
+    <td>encoding</td>
+    <td>The encoding to assume when filter-copying the files. <em>since Ant 1.5</em>.</td>
+    <td>No; defaults to default JVM character encoding</td>
   </tr>
   <tr>
-    <td valign="top">outputencoding</td>
-    <td valign="top">The encoding to use when writing the files.
-    <em>since Ant 1.6</em>.</td>
-    <td align="center">No - defaults to the value of the encoding
-    attribute if given or the default JVM encoding otherwise.</td>
+    <td>outputencoding</td>
+    <td>The encoding to use when writing the files.  <em>since Ant 1.6</em>.</td>
+    <td>No; defaults to <var>encoding</var> if set or default JVM character encoding otherwise</td>
   </tr>
   <tr>
-    <td valign="top">enablemultiplemappings</td>
-    <td valign="top">
-      If true the task will process to all the mappings for a
-      given source path. If false the task will only process
-      the first file or directory. This attribute is only relevant
-      if there is a mapper subelement.
-      <em>since Ant 1.6</em>.</td>
-    <td align="center">No - defaults to false.</td>
+    <td>enablemultiplemappings</td>
+    <td>If <q>true</q> the task will process to all the mappings for a given source
+      path. If <q>false</q> the task will only process the first file or directory. This attribute
+      is only relevant if there is a <code>mapper</code> subelement.  <em>since Ant 1.6</em>.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">granularity</td>
-    <td valign="top">The number of milliseconds leeway to give before
-    deciding a file is out of date. This is needed because not every
-    file system supports tracking the last modified time to the
-    millisecond level. Default is 0 milliseconds, or 2 seconds on DOS
-    systems.  This can also be useful if source and target files live
-    on separate machines with clocks being out of sync.  <em>since Ant
-    1.6</em>.</td>
+    <td>granularity</td>
+    <td>The number of milliseconds leeway to give before deciding a file is out of date. This is
+      needed because not every file system supports tracking the last modified time to the
+      millisecond level.  This can also be useful if source and target files live on separate
+      machines with clocks being out of sync.  <em>since Ant 1.6</em>.</td>
+    <td>No; default is 0 milliseconds, or 2 seconds on DOS systems</td>
   </tr>
   <tr>
-    <td valign="top">performGCOnFailedDelete</td>
-    <td valign="top">
-      If Ant fails to delete a file or directory it will retry the
-      operation once.  If this flag is set to true it will perform a
-      garbage collection before retrying the delete.<br/>
-      Setting this flag to true is known to resolve some problems on
-      Windows (where it defaults to true) but also for directory trees
-      residing on an NFS share.
-      <em>Since Ant 1.8.3</em></td>
-    <td align="center" valign="top">No, default &quot;true&quot; on
-      Windows and &quot;true&quot; on any other OS.</td>
+    <td>performGCOnFailedDelete</td>
+    <td>If Ant fails to delete a file or directory it will retry the operation once.  If this flag
+      is set to <q>true</q> it will perform a garbage collection before retrying the delete.<br/>
+      Setting this flag to <q>true</q> is known to resolve some problems on Windows (where it
+      defaults to <q>true</q>) but also for directory trees residing on an NFS share.  <em>Since Ant
+      1.8.3</em></td>
+    <td>No; defaults to <q>true</q> on Windows and <q>false</q> on any other OS</td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 <h4>mapper</h4>
-<p>You can define file name transformations by using a nested <a
-href="../Types/mapper.html">mapper</a> element. The default mapper used by
-<code>&lt;move&gt;</code> is the <a
-href="../Types/mapper.html#identity-mapper">identity</a>.</p>
-<p>Note that the source name handed to the mapper depends on the
-resource collection you use.  If you use <code>&lt;fileset&gt;</code>
-or any other collection that provides a base directory, the name
-passed to the mapper will be a relative filename, relative to the base
-directory.  In any other case the absolute filename of the source will
-be used.</p>
+<p>You can define file name transformations by using a
+nested <a href="../Types/mapper.html">mapper</a> element. The default mapper used
+by <code>&lt;move&gt;</code> is the <a href="../Types/mapper.html#identity-mapper">identity</a>.</p>
+<p>Note that the source name handed to the mapper depends on the resource collection you use.  If
+you use <code>&lt;fileset&gt;</code> or any other collection that provides a base directory, the
+name passed to the mapper will be a relative filename, relative to the base directory.  In any other
+case the absolute filename of the source will be used.</p>
 <h4>filterchain</h4>
-<p>The Move task supports nested <a href="../Types/filterchain.html">
-FilterChain</a>s.</p>
-
-<p>
-If <code>&lt;filterset&gt;</code> and <code>&lt;filterchain&gt;</code> elements are used inside the
-same <code>&lt;move&gt;</code> task, all <code>&lt;filterchain&gt;</code> elements are processed first
-followed by <code>&lt;filterset&gt;</code> elements.
-</p>
+<p>The Move task supports nested <a href="../Types/filterchain.html">FilterChain</a>s.</p>
+<p>If <code>&lt;filterset&gt;</code> and <code>&lt;filterchain&gt;</code> elements are used inside
+the same <code>&lt;move&gt;</code> task, all <code>&lt;filterchain&gt;</code> elements are processed
+first followed by <code>&lt;filterset&gt;</code> elements.</p>
 
 <h3>Examples</h3>
-<p><b>Move a single file (rename a file)</b></p>
-<pre>
-  &lt;move file=&quot;file.orig&quot; tofile=&quot;file.moved&quot;/&gt;
-</pre>
-<p><b>Move a single file to a directory</b></p>
-<pre>
-  &lt;move file=&quot;file.orig&quot; todir=&quot;dir/to/move/to&quot;/&gt;
-</pre>
-<p><b>Move a directory to a new directory</b></p>
-<pre>
-  &lt;move todir=&quot;new/dir/to/move/to&quot;&gt;
-    &lt;fileset dir=&quot;src/dir&quot;/&gt;
-  &lt;/move&gt;
-</pre>
-  <i>or, since Ant 1.6.3:</i>
-<pre>
-  &lt;move file=&quot;src/dir&quot; tofile=&quot;new/dir/to/move/to&quot;/&gt;
-</pre>
-<p><b>Move a set of files to a new directory</b></p>
-<pre>
-  &lt;move todir=&quot;some/new/dir&quot;&gt;
-    &lt;fileset dir=&quot;my/src/dir&quot;&gt;
-      &lt;include name=&quot;**/*.jar&quot;/&gt;
-      &lt;exclude name=&quot;**/ant.jar&quot;/&gt;
-    &lt;/fileset&gt;
-  &lt;/move&gt;
-</pre>
-<p><b>Move a list of files to a new directory</b></p>
-<pre>
-  &lt;move todir=&quot;some/new/dir&quot;&gt;
-    &lt;filelist dir=&quot;my/src/dir&quot;&gt;
-      &lt;file name="file1.txt"/&gt;
-      &lt;file name="file2.txt"/&gt;
-    &lt;/filelist&gt;
-  &lt;/move&gt;
-</pre>
-<p><b>Append <code>&quot;.bak&quot;</code> to the names of all files
-in a directory.</b></p>
-<pre>
-  &lt;move todir=&quot;my/src/dir&quot; includeemptydirs=&quot;false&quot;&gt;
-    &lt;fileset dir=&quot;my/src/dir&quot;&gt;
-      &lt;exclude name=&quot;**/*.bak&quot;/&gt;
-    &lt;/fileset&gt;
-    &lt;mapper type=&quot;glob&quot; from=&quot;*&quot; to=&quot;*.bak&quot;/&gt;
-  &lt;/move&gt;
-</pre>
-
+<p><strong>Move a single file (rename a file)</strong></p>
+<pre>&lt;move file=&quot;file.orig&quot; tofile=&quot;file.moved&quot;/&gt;</pre>
+<p><strong>Move a single file to a directory</strong></p>
+<pre>&lt;move file=&quot;file.orig&quot; todir=&quot;dir/to/move/to&quot;/&gt;</pre>
+<p><strong>Move a directory to a new directory</strong></p>
+<pre>
+&lt;move todir=&quot;new/dir/to/move/to&quot;&gt;
+  &lt;fileset dir=&quot;src/dir&quot;/&gt;
+&lt;/move&gt;</pre>
+<p>or, <em>since Ant 1.6.3</em>:</p>
+<pre>&lt;move file=&quot;src/dir&quot; tofile=&quot;new/dir/to/move/to&quot;/&gt;</pre>
+<p><strong>Move a set of files to a new directory</strong></p>
+<pre>
+&lt;move todir=&quot;some/new/dir&quot;&gt;
+  &lt;fileset dir=&quot;my/src/dir&quot;&gt;
+    &lt;include name=&quot;**/*.jar&quot;/&gt;
+    &lt;exclude name=&quot;**/ant.jar&quot;/&gt;
+  &lt;/fileset&gt;
+&lt;/move&gt;</pre>
+<p><strong>Move a list of files to a new directory</strong></p>
+<pre>
+&lt;move todir=&quot;some/new/dir&quot;&gt;
+  &lt;filelist dir=&quot;my/src/dir&quot;&gt;
+    &lt;file name="file1.txt"/&gt;
+    &lt;file name="file2.txt"/&gt;
+  &lt;/filelist&gt;
+&lt;/move&gt;</pre>
+<p><strong>Append <code>&quot;.bak&quot;</code> to the names of all files in a
+directory.</strong></p>
+<pre>
+&lt;move todir=&quot;my/src/dir&quot; includeemptydirs=&quot;false&quot;&gt;
+  &lt;fileset dir=&quot;my/src/dir&quot;&gt;
+    &lt;exclude name=&quot;**/*.bak&quot;/&gt;
+  &lt;/fileset&gt;
+  &lt;mapper type=&quot;glob&quot; from=&quot;*&quot; to=&quot;*.bak&quot;/&gt;
+&lt;/move&gt;</pre>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/native2ascii.html ant-1.10.3/manual/Tasks/native2ascii.html
--- ant-1.9.10/manual/Tasks/native2ascii.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/native2ascii.html	2018-03-24 12:37:12.000000000 +0000
@@ -15,135 +15,111 @@
    limitations under the License.
 -->
 <html>
-  <head><link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
-<title>Native2Ascii Task</title></head>
+  <head>
+    <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
+    <title>Native2Ascii Task</title>
+  </head>
   <body>
     <h2>Native2Ascii</h2>
 
-    <h3>Description:</h3>
+    <h3>Description</h3>
 
-    <p>
-      Converts files from native encodings to ASCII with escaped Unicode.
-      A common usage is to convert source files maintained in a native
-      operating system encoding, to ASCII prior to compilation.
-    </p>
-
-    <p>
-      Files in the directory <em>src</em>
-      are converted from a native encoding to ASCII.
-      By default, all files in the directory are converted.
-      However, conversion may be limited to selected files using
-      <em>includes</em> and <em>excludes</em> attributes.
-      For more information on file matching patterns,
-      see the section on
-      <a href="../dirtasks.html#directorybasedtasks">directory based tasks</a>.
-      If no <em>encoding</em> is specified,
-      the default encoding for the JVM is used.
-      If <em>ext</em> is specified, then output files are renamed
-      to use it as a new extension.
-      More sophisticated file name translations can be achieved using a nested
-      <em><code>&lt;mapper&gt;</code></em> element. By default an
-      <a href="../Types/mapper.html#identity-mapper">identity mapper</a> will be used.
-      If <em>dest</em> and <em>src</em> point to the same directory,
-      the <em>ext</em> attribute or a nested <em><code>&lt;mapper&gt;</code></em>
-      is required.
-    </p>
-
-    <p>
-      This task forms an implicit <a href="../Types/fileset.html">File Set</a>,
-      and supports most attributes of <code>&lt;fileset&gt;</code>
-      (<code>dir</code> becomes <code>src</code>) as well as
+    <p>Converts files from native encodings to ASCII with escaped Unicode.  A common usage is to
+      convert source files maintained in a native operating system encoding, to ASCII prior to
+      compilation.</p>
+
+    <p>Files in the directory <var>src</var> are converted from a native encoding to ASCII.  By
+      default, all files in the directory are converted.  However, conversion may be limited to
+      selected files using <var>includes</var> and <var>excludes</var> attributes.  For more
+      information on file matching patterns, see the section
+      on <a href="../dirtasks.html#directorybasedtasks">directory based tasks</a>.  If
+      no <var>encoding</var> is specified, the default encoding for the JVM is used.
+      If <var>ext</var> is specified, then output files are renamed to use it as a new extension.
+      More sophisticated file name translations can be achieved using a
+      nested <code>&lt;mapper&gt;</code> element. By default
+      an <a href="../Types/mapper.html#identity-mapper">identity mapper</a> will be used.
+      If <var>dest</var> and <var>src</var> point to the same directory, the <var>ext</var>
+      attribute or a nested <code>&lt;mapper&gt;</code> is required.</p>
+
+    <p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a>, and supports most
+      attributes of <code>&lt;fileset&gt;</code> (<var>dir</var> becomes <var>src</var>) as well as
       nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code>,
-      and <code>&lt;patternset&gt;</code> elements.
-    </p>
+      and <code>&lt;patternset&gt;</code> elements.</p>
 
-    <p>It is possible to use different converters. This can be selected
-      with the <code>implementation</code> attribute or a nested element.
-      <a name="implementationvalues">Here are the choices of the attribute</a>:</p>
+    <p id="implementationvalues">It is possible to use different converters. This can be selected
+      with the <var>implementation</var> attribute or a nested element. Here are the choices of the
+      attribute:</p>
     <ul>
-      <li>default - the default converter for the platform - kaffee
-        when run on Kaffee, builtin if JDK9 or newer is detected, sun
-        otherwise.</li>
-      <li>sun (the standard converter of the JDK < 9)</li>
-      <li>kaffe (the standard converter
-        of <a href="http://www.kaffe.org" target="_top">Kaffe</a>)</li>
-      <li>builtin - Ant's internal implementation used for
-        JDK9+. <em>since ant 1.9.8</em></li>
+      <li><q>default</q>&mdash;the default converter for the platform: kaffe when run on Kaffe,
+        builtin otherwise.</li>
+      <li><q>sun</q>&mdash;used to be the standard converter of the JDK 8 or earlier</li>
+      <li><q>kaffe</q>&mdash;the standard converter of <a href="http://www.kaffe.org"
+        target="_top">Kaffe</a></li>
+      <li><q>builtin</q>&mdash;Ant's internal implementation. <em>Since Ant 1.9.8</em></li>
     </ul>
 
-    <table border="1" cellpadding="2" cellspacing="0">
+    <table class="attr">
       <tr>
-        <td><b>Attribute</b></td>
-        <td><b>Description</b></td>
-        <td><b>Required</b></td>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
       <tr>
         <td>reverse</td>
-        <td>Reverse the sense of the conversion,
-          i.e. convert from ASCII to native <b>only supported by the
-            sun and builtin converters</b></td>
-        <td align="center">No</td>
+        <td>Reverse the sense of the conversion, i.e. convert from ASCII to native<br/><strong>Only
+          supported by the <q>sun</q> and <q>builtin</q> converters</strong></td>
+        <td>No</td>
       </tr>
       <tr>
         <td>encoding</td>
-        <td>The native encoding the files are in
-          (default is the default encoding for the JVM)</td>
-        <td align="center">No</td>
+        <td>The native encoding the files are in</td>
+        <td>No; defaults to default JVM character encoding</td>
       </tr>
       <tr>
         <td>src</td>
-        <td>The directory to find files in (default is <em>basedir</em>)</td>
-        <td align="center">No</td>
+        <td>The directory to find files in; default is <var>basedir</var></td>
+        <td>No</td>
       </tr>
       <tr>
         <td>dest</td>
         <td>The directory to output file to</td>
-        <td align="center">Yes</td>
+        <td>Yes</td>
       </tr>
       <tr>
         <td>ext</td>
         <td>File extension to use in renaming output files</td>
-        <td align="center">No</td>
-      </tr>
-      <tr>
-        <td>defaultexcludes</td>
-        <td>indicates whether default excludes should be used or not
-          (&quot;yes&quot;/&quot;no&quot;).
-          Default excludes are used when omitted.
-        </td>
-        <td align="center">No</td>
+        <td>No</td>
       </tr>
       <tr>
         <td>includes</td>
-        <td>comma- or space-separated list of patterns of files that must be
-          included. All files are included when omitted.</td>
-        <td align="center">No</td>
+        <td>Comma- or space-separated list of patterns of files that must be included.</td>
+        <td>No; defaults to all (<q>**</q>)</td>
       </tr>
       <tr>
         <td>includesfile</td>
-        <td>the name of a file. Each line of this file is
-          taken to be an include pattern</td>
-        <td align="center">No</td>
+        <td>Name of a file. Each line of this file is taken to be an include pattern</td>
+        <td>No</td>
       </tr>
       <tr>
         <td>excludes</td>
-        <td>comma- or space-separated list of patterns of files that must be excluded.
-          No files (except default excludes) are excluded when omitted.</td>
-        <td align="center">No</td>
+        <td>Comma- or space-separated list of patterns of files that must be excluded.</td>
+        <td>No; defaults to default excludes or none if <var>defaultexcludes</var> is <q>no</q></td>
       </tr>
       <tr>
         <td>excludesfile</td>
-        <td>the name of a file. Each line of this file is
-          taken to be an exclude pattern</td>
-        <td align="center">No</td>
+        <td>Name of a file. Each line of this file is taken to be an exclude pattern</td>
+        <td>No</td>
       </tr>
       <tr>
-        <td valign="top">implementation</td>
-        <td valign="top">The converter implementation to use.
-          If this attribute is not set, the default converter for the
-          current VM will be used.  (See the above <a
-          href="#implementationvalues">list</a> of valid converters.)</td>
-        <td align="center" valign="top">No</td>
+        <td>defaultexcludes</td>
+        <td>Indicates whether default excludes should be used or not (<q>yes|no</q>).</td>
+        <td>No; defaults to <q>yes</q></td>
+      </tr>
+      <tr>
+        <td>implementation</td>
+        <td>The converter implementation to use.  (See the
+          above <a href="#implementationvalues">list</a> of valid converters.)</td>
+        <td>No; defaults to default converter for the current JVM</td>
       </tr>
     </table>
 
@@ -151,101 +127,85 @@
 
 <h4>arg</h4>
 
-<p>You can specify additional command line arguments for the converter
-with nested <code>&lt;arg&gt;</code> elements.  These elements are
-specified like <a href="../using.html#arg">Command-line Arguments</a>
-but have an additional attribute that can be used to enable arguments
-only if a given converter implementation will be used.</p>
+<p>You can specify additional command line arguments for the converter with
+nested <code>&lt;arg&gt;</code> elements.  These elements are specified
+like <a href="../using.html#arg">Command-line Arguments</a> but have an additional attribute that
+can be used to enable arguments only if a given converter implementation will be used.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <th>Attribute</th>
+  <th>Description</th>
+  <th>Required</th>
 </tr>
   <tr>
-    <td valign="top">value</td>
-    <td align="center" rowspan="4">See
-    <a href="../using.html#arg">Command-line Arguments</a>.</td>
-    <td align="center" rowspan="4">Exactly one of these.</td>
+    <td>value</td>
+    <td rowspan="4">See <a href="../using.html#arg">Command-line Arguments</a>.</td>
+    <td rowspan="4">Exactly one of these</td>
   </tr>
   <tr>
-    <td valign="top">line</td>
+    <td class="var">line</td>
   </tr>
   <tr>
-    <td valign="top">file</td>
+    <td class="var">file</td>
   </tr>
   <tr>
-    <td valign="top">path</td>
+    <td class="var">path</td>
   </tr>
   <tr>
-    <td valign="top">implementation</td>
-    <td>Only pass the specified argument if the chosen converter
-    implementation matches the value of this attribute.  Legal values
-    are the same as those in the above <a
-    href="#implementationvalues">list</a> of valid compilers.)</td>
-    <td align="center">No</td>
+    <td>implementation</td>
+    <td>Only pass the specified argument if the chosen converter implementation matches the value of
+    this attribute.  Legal values are the same as those in the
+    above <a href="#implementationvalues">list</a> of valid compilers.)</td>
+    <td>No</td>
   </tr>
 </table>
 
-<h4>implementationclasspath <em>since Apache Ant 1.8.0</em></h4>
-
-<p>A <a href="../using.html#path">PATH like structure</a> holding the
-  classpath to use when loading the converter implementation if a
-  custom class has been specified.  Doesn't have any effect when
-  using one of the built-in converters.</p>
-
-<h4>Any nested element of a type that implements Native2AsciiAdapter
-  <em>since Ant 1.8.0</em></h4>
+<h4>implementationclasspath</h4>
+<p><em>Since Apache Ant 1.8.0</em></p>
+<p>A <a href="../using.html#path">path-like structure</a> holding the classpath to use when loading
+the converter implementation if a custom class has been specified.  Doesn't have any effect when
+using one of the built-in converters.</p>
+
+<h4>Any nested element of a type that implements Native2AsciiAdapter</h4>
+<p><em>Since Ant 1.8.0</em></p>
+<p>If a defined type implements the <code class="code">Native2AsciiAdapter</code> interface a nested
+element of that type can be used as an alternative to the <var>implementation</var> attribute.</p>
 
-<p>If a defined type implements the <code>Native2AsciiAdapter</code>
-  interface a nested element of that type can be used as an
-  alternative to the <code>implementation</code> attribute.</p>
+<h3>Examples</h3>
 
-    <h3>Examples</h3>
-
-    <pre>
+<pre>
 &lt;native2ascii encoding=&quot;EUCJIS&quot; src=&quot;srcdir&quot; dest=&quot;srcdir&quot;
-   includes=&quot;**/*.eucjis&quot; ext=&quot;.java&quot;/&gt;
-    </pre>
+              includes=&quot;**/*.eucjis&quot; ext=&quot;.java&quot;/&gt;</pre>
 
-    <p>
-      Converts all files in the directory <em>srcdir</em>
-      ending in <code>.eucjis</code> from the EUCJIS encoding to ASCII
-      and renames them to end in <code>.java</code>.
-    </p>
+<p>Converts all files in the directory <samp>srcdir</samp> ending in <samp>.eucjis</samp> from the
+EUCJIS encoding to ASCII and renames them to end in <samp>.java</samp>.</p>
 
 <pre>
 &lt;native2ascii encoding=&quot;EUCJIS&quot; src=&quot;native/japanese&quot; dest=&quot;src&quot;
-   includes=&quot;**/*.java&quot;/&gt;
-</pre>
+              includes=&quot;**/*.java&quot;/&gt;</pre>
 
-    <p>
-      Converts all the files ending in <code>.java</code>
-      in the directory <em>native/japanese</em> to ASCII,
-      placing the results in the directory <em>src</em>.
-      The names of the files remain the same.
-    </p>
-
-<p>If you want to use a custom
-  Native2AsciiAdapter <code>org.example.MyAdapter</code> you can either
-  use the implementation attribute:</p>
+<p>Converts all the files ending in <samp>.java</samp> in the directory <samp>native/japanese</samp>
+to ASCII, placing the results in the directory <samp>src</samp>.  The names of the files remain the
+same.</p>
+
+<p>If you want to use a
+custom <code class="code">Native2AsciiAdapter</code> <code>org.example.MyAdapter</code> you can
+either use the implementation attribute:</p>
 <pre>
 &lt;native2ascii encoding="EUCJIS" src="srcdir" dest="srcdir"
-       includes="**/*.eucjis" ext=".java"
-       implementation="org.example.MyAdapter"/&gt;
-</pre>
+              includes="**/*.eucjis" ext=".java"
+              implementation="org.example.MyAdapter"/&gt;</pre>
 <p>or a define a type and nest this into the task like in:</p>
 <pre>
 &lt;componentdef classname="org.example.MyAdapter"
               name="myadapter"/&gt;
 &lt;native2ascii encoding="EUCJIS" src="srcdir" dest="srcdir"
-       includes="**/*.eucjis" ext=".java"&gt;
-  &lt;myadapter/&gt;
-&lt;/native2ascii&gt;
-</pre>
-<p>in which case your native2ascii adapter can support attributes and
-  nested elements of its own.</p>
-  </body>
+              includes="**/*.eucjis" ext=".java"&gt;
+    &lt;myadapter/&gt;
+&lt;/native2ascii&gt;</pre>
+<p>in which case your <code>native2ascii</code> adapter can support attributes and nested elements
+of its own.</p>
 
+</body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/netrexxc.html ant-1.10.3/manual/Tasks/netrexxc.html
--- ant-1.9.10/manual/Tasks/netrexxc.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/netrexxc.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,318 +24,279 @@
 
 <body>
 
-<h2><a name="netrexxc">NetRexxC</a></h2>
+<h2 id="netrexxc">NetRexxC</h2>
 <h3>Description</h3>
-<p>Compiles a <a href="http://www2.hursley.ibm.com/netrexx" target="_top">NetRexx</a>
-source tree within the running (Apache Ant) VM.</p>
-<p>The source and destination directory will be recursively scanned for
-NetRexx source files to compile.  Only NetRexx files that have no corresponding
-class file or where the class file is older than the java file will be compiled.</p>
-<p>Files in the source tree are copied to the destination directory,
-allowing support files to be located properly in the classpath. The source
-files are copied because the NetRexx compiler cannot produce class files in a
-specific directory via parameters</p>
-<p>The directory structure of the source tree should follow the package
-hierarchy.</p>
-<p>It is possible to refine the set of files that are being compiled/copied.
-This can be done with the <i>includes</i>, <i>includesfile</i>, <i>excludes</i>, <i>excludesfile</i> and
-<i>defaultexcludes</i> attributes. With the <i>includes</i> or <i>includesfile</i> attribute you
-specify the files you want to have included by using patterns. The
-<i>exclude</i> or <i>excludesfile</i> attribute is used to specify the files you want to have
-excluded.  This is also done with patterns.  And finally with the
-<i>defaultexcludes</i> attribute, you can specify whether you
-want to use default exclusions or not. See the section on <a
-href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
+<p>Compiles a <a href="https://www.ibm.com/software/awdtools/netrexx/library.html"
+target="_top">NetRexx</a> source tree within the running (Apache Ant) JVM.</p>
+<p>The source and destination directory will be recursively scanned for NetRexx source files to
+compile.  Only NetRexx files that have no corresponding class file or where the class file is older
+than the java file will be compiled.</p>
+<p>Files in the source tree are copied to the destination directory, allowing support files to be
+located properly in the classpath. The source files are copied because the NetRexx compiler cannot
+produce class files in a specific directory via parameters</p>
+<p>The directory structure of the source tree should follow the package hierarchy.</p>
+<p>It is possible to refine the set of files that are being compiled/copied.  This can be done with
+the <var>includes</var>, <var>includesfile</var>, <var>excludes</var>, <var>excludesfile</var>
+and <var>defaultexcludes</var> attributes. With the <var>includes</var> or <var>includesfile</var>
+attribute you specify the files you want to have included by using patterns. The <var>exclude</var>
+or <var>excludesfile</var> attribute is used to specify the files you want to have excluded.  This
+is also done with patterns.  And finally with the <var>defaultexcludes</var> attribute, you can
+specify whether you want to use default exclusions or not. See the section
+on <a href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
 inclusion/exclusion of files works, and how to write patterns.</p>
-<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and
-supports most attributes of <code>&lt;fileset&gt;</code>
-(<code>dir</code> becomes <code>srcdir</code>) as well as the nested
-<code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and
-<code>&lt;patternset&gt;</code> elements.</p>
-<p>All properties except classpath, srcdir and destDir are also available as properties in the form
-<code>ant.netrexxc.<i>attributename</i></code>, eg.<br>
-<code>&lt;property name="ant.netrexxc.verbose" value="noverbose"/&gt;</code><br>
-or from the command line as<br>
-<code>ant -Dant.netrexxc.verbose=noverbose ...</code>
-</p>
-<p><strong>Note:</strong> This task depends on external libraries not
-included in the Apache Ant distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a>
-for more information.</p>
+<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and supports most
+attributes of <code>&lt;fileset&gt;</code> (<var>dir</var> becomes <var>srcdir</var>) as well as the
+nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code>
+and <code>&lt;patternset&gt;</code> elements.</p>
+<p>All attributes except <var>classpath</var>, <var>srcdir</var> and <var>destDir</var> are also
+available as properties in the form <code>ant.netrexxc.<i>attributename</i></code>,
+eg.<br/><code class="code">&lt;property name="ant.netrexxc.verbose"
+value="noverbose"/&gt;</code><br/> or from the command line as<br/><kbd>ant
+-Dant.netrexxc.verbose=noverbose ...</kbd></p>
+<p><strong>Note</strong>: This task depends on external libraries not included in the Apache Ant
+distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a> for more
+information.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">binary</td>
-    <td valign="top">Whether literals are treated as the java binary
-      type rather than the NetRexx types</td>
-    <td valign="top" align="center">No</td>
+    <td>binary</td>
+    <td>Whether literals are treated as the Java binary type rather than the NetRexx types</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">The classpath to use during compilation</td>
-    <td valign="top" align="center">No</td>
+    <td>classpath</td>
+    <td>The classpath to use during compilation</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">comments</td>
-    <td valign="top">Whether comments are passed through to the
-      generated java source</td>
-    <td valign="top" align="center">No</td>
+    <td>comments</td>
+    <td>Whether comments are passed through to the generated Java source file</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">compact</td>
-    <td valign="top">Whether error messages come out in compact or
-      verbose format. Default is the compact format.</td>
-    <td valign="top" align="center">No</td>
+    <td>compact</td>
+    <td>Whether error messages come out in compact or verbose format.</td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">compile</td>
-    <td valign="top">Whether the NetRexx compiler should compile the
-      generated java code</td>
-    <td valign="top" align="center">No</td>
+    <td>compile</td>
+    <td>Whether the NetRexx compiler should compile the generated Java code</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">console</td>
-    <td valign="top">Whether or not messages should be displayed on the
-      'console'. Note that this task will rely on the default value for filtering compile messages.</td>
-    <td valign="top" align="center">No</td>
+    <td>console</td>
+    <td>Whether or not messages should be displayed on the 'console'. Note that this task will rely
+      on the default value for filtering compile messages.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">crossref</td>
-    <td valign="top">Whether variable cross references are generated</td>
-    <td valign="top" align="center">No</td>
+    <td>crossref</td>
+    <td>Whether variable cross references are generated</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">decimal</td>
-    <td valign="top">Whether decimal arithmetic should be used for the
-      NetRexx code. Setting this to off will report decimal arithmetic
-      as an error, for performance critical applications.</td>
-    <td valign="top" align="center">No</td>
+    <td>decimal</td>
+    <td>Whether decimal arithmetic should be used for the NetRexx code. Setting this to <q>off</q>
+      will report decimal arithmetic as an error, for performance critical applications.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">defaultexcludes</td>
-    <td valign="top">indicates whether default excludes should be used or not
-      (&quot;yes&quot;/&quot;no&quot;). Default excludes are used when
-      omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>defaultexcludes</td>
+    <td>Whether default excludes should be used or not (<q>yes|no</q>).</td>
+    <td>No; defaults to <q>yes</q></td>
   </tr>
   <tr>
-    <td valign="top">destDir</td>
-    <td valign="top">the destination directory into which the NetRexx
-      source files should be copied and then compiled</td>
-    <td valign="top" align="center">Yes</td>
+    <td>destDir</td>
+    <td>the destination directory into which the NetRexx source files should be copied and then
+      compiled</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">diag</td>
-    <td valign="top">Whether diagnostic information about the compile is
-      generated</td>
-    <td valign="top" align="center">No</td>
+    <td>diag</td>
+    <td>Whether diagnostic information about the compile is generated</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">excludes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      excluded. No files (except default excludes) are excluded when
-      omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>excludes</td>
+    <td>Comma- or space-separated list of patterns of files that must be excluded.</td>
+    <td>No; defaults to default excludes or none if <var>defaultexcludes</var> is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an exclude pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>excludesfile</td>
+    <td>Name of a file. Each line of this file is taken to be an exclude pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">explicit</td>
-    <td valign="top">Whether variables must be declared explicitly
-      before use</td>
-    <td valign="top" align="center">No</td>
+    <td>explicit</td>
+    <td>Whether variables must be declared explicitly before use</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">format</td>
-    <td valign="top">Whether the generated java code is formatted nicely
-      or left to match NetRexx line numbers for call stack debugging</td>
-    <td valign="top" align="center">No</td>
+    <td>format</td>
+    <td>Whether the generated Java code is formatted nicely or left to match NetRexx line numbers
+      for call stack debugging</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">includes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      included. All files are included when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>includes</td>
+    <td>Comma- or space-separated list of patterns of files that must be included.</td>
+    <td>No; defaults to all (<q>**</q>)</td>
   </tr>
   <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an include pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>includesfile</td>
+    <td>Name of a file. Each line of this file is taken to be an include pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">java</td>
-    <td valign="top">Whether the generated java code is produced</td>
-    <td valign="top" align="center">No</td>
+    <td>java</td>
+    <td>Whether the generated Java code is produced</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">keep</td>
-    <td valign="top">Sets whether the generated java source file should be kept
-      after compilation. The generated files will have an extension of
-      .java.keep, <b>not</b> .java. Use removeKeepExtension to change that.</td>
-    <td valign="top" align="center">No</td>
+    <td>keep</td>
+    <td>Sets whether the generated java source file should be kept after compilation. The generated
+      files will have an extension
+      of <samp>.java.keep</samp>, <strong>not</strong> <samp>.java</samp>. Use <q>removeKeepExtension</q>
+      to change that.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">logo</td>
-    <td valign="top">Whether the compiler text logo is displayed when
-      compiling</td>
-    <td valign="top" align="center">No</td>
+    <td>logo</td>
+    <td>Whether the compiler text logo is displayed when compiling</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">removeKeepExtension</td>
-    <td valign="top">Tells whether the trailing .keep in nocompile-mode should
-      be removed so that the resulting java source really ends on .java. This
-      facilitates the use of the javadoc tool lateron.</td>
-    <td valign="top" align="center">No</td>
+    <td>removeKeepExtension</td>
+    <td>Tells whether the trailing <samp>.keep</samp> in <var>compile</var>=<q>false</q> mode should
+      be removed so that the resulting Java source file really ends on <samp>.java</samp>. This
+      facilitates the use of the <kbd>javadoc</kbd> tool later on.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">replace</td>
-    <td valign="top">Whether the generated .java file should be replaced
-      when compiling</td>
-    <td valign="top" align="center">No</td>
+    <td>replace</td>
+    <td>Whether the generated <samp>.java</samp> files should be replaced when compiling</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">savelog</td>
-    <td valign="top">Whether the compiler messages will be written to
-      NetRexxC.log as well as to the console</td>
-    <td valign="top" align="center">No</td>
+    <td>savelog</td>
+    <td>Whether the compiler messages will be written to <samp>NetRexxC.log</samp> as well as to the
+      console</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">sourcedir</td>
-    <td valign="top">Tells the NetRexx compiler to store the class files in the
-      same directory as the source files. The alternative is the working
-      directory</td>
-    <td valign="top" align="center">No</td>
+    <td>sourcedir</td>
+    <td>Tells the NetRexx compiler to store the class files in the same directory as the source
+      files. The alternative is the working directory</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">srcDir</td>
-    <td valign="top">Set the source dir to find the source NetRexx
-      files</td>
-    <td valign="top" align="center">Yes</td>
+    <td>srcDir</td>
+    <td>Sets the directory to find the source NetRexx files in</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">strictargs</td>
-    <td valign="top">Tells the NetRexx compiler that method calls always
-      need parentheses, even if no arguments are needed, e.g.
-      <code>aStringVar.getBytes</code> vs.
-      <code>aStringVar.getBytes()</code></td>
-    <td valign="top" align="center">No</td>
+    <td>strictargs</td>
+    <td>Tells the NetRexx compiler that method calls always need parentheses, even if no arguments
+      are needed, e.g. <code>aStringVar.getBytes</code> vs. <code>aStringVar.getBytes()</code></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">strictassign</td>
-    <td valign="top">Tells the NetRexx compile that assignments must
-      match exactly on type</td>
-    <td valign="top" align="center">No</td>
+    <td>strictassign</td>
+    <td>Tells the NetRexx compile that assignments must match exactly on type</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">strictcase</td>
-    <td valign="top">Specifies whether the NetRexx compiler should be
-      case sensitive or not</td>
-    <td valign="top" align="center">No</td>
+    <td>strictcase</td>
+    <td>Specifies whether the NetRexx compiler should be case sensitive or not</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">strictimport</td>
-    <td valign="top">Whether classes need to be imported explicitly using an
-      <code>import</code> statement.  By default the NetRexx compiler will
-      import certain packages automatically</td>
-    <td valign="top" align="center">No</td>
+    <td>strictimport</td>
+    <td>Whether classes need to be imported explicitly using an <code>import</code> statement</td>
+    <td>No; by default the NetRexx compiler will import certain packages automatically</td>
   </tr>
   <tr>
-    <td valign="top">strictprops</td>
-    <td valign="top">Whether local properties need to be qualified
-      explicitly using <code>this</code></td>
-    <td valign="top" align="center">No</td>
+    <td>strictprops</td>
+    <td>Whether local properties need to be qualified explicitly using <code>this</code></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">strictsignal</td>
-    <td valign="top">Whether the compiler should force catching of
-      exceptions by explicitly named types</td>
-    <td valign="top" align="center">No</td>
+    <td>strictsignal</td>
+    <td>Whether the compiler should force catching of exceptions by explicitly named types</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">symbols</td>
-    <td valign="top">Whether debug symbols should be generated into the
-      class file</td>
-    <td valign="top" align="center">No</td>
+    <td>symbols</td>
+    <td>Whether debug symbols should be generated into the class file</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">time</td>
-    <td valign="top">Asks the NetRexx compiler to print compilation
-      times to the console</td>
-    <td valign="top" align="center">No</td>
+    <td>time</td>
+    <td>Asks the NetRexx compiler to print compilation times to the console</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">trace</td>
-    <td valign="top">Turns on or off tracing and directs the resultant
-      trace output</td>
-    <td valign="top" align="center">No</td>
+    <td>trace</td>
+    <td>Turns on or off tracing and directs the resultant trace output</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">utf8</td>
-    <td valign="top">Tells the NetRexx compiler that the source is in UTF8</td>
-    <td valign="top" align="center">No</td>
+    <td>utf8</td>
+    <td>Tells the NetRexx compiler that the source is in UTF8</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">Whether lots of warnings and error messages should
-      be generated</td>
-    <td valign="top" align="center">No</td>
+    <td>verbose</td>
+    <td>Tells whether lots of warnings and error messages should be generated</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">suppressMethodArgumentNotUsed</td>
-    <td valign="top">Tells whether we should filter out the
-      &amp;Method argument not used&amp; messages in strictargs mode.</td>
-    <td valign="top" align="center">No</td>
+    <td>suppressMethodArgumentNotUsed</td>
+    <td>Tells whether we should filter out the <q>Method argument not used</q> messages
+      in <var>strictargs</var> mode.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">suppressPrivatePropertyNotUsed</td>
-    <td valign="top">Tells whether we should filter out the
-      &amp;Private Property defined, but not used&amp; messages in strictargs mode.</td>
-    <td valign="top" align="center">No</td>
+    <td>suppressPrivatePropertyNotUsed</td>
+    <td>Tells whether we should filter out the <q>Private Property defined, but not used</q>
+      messages in <var>strictargs</var> mode.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">suppressVariableNotUsed</td>
-    <td valign="top">Tells whether we should filter out the
-      &amp;Variable set but not used&amp; messages in strictargs mode.
-      Please be careful with this one, as you can hide errors behind it!</td>
-    <td valign="top" align="center">No</td>
+    <td>suppressVariableNotUsed</td>
+    <td>Tells whether we should filter out the <q>Variable set but not used</q> messages
+      in <var>strictargs</var> mode.  Please be careful with this one, as you can hide errors behind
+      it!</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">suppressExceptionNotSignalled</td>
-    <td valign="top">Tells whether we should filter out the
-      &amp;Exception is declared, but not signalled within the method&amp;
-      messages in strictsignal mode.</td>
-    <td valign="top" align="center">No</td>
+    <td>suppressExceptionNotSignalled</td>
+    <td>Tells whether we should filter out the <q>Exception is declared, but not signalled within
+      the method</q> messages in <var>strictsignal</var> mode.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">suppressDeprecation</td>
-    <td valign="top">Tells whether we should filter out any deprecation-messages
-      of the compiler out.</td>
-    <td valign="top" align="center">No</td>
+    <td>suppressDeprecation</td>
+    <td>Tells whether we should filter out any deprecation messages of the compiler output</td>
+    <td>No</td>
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
-  <p><code>&lt;netrexxc srcDir=&quot;/source/project&quot;
-           includes=&quot;vnr/util/*&quot;
-           destDir=&quot;/source/project/build&quot;
-           classpath=&quot;/source/project2/proj.jar&quot;
-           comments=&quot;true&quot;
-           crossref=&quot;false&quot; replace=&quot;true&quot;
-           keep=&quot;true&quot;/&gt;</code>
-  </p>
-</blockquote>
 
+<pre>
+&lt;netrexxc srcDir=&quot;/source/project&quot;
+          includes=&quot;vnr/util/*&quot;
+          destDir=&quot;/source/project/build&quot;
+          classpath=&quot;/source/project2/proj.jar&quot;
+          comments=&quot;true&quot;
+          crossref=&quot;false&quot; replace=&quot;true&quot;
+          keep=&quot;true&quot;/&gt;</pre>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/nice.html ant-1.10.3/manual/Tasks/nice.html
--- ant-1.9.10/manual/Tasks/nice.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/nice.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,47 +24,38 @@
 
 <body>
 
-<h2><a name="echo">Nice</a></h2>
+<h2 id="echo">Nice</h2>
 <h3>Description</h3>
-<p>Provide "nice-ness" to the current thread
-   and/or query the current value.</p>
+<p>Provide &quot;nice-ness&quot; to the current thread and/or query the current value.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">currentpriority</td>
-    <td valign="top">the name of the property whose value should be
-                     set to the current &quot;nice-ness&quot; level.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>currentpriority</td>
+    <td>name of the property whose value should be set to the current &quot;nice-ness&quot;
+      level.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">newpriority</td>
-    <td valign="top">the value to which the
-                     &quot;nice-ness&quot; level should be set.
-                     Must be a valid Java Thread priority.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>newpriority</td>
+    <td>value to which the &quot;nice-ness&quot; level should be set.  Must be a valid Java Thread
+      priority.</td>
+    <td>No</td>
   </tr>
 </table>
 <h3>Examples</h3>
-<pre>   &lt;nice newpriority=&quot;10&quot;/&gt;</pre>
-Set the Thread priority to 10 (highest).
-<pre>   &lt;nice currentpriority=&quot;priority&quot;/&gt;</pre>
-Store the current Thread priority in the user property "priority".
-<pre>
-   &lt;nice currentpriority=&quot;currentpriority&quot; newpriority=&quot;1&quot;/&gt;
-</pre>
-<p>Set the current Thread priority to 1 (lowest), storing the original
-priority in the user property "currentpriority".  This
-can be used to set the priority back to its original value later.
-</p>
-
+<pre>&lt;nice newpriority=&quot;10&quot;/&gt;</pre>
+<p>Set the Thread priority to 10 (highest).</p>
+<pre>&lt;nice currentpriority=&quot;priority&quot;/&gt;</pre>
+<p>Store the current Thread priority in the user property <code>priority</code>.</p>
+<pre>&lt;nice currentpriority=&quot;currentpriority&quot; newpriority=&quot;1&quot;/&gt;</pre>
+<p>Set the current Thread priority to 1 (lowest), storing the original priority in the user
+property <code>currentpriority</code>.  This can be used to set the priority back to its original
+value later.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/pack.html ant-1.10.3/manual/Tasks/pack.html
--- ant-1.9.10/manual/Tasks/pack.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/pack.html	2018-03-24 12:37:12.000000000 +0000
@@ -19,58 +19,57 @@
 <head>
 <meta http-equiv="Content-Language" content="en-us">
 <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
-<title>GZip/BZip2 Tasks</title>
+<title>GZip/BZip2/XZ Tasks</title>
 </head>
 
 <body>
 
-<h2><a name="pack">GZip/BZip2</a></h2>
+<h2 id="pack">GZip/BZip2/XZ</h2>
 <h3>Description</h3>
-<p>Packs a resource using the GZip or BZip2 algorithm.
-The output file is only generated if it doesn't exist or the source
-resource is newer.</p>
+<p>Packs a resource using the GZip, BZip2 or XZ algorithm.  The output file is only generated if it
+doesn't exist or the source resource is newer.</p>
+
+<p>XZ compression support has been added <em>since Apache Ant 1.10.1</em> and depends on external
+libraries not included in the Ant distribution.
+See <a href="../install.html#librarydependencies">Library Dependencies</a> for more information.</p>
+
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">src</td>
-    <td valign="top">the file to gzip/bzip.</td>
-    <td align="center" valign="top">Yes, or a nested resource collection.</td>
+    <td>src</td>
+    <td>the file to gzip/bzip/xz.</td>
+    <td>Yes, or a nested resource collection</td>
   </tr>
   <tr>
-    <td valign="top">destfile</td>
-    <td valign="top">the destination file to create.</td>
-    <td align="center" valign="top" rowspan="2">Exactly one of the two.</td>
+    <td>destfile</td>
+    <td>the destination file to create.</td>
+    <td rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
-    <td valign="top">zipfile</td>
-    <td valign="top">the <i>deprecated</i> old name of destfile.</td>
+    <td>zipfile</td>
+    <td class="left"><em><u>deprecated</u></em> old name of <var>destfile</var>.</td>
   </tr>
 </table>
-<h4>any <a href="../Types/resources.html">resource</a> or single element
-resource collection</h4>
-
-<p>The specified resource will be used as src. <em>Since Apache Ant 1.7</em></p>
+<h3>Parameters specified as nested elements</h3>
+<h4>any <a href="../Types/resources.html">resource</a> or single element resource collection</h4>
+<p><em>Since Apache Ant 1.7</em></p>
+<p>The specified resource will be used as <var>src</var>.</p>
 
 <h3>Examples</h3>
-<blockquote><pre>
-&lt;gzip src=&quot;test.tar&quot; destfile=&quot;test.tar.gz&quot;/&gt;
-</pre></blockquote>
-<blockquote><pre>
-&lt;bzip2 src=&quot;test.tar&quot; destfile=&quot;test.tar.bz2&quot;/&gt;
-</pre></blockquote>
-<blockquote><pre>
+<pre>&lt;gzip src=&quot;test.tar&quot; destfile=&quot;test.tar.gz&quot;/&gt;</pre>
+<pre>&lt;bzip2 src=&quot;test.tar&quot; destfile=&quot;test.tar.bz2&quot;/&gt;</pre>
+<pre>&lt;xz src=&quot;test.tar&quot; destfile=&quot;test.tar.xz&quot;/&gt;</pre>
+<pre>
 &lt;gzip destfile=&quot;archive.tar.gz&quot;&gt;
   &lt;url url="http://example.org/archive.tar"/&gt;
-&lt;/gzip&gt;
-</pre></blockquote>
-<p>downloads <i>http://example.org/archive.tar</i> and compresses it
-to <i>archive.tar.gz</i> in the project's basedir on the fly.</p>
-
+&lt;/gzip&gt;</pre>
+<p>downloads <samp>http://example.org/archive.tar</samp> and compresses it
+to <samp>archive.tar.gz</samp> in the project's <var>basedir</var> on the fly.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/parallel.html ant-1.10.3/manual/Tasks/parallel.html
--- ant-1.9.10/manual/Tasks/parallel.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/parallel.html	2018-03-24 12:37:12.000000000 +0000
@@ -26,136 +26,114 @@
 
 <h2>Parallel</h2>
 <h3>Description</h3>
-<p>
-    Executes nested tasks in parallel with no guarantees of thread safety.
-    Every task will run in its own thread, with the likelihood of 
-    concurrency problems scaling with the number of CPUs on the host system.
-</p>
-<p><b>Warning:</b> While the Apache Ant core is believed to be thread safe, no such 
-    guarantees are made about tasks, which are not tested for thread safety during
-    Ant's test process. 
-    Third party tasks may or may not be thread safe, and some of Ant's core tasks, such as
-    <code>&lt;javac&gt;</code> are definitely not re-entrant. This is because they use libraries that
-    were never designed to be used in a multithreaded environment.
-</p>
-<p>
-    The primary use case for <code>&lt;parallel&gt;</code> is to run external programs
-    such as an application server, and the JUnit or TestNG test suites at the
-    same time. Anyone trying to run large Ant task sequences in parallel, such
-    as javadoc and javac at the same time, is implicitly taking on the task
-    of identifying and fixing all concurrency bugs the tasks that they run.
-    
-</p>
-<p>
-    Accordingly, while this task has uses, it should be considered an advanced
-    task which should be used in certain batch-processing or testing situations,
-    rather than an easy trick to speed up build times on a multiway CPU. 
-</p>
+<p>Executes nested tasks in parallel with no guarantees of thread safety.  Every task will run in
+its own thread, with the likelihood of concurrency problems scaling with the number of CPUs on the
+host system.</p>
+<p><strong>Warning</strong>: While the Apache Ant core is believed to be thread safe, no such
+guarantees are made about tasks, which are not tested for thread safety during Ant's test process.
+Third party tasks may or may not be thread safe, and some of Ant's core tasks, such
+as <code>&lt;javac&gt;</code> are definitely not re-entrant. This is because they use libraries that
+were never designed to be used in a multithreaded environment.</p>
+<p>The primary use case for <code>&lt;parallel&gt;</code> is to run external programs such as an
+application server, and the JUnit or TestNG test suites at the same time. Anyone trying to run large
+Ant task sequences in parallel, such as <code>javadoc</code> and <code>javac</code> at the same
+time, is implicitly taking on the task of identifying and fixing all concurrency bugs the tasks that
+they run.</p>
+<p>Accordingly, while this task has uses, it should be considered an advanced task which should be
+used in certain batch processing or testing situations, rather than an easy trick to speed up build
+times on a multicore CPU.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">threadCount</td>
-    <td valign="top">Maximum numbers of thread to use.</td>
-    <td align="center" valign="top">No</td>
+    <td>threadCount</td>
+    <td>Maximum numbers of thread to use.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">threadsPerProcessor</td>
-    <td valign="top">Maximum number of threads to use per available processor
-(Java 1.4+)</td>
-    <td align="center" valign="top">No, defers to threadCount</td>
+    <td>threadsPerProcessor</td>
+    <td>Maximum number of threads to use per available processor (Java 1.4+)</td>
+    <td>No; defers to <var>threadCount</var></td>
   </tr>
   <tr>
-    <td valign="top">timeout</td>
-    <td valign="top">Number of milliseconds before execution is terminated</td>
-    <td align="center" valign="top">No</td>
+    <td>timeout</td>
+    <td>Number of milliseconds before execution is terminated</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">failonany</td>
-    <td valign="top">If any of the nested tasks fails, execution of the task completes
-                     at that point without waiting for any other tasks to complete.</td>
-    <td align="center" valign="top">No, default is false.</td>
+    <td>failonany</td>
+    <td>If any of the nested tasks fails, execution of the task completes at that point without
+      waiting for any other tasks to complete.</td>
+    <td>No; default is <q>false</q>.</td>
   </tr>
   <tr>
-    <td valign="top">pollInterval</td>
-    <td valign="top">Currently has no effect</td>
-    <td align="center" valign="top">No, default is 1000</td>
+    <td>pollInterval</td>
+    <td>Currently has no effect</td>
+    <td>No; default is <q>1000</q></td>
   </tr>
 </table>
 
 <p>Parallel tasks have a number of uses in an Ant build file including:</p>
 <ul>
-<li>Taking advantage of available processing resources to execute external
- programs simultaneously.</li>
-<li>Testing servers, where the server can be run in one thread and the test
-harness is run in another thread.</li>
+  <li>Taking advantage of available processing resources to execute external programs
+    simultaneously.</li>
+  <li>Testing servers, where the server can be run in one thread and the test harness is run in
+    another thread.</li>
 </ul>
 
-<p>Any valid Ant task may be embedded within a
-parallel task, including other parallel tasks, though there is no guarantee that
-the tasks will be thread safe in such an environment.</p>
-
-<p>While the tasks within the parallel task are being run, the main
-thread will be blocked waiting for all the child threads to complete. If
-execution is terminated by a timeout or a nested task failure when the
-<code>failonany</code>
-flag is set, the parallel task will complete without waiting for other nested
-tasks to complete in other threads.
-</p>
-
-<p>If any of the tasks within the <code>&lt;parallel&gt;</code> task fails and failonany is
-not set, the remaining tasks in other threads will continue to run until
-all threads have completed. In this situation, the parallel task will also fail.</p>
-
-<p>The parallel task may be combined with the <a href="sequential.html">
-sequential</a> task to define sequences of tasks to be executed on each thread
-within the parallel block</p>
-
-<p>The <code>threadCount</code> attribute can be used to place a maximum number of available
-threads for the execution.  When not present all child tasks will be executed at
-once.  When present then the maximum number of concurrently executing tasks will
-not exceed the number of threads specified.  Furthermore, each task will be
-started in the order they are given.  But no guarantee is made as to the speed
-of execution or the order of completion of the tasks, only that each will be
-started before the next.<p>
-
-<p>If you are using Java 1.4 or later you can also use the <code>threadsPerProcessor</code>
-and the number of available threads will be the stated multiple of the number of
-processors (there is no affinity to a particular processor however).  This will
-override the value in <code>threadCount</code>.  If <code>threadsPerProcessor</code>
-is specified on any older JVM, then the value in <code>threadCount</code> will be used as is.</p>
-
-<p>When using <code>threadCount</code> and  <code>threadsPerProcessor</code> 
-    care should be taken to ensure that the build does not deadlock.  
-    This can be caused by tasks such as <code>waitfor</code>
-    taking up all available threads before the tasks that would unlock the 
-    <code>waitfor</code>
-would occur.  This is not a replacement for Java Language level thread
-semantics and is best used for "embarassingly parallel" tasks.</p>
-
+<p>Any valid Ant task may be embedded within a <code>parallel</code> task, including
+other <code>parallel</code> tasks, though there is no guarantee that the tasks will be thread safe
+in such an environment.</p>
+
+<p>While the tasks within the <code>parallel</code> task are being run, the main thread will be
+blocked waiting for all the child threads to complete. If execution is terminated by a timeout or a
+nested task failure when the <var>failonany</var> flag is set, the <code>parallel</code> task will
+complete without waiting for other nested tasks to complete in other threads.</p>
+
+<p>If any of the tasks within the <code>&lt;parallel&gt;</code> task fails and <var>failonany</var>
+is not set, the remaining tasks in other threads will continue to run until all threads have
+completed. In this situation, the <code>parallel</code> task will also fail.</p>
+
+<p>The <code>parallel</code> task may be combined with the <a href="sequential.html">sequential</a>
+task to define sequences of tasks to be executed on each thread within the parallel block.</p>
+
+<p>The <var>threadCount</var> attribute can be used to place a maximum number of available threads
+for the execution.  When not present all child tasks will be executed at once.  When present then
+the maximum number of concurrently executing tasks will not exceed the number of threads specified.
+Furthermore, each task will be started in the order they are given.  But no guarantee is made as to
+the speed of execution or the order of completion of the tasks, only that each will be started
+before the next.<p>
+
+<p>If you are using Java 1.4 or later you can also use the <var>threadsPerProcessor</var> and the
+number of available threads will be the started multiple of the number of processors (there is no
+affinity to a particular processor, however).  This will override the value
+in <var>threadCount</var>.  If <var>threadsPerProcessor</var> is specified on any older JVM, then
+the value in <var>threadCount</var> will be used as is.</p>
+
+<p>When using <var>threadCount</var> and <var>threadsPerProcessor</var> care should be taken to
+ensure that the build does not deadlock.  This can be caused by tasks such as <code>waitfor</code>
+taking up all available threads before the tasks that would unlock the <code>waitfor</code> would
+occur.  This is not a replacement for Java Language level thread semantics and is best used for
+"embarrassingly parallel" tasks.</p>
 
 <h3>Parameters specified as nested elements</h3>
 
 <h4>daemons</h4>
-<p>
-The parallel task supports a <code>&lt;daemons&gt;</code> nested element. This is a list of tasks
-which are to be run in parallel daemon threads. The parallel task will not wait for
-these tasks to complete. Being daemon threads, however, they will not prevent Ant from
-completing, whereupon the threads are terminated. Failures in daemon threads which
-occur before the parallel task itself finishes will be reported and can cause
-parallel to throw an exception. Failures which occur after parallel has completed are not
-reported.
-</p>
-
-<p>Daemon tasks can be used, for example, to start test servers which might not be easily
-terminated from Ant. By using <code>&lt;daemons&gt;</code> such servers do not halt the build.
-</p>
+<p>The <code>parallel</code> task supports a <code>&lt;daemons&gt;</code> nested element. This is a
+list of tasks which are to be run in parallel daemon threads. The <code>parallel</code> task will
+not wait for these tasks to complete. Being daemon threads, however, they will not prevent Ant from
+completing, whereupon the threads are terminated. Failures in daemon threads which occur before
+the <code>parallel</code> task itself finishes will be reported and can cause <code>parallel</code>
+to throw an exception. Failures which occur after <code>parallel</code> has completed are not
+reported.</p>
 
+<p>Daemon tasks can be used, for example, to start test servers which might not be easily terminated
+from Ant. By using <code>&lt;daemons&gt;</code> such servers do not halt the build.</p>
 
 <h3>Examples</h3>
 <pre>
@@ -166,15 +144,13 @@
     &lt;junit fork="true" forkmode="once" ... &gt;
     &lt;wlstop/&gt;
   &lt;/sequential&gt;
-&lt;/parallel&gt;
-</pre>
-<p>This example represents a typical pattern for testing a server application.
-In one thread the server is started (the <code>&lt;wlrun&gt;</code> task). 
-The other thread consists
-of a three tasks which are performed in sequence. The <code>&lt;sleep&gt;</code> task is used to
-give the server time to come up. Another task which is capable of validating
-that the server is available could be used in place of the <code>&lt;sleep&gt;</code> task. The
-<code>&lt;junit&gt;</code> test harness then runs, again in its own JVM. Once the tests are complete, the server is stopped
+&lt;/parallel&gt;</pre>
+<p>This example represents a typical pattern for testing a server application.  In one thread the
+server is started (the <code>&lt;wlrun&gt;</code> task).  The other thread consists of a three tasks
+which are performed in sequence. The <code>&lt;sleep&gt;</code> task is used to give the server time
+to come up. Another task which is capable of validating that the server is available could be used
+in place of the <code>&lt;sleep&gt;</code> task. The <code>&lt;junit&gt;</code> test harness then
+runs, again in its own JVM. Once the tests are complete, the server is stopped
 (using <code>&lt;wlstop&gt;</code> in this example), allowing both threads to complete. The
 <code>&lt;parallel&gt;</code> task will also complete at this time and the build will then
 continue.</p>
@@ -183,53 +159,44 @@
 &lt;parallel&gt;
   &lt;javac fork="true"...&gt; &lt;!-- compiler servlet code --&gt;
   &lt;wljspc ...&gt; &lt;!-- precompile JSPs --&gt;
-&lt;/parallel&gt;
-</pre>
+&lt;/parallel&gt;</pre>
 
-<p>This example shows two independent tasks being run to achieve better
-resource utilization during the build. In this instance, some servlets are being
-compiled in one thead and a set of JSPs is being precompiled in another. Developers
-need to be careful that the two tasks are independent, both in
-terms of their dependencies and in terms of their potential interactions in
-Ant's external environment. Here we set <code>fork="true"</code> for the 
-<code>&lt;javac&gt;</code> task, so that it runs in a new process; 
-if the <code>&lt;wljspc&gt;</code> task used the javac compiler in-VM
-(it may), concurrency problems may arise.
-</p>
+<p>This example shows two independent tasks being run to achieve better resource utilization during
+the build. In this instance, some servlets are being compiled in one thread and a set of JSPs is
+being precompiled in another. Developers need to be careful that the two tasks are independent, both
+in terms of their dependencies and in terms of their potential interactions in Ant's external
+environment. Here we set <var>fork</var>=<q>true</q> for the <code>&lt;javac&gt;</code> task, so
+that it runs in a new process; if the <code>&lt;wljspc&gt;</code> task used the <kbd>javac</kbd>
+compiler in-VM (it may), concurrency problems may arise.</p>
 
 <pre>
  &lt;macrodef name="dbpurge"&gt;
     &lt;attribute file="file"/&gt;
    &lt;sequential&gt;
       &lt;java jar="utils/dbpurge.jar" fork="true" &gt;
-        &lt;arg file="@{file} /&gt;
+        &lt;arg file="@{file}/&gt;
       &lt;/java&gt;
    &lt;/sequential&gt;
 &lt;/macrodef&gt;
-    
+
 &lt;parallel threadCount="4"&gt;
-  &lt;dbpurge file="db/one" /&gt;
-  &lt;dbpurge file="db/two" /&gt;
-  &lt;dbpurge file="db/three" /&gt;
-  &lt;dbpurge file="db/four" /&gt;
-  &lt;dbpurge file="db/five" /&gt;
-  &lt;dbpurge file="db/six" /&gt;
-  &lt;dbpurge file="db/seven" /&gt;
-  &lt;dbpurge file="db/eight" /&gt;
+  &lt;dbpurge file="db/one"/&gt;
+  &lt;dbpurge file="db/two"/&gt;
+  &lt;dbpurge file="db/three"/&gt;
+  &lt;dbpurge file="db/four"/&gt;
+  &lt;dbpurge file="db/five"/&gt;
+  &lt;dbpurge file="db/six"/&gt;
+  &lt;dbpurge file="db/seven"/&gt;
+  &lt;dbpurge file="db/eight"/&gt;
   &lt;!-- repeated about 40 times --&gt;
-&lt;/parallel&gt;
-</pre>
-
-<p>This example represents a typical need for use of the threadCount and
-threadsPerProcessor attributes.  Spinning up all 40 of those tasks could cripple
-the system for memory and CPU time.  By limiting the number of
-concurrent executions you can reduce contention for CPU, memory and disk IO, 
-and so actually finish faster.  This is also a good
-candidate for use of threadCount (and possibly threadsPerProcessor) because
-each task is independent (every new JVM is forked) and has no dependencies on
-the other tasks.</p>
+&lt;/parallel&gt;</pre>
 
+<p>This example represents a typical need for use of the <var>threadCount</var>
+and <var>threadsPerProcessor</var> attributes.  Spinning up all 40 of those tasks could cripple the
+system for memory and CPU time.  By limiting the number of concurrent executions you can reduce
+contention for CPU, memory and disk IO, and so actually finish faster.  This is also a good
+candidate for use of <var>threadCount</var> (and possibly <var>threadsPerProcessor</var>) because
+each task is independent (every new JVM is forked) and has no dependencies on the other tasks.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/patch.html ant-1.10.3/manual/Tasks/patch.html
--- ant-1.9.10/manual/Tasks/patch.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/patch.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,88 +24,80 @@
 
 <body>
 
-<h2><a name="patch">Patch</a></h2>
+<h2 id="patch">Patch</h2>
 <h3>Description</h3>
-<p>Applies a diff file to originals. ; requires "patch" to be
- on the execution path.  </p>
+<p>Applies a diff file to originals. Requires <kbd>patch</kbd> to be on the execution path.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">patchfile</td> 
-    <td valign="top">the file that includes the diff output</td>
-    <td align="center" valign="top">Yes</td>
+    <td>patchfile</td>
+    <td>the file that includes the diff output</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">originalfile</td> 
-    <td valign="top">the file to patch</td>
-    <td align="center" valign="top">No, tries to guess it from the diff 
-      file</td>
+    <td>originalfile</td>
+    <td>the file to patch</td>
+    <td>No; tries to guess it from the diff file</td>
   </tr>
   <tr>
-    <td valign="top">destfile</td> 
-    <td valign="top">the file to send the output to instead of
-      patching the file(s) in place.  <em>since Apache Ant 1.6</em></td>
-    <td align="center" valign="top">No.</td>
+    <td>destfile</td>
+    <td>the file to send the output to instead of patching the file(s) in place.  <em>since Apache
+      Ant 1.6</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">backups</td> 
-    <td valign="top">Keep backups of the unpatched files</td>
-    <td align="center" valign="top">No</td>
+    <td>backups</td>
+    <td>Keep backups of the unpatched files</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">quiet</td> 
-    <td valign="top">Work silently unless an error occurs</td>
-    <td align="center" valign="top">No</td>
+    <td>quiet</td>
+    <td>Work silently unless an error occurs</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">reverse</td> 
-    <td valign="top">Assume patch was created with old and new files 
-      swapped.</td>
-    <td align="center" valign="top">No</td>
+    <td>reverse</td>
+    <td>Assume patch was created with old and new files swapped.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">ignorewhitespace</td> 
-    <td valign="top">Ignore whitespace differences.</td>
-    <td align="center" valign="top">No</td>
+    <td>ignorewhitespace</td>
+    <td>Ignore whitespace differences.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">strip</td> 
-    <td valign="top">Strip the smallest prefix containing <i>num</i> leading 
-      slashes from filenames.</td>
-    <td align="center" valign="top">No</td>
+    <td>strip</td>
+    <td>Strip the smallest prefix containing <q>num</q> leading slashes from filenames.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">dir</td> 
-    <td valign="top">The directory in which to run the patch command.</td>
-    <td align="center" valign="top">No, default is the project's basedir.</td>
+    <td>dir</td>
+    <td>The directory in which to run the <code>patch</code> command.</td>
+    <td>No; default is the project's <var>basedir</var></td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">Stop the buildprocess if the command exits with a
-      return code signaling failure. Defaults to false.
-      <em>since Ant 1.8.0</em></td>
-    <td align="center" valign="top">No</td>
+    <td>failonerror</td>
+    <td>Stop the build process if the command exits with a return code signaling failure. <em>since
+      Ant 1.8.0</em></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
-<pre>  &lt;patch patchfile=&quot;module.1.0-1.1.patch&quot;/&gt;</pre>
-<p>applies the diff included in <i>module.1.0-1.1.patch</i> to the
-files in base directory guessing the filename(s) from the diff output.</p>
-<pre>  &lt;patch patchfile=&quot;module.1.0-1.1.patch&quot; strip=&quot;1&quot;/&gt;</pre>
-<p>like above but one leading directory part will be removed. i.e. if
-the diff output looked like</p>
+<pre>&lt;patch patchfile=&quot;module.1.0-1.1.patch&quot;/&gt;</pre>
+<p>applies the diff included in <samp>module.1.0-1.1.patch</samp> to the files in base directory
+guessing the filename(s) from the diff output.</p>
+<pre>&lt;patch patchfile=&quot;module.1.0-1.1.patch&quot; strip=&quot;1&quot;/&gt;</pre>
+<p>like above but one leading directory part will be removed. i.e. if the diff output looked
+like</p>
 <pre>
---- a/mod1.0/A	Mon Jun  5 17:28:41 2000
-+++ a/mod1.1/A	Mon Jun  5 17:28:49 2000
-</pre> 
-the leading <i>a/</i> will be stripped.
-
+--- a/mod1.0/A  Mon Jun  5 17:28:41 2000
++++ a/mod1.1/A  Mon Jun  5 17:28:49 2000</pre>
+the leading <samp>a/</samp> will be stripped.
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/pathconvert.html ant-1.10.3/manual/Tasks/pathconvert.html
--- ant-1.9.10/manual/Tasks/pathconvert.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/pathconvert.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,201 +24,156 @@
 
 <body>
 
-<h2><a name="pathconvert">Pathconvert</a></h2>
+<h2 id="pathconvert">Pathconvert</h2>
 <h3>Description</h3>
-<p>Converts nested <a href="../Types/resources.html#collection">
-ResourceCollection</a>s, or a reference to just one, into a path
-form for a particular platform, optionally storing the result into
-a given property. It can also be used when you need
-to convert a Resource Collection into a list, separated by a given
-character, such as a comma or space, or, conversely, e.g. to convert a list
-of files in a FileList into a path.
-</p>
-<p>Nested <code>&lt;map&gt;</code> elements can be specified to map Windows
-drive letters to Unix paths, and vice-versa.</p>
-<p>More complex transformations can be achieved using a nested
-<a href="../Types/mapper.html"><code>&lt;mapper&gt;</code></a>
-(since Apache Ant 1.6.2).
-</p>
+<p>Converts nested <a href="../Types/resources.html#collection">resource collections</a>, or a
+reference to just one, into a path form for a particular platform, optionally storing the result
+into a given property. It can also be used when you need to convert a resource collection into a
+list, separated by a given character, such as a comma or space, or, conversely, e.g. to convert a
+list of files in a FileList into a path.</p>
+<p>Nested <code>&lt;map&gt;</code> elements can be specified to map Windows drive letters to Unix
+paths, and vice-versa.</p>
+<p>More complex transformations can be achieved using a
+nested <a href="../Types/mapper.html"><code>&lt;mapper&gt;</code></a> (<em>since Apache Ant
+1.6.2</em>).</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">targetos</td>
-    <td valign="top">
-        The target architecture.  Must be one of 'unix', 'windows', 
-        'netware', 'tandem' or 'os/2'.
-        This is a shorthand mechanism for specifying both
-        <code>pathsep</code> and <code>dirsep</code>
-        according to the specified target architecture.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>targetos</td>
+    <td>The target architecture.  Must be one
+        of <q>unix</q>, <q>windows</q>, <q>netware</q>, <q>tandem</q> or <q>os/2</q>.  This is a
+        shorthand mechanism for specifying both <var>pathsep</var> and <var>dirsep</var> according
+        to the specified target architecture.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">dirsep</td>
-    <td valign="top">
-       The character(s) to use as the directory separator in the
-       generated paths.
-    </td>
-    <td valign="top" align="center">No, defaults to current JVM <tt>File.separator</tt></td>
+    <td>dirsep</td>
+    <td>The character(s) to use as the directory separator in the generated paths.</td>
+    <td>No; defaults to current JVM <code>File.separator</code></td>
   </tr>
   <tr>
-    <td valign="top">pathsep</td>
-    <td valign="top">
-       The character(s) to use as the path-element separator in the
-       generated paths.
-    </td>
-    <td valign="top" align="center">No, defaults to current JVM <tt>File.pathSeparator</tt></td>
+    <td>pathsep</td>
+    <td>The character(s) to use as the path-element separator in the generated paths.</td>
+    <td>No; defaults to current JVM <code>File.pathSeparator</code></td>
   </tr>
   <tr>
-    <td valign="top">property</td>
-    <td valign="top">The name of the property in which to place the converted path.</td>
-    <td valign="top" align="center">No, result will be logged if unset</td>
+    <td>property</td>
+    <td>The name of the property in which to place the converted path.</td>
+    <td>No, result will be logged if unset</td>
   </tr>
   <tr>
-    <td valign="top">refid</td>
-    <td valign="top">What to convert, given as a
-        <a href="../using.html#references">reference</a> to a
-        <code>&lt;path&gt;</code>, <code>&lt;fileset&gt;</code>,
-        <code>&lt;dirset&gt;</code>, or <code>&lt;filelist&gt;</code>
-        defined elsewhere</td>
-    <td valign="top" align="center">No; if omitted, a nested
-        <code>&lt;path&gt;</code> element must be supplied.</td>
+    <td>refid</td>
+    <td>What to convert, given as a <a href="../using.html#references">reference</a> to
+      a <code>&lt;path&gt;</code>, <code>&lt;fileset&gt;</code>, <code>&lt;dirset&gt;</code>,
+      or <code>&lt;filelist&gt;</code> defined elsewhere</td>
+    <td>Yes, unless a nested <code>&lt;path&gt;</code> element is supplied</td>
   </tr>
   <tr>
-    <td valign="top">setonempty</td>
-    <td valign="top">Should the property be set, even if the result
-      is the empty string?
-    <td valign="top" align="center">No; default is &quot;true&quot;.
+    <td>setonempty</td>
+    <td>Should the property be set, even if the result is the empty string?</td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">preserveduplicates</td>
-    <td valign="top">Whether to preserve duplicate resources. <b>Since Ant 1.8</b></td>
-    <td valign="top" align="center">No; default &quot;false&quot;.
+    <td>preserveduplicates</td>
+    <td>Whether to preserve duplicate resources. <em>Since Ant 1.8</em></td>
+    <td>No; default is <q>false</q></td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 <h4>map</h4>
 <p>Specifies the mapping of path prefixes between Unix and Windows.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">from</td>
-    <td valign="top">
-      The prefix to match.  Note that this value is case-insensitive when
-      the build is running on a Windows platform and case-sensitive 
-      when running on a Unix platform.
-      <em>Since Ant 1.7.0</em>, on Windows this value is also insensitive
-      to the slash style used for directories, one can use '/' or '\'.
-    </td>
-    <td valign="top" align="center">Yes</td>
-  </tr>
-  <tr>
-    <td valign="top">to</td>
-    <td valign="top">The replacement text to use when <code>from</code> is matched.</td>
-    <td valign="top" align="center">Yes</td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>from</td>
+    <td>The prefix to match.  Note that this value is case-insensitive when the build is running on
+      a Windows platform and case-sensitive when running on a Unix platform.  <em>Since Ant
+      1.7.0</em>, on Windows this value is also insensitive to the slash style used for directories,
+      one can use <q>/</q> or <q>\</q>.</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>to</td>
+    <td>The replacement text to use when <var>from</var> is matched.</td>
+    <td>Yes</td>
   </tr>
 </table>
 
-<p>Each map element specifies a single replacement map to be applied to the elements of
-   the path being processed.  If no map entries are specified, then no path prefix mapping
-   is performed.
-</p>
-<p><strong>Note</strong>: The map elements are applied in the order specified,
-and only the first matching map element is applied.  So, the ordering of
-your map elements can be important, if any <code>from</code> values are
-prefixes of other <code>from</code> values.</i>
-</p>   
-<h4>Resource Collections</h4>
-<p>If the <code>refid</code> attribute is not specified, then one or more
-   nested <a href="../Types/resources.html#collection">Resource
-Collection</a>s must be supplied.</p>
+<p>Each map element specifies a single replacement map to be applied to the elements of the path
+being processed.  If no map entries are specified, then no path prefix mapping is performed.</p>
+<p><strong>Note</strong>: The map elements are applied in the order specified, and only the first
+matching map element is applied.  So, the ordering of your map elements can be important, if
+any <var>from</var> values are prefixes of other <var>from</var> values.</p>
+<h4>resource collections</h4>
+<p>If the <var>refid</var> attribute is not specified, then one or more
+nested <a href="../Types/resources.html#collection">resource collections</a> must be supplied.</p>
 <h4>mapper</h4>
-<p>A single nested <a href="../Types/mapper.html">
-<code>&lt;mapper&gt;</code></a> element can be specified
-to perform any of various filename transformations (since Ant 1.6.2).
-</p>
+<p>A single nested <a href="../Types/mapper.html"><code>&lt;mapper&gt;</code></a> element can be
+specified to perform any of various filename transformations (<em>since Ant 1.6.2</em>).</p>
 
 <h3>Examples</h3>
-<p>In the examples below, assume that the <code>${wl.home}</code> property
-has the value
-<code>d:\weblogic</code>, and <code>${wl.home.unix}</code> has the value
-<code>/weblogic</code>.</p>
+<p>In the examples below, assume that the <samp>${wl.home}</samp> property has the
+value <samp>d:\weblogic</samp>, and <samp>${wl.home.unix}</samp> has the
+value <samp>/weblogic</samp>.</p>
 <h4>Example 1</h4>
 <pre>
-    &lt;path id="wl.path"&gt;
-      &lt;pathelement location=&quot;${wl.home}/lib/weblogicaux.jar&quot;/&gt;
-      &lt;pathelement location=&quot;${wl.home}/classes&quot;/&gt;
-      &lt;pathelement location=&quot;${wl.home}/mssqlserver4/classes&quot;/&gt;
-      &lt;pathelement location=&quot;c:\winnt\System32&quot;/&gt;
-    &lt;/path&gt;
-    
-    &lt;pathconvert targetos=&quot;unix&quot; property=&quot;wl.path.unix&quot; refid=&quot;wl.path&quot;&gt;
-      &lt;map from=&quot;${wl.home}&quot; to=&quot;${wl.home.unix}&quot;/&gt;
-      &lt;map from=&quot;c:&quot; to=&quot;&quot;/&gt;
-    &lt;/pathconvert&gt;
-</pre>
-<p> will generate the path shown below
-and store it in the property named <code>wl.path.unix</code>.
-</p>   
-<pre>
-/weblogic/lib/weblogicaux.jar:/weblogic/classes:/weblogic/mssqlserver4/classes:/WINNT/SYSTEM32
-</pre>
+&lt;path id="wl.path"&gt;
+  &lt;pathelement location=&quot;${wl.home}/lib/weblogicaux.jar&quot;/&gt;
+  &lt;pathelement location=&quot;${wl.home}/classes&quot;/&gt;
+  &lt;pathelement location=&quot;${wl.home}/mssqlserver4/classes&quot;/&gt;
+  &lt;pathelement location=&quot;c:\winnt\System32&quot;/&gt;
+&lt;/path&gt;
+
+&lt;pathconvert targetos=&quot;unix&quot; property=&quot;wl.path.unix&quot; refid=&quot;wl.path&quot;&gt;
+  &lt;map from=&quot;${wl.home}&quot; to=&quot;${wl.home.unix}&quot;/&gt;
+  &lt;map from=&quot;c:&quot; to=&quot;&quot;/&gt;
+&lt;/pathconvert&gt;</pre>
+<p>will generate the path shown below and store it in the property
+named <code>wl.path.unix</code>.</p>
+<pre class="output">/weblogic/lib/weblogicaux.jar:/weblogic/classes:/weblogic/mssqlserver4/classes:/WINNT/SYSTEM32</pre>
 
 <h4>Example 2</h4>
-Given a FileList defined as:
+<p>Given a FileList defined as:</p>
 <pre>
-  &lt;filelist id=&quot;custom_tasks.jars&quot;
-        dir=&quot;${env.HOME}/ant/lib&quot;
-        files=&quot;njavac.jar,xproperty.jar&quot;/&gt;
-</pre>
-then:
-<pre>
-    &lt;pathconvert targetos=&quot;unix&quot; property=&quot;custom_tasks.jars&quot; refid=&quot;custom_tasks.jars&quot;&gt;
-      &lt;map from=&quot;${env.HOME}&quot; to=&quot;/usr/local&quot;/&gt;
-    &lt;/pathconvert&gt;
-</pre>
-will convert the list of files to the following Unix path:
-<pre>
-/usr/local/ant/lib/njavac.jar:/usr/local/ant/lib/xproperty.jar
-</pre>
+&lt;filelist id=&quot;custom_tasks.jars&quot;
+          dir=&quot;${env.HOME}/ant/lib&quot;
+          files=&quot;njavac.jar,xproperty.jar&quot;/&gt;</pre>
+<p>then:</p>
+<pre>
+&lt;pathconvert targetos=&quot;unix&quot; property=&quot;custom_tasks.jars&quot; refid=&quot;custom_tasks.jars&quot;&gt;
+  &lt;map from=&quot;${env.HOME}&quot; to=&quot;/usr/local&quot;/&gt;
+&lt;/pathconvert&gt;</pre>
+<p>will convert the list of files to the following Unix path:</p>
+<pre class="output">/usr/local/ant/lib/njavac.jar:/usr/local/ant/lib/xproperty.jar</pre>
 
 <h4>Example 3</h4>
 <pre>
-    &lt;fileset dir=&quot;${src.dir}&quot; id=&quot;src.files&quot;&gt;
-      &lt;include name=&quot;**/*.java&quot;/&gt;
-    &lt;/fileset&gt;
-  
-    &lt;pathconvert pathsep=&quot;,&quot; property=&quot;javafiles&quot; refid=&quot;src.files&quot;/&gt;
-</pre>
+&lt;fileset dir=&quot;${src.dir}&quot; id=&quot;src.files&quot;&gt;
+  &lt;include name=&quot;**/*.java&quot;/&gt;
+&lt;/fileset&gt;
+
+&lt;pathconvert pathsep=&quot;,&quot; property=&quot;javafiles&quot; refid=&quot;src.files&quot;/&gt;</pre>
 <p>This example takes the set of files determined by the fileset (all files ending
-in <tt>.java</tt>), joins them together separated by commas, and places the resulting
-list into the property <tt>javafiles</tt>.  The directory separator is not specified, so
-it defaults to the appropriate character for the current platform.  Such a list could
-then be used in another task, like <tt>javadoc</tt>, that requires a comma separated
-list of files.
-</p>
+in <samp>.java</samp>), joins them together separated by commas, and places the resulting list into
+the property <code>javafiles</code>.  The directory separator is not specified, so it defaults to
+the appropriate character for the current platform.  Such a list could then be used in another task,
+like <code>javadoc</code>, that requires a comma separated list of files.</p>
 <h4>Example 4</h4>
 <pre>
-    &lt;pathconvert property="prop" dirsep="|"&gt;
-      &lt;map from="${basedir}/abc/" to=''/&gt;
-      &lt;path location="abc/def/ghi"/&gt;
-    &lt;/pathconvert&gt;
-</pre>
-  <p>
-    This example sets the property "prop" to "def|ghi" on
-    Windows and on Unix.
-  </p>
+&lt;pathconvert property="prop" dirsep="|"&gt;
+  &lt;map from="${basedir}/abc/" to=&quot;&quot;/&gt;
+  &lt;path location="abc/def/ghi"/&gt;
+&lt;/pathconvert&gt;</pre>
+<p>This example sets the property <code>prop</code> to <q>def|ghi</q> on Windows and on Unix.</p>
 </body>
 </html>
-
- 
diff -Nru ant-1.9.10/manual/Tasks/presetdef.html ant-1.10.3/manual/Tasks/presetdef.html
--- ant-1.9.10/manual/Tasks/presetdef.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/presetdef.html	2018-03-24 12:37:12.000000000 +0000
@@ -15,95 +15,66 @@
    limitations under the License.
 -->
 <html>
-  
+
   <head>
-    <meta http-equiv="Content-Language" content="en-us"></meta>
+    <meta http-equiv="Content-Language" content="en-us">
     <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
-<title>PreSetDef Task</title>
-    <style type="text/css">
-      <!--
-           .code { background: #EFEFEF; margin-top: }
-           -->
-    </style>
+    <title>PreSetDef Task</title>
   </head>
-  
+
   <body>
-    
-    <h2><a name="presetdef">PreSetDef</a></h2>
+
+    <h2 id="presetdef">PreSetDef</h2>
+    <p><em>Since Apache Ant 1.6</em></p>
     <h3>Description</h3>
-    <p>
-      The preset definition generates a new definition
-      based on a current definition with some attributes
-      or elements preset.
-    </p>
-    <p>
-      <em>since Apache Ant 1.6</em>
-    </p>
-    <p>
-      The resolution of properties in any of the attributes or
-      nested text takes place with the definition is used and <em>not</em>
-      when the preset definition is defined.
-    </p>
+    <p>The preset definition generates a new definition based on a current definition with some
+      attributes or elements preset.</p>
+    <p>The resolution of properties in any of the attributes or nested text takes place with the
+      definition is used and <em>not</em> when the preset definition is defined.</p>
     <h3>Parameters</h3>
-    <table border="1" cellpadding="2" cellspacing="0">
+    <table class="attr">
       <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
       <tr>
-        <td valign="top">name</td>
-        <td valign="top">the name of the new definition</td>
-        <td valign="top" align="center">Yes</td>
+        <td>name</td>
+        <td>the name of the new definition</td>
+        <td>Yes</td>
       </tr>
       <tr>
-        <td valign="top">uri</td>
-        <td valign="top">
-          The uri that this definition should live in.
-        </td>
-        <td valign="top" align="center">No</td>
+        <td>uri</td>
+        <td>The URI that this definition should live in.</td>
+        <td>No</td>
       </tr>
     </table>
     <h3>Parameters specified as nested elements</h3>
     <h4>another type with attributes or elements set</h4>
-    <p>The <code>&lt;presetdef&gt;</code> task takes one nested element as a parameter.
-      This nested element can be any other type or task. The attributes
-      and elements that need to be preset are placed here.
-    </p>
-    
+    <p>The <code>&lt;presetdef&gt;</code> task takes one nested element as a parameter.  This nested
+      element can be any other type or task. The attributes and elements that need to be preset are
+      placed here.</p>
+
     <h3>Examples</h3>
-      The following fragment defines a javac task with the debug, deprecation
-      srcdir and destdir
-      attributes set. It also has a src element to source files from a generated
-      directory.
-    <blockquote>
-<pre class="code">
+    <p>The following fragment defines a <code>javac</code> task with
+      the <var>debug</var>, <var>deprecation</var>, <var>srcdir</var> and <var>destdir</var>
+      attributes set. It also has a <code>src</code> element to source files from a generated
+      directory.</p>
+    <pre>
 &lt;presetdef name="my.javac"&gt;
    &lt;javac debug="${debug}" deprecation="${deprecation}"
           srcdir="${src.dir}" destdir="${classes.dir}"&gt;
       &lt;src path="${gen.dir}"/&gt;
    &lt;/javac&gt;
-&lt;/presetdef&gt;
-</pre>
-    </blockquote>
-      This can be used as a normal javac task - example:
-    <blockquote>
-<pre class="code">
-&lt;my.javac/&gt;
-</pre>
-    </blockquote>
-      The attributes specified in the preset task may be overridden - i.e.
-      they may be seen as optional attributes - example:
-    <blockquote>
-<pre class="code">
-&lt;my.javac srcdir="${test.src}" deprecation="no"/&gt;
-</pre>
-    </blockquote>
-      One may put a presetdef definition in an antlib.
-      For example suppose the jar file antgoodies.jar has
-      the antlib.xml as follows:
-    <blockquote>
-<pre class="code">
+&lt;/presetdef&gt;</pre>
+    <p>This can be used as a normal <code>javac</code> task&mdash;for example:</p>
+    <pre>&lt;my.javac/&gt;</pre>
+    <p>The attributes specified in the preset task may be overridden&mdash;i.e.  they may be seen as
+      optional attributes&mdash;for example:</p>
+    <pre>&lt;my.javac srcdir="${test.src}" deprecation="no"/&gt;</pre>
+    <p>One may put a <code>presetdef</code> definition in an antlib.  For example suppose the jar
+      file <samp>antgoodies.jar</samp> has the <samp>antlib.xml</samp> as follows:</p>
+    <pre>
 &lt;antlib&gt;
    &lt;taskdef resource="com/acme/antgoodies/tasks.properties"/&gt;
    &lt;!-- Implement the common use of the javac command --&gt;
@@ -111,12 +82,9 @@
       &lt;javac deprecation="${deprecation}" debug="${debug}"
              srcdir="src" destdir="classes"/&gt;
    &lt;/presetdef&gt;
-&lt;/antlib&gt;
-</pre>
-    </blockquote>
-      One may then use this in a build file as follows:
-    <blockquote>
-<pre class="code">
+&lt;/antlib&gt;</pre>
+    <p>One may then use this in a build file as follows:</p>
+    <pre>
 &lt;project default="example" xmlns:antgoodies="antlib:com.acme.antgoodies"&gt;
    &lt;target name="example"&gt;
       &lt;!-- Compile source --&gt;
@@ -124,15 +92,9 @@
       &lt;!-- Compile test code --&gt;
       &lt;antgoodies:javac srcdir="src/test"/&gt;
    &lt;/target&gt;
-&lt;/project&gt;
-</pre>
-    </blockquote>
-    <p>
-      The following is an example of evaluation of properties when the
-      definition is used:
-    </p>
-     <blockquote>
-<pre class="code">
+&lt;/project&gt;</pre>
+    <p>The following is an example of evaluation of properties when the definition is used:</p>
+    <pre>
 &lt;target name="defineandcall"&gt;
    &lt;presetdef name="showmessage"&gt;
       &lt;echo&gt;message is '${message}'&lt;/echo&gt;
@@ -146,39 +108,26 @@
 &lt;/target&gt;
 &lt;target name="called"&gt;
    &lt;showmessage/&gt;
-&lt;/target&gt;
-</pre>
-     </blockquote>
-     <p>
-        The command ant defineandcall results in the output:
-     </p>
-     <blockquote>
-<pre class="code">
+&lt;/target&gt;</pre>
+    <p>The command <kbd>ant defineandcall</kbd> results in the output:</p>
+    <pre class="output">
 defineandcall:
 [showmessage] message is '${message}'
 [showmessage] message is 'Message 1'
 
 called:
-[showmessage] message is 'Message 2'
-</pre>
-     </blockquote>
-<p>
-It is possible to use a trick to evaluate properties when the definition is
-<em>made</em> rather than used. This can be useful if you do not expect some
-properties to be available in child builds run with
-<code>&lt;ant ... inheritall="false"&gt;</code>:
-</p>
-<blockquote><pre class="code">
+[showmessage] message is 'Message 2'</pre>
+    <p>It is possible to use a trick to evaluate properties when the definition is <em>made</em>
+      rather than used. This can be useful if you do not expect some properties to be available in
+      child builds run with <code>&lt;ant ... inheritall="false"&gt;</code>:</p>
+    <pre>
 &lt;macrodef name="showmessage-presetdef"&gt;
   &lt;attribute name="messageval"/&gt;
   &lt;presetdef name="showmessage"&gt;
     &lt;echo&gt;message is '@{messageval}'&lt;/echo&gt;
   &lt;/presetdef&gt;
 &lt;/macrodef&gt;
-&lt;showmessage-presetdef messageval="${message}"/&gt;
-</pre></blockquote>
-    <hr></hr>
-    
+&lt;showmessage-presetdef messageval="${message}"/&gt;</pre>
+
   </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/projecthelper.html ant-1.10.3/manual/Tasks/projecthelper.html
--- ant-1.9.10/manual/Tasks/projecthelper.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/projecthelper.html	2018-03-24 12:37:12.000000000 +0000
@@ -25,30 +25,28 @@
 <body>
 
 <h2>ProjectHelper</h2>
+<p><em>Since Ant 1.8.2</em></p>
 <h3>Description</h3>
-<p>This task is provided for the purpose of allowing the user to install a different
-ProjectHelper at runtime.
-</p>
-<p>The helpers will be added after all the already registered helpers, but before
-the default one (ProjectHelper2)
-</p>
-<p>See the description of Apache Ant's
-<a href="../projecthelper.html">Project Helper</a> for more information.
-</p>
-<p><b>Since Ant 1.8.2</b></p>
+<p>This task is provided for the purpose of allowing the user to install a different ProjectHelper
+at run time.</p>
+<p>The helpers will be added after all the already registered helpers, but before the default one
+(<code>ProjectHelper2</code>)</p>
+<p>See the description of Apache Ant's <a href="../projecthelper.html">Project Helper</a> for more
+information.</p>
 
 <h3>Parameters specified as nested elements</h3>
 
-You may specify many configured <code>org.apache.tools.ant.ProjectHelper</code> instances.
+<p>You may specify many configured <code class="code">org.apache.tools.ant.ProjectHelper</code>
+instances.</p>
 
 <h3>Example</h3>
 
-<p>Install a custom ProjectHelper implementation
-  (assuming <code>MyProjectHelper extends ProjectHelper</code>):</p>
+<p>Install a custom ProjectHelper implementation (assuming <code class="code">MyProjectHelper
+extends ProjectHelper</code>):</p>
 
 <pre>
 &lt;typedef classname="org.example.MyProjectHelper"
-              name="myprojecthelper"/>
+         name="myprojecthelper"/>
 &lt;projecthelper>
   &lt;myprojecthelper/>
 &lt;/projecthelper>
@@ -56,4 +54,3 @@
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/propertyfile.html ant-1.10.3/manual/Tasks/propertyfile.html
--- ant-1.9.10/manual/Tasks/propertyfile.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/propertyfile.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,143 +24,140 @@
 <body>
 
 <h1>PropertyFile</h1>
+<hr/>
+<h2 id="introduction">Introduction</h2>
+<p>Apache Ant provides an optional task for editing property files. This is very useful when wanting
+to make unattended modifications to configuration files for application servers and
+applications. Currently, the task maintains a working property file with the ability to add
+properties or make changes to existing ones. <em>Since Ant 1.8.0</em> comments and layout of the
+original properties file are preserved.</p>
+
+<p><em>Since Ant 1.8.2</em> the linefeed-style of the original file will be preserved as well, as
+long as style used to be consistent.  In general, linefeeds of the updated file will be the same as
+the first linefeed found when reading it.</p>
 
-<hr>
-<h2><a name="introduction">Introduction</a></h2>
-<p>Apache Ant provides an optional task for editing property files. This is
-very useful when wanting to make unattended modifications to
-configuration files for application servers and
-applications. Currently, the task maintains a working property file
-with the ability to add properties or make changes to existing
-ones. <em>Since Ant 1.8.0</em> comments and layout of the original properties
-file are preserved.</p>
-
-<p><em>Since Ant 1.8.2</em> the linefeed-style of the original file
-  will be preserved as well, as long as style used to be consistent.
-  In general, linefeeds of the updated file will be the same as the
-  first linefeed found when reading it.</p>
+<hr/>
 
-<hr>
-<h2><a name="proptask">PropertyFile Task</a></h2>
+<h2 id="proptask">PropertyFile Task</h2>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <th>Attribute</th>
+  <th>Description</th>
+  <th>Required</th>
 </tr>
 <tr>
-  <td width="12%" valign="top">file</td>
-  <td width="78%" valign="top">Location of the property file to be edited</td>
-  <td width="10%" valign="top">Yes</td>
+  <td>file</td>
+  <td>Location of the property file to be edited</td>
+  <td>Yes</td>
 </tr>
 <tr>
-  <td width="12%" valign="top">comment</td>
-  <td width="78%" valign="top">Header for the file itself</td>
-  <td width="10%" valign="top">no</td>
+  <td>comment</td>
+  <td>Header for the file itself</td>
+  <td>No</td>
 </tr>
 <tr>
-  <td width="12%" valign="top">jdkproperties</td>
-  <td width="78%" valign="top">Use java.lang.Properties, which will
-    loose comments and layout of file (default is 'false').  <em>since
+  <td>jdkproperties</td>
+  <td>Use <code>java.lang.Properties</code>, which will lose comments and layout of file.  <em>since
     Ant 1.8.0</em></td>
-  <td width="10%" valign="top">no</td>
+  <td>No; default is <q>false</q></td>
 </tr>
 </table>
 
-<p>The boolean attribute 'jdkproperties' is provided to recover the
-previous behaviour of the task, in which the layout and any comments
-in the properties file were lost by the task.</p>
+<p>The boolean attribute <var>jdkproperties</var> is provided to recover the previous behaviour of
+the task, in which the layout and any comments in the properties file were lost by the task.</p>
 
 <h3>Parameters specified as nested elements</h3>
-<h4><a name="entryElement">Entry</a></h4>
-<p>Use nested <code>&lt;entry&gt;</code>
-elements to specify actual modifications to the property file itself.</p>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">key</td>
-    <td valign="top">Name of the property name/value pair</td>
-    <td valign="top" align="center">Yes</td>
-  </tr>
-  <tr>
-    <td valign="top">value</td>
-    <td valign="top">Value to set (=), to add (+) or subtract (-)</td>
-    <td valign="top" align="center" rowspan="2">At least one must be specified, if <i>operation</i> is not <i>delete</i></td>
-  </tr>
-  <tr>
-    <td valign="top">default</td>
-    <td valign="top">Initial value to set for a property if it is not
-                     already defined in the property file.<br>
-                     For type date, an additional keyword is allowed: &quot;now&quot;</td>
-    </tr>
-  <tr>
-    <td valign="top">type</td>
-    <td valign="top">Regard the value as : int, date or string (default)</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">operation</td>
-    <td valign="top">One of the following operations:<br><br>
-    <b>for all datatypes:</b><ul>
-      <li>&quot;del&quot; : deletes an entry</li>
-      <li>&quot;+&quot; : adds a value to the existing value</li>
-      <li>&quot;=&quot; : sets a value instead of the existing value (default)</li>
-    </ul><br><b>for date and int only:</b><ul>
-      <li>&quot;-&quot; : subtracts a value from the existing value</li>
-    </ul>
+<h4 id="entryElement">Entry</h4>
+<p>Use nested <code>&lt;entry&gt;</code> elements to specify actual modifications to the property
+file itself.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>key</td>
+    <td>Name of the property name/value pair</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>value</td>
+    <td>Value to set (<q>=</q>), to add (<q>+</q>) or subtract (<q>-</q>)</td>
+    <td rowspan="2">At least one must be specified, if <var>operation</var> is not <q>del</q></td>
+  </tr>
+  <tr>
+    <td>default</td>
+    <td class="left">Initial value to set for a property if it is not already defined in the
+      property file.<br/>For type <var>date</var>, an additional keyword is
+      allowed: <q>now</q></td></tr>
+  <tr>
+    <td>type</td>
+    <td>Regard the value as: <q>int</q>, <q>date</q> or <q>string</q> (default)</td>
+    <td>No; defaults to <q>string</q></td>
+  </tr>
+  <tr>
+    <td>operation</td>
+    <td>One of the following operations:<br/>
+      <strong>for all datatypes:</strong>
+      <ul>
+        <li><q>del</q> : deletes an entry</li>
+        <li><q>+</q> : adds a value to the existing value</li>
+        <li><q>=</q> : sets a value instead of the existing value (default)</li>
+      </ul>
+      <strong>for <var>date</var> and <var>int</var> only:</strong>
+      <ul>
+        <li><q>-</q> : subtracts a value from the existing value</li>
+      </ul>
     </td>
-    <td valign="top" align="center">No</td>
+    <td>No; defaults to <q>=</q></td>
   </tr>
   <tr>
-    <td valign="top">pattern</td>
-    <td valign="top">For int and date type only. If present, Values will
-                     be parsed and formatted accordingly.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">unit</td>
-    <td valign="top">The unit of the value to be applied to date +/- operations.
-                     Valid Values are:
-                     <ul>
-                        <li>millisecond</li>
-                        <li>second</li>
-                        <li>minute</li>
-                        <li>hour</li>
-                        <li>day (default)</li>
-                        <li>week</li>
-                        <li>month</li>
-                        <li>year</li>
-                     </ul>
-                     This only applies to date types using a +/- operation.
+    <td>pattern</td>
+    <td>For <var>int</var> and <var>date</var> type only. If present, values will be parsed and
+      formatted accordingly.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>unit</td>
+    <td>The unit of the value to be applied to <var>date</var> <q>+</q>/<q>-</q> operations.  Valid
+      Values are:
+      <ul>
+        <li><q>millisecond</q></li>
+        <li><q>second</q></li>
+        <li><q>minute</q></li>
+        <li><q>hour</q></li>
+        <li><q>day</q> (default)</li>
+        <li><q>week</q></li>
+        <li><q>month</q></li>
+        <li><q>year</q></li>
+      </ul>
+      This only applies to <var>date</var> types using a <q>+</q>/<q>-</q> operation.
     </td>
-    <td align="center" valign="top">No</td>
+    <td>No; defaults to <q>day</q></td>
   </tr>
 </table>
-<p>The rules used when setting a property value are shown below.&nbsp; The
-operation occurs <b>after</b> these rules are considered.</p>
+<p>The rules used when setting a property value are shown below. The operation
+occurs <strong>after</strong> these rules are considered.</p>
 
 <ul>
-  <li>If only value is specified, the property is set to it regardless of its
-  previous value.</li>
-  <li>If only default is specified and the property previously existed in the
-  property file, it is unchanged.</li>
-  <li>If only default is specified and the property did not exist in the
-  property file, the property is set to default.</li>
-  <li>If value and default are both specified and the property previously
-  existed in the property file, the property is set to value.</li>
-  <li>If value and default are both specified and the property did not exist in
-  the property file, the property is set to default.</li>
+  <li>If only <var>value</var> is specified, the property is set to it regardless of its previous
+    value.</li>
+  <li>If only <var>default</var> is specified and the property previously existed in the property
+    file, it is unchanged.</li>
+  <li>If only <var>default</var> is specified and the property did not exist in the property file,
+    the property is set to <var>default</var>.</li>
+  <li>If <var>value</var> and <var>default</var> are both specified and the property previously
+    existed in the property file, the property is set to <var>value</var>.</li>
+  <li>If <var>value</var> and <var>default</var> are both specified and the property did not exist
+    in the property file, the property is set to <var>default</var>.</li>
 </ul>
-<p>&nbsp;</p>
 
 <h3>Examples</h3>
 
-<p>The following changes the my.properties file.  Assume my.properties look like:</p>
+<p>The following changes the <samp>my.properties</samp> file.  Assume <samp>my.properties</samp>
+looks like:</p>
 
 <pre># A string value
 akey=original value
@@ -169,8 +166,7 @@
 # each time the build is run.
 anint=1</pre>
 
-<p>After running, the file would now look like
-</p>
+<p>After running, the file would now look like</p>
 <pre>#My properties
 #Wed Aug 31 13:47:19 BST 2005
 # A string value
@@ -185,65 +181,55 @@
 formated.int=0014
 
 formated.date=243 13\:47</pre>
-<p>
-The slashes conform to the expectations of the Properties class.  The file will be stored in a manner so that each character is examined and escaped if necessary. 
-</p>
-
-<p>
-The layout and comment of the original file is preserved. New properties are added at the end of the file. Existing properties are overwritten in place.
-</p>
-
-<blockquote><pre>&lt;propertyfile
-    file=&quot;my.properties&quot;
-    comment=&quot;My properties&quot;&gt;
-  &lt;entry  key=&quot;akey&quot; value=&quot;avalue&quot;/&gt;
-  &lt;entry  key=&quot;adate&quot; type=&quot;date&quot; value=&quot;now&quot;/&gt;
-  &lt;entry  key=&quot;anint&quot; type=&quot;int&quot; default=&quot;0&quot; operation=&quot;+&quot;/&gt;
-  &lt;entry  key=&quot;formated.int&quot; type=&quot;int&quot; default=&quot;0013&quot; operation=&quot;+&quot; pattern=&quot;0000&quot;/&gt;
-  &lt;entry  key=&quot;formated.date&quot; type=&quot;date&quot; value=&quot;now&quot; pattern=&quot;DDD HH:mm&quot;/&gt;
-&lt;/propertyfile&gt;
-</pre></blockquote>
-<p>
-To produce dates relative from today :</p>
-<blockquote><pre>&lt;propertyfile
-    file=&quot;my.properties&quot;
-    comment=&quot;My properties&quot;&gt;
-  &lt;entry  key=&quot;formated.date-1&quot;
-      type=&quot;date&quot; default=&quot;now&quot; pattern=&quot;DDD&quot;
-      operation=&quot;-&quot; value=&quot;1&quot;/&gt;
-  &lt;entry  key=&quot;formated.tomorrow&quot;
-      type=&quot;date&quot; default=&quot;now&quot; pattern=&quot;DDD&quot;
-      operation=&quot;+&quot; value=&quot;1&quot;/&gt;
-&lt;/propertyfile&gt;
-</pre></blockquote>
-
-<p>
-Concatenation of strings :</p>
-<blockquote><pre>&lt;propertyfile
-    file=&quot;my.properties&quot;
-    comment=&quot;My properties&quot;&gt;
-  &lt;entry  key=&quot;progress&quot; default=&quot;&quot; operation=&quot;+&quot; value=&quot;.&quot;/&gt;
-&lt;/propertyfile&gt;
-</pre></blockquote>
-<p>Each time called, a &quot;.&quot; will be appended to &quot;progress&quot;
-</p>
-
-<p>Pumps the project version to the next minor version (increase minor and set path=0):
-<blockquote><pre>&lt;target name="nextMinorVersion"&gt;
-   &lt;property
-     name="header"
-     value="##Generated file - do not modify!"/&gt;
-   &lt;propertyfile file="version.properties" comment="${header}"&gt;
-     &lt;entry key="product.build.major"   type="int"  value="3" /&gt;
-     &lt;entry key="product.build.minor"   type="int"  operation="+" /&gt;
-     &lt;entry key="product.build.patch"   type="int"  value="0" /&gt;
-     &lt;entry key="product.build.date"    type="date" value="now" /&gt;
-  &lt;/propertyfile&gt;
-&lt;/target&gt;
-</pre></blockquote>
-After running this target the version changed e.g. from 3.2.2 to 3.3.0.
-</p>
+<p>The slashes conform to the expectations of the Properties class.  The file will be stored in a
+manner so that each character is examined and escaped if necessary.</p>
 
+<p>The layout and comment of the original file is preserved. New properties are added at the end of
+the file. Existing properties are overwritten in place.</p>
+
+<pre>
+&lt;propertyfile file=&quot;my.properties&quot;
+              comment=&quot;My properties&quot;&gt;
+    &lt;entry key=&quot;akey&quot; value=&quot;avalue&quot;/&gt;
+    &lt;entry key=&quot;adate&quot; type=&quot;date&quot; value=&quot;now&quot;/&gt;
+    &lt;entry key=&quot;anint&quot; type=&quot;int&quot; default=&quot;0&quot; operation=&quot;+&quot;/&gt;
+    &lt;entry key=&quot;formated.int&quot; type=&quot;int&quot; default=&quot;0013&quot; operation=&quot;+&quot; pattern=&quot;0000&quot;/&gt;
+    &lt;entry key=&quot;formated.date&quot; type=&quot;date&quot; value=&quot;now&quot; pattern=&quot;DDD HH:mm&quot;/&gt;
+&lt;/propertyfile&gt;</pre>
+<p>To produce dates relative from today:</p>
+<pre>
+&lt;propertyfile file=&quot;my.properties&quot;
+              comment=&quot;My properties&quot;&gt;
+    &lt;entry key=&quot;formated.date-1&quot;
+           type=&quot;date&quot; default=&quot;now&quot; pattern=&quot;DDD&quot;
+           operation=&quot;-&quot; value=&quot;1&quot;/&gt;
+    &lt;entry key=&quot;formated.tomorrow&quot;
+           type=&quot;date&quot; default=&quot;now&quot; pattern=&quot;DDD&quot;
+           operation=&quot;+&quot; value=&quot;1&quot;/&gt;
+&lt;/propertyfile&gt;</pre>
+
+<p>Concatenation of strings:</p>
+<pre>
+&lt;propertyfile file=&quot;my.properties&quot;
+              comment=&quot;My properties&quot;&gt;
+    &lt;entrykey=&quot;progress&quot; default=&quot;&quot; operation=&quot;+&quot; value=&quot;.&quot;/&gt;
+&lt;/propertyfile&gt;</pre>
+<p>Each time called, a <q>.</q> will be appended to <code>progress</code></p>
+
+<p>Pumps the project version to the next minor version (increase minor and
+set <code>patch=0</code>):</p>
+<pre>
+&lt;target name="nextMinorVersion"&gt;
+    &lt;property name="header"
+              value="##Generated file - do not modify!"/&gt;
+    &lt;propertyfile file="version.properties" comment="${header}"&gt;
+        &lt;entry key="product.build.major" type="int"  value="3"/&gt;
+        &lt;entry key="product.build.minor" type="int"  operation="+"/&gt;
+        &lt;entry key="product.build.patch" type="int"  value="0"/&gt;
+        &lt;entry key="product.build.date"  type="date" value="now"/&gt;
+    &lt;/propertyfile&gt;
+&lt;/target&gt;</pre>
+<p>After running this target the version changed e.g. from 3.2.2 to 3.3.0.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/propertyhelper.html ant-1.10.3/manual/Tasks/propertyhelper.html
--- ant-1.9.10/manual/Tasks/propertyhelper.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/propertyhelper.html	2018-03-24 12:37:12.000000000 +0000
@@ -25,49 +25,52 @@
 <body>
 
 <h2>PropertyHelper</h2>
+<p><em>Since Ant 1.8.0</em></p>
 <h3>Description</h3>
-<p>This task is provided for the purpose of allowing the user to
-<b>(a)</b> install a different PropertyHelper at runtime, or
-<b>(b)</b> (hopefully more often) install one or more PropertyHelper Delegates into the
-PropertyHelper active on the current Project. This is somewhat advanced Apache Ant usage and
-assumes a working familiarity with the modern Ant APIs. See the description of Ant's
-<a href="../properties.html#propertyHelper">Property Helper</a> for more information.
-<b>Since Ant 1.8.0</b></p>
+<p>This task is provided for the purpose of allowing the user to <strong>(a)</strong> install a
+different <code>PropertyHelper</code> at run time, or <strong>(b)</strong> (hopefully more often)
+install one or more <code class="code">PropertyHelper</code> Delegates into
+the <code class="code">PropertyHelper</code> active on the
+current <code class="code">Project</code>. This is somewhat advanced Apache Ant usage and assumes a
+working familiarity with the modern Ant APIs. See the description of
+Ant's <a href="../properties.html#propertyHelper">Property Helper</a> for more information.</p>
 
 <h3>Parameters specified as nested elements</h3>
 
 <h4>PropertyHelper</h4>
-You may specify exactly one configured <code>org.apache.tools.ant.PropertyHelper</code> instance.
+<p>You may specify exactly one configured <code>org.apache.tools.ant.PropertyHelper</code>
+instance.</p>
 
 <h4>PropertyHelper.Delegate</h4>
-You may specify, either in conjunction with a new <code>PropertyHelper</code> or not, one or
-more configured implementations of the <code>org.apache.tools.ant.PropertyHelper.Delegate</code>
-interface. A deeper understanding of the API is required here, however, as <code>Delegate</code>
-is a marker interface only: the nested arguments must implement a <code>Delegate</code>
-subinterface in order to do anything meaningful.
+<p>You may specify, either in conjunction with a new <code class="code">PropertyHelper</code> or
+not, one or more configured implementations of
+the <code class="code">org.apache.tools.ant.PropertyHelper.Delegate</code> interface. A deeper
+understanding of the API is required here, however, as <code class="code">Delegate</code> is a
+marker interface only: the nested arguments must implement a <code class="code">Delegate</code>
+subinterface in order to do anything meaningful.</p>
 
 <h4>delegate</h4>
-<p>A generic &lt;delegate&gt; element which can use project references
-is also provided:</p>
+<p>A generic <code>&lt;delegate&gt;</code> element which can use project references is also
+provided:</p>
 
 <h5>Parameters</h5>
-<table border="1" cellpadding="2" cellspacing="0"> 
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">refid</td>
-    <td valign="top">The <i>id</i> of a <code>PropertyHelper.Delegate</code> to install.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>refid</td>
+    <td>The <var>id</var> of a <code>PropertyHelper.Delegate</code> to install.</td>
+    <td>Yes</td>
   </tr>
 </table>
 
 <h3>Examples</h3>
 
-<p>Install a completely different PropertyHelper implementation
-  (assuming <code>MyPropertyHelper extends PropertyHelper</code>):</p>
+<p>Install a completely different <code class="code">PropertyHelper</code> implementation
+(assuming <code class="code">MyPropertyHelper extends PropertyHelper</code>):</p>
 
 <pre>
 &lt;componentdef classname="org.example.MyPropertyHelper"
@@ -77,12 +80,11 @@
 &lt;/propertyhelper>
 </pre>
 
-<p>Add a new PropertyEvaluator delegate
-  (assuming <code>MyPropertyEvaluator implements
-  PropertyHelper.PropertyEvaluator</code>).  Note that PropertyHelper
-  uses the configured delegates in LIFO order.  I.e. the delegate
-  added by this task will be consulted before any previously defined
-  delegate and in particular before the built-in ones.</p>
+<p>Add a new <code class="code">PropertyEvaluator</code> delegate
+(assuming <code class="code">MyPropertyEvaluator implements
+PropertyHelper.PropertyEvaluator</code>).  Note that <code class="code">PropertyHelper</code> uses
+the configured delegates in LIFO order.  I.e. the delegate added by this task will be consulted
+before any previously defined delegate and in particular before the built-in ones.</p>
 
 <pre>
 &lt;componentdef classname="org.example.MyPropertyEvaluator"
@@ -92,7 +94,8 @@
 &lt;/propertyhelper>
 </pre>
 
-<p>Add a new PropertyEvaluator delegate using the refid syntax:</p>
+<p>Add a new <code class="code">PropertyEvaluator</code> delegate using the <var>refid</var>
+syntax:</p>
 
 <pre>
 &lt;typedef classname="org.example.MyPropertyEvaluator"
@@ -105,4 +108,3 @@
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/property.html ant-1.10.3/manual/Tasks/property.html
--- ant-1.9.10/manual/Tasks/property.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/property.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,322 +24,292 @@
 
 <body>
 
-<h2><a name="property">Property</a></h2>
+<h2 id="property">Property</h2>
 <h3>Description</h3>
-<p>Sets a <a href="../using.html#properties">property</a>
-(by name and value), or set of properties (from file or
-resource) in the project.  Properties are case sensitive.</p>
- Properties are immutable: whoever sets a property first freezes it for the
- rest of the build; they are most definitely not variables.
+<p>Sets a <a href="../using.html#properties">property</a> (by name and value), or set of properties
+(from file or resource) in the project.  Properties are case sensitive.</p>
+<p>Properties are immutable: whoever sets a property first freezes it for the rest of the build;
+they are most definitely not variables.</p>
 <p>There are seven ways to set properties:</p>
 <ul>
-  <li>By supplying both the <i>name</i> and one of <i>value</i> or <i>location</i> attribute.</li>
-  <li>By supplying the <i>name</i> and nested text.</li>
-  <li>By supplying both the <i>name</i> and <i>refid</i> attribute.</li>
-  <li>By setting the <i>file</i> attribute with the filename of the property
-    file to load. This property file has the format as defined by the file used
-    in the class java.util.Properties, with the same rules about how
-    non-ISO8859-1 characters must be escaped.</li>
-  <li>By setting the <i>url</i> attribute with the url from which to load the
-    properties. This url must be directed to a file that has the format as defined
-    by the file used in the class java.util.Properties.</li>
-  <li>By setting the <i>resource</i> attribute with the resource name of the
-    property file to load. A resource is a property file on the current
-    classpath, or on the specified classpath.</li>
-  <li>By setting the <i>environment</i> attribute with a prefix to use.
-    Properties will be defined for every environment variable by
-    prefixing the supplied name and a period to the name of the variable.</li>
+  <li>By supplying both the <var>name</var> and one of <var>value</var> or <var>location</var>
+    attributes.</li>
+  <li>By supplying the <var>name</var> and nested text.</li>
+  <li>By supplying both the <var>name</var> and <var>refid</var> attributes.</li>
+  <li>By setting the <var>file</var> attribute with the filename of the property file to load. This
+    property file has the format as defined by the file used in the
+    class <code class="code">java.util.Properties</code>, with the same rules about how
+    non-ISO-8859-1 characters must be escaped.</li>
+  <li>By setting the <var>url</var> attribute with the URL from which to load the properties. This
+    URL must be directed to a file that has the format as defined by the file used in the
+    class <code class="code">java.util.Properties</code>.</li>
+  <li>By setting the <var>resource</var> attribute with the resource name of the property file to
+    load. A resource is a property file on the current classpath, or on the specified
+    classpath.</li>
+  <li>By setting the <var>environment</var> attribute with a prefix to use.  Properties will be
+    defined for every environment variable by prefixing the supplied name and a period to the name
+    of the variable.</li>
 </ul>
-<p>Although combinations of these ways are possible, only one should be used
-at a time. Problems might occur with the order in which properties are set, for
-instance.</p>
-<p>The value part of the properties being set, might contain references to other
-properties. These references are resolved at the time these properties are set.
-This also holds for properties loaded from a property file.</p>
-<p>A list of predefined properties can be found <a
-href="../properties.html#built-in-props">here</a>.</p>
-<p>Since Apache Ant 1.8.0 it is possible to load properties defined in xml
-according to <a href="http://java.sun.com/dtd/properties.dtd">Suns DTD</a>,
-if Java5+ is present. For this the name of the file, resource or url has 
-to end with <tt>.xml</tt>.</p>
+<p>Although combinations of these ways are possible, only one should be used at a time. Problems
+might occur with the order in which properties are set, for instance.</p>
+<p>The value part of the properties being set might contain references to other properties. These
+references are resolved at the time these properties are set.  This also holds for properties loaded
+from a property file.</p>
+<p>A list of predefined properties can be
+found <a href="../properties.html#built-in-props">here</a>.</p>
+<p><em>Since Apache Ant 1.8.0</em>, it is possible to load properties defined in XML according
+to <a href="http://java.sun.com/dtd/properties.dtd" target="_top">Sun DTD</a>, when running on Java
+5+. For this the name of the file, resource or url has to end with <samp>.xml</samp>.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">the name of the property to set.</td>
-    <td valign="top" align="center">No</td>
+    <td>name</td>
+    <td>the name of the property to set.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">the value of the property.</td>
-    <td valign="middle" align="center" rowspan="3">One of these or
-       nested text, when using the name attribute</td>
+    <td>value</td>
+    <td>the value of the property.</td>
+    <td rowspan="3">One of these or nested text, when the <var>name</var> attribute is set</td>
   </tr>
   <tr>
-    <td valign="top">location</td>
-    <td valign="top">Sets the property to the absolute filename of the
-      given file. If the value of this attribute is an absolute path, it
-      is left unchanged (with / and \ characters converted to the
-      current platforms conventions). Otherwise it is taken as a path
-      relative to the project's basedir and expanded.</td>
+    <td>location</td>
+    <td class="left">Sets the property to the absolute filename of the given file. If the value of
+      this attribute is an absolute path, it is left unchanged (with <q>/</q> and <q>\</q>
+      characters converted to the current platforms conventions). Otherwise it is taken as a path
+      relative to the project's <var>basedir</var> and expanded.</td>
   </tr>
   <tr>
-    <td valign="top">refid</td>
-    <td valign="top"><a href="../using.html#references">Reference</a> to an object
-      defined elsewhere. Only yields reasonable results for references
-      to <a href="../using.html#path">PATH like structures</a> or properties.</td>
+    <td>refid</td>
+    <td class="left"><a href="../using.html#references">Reference</a> to an object defined
+      elsewhere. Only yields reasonable results for references
+      to <a href="../using.html#path">path-like structures</a> or properties.</td>
   </tr>
   <tr>
-    <td valign="top">resource</td>
-    <td valign="top"> the name of the classpath resource containing
-      properties settings in properties file format.</td>
-    <td valign="middle" align="center" rowspan="4">One of these, when
-      <b>not</b> using the name attribute</td>
+    <td>resource</td>
+    <td>the name of the classpath resource containing properties settings in properties file
+      format.</td>
+    <td rowspan="4">One of these, <strong>unless</strong> the <var>name</var> attribute is set</td>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">the location of the properties file to load.</td>
+    <td>file</td>
+    <td class="left">the location of the properties file to load.</td>
   </tr>
   <tr>
-    <td valign="top">url</td>
-    <td valign="top">a url containing properties-format settings.</td>
+    <td>url</td>
+    <td class="left">a URL containing properties-format settings.</td>
   </tr>
   <tr>
-    <td valign="top">environment</td>
-    <td valign="top">the prefix to use when retrieving environment variables. Thus
-    if you specify environment=&quot;myenv&quot; you will be able to access OS-specific
-    environment variables via property names &quot;myenv.PATH&quot; or
-    &quot;myenv.TERM&quot;. Note that if you supply a property name with a final
-    &quot;.&quot; it will not be doubled; i.e. environment=&quot;myenv.&quot; will still
-    allow access of environment variables through &quot;myenv.PATH&quot; and
-    &quot;myenv.TERM&quot;. This functionality is currently only implemented
-    on <a href="#notes-env">select platforms</a>. Feel free to send patches to increase the
-    number of platforms on which this functionality is supported ;).<br>
-    Note also that properties are case-sensitive, even if the
-    environment variables on your operating system are not; e.g. Windows 2000's
-    system path variable is set to an Ant property named "env.Path"
-    rather than "env.PATH".</td>
+    <td>environment</td>
+    <td class="left">the prefix to use when retrieving environment variables. Thus if you
+      specify <var>environment</var>=<q>myenv</q> you will be able to access OS-specific environment
+      variables via property names <code>myenv.PATH</code> or <code>myenv.TERM</code>. Note that if
+      you supply a property <var>name</var> with a final <q>.</q> it will not be doubled;
+      i.e. <var>environment</var>=<q>myenv.</q> will still allow access of environment variables
+      through <code>myenv.PATH</code> and <code>myenv.TERM</code>. This functionality is currently
+      only implemented on <a href="#notes-env">select platforms</a>. Feel free to send patches to
+      increase the number of platforms on which this functionality is supported ;-).<br/>Note also
+      that properties are case-sensitive, even if the environment variables on your operating system
+      are not; e.g. Windows 2000 or later system path variable is set to an Ant property
+      named <code>env.Path</code> rather than <code>env.PATH</code>.</td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">the classpath to use when looking up a resource.</td>
-    <td align="center" valign="top">No</td>
+    <td>classpath</td>
+    <td>the classpath to use when looking up a resource.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">the classpath to use when looking up a resource,
-      given as <a href="../using.html#references">reference</a> to a <code>&lt;path&gt;</code> defined
+    <td>classpathref</td>
+    <td>the classpath to use when looking up a resource, given
+      as <a href="../using.html#references">reference</a> to a <code>&lt;path&gt;</code> defined
       elsewhere..</td>
-    <td align="center" valign="top">No</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">prefix</td>
-    <td valign="top">Prefix to apply to properties loaded using <code>file</code>,
-    <code>resource</code>, or <code>url</code>.
-      A "." is appended to the prefix if not specified.</td>
-    <td align="center" valign="top">No</td>
+    <td>prefix</td>
+    <td>Prefix to apply to properties loaded using <var>file</var>, <var>resource</var>,
+      or <var>url</var>.  A <q>.</q> is appended to the prefix if not specified.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">prefixValues</td>
-    <td valign="top">Whether to apply the prefix when expanding the
-      right hand side of properties loaded using <code>file</code>,
-      <code>resource</code>, or <code>url</code>.
-      <em>Since Ant 1.8.2</em></td>
-    <td align="center" valign="top">No (default=<tt>false</tt>)</td>
+    <td>prefixValues</td>
+    <td>Whether to apply the prefix when expanding the right hand side of properties loaded
+      using <var>file</var>, <var>resource</var>, or <var>url</var>.  <em>Since Ant 1.8.2</em></td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">relative</td>
-    <td valign="top">If set to <tt>true</tt> the relative path
-      to <tt>basedir</tt> is set.  <em>Since Ant 1.8.0</em></td>
-    <td align="center" valign="top">No (default=<tt>false</tt>)</td>
+    <td>relative</td>
+    <td>If set to <q>true</q> the relative path to <var>basedir</var> is set.  <em>Since Ant
+      1.8.0</em></td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">basedir</td>
-    <td valign="top">The basedir to calculate the relative path
-      from.  <em>Since Ant 1.8.0</em></td>
-    <td align="center" valign="top">No (default=<tt>${basedir}</tt>)</td>
+    <td>basedir</td>
+    <td>The <var>basedir</var> to calculate the relative path from.  <em>Since Ant 1.8.0</em></td>
+    <td>No; default is project's <var>basedir</var></td>
   </tr>
 </table>
 
 <h4>OpenVMS Users</h4>
-<p>With the <code>environment</code> attribute this task will load all defined
-logicals on an OpenVMS system.  Logicals with multiple equivalence names get
-mapped to a property whose value is a comma separated list of all equivalence
-names.  If a logical is defined in multiple tables, only the most local
-definition is available (the table priority order being PROCESS, JOB, GROUP,
-SYSTEM).
-</p>
+<p>With the <var>environment</var> attribute this task will load all defined logicals on an OpenVMS
+system.  Logicals with multiple equivalence names get mapped to a property whose value is a comma
+separated list of all equivalence names.  If a logical is defined in multiple tables, only the most
+local definition is available (the table priority order being PROCESS, JOB, GROUP, SYSTEM).</p>
 
 <h4>Any OS except OpenVMS</h4>
-<p>Starting with Ant 1.8.2 if Ant detects it is running of a Java 1.5
-  VM (or better) Ant will use <code>System.getenv</code> rather than
-  its own OS dependent native implementation.  For some OSes this
-  causes minor differences when compared to older versions of Ant.
-  For a full list
-  see <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=49366">Bugzilla
-  Issue 49366</a>.  In particular:</p>
+<p><em>Since Ant 1.8.2</em>, if Ant detects it is running on a Java 5 or newer, Ant will
+use <code class="code">System.getenv()</code> rather than its own OS dependent native
+implementation.  For some OSes this causes minor differences when compared to older versions of Ant.
+For a full list see <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=49366"
+target="_top">Bugzilla Issue 49366</a>.  In particular:</p>
 <ul>
-  <li>On Windows Ant will now return additional "environment
-    variables" that correspond to the drive specific current working
-    directories when Ant is run from the command line.  The keys of
+  <li>On Windows, Ant will now return additional "environment variables" that correspond to the
+    drive specific current working directories when Ant is run from the command line.  The keys of
     these variables starts with an equals sign.</li>
-  <li>Some users reported that some Cygwin specific variables (in
-    particular PROMPT) was no longer present.</li>
-  <li>On OS/2 Ant no longer returns the BEGINLIBPATH variable.</li>
+  <li>Some users reported that some Cygwin specific variables (in particular <code>PROMPT</code>)
+    were no longer present.</li>
+  <li>On OS/2, Ant no longer returns the <code>BEGINLIBPATH</code> variable.</li>
 </ul>
 
 <h3>Parameters specified as nested elements</h3>
 <h4>classpath</h4>
-<p><code>Property</code>'s <i>classpath</i> attribute is a <a
-href="../using.html#path">PATH like structure</a> and can also be set via a nested
-<i>classpath</i> element.</p>
+<p><code>Property</code>'s <var>classpath</var> attribute is
+a <a href="../using.html#path">path-like structure</a> and can also be set via a
+nested <code>classpath</code> element.</p>
 
 <h3>Examples</h3>
-<pre>  &lt;property name=&quot;foo.dist&quot; value=&quot;dist&quot;/&gt;</pre>
-<p>sets the property <code>foo.dist</code> to the value &quot;dist&quot;.</p>
+<pre>&lt;property name=&quot;foo.dist&quot; value=&quot;dist&quot;/&gt;</pre>
+<p>sets the property <code>foo.dist</code> to the value <q>dist</q>.</p>
 
-<pre>  &lt;property name=&quot;foo.dist&quot;&gt;dist&lt;/property&gt;</pre>
-<p>sets the property <code>foo.dist</code> to the value &quot;dist&quot;.</p>
+<pre>&lt;property name=&quot;foo.dist&quot;&gt;dist&lt;/property&gt;</pre>
+<p>sets the property <code>foo.dist</code> to the value <q>dist</q>.</p>
 
-<pre>  &lt;property file=&quot;foo.properties&quot;/&gt;</pre>
-<p>reads a set of properties from a file called &quot;foo.properties&quot;.</p>
+<pre>&lt;property file=&quot;foo.properties&quot;/&gt;</pre>
+<p>reads a set of properties from a file called <samp>foo.properties</samp>.</p>
 
-<pre>  &lt;property url=&quot;http://www.mysite.com/bla/props/foo.properties&quot;/&gt;</pre>
-<p>reads a set of properties from the address &quot;http://www.mysite.com/bla/props/foo.properties&quot;.</p>
-
-<pre>  &lt;property resource=&quot;foo.properties&quot;/&gt;</pre>
-<p>reads a set of properties from a resource called &quot;foo.properties&quot;.</p>
-<p>Note that you can reference a global properties file for all of your Ant
-builds using the following:</p>
-
-<pre>  &lt;property file=&quot;${user.home}/.ant-global.properties&quot;/&gt;</pre>
-<p>since the &quot;user.home&quot; property is defined by the Java virtual machine
-to be your home directory.  Where the &quot;user.home&quot; property resolves to in
-the file system depends on the operating system version and the JVM implementation.
-On Unix based systems, this will map to the user's home directory. On modern Windows
-variants, this will most likely resolve to the user's directory in the &quot;Documents
-and Settings&quot; or &quot;Users&quot; folder. Older windows variants such as Windows 98/ME are less
-predictable, as are other operating system/JVM combinations.</p>
+<pre>&lt;property url=&quot;http://www.mysite.com/bla/props/foo.properties&quot;/&gt;</pre>
+<p>reads a set of properties from the
+address <samp>http://www.mysite.com/bla/props/foo.properties</samp>.</p>
+
+<pre>&lt;property resource=&quot;foo.properties&quot;/&gt;</pre>
+<p>reads a set of properties from a resource called <samp>foo.properties</samp>.</p>
+<p>Note that you can reference a global properties file for all of your Ant builds using the
+following:</p>
+
+<pre>&lt;property file=&quot;${user.home}/.ant-global.properties&quot;/&gt;</pre>
+<p>since the <code>user.home</code> property is defined by JVM to be your home directory.  Where
+the <code>user.home</code> property resolves to in the file system depends on the operating system
+version and the JVM implementation.  On Unix based systems, this will map to the user's home
+directory. On modern Windows variants, this will most likely resolve to the user's directory in
+the <samp>Documents and Settings</samp> or <samp>Users</samp> folder. Older Windows variants such as
+Windows 98/ME are less predictable, as are other operating system/JVM combinations.</p>
 
 <pre>
-  &lt;property environment=&quot;env&quot;/&gt;
-  &lt;echo message=&quot;Number of Processors = ${env.NUMBER_OF_PROCESSORS}&quot;/&gt;
-  &lt;echo message=&quot;ANT_HOME is set to = ${env.ANT_HOME}&quot;/&gt;
-</pre>
-<p>reads the system environment variables and stores them in properties, prefixed with &quot;env&quot;.
-Note that this only works on <em>select</em> operating systems.
-Two of the values are shown being echoed.
+&lt;property environment=&quot;env&quot;/&gt;
+&lt;echo message=&quot;Number of Processors = ${env.NUMBER_OF_PROCESSORS}&quot;/&gt;
+&lt;echo message=&quot;ANT_HOME is set to = ${env.ANT_HOME}&quot;/&gt;</pre>
+<p>reads the system environment variables and stores them in properties, prefixed with <q>env</q>.
+Note that this only works on <em>select</em> operating systems.  Two of the values are shown being
+echoed.
 </p>
 
 <pre>
-  &lt;property environment=&quot;env&quot;/&gt;
-  &lt;property file=&quot;${user.name}.properties&quot;/&gt;
-  &lt;property file=&quot;${env.STAGE}.properties&quot;/&gt;
-  &lt;property file=&quot;build.properties&quot;/&gt;
-</pre>
-<p>This buildfile uses the properties defined in <tt>build.properties</tt>. Regarding to the
-environment variable <tt>STAGE</tt> some or all values could be overwritten, e.g. having
-<tt>STAGE=test</tt> and a <tt>test.properties</tt> you have special values for that (like another
-name for the test server). Finally all these values could be overwritten by personal settings with
-a file per user.</p>
-
-<pre>
-  &lt;property name=&quot;foo&quot; location=&quot;my/file.txt&quot; relative=&quot;true&quot; basedir=&quot;..&quot;/&gt;
-</pre>
-<p>Stores the relative path in <tt>foo</tt>: projectbasedir/my/file.txt</p>
-
-<pre>
-  &lt;property name=&quot;foo&quot; location=&quot;my/file.txt&quot; relative=&quot;true&quot; basedir=&quot;cvs&quot;/&gt;
-</pre>
-<p>Stores the relative path in <tt>foo</tt>: ../my/file.txt</p>
+&lt;property environment=&quot;env&quot;/&gt;
+&lt;property file=&quot;${user.name}.properties&quot;/&gt;
+&lt;property file=&quot;${env.STAGE}.properties&quot;/&gt;
+&lt;property file=&quot;build.properties&quot;/&gt;</pre>
+<p>This buildfile uses the properties defined in <samp>build.properties</samp>. Regarding to the
+environment variable <code>STAGE</code> some or all values could be overwritten,
+e.g. having <code>STAGE=test</code> and a <samp>test.properties</samp> you have special values for
+that (like another name for the test server). Finally all these values could be overwritten by
+personal settings with a file per user.</p>
+
+<pre>&lt;property name=&quot;foo&quot; location=&quot;my/file.txt&quot; relative=&quot;true&quot; basedir=&quot;..&quot;/&gt;</pre>
+<p>Stores the relative path in <code>foo</code>: <samp>../my/file.txt</samp></p>
 
+<pre>&lt;property name=&quot;foo&quot; location=&quot;my/file.txt&quot; relative=&quot;true&quot; basedir=&quot;cvs&quot;/&gt;</pre>
+<p>Stores the relative path in <code>foo</code>: <samp>cvs/my/file.txt</samp></p>
 
-<h3>Property Files</h3>
+<h3>Property files</h3>
 
-As stated, this task will load in a properties file stored in the file
-system, or as a resource on a classpath. Here are some interesting facts
-about this feature
+<p>As stated, this task will load in a properties file stored in the file system, or as a resource
+on a classpath. Here are some interesting facts about this feature</p>
 <ol>
-<li>If the file is not there, nothing is printed except at -verbose log
-level. This lets you have optional configuration files for every
-project, that team members can customize.
-<li>The rules for this format match <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Properties.html#load%28java.io.InputStream%29">java.util.Properties</a>.</li>
-<li>Trailing spaces are not stripped. It may have been what you wanted.</li>
-<li>Want unusual characters? Escape them \u0456 or \&quot; style.</li>
-<li>Ant Properties are expanded in the file</li>
-<li>If you want to expand properties defined inside the same file and
-  you use the prefix attribute of the task, you must use the same
-  prefix when expanding the properties or
-  set <code>prefixValues</code> to true.</li>
+  <li>If the file is not there, nothing is printed except at <kbd>-verbose</kbd> log level. This
+    lets you have optional configuration files for every project, that team members can customize.
+  <li>The rules for this format
+    match <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html#load-java.io.InputStream-"
+    target="_top">java.util.Properties</a>.</li>
+  <li>Trailing spaces are not stripped. It may have been what you wanted.</li>
+  <li>Want unusual characters? Escape them <code>\u0456</code> or <code>\&quot;</code> style.</li>
+  <li>Ant Properties are expanded in the file</li>
+  <li>If you want to expand properties defined inside the same file and you use
+    the <var>prefix</var> attribute of the task, you must use the same prefix when expanding the
+    properties or set <var>prefixValues</var> to <q>true</q>.</li>
 </ol>
-In-file property expansion is very cool. Learn to use it.
-<p>
-Example:
+<p>In-file property expansion is very cool. Learn to use it.</p>
+<p>Example:</p>
 <pre>
 build.compiler=jikes
 deploy.server=lucky
 deploy.port=8080
-deploy.url=http://${deploy.server}:${deploy.port}/
-</pre>
-
+deploy.url=http://${deploy.server}:${deploy.port}/</pre>
 
-<a name="notes-env"></a>
-<h3>Notes about environment variables</h3>
-<p>
-  Ant runs on Java 1.2 therefore it cannot use Java5 features for accessing environment
-  variables. So it starts a command in a new process which prints the environment variables,
-  analyzes the output and creates the properties. <br>
-  There are commands for the following operating systems implemented in
-  <a href="https://git-wip-us.apache.org/repos/asf?p=ant.git;a=blob;f=src/main/org/apache/tools/ant/taskdefs/Execute.java;hb=24e5a0e881dba01a6f012c4a271b743946412a0d">
-  Execute.java</a> (method <tt>getProcEnvCommand()</tt>):
+<h3 id="notes-env">Notes about environment variables</h3>
+<p>Ant runs on Java 1.2 therefore it cannot use Java 5 features for accessing environment
+variables. So it starts a command in a new process which prints the environment variables, analyzes
+the output and creates the properties.<br/>  There are commands for the following operating systems
+implemented
+in <a href="https://git-wip-us.apache.org/repos/asf?p=ant.git;a=blob;f=src/main/org/apache/tools/ant/taskdefs/Execute.java;hb=refs/heads/master"
+target="_top">Execute.java</a> (method <code class="code">getProcEnvCommand()</code>):
+</p>
   <table>
     <tr>
       <th>OS</th>
       <th>command</th>
     </tr>
     <tr>
-      <td> os/2 </td>
-      <td> cmd /c set </td>
+      <td>os/2</td>
+      <td><code>cmd /c set</code></td>
     </tr>
     <tr>
-      <td colspan="2"> windows </td>
+      <td colspan="2">windows</td>
     </tr>
     <tr>
-      <td> * win9x </td>
-      <td> command.com /c set </td>
+      <td>* win9x</td>
+      <td><code>command.com /c set</code></td>
     </tr>
     <tr>
-      <td> * other </td>
-      <td> cmd /c set </td>
+      <td>* other</td>
+      <td><code>cmd /c set</code></td>
     </tr>
     <tr>
-      <td> z/os </td>
-      <td> /bin/env <b>OR</b> /usr/bin/env <b>OR</b> env   <i>(depending on read rights)</i> </td>
+      <td>z/os</td>
+      <td><code>/bin/env</code> <strong>OR</strong> <code>/usr/bin/env</code> <strong>OR</strong> <code>env</code> (<em>depending on read rights</em>)</td>
     </tr>
     <tr>
-      <td> unix </td>
-      <td> /bin/env <b>OR</b> /usr/bin/env <b>OR</b> env   <i>(depending on read rights)</i> </td>
+      <td>unix</td>
+      <td><code>/bin/env</code> <strong>OR</strong> <code>/usr/bin/env</code> <strong>OR</strong> <code>env</code> (<em>depending on read rights</em>)</td>
     </tr>
     <tr>
-      <td> netware </td>
-      <td> env </td>
+      <td>netware</td>
+      <td><code>env</code></td>
     </tr>
     <tr>
-      <td> os/400 </td>
-      <td> env </td>
+      <td>os/400</td>
+      <td><code>env</code></td>
     </tr>
     <tr>
-      <td> openvms </td>
-      <td> show logical </td>
+      <td>openvms</td>
+      <td><code>show logical</code></td>
     </tr>
   </table>
-</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/pvcstask.html ant-1.10.3/manual/Tasks/pvcstask.html
--- ant-1.9.10/manual/Tasks/pvcstask.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/pvcstask.html	2018-03-24 12:37:12.000000000 +0000
@@ -14,234 +14,186 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
 <html>
 <head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
    <meta http-equiv="Content-Language" content="en-us">
    <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
 <title>PVCS task</title>
 </head>
 <body>
 
-<h1>
-Apache Ant Pvcs Task User Manual</h1>
+<h1>Apache Ant Pvcs Task User Manual</h1>
 
-<p><b>Note:</b>
-Before using this task, the user running Ant must have access to the
-commands of PVCS (get and pcli) and must have access to the
-repository. Note that the way to specify the repository is platform
-dependent so use property to specify location of repository.
-</p>
-
-by
-<br><!-- Names are in alphabetical order, on last name -->
+<p><strong>Note</strong>: Before using this task, the user running Ant must have access to the
+commands of PVCS (<kbd>get</kbd> and <kbd>pcli</kbd>) and must have access to the
+repository. Note that the way to specify the repository is platform dependent so use property to
+specify location of repository.</p>
+<p>by</p>
+<!-- Names are in alphabetical order, on last name -->
 <ul>
   <li>Thomas Christensen (<a href="mailto:tchristensen@nordija.com">tchristensen@nordija.com</a>)</li>
   <li>Don Jeffery (<a href="mailto:donj@apogeenet.com">donj@apogeenet.com</a>)</li>
   <li>Jon Dickinson (<a href="mailto:dickinson.j@ucles.org.uk">dickinson.j@ucles.org.uk</a>)</li>
 </ul>
-Version 1.1 - 2001/06/27<br>
-<p>Problems with UNC pathnames and the use of () in paths are fixed and an updateonly
-  argument introduced.</p>
-Version 1.0 - 2001/01/31<br>
+<p>Version 1.1&mdash;2001/06/27</p>
+<p>Problems with UNC pathnames and the use of <q>()</q> in paths are fixed and
+an <var>updateonly</var> argument introduced.</p>
+<p>Version 1.0&mdash;2001/01/31</p>
 <p>Initial release.</p>
-<hr>
-<h2>
-Table of Contents</h2>
+
+<hr/>
+
+<h2>Table of Contents</h2>
 <ul>
   <li><a href="#introduction">Introduction</a></li>
   <li><a href="#pvcs">Pvcs Task</a></li>
 </ul>
-<hr>
 
-<h2><a NAME="introduction">Introduction</a></h2>
-The pvcs task allows the user of Ant to extract the latest edition
-of the source code from a PVCS repository. PVCS is a version control system
-developed by <a href="http://www.merant.com/products/pvcs">Merant</a>.
-<br>
-This version has been tested against PVCS version 6.5 and 6.6 under Windows and Solaris.
+<hr/>
 
-<hr>
-<h2><a NAME="pvcs">Pvcs Task</a></h2>
-<h3>Description</h3>
-The pvcs task is set to point at a PVCS repository and optionally a project
-within that repository, and can from that specification get the latest
-version of the files contained by the repository.
-<h3>
-Parameters</h3>
-
-<table BORDER CELLSPACING=0 CELLPADDING=2 >
-<tr>
-<td VALIGN=TOP WIDTH="12%"><b>Attribute</b></td>
-
-<td VALIGN=TOP WIDTH="78%"><b>Description</b></td>
-
-<td VALIGN=TOP WIDTH="10%"><b>Required</b></td>
-</tr>
-
-<tr>
-<td VALIGN=TOP WIDTH="12%">repository</td>
-
-<td VALIGN=TOP WIDTH="78%">The location of the repository (see your PVCS
-manuals)</td>
-
-<td VALIGN=TOP WIDTH="10%">Yes</td>
-</tr>
-
-<tr>
-<td VALIGN=TOP WIDTH="12%">pvcsproject</td>
-
-<td VALIGN=TOP WIDTH="78%">The project within the PVCS repository to extract
-files from (&quot;/&quot; is root project and that is default if this attribute isn't
-specified)</td>
-
-<td VALIGN=TOP WIDTH="10%">No</td>
-</tr>
-
-<tr>
-<td VALIGN=TOP WIDTH="12%">label</td>
-
-<td VALIGN=TOP WIDTH="78%">Only files marked with this label are extracted.</td>
-
-<td VALIGN=TOP WIDTH="10%">No</td>
-</tr>
-
-<tr>
-<td VALIGN=TOP WIDTH="12%">promotiongroup</td>
-
-<td VALIGN=TOP WIDTH="78%">Only files within this promotion group are extracted. Using
-both the <i>label</i> and the <i>promotiongroup</i> tag will cause the files in the
-promotion group and with that label to be extracted.
-</td>
-
-<td VALIGN=TOP WIDTH="10%">No</td>
-</tr>
-
-<tr>
-<td VALIGN=TOP WIDTH="12%">config</td>
-
-<td VALIGN=TOP WIDTH="78%">path of a non default .cfg file.
-Can be given absolute or relative to Ant's base directory.
-</td>
-
-<td VALIGN=TOP WIDTH="10%">No</td>
-</tr>
-
-<tr>
-<td VALIGN=TOP WIDTH="12%">force</td>
-
-<td VALIGN=TOP WIDTH="78%">If set to <i>yes</i> all files that exists and are writable are overwritten. Default <i>no</i> causes the files that are writable to be ignored. This stops the PVCS command <i>get</i> to stop asking questions!</td>
-
-<td VALIGN=TOP WIDTH="10%">No</td>
-</tr>
-
-<tr>
-<td VALIGN=TOP WIDTH="12%">workspace</td>
-
-<td VALIGN=TOP WIDTH="78%">By specifying a workspace, the files are extracted to that location. A PVCS workspace is a
-name for a location of the workfiles and isn't as such the location itself. You define the location for a workspace
-using the PVCS GUI clients. If this isn't specified the default workspace for the current user is used.</td>
-
-<td VALIGN=TOP WIDTH="10%">No</td>
-</tr>
-
-<tr>
-<td VALIGN=TOP WIDTH="12%">pvcsbin</td>
-
-<td VALIGN=TOP WIDTH="78%">On some systems the PVCS executables <i>pcli</i>
-and <i>get</i> are not found in the PATH. In such cases this attribute
-should be set to the bin directory of the PVCS installation containing
-the executables mentioned before. If this attribute isn't specified the
-tag expects the executables to be found using the PATH environment variable.</td>
-
-<td VALIGN=TOP WIDTH="10%">No</td>
-</tr>
-    <tr>
-      <td VALIGN=TOP WIDTH="12%">ignorereturncode</td>
-      <td VALIGN=TOP WIDTH="78%">If set to <i>true</i> the return value from executing
-        the pvcs commands are ignored.</td>
-      <td VALIGN=TOP WIDTH="10%">No</td>
-    </tr>
-    <tr>
-      <td VALIGN=TOP WIDTH="12%">updateonly</td>
-      <td VALIGN=TOP WIDTH="78%">If set to <i>true</i> files are gotten only if
-        newer than existing local files.</td>
-      <td VALIGN=TOP WIDTH="10%">No</td>
-    </tr>
-    <tr>
-      <td valign="TOP">filenameformat</td>
-      <td valign="TOP">The format of your folder names in a
-          format suitable for <code>java.text.MessageFormat</code>.
-          Defaults to <code>{0}-arc({1})</code>.  Repositories where
-          the archive extension is not  <code>-arc</code> should set
-          this.</td>
-      <td valign="TOP">No</td>
-    </tr>
-    <tr>
-      <td valign="TOP">linestart</td>
-        <td valign="TOP">Used to parse the output of the pcli
-          command. It defaults to <code>&quot;P:</code>.  The parser already
-          knows about / and \\, this property is useful in cases where the
-          repository is accessed on a Windows platform via a drive letter
-          mapping.</td>
-      <td valign="TOP">No</td>
-    </tr>
-    <tr>
-      <td valign="TOP">revision</td>
-      <td valign="TOP">Retrieve the specified revision.</td>
-      <td valign="TOP">No</td>
-    </tr>
-    <tr>
-      <td valign="TOP">userid</td>
-      <td valign="TOP">Use the specified userid.</td>
-      <td valign="TOP">No</td>
-    </tr>
-</table>
-<h3><a name="nested">Nested Elements</a></h3>
+<h2 id="introduction">Introduction</h2>
+<p>The <code>pvcs</code> task allows the user of Ant to extract the latest edition of the source
+code from a <a href="https://en.wikipedia.org/wiki/PVCS" target="_top">PVCS</a> (Polytron Version
+Control System) repository. It is currently owned
+by <a href="https://www.microfocus.com/products/pvcs/" target="_top">MicroFocus</a>.</p>
+<p>This version has been tested against PVCS version 6.5 and 6.6 under Windows and Solaris.</p>
 
-<h3>pvcsproject element</h3>
-<p><code>pvcs</code> supports a nested
-<code>&lt;pvcsproject&gt;</code> element, that represents a project
-within the PVCS repository to extract files from.  By nesting multiple
-<code>&lt;pvcsproject&gt;</code> elements under the
-<code>&lt;pvcs&gt;</code> task, multiple projects can be
-specified.</p>
+<hr/>
 
+<h2 id="pvcs">Pvcs Task</h2>
+<h3>Description</h3>
+<p>The <code>pvcs</code> task is set to point at a PVCS repository and optionally a project within
+that repository, and can from that specification get the latest version of the files contained by
+the repository.</p>
 <h3>Parameters</h3>
 
-<table BORDER CELLSPACING=0 CELLPADDING=2 >
-<tr>
-<td VALIGN=TOP WIDTH="12%"><b>Attribute</b></td>
-
-<td VALIGN=TOP WIDTH="78%"><b>Description</b></td>
-
-<td VALIGN=TOP WIDTH="10%"><b>Required</b></td>
-</tr>
-
-<tr>
-<td VALIGN=TOP WIDTH="12%">name</td>
-
-<td VALIGN=TOP WIDTH="78%">The name of the pvcs project</td>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>repository</td>
+    <td>The location of the repository (see your PVCS manuals).</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>pvcsproject</td>
+    <td>The project within the PVCS repository to extract files from.</td>
+    <td>No; defaults to root project, <q>/</q></td>
+  </tr>
+  <tr>
+    <td>label</td>
+    <td>Only files marked with this label are extracted.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>promotiongroup</td>
+    <td>Only files within this promotion group are extracted. Using both the <var>label</var> and
+      the <var>promotiongroup</var> tag will cause the files in the promotion group and with that
+      label to be extracted.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>config</td>
+    <td>path of a non default <samp>.cfg</samp> file.  Can be given absolute or relative to
+      project's base directory.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>force</td>
+    <td>If set to <q>yes</q> all files that exists and are writable are
+      overwritten. Default <q>no</q> causes the files that are writable to be ignored. This stops
+      the PVCS command <code>get</code> to stop asking questions!</td>
+    <td>No; default is <q>no</q></td>
+  </tr>
+  <tr>
+    <td>workspace</td>
+    <td>By specifying a <var>workspace</var>, the files are extracted to that location. A PVCS
+      workspace is a name for a location of the workfiles and isn't as such the location itself. You
+      define the location for a workspace using the PVCS GUI clients.</td>
+    <td>No; defaults to default workspace for the current user</td>
+  </tr>
+  <tr>
+    <td>pvcsbin</td>
+    <td>On some systems the PVCS executables <kbd>pcli</kbd> and <kbd>get</kbd> are not found in
+      the <code>PATH</code>. In such cases this attribute should be set to the <code>bin</code>
+      directory of the PVCS installation containing the executables mentioned before. If this
+      attribute isn't specified the tag expects the executables to be found using
+      the <code>PATH</code> environment variable.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>ignorereturncode</td>
+    <td>If set to <q>true</q> the return value from executing the PVCS commands are ignored.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>updateonly</td>
+    <td>If set to <q>true</q> files are gotten only if newer than existing local files.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>filenameformat</td>
+    <td>The format of your folder names in a format suitable
+      for <code>java.text.MessageFormat</code>.  Repositories where the archive extension is
+      not <samp>-arc</samp> should set this.</td>
+    <td>No; defaults to <q>{0}-arc({1})</q></td>
+  </tr>
+  <tr>
+    <td>linestart</td>
+    <td>Used to parse the output of the <code>pcli</code> command.  The parser already knows
+      about <q>/</q> and <q>\\</q>, this property is useful in cases where the repository is
+      accessed on a Windows platform via a drive letter mapping.</td>
+    <td>No; defaults to <code>&quot;P:</code></td>
+  </tr>
+  <tr>
+    <td>revision</td>
+    <td>Retrieve the specified revision.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>userid</td>
+    <td>Use the specified userid.</td>
+    <td>No</td>
+  </tr>
+</table>
+<h3 id="nested">Parameters specified as nested elements</h3>
 
-<td VALIGN=TOP WIDTH="10%">Yes</td>
-</tr>
+<h4>pvcsproject element</h4>
+<p>The task supports a nested <code>&lt;pvcsproject&gt;</code> element, that represents a
+project within the PVCS repository to extract files from.  By nesting
+multiple <code>&lt;pvcsproject&gt;</code> elements under the <code>&lt;pvcs&gt;</code> task,
+multiple projects can be specified.</p>
+
+<h5>Parameters</h5>
+
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>name</td>
+    <td>The name of the PVCS project</td>
+    <td>Yes</td>
+  </tr>
 </table>
 
 <h3>Examples</h3>
-The following set-up extracts the latest version of the files in the pvcs repository.
+<p>The following set-up extracts the latest version of the files in the pvcs repository.</p>
 <pre>
-  &lt;!-- =================================================================== --&gt;
-  &lt;!-- Get the latest version                                              --&gt;
-  &lt;!-- =================================================================== --&gt;
-  &lt;target name=&quot;getlatest&quot;&gt;
-    &lt;pvcs repository=&quot;/mnt/pvcs&quot; pvcsproject=&quot;/myprj&quot;/&gt;
-  &lt;/target&gt;</ul>
-</pre>
-<p>Now run:</p>
-<code>ant getlatest</code>
+&lt;!-- =================================================================== --&gt;
+&lt;!-- Get the latest version                                              --&gt;
+&lt;!-- =================================================================== --&gt;
+&lt;target name=&quot;getlatest&quot;&gt;
+  &lt;pvcs repository=&quot;/mnt/pvcs&quot; pvcsproject=&quot;/myprj&quot;/&gt;
+&lt;/target&gt;</pre>
+<p>Now run: <kbd>ant getlatest</kbd></p>
 <p>This will cause the following output to appear:</p>
-<pre>
+<pre class="output">
   getlatest:
   [pvcs] PVCS Version Manager (VMGUI) v6.6.10 (Build 870) for Windows NT/80x86
   [pvcs] Copyright 1985-2000 MERANT. All rights reserved.
@@ -256,23 +208,21 @@
 
   Total time: 19 seconds</pre>
 
-This next example extracts the latest version of the files in the pvcs
-repository from two projects using nested <code>&lt;pvcsproject&gt;</code> elements.
+<p>This next example extracts the latest version of the files in the pvcs repository from two
+projects using nested <code>&lt;pvcsproject&gt;</code> elements.</p>
 <pre>
-  &lt;!-- ===================================================================--&gt;
-  &lt;!-- Get latest from myprj and myprj2                                   --&gt;
-  &lt;!-- ===================================================================--&gt;
-  &lt;target name=&quot;getlatest2&quot;&gt;
-    &lt;pvcs repository=&quot;/mnt/pvcs&quot;&gt;
-      &lt;pvcsproject name=&quot;/myprj&quot;/&gt;
-      &lt;pvcsproject name=&quot;/myprj2&quot;/&gt;
-    &lt;/pvcs&gt;
-  &lt;/target&gt;</ul>
-</pre>
-<p>Now run:</p>
-<code>ant getlatest2</code>
+&lt;!-- ===================================================================--&gt;
+&lt;!-- Get latest from myprj and myprj2                                   --&gt;
+&lt;!-- ===================================================================--&gt;
+&lt;target name=&quot;getlatest2&quot;&gt;
+  &lt;pvcs repository=&quot;/mnt/pvcs&quot;&gt;
+    &lt;pvcsproject name=&quot;/myprj&quot;/&gt;
+    &lt;pvcsproject name=&quot;/myprj2&quot;/&gt;
+  &lt;/pvcs&gt;
+&lt;/target&gt;</pre>
+<p>Now run: <kbd>ant getlatest2</kbd></p>
 <p>This will cause the following output to appear:</p>
-<pre>
+<pre class="output">
   getlatest2:
   [pvcs] PVCS Version Manager (VMGUI) v6.6.10 (Build 870) for Windows NT/80x86
   [pvcs] Copyright 1985-2000 MERANT.  All rights reserved.
@@ -289,7 +239,5 @@
 
   Total time: 22 seconds</pre>
 
-<hr WIDTH="100%">
-<p>PVCS is a registered trademark of MERANT.</p>
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/recorder.html ant-1.10.3/manual/Tasks/recorder.html
--- ant-1.9.10/manual/Tasks/recorder.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/recorder.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,73 +24,66 @@
 
 <body>
 
-<h2><a name="log">Record</a></h2>
+<h2 id="log">Record</h2>
 <h3>Description</h3>
-<p>A recorder is a listener to the current build process that records the
-output to a file.</p>
+<p>A recorder is a listener to the current build process that records the output to a file.</p>
 
-<p>Several recorders can exist at the same time.  Each recorder is
-associated with a file.  The filename is used as a unique identifier for
-the recorders.  The first call to the recorder task with an unused filename
-will create a recorder (using the parameters provided) and add it to the
-listeners of the build.  All subsequent calls to the recorder task using
-this filename will modify that recorders state (recording or not) or other
-properties (like logging level).</p>
-
-<p>Some technical issues: the file's print stream is flushed for &quot;finished&quot;
-events (buildFinished, targetFinished and taskFinished), and is closed on
-a buildFinished event.</p>
+<p>Several recorders can exist at the same time.  Each recorder is associated with a file.  The
+filename is used as a unique identifier for the recorders.  The first call to
+the <code>record</code> task with an unused filename will create a recorder (using the parameters
+provided) and add it to the listeners of the build.  All subsequent calls to the <code>record</code>
+task using this filename will modify that recorder's state (recording or not) or other properties
+(like logging level).</p>
+
+<p>Some technical issues: the file's print stream is flushed for <q>finished</q> events
+(<q>buildFinished</q>, <q>targetFinished</q> and <q>taskFinished</q>), and is closed on
+a <q>buildFinished</q> event.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The name of the file this logger is associated with.</td>
-    <td align="center" valign="middle">yes</td>
+    <td>name</td>
+    <td>The name of the file this logger is associated with.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">action</td>
-    <td valign="top">This tells the logger what to do: should it start
-    recording or stop?  The first time that the recorder task is called for
-    this logfile, and if this attribute is not provided, then the default
-    for this attribute is &quot;start&quot;.  If this attribute is not provided on
-    subsequent calls, then the state remains as previous.
-    [Values = {start|stop}, Default = no state change]</td>
-    <td align="center" valign="middle">no</td>
+    <td>action</td>
+    <td>This tells the logger what to do: should it start recording or stop?  The first time that
+      the recorder task is called for this logfile, and if this attribute is not provided, then the
+      default for this attribute is <q>start</q>.  If this attribute is not provided on subsequent
+      calls, then the state remains as previous.</td>
+    <td>No [values = <q>start|stop</q>, default = no state change]</td>
   </tr>
   <tr>
-    <td valign="top">append</td>
-    <td valign="top">Should the recorder append to a file, or create a new
-    one? This is only applicable the first time this task is called for
-    this file.  [Values = {yes|no}, Default=no]</td>
-    <td align="center" valign="middle">no</td>
+    <td>append</td>
+    <td>Should the recorder append to a file, or create a new one? This is only applicable the first
+      time this task is called for this file.</td>
+    <td>No [values = <q>start|stop</q>, default = no state change]</td>
   </tr>
   <tr>
-    <td valign="top">emacsmode</td>
-    <td valign="top">Removes <code>[task]</code> banners like Apache Ant's
-    <code>-emacs</code> command line switch if set to
-    <em>true</em>.</td>
-    <td align="center" valign="middle">no, default is <em>false</em></td>
+    <td>emacsmode</td>
+    <td>Removes <code>[task]</code> banners like Apache Ant's <kbd>-emacs</kbd> command line
+      switch if set to <q>true</q>.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">loglevel</td>
-    <td valign="top">At what logging level should this recorder instance
-    record to?  This is not a once only parameter (like <code>append</code>
-    is) -- you can increase or decrease the logging level as the build process
-    continues.  [Values= {error|warn|info|verbose|debug}, Default = no change]
+    <td>loglevel</td>
+    <td>At what logging level should this recorder instance record to?  This is not a once only
+      parameter (like <var>append</var> is)&mdash;you can increase or decrease the logging level as
+      the build process continues.
     </td>
-    <td align="center" valign="middle">no</td>
+    <td>No [values = <q>error|warn|info|verbose|debug</q>, default = no change]</td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<p>The following build.xml snippet is an example of how to use the recorder
-to record just the <code>&lt;javac&gt;</code> task:</p>
+<p>The following <samp>build.xml</samp> snippet is an example of how to use the recorder to record
+just the <code>&lt;javac&gt;</code> task:</p>
 <pre>
     ...
     &lt;compile &gt;
@@ -101,10 +94,9 @@
     ...
 </pre>
 
-<p>The following two calls to <code>&lt;record&gt;</code> set up two
-recorders: one to file &quot;records-simple.log&quot; at logging level <code>info</code>
-(the default) and one to file &quot;ISO.log&quot; using logging level of
-<code>verbose</code>.</p>
+<p>The following two calls to <code>&lt;record&gt;</code> set up two recorders: one to
+file <samp>records-simple.log</samp> at logging level <q>info</q> (the default) and one to
+file <samp>ISO.log</samp> using logging level of <q>verbose</q>.</p>
 <pre>
     ...
     &lt;record name=&quot;records-simple.log&quot;/&gt;
@@ -113,60 +105,49 @@
 </pre>
 
 <h3>Notes</h3>
-<p>There is some functionality that I would like to be able to add in the
-future.  They include things like the following:</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<p>There is some functionality that I would like to be able to add in the future.  They include
+things like the following:</p>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">listener</td>
-    <td valign="top">A classname of a build listener to use from this point
-    on instead of the default listener.</td>
-    <td align="center" valign="middle">no</td>
+    <td>listener</td>
+    <td>A classname of a build listener to use from this point on instead of the default
+      listener.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">includetarget</td>
-    <td valign="top" rowspan=2>A comma-separated list of targets to automatically
-    record.  If this value is &quot;all&quot;, then all targets are recorded.
-    [Default = all]</td>
-    <td align="center" valign="middle">no</td>
+    <td>includetarget</td>
+    <td rowspan="2">A comma-separated list of targets to automatically record.  If this value
+      is <q>all</q>, then all targets are recorded.</td>
+    <td>No; default is <q>all</q></td>
   </tr>
   <tr>
-    <td valign="top">excludetarget</td>
-    <td align="center" valign="middle">no</td>
+    <td>excludetarget</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">includetask</td>
-    <td valign="top" rowspan=2>A comma-separated list of task to automatically
-    record or not.  This could be difficult as it could conflict with the
-    <code>includetarget/excludetarget</code>.  (e.g.:
-    <code>includetarget=&quot;compile&quot; excludetask=&quot;javac&quot;</code>, what should
-    happen?)</td>
-    <td align="center" valign="middle">no</td>
+    <td>includetask</td>
+    <td rowspan="2">A comma-separated list of tasks to automatically record or not.  This could be
+      difficult as it may conflict with the <code>includetarget/excludetarget</code>.
+      (e.g.: <code>includetarget=&quot;compile&quot; excludetask=&quot;javac&quot;</code>, what
+      should happen?)</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">excludetask</td>
-    <td align="center" valign="middle">no</td>
+    <td>excludetask</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">action</td>
-    <td valign="top">add greater flexibility to the action attribute.  Things
-    like <code>close</code> to close the print stream.</td>
-    <td align="center" valign="top">no</td>
-  </tr>
-  <tr>
-    <td valign="top"></td>
-    <td valign="top"></td>
-    <td align="center" valign="top"></td>
+    <td>action</td>
+    <td>add greater flexibility to the <var>action</var> attribute.  Things like <q>close</q> to
+      close the print stream.</td>
+    <td>No</td>
   </tr>
 </table>
 
-
-
-
-
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/renameextensions.html ant-1.10.3/manual/Tasks/renameextensions.html
--- ant-1.9.10/manual/Tasks/renameextensions.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/renameextensions.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,100 +24,82 @@
 
 <body>
 
-<h2><a name="renameexts">RenameExtensions</a></h2>
-<h3><i>Deprecated</i></h3>
-<p><i>This task has been deprecated.  Use the <a href="../Tasks/move.html">move</a>
-task with a <a href="../Types/mapper.html#glob-mapper">glob mapper</a> instead.</i></p>
+<h2 id="renameexts">RenameExtensions</h2>
+<h3><em><u>Deprecated</u></em></h3>
+<p><em>This task has been <u>deprecated</u>.  Use the <a href="../Tasks/move.html">move</a> task
+with a <a href="../Types/mapper.html#glob-mapper">glob mapper</a> instead.</em></p>
 <h3>Description</h3>
-<p>Renames files in the <code>srcDir</code> directory ending with the
-<code>fromExtension</code> string so that they end with the
-<code>toExtension</code> string. Files are only replaced if
-<code>replace</code> is true
-</p>
-<p>See the section on
-<a href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
-inclusion/exclusion of files works, and how to write patterns.
-This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and
-supports most attributes of <code>&lt;fileset&gt;</code>
-(<code>dir</code> becomes <code>srcDir</code>) as well as the nested
-<code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and
-<code>&lt;patternset&gt;</code> elements.</p>
+<p>Renames files in the <var>srcDir</var> directory ending with the <var>fromExtension</var> string
+so that they end with the <var>toExtension</var> string. Files are only replaced
+if <var>replace</var> is <q>true</q>.</p>
+<p>See the section on <a href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on
+how the inclusion/exclusion of files works, and how to write patterns.  This task forms an
+implicit <a href="../Types/fileset.html">FileSet</a> and supports most attributes
+of <code>&lt;fileset&gt;</code> (<var>dir</var> becomes <var>srcDir</var>) as well as the
+nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code>
+and <code>&lt;patternset&gt;</code> elements.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">defaultexcludes</td>
-    <td valign="top">indicates whether default excludes should be used or not
-      (&quot;yes&quot;/&quot;no&quot;). Default excludes are used when
-      omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>defaultexcludes</td>
+    <td>indicates whether default excludes should be used or not (<q>yes|no</q>).</td>
+    <td>No; defaults to <q>yes</q></td>
   </tr>
   <tr>
-    <td valign="top">excludes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      excluded. No files (except default excludes) are excluded when
-      omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>excludes</td>
+    <td>comma- or space-separated list of patterns of files that must be excluded.</td>
+    <td>No; defaults to default excludes or none if <var>defaultexcludes</var> is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an exclude pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>excludesfile</td>
+    <td>name of a file. Each line of this file is taken to be an exclude pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">fromExtension</td>
-    <td valign="top">The string that files must end in to be renamed</td>
-    <td valign="top" align="center">Yes</td>
+    <td>fromExtension</td>
+    <td>The string that files must end in to be renamed</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">includes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      included. All files are included when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>includes</td>
+    <td>comma- or space-separated list of patterns of files that must be included.</td>
+    <td>No; defaults to all (<q>**</q>)</td>
   </tr>
   <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an include pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>includesfile</td>
+    <td>name of a file. Each line of this file is taken to be an include pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">replace</td>
-    <td valign="top">Whether the file being renamed to should be
-      replaced if it already exists</td>
-    <td valign="top" align="center">No</td>
+    <td>replace</td>
+    <td>Whether the file being renamed to should be replaced if it already exists</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">srcDir</td>
-    <td valign="top">The starting directory for files to search in</td>
-    <td valign="top" align="center">Yes</td>
+    <td>srcDir</td>
+    <td>The starting directory for files to search in</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">toExtension</td>
-    <td valign="top">The string that renamed files will end with on
-      completion</td>
-    <td valign="top" align="center">Yes</td>
+    <td>toExtension</td>
+    <td>The string that renamed files will end with on completion</td>
+    <td>Yes</td>
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
-  <p><code>&lt;renameext srcDir=&quot;/source/project1&quot;
-              includes=&quot;**&quot;
-              excludes=&quot;**/samples/*&quot;
-              fromExtension=&quot;.java.keep&quot;
-              toExtension=&quot;.java&quot;
-              replace=&quot;true&quot;/&gt;
-</code>
-  </p>
-</blockquote>
-
 
+<pre>
+&lt;renameext srcDir=&quot;/source/project1&quot;
+           includes=&quot;**&quot;
+           excludes=&quot;**/samples/*&quot;
+           fromExtension=&quot;.java.keep&quot;
+           toExtension=&quot;.java&quot;
+           replace=&quot;true&quot;/&gt;</pre>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/rename.html ant-1.10.3/manual/Tasks/rename.html
--- ant-1.9.10/manual/Tasks/rename.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/rename.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,41 +24,40 @@
 
 <body>
 
-<h2><a name="rename">Rename</a></h2>
-<h3><i>Deprecated</i></h3>
-<p><i>This task has been deprecated.  Use the Move task instead.</i></p>
+<h2 id="rename">Rename</h2>
+<h3><em><u>Deprecated</u></em></h3>
+<p><em>This task has been <u>deprecated</u>.  Use the <code>Move</code> task instead.</em></p>
 <h3>Description</h3>
 <p>Renames a given file.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">src</td>
-    <td valign="top">file to rename.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>src</td>
+    <td>file to rename.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">dest</td>
-    <td valign="top">new name of the file.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>dest</td>
+    <td>new name of the file.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">replace</td>
-    <td valign="top">Enable replacing of existing file (default: on).</td>
-    <td valign="top" align="center">No</td>
+    <td>replace</td>
+    <td>Enable replacing of existing file.</td>
+    <td>No; default is <q>on</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
-<pre>  &lt;rename src=&quot;foo.jar&quot; dest=&quot;${name}-${version}.jar&quot;/&gt;</pre> 
-<p>Renames the file <code>foo.jar</code> to <code>${name}-${version}.jar</code> (assuming <code>name</code>
- and <code>version</code> being predefined properties). If a file named <code>${name}-${version}.jar</code>
- already exists, it will be removed prior to renaming <code>foo.jar</code>.</p>
-
+<pre>&lt;rename src=&quot;foo.jar&quot; dest=&quot;${name}-${version}.jar&quot;/&gt;</pre>
+<p>Renames the file <samp>foo.jar</samp> to <samp>${name}-${version}.jar</samp>
+(assuming <code>name</code> and <code>version</code> being predefined properties). If a file
+named <samp>${name}-${version}.jar</samp> already exists, it will be removed prior to
+renaming <samp>foo.jar</samp>.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/replace.html ant-1.10.3/manual/Tasks/replace.html
--- ant-1.9.10/manual/Tasks/replace.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/replace.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,219 +24,205 @@
 
 <body>
 
-<h2><a name="replace">Replace</a></h2>
+<h2 id="replace">Replace</h2>
 <h3>Description</h3>
-<p>Replace is a directory based task for replacing the occurrence of a given string with another string 
-in selected file.</p>
-<p>If you want to replace a text that crosses line boundaries, you
-must use a nested <code>&lt;replacetoken&gt;</code> element.</p>
+<p><code>Replace</code> is a directory based task for replacing the occurrence of a given string
+with another string in selected file.</p>
+<p>If you want to replace a text that crosses line boundaries, you must use a
+nested <code>&lt;replacetoken&gt;</code> element.</p>
 
-<p>The output file is only written if it differs from the existing
-file.  This prevents spurious rebuilds based on unchanged files which
-have been regenerated by this task.</p> 
+<p>The output file is only written if it differs from the existing file.  This prevents spurious
+rebuilds based on unchanged files which have been regenerated by this task.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">file for which the token should be replaced.</td>
-    <td align="center" rowspan="2">Exactly one of the two.</td>
+    <td>file</td>
+    <td>file for which the token should be replaced.</td>
+    <td rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
-    <td valign="top">dir</td>
-    <td valign="top">The base directory to use when replacing a token in 
-      multiple files.</td>
+    <td>dir</td>
+    <td class="left">The base directory to use when replacing a token in multiple files.</td>
   </tr>
   <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">The encoding of the files upon which replace operates.</td>
-    <td align="center">No - defaults to default JVM encoding</td>
+    <td>encoding</td>
+    <td>The encoding of the files upon which replace operates.</td>
+    <td>No; defaults to default JVM character encoding</td>
   </tr>
   <tr>
-    <td valign="top">token</td>
-    <td valign="top">the token which must be replaced.</td>
-    <td valign="top" align="center">Yes, unless a nested
-    <code>replacetoken</code> element or the replacefilterfile
-    attribute is used.</td>
+    <td>token</td>
+    <td>the token which must be replaced.</td>
+    <td>Yes, unless a nested <code>replacetoken</code> element or the <var>replacefilterfile</var>
+      attribute is used.</td>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">the new value for the token. When omitted, an empty string
-      (&quot;&quot;) is used.</td>
-    <td valign="top" align="center">No</td>
+    <td>value</td>
+    <td>the new value for the token.</td>
+    <td>No; defaults to empty string (<q></q>)</td>
   </tr>
   <tr>
-    <td valign="top">summary</td>
-    <td valign="top">Indicates whether a summary of the replace operation 
-                     should be produced, detailing how many token occurrences 
-                     and files were processed
-                     </td>
-    <td valign="top" align="center">No, by default no summary is produced</td>
+    <td>summary</td>
+    <td>Indicates whether a summary of the replace operation should be produced, detailing how many
+      token occurrences and files were processed</td>
+    <td>No; defaults to no summary</td>
   </tr>
   <tr>
-    <td valign="top">propertyFile</td>
-    <td valign="top">valid property file from which properties specified using nested <code>&lt;replacefilter&gt;</code> elements are drawn.</td>
-    <td valign="top" align="center">Yes only if <i>property</i> attribute of <code>&lt;replacefilter&gt;</code> is used.</td>
+    <td>propertyFile</td>
+    <td>valid property file from which properties specified using
+      nested <code>&lt;replacefilter&gt;</code> elements are drawn.</td>
+    <td>Yes, only if <var>property</var> attribute of <code>&lt;replacefilter&gt;</code> is
+      used.</td>
   </tr>
   <tr>
-    <td valign="top">replacefilterfile</td>
-    <td valign="top">valid property file.  Each property will be
-    treated as a replacefilter where <code>token</code> is the name of
-    the property and <code>value</code> is the properties value.
-    <td valign="top" align="center">No.</td>
+    <td>replacefilterfile</td>
+    <td>valid property file.  Each property will be treated as a <code>replacefilter</code>
+      where <var>token</var> is the name of the property and <var>value</var> is the property's
+      value.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">includes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      included. All files are included when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>includes</td>
+    <td>comma- or space-separated list of patterns of files that must be included.</td>
+    <td>No; defaults to all (<q>**</q>)</td>
   </tr>
   <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an include pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>includesfile</td>
+    <td>name of a file. Each line of this file is taken to be an include pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">excludes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      excluded. No files (except default excludes) are excluded when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>excludes</td>
+    <td>comma- or space-separated list of patterns of files that must be excluded.</td>
+    <td>No; defaults to default excludes or none if <var>defaultexcludes</var> is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an exclude pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>excludesfile</td>
+    <td>name of a file. Each line of this file is taken to be an exclude pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">defaultexcludes</td>
-    <td valign="top">indicates whether default excludes should be used or not
-      (&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>defaultexcludes</td>
+    <td>indicates whether default excludes should be used or not (<q>yes|no</q>).</td>
+    <td>No; defaults to <q>yes</q></td>
   </tr>
   <tr>
-    <td valign="top">preserveLastModified</td>
-    <td valign="top">Keep the file timestamp(s) even if the file(s)
-      is(are) modified.  <em>since Apache Ant 1.8.0.</em></td>
-    <td valign="top" align="center">No, defaults to false</td>
+    <td>preserveLastModified</td>
+    <td>Keep the file timestamp(s) even if the file(s) is(are) modified.  <em>since Apache Ant
+      1.8.0</em>.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">failOnNoReplacements</td>
-    <td valign="top">Whether to fail the build if the task didn't do
-      anything.  <em>since Ant 1.8.0.</em></td>
-    <td valign="top" align="center">No, defaults to false</td>
+    <td>failOnNoReplacements</td>
+    <td>Whether to fail the build if the task didn't do anything.  <em>since Ant 1.8.0</em>.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
-<pre>  &lt;replace file=&quot;${src}/index.html&quot; token=&quot;@@@&quot; value=&quot;wombat&quot;/&gt;</pre>
-<p>replaces occurrences of the string &quot;@@@&quot; with the string
-&quot;wombat&quot;, in the file <code>${src}/index.html</code>.</p>
+<pre>&lt;replace file=&quot;${src}/index.html&quot; token=&quot;@@@&quot; value=&quot;wombat&quot;/&gt;</pre>
+<p>replaces occurrences of the string <q>@@@</q> with the string <q>wombat</q>, in the
+file <samp>${src}/index.html</samp>.</p>
 <h3>Parameters specified as nested elements</h3>
-<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and
-supports most attributes of <code>&lt;fileset&gt;</code> as well as the
-nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and
-<code>&lt;patternset&gt;</code> elements.</p>
-<p>Since Ant 1.8.0 this task supports any filesystem
-  based <a href="../Types/resources.html#collection">resource
-    collections</a> as nested elements.</p>
+<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and supports most
+attributes of <code>&lt;fileset&gt;</code> as well as the
+nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code>
+and <code>&lt;patternset&gt;</code> elements.</p>
+<p><em>Since Ant 1.8.0</em>, this task supports any filesystem
+based <a href="../Types/resources.html#collection">resource collections</a> as nested elements.</p>
 <h4>replacetoken and replacevalue</h4>
-<p>If either the text you want to replace or the replacement text
-cross line boundaries, you can use nested elements to specify
-them.</p>
+<p>If either the text you want to replace or the replacement text cross line boundaries, you can use
+nested elements to specify them.</p>
 <p>The elements support attributes:</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">expandProperties</td>
-    <td valign="top">Whether to expand properties in the nested text.
-      <em>since Ant 1.8.0.</em></td>
-    <td align="center">No, defaults to true.</td>
+    <td>expandProperties</td>
+    <td>Whether to expand properties in the nested text.  <em>Since Ant 1.8.0</em>.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote><pre>
+<pre>
 &lt;replace dir=&quot;${src}&quot; value=&quot;wombat&quot;&gt;
   &lt;include name=&quot;**/*.html&quot;/&gt;
   &lt;replacetoken&gt;&lt;![CDATA[multi line
 token]]&gt;&lt;/replacetoken&gt;
-&lt;/replace&gt;
-</pre></blockquote>
-<p>replaces occurrences of the string &quot;multi
-line<i>\n</i>token&quot; with the string &quot;wombat&quot;, in all
-HTML files in the directory <code>${src}</code>.Where <i>\n</i> is
-the platform specific line separator.</p>
-<blockquote><pre>
+&lt;/replace&gt;</pre>
+<p>replaces occurrences of the string <q>multi line<i>\n</i>token</q> with the string <q>wombat</q>,
+in all HTML files in the directory <samp>${src}</samp>. Here, <q><i>\n</i></q> is the platform
+specific line separator.</p>
+<pre>
 &lt;replace file=&quot;${src}/index.html&quot;&gt;
   &lt;replacetoken&gt;&lt;![CDATA[two line
 token]]&gt;&lt;/replacetoken&gt;
   &lt;replacevalue&gt;&lt;![CDATA[two line
 token]]&gt;&lt;/replacevalue&gt;
-&lt;/replace&gt;
-</pre></blockquote>
+&lt;/replace&gt;</pre>
 <h4>replacefilter</h4>
-<p>In addition to allowing for multiple replacements, optional nested <code>&lt;replacefilter&gt;</code> elements allow replacement values to be extracted from a property file. The name of this file is specified using the <code>&lt;replace&gt;</code> attribute <i>propertyFile</i>.
-</p>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+<p>In addition to allowing for multiple replacements, optional
+nested <code>&lt;replacefilter&gt;</code> elements allow replacement values to be extracted from a
+property file. The name of this file is specified using the <code>&lt;replace&gt;</code>
+attribute <var>propertyFile</var>.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">token</td>
-    <td valign="top">The string to search for.</td>
-    <td align="center" valign="top">Yes unless a nested replacetoken
+    <td>token</td>
+    <td>The string to search for.</td>
+    <td>Yes, unless a nested <code>replacetoken</code>
       is specified</td>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">The replacement string.</td>
-    <td align="center" rowspan="2">Either may be specified, but not both. Both can be omitted, if desired.</td>
+    <td>value</td>
+    <td>The replacement string.</td>
+    <td rowspan="2">Either may be specified, but not both. Both can be omitted, if desired.</td>
   </tr>
   <tr>
-    <td valign="top">property</td>
-    <td valign="top">Name of the property whose value is to serve as the replacement value.</td>
+    <td>property</td>
+    <td class="left">Name of the property whose value is to serve as the replacement value.</td>
   </tr>
 </table>
-<p>Since Ant 1.8.0 token and value can be specified as nested elements
-  just like in the task itself.</p>
-<p>If neither <i>value</i> nor <i>property</i> is used, the value provided using the <code>&lt;replace&gt;</code> attribute <i>value</i> and/or the <code>&lt;replacevalue&gt;</code> element is used. If no value was specified using either of these options, the token is replaced with an empty string.
-</p>
+<p><em>Since Ant 1.8.0</em>, <var>token</var> and <var>value</var> can be specified as nested
+elements just like in the task itself.</p>
+<p>If neither <var>value</var> nor <var>property</var> is used, the value provided using
+the <code>&lt;replace&gt;</code> attribute <var>value</var> and/or
+the <code>&lt;replacevalue&gt;</code> element is used. If no value was specified using either of
+these options, the token is replaced with an empty string.</p>
 <h3>Examples</h3>
-<blockquote><pre>
-&lt;replace 
-    file=&quot;configure.sh&quot;
-    value=&quot;defaultvalue&quot;
-    propertyFile=&quot;src/name.properties&quot;&gt;
-  &lt;replacefilter 
-    token=&quot;@token1@&quot;/&gt;
-  &lt;replacefilter 
-    token=&quot;@token2@&quot; 
-    value=&quot;value2&quot;/&gt;
-  &lt;replacefilter 
-    token=&quot;@token3@&quot; 
-    property=&quot;property.key&quot;/&gt;
+<pre>
+&lt;replace file=&quot;configure.sh&quot;
+         value=&quot;defaultvalue&quot;
+         propertyFile=&quot;src/name.properties&quot;&gt;
+  &lt;replacefilter token=&quot;@token1@&quot;/&gt;
+  &lt;replacefilter token=&quot;@token2@&quot;
+                 value=&quot;value2&quot;/&gt;
+  &lt;replacefilter token=&quot;@token3@&quot;
+                 property=&quot;property.key&quot;/&gt;
   &lt;replacefilter&gt;
-    &lt;replacetoken&gt;@token4@&lt;/replacetoken&gt; 
+    &lt;replacetoken&gt;@token4@&lt;/replacetoken&gt;
     &lt;replacevalue&gt;value4&lt;/replacevalue&gt;
   &lt;/replacefilter&gt;
-&lt;/replace&gt;
-</pre></blockquote>
-<p>In file <code>configure.sh</code>, replace all instances of &quot;@token1@&quot; with &quot;defaultvalue&quot;, all instances of &quot;@token2@&quot; with &quot;value2&quot;, and all instances of &quot;@token3@&quot; with the value of the property &quot;property.key&quot;, as it appears in property file <code>src/name.properties</code>.</p>
-<p><b>Note:</b> It is possible to use either the <i>token</i>/<code>&lt;replacetoken&gt;</code> and <i>value</i>/<code>&lt;replacevalue&gt;</code> attributes/elements, the nested replacefilter elements, or both in the same operation.
-</p>
-
+&lt;/replace&gt;</pre>
+<p>In file <samp>configure.sh</samp>, replace all instances of <q>@token1@</q>
+with <q>defaultvalue</q>, all instances of <q>@token2@</q> with <q>value2</q>, and all instances
+of <q>@token3@</q> with the value of the property <code>property.key</code>, as it appears in
+property file <samp>src/name.properties</samp>.</p>
+<p><strong>Note</strong>: It is possible to use either
+the <var>token</var>/<code>&lt;replacetoken&gt;</code>
+and <var>value</var>/<code>&lt;replacevalue&gt;</code> attributes/elements, the
+nested <code>replacefilter</code> elements, or both in the same operation.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/replaceregexp.html ant-1.10.3/manual/Tasks/replaceregexp.html
--- ant-1.9.10/manual/Tasks/replaceregexp.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/replaceregexp.html	2018-03-24 12:37:12.000000000 +0000
@@ -23,75 +23,73 @@
 </head>
 <body>
 
-<h2><a name="replaceregexp">ReplaceRegExp</a></h2>
+<h2 id="replaceregexp">ReplaceRegExp</h2>
 <h3>Description</h3>
-<p>ReplaceRegExp is a directory based task for replacing the
-occurrence of a given regular expression with a substitution pattern
-in a selected file or set of files.</p>
-
-<p>The output file is only written if it differs from the existing
-file.  This prevents spurious rebuilds based on unchanged files which
-have been regenerated by this task.</p> 
-
-<p>Similar to <a href="../Types/mapper.html#regexp-mapper">regexp
-type mappers</a> this task needs a supporting regular expression
-library and an implementation of
-<code>org.apache.tools.ant.util.regexp.Regexp</code>.
-See details in the documentation of the <a href="../Types/regexp.html#implementation">Regexp Type</a>. </p>
+<p><code>ReplaceRegExp</code> is a directory based task for replacing the occurrence of a given
+regular expression with a substitution pattern in a selected file or set of files.</p>
+
+<p>The output file is only written if it differs from the existing file.  This prevents spurious
+rebuilds based on unchanged files which have been regenerated by this task.</p>
+
+<p>Similar to <a href="../Types/mapper.html#regexp-mapper">regexp type mappers</a> this task needs a
+supporting regular expression library and an implementation
+of <code class="code">org.apache.tools.ant.util.regexp.Regexp</code>.  See details in the
+documentation of the <a href="../Types/regexp.html#implementation">Regexp Type</a>.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">file for which the regular expression should be replaced.</td>
-    <td align="center">Yes if no nested <code>&lt;fileset&gt;</code> is used</td>
+    <td>file</td>
+    <td>file for which the regular expression should be replaced.</td>
+    <td>Yes, unless nested <code>&lt;fileset&gt;</code> is used</td>
   </tr>
   <tr>
-    <td valign="top">match</td>
-    <td valign="top">The regular expression pattern to match in the file(s)</td>
-    <td align="center">Yes, if no nested <code>&lt;regexp&gt;</code> is used</td>
+    <td>match</td>
+    <td>The regular expression pattern to match in the file(s)</td>
+    <td>Yes, unless nested <code>&lt;regexp&gt;</code> is used</td>
   </tr>
   <tr>
-    <td valign="top">replace</td>
-    <td valign="top">The substitution pattern to place in the file(s) in place
-                     of the regular expression.</td>
-    <td align="center">Yes, if no nested <code>&lt;substitution&gt;</code> is used</td>
+    <td>replace</td>
+    <td>The substitution pattern to place in the file(s) in place of the regular expression.</td>
+    <td>Yes, unless nested <code>&lt;substitution&gt;</code> is used</td>
   </tr>
   <tr>
-    <td valign="top">flags</td>
-    <td valign="top">The flags to use when matching the regular expression.  For more
-                     information, consult the Perl5 syntax<br>
-                     g : Global replacement.  Replace all occurrences found<br>
-                     i : Case Insensitive.  Do not consider case in the match<br>
-                     m : Multiline.  Treat the string as multiple lines of input, using "^" and "$" as the start or end of any line, respectively, rather than start or end of string.<br>
-                     s : Singleline.  Treat the string as a single line of input, using "." to match any character, including a newline, which normally, it would not match.<br>
+    <td>flags</td>
+    <td>The flags to use when matching the regular expression.  For more information, consult the
+      Perl 5 syntax<br/>
+      <q>g</q> : Global replacement.  Replace all occurrences found<br/>
+      <q>i</q> : Case Insensitive.  Do not consider case in the match<br/>
+      <q>m</q> : Multiline.  Treat the string as multiple lines of input, using <q>^</q>
+      and <q>$</q> as the start or end of any line, respectively, rather than start or end of
+      string.<br/>
+      <q>s</q> : Singleline.  Treat the string as a single line of input, using <q>.</q> to match
+      any character, including a newline, which normally, it would not match.
     </td>
-    <td valign="top" align="center">No</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">byline</td>
-    <td valign="top">Process the file(s) one line at a time, executing the replacement
-                     on one line at a time (<i>true/false</i>).  This is useful if you
-                     want to only replace the first occurrence of a regular expression on
-                     each line, which is not easy to do when processing the file as a whole.
-                     Defaults to <i>false</i>.</td>
-    <td valign="top" align="center">No</td>
+    <td>byline</td>
+    <td>Process the file(s) one line at a time, executing the replacement on one line at a time
+      (<q>true|false</q>).  This is useful if you want to only replace the first occurrence of a
+      regular expression on each line, which is not easy to do when processing the file as a
+      whole.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">The encoding of the file. <em>since Apache Ant 1.6</em></td>
-    <td align="center">No - defaults to default JVM encoding</td>
+    <td>encoding</td>
+    <td>The encoding of the file. <em>since Apache Ant 1.6</em></td>
+    <td>No; defaults to default JVM character encoding</td>
   </tr>
   <tr>
-    <td valign="top">preserveLastModified</td>
-    <td valign="top">Keep the file timestamp(s) even if the file(s)
-      is(are) modified.  <em>since Ant 1.8.0.</em></td>
-    <td valign="top" align="center">No, defaults to false</td>
+    <td>preserveLastModified</td>
+    <td>Keep the file timestamp(s) even if the file(s) is(are) modified.  <em>since Ant
+      1.8.0</em>.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
@@ -99,107 +97,81 @@
 &lt;replaceregexp file=&quot;${src}/build.properties&quot;
                match=&quot;OldProperty=(.*)&quot;
                replace=&quot;NewProperty=\1&quot;
-               byline=&quot;true&quot;
-/&gt;
-</pre>
-<p>replaces occurrences of the property name &quot;OldProperty&quot;
- with &quot;NewProperty&quot; in a properties file, preserving the existing
-value, in the file <code>${src}/build.properties</code></p>
+               byline=&quot;true&quot;/&gt;</pre>
+<p>replaces occurrences of the property name <q>OldProperty</q> with <q>NewProperty</q> in a
+properties file, preserving the existing value, in the file <samp>${src}/build.properties</samp></p>
 
 <h3>Parameters specified as nested elements</h3>
-<p>This task supports a nested <a href="../Types/fileset.html">FileSet</a>
-   element.</p>
-<p>Since Ant 1.8.0 this task supports any filesystem
-  based <a href="../Types/resources.html#collection">resource
-    collections</a> as nested elements.</p>
-<p>This task supports a nested <i><a href="../Types/regexp.html">Regexp</a></i> element to specify
-   the regular expression.  You can use this element to refer to a previously
-   defined regular expression datatype instance.</p>
-<blockquote>
-     &lt;regexp id="id" pattern="alpha(.+)beta"/&gt;<br>
-     &lt;regexp refid="id"/&gt;
-</blockquote>
-<p>This task supports a nested <i>Substitution</i> element to specify
-   the substitution pattern.  You can use this element to refer to a previously
-   defined substitution pattern datatype instance.</p>
-<blockquote>
-     &lt;substitution id="id" expression="beta\1alpha"/&gt;<br>
-     &lt;substitution refid="id"/&gt;
-</blockquote>
+<p>This task supports a nested <a href="../Types/fileset.html">FileSet</a> element.</p>
+<p><em>Since Ant 1.8.0</em>, this task supports any filesystem
+based <a href="../Types/resources.html#collection">resource collections</a> as nested elements.</p>
+<p>This task supports a nested <a href="../Types/regexp.html">Regexp</a> element to specify the
+regular expression.  You can use this element to refer to a previously defined regular expression
+datatype instance.</p>
 
+<pre>
+&lt;regexp id="id" pattern="alpha(.+)beta"/&gt;
+&lt;regexp refid="id"/&gt;</pre>
+
+<p>This task supports a nested <code>substitution</code> element to specify the substitution
+pattern.  You can use this element to refer to a previously defined substitution pattern datatype
+instance.</p>
+
+<pre>
+&lt;substitution id="id" expression="beta\1alpha"/&gt;<br/>
+&lt;substitution refid="id"/&gt;</pre>
 
 <h3>Examples</h3>
 
-<blockquote>
-  <pre>
+<pre>
 &lt;replaceregexp byline=&quot;true&quot;&gt;
-  &lt;regexp pattern=&quot;OldProperty=(.*)&quot;/&gt;
-  &lt;substitution expression=&quot;NewProperty=\1&quot;/&gt;
-  &lt;fileset dir=&quot;.&quot;&gt;
-    &lt;include name=&quot;*.properties&quot;/&gt;
-  &lt;/fileset&gt;
-&lt;/replaceregexp&gt;
-</pre></blockquote>
-<p>replaces occurrences of the property name &quot;OldProperty&quot;
- with &quot;NewProperty&quot; in a properties file, preserving the existing
-value, in all files ending in <code>.properties</code> in the current directory</p>
-
-<br>
-<blockquote>
-<pre>&lt;replaceregexp match="\s+" replace=" " flags="g" byline="true"&gt;
+    &lt;regexp pattern=&quot;OldProperty=(.*)&quot;/&gt;
+    &lt;substitution expression=&quot;NewProperty=\1&quot;/&gt;
+    &lt;fileset dir=&quot;.&quot;&gt;
+        &lt;include name=&quot;*.properties&quot;/&gt;
+    &lt;/fileset&gt;
+&lt;/replaceregexp&gt;</pre>
+<p>replaces occurrences of the property name <q>OldProperty</q> with <q>NewProperty</q> in a
+properties file, preserving the existing value, in all files ending in <samp>.properties</samp> in
+the current directory</p>
+
+<pre>
+&lt;replaceregexp match="\s+" replace=" " flags="g" byline="true"&gt;
     &lt;fileset dir="${html.dir}" includes="**/*.html"/&gt;
-&lt;/replaceregexp&gt;
-</pre></blockquote>
-<p>replaces all whitespaces (blanks, tabs, etc) by one blank remaining the
-line separator. So with input
-<blockquote>
+&lt;/replaceregexp&gt;</pre>
+<p>replaces all whitespaces (blanks, tabs, etc) by one blank remaining the line separator. So with
+input</p>
+
 <pre>
 &lt;html&gt;    &lt;body&gt;
-&lt;&lt;TAB&gt;&gt;&lt;h1&gt;    T E S T   &lt;/h1&gt;  &lt;&lt;TAB&gt;&gt;    
-&lt;&lt;TAB&gt;&gt; &lt;/body&gt;&lt;/html&gt;
-</pre></blockquote>
-would converted to
-<blockquote>
+&lt;&lt;TAB&gt;&gt;&lt;h1&gt;    T E S T   &lt;/h1&gt;  &lt;&lt;TAB&gt;&gt;
+&lt;&lt;TAB&gt;&gt; &lt;/body&gt;&lt;/html&gt;</pre>
+<p>would converted to</p>
 <pre>
 &lt;html&gt; &lt;body&gt;
- &lt;h1&gt; T E S T &lt;/h1&gt; &lt;/body&gt;&lt;/html&gt;
-</pre>
-</blockquote>
-</p>
-
-<br><!-- small distance from code of the previous example -->
-<blockquote>
-<pre>&lt;replaceregexp match="\\n" replace="${line.separator}" flags="g" byline="true"&gt;
+ &lt;h1&gt; T E S T &lt;/h1&gt; &lt;/body&gt;&lt;/html&gt;</pre>
+
+<br/><!-- small distance from code of the previous example -->
+
+<pre>
+&lt;replaceregexp match="\\n" replace="${line.separator}" flags="g" byline="true"&gt;
     &lt;fileset dir="${dir}"/&gt;
-&lt;/replaceregexp&gt;
-</pre></blockquote>
-<p>replaces all <tt>\n</tt> markers (beware the quoting of the backslash) by a line break.
-So with input
-<blockquote>
-<pre>
-one\ntwo\nthree
-</pre></blockquote>
-would converted to
-<blockquote>
+&lt;/replaceregexp&gt;</pre>
+<p>replaces all <q>\n</q> markers (beware the quoting of the backslash) by a line break.  So with
+input</p>
+<pre>one\ntwo\nthree</pre>
+<p>would converted to</p>
 <pre>
 one
 two
-three
-</pre>
-</blockquote>
-Beware that inserting line breaks could break file syntax. For example in xml:
-<blockquote>
+three</pre>
+
+<p>Beware that inserting line breaks could break file syntax. For example in xml:</p>
 <pre>
 &lt;root&gt;
-  &lt;text&gt;line breaks \n should work in text&lt;/text&gt;
-  &lt;attribute value=&quot;but breaks \n attributes&quot; /&gt;
-&lt;/root&gt;
-</pre>
-</blockquote>
-</p>
-
-
+    &lt;text&gt;line breaks \n should work in text&lt;/text&gt;
+    &lt;attribute value=&quot;but breaks \n attributes&quot;/&gt;
+&lt;/root&gt;</pre>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/resourcecount.html ant-1.10.3/manual/Tasks/resourcecount.html
--- ant-1.9.10/manual/Tasks/resourcecount.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/resourcecount.html	2018-03-24 12:37:12.000000000 +0000
@@ -25,60 +25,61 @@
 <body>
 
 <h2>ResourceCount</h2>
-
+<p><em>Since Apache Ant 1.7</em></p>
 <h3>Description</h3>
-<p>Display or set a property containing the size of a nested
-   <a href="../Types/resources.html#collection">Resource Collection</a>.
-   Can also be used as a condition. <b>Since Apache Ant 1.7</b></p>
+<p>Display or set a property containing the size of a
+nested <a href="../Types/resources.html#collection">resource collection</a>.  Can also be used as
+a <code>condition</code>.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
+  <tr>
+    <th rowspan="2">Attribute</th>
+    <th rowspan="2">Description</th>
+    <th colspan="2">Required</th>
+  </tr>
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Task</th>
+    <th>Condition</th>
   </tr>
   <tr>
-    <td valign="top">property</td>
-    <td valign="top">The property to set. If omitted the results are written
-      to the log. Ignored when processing as a condition.</td>
-    <td valign="top" align="center">No</td>
+    <td>property</td>
+    <td>The property to set.</td>
+    <td class="center">No; by default, output value to the log</td>
+    <td>Ignored</td>
   </tr>
   <tr>
-    <td valign="top">refid</td>
-    <td valign="top">A <a href="../using.html#references">reference</a>
-      to a Resource Collection.</td>
-    <td valign="top" align="center">
-      Yes, unless a nested Resource Collection is supplied
-    </td>
+    <td>refid</td>
+    <td>A <a href="../using.html#references">reference</a> to a resource collection.</td>
+    <td colspan="2">Yes, unless a nested resource collection is supplied</td>
   </tr>
   <tr>
-    <td valign="top">count</td>
-    <td valign="top">Comparison count for processing as a condition.</td>
-    <td valign="top" align="center">Yes, in condition mode</td>
+    <td>count</td>
+    <td>Comparison count.</td>
+    <td class="center">Ignored</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">when</td>
-    <td valign="top">Comparison type: "equal", "eq", "greater", "gt", "less",
-      "lt", "ge" (greater or equal), "ne" (not equal), "le" (less or equal)
-      for use when operating as a condition.</td>
-    <td valign="top" align="center">No; default is "equal"</td>
+    <td>when</td>
+    <td>Comparison
+    type: <q>equal</q>, <q>eq</q>, <q>greater</q>, <q>gt</q>, <q>less</q>, <q>lt</q>, <q>ge</q>
+    (greater or equal), <q>ne</q> (not equal), <q>le</q> (less or equal).</td>
+    <td class="center">Ignored</td>
+    <td>No; default is <q>equal</q></td>
   </tr>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
-<h4>Resource Collection</h4>
-<p>A single
-  <a href="../Types/resources.html#collection">Resource Collection</a>
-should be specified via a nested element or the <code>refid</code> attribute.
-</p>
+<h4>resource collection</h4>
+<p>A single <a href="../Types/resources.html#collection">resource collection</a> should be specified
+via a nested element or the <var>refid</var> attribute.</p>
 
 <h3>Examples</h3>
-<pre>&lt;resourcecount property=&quot;count.foo&quot;&gt;
-  &lt;filelist dir=&quot;.&quot; files=&quot;foo,bar&quot; /&gt;
-&lt;/resourcecount&gt;
-</pre>
-<p>Stores the number of resources in the specified filelist (two)
-in the property named <i>count.foo</i>.</p>
+<pre>
+&lt;resourcecount property=&quot;count.foo&quot;&gt;
+  &lt;filelist dir=&quot;.&quot; files=&quot;foo,bar&quot;/&gt;
+&lt;/resourcecount&gt;</pre>
+<p>Stores the number of resources in the specified filelist (two) in the property
+named <samp>count.foo</samp>.</p>
 
 <pre>
 &lt;project&gt;
@@ -96,12 +97,9 @@
     &lt;/tokens&gt;
   &lt;/resourcecount&gt;
   &lt;echo&gt;The file '${file}' has ${file.lines} lines.&lt;/echo&gt;
-&lt;/project&gt;
-</pre>
-<p>Stores the number of lines of the current buildfile in the property <tt>file.lines</tt>.
-Requires Ant 1.7.1+ as &lt;concat&gt; has to be resource.</p>
-
+&lt;/project&gt;</pre>
+<p>Stores the number of lines of the current buildfile in the property <code>file.lines</code>.
+Requires Ant 1.7.1+ as <code>&lt;concat&gt;</code> has to be a resource.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/retry.html ant-1.10.3/manual/Tasks/retry.html
--- ant-1.9.10/manual/Tasks/retry.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/retry.html	2018-03-24 12:37:12.000000000 +0000
@@ -23,28 +23,29 @@
 </head>
 <body>
 <h2>Retry</h2>
+<p><em>Since Apache Ant 1.7.1</em></p>
 <h3>Description</h3>
-<p>Retry is a container which executes a single nested task until either: there is no failure; or:
-its <em>retrycount</em> has been exceeded. If this happens a BuildException is thrown.
-<em>Since Apache Ant 1.7.1</em></p>
+<p><code>Retry</code> is a container which executes a single nested task until either: there is no
+failure; or: its <var>retrycount</var> has been exceeded. If this happens
+a <code>BuildException</code> is thrown.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr> 
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
-  <tr> 
-    <td valign="top">retrycount</td>
-    <td valign="top">number of times to attempt to execute the nested task</td>
-    <td valign="top" align="center">Yes</td>
+  <tr>
+    <td>retrycount</td>
+    <td>number of times to attempt to execute the nested task</td>
+    <td>Yes</td>
   </tr>
-  <tr> 
-    <td valign="top">retrydelay</td>
-    <td valign="top">number of milliseconds to wait between retry attempts
-    task. <em>Since Apache Ant 1.8.3</em></td>
-    <td valign="top" align="center">No, defaults to no delay</td>
+  <tr>
+    <td>retrydelay</td>
+    <td>number of milliseconds to wait between retry attempts task. <em>Since Apache Ant
+    1.8.3</em></td>
+    <td>No; defaults to no delay</td>
   </tr>
 </table>
 <p>Any valid Ant task may be embedded within the retry task.</p>
@@ -52,10 +53,10 @@
 <h3>Example</h3>
 <pre>
 &lt;retry retrycount="3"&gt;
-  &lt;get src="http://www.unreliable-server.com/unreliable.tar.gz" 
-       dest="/home/retry/unreliable.tar.gz" /&gt;
-&lt;/retry&gt;
-</pre>
-<p>This example shows how to use <code>&lt;retry&gt;</code> to wrap a task which must interact with an unreliable network resource.</p>
+  &lt;get src="http://www.unreliable-server.com/unreliable.tar.gz"
+       dest="/home/retry/unreliable.tar.gz"/&gt;
+&lt;/retry&gt;</pre>
+<p>This example shows how to use <code>&lt;retry&gt;</code> to wrap a task which must interact with
+an unreliable network resource.</p>
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/rexec.html ant-1.10.3/manual/Tasks/rexec.html
--- ant-1.9.10/manual/Tasks/rexec.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/rexec.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,22 +24,23 @@
 
 <body>
 
-<h2><a name="rexec">RExec</a></h2>
+<h2 id="rexec">RExec</h2>
 <h3>Description</h3>
-Task to automate a remote rexec session. Just like the Telnet task,
-it uses nested <tt>&lt;read&gt;</tt> to indicate strings to wait for, and
-<tt>&lt;write&gt;</tt> tags to specify text to send to the remote process.
-
-<p><b>Note:</b> This task depends on external libraries not included in the Apache Ant distribution.
-See <a href="../install.html#librarydependencies">Library Dependencies</a> for more information.</p>
-
-<p>You can specify the commands you want to execute as nested elements
-or via the command attribute, we recommend you use the command
-attribute.  If you use the command attribute, you must use the
-username and password attributes as well.</p>
+<p>Task to automate a remote rexec session. Just like the <code>Telnet</code> task, it uses
+nested <code>&lt;read&gt;</code> to indicate strings to wait for, and
+<code>&lt;write&gt;</code> tags to specify text to send to the remote
+process.</p>
+
+<p><strong>Note</strong>: This task depends on external libraries not included in the Apache Ant
+distribution.  See <a href="../install.html#librarydependencies">Library Dependencies</a> for more
+information.</p>
+
+<p>You can specify the commands you want to execute as nested elements or via the <var>command</var>
+attribute, we recommend you use the <var>command</var> attribute.  If you use the <var>command</var>
+attribute, you must use the <var>username</var> and <var>password</var> attributes as well.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -67,50 +68,40 @@
   </tr>
   <tr>
      <td>port</td>
-     <td>the port number of the remote rexec server. Defaults to port 512 in BSD Unix systems.</td>
-     <td>No</td>
+      <td>the port number of the remote rexec server.</td>
+     <td>No; defaults to <q>512</q> in Unix</td>
   </tr>
   <tr>
      <td>timeout</td>
-     <td>set a default timeout to wait for a response. Specified in seconds. Default is no timeout.</td>
-     <td>No</td>
+     <td>set a default timeout to wait for a response, specified in seconds.</td>
+     <td>No; default is no timeout</td>
   </tr>
 </table>
-<h3><a name="nested">Nested Elements</a></h3>
-The input to send to the server, and responses to wait for, are
-described as nested elements.  
+<h3 id="nested">Parameters specified as nested elements</h3>
+<p>The input to send to the server, and responses to wait for, are described as nested elements.</p>
 
 <h4>read</h4>
 
-<p>declare (as a text child of this element) a string to wait for.
-The element supports the timeout attribute, which overrides any
-timeout specified for the task as a whole. It also has a <tt>string</tt>
-attribute, which is an alternative to specifying the string as 
-a text element.
-</p>
-<i>It is not necessary to declare a closing <code>&lt;read&gt;</code> element like for the Telnet task. The connection is not broken until the command has completed and
-the input stream (output of the command) is terminated.
-</i>
+<p>declare (as a text child of this element) a string to wait for.  The element supports
+the <var>timeout</var> attribute, which overrides any timeout specified for the task as a whole. It
+also has a <var>string</var> attribute, which is an alternative to specifying the string as a text
+element.</p>
+<p><em>It is not necessary to declare a closing <code>&lt;read&gt;</code> element like for
+the <code>Telnet</code> task. The connection is not broken until the command has completed and the
+input stream (output of the command) is terminated.</em></p>
+
 <h4>write</h4>
 
-<p>describes the text to send to the server. The <tt>echo</tt> boolean
-attribute controls whether the string is echoed to the local log; 
-this is "true" by default
-</p>
+<p>describes the text to send to the server. The <var>echo</var> boolean attribute controls whether
+the string is echoed to the local log; this is <q>true</q> by default.</p>
 <h3>Example</h3>
-A simple example of connecting to a server and running a command.
+<p>A simple example of connecting to a server and running a command.</p>
 
-<blockquote><pre>
-&lt;rexec userid=&quot;bob&quot; password=&quot;badpass&quot; server=&quot;localhost&quot; command=&quot;ls&quot;/&gt;
-</pre></blockquote>
-
-The task can be used with other ports as well:
-<blockquote><pre>
-&lt;rexec port=&quot;80&quot; userid=&quot;bob&quot; password=&quot;badpass&quot; server=&quot;localhost&quot; command=&quot;ls&quot;/&gt;
-</pre></blockquote>
+<pre>&lt;rexec userid=&quot;bob&quot; password=&quot;badpass&quot; server=&quot;localhost&quot; command=&quot;ls&quot;/&gt;</pre>
 
+<p>The task can be used with other ports as well:</p>
 
+<pre>&lt;rexec port=&quot;80&quot; userid=&quot;bob&quot; password=&quot;badpass&quot; server=&quot;localhost&quot; command=&quot;ls&quot;/&gt;</pre>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/rmic.html ant-1.10.3/manual/Tasks/rmic.html
--- ant-1.9.10/manual/Tasks/rmic.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/rmic.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,322 +24,293 @@
 
 <body>
 
-<h2><a name="rmic">Rmic</a></h2>
+<h2 id="rmic">Rmic</h2>
 <h3>Description</h3>
-<p>Runs the rmic compiler for a certain class.</p>
-<p>Rmic can be run on a single class (as specified with the classname
-attribute) or a number of classes at once (all classes below base that
-are neither _Stub nor _Skel classes).  If you want to rmic a single
-class and this class is a class nested into another class, you have to
-specify the classname in the form <code>Outer$$Inner</code> instead of
-<code>Outer.Inner</code>.</p>
-<p>It is possible to refine the set of files that are being rmiced. This can be
-done with the <i>includes</i>, <i>includesfile</i>, <i>excludes</i>, <i>excludesfile</i> and <i>defaultexcludes</i>
-attributes. With the <i>includes</i> or <i>includesfile</i> attribute you specify the files you want to
-have included by using patterns. The <i>exclude</i> or <i>excludesfile</i> attribute is used to specify
-the files you want to have excluded. This is also done with patterns. And
-finally with the <i>defaultexcludes</i> attribute, you can specify whether you
-want to use default exclusions or not. See the section on <a
-href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
+<p>Runs the <kbd>rmic</kbd> compiler for a certain class.</p>
+<p><code>Rmic</code> can be run on a single class (as specified with the classname attribute) or a
+number of classes at once (all classes below base that are neither <code>_Stub</code>
+nor <code>_Skel</code> classes).  If you want to <code>rmic</code> a single class and this class is
+a class nested into another class, you have to specify the classname in the
+form <code>Outer$$Inner</code> instead of <code>Outer.Inner</code>.</p>
+<p>It is possible to refine the set of files that are being <code>rmic</code>ed. This can be done
+with the <var>includes</var>, <var>includesfile</var>, <var>excludes</var>, <var>excludesfile</var>
+and <var>defaultexcludes</var> attributes. With the <var>includes</var> or <var>includesfile</var>
+attribute you specify the files you want to have included by using patterns. The <var>exclude</var>
+or <var>excludesfile</var> attribute is used to specify the files you want to have excluded. This is
+also done with patterns. And finally with the <var>defaultexcludes</var> attribute, you can specify
+whether you want to use default exclusions or not. See the section
+on <a href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
 inclusion/exclusion of files works, and how to write patterns.</p>
-<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and
-supports most attributes of <code>&lt;fileset&gt;</code>
-(<code>dir</code> becomes <code>base</code>) as well as the nested
-<code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and
-<code>&lt;patternset&gt;</code> elements.</p>
-<p>It is possible to use different compilers. This can be selected
-with the &quot;build.rmic&quot; property, the <code>compiler</code>
-attribute. or a nested element.
-<a name="compilervalues">Here are the choices</a>:</p>
+<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and supports most
+attributes of <code>&lt;fileset&gt;</code> (<var>dir</var> becomes <var>base</var>) as well as the
+nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code>
+and <code>&lt;patternset&gt;</code> elements.</p>
+<p id="compilervalues">It is possible to use different compilers. This can be selected with
+the <code>build.rmic</code> property, the <var>compiler</var> attribute, or a nested element. Here
+are the choices:</p>
 <ul>
-  <li>default -the default compiler (kaffe, sun or forking) for the platform.
-  <li>sun (the standard compiler of the JDK &lt; JDK 9)</li>
-  <li>kaffe (the standard compiler of <a href="http://www.kaffe.org" target="_top">Kaffe</a>)</li>
-  <li>weblogic</li>
-  <li>forking - the sun compiler forked into a separate process (since
-    Apache Ant 1.7). Starting with Ant 1.9.8 this is the default when
-    running on JDK 9+.</li>
-  <li>xnew - the sun compiler forked into a separate process,
-      with the -Xnew option (since Ant 1.7).
-    This is the most reliable way to use -Xnew.
-    <br></br>JDK9 has removed support for -Xnew and starting with Ant
-    1.9.8 this option will be rejected by ant when running on JDK9.</li>
-    <li> "" (empty string). This has the same behaviour as not setting the compiler attribute.
-    First the value of <tt>build.rmic</tt> is used if defined, and if not, the default
-    for the platform is chosen. If build.rmic is set to this, you get the default.
-
+  <li><q>default</q>&mdash;the default compiler (<q>kaffe</q>, <q>sun</q> or <q>forking</q>) for the
+    platform.
+  <li><q>sun</q>&mdash;the standard compiler prior to JDK 9</li>
+  <li><q>kaffe</q>&mdash;the standard compiler of <a href="http://www.kaffe.org"
+    target="_top">Kaffe</a></li>
+  <li><q>weblogic</q></li>
+  <li><q>forking</q>&mdash;(<em>since Apache Ant 1.7</em>) the <q>sun</q> compiler forked into a
+    separate process.  <em>Since Ant 1.9.8</em>, this is the default when running on JDK 9+.</li>
+  <li><q>xnew</q>&mdash;(<em>since Ant 1.7</em>) the <q>sun</q> compiler forked into a separate
+    process, with the <kbd>-Xnew</kbd> option. This is the most reliable way to
+    use <kbd>-Xnew</kbd>.<br/>JDK 9 has removed support for <kbd>-Xnew</kbd> and <em>since Ant
+    1.9.8</em> this option will be rejected when running on JDK 9+.</li>
+  <li><q></q> (empty string). This has the same behaviour as not setting the compiler attribute.
+    First the value of <code>build.rmic</code> is used if defined, and if not, the default for the
+    platform is chosen. If <code>build.rmic</code> is set to this, you get the default.</li>
 </ul>
 
-<p>The <a href="http://dione.zcu.cz/~toman40/miniRMI/">miniRMI</a>
-project contains a compiler implementation for this task as well,
-please consult miniRMI's documentation to learn how to use it.</p>
+<p>The <a href="https://web.archive.org/web/20131225023602/http://dione.zcu.cz/~toman40/miniRMI/"
+target="_top">miniRMI</a> project contains a compiler implementation for this task as well, please
+consult miniRMI's documentation to learn how to use it.</p>
+
+<h4>CORBA support</h4>
+
+<p>Java 11 <a href="http://openjdk.java.net/jeps/320" target="_top">removes</a> the Java EE and
+CORBA packages and <kbd>rmic</kbd> no longer supports either <kbd>-iiop</kbd>
+or <kbd>-idl</kbd> options. Starting with Ant 1.10.3, the <kbd>rmic</kbd> task will fail when using
+either while running Java 11+ unless you fork the task and explicitly specify an executable.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
-  <tr>
-    <td valign="top">base</td>
-    <td valign="top">the location to store the compiled files.
-      Also serves as the parent directory for any non-Fileset includes, etc.
-      (This functionality has remained unchanged.)</td>
-    <td valign="top" align="center" rowspan="2"><a href="#footnote-1">*1</a></td>
+  <tr id="footnote-1-back">
+    <td>base</td>
+    <td>the location to store the compiled files.  Also serves as the parent directory for any
+      non-Fileset includes, etc.  (This functionality has remained unchanged.)</td>
+    <td rowspan="2">See <a href="#footnote-1">note</a></td>
   </tr>
   <tr>
-    <td valign="top">destdir</td>
-    <td valign="top">the location to store the compiled files.</td>
+    <td>destdir</td>
+    <td class="left">the location to store the compiled files.</td>
   </tr>
   <tr>
-    <td valign="top">classname</td>
-    <td valign="top">the class for which to run <code>rmic</code>.</td>
-    <td valign="top" align="center">No</td>
+    <td>classname</td>
+    <td>the class for which to run <kbd>rmic</kbd>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">filtering</td>
-    <td valign="top">indicates whether token filtering should take place</td>
-    <td valign="top" align="center">No</td>
+    <td>filtering</td>
+    <td>indicates whether token filtering should take place</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">sourcebase</td>
-    <td valign="top">Pass the &quot;-keepgenerated&quot; flag to rmic and
- move the generated source file to the given sourcebase directory.</td>
-    <td align="center" valign="top">No</td>
+    <td>sourcebase</td>
+    <td>Pass the <kbd>-keepgenerated</kbd> flag to <kbd>rmic</kbd> and move the generated source
+      file to the given <var>sourcebase</var> directory.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">stubversion</td>
-    <td valign="top">Specify the JDK version for the generated stub code.
- Specify &quot;1.1&quot; to pass the &quot;-v1.1&quot; option to rmic,
- "1.2" for -v12, compat for -vcompat. <br>
-        Since Ant1.7, if you do not specify a version, and do not ask
-        for iiop or idl files, "compat" is selected.
- 
- </td>
-    <td align="center" valign="top">No, default="compat"</td>
+    <td>stubversion</td>
+    <td>Specify the JDK version for the generated stub code.  Specify <q>1.1</q> to pass
+      the <kbd>-v1.1</kbd> option to <kbd>rmic</kbd>, <q>1.2</q>
+      for <kbd>-v1.2</kbd>, <q>compat</q> for <kbd>-vcompat</kbd>.<br/><em>Since Ant 1.7</em>, if
+      you do not specify a version, and do not ask for <samp>.iiop</samp> or <samp>.idl</samp>
+      files, <q>compat</q> is selected.</td>
+    <td>No; default is <q>compat</q></td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">The classpath to use during compilation</td>
-    <td align="center" valign="top">No</td>
+    <td>classpath</td>
+    <td>The classpath to use during compilation</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">The classpath to use during compilation, given as <a
-      href="../using.html#references">reference</a> to a PATH defined elsewhere</td>
-    <td align="center" valign="top">No</td>
+    <td>classpathref</td>
+    <td>The classpath to use during compilation, given
+      as <a href="../using.html#references">reference</a> to a path defined elsewhere</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">includes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      included. All files are included when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>includes</td>
+    <td>comma- or space-separated list of patterns of files that must be included.</td>
+    <td>No; defaults to all (<q>**</q>)</td>
   </tr>
   <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an include pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>includesfile</td>
+    <td>name of a file. Each line of this file is taken to be an include pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">excludes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      excluded. No files (except default excludes) are excluded when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>excludes</td>
+    <td>comma- or space-separated list of patterns of files that must be excluded.</td>
+    <td>No; defaults to default excludes or none if <var>defaultexcludes</var> is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an exclude pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>excludesfile</td>
+    <td>name of a file. Each line of this file is taken to be an exclude pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">defaultexcludes</td>
-    <td valign="top">indicates whether default excludes should be used or not
-      (&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>defaultexcludes</td>
+    <td>indicates whether default excludes should be used or not (<q>yes|no</q>).</td>
+    <td>No; defaults to <q>yes</q></td>
   </tr>
   <tr>
-    <td valign="top">verify</td>
-    <td valign="top">check that classes implement Remote before handing them 
-        to rmic (default is false)</td>
-    <td align="center" valign="top">No</td>
+    <td>verify</td>
+    <td>check that classes implement <code>Remote</code> before handing them to <kbd>rmic</kbd></td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">iiop</td>
-    <td valign="top">indicates that portable (RMI/IIOP) stubs should be generated</td>
-    <td align="center" valign="top">No</td>
+    <td>iiop</td>
+    <td>indicates that portable (RMI/IIOP) stubs should be generated.<br/>  See the note on CORBA
+      support above.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">iiopopts</td>
-    <td valign="top">additional arguments for IIOP class generation</td>
-    <td align="center" valign="top">No</td>
+    <td>iiopopts</td>
+    <td>additional arguments for IIOP class generation</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">idl</td>
-    <td valign="top">indicates that IDL output files should be generated</td>
-    <td align="center" valign="top">No</td>
+    <td>idl</td>
+    <td>indicates that IDL output files should be generated.<br/>  See the note on CORBA support
+      above.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">idlopts</td>
-    <td valign="top">additional arguments for IDL file generation</td>
-    <td align="center" valign="top">No</td>
+    <td>idlopts</td>
+    <td>additional arguments for IDL file generation</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">debug</td>
-    <td valign="top">generate debug info (passes -g to rmic). Defaults to false.</td>
-    <td align="center" valign="top">No</td>
+    <td>debug</td>
+    <td>generate debug info (passes <kbd>-g</kbd> to <kbd>rmic</kbd>)</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">includeAntRuntime</td> 
-    <td valign="top">whether to include the Ant run-time libraries;
-      defaults to <code>yes</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>includeAntRuntime</td>
+    <td>whether to include the Ant run-time libraries</td>
+    <td>No; defaults to <q>yes</q></td>
   </tr>
   <tr>
-    <td valign="top">includeJavaRuntime</td> 
-    <td valign="top">whether to include the default run-time
-      libraries from the executing VM; defaults to <code>no</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>includeJavaRuntime</td>
+    <td>whether to include the default run-time libraries from the executing JVM</td>
+    <td>No; defaults to <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">extdirs</td>
-    <td valign="top">location of installed extensions.</td>
-    <td align="center" valign="top">No</td>
+    <td>extdirs</td>
+    <td>location of installed extensions</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">compiler</td>
-    <td valign="top">The compiler implementation to use.
-      If this attribute is not set, the value of the
-      <code>build.rmic</code> property, if set, will be used.
-      Otherwise, the default compiler for the current VM will be used.
-      (See the above <a href="#compilervalues">list</a> of valid
-      compilers.)</td>
-    <td align="center" valign="top">No</td>
+    <td>compiler</td>
+    <td>The compiler implementation to use.  (See the above <a href="#compilervalues">list</a> of
+      valid compilers.)</td>
+    <td>No; defaults to the value of the <code>build.rmic</code> property, if set, and the default
+      compiler for the current JDK otherwise</td>
   </tr>
   <tr>
-    <td valign="top">executable</td>
-    <td valign="top">Complete path to the <code>rmic</code>
-      executable to use in case of the <code>forking</code>
-      or <code>xnew</code> compiler.
-      Defaults to the rmic compiler of the Java version that is currently
-      running Ant.<br/>
-      <em>Since Ant 1.8.0</em>.</td>
-    <td align="center" valign="top">No</td>
+    <td>executable</td>
+    <td>Complete path to the <kbd>rmic</kbd> executable to use in case of the <q>forking</q>
+      or <q>xnew</q> compiler. <em>Since Ant 1.8.0</em>.</td>
+    <td>No; defaults to the <kbd>rmic</kbd> compiler of JDK that is currently running Ant</td>
   </tr>
   <tr>
-    <td valign="top">listfiles</td>
-    <td valign="top">Indicates whether the source files to be compiled will
-      be listed; defaults to <code>no</code>.<br/>
-      <em>Since Ant 1.8.0</em>.</td>
-    <td align="center" valign="top">No</td>
+    <td>listfiles</td>
+    <td>Indicates whether the source files to be compiled will be listed. <em>Since Ant
+      1.8.0</em>.</td>
+    <td>No; defaults to <q>no</q></td>
   </tr>
 </table>
 
-<p><a name="footnote-1">*1</a>:
+<p id="footnote-1"><a href="#footnote-1-back">Note</a>:</p>
 <ul>
-  <li>Maintaining compatibility, <code>base</code>, when specified by
-    itself, serves as both the parent directory for any source files
-    AND the output directory.</li>
-  <li><code>destdir</code> can be used to specify the output
-    directory, allowing for <code>base</code> to be used as the parent
-    directory for any source files.</li>
-  <li>At least one of either <code>base</code> or <code>destdir</code>
-    must be specified and exist, or a runtime error will
-    occur.</li>
+  <li>Maintaining compatibility, <var>base</var>, when specified by itself, serves as both the
+    parent directory for any source files AND the output directory.</li>
+  <li><var>destdir</var> can be used to specify the output directory, allowing for <var>base</var>
+    to be used as the parent directory for any source files.</li>
+  <li>At least one of either <var>base</var> or <var>destdir</var> must be specified and exist, or
+    an error will occur at run time.</li>
 </ul>
-</p>
 
 <h3>Parameters specified as nested elements</h3>
 <h4>classpath and extdirs</h4>
-<p><code>Rmic</code>'s <i>classpath</i> and <i>extdirs</i> attributes are <a
-href="../using.html#path">PATH like structure</a> and can also be set via a nested
-<i>classpath</i> and <i>extdirs</i> elements.</p>
+<p><code>Rmic</code>'s <var>classpath</var> and <var>extdirs</var> attributes
+are <a href="../using.html#path">path-like structure</a> and can also be set via a nested
+<code>classpath</code> and <code>extdirs</code> elements.</p>
 
 <h4>compilerarg</h4>
 
-<p>You can specify additional command line arguments for the compiler
-with nested <code>&lt;compilerarg&gt;</code> elements.  These elements
-are specified like <a href="../using.html#arg">Command-line
-Arguments</a> but have an additional attribute that can be used to
-enable arguments only if a given compiler implementation will be
-used.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<p>You can specify additional command line arguments for the compiler with
+nested <code>&lt;compilerarg&gt;</code> elements.  These elements are specified
+like <a href="../using.html#arg">Command-line Arguments</a> but have an additional attribute that
+can be used to enable arguments only if a given compiler implementation will be used.</p>
+<table class="attr">
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <th>Attribute</th>
+  <th>Description</th>
+  <th>Required</th>
 </tr>
   <tr>
-    <td valign="top">value</td>
-    <td align="center" rowspan="4">See
-    <a href="../using.html#arg">Command-line Arguments</a>.</td>
-    <td align="center" rowspan="4">Exactly one of these.</td>
+    <td>value</td>
+    <td rowspan="4">See <a href="../using.html#arg">Command-line Arguments</a>.</td>
+    <td rowspan="4">Exactly one of these</td>
   </tr>
   <tr>
-    <td valign="top">line</td>
+    <td class="var">line</td>
   </tr>
   <tr>
-    <td valign="top">file</td>
+    <td class="var">file</td>
   </tr>
   <tr>
-    <td valign="top">path</td>
+    <td class="var">path</td>
   </tr>
   <tr>
-    <td valign="top">prefix</td>
-    <td align="center" rowspan="2">See
+    <td>prefix</td>
+    <td rowspan="2">See
     <a href="../using.html#arg">Command-line Arguments</a>.
-    <em>Since Ant 1.8.</em></td>
-    <td valign="top" align="center">No</td>
+    <em>Since Ant 1.8</em>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">suffix</td>
-    <td valign="top" align="center">No</td>
+    <td>suffix</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">compiler</td>
-    <td>Only pass the specified argument if the chosen
-      compiler implementation matches the value of this attribute.
-      Legal values are the
-      same as those in the above <a href="#compilervalues">list</a> of valid
-      compilers.)</td>
-    <td align="center">No</td>
+    <td>compiler</td>
+    <td>Only pass the specified argument if the chosen compiler implementation matches the value of
+      this attribute.  Legal values are the same as those in the
+      above <a href="#compilervalues">list</a> of valid compilers.)</td>
+    <td>No</td>
   </tr>
 </table>
 
-<h4>compilerclasspath <em>since Ant 1.8.0</em></h4>
-
-<p>A <a href="../using.html#path">PATH like structure</a> holding the
-  classpath to use when loading the compiler implementation if a
-  custom class has been specified.  Doesn't have any effect when
-  using one of the built-in compilers.</p>
-
-<h4>Any nested element of a type that implements RmicAdapter
-  <em>since Ant 1.8.0</em></h4>
-
-<p>If a defined type implements the <code>RmicAdapter</code>
-  interface a nested element of that type can be used as an
-  alternative to the <code>compiler</code> attribute.</p>
+<h4>compilerclasspath</h4>
+<p><em>Since Ant 1.8.0</em></p>
+<p>A <a href="../using.html#path">path-like structure</a> holding the classpath to use when loading
+the compiler implementation if a custom class has been specified.  Doesn't have any effect when
+using one of the built-in compilers.</p>
+
+<h4>Any nested element of a type that implements RmicAdapter</h4>
+<p><em>Since Ant 1.8.0</em></p>
+<p>If a defined type implements the <code>RmicAdapter</code> interface a nested element of that type
+can be used as an alternative to the <var>compiler</var> attribute.</p>
 
 <h3>Examples</h3>
-<pre>  &lt;rmic classname=&quot;com.xyz.FooBar&quot; base=&quot;${build}/classes&quot;/&gt;</pre>
-<p>runs the rmic compiler for the class <code>com.xyz.FooBar</code>. The
-compiled files will be stored in the directory <code>${build}/classes</code>.</p>
-<pre>  &lt;rmic base=&quot;${build}/classes&quot; includes=&quot;**/Remote*.class&quot;/&gt;</pre>
-<p>runs the rmic compiler for all classes with <code>.class</code>
-files below <code>${build}/classes</code> whose classname starts with
-<i>Remote</i>. The compiled files will be stored in the directory
-<code>${build}/classes</code>.</p>
-
-<p>If you want to use a custom
-  RmicAdapter <code>org.example.MyAdapter</code> you can either
-  use the compiler attribute:</p>
+<pre>&lt;rmic classname=&quot;com.xyz.FooBar&quot; base=&quot;${build}/classes&quot;/&gt;</pre>
+<p>runs the <kbd>rmic</kbd> compiler for the class <code>com.xyz.FooBar</code>. The compiled files
+will be stored in the directory <samp>${build}/classes</samp>.</p>
+<pre>&lt;rmic base=&quot;${build}/classes&quot; includes=&quot;**/Remote*.class&quot;/&gt;</pre>
+<p>runs the <kbd>rmic</kbd> compiler for all classes with <samp>.class</samp> files
+below <samp>${build}/classes</samp> whose classname starts with <code>Remote</code>. The compiled
+files will be stored in the directory <samp>${build}/classes</samp>.</p>
+
+<p>If you want to use a custom RmicAdapter <code>org.example.MyAdapter</code> you can either use
+the <var>compiler</var> attribute:</p>
 <pre>
 &lt;rmic classname=&quot;com.xyz.FooBar&quot;
       base=&quot;${build}/classes&quot;
-      compiler="org.example.MyAdapter"/&gt;
-</pre>
+      compiler="org.example.MyAdapter"/&gt;</pre>
 <p>or a define a type and nest this into the task like in:</p>
 <pre>
 &lt;componentdef classname="org.example.MyAdapter"
@@ -347,11 +318,8 @@
 &lt;rmic classname=&quot;com.xyz.FooBar&quot;
       base=&quot;${build}/classes&quot;&gt;
   &lt;myadapter/&gt;
-&lt;/rmic&gt;
-</pre>
-<p>in which case your compiler adapter can support attributes and
-  nested elements of its own.</p>
+&lt;/rmic&gt;</pre>
+<p>in which case your compiler adapter can support attributes and nested elements of its own.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/rpm.html ant-1.10.3/manual/Tasks/rpm.html
--- ant-1.9.10/manual/Tasks/rpm.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/rpm.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,100 +24,86 @@
 
 <body>
 
-<h2><a name="rpm">Rpm</a></h2>
+<h2 id="rpm">Rpm</h2>
 <h3>Description</h3>
-<p>
-  A basic task for invoking the rpm executable to build a RedHat Package Manager Linux installation
-  file. The task currently only works on Linux or other Unix platforms with rpm support.
-</p>
+<p> A basic task for invoking the <code>rpm</code> executable to build a RedHat Package Manager
+Linux installation file. The task currently only works on Linux or other Unix platforms
+with <code>rpm</code> support.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">specFile</td>
-    <td valign="top">The name of the spec file to be used. This must be relative to the SPECS directory
-    under the root of the RPM set in the topDir attribute.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>specFile</td>
+    <td>The name of the spec file to be used. This must be relative to the <samp>SPECS</samp>
+      directory under the root of the RPM set in the <var>topDir</var> attribute.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">topDir</td>
-    <td valign="top">
-      This is the directory which will have the expected
-      subdirectories, SPECS, SOURCES, BUILD, SRPMS.  If this isn't specified,
-      the default RPM directory of the system (or user, if ~/.rpmmacros defines it) is used (often
-      /usr/src/rpm.<br>
-      Defining a topdir will set <tt>%_topdir</tt> to the specified directory -there is no need
-      to edit your .rpmmacros file.
-    </td>
-    <td valign="top" align="center">No, but your build file is very brittle if it is not set.</td>
+    <td>topDir</td>
+    <td>This is the directory which will have the expected
+      subdirectories, <samp>SPECS</samp>, <samp>SOURCES</samp>, <samp>BUILD</samp>, <samp>SRPMS</samp>.
+      If this isn't specified, the default RPM directory of the system (or user,
+      if <samp>~/.rpmmacros</samp> defines it) is used (often <samp>/usr/src/rpm</samp>.<br/>
+      Defining a <var>topdir</var> will set <code>%_topdir</code> to the specified
+      directory&mdash;there is no need to edit your <samp>.rpmmacros</samp> file.</td>
+    <td>No, but your build file is very brittle if it is not set.</td>
   </tr>
   <tr>
-    <td valign="top">cleanBuildDir</td>
-    <td valign="top">This will remove the generated files in the BUILD
-      directory.
-      See the the <tt>--clean</tt> option of rpmbuild.
-    </td>
-    <td align="center" valign="top">No</td>
+    <td>cleanBuildDir</td>
+    <td>This will remove the generated files in the <samp>BUILD</samp> directory.  See the
+      the <kbd>--clean</kbd> option of <kbd>rpmbuild</kbd>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">removeSpec</td>
-    <td valign="top">This will remove the spec file from SPECS.
-      See the the <tt>--rmspec</tt> option of rpmbuild.
-    </td>
-    <td align="center" valign="top">No</td>
+    <td>removeSpec</td>
+    <td>This will remove the spec file from <samp>SPECS</samp>.  See the the <kbd>--rmspec</kbd>
+      option of <kbd>rpmbuild</kbd>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">removeSource</td>
-    <td valign="top">Flag (optional, default=false) 
-        to remove the sources after the build.
-        See the the <tt>--rmsource</tt> option of rpmbuild.</td>
-    <td align="center" valign="top">No</td>
+    <td>removeSource</td>
+    <td>Flag to remove the sources after the build.  See the <kbd>--rmsource</kbd> option
+      of <kbd>rpmbuild</kbd>.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">rpmBuildCommand</td>
-    <td valign="top">The executable to use for building the RPM.
-      Defaults to <code>rpmbuild</code> if it can be found or
-      <code>rpm</code> otherwise.  Set this if you don't have either on
-      your PATH or want to use a different executable.  <em>Since Apache Ant
-      1.6</em>.</td>
-    <td valign="top" align="center">No</td>
+    <td>rpmBuildCommand</td>
+    <td>The executable to use for building the RPM. Set this if default executables are not on
+      <code>PATH</code> or a different executable is needed.  <em>Since Apache Ant 1.6</em>.</td>
+    <td>No; defaults to <kbd>rpmbuild</kbd> if it can be found or <kbd>rpm</kbd> otherwise</td>
   </tr>
   <tr>
-    <td valign="top">command</td>
-    <td valign="top">The command to pass to the rpmbuild program. The default is "-bb"</td>
-    <td align="center" valign="top">No</td>
+    <td>command</td>
+    <td>The command to pass to the <code>rpmbuild</code> program.</td>
+    <td>No; default is <kbd>-bb</kbd></td>
   </tr>
   <tr>
-    <td valign="top">quiet</td>
-    <td valign="top">Suppress output. Defaults to false.</td>
-    <td align="center" valign="top">No</td>
+    <td>quiet</td>
+    <td>Suppress output.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">output/error</td>
-    <td valign="top">Where standard output and error go</td>
-    <td align="center" valign="top">No</td>
+    <td>output/error</td>
+    <td>Where standard output and error go.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">failOnError</td>
-    <td valign="top">Stop the buildprocess if the RPM build command exits with 
-       a non-zero returncode. Defaults to false</td>
-    <td align="center" valign="top">No</td>
+    <td>failOnError</td>
+    <td>Stop the build process if the RPM build command exits with a non-zero return code.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
 </table>
 
 <h3>Examples</h3>
 <pre>
-    &lt;rpm
-        specFile="example.spec"
-        topDir="build/rpm"
-        cleanBuildDir="true"
-        failOnError="true"/&gt;
-</pre>
+&lt;rpm specFile="example.spec"
+     topDir="build/rpm"
+     cleanBuildDir="true"
+     failOnError="true"/&gt;</pre>
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/schemavalidate.html ant-1.10.3/manual/Tasks/schemavalidate.html
--- ant-1.9.10/manual/Tasks/schemavalidate.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/schemavalidate.html	2018-03-24 12:37:12.000000000 +0000
@@ -23,261 +23,224 @@
 
 <body>
 
-<h2><a name="schemavalidate">SchemaValidate</a></h2>
+<h2 id="schemavalidate">SchemaValidate</h2>
 <h3>Description</h3>
 
-<p>This <tt>schemavalidate</tt> task validates XML files described by an XML Schema.
-The task extends the XmlValidate task with XSD-specific features.</p>
+<p>This <code>schemavalidate</code> task validates XML files described by an XML Schema.  The task
+extends the <code>XmlValidate</code> task with XSD-specific features.</p>
 <ol>
-<li>The parser is created validating and namespace aware
-</li>
-<li>Validation is turned on.</li>
-<li>Schema validation is turned on.</li>
-<li>Any no-namespace schema URL or file supplied is used as the no-namespace schema
-<li>All nested schema declarations are turned into the list of namespace-url
-bindings for schema lookup.
+  <li>The parser is created validating and namespace aware.</li>
+  <li>Validation is turned on.</li>
+  <li>Schema validation is turned on.</li>
+  <li>Any no-namespace schema URL or file supplied is used as the no-namespace schema.</li>
+  <li>All nested schema declarations are turned into the list of namespace-url bindings for schema
+    lookup.</li>
 </ol>
 
-Note that nested catalogs are still used for lookup of the URLs given as the
-sources of schema documents, so you can still delegate lookup to a catalog, you
-just need to list all schema URIs and their URL equivalents.
-
-<p>This task supports the use of nested
-  <li><a href="../Types/xmlcatalog.html"><tt>&lt;xmlcatalog&gt;</tt></a> elements</li>
-  <li> <tt>&lt;schema&gt;</tt> elements, that bind a namespace URI to a URL or a
-  local filename.
-  <li><tt>&lt;dtd&gt;</tt> elements which are used to resolve DTDs and entities.</li>
-  <li><tt>&lt;attribute&gt;</tt> elements which are used to set features on the parser.
-      These can be any number of
-      <a href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description"><tt>http://xml.org/sax/features/</tt></a>
-      or other features that your parser may support.</li>
-  <li><tt>&lt;property&gt;</tt> elements, containing string properties
-</p>
-
-<p>
-The task only supports SAX2 or later parsers: it is an error to specify a SAX1
-parser. 
+<p>Note that nested catalogs are still used for lookup of the URLs given as the sources of schema
+documents, so you can still delegate lookup to a catalog, you just need to list all schema URIs and
+their URL equivalents.</p>
+
+<p>This task supports the use of nested</p>
+<ul>
+  <li><a href="../Types/xmlcatalog.html"><code>&lt;xmlcatalog&gt;</code></a> elements</li>
+  <li><code>&lt;schema&gt;</code> elements, that bind a namespace URI to a URL or a local
+    filename.</li>
+  <li><code>&lt;dtd&gt;</code> elements which are used to resolve DTDs and entities.</li>
+  <li><code>&lt;attribute&gt;</code> elements which are used to set features on the parser.  These
+    can be any number
+    of <a href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description"
+    target="_top"><code>http://xml.org/sax/features/</code></a> or other features that your parser
+    may support.</li>
+  <li><code>&lt;property&gt;</code> elements, containing string properties</li>
+</ul>
 
+<p>The task only supports SAX2 or later parsers: it is an error to specify a SAX1 parser.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">classname</td>
-    <td valign="top">the parser to use.</td>
-    <td align="center" valign="top">No</td>
+    <td>classname</td>
+    <td>the parser to use.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">where to find the parser class. 
-    Optionally can use an embedded <tt>&lt;classpath&gt;</tt> element.</td>
-    <td align="center" valign="top">No</td>
+    <td>classpathref</td>
+    <td>where to find the parser class.  Optionally can use an
+      embedded <code>&lt;classpath&gt;</code> element.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">disableDTD</td>
-    <td valign="top">
-      Flag to disable DTD support. DTD support is needed to 
-      validate XSD files themselves, amongst others.
-    </td>
-    <td valign="top" align="center">No - default false</td>
+    <td>disableDTD</td>
+    <td>Flag to disable DTD support. DTD support is needed to validate XSD files themselves, amongst
+      others.</td>
+    <td>No; default <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">fails on a error if set to true (defaults to true).</td>
-    <td align="center" valign="top">No</td>
+    <td>failonerror</td>
+    <td>fails on a error if set to <q>true</q>.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">the file(s) you want to check. (optionally can use an embedded fileset)</td>
-    <td valign="top" align="center">No</td>
+    <td>file</td>
+    <td>the file(s) you want to check (optionally use an embedded fileset).</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">fullchecking</td>
-    <td valign="top">
-      enable full schema checking. Slow but strict.
-    </td>
-    <td valign="top" align="center">No - default true</td>
+    <td>fullchecking</td>
+    <td>enable full schema checking. Slow but strict.</td>
+    <td>No; default <q>true</q></td>
   </tr>
-  
   <tr>
-    <td valign="top">lenient</td>
-    <td valign="top">
-      if true, only check the XML document is well formed
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>lenient</td>
+    <td>if <q>true</q>, only check the XML document is well formed</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">noNamespaceFile</td>
-    <td valign="top">
-      filename of a no-namespace XSD file to provide the 
-      schema for no-namespace XML content.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>noNamespaceFile</td>
+    <td>filename of a no-namespace XSD file to provide the schema for no-namespace XML content</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">noNamespaceURL</td>
-    <td valign="top">
-      URL of a no-namespace XSD file to provide the 
-      schema for no-namespace XML content.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>noNamespaceURL</td>
+    <td>URL of a no-namespace XSD file to provide the schema for no-namespace XML content</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">warn</td>
-    <td valign="top">log parser warn events.</td>
-    <td align="center" valign="top">No</td>
+    <td>warn</td>
+    <td>log parser warn events</td>
+    <td>No</td>
   </tr>
 </table>
 
-<h3><a name="nested">Nested Elements</a></h3>
-
+<h3 id="nested">Parameters specified as nested elements</h3>
 
 <h4>schema</h4>
-<p>
-Identify the name and location of a schema that may be used in validating
-the document(s).
-</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<p>Identify the name and location of a schema that may be used in validating the document(s).</p>
+<table class="attr">
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <th>Attribute</th>
+  <th>Description</th>
+  <th>Required</th>
 </tr>
   <tr>
-    <td valign="top">namespace</td>
-    <td valign="top">URI of the schema namespace</td>
-    <td align="center" valign="top">Yes</td>
+    <td>namespace</td>
+    <td>URI of the schema namespace</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">url</td>
-    <td valign="top">URL of the schema</td>
-    <td align="center" valign="top">One of url or file is required</td>
+    <td>url</td>
+    <td>URL of the schema</td>
+    <td rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">file of the schema</td>
-    <td align="center" valign="top">One of url or file is required</td>
+    <td>file</td>
+    <td class="left">file of the schema</td>
   </tr>
 </table>
 
 <h4>dtd</h4>
-<p>
-<tt>&lt;dtd&gt;</tt> is used to specify different locations for DTD resolution.
-</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<p><code>&lt;dtd&gt;</code> is used to specify different locations for DTD resolution.</p>
+<table class="attr">
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <th>Attribute</th>
+  <th>Description</th>
+  <th>Required</th>
 </tr>
   <tr>
-    <td valign="top">publicId</td>
-    <td valign="top">Public ID of the DTD to resolve</td>
-    <td align="center" valign="top">Yes</td>
+    <td>publicId</td>
+    <td>Public ID of the DTD to resolve</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">location</td>
-    <td valign="top">Location of the DTD to use, which can be a file,
+    <td>location</td>
+    <td>Location of the DTD to use, which can be a file,
     a resource, or a URL</td>
-    <td align="center" valign="top">Yes</td>
+    <td>Yes</td>
   </tr>
 </table>
 <h4>xmlcatalog</h4>
-<p>The <a href="../Types/xmlcatalog.html"><tt>&lt;xmlcatalog&gt;</tt></a>
-element is used to perform entity resolution.</p>
+<p>The <a href="../Types/xmlcatalog.html"><code>&lt;xmlcatalog&gt;</code></a> element is used to
+perform entity resolution.</p>
 <h4>attribute</h4>
-<p>The <tt>&lt;attribute&gt;</tt> element is used to set parser features.<br>
-Features usable with the xerces parser are defined here :
- <a href="http://xml.apache.org/xerces-j/features.html">Setting features</a><br>
-
-SAX features are defined here:
- <a href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description"><tt>http://xml.org/sax/features/</tt></a><br>
- </p>
-<table border="1" cellpadding="2" cellspacing="0">
-<tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+<p>The <code>&lt;attribute&gt;</code> element is used to set parser features.<br/>Features usable
+with the Xerces parser are defined here: <a href="https://xml.apache.org/xerces-j/features.html"
+target="_top">Setting features</a><br/>SAX features are defined
+here: <a href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description"
+target="_top"><code>http://xml.org/sax/features/</code></a></p>
+<table class="attr">
+  <tr>
+  <th>Attribute</th>
+  <th>Description</th>
+  <th>Required</th>
 </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The name of the feature</td>
-    <td align="center" valign="top">Yes</td>
+    <td>name</td>
+    <td>The name of the feature</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">The boolean value of the feature</td>
-    <td align="center" valign="top">Yes</td>
+    <td>value</td>
+    <td>The boolean value of the feature</td>
+    <td>Yes</td>
   </tr>
 </table>
-</p>
 
 <h4>property</h4>
-<p>The <tt>&lt;property&gt;</tt> element is used to set properties.
-These properties are defined here for the xerces XML parser implementation :
- <a href="http://xml.apache.org/xerces-j/properties.html">XML Parser properties</a>
-Properties can be used to set the schema used to validate the XML file.
+<p>The <code>&lt;property&gt;</code> element is used to set properties.  These properties are
+defined here for the Xerces XML parser
+implementation: <a href="https://xml.apache.org/xerces-j/properties.html" target="_top">XML Parser
+properties</a>. Properties can be used to set the schema used to validate the XML file.
 </p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <th>Attribute</th>
+  <th>Description</th>
+  <th>Required</th>
 </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The name of the feature</td>
-    <td align="center" valign="top">Yes</td>
+    <td>name</td>
+    <td>The name of the feature</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">The string value of the property</td>
-    <td align="center" valign="top">Yes</td>
+    <td>value</td>
+    <td>The string value of the property</td>
+    <td>Yes</td>
   </tr>
 </table>
-</p>
-
 
 <h3>Examples</h3>
 <pre>
-    &lt;schemavalidate
-      noNamespaceFile="document.xsd"
-      file="xml/endpiece.xml"&gt;
-    &lt;/schemavalidate&gt;
-</pre>
-Validate a document against an XML schema. The document does not declare
-any schema itself, which is why the <tt>noNamespaceFile</tt> is needed. 
-<pre>
-    &lt;presetdef name="validate-soap"&gt;
-      &lt;schemavalidate&gt;
-        &lt;schema namespace="http://schemas.xmlsoap.org/ws/2003/03/addressing"
-          file="${soap.dir}/ws-addressing.xsd" /&gt;
-        &lt;schema namespace="http://www.w3.org/2003/05/soap-envelope"
-          file="${soap.dir}/soap12.xsd" /&gt;
-        &lt;schema namespace="http://schemas.xmlsoap.org/wsdl/"
-          file="${soap.dir}/wsdl.xsd" /&gt;
-        &lt;schema namespace="http://www.w3.org/2001/XMLSchema"
-          file="${soap.dir}/XMLSchema.xsd" /&gt;
-        &lt;/schemavalidate&gt;
-    &lt;/presetdef&gt;
-</pre>
-Declare a new preset task, <tt>&lt;validate-soap&gt;</tt>, that validates
-XSD and WSDL documents against the relevant specifications. 
-To validate XSD documents, you also need XMLSchema.dtd and datatypes.dtd in 
-the same directory as XMLSchema.xsd, or pointed to via the catalog. All
-these files can be fetched from <a href="http://www.w3.org/2001/XMLSchema">
-the W3C</a>. 
+&lt;schemavalidate noNamespaceFile="document.xsd"
+                file="xml/endpiece.xml"/&gt;</pre>
+<p>Validate a document against an XML schema. The document does not declare any schema itself, which
+is why the <var>noNamespaceFile</var> is needed.</p>
 <pre>
-    &lt;validate-soap file="xml/test.xsd"/&gt;
-</pre>
-Use the preset task defined above to validate an XML Schema document.
-<br>
-
+&lt;presetdef name="validate-soap"&gt;
+  &lt;schemavalidate&gt;
+    &lt;schema namespace="http://schemas.xmlsoap.org/ws/2003/03/addressing"
+            file="${soap.dir}/ws-addressing.xsd"/&gt;
+    &lt;schema namespace="http://www.w3.org/2003/05/soap-envelope"
+            file="${soap.dir}/soap12.xsd"/&gt;
+    &lt;schema namespace="http://schemas.xmlsoap.org/wsdl/"
+            file="${soap.dir}/wsdl.xsd"/&gt;
+    &lt;schema namespace="http://www.w3.org/2001/XMLSchema"
+            file="${soap.dir}/XMLSchema.xsd"/&gt;
+    &lt;/schemavalidate&gt;
+&lt;/presetdef&gt;</pre>
+<p>Declare a new preset task, <code>&lt;validate-soap&gt;</code>, that validates XSD and WSDL
+documents against the relevant specifications.  To validate XSD documents, you also
+need <samp>XMLSchema.dtd</samp> and <samp>datatypes.dtd</samp> in the same directory
+as <samp>XMLSchema.xsd</samp>, or pointed to via the catalog. All these files can be fetched
+from <a href="https://www.w3.org/2001/XMLSchema" target="_top">W3C</a>.</p>
+<pre>&lt;validate-soap file="xml/test.xsd"/&gt;</pre>
+<p>Use the preset task defined above to validate an XML Schema document.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/scp.html ant-1.10.3/manual/Tasks/scp.html
--- ant-1.9.10/manual/Tasks/scp.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/scp.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,303 +24,251 @@
 
 <body>
 
-<h2><a name="scp">SCP</a></h2>
+<h2 id="scp">SCP</h2>
+<p><em>Since Apache Ant 1.6</em></p>
 <h3>Description</h3>
 
-<p><em>since Apache Ant 1.6</em></p>
-
 <p>Copies a file or FileSet to or from a (remote) machine running an SSH daemon.
-FileSet <i>only</i> works for copying files from the local machine to a
-remote machine.</p>
+FileSet <em>only</em> works for copying files from the local machine to a remote machine.</p>
 
-<p><b>Note:</b> This task depends on external libraries not included
-in the Ant distribution.  See <a
-href="../install.html#librarydependencies">Library Dependencies</a>
-for more information.  This task has been tested with jsch-0.1.2 and later.</p>
+<p><strong>Note</strong>: This task depends on external libraries not included in the Ant
+distribution.  See <a href="../install.html#librarydependencies">Library Dependencies</a> for more
+information.  This task has been tested with <code>jsch-0.1.2</code> and later.</p>
 
 <p>See also the <a href="sshexec.html">sshexec task</a></p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">file</td>
-    <td valign="top">The file to copy.  This can be a local path or a
-    remote path of the form <i>user[:password]@host:/directory/path</i>.
-    <i>:password</i> can be omitted if you use key based
-    authentication or specify the password attribute.  The way remote
-    path is recognized is whether it contains @ character or not. This
-    will not work if your localPath contains @ character.</td>
-    <td valign="top" align="center">Yes, unless a nested
-    <code>&lt;fileset&gt;</code> element is used.</td>
-  </tr>
-  <tr>
-    <td valign="top">localFile</td>
-    <td valign="top">This is an alternative to the file attribute. But
-    this must always point to a local file. The reason this was added
-    was that when you give file attribute it is treated as remote if
-    it contains @ character. This character can exist also in local
-    paths.  <em>since Ant 1.6.2</em></td>
-    <td valign="top" align="center">Alternative to file attribute.</td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>file</td>
+    <td>The file to copy.  This can be a local path or a remote path of the
+      form <samp>user[:password]@host:/directory/path</samp>.  <samp>:password</samp> can be omitted
+      if you use key based authentication or specify the <var>password</var> attribute.  The way
+      remote path is recognized is whether it contains <q>@</q> character or not. This will not work
+      if your <var>localPath</var> contains <q>@</q> character.</td>
+    <td>Yes, unless a nested <code>&lt;fileset&gt;</code> element is used</td>
+  </tr>
+  <tr>
+    <td>localFile</td>
+    <td>This is an alternative to the <var>file</var> attribute. But this must always point to a
+      local file. The reason this was added was that when you give file attribute it is treated as
+      remote if it contains <q>@</q> character. This character can exist also in local
+      paths.  <em>since Ant 1.6.2</em></td>
+    <td>Alternative to <var>file</var> attribute</td>
   </tr>
   <tr>
-    <td valign="top">remoteFile</td>
-    <td valign="top">This is an alternative to the file attribute. But
-    this must always point to a remote file.  <em>since Ant 1.6.2</em></td>
-    <td valign="top" align="center">Alternative to file attribute.</td>
+    <td>remoteFile</td>
+    <td>This is an alternative to the <var>file</var> attribute. But this must always point to a
+      remote file.  <em>since Ant 1.6.2</em></td>
+    <td>Alternative to <var>file</var> attribute</td>
   </tr>
   <tr>
-    <td valign="top">todir</td>
-    <td valign="top">The directory to copy to.  This can be a local path
-    or a remote path of the form <i>user[:password]@host:/directory/path</i>.
-    <i>:password</i> can be omitted if you use key based
-    authentication or specify the password attribute.  The way remote
-    path is recognized is whether it contains @ character or not. This
-    will not work if your localPath contains @ character.</td>
-    <td valian="top" align="center">Yes</td>
+    <td>todir</td>
+    <td>The directory to copy to.  This can be a local path or a remote path of the
+      form <samp>user[:password]@host:/directory/path</samp>.  <samp>:password</samp> can be omitted
+      if you use key based authentication or specify the <var>password</var> attribute.  The way
+      remote path is recognized is whether it contains <q>@</q> character or not. This will not work
+      if your <var>localPath</var> contains <q>@</q> character.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">localTodir</td>
-    <td valign="top">This is an alternative to the todir
-    attribute. But this must always point to a local directory. The
-    reason this was added was that when you give todir attribute it is
-    treated as remote if it contains @ character. This character can
-    exist also in local paths.  <em>since Ant 1.6.2</em></td>
-    <td valian="top" align="center">Alternative to todir attribute.</td>
+    <td>localTodir</td>
+    <td>This is an alternative to the <var>todir</var> attribute. But this must always point to a
+    local directory. The reason this was added was that when you give <var>todir</var> attribute it
+    is treated as remote if it contains <q>@</q> character. This character can exist also in local
+    paths.  <em>since Ant 1.6.2</em></td>
+    <td>Alternative to <var>todir</var> attribute</td>
   </tr>
   <tr>
-    <td valign="top">localTofile</td>
-    <td valign="top">Changes the file name to the given name while
-    receiving it, only useful if receiving a single file.  <em>since
-    Ant 1.6.2</em></td>
-    <td valian="top" align="center">Alternative to todir attribute.</td>
+    <td>localTofile</td>
+    <td>Changes the file name to the given name while receiving it, only useful if receiving a
+      single file.  <em>since Ant 1.6.2</em></td>
+    <td>Alternative to <var>todir</var> attribute</td>
   </tr>
   <tr>
-    <td valign="top">remoteTodir</td>
-    <td valign="top">This is an alternative to the todir
-    attribute. But this must always point to a remote directory.
-    <em>since Ant 1.6.2</em></td>
-    <td valian="top" align="center">Alternative to todir attribute.</td>
+    <td>remoteTodir</td>
+    <td>This is an alternative to the <var>todir</var> attribute. But this must always point to a
+      remote directory.  <em>since Ant 1.6.2</em></td>
+    <td>Alternative to <var>todir</var> attribute</td>
   </tr>
   <tr>
-    <td valign="top">remoteTofile</td>
-    <td valign="top">Changes the file name to the given name while
-    sending it, only useful if sending a single file.  <em>since
-    Ant 1.6.2</em></td>
-    <td valian="top" align="center">Alternative to todir attribute.</td>
+    <td>remoteTofile</td>
+    <td>Changes the file name to the given name while sending it, only useful if sending a single
+      file.  <em>since Ant 1.6.2</em></td>
+    <td>Alternative to <var>todir</var> attribute</td>
   </tr>
   <tr>
-    <td valign="top">port</td>
-    <td valign="top">The port to connect to on the remote host.</td>
-    <td valian="top" align="center">No, defaults to 22.</td>
+    <td>port</td>
+    <td>The port to connect to on the remote host.</td>
+    <td>No; defaults to <q>22</q></td>
   </tr>
   <tr>
-    <td valign="top">trust</td>
-    <td valign="top">This trusts all unknown hosts if set to yes/true.<br>
-      <strong>Note</strong> If you set this to false (the default), the
-      host you connect to must be listed in your knownhosts file, this
-      also implies that the file exists.</td>
-    <td valian="top" align="center">No, defaults to No.</td>
+    <td>trust</td>
+    <td>This trusts all unknown hosts if set to <q>yes</q>
+      or <q>true</q>.<br/><strong>Note</strong>: If you set this to <q>false</q> (the default), the
+      host you connect to must be listed in your <var>knownhosts</var> file, this also implies that
+      the file exists.</td>
+    <td>No; defaults to <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">knownhosts</td>
-    <td valign="top">This sets the known hosts file to use to validate
-    the identity of the remote host.  This must be a SSH2 format file.
-    SSH1 format is not supported.</td>
-    <td valian="top" align="center">No, defaults to
-    ${user.home}/.ssh/known_hosts.</td>
+    <td>knownhosts</td>
+    <td>This sets the known hosts file to use to validate the identity of the remote host.  This
+      must be a SSH2 format file.  SSH1 format is not supported.</td>
+    <td>No; defaults to <samp>${user.home}/.ssh/known_hosts</samp></td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-     <td valign="top">Whether to halt the build if the transfer fails.
-     </td>
-     <td valign="top" align="center">No; defaults to true.</td>
+    <td>failonerror</td>
+    <td>Whether to halt the build if the transfer fails.</td>
+     <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">password</td>
-     <td valign="top">The password.</td>
-     <td valign="top" align="center">Not if you are using key based
-     authentication or the password has been given in the file or
-     todir attribute.</td>
+    <td>password</td>
+    <td>The password.</td>
+    <td>Yes, unless you are using key based authentication or the password has been given in the
+     file or <var>todir</var> attribute</td>
   </tr>
   <tr>
-    <td valign="top">keyfile</td>
-     <td valign="top">Location of the file holding the private key.</td>
-     <td valign="top" align="center">Yes, if you are using key based
-     authentication.</td>
+    <td>keyfile</td>
+    <td>Location of the file holding the private key.</td>
+    <td>Yes, if you are using key based authentication</td>
   </tr>
   <tr>
-    <td valign="top">passphrase</td>
-     <td valign="top">Passphrase for your private key.</td>
-     <td valign="top" align="center">No, defaults to an empty string.</td>
+    <td>passphrase</td>
+    <td>Passphrase for your private key.</td>
+    <td>No; defaults to an empty string</td>
   </tr>
   <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">Determines whether SCP outputs verbosely to the
-    user. Currently this means outputting dots/stars showing the
-    progress of a file transfer.  <em>since Ant 1.6.2</em></td>
-    <td valign="top" align="center">No; defaults to false.</td>
+    <td>verbose</td>
+    <td>Determines whether SCP outputs verbosely to the user. Currently this means outputting
+      dots/stars showing the progress of a file transfer.  <em>since Ant 1.6.2</em></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">sftp</td>
-    <td valign="top">Determines whether SCP uses the sftp protocol.
-    The sftp protocol is the file transfer protocol of SSH2.  It is
-    recommended that this be set to true if you are copying to/from a
-    server that doesn't support scp1. <em>since Ant 1.7</em></td>
-    <td valign="top" align="center">No; defaults to false.</td>
+    <td>sftp</td>
+    <td>Determines whether SCP uses the sftp protocol.  The sftp protocol is the file transfer
+      protocol of SSH2.  It is recommended that this be set to <q>true</q> if you are copying to/from
+      a server that doesn't support scp1. <em>since Ant 1.7</em></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">preserveLastModified</td>
-    <td valign="top">Determines whether the last modification
-    timestamp of downloaded files is preserved.  It only works when
-    transferring from a remote to a local system and probably doesn't
-    work with a server that doesn't support SSH2.  <em>since Ant
-    1.8.0</em></td>
-    <td valign="top" align="center">No; defaults to false.</td>
+    <td>preserveLastModified</td>
+    <td>Determines whether the last modification timestamp of downloaded files is preserved.  It
+      only works when transferring from a remote to a local system and probably doesn't work with a
+      server that doesn't support SSH2.  <em>since Ant 1.8.0</em></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">filemode</td>
-    <td valign="top">A 3 digit octal string, specify the user, group
-      and other modes in the standard Unix fashion.  Only applies to
-      uploaded files.  Note the actual permissions of the remote
-      file will be governed by this setting and the UMASK on the
-      remote server. Default is 644. <em>since Ant 1.9.5</em>.</td>
-    <td align="center" valign="top">No</td>
+    <td>filemode</td>
+    <td>A 3 digit octal string, specify the user, group and other modes in the standard Unix
+      fashion.  Only applies to uploaded files.  Note the actual permissions of the remote file will
+      be governed by this setting and the <code>UMASK</code> on the remote server. <em>since Ant
+      1.9.5</em>.</td>
+    <td>No; default is <q>644</q></td>
   </tr>
   <tr>
-    <td valign="top">dirmode</td>
-    <td valign="top">A 3 digit octal string, specify the user, group
-      and other modes in the standard Unix fashion.  Only applies to
-      uploaded dirs.  Note the actual permissions of the remote
-      dir will be governed by this setting and the UMASK on the
-      remote server. Default is 755. <em>since Ant 1.9.5</em>.</td>
-    <td align="center" valign="top">No</td>
+    <td>dirmode</td>
+    <td>A 3 digit octal string, specify the user, group and other modes in the standard Unix
+      fashion.  Only applies to uploaded dirs.  Note the actual permissions of the remote dir will
+      be governed by this setting and the <code>UMASK</code> on the remote server. <em>since Ant
+      1.9.5</em>.</td>
+    <td>No; default is <q>755</q></td>
   </tr>
   <tr>
-    <td valign="top">serverAliveIntervalSeconds</td>
-    <td valign="top">Sets a timeout interval in seconds after which if no data has
-      been received from the server, the task will send a message through
-      the encrypted channel to request a response from the server.
-      <em>since Ant 1.9.7</em></td>
-    <td align="center" valign="top">No, the default is 0, indicating
-      that these messages will not be sent to the server</td>
+    <td>serverAliveIntervalSeconds</td>
+    <td>Sets a timeout interval in seconds after which if no data has been received from the server,
+      the task will send a message through the encrypted channel to request a response from the
+      server.  <em>since Ant 1.9.7</em></td>
+    <td>No, the default is <q>0</q>, indicating that these messages will not be sent to the
+      server</td>
   </tr>
   <tr>
-    <td valign="top">serverAliveCountMax</td>
-    <td valign="top">The number of server alive messages which may be
-      sent without receiving any messages back from the server. Only
-      used if serverAliveIntervalSeconds is not 0.
-      <em>since Ant 1.9.7</em></td>
-    <td align="center" valign="top">No, defaults to 3</td>
+    <td>serverAliveCountMax</td>
+    <td>The number of server alive messages which may be sent without receiving any messages back
+      from the server. Only used if <var>serverAliveIntervalSeconds</var> is
+      not <q>0</q>.  <em>since Ant 1.9.7</em></td>
+    <td>No; defaults to <q>3</q></td>
   </tr>
   <tr>
-    <td valign="top">compressed</td>
-    <td valign="top">Whether to enable compression during transfer.
-      <em>since Ant 1.9.8</em></td>
-    <td align="center" valign="top">No, defaults to false</td>
+    <td>compressed</td>
+    <td>Whether to enable compression during transfer.  <em>since Ant 1.9.8</em></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 
-<h4>fileset or resource collections</h4>
- <p><a href="../Types/fileset.html">FileSet</a>s or <a href="../Types/resources.html#collection">Resource Collection</a>s are used to select
- groups of files to copy. To use a fileset or a resource collection, the <code>todir</code> attribute must be set.</p>
+<h4>resource collections</h4>
+<p><a href="../Types/fileset.html">FileSet</a>s
+or other <a href="../Types/resources.html#collection">resource collections</a> are used to select groups
+of files to copy. To use a fileset or a resource collection, the <var>todir</var> attribute must be
+set.</p>
 
-Prior to Ant 1.9.7 only &lt;fileset&gt; has been supported as a nested element.
+<p>Prior to Ant 1.9.7 only <code>&lt;fileset&gt;</code> has been supported as a nested element.</p>
 
 <h3>Examples</h3>
-<p><b>Copy a single local file to a remote machine</b></p>
-<pre>
-  &lt;scp file=&quot;myfile.txt&quot; todir=&quot;user:password@somehost:/home/chuck&quot;/&gt;
-</pre>
-
-<p><b>Copy a single local file to a remote machine with separate
-password attribute</b></p>
-<pre>
-  &lt;scp file=&quot;myfile.txt&quot; todir=&quot;user@somehost:/home/chuck&quot; password=&quot;password&quot;/&gt;
-</pre>
-
-<p><b>Copy a single local file to a remote machine using key base
-authentication.</b></p>
-<pre>
-  &lt;scp file=&quot;myfile.txt&quot;
-       todir=&quot;user@somehost:/home/chuck&quot; 
-       keyfile=&quot;${user.home}/.ssh/id_dsa&quot;
-       passphrase=&quot;my extremely secret passphrase&quot;
-  /&gt;
-</pre>
+<p><strong>Copy a single local file to a remote machine</strong></p>
+<pre>&lt;scp file=&quot;myfile.txt&quot; todir=&quot;user:password@somehost:/home/chuck&quot;/&gt;</pre>
 
-<p><b>Copy a single remote file to a local directory</b></p>
-<pre>
-  &lt;scp file=&quot;user:password@somehost:/home/chuck/myfile.txt&quot; todir=&quot;../some/other/dir&quot;/&gt;
-</pre>
-
-<p><b>Copy a remote directory to a local directory</b></p>
-<pre>
-  &lt;scp file=&quot;user:password@somehost:/home/chuck/*&quot; todir=&quot;/home/sara&quot;/&gt;
-</pre>
-
-<p><b>Copy a local directory to a remote directory</b></p>
-<pre>
-  &lt;scp todir=&quot;user:password@somehost:/home/chuck/&quot;&gt;
-    &lt;fileset dir=&quot;src_dir&quot;/&gt;
-  &lt;/scp&gt;
-</pre>
-<p><b>Copy a set of files to a directory</b></p>
-<pre>
-  &lt;scp todir=&quot;user:password@somehost:/home/chuck&quot;&gt;
+<p><strong>Copy a single local file to a remote machine with separate <var>password</var>
+attribute</strong></p>
+<pre>&lt;scp file=&quot;myfile.txt&quot; todir=&quot;user@somehost:/home/chuck&quot; password=&quot;password&quot;/&gt;</pre>
+
+<p><strong>Copy a single local file to a remote machine using key base authentication.</strong></p>
+<pre>
+&lt;scp file=&quot;myfile.txt&quot;
+     todir=&quot;user@somehost:/home/chuck&quot;
+     keyfile=&quot;${user.home}/.ssh/id_dsa&quot;
+     passphrase=&quot;my extremely secret passphrase&quot;/&gt;</pre>
+
+<p><strong>Copy a single remote file to a local directory</strong></p>
+<pre>&lt;scp file=&quot;user:password@somehost:/home/chuck/myfile.txt&quot; todir=&quot;../some/other/dir&quot;/&gt;</pre>
+
+<p><strong>Copy a remote directory to a local directory</strong></p>
+<pre>&lt;scp file=&quot;user:password@somehost:/home/chuck/*&quot; todir=&quot;/home/sara&quot;/&gt;</pre>
+
+<p><strong>Copy a local directory to a remote directory</strong></p>
+<pre>
+&lt;scp todir=&quot;user:password@somehost:/home/chuck/&quot;&gt;
+  &lt;fileset dir=&quot;src_dir&quot;/&gt;
+&lt;/scp&gt;</pre>
+<p><strong>Copy a set of files to a directory</strong></p>
+<pre>
+&lt;scp todir=&quot;user:password@somehost:/home/chuck&quot;&gt;
+  &lt;fileset dir=&quot;src_dir&quot;&gt;
+    &lt;include name=&quot;**/*.java&quot;/&gt;
+  &lt;/fileset&gt;
+&lt;/scp&gt;</pre>
+<p><strong>Copy a set of files to a remote directory in reverse last-modified order</strong></p>
+<pre>
+&lt;scp todir=&quot;user:password@somehost:/home/chuck&quot;&gt;
+  &lt;sort&gt;
+    &lt;reverse&gt;
+      &lt;date/&gt;
+    &lt;/reverse&gt;
     &lt;fileset dir=&quot;src_dir&quot;&gt;
-      &lt;include name=&quot;**/*.java&quot;/&gt;
+      &lt;include name=&quot;**/*&quot;/&gt;
     &lt;/fileset&gt;
-  &lt;/scp&gt;
-</pre>
-<p><b>Copy a set of files to a remote directory in reverse last-modified order</b></p>
-<pre>
-  &lt;scp todir=&quot;user:password@somehost:/home/chuck&quot;&gt;
-    &lt;sort&gt;
-      &lt;reverse&gt;
-        &lt;date /&gt;
-      &lt;/reverse&gt;
-      &lt;fileset dir=&quot;src_dir&quot;&gt;
-        &lt;include name=&quot;**/*&quot; /&gt;
-      &lt;/fileset&gt;
-    &lt;/sort&gt;
-  &lt;/scp&gt;
-</pre>
-
-<p><strong>Security Note:</strong>  Hard coding passwords and/or usernames
-in scp task can be a serious security hole.  Consider using variable
-substitution and include the password on the command line.  For example:
-<p>
-<pre>
-    &lt;scp todir=&quot;${username}:${password}@host:/dir&quot; ...&gt;
-</pre>
-Invoking ant with the following command line:
-<pre>
-    ant -Dusername=me -Dpassword=mypassword target1 target2
-</pre>
-
-Is slightly better, but the username/password is exposed to all users on an Unix
-system (via the ps command). The best approach is to use the
-<code>&lt;input&gt;</code> task and/or retrieve the password from a (secured)
-.properties file.
-
-<p>
-
-<p><strong>Unix Note:</strong> File permissions are not retained when files
-are downloaded; they end up with the default <code>UMASK</code> permissions
-instead. This is caused by the lack of any means to query or set file
-permissions in the current Java runtimes. If you need a permission-
-preserving copy function, use <code>&lt;exec executable="scp" ... &gt;</code>
-instead.
-</p>
-
+  &lt;/sort&gt;
+&lt;/scp&gt;</pre>
 
+<p><strong>Security Note</strong>: Hardcoding passwords and/or usernames in <code>scp</code> task
+can be a serious security hole.  Consider using variable substitution and include the password on
+the command line.  For example:</p>
+<pre>&lt;scp todir=&quot;${username}:${password}@host:/dir&quot; ...&gt;</pre>
+<p>Invoking Ant with the following command line:</p>
+<pre class="input">ant -Dusername=me -Dpassword=mypassword target1 target2</pre>
+<p>is slightly better, but the username/password is exposed to all users on an Unix system (via
+the <kbd>ps</kbd> command). The best approach is to use the <code>&lt;input&gt;</code> task and/or
+retrieve the password from a (secured) <samp>.properties</samp> file.</p>
+
+<p><strong>Unix Note</strong>: File permissions are not retained when files are downloaded; they end
+up with the default <code>UMASK</code> permissions instead. This is caused by the lack of any means
+to query or set file permissions in the current Java runtimes. If you need a permission-preserving
+copy function, use <code>&lt;exec executable="scp" ... &gt;</code> instead.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/scriptdef.html ant-1.10.3/manual/Tasks/scriptdef.html
--- ant-1.9.10/manual/Tasks/scriptdef.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/scriptdef.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,309 +24,267 @@
 
 <body>
 
-<h2><a name="script">Scriptdef</a></h2>
+<h2 id="script">Scriptdef</h2>
 <h3>Description</h3>
-<p>Scriptdef can be used to define an Apache Ant task using a scripting language. Ant
-scripting languages supported by
-<a href="http://jakarta.apache.org/bsf" target="_top">Apache BSF</a> 
-or
-  <a href="https://scripting.dev.java.net">JSR 223</a>
-may be
-used to define the script. Scriptdef provides a mechanism to encapsulate
-control logic from a build within an Ant task minimizing the need for
-providing control style tasks in Ant itself. Complex logic can be made
-available while retaining the simple structure of an Ant build file. Scriptdef
-is also useful for prototyping new custom tasks. Certainly as the complexity
-of the script increases it would be better to migrate the task definition
-into a Java based custom task.
-</p>
-
-<p><b>Note:</b> This task depends on external libraries not included in the
-Ant distribution. See
-<a href="../install.html#librarydependencies">Library Dependencies</a>
-for more information.</p>
-
-
+<p><code>Scriptdef</code> can be used to define an Apache Ant task using a scripting language. Ant
+scripting languages supported by <a href="https://jakarta.apache.org/bsf" target="_top">Apache
+BSF</a> or <a href="https://jcp.org/aboutJava/communityprocess/maintenance/jsr223/223ChangeLog.html"
+target="_top">JSR 223</a> may be used to define the script. <code>Scriptdef</code> provides a
+mechanism to encapsulate control logic from a build within an Ant task minimizing the need for
+providing control style tasks in Ant itself. Complex logic can be made available while retaining the
+simple structure of an Ant build file. <code>Scriptdef</code> is also useful for prototyping new
+custom tasks. Certainly as the complexity of the script increases it would be better to migrate the
+task definition into a Java based custom task.</p>
+
+<p><strong>Note</strong>: This task depends on external libraries not included in the Ant
+distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a> for more
+information.</p>
 
 <p>The attributes and nested elements supported by the task may be defined
 using <code>&lt;attribute&gt;</code> and <code>&lt;element&gt;</code> nested elements. These are
-available to the script that implements the task as two collection style
-script variables <code>attributes</code> and <code>elements</code>. The
-elements in the <code>attributes</code> collection may be accessed by the
-attribute name. The <code>elements</code> collection is accessed by the nested
-element name. This will return a list of all instances of the nested element.
-The instances in this list may be accessed by an integer index.
-</p>
-
-<p><b>Note:</b> Ant will turn all attribute and element names into all
-lowercase names, so even if you use name="SomeAttribute", you'll have
-to use "someattribute" to retrieve the attribute's value from the
-<code>attributes</code> collection.</p>
-
-<p>The name "self" (<i>since Ant 1.6.3</i>) is a pre-defined reference to the
-    script def task instance.
-    It can be used for logging, or for integration with the rest of
-    ant. the <code>self.text attribute</code> contains
-    any nested text passed to the script</p>
-
-<p>If an attribute or element is not passed in, 
-then <code>attributes.get()</code> or <code>elements.get()</code> will 
-return null. It is up to the script to perform any checks and validation. 
-<code>self.fail(String message)</code>can be used to raise a 
-<code>BuildException</code>.
-</p>
-
-
-<p>The name "project" is a pre-defined reference to the Ant Project. For
-more information on writing scripts, please refer to the
-<a href="script.html"><code>&lt;script&gt;</code></a> task
-</p>
-
+available to the script that implements the task as two collection style script
+variables <code class="code">attributes</code> and <code class="code">elements</code>. The elements
+in the <code class="code">attributes</code> collection may be accessed by the attribute
+name. The <code class="code">elements</code> collection is accessed by the nested element name. This
+will return a list of all instances of the nested element.  The instances in this list may be
+accessed by an integer index.</p>
+
+<p><strong>Note</strong>: Ant will turn all attribute and element names into all lowercase names, so
+even if you use <var>name</var>=<q>SomeAttribute</q>, you'll have to use <q>someattribute</q> to
+retrieve the attribute's value from the <code class="code">attributes</code> collection.</p>
+
+<p>The name <code class="code">self</code> (<em>since Ant 1.6.3</em>) is a pre-defined reference to
+the <code>scriptdef</code> task instance.  It can be used for logging, or for integration with the
+rest of Ant. The <code class="code">self.text</code> attribute contains any nested text passed to
+the script</p>
+
+<p>If an attribute or element is not passed in, then <code class="code">attributes.get()</code>
+or <code class="code">elements.get()</code> will return null. It is up to the script to perform any
+checks and validation. <code class="code">self.fail(String message)</code>can be used to raise
+a <code>BuildException</code>.</p>
+
+<p>The name <code class="code">project</code> is a pre-defined reference to the Ant Project. For
+more information on writing scripts, please refer to
+the <a href="script.html"><code>&lt;script&gt;</code></a> task.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">the name of the task to be created using the script</td>
-    <td valign="top" align="center">Yes</td>
+    <td>name</td>
+    <td>the name of the task to be created using the script</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">language</td>
-    <td valign="top">The programming language the script is written in.
-      Must be a supported Apache BSF or JSR 223 language</td>
-    <td valign="top" align="center">Yes</td>
+    <td>language</td>
+    <td>The programming language the script is written in.  Must be a supported Apache BSF or JSR
+      223 language</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">manager</td>
-    <td valign="top">
-      The script engine manager to use.
-      See the <a href="../Tasks/script.html">script</a> task
-      for using this attribute.
-    </td>
-    <td valign="top" align="center">No - default is "auto"</td>
+    <td>manager</td>
+    <td>The script engine manager to use.  See the <a href="../Tasks/script.html">script</a> task
+      for using this attribute.</td>
+    <td>No; default is <q>auto</q></td>
   </tr>
   <tr>
-    <td valign="top">src</td>
-    <td valign="top">The location of the script as a file, if not inline</td>
-    <td valign="top" align="center">No</td>
+    <td>src</td>
+    <td>The location of the script as a file, if not inline</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">uri</td>
-    <td valign="top">
-      The XML namespace uri that this definition should live in.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>encoding</td>
+    <td>The encoding of the script as a file. <em>since Ant 1.10.2</em>.</td>
+    <td>No; defaults to default JVM character encoding</td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">
-      The classpath to pass into the script.
-    </td>
-    <td align="center" valign="top">No</td>
+    <td>compiled</td>
+    <td>If true, the script is compiled before the first evaluation for faster multiple executions,
+      on the condition that the <var>manager</var> is <q>javax</q> and the target engine
+      implements <code>javax.script.Compilable</code>.  Note that the <q>bsf</q> manager may
+      automatically compile the script. <em>since Ant 1.10.2</em>.</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>uri</td>
+    <td>The XML namespace uri that this definition should live in.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>classpath</td>
+    <td>The classpath to pass into the script.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">The classpath to use, given as a
-      <a href="../using.html#references">reference</a> to a path defined elsewhere.
-      <td align="center" valign="top">No</td>
-    </tr>
-    <tr>
-      <td valign="top">loaderRef</td>
-      <td valign="top">the name of the loader that is
-        used to load the script, constructed from the specified 
-        classpath. This allows multiple script definitions
-        to reuse the same class loader.
-      </td>
-      <td align="center" valign="top">No</td>
-    </tr>
-  </table>
+    <td>classpathref</td>
+    <td>The classpath to use, given as a <a href="../using.html#references">reference</a> to a path
+      defined elsewhere.
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>loaderRef</td>
+    <td>the name of the loader that is used to load the script, constructed from the specified
+      classpath. This allows multiple script definitions to reuse the same class loader.
+    </td>
+    <td>No</td>
+  </tr>
+</table>
 
-<h3>Nested elements</h3>
+<h3>Parameters specified as nested elements</h3>
 <h4>attribute</h4>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">the name of the attribute</td>
-    <td valign="top" align="center">Yes</td>
+    <td>name</td>
+    <td>the name of the attribute</td>
+    <td>Yes</td>
   </tr>
 </table>
 
 <h4>element</h4>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
+<table class="attr">
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">the name of the nested element to be supported by the
-                     task defined by the script</td>
-    <td valign="top" align="center">Yes</td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">classname</td>
-    <td valign="top">the classname of the class to be used for the nested element.
-         This specifies the class directly and is an alternative to specifying
-         the Ant type name.</td>
-    <td valign="top" align="center">No</td>
+    <td>name</td>
+    <td>the name of the nested element to be supported by the task defined by the script</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">type</td>
-    <td valign="top">This is the name of an Ant task or type which is to
-        be used when this element is to be created. This is an alternative
-        to specifying the class name directly. If the type is in a namespace,
-        the URI and a : must be prefixed to the type. For example
-        <code>type="antlib:example.org:newtype"</code></td>
-    <td valign="top" align="center">No</td>
+    <td>classname</td>
+    <td>the classname of the class to be used for the nested element.  This specifies the class
+      directly and is an alternative to specifying the Ant type name.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">any resource or resource collection</td>
-    <td valign="top">Since Ant1.7.1, this task can load scripts
-    from any resource supplied as a nested element. when </td>
-    <td valign="top" align="center">No</td>
+    <td>type</td>
+    <td>This is the name of an Ant task or type which is to be used when this element is to be
+      created. This is an alternative to specifying the class name directly. If the type is in a
+      namespace, the URI and a <q>:</q> must be prefixed to the type. For
+      example <var>type</var>=<q>antlib:example.org:newtype</q></td>
+    <td>No</td>
   </tr>
-
 </table>
 
-  <h4>classpath</h4>
-  <p>
-    See the <a href="../Tasks/script.html">script</a> task
-    for using this nested element.
-  </p>
+<h4>classpath</h4>
+<p>See the <a href="../Tasks/script.html">script</a> task for using this nested element.</p>
 
+<h4>any resource collection</h4>
+<p><em>Since Ant 1.7.1</em></p>
+<p>This task can load scripts from any resource supplied as a nested element.</p>
 
 <h3>Examples</h3>
 
-<p>
-The following definition creates a task which supports an attribute called
-attr and two nested elements, one being a fileset and the other a path. When
-executed, the resulting task logs the value of the attribute and the basedir
-of the first fileset.
-</p>
+<p>The following definition creates a task which supports an attribute called <var>attr</var> and
+two nested elements, one being a fileset and the other a path. When executed, the resulting task
+logs the value of the attribute and the <var>basedir</var> of the first fileset.</p>
 
 <pre>
-  &lt;scriptdef name=&quot;scripttest&quot; language=&quot;javascript&quot;&gt;
-    &lt;attribute name=&quot;attr1&quot;/&gt;
-    &lt;element name=&quot;fileset&quot; type=&quot;fileset&quot;/&gt;
-    &lt;element name=&quot;path&quot; type=&quot;path&quot;/&gt;
-    &lt;![CDATA[
-
-      self.log(&quot;Hello from script&quot;);
-      self.log(&quot;Attribute attr1 = &quot; + attributes.get(&quot;attr1&quot;));
-      self.log(&quot;First fileset basedir = &quot;
-        + elements.get(&quot;fileset&quot;).get(0).getDir(project));
-
-    ]]&gt;
-  &lt;/scriptdef&gt;
-
-  &lt;scripttest attr1=&quot;test&quot;&gt;
-    &lt;path&gt;
-      &lt;pathelement location=&quot;src&quot;/&gt;
-    &lt;/path&gt;
-    &lt;fileset dir=&quot;src&quot;/&gt;
-    &lt;fileset dir=&quot;main&quot;/&gt;
-  &lt;/scripttest&gt;
-</pre>
-
-<p>
-The following variation on the above script lists the number of fileset elements
-and iterates through them
-</p>
+&lt;scriptdef name=&quot;scripttest&quot; language=&quot;javascript&quot;&gt;
+  &lt;attribute name=&quot;attr1&quot;/&gt;
+  &lt;element name=&quot;fileset&quot; type=&quot;fileset&quot;/&gt;
+  &lt;element name=&quot;path&quot; type=&quot;path&quot;/&gt;
+  &lt;![CDATA[
+
+    self.log(&quot;Hello from script&quot;);
+    self.log(&quot;Attribute attr1 = &quot; + attributes.get(&quot;attr1&quot;));
+    self.log(&quot;First fileset basedir = &quot;
+      + elements.get(&quot;fileset&quot;).get(0).getDir(project));
+
+  ]]&gt;
+&lt;/scriptdef&gt;
+
+&lt;scripttest attr1=&quot;test&quot;&gt;
+  &lt;path&gt;
+    &lt;pathelement location=&quot;src&quot;/&gt;
+  &lt;/path&gt;
+  &lt;fileset dir=&quot;src&quot;/&gt;
+  &lt;fileset dir=&quot;main&quot;/&gt;
+&lt;/scripttest&gt;</pre>
+
+<p>The following variation on the above script lists the number of fileset elements and iterates
+through them</p>
 <pre>
-  &lt;scriptdef name=&quot;scripttest2&quot; language=&quot;javascript&quot;&gt;
-    &lt;element name=&quot;fileset&quot; type=&quot;fileset&quot;/&gt;
-    &lt;![CDATA[
-      filesets = elements.get(&quot;fileset&quot;);
-      self.log(&quot;Number of filesets = &quot; + filesets.size());
-      for (i = 0; i &lt; filesets.size(); ++i) {
-        self.log(&quot;fileset &quot; + i + &quot; basedir = &quot;
-          + filesets.get(i).getDir(project));
-      }
-    ]]&gt;
-  &lt;/scriptdef&gt
-
-  &lt;scripttest2&gt;
-    &lt;fileset dir=&quot;src&quot;/&gt;
-    &lt;fileset dir=&quot;main&quot;/&gt;
-  &lt;/scripttest2&gt;
-</pre>
-
-<p>
-When a script has a syntax error, the scriptdef name will be listed in the
-error. For example in the above script, removing the closing curly bracket
-would result in this error
-</p>
-
-<p><code>build.xml:15: SyntaxError: missing } in compound
-statement (scriptdef <code>&lt;scripttest2&gt;</code>; line 10)</code></p>
-
-<p>
-Script errors are only detected when a script task is actually executed.
-</p>
-<p>
-    The next example does uses nested text in Jython. It also declares 
-    the script in a new xml namespace, which must be used to refer to 
-    the task. Declaring scripts in a new namespace guarantees that Ant will 
-    not create a task of the same (namespace,localname) name pair. 
-</p>
+&lt;scriptdef name=&quot;scripttest2&quot; language=&quot;javascript&quot;&gt;
+  &lt;element name=&quot;fileset&quot; type=&quot;fileset&quot;/&gt;
+  &lt;![CDATA[
+    filesets = elements.get(&quot;fileset&quot;);
+    self.log(&quot;Number of filesets = &quot; + filesets.size());
+    for (i = 0; i &lt; filesets.size(); ++i) {
+      self.log(&quot;fileset &quot; + i + &quot; basedir = &quot;
+        + filesets.get(i).getDir(project));
+    }
+  ]]&gt;
+&lt;/scriptdef&gt
+
+&lt;scripttest2&gt;
+  &lt;fileset dir=&quot;src&quot;/&gt;
+  &lt;fileset dir=&quot;main&quot;/&gt;
+&lt;/scripttest2&gt;</pre>
+
+<p>When a script has a syntax error, the <code>scriptdef</code> name will be listed in the
+error. For example in the above script, removing the closing curly bracket would result in this
+error</p>
+
+<pre class="output">build.xml:15: SyntaxError: missing } in compound
+statement (scriptdef &lt;scripttest2&gt;; line 10)</pre>
+
+<p>Script errors are only detected when a <code>script</code> task is actually executed.</p>
+<p>The next example does uses nested text in Jython. It also declares the script in a new xml
+namespace, which must be used to refer to the task. Declaring scripts in a new namespace guarantees
+that Ant will not create a task of the same (namespace,localname) name pair.</p>
 
 <pre>
 &lt;target name="echo-task-jython"&gt;
   &lt;scriptdef language="jython"
-      name="echo"
-      uri="http://example.org/script"&gt;
+             name="echo"
+             uri="http://example.org/script"&gt;
       &lt;![CDATA[
 self.log("text: " +self.text)
-    ]]&gt;
+      ]]&gt;
     &lt;/scriptdef&gt;
 &lt;/target&gt;
 
 &lt;target name="testEcho" depends="echo-task-jython"
-    xmlns:s="http://example.org/script"&gt;
+        xmlns:s="http://example.org/script"&gt;
   &lt;s:echo&gt;nested text&lt;/s:echo&gt;
-&lt;/target&gt;
-</pre>
+&lt;/target&gt;</pre>
 
-The next example shows the use of &lt;classpath&gt; and
-"loaderref" to get access to the beanshell jar.
+<p>The next example shows the use of <code>&lt;classpath&gt;</code>
+and <var>loaderref</var> to get access to the beanshell jar.</p>
 <pre>
-    &lt;scriptdef name="b1" language="beanshell"
-               loaderref="beanshell-ref"&gt;
-      &lt;attribute name="a"/&gt;
-      &lt;classpath
-        path="${user.home}/scripting/beanshell/bsh-1.3b1.jar"/&gt;
-      self.log("attribute a is " + attributes.get("a"));
-    &lt;/scriptdef&gt;
-
-    &lt;scriptdef name="b2" language="beanshell"
-               loaderref="beanshell-ref"&gt;
-      &lt;attribute name="a2"/&gt;
-      self.log("attribute a2 is " + attributes.get("a2"));
-    &lt;/scriptdef&gt;
-
-    &lt;b1 a="this is an 'a'"/&gt;
-    &lt;b2 a2="this is an 'a2' for b2"/&gt;
-</pre>
-<h3>Testing Scripts</h3>
-
-<p>
-The easiest way to test scripts is to use the 
-<a href="http://ant.apache.org/antlibs/antunit/">AntUnit</a> ant library.
-This will run all targets in a script that begin with "test" (and their dependencies). </p>
-
-
-
+&lt;scriptdef name="b1" language="beanshell"
+           loaderref="beanshell-ref"&gt;
+  &lt;attribute name="a"/&gt;
+  &lt;classpath path="${user.home}/scripting/beanshell/bsh-1.3b1.jar"/&gt;
+  self.log("attribute a is " + attributes.get("a"));
+&lt;/scriptdef&gt;
+
+&lt;scriptdef name="b2" language="beanshell"
+           loaderref="beanshell-ref"&gt;
+  &lt;attribute name="a2"/&gt;
+  self.log("attribute a2 is " + attributes.get("a2"));
+&lt;/scriptdef&gt;
+
+&lt;b1 a="this is an 'a'"/&gt;
+&lt;b2 a2="this is an 'a2' for b2"/&gt;</pre>
+
+<h3>Testing scripts</h3>
+
+<p>The easiest way to test scripts is to use the <a href="https://ant.apache.org/antlibs/antunit/"
+target="_top">AntUnit</a> Ant library.  This will run all targets in a script that begin
+with <q>test</q> (and their dependencies).</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/script.html ant-1.10.3/manual/Tasks/script.html
--- ant-1.9.10/manual/Tasks/script.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/script.html	2018-03-24 12:37:12.000000000 +0000
@@ -17,147 +17,126 @@
 <html>
 
 <head>
-<meta http-equiv="Content-Language" content="en-us"></meta>
+<meta http-equiv="Content-Language" content="en-us">
 <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
 <title>Script Task</title>
 </head>
 
 <body>
 
-<h2><a name="script">Script</a></h2>
+<h2 id="script">Script</h2>
 <h3>Description</h3>
-  <p>Execute a script in a
-    <a href="http://jakarta.apache.org/bsf" target="_top">Apache BSF</a>
-    or
-    <a href="https://scripting.dev.java.net">JSR 223</a>  supported language.
-  </p>
-  <p><b>Note:</b>
-    This task depends on external libraries not included in the Apache Ant distribution.
-    See <a href="../install.html#librarydependencies">Library Dependencies</a>
-    for more information.
-  </p>
-  <p>
-    The task may use the BSF scripting manager or the JSR 223 manager that
-    is included in JDK6 and higher. This is controlled by the <code>manager</code>
-    attribute. The JSR 223 scripting manager is indicated by "javax".
-  </p>
-  <p>All items (tasks, targets, etc) of the running project are
-    accessible from the script, using either their <code>name</code> or
-    <code>id</code> attributes (as long as their names are considered
-    valid Java identifiers, that is).
-    This is controlled by the "setbeans" attribute of the task.
-    The name "project" is a pre-defined reference to the Project, which can be
-    used instead of the project name. The name "self" is a pre-defined reference to the actual
-    <code>&lt;script&gt;</code>-Task instance.<br>From these objects you have access to the Ant Java API, see the
-<a href="../api/index.html">JavaDoc</a> (especially for
-<a href="../api/org/apache/tools/ant/Project.html">Project</a> and
-<a href="../api/org/apache/tools/ant/taskdefs/optional/Script.html">Script</a>) for more information.</p>
-<p>If you are using JavaScript under BSF, a good resource is <a target="_blank" href="http://www.mozilla.org/rhino/doc.html">
-http://www.mozilla.org/rhino/doc.html</a> as we are using their JavaScript interpreter.</p>
+<p>Execute a script in a <a href="https://jakarta.apache.org/bsf" target="_top">Apache BSF</a>
+or <a href="https://jcp.org/aboutJava/communityprocess/maintenance/jsr223/223ChangeLog.html"
+target="_top">JSR 223</a> supported language.
+</p>
+<p><strong>Note</strong>: This task depends on external libraries not included in the Apache Ant
+distribution.  See <a href="../install.html#librarydependencies">Library Dependencies</a> for more
+information.</p>
+<p>The task may use the BSF scripting manager or the JSR 223 manager that is included in JDK 6 and
+higher. This is controlled by the <var>manager</var> attribute. The JSR 223 scripting manager is
+indicated by <q>javax</q>.</p>
+<p>All items (tasks, targets, etc) of the running project are accessible from the script, using
+either their <var>name</var> or <var>id</var> attributes (as long as their names are considered
+valid Java identifiers, that is).  This is controlled by the <var>setbeans</var> attribute of the
+task.  The name <code class="code">project</code> is a pre-defined reference to the Project, which
+can be used instead of the project name. The name <code class="code">self</code> is a pre-defined
+reference to the actual <code>&lt;script&gt;</code>-Task instance.<br/>From these objects you have
+access to the Ant Java API, see the <a href="../api/index.html">JavaDoc</a> (especially
+for <a href="../api/org/apache/tools/ant/Project.html">Project</a>
+and <a href="../api/org/apache/tools/ant/taskdefs/optional/Script.html">Script</a>) for more
+information.</p>
+<p>If you are using JavaScript under BSF, a good resource
+is <a href="https://www.mozilla.org/rhino/doc.html"
+target="_top">https://www.mozilla.org/rhino/doc.html</a> as we are using their JavaScript
+interpreter.</p>
 <p>Scripts can do almost anything a task written in Java could do.</p>
-<p>Rhino provides a special construct - the <i>JavaAdapter</i>. With that you can
-create an object which implements several interfaces, extends classes and for which you
-can overwrite methods. Because this is an undocumented feature (yet), here is the link
-to an explanation: <a href="http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&newwindow=1&frame=right&th=610d2db45c0756bd&seekm=391EEC3C.5236D929%40yahoo.com#link2">
-Groups@Google: "Rhino, enum.js, JavaAdapter?"</a> by Norris Boyd in the newsgroup
-<i>netscape.public.mozilla.jseng</i>.</p>
-
-<p>If you are creating Targets programmatically, make sure you set the
-Location to a useful value.  In particular all targets should have
-different location values.</p>
+<p>Rhino provides a special construct&mdash;the <code>JavaAdapter</code>. With that you can create
+an object which implements several interfaces, extends classes and for which you can overwrite
+methods. Because this is an undocumented feature (yet), here is the link to an
+explanation: <a href="https://groups.google.com/forum/#!msg/netscape.public.mozilla.jseng/YlRQE0OvM8c/F8Mvq-XkpxcJ"
+target="_top">Google Groups: "Rhino, enum.js, JavaAdapter?"</a>  by Norris Boyd in the
+newsgroup <em>netscape.public.mozilla.jseng</em>.</p>
+
+<p>If you are creating Targets programmatically, make sure you set the Location to a useful value.
+In particular all targets should have different location values.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">language</td>
-    <td valign="top">The programming language the script is written in.
-      Must be a supported Apache BSF or JSR 223 language</td>
-    <td valign="top" align="center">Yes</td>
+    <td>language</td>
+    <td>The programming language the script is written in.  Must be a supported Apache BSF or JSR
+      223 language</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">manager</td>
-    <td valign="top">
-      <em>Since: Ant 1.7. </em>
-      The script engine manager to use. This can have
-      one of three values ("auto", "bsf" or "javax").
-      The default value is "auto".
-      <dl>
-        <li>"bsf" use the BSF scripting manager to run
-          the language.</li>
-        <li>"javax" use the <em>javax.scripting</em> manager
-          to run the language. (This will only work for JDK6 and higher).</li>
-        <li>"auto" use the BSF engine if it exists,
-          otherwise use the <em>javax.scripting</em> manager.</li>
-      </dl>
+    <td>manager</td>
+    <td>
+      <em>Since Ant 1.7</em>.  The script engine manager to use. This can have one of three
+      values: <q>auto</q>, <q>bsf</q> or <q>javax</q>.
+      <ul>
+        <li><q>bsf</q> use the BSF scripting manager to run the language.</li>
+        <li><q>javax</q> use the <code>javax.scripting</code> manager to run the language. (This
+          will only work for JDK 6 and higher).</li>
+        <li><q>auto</q> use the BSF engine if it exists, otherwise use
+          the <code>javax.scripting</code> manager.</li>
+      </ul>
     </td>
-    <td valign="top" align="center">No</td>
+    <td>No; default is <q>auto</q></td>
   </tr>
   <tr>
-    <td valign="top">src</td>
-    <td valign="top">The location of the script as a file, if not inline</td>
-    <td valign="top" align="center">No</td>
+    <td>src</td>
+    <td>The location of the script as a file, if not inline</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">setbeans</td>
-    <td valign="top">
-      This attribute controls whether to set variables for
-      all properties, references and targets in the running script.
-      If this attribute is false, only the the "project" and "self" variables are set.
-      If this attribute is true all the variables are set. The default value of this
-      attribute is "true".  <em>Since Ant 1.7</em>
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>encoding</td>
+    <td>The encoding of the script as a file. <em>Since Ant 1.10.2</em>.</td>
+    <td>No; defaults to default JVM character encoding</td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">
-      The classpath to pass into the script. <em>Since Ant 1.7</em>
-    </td>
-    <td align="center" valign="top">No</td>
+    <td>setbeans</td>
+    <td>This attribute controls whether to set variables for all properties, references and targets
+      in the running script.  If this attribute is <q>false</q>, only the the <code>project</code>
+      and <code>self</code> variables are set.  If this attribute is <q>true</q> all the variables
+      are set. <em>Since Ant 1.7</em></td>
+    <td>No; defaults to <q>true</q></td>
+  </tr>
+  <tr>
+    <td>classpath</td>
+    <td>The classpath to pass into the script. <em>Since Ant 1.7</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">The classpath to use, given as a
-       <a href="../using.html#references">reference</a> to a path defined elsewhere.
+    <td>classpathref</td>
+    <td>The classpath to use, given as a <a href="../using.html#references">reference</a> to a path
+    defined elsewhere.
     <em>Since Ant 1.7</em></td>
-    <td align="center" valign="top">No</td>
+    <td>No</td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 <h4>classpath</h4>
-  <p><em>Since Ant 1.7</em></p>
-<p>
-  <code>Script</code>'s <code>classpath</code> attribute is a 
-  <a href="../using.html#path">path-like structure</a> and can also be set via a nested
-  <code>&lt;classpath&gt;</code> element.
-  <p>
-    If a classpath is set, it will be used as the current thread
-    context classloader, and
-    as the classloader given to the BSF manager. 
-    This means that it can be used to specify
-    the classpath containing the language implementation for BSF
-    or for JSR 223 managers.
-    This can be useful if one wants
-    to keep ${user.home}/.ant/lib free of lots of scripting language
-    specific jar files.
-  </p>
-  <p>
-    <b>NB: (Since Ant 1.7.1)</b>
-    This classpath <em>can</em> be used to
-    specify the location of
-    the BSF jar file and/or languages
-    that have engines in the BSF jar file. This includes the
-    javascript, jython, netrexx and jacl languages.
-  </p>
+<p><em>Since Ant 1.7</em></p>
+<p><code>Script</code>'s <var>classpath</var> attribute is a <a href="../using.html#path">path-like
+structure</a> and can also be set via a nested <code>&lt;classpath&gt;</code> element.
 </p>
+<p>If a classpath is set, it will be used as the current thread context classloader, and as the
+classloader given to the BSF manager.  This means that it can be used to specify the classpath
+containing the language implementation for BSF or for JSR 223 managers.  This can be useful if one
+wants to keep <samp>${user.home}/.ant/lib</samp> free of lots of scripting language specific jar
+files.</p>
+<p><strong>Note</strong>: (<em>since Ant 1.7.1</em>) This classpath <em>can</em> be used to specify
+the location of the BSF jar file and/or languages that have engines in the BSF jar file. This
+includes the <q>javascript</q>, <q>jython</q>, <q>netrexx</q> and <q>jacl</q> languages.</p>
 <h3>Examples</h3>
-The following snippet shows use of five different languages:
-  <blockquote><pre>
+<p>The following snippet shows use of five different languages:</p>
+<pre>
     &lt;property name="message" value="Hello world"/&gt;
 
     &lt;script language="groovy"&gt;
@@ -178,74 +157,50 @@
 
     &lt;script language="jython"&gt;
 print "message is %s" % message
-    &lt;/script&gt;
-</pre>
-  </blockquote>
-  <p>
-  Note that for the <i>jython</i> example, the script contents <b>must</b>
-  start on the first column.
-  </p>
-  <p>
-    Note also that for the <i>ruby</i> example, the names of the set variables are prefixed
-    by a '$'.
-  <p>
-    The following script shows a little more complicated jruby example:
-  </p>
-  <blockquote><pre>
+    &lt;/script&gt;</pre>
+<p>Note that for the <q>jython</q> example, the script contents <strong>must</strong> start on the
+first column.</p>
+<p>Note also that for the <q>ruby</q> example, the names of the set variables are prefixed by
+a <q>$</q>.</p>
+<p>The following script shows a little more complicated JRuby example:</p>
+<pre>
 &lt;script language="ruby"&gt;
   xmlfiles = Dir.new(".").entries.delete_if { |i| ! (i =~ /\.xml$/) }
   xmlfiles.sort.each { |i| $self.log(i) }
-&lt;/script&gt;
-</pre>
-  </blockquote>
-  <p>
-    The same example in groovy is:
-  </p>
-  <blockquote><pre>
+&lt;/script&gt;</pre>
+<p>The same example in Groovy is:</p>
+<pre>
 &lt;script language="groovy"&gt;
   xmlfiles = new java.io.File(".").listFiles().findAll{ it =~ "\.xml$"}
-  xmlfiles.sort().each { self.log(it.toString())}
-&lt;/script&gt;
-</pre>
-  </blockquote>
-  <p>
-    The following example shows the use of classpath to specify the location
-    of the beanshell jar file.
-  </p>
-  <blockquote><pre>
+  xmlfiles.sort().each { self.log(it.toString()) }
+&lt;/script&gt;</pre>
+<p>The following example shows the use of classpath to specify the location of the beanshell jar
+file.</p>
+<pre>
 &lt;script language="beanshell" setbeans="true"&gt;
   &lt;classpath&gt;
-    &lt;fileset dir="${user.home}/lang/beanshell" includes="*.jar" /&gt;
+    &lt;fileset dir="${user.home}/lang/beanshell" includes="*.jar"/&gt;
   &lt;/classpath&gt;
   System.out.println("Hello world");
-&lt;/script&gt;
-</pre>
-  </blockquote>
+&lt;/script&gt;</pre>
   <p>
-    The following script uses javascript to create a number of
-    echo tasks and execute them.
+    The following script uses JavaScript to create a number of
+    <code>echo</code> tasks and execute them.
   </p>
-<blockquote><pre>
+<pre>
 &lt;project name=&quot;squares&quot; default=&quot;main&quot; basedir=&quot;.&quot;&gt;
-
   &lt;target name=&quot;main&quot;&gt;
-
     &lt;script language=&quot;javascript&quot;&gt; &lt;![CDATA[
-
-      for (i=1; i&lt;=10; i++) {
+      for (i = 1; i &lt;= 10; i++) {
         echo = squares.createTask(&quot;echo&quot;);
         echo.setMessage(i*i);
         echo.perform();
       }
-
     ]]&gt; &lt;/script&gt;
-
   &lt;/target&gt;
-
-&lt;/project&gt;
-</pre></blockquote>
+&lt;/project&gt;</pre>
 <p>generates</p>
-<blockquote><pre>
+<pre>
 main:
 1
 4
@@ -258,15 +213,13 @@
 81
 100
 
-BUILD SUCCESSFUL
-</pre></blockquote>
+BUILD SUCCESSFUL</pre>
 
-<p>Now a more complex example using the Java API and the Ant API. The goal is to list the
-filesizes of all files a <code>&lt;fileset/&gt;</code> caught.</p>
-<blockquote><pre>
-
-&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
-&lt;project name="<font color=blue>MyProject</font>" basedir="." default="main"&gt;
+<p>Now a more complex example using the Java API and the Ant API. The goal is to list the file sizes
+of all files a <code>&lt;fileset/&gt;</code> caught.</p>
+<pre>
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;project name="<span style="color:blue">MyProject</span>" basedir="." default="main"&gt;
 
   &lt;property name="fs.dir" value="src"/&gt;
   &lt;property name="fs.includes" value="**/*.txt"/&gt;
@@ -274,20 +227,19 @@
 
   &lt;target name="main"&gt;
     &lt;script language="javascript"&gt; &lt;![CDATA[
-
       // import statements
-      <font color=blue>// importPackage(java.io)</font>;
-      <font color=blue>importClass(java.io.File)</font>;
+      <span style="color:blue">// importPackage(java.io)</span>;
+      <span style="color:blue">importClass(java.io.File)</span>;
 
       // Access to Ant-Properties by their names
-      dir      = <font color=blue>project</font>.getProperty("fs.dir");
-      includes = <font color=blue>MyProject</font>.getProperty("fs.includes");
-      excludes = <font color=blue>self.getProject()</font>  .<font color=blue>getProperty("fs.excludes")</font>;
+      dir      = <span style="color:blue">project</span>.getProperty("fs.dir");
+      includes = <span style="color:blue">MyProject</span>.getProperty("fs.includes");
+      excludes = <span style="color:blue">self.getProject()</span>.<span style="color:blue">getProperty("fs.excludes")</span>;
 
       // Create a &lt;fileset dir="" includes=""/&gt;
-      fs = project.<font color=blue>createDataType("fileset")</font>;
-      fs.setDir( new File(dir) );
-      <font color=blue>fs.setIncludes(includes)</font>;
+      fs = project.<span style="color:blue">createDataType("fileset")</span>;
+      fs.setDir(new File(dir));
+      <span style="color:blue">fs.setIncludes(includes)</span>;
       fs.setExcludes(excludes);
 
       // Get the files (array) of that fileset
@@ -295,50 +247,44 @@
       srcFiles = ds.getIncludedFiles();
 
       // iterate over that array
-      for (i=0; i&lt;srcFiles.length; i++) {
+      for (i = 0; i &lt; srcFiles.length; i++) {
 
         // get the values via Java API
         var basedir  = fs.getDir(project);
         var filename = srcFiles[i];
-        var file = <font color=blue>new File(basedir, filename)</font>;
+        var file = <span style="color:blue">new File(basedir, filename)</span>;
         var size = file.length();
 
         // create and use a Task via Ant API
-        echo = MyProject.<font color=blue>createTask("echo")</font>;
+        echo = MyProject.<span style="color:blue">createTask("echo")</span>;
         echo.setMessage(filename + ": " + size + " byte");
-        echo.<font color=blue>perform()</font>;
+        echo.<span style="color:blue">perform()</span>;
       }
     ]]&gt;&lt;/script&gt;
   &lt;/target&gt;
-&lt;/project&gt;
-</pre></blockquote>
-<p>We want to use the Java API. Because we don't want always typing the package signature
-we do an import. Rhino knows two different methods for import statements: one for packages
-and one for a single class. By default only the <i>java</i> packages are available, so
-<i>java.lang.System</i> can be directly imported with <code>importClass/importPackage</code>.
-For other packages you have to prefix the full classified name with <i>Packages</i>.
-For example Ant's <i>FileUtils</i> class can be imported with
-<code>importClass(<b>Packages</b>.org.apache.tools.ant.util.FileUtils)</code>
-<br>
-The <code>&lt;script&gt;</code> task populates the Project instance under
-the name <i>project</i>, so we can use that reference. Another way is to use its given name
-or getting its reference from the task itself.<br>
-The Project provides methods for accessing and setting properties, creating DataTypes and
-Tasks and much more.<br>
-After creating a FileSet object we initialize that by calling its set-methods. Then we can
-use that object like a normal Ant task (<code>&lt;copy&gt;</code> for example).<br>
-For getting the size of a file we instantiate a <code>java.io.File</code>. So we are using
-normal Java API here.<br>
-Finally we use the <code>&lt;echo&gt;</code> task for producing the output. The task is not executed by
-its execute() method, because the perform() method (implemented in Task itself) does the
-appropriate logging before and after invoking execute().
-</p>
-<p>
-  Here is an example of using beanshell to create an ant
-  task. This task will add filesets and paths to a referenced
-  path. If the path does not exist, it will be created.
-</p>
-<blockquote><pre>
+&lt;/project&gt;</pre>
+<p>We want to use the Java API. Because we don't want always typing the package signature we do an
+import. Rhino knows two different methods for import statements: one for packages and one for a
+single class. By default only the <code>java</code> packages are available,
+so <code class="code">java.lang.System</code> can be directly imported
+with <code>importClass/importPackage</code>.  For other packages you have to prefix the full
+classified name with <strong>Packages</strong>.  For example Ant's <code>FileUtils</code> class can
+be imported
+with <code class="code">importClass(<strong>Packages</strong>.org.apache.tools.ant.util.FileUtils)</code><br/>
+The <code>&lt;script&gt;</code> task populates the Project instance under the
+name <code>project</code>, so we can use that reference. Another way is to use its given name or
+getting its reference from the task itself.<br/>  The Project provides methods for accessing and
+setting properties, creating DataTypes and Tasks and much more.<br/>  After creating a FileSet
+object we initialize that by calling its set-methods. Then we can use that object like a normal Ant
+task (<code>&lt;copy&gt;</code> for example).<br/>  For getting the size of a file we instantiate
+a <code class="code">java.io.File</code>. So we are using normal Java API here.<br/>  Finally we use
+the <code>&lt;echo&gt;</code> task for producing the output. The task is not executed by
+its <code class="code">execute()</code> method, because the <code class="code">perform()</code>
+method (implemented in Task itself) does the appropriate logging before and after
+invoking <code class="code">execute()</code>.</p>
+<p>Here is an example of using beanshell to create an Ant task. This task will add filesets and
+paths to a referenced path. If the path does not exist, it will be created.</p>
+<pre>
 &lt;!--
        Define addtopath task
  --&gt;
@@ -366,15 +312,11 @@
         }
     }
     project.addTaskDefinition("addtopath", AddToPath.class);
-&lt;/script&gt;
-</pre></blockquote>
-  <p>
-    An example of using this task to create a path
-    from a list of directories (using antcontrib's
-    <a href="http://ant-contrib.sourceforge.net/tasks/tasks/for.html">
-      &lt;for&gt;</a> task) follows:
-  </p>
-<blockquote><pre>
+&lt;/script&gt;</pre>
+<p>An example of using this task to create a path from a list of directories (using
+Ant-Contrib's <a href="http://ant-contrib.sourceforge.net/tasks/tasks/for.html"
+target="_top">&lt;for&gt;</a> task) follows:</p>
+<pre>
 &lt;path id="main.path"&gt;
   &lt;fileset dir="build/classes"/&gt;
 &lt;/path&gt;
@@ -386,8 +328,7 @@
                includes="**/*.jar"/&gt;
     &lt;/addtopath&gt;
   &lt;/sequential&gt;
-&lt;/ac:for&gt;
-</pre></blockquote>
+&lt;/ac:for&gt;</pre>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/sequential.html ant-1.10.3/manual/Tasks/sequential.html
--- ant-1.9.10/manual/Tasks/sequential.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/sequential.html	2018-03-24 12:37:12.000000000 +0000
@@ -26,14 +26,12 @@
 
 <h2>Sequential</h2>
 <h3>Description</h3>
-<p>Sequential is a container task - it can contain other Apache Ant tasks. The nested 
-tasks are simply executed in sequence. Sequential's primary use is to support 
-the sequential execution of a subset of tasks within the 
-<a href="parallel.html">parallel</a> task</p>
+<p><code>Sequential</code> is a container task&mdash;it can contain other Apache Ant tasks. The
+nested tasks are simply executed in sequence. Sequential's primary use is to support the sequential
+execution of a subset of tasks within the <a href="parallel.html">parallel</a> task</p>
 
-<p>The sequential task has no attributes and does not support any nested 
-elements apart from Ant tasks. Any valid Ant task may be embedded within the 
-sequential task.</p>
+<p>The <code>sequential</code> task has no attributes and does not support any nested elements apart
+from Ant tasks. Any valid Ant task may be embedded within the sequential task.</p>
 
 <h3>Example</h3>
 <pre>
@@ -44,12 +42,9 @@
     &lt;junit ... &gt;
     &lt;wlstop/&gt;
   &lt;/sequential&gt;
-&lt;/parallel&gt;
-</pre>
-<p>This example shows how the sequential task is used to execute three tasks in
-sequence, while another task is being executed in a separate thread. </p>
-
+&lt;/parallel&gt;</pre>
+<p>This example shows how the <code>sequential</code> task is used to execute three tasks in
+sequence, while another task is being executed in a separate thread.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/serverdeploy.html ant-1.10.3/manual/Tasks/serverdeploy.html
--- ant-1.9.10/manual/Tasks/serverdeploy.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/serverdeploy.html	2018-03-24 12:37:12.000000000 +0000
@@ -25,311 +25,281 @@
 
 <body>
 
-<h1><a name="serverdeploy">Apache Ant ServerDeploy User Manual</a></h1>
+<h1 id="serverdeploy">Apache Ant ServerDeploy User Manual</h1>
 <p>by</p>
 <!-- Names are in alphabetical order, on last name -->
 <ul>
-<li>Christopher A. Longo (<a href="mailto:cal@cloud9.net">cal@cloud9.net</a>)</li>
-<li>Cyrille Morvan (<a href="mailto:cmorvan@ingenosya.com">cmorvan@ingenosya.com</a>)</li>
+  <li>Christopher A. Longo (<a href="mailto:cal@cloud9.net">cal@cloud9.net</a>)</li>
+  <li>Cyrille Morvan (<a href="mailto:cmorvan@ingenosya.com">cmorvan@ingenosya.com</a>)</li>
 </ul>
 
-</p>
-<hr>
-<p> At present the tasks support:<br>
+<hr/>
+<p>At present the tasks support:</p>
 
 <ul>
-<li><a href="http://www.bea.com" target="_top">Weblogic</a> servers</li>
-<li><a href="http://www.objectweb.org/jonas/" target="_top">JOnAS</a>
-2.4 Open Source EJB server</li>
+  <li><a href="http://www.bea.com" target="_top">WebLogic</a> servers</li>
+  <li><a href="https://jonas.ow2.org/" target="_top">JOnAS</a> 2.4 Open Source EJB server</li>
 </ul>
-Over time we expect further optional tasks  to support additional J2EE Servers.
-</p>
+<p>Over time we expect further optional tasks to support additional J2EE Servers.</p>
 
-<hr>
-
-<table border="1" cellpadding="5">
-<tr><td>Task</td><td colspan="2">Application Servers</td></tr>
-<tr><td rowspan="4"><a href="#serverdeploy_element">serverdeploy</a></td><td colspan="2" align="center"><b>Nested Elements</b></td></tr>
-<tr><td><a href="#serverdeploy_generic">generic</a></td><td>Generic task</td></tr>
-<tr><td><a href="#serverdeploy_jonas">jonas</a></td><td>JOnAS 2.4</td></tr>
-<tr><td><a href="#serverdeploy_weblogic">weblogic</a></td><td>Weblogic</td></tr>
+<hr/>
 
+<table>
+  <tr><th>Task</th><th colspan="2">Application Servers</th></tr>
+  <tr><td rowspan="4"><a href="#serverdeploy_element">serverdeploy</a></td><th colspan="2">Nested Elements</th></tr>
+  <tr><td><a href="#serverdeploy_generic">generic</a></td><td>Generic task</td></tr>
+  <tr><td><a href="#serverdeploy_jonas">jonas</a></td><td>JOnAS 2.4</td></tr>
+  <tr><td><a href="#serverdeploy_weblogic">weblogic</a></td><td>WebLogic</td></tr>
 </table>
 
-<a name="serverdeploy_element">
-<h2>ServerDeploy element</h2>
+<h2 id="serverdeploy_element">ServerDeploy element</h2>
+
+<h3>Description</h3>
 
-<h3><b>Description:</b></h3>
+<p>The <code>serverdeploy</code> task is used to run a "hot" deployment tool for vendor-specific
+J2EE server. The task requires nested elements which define the attributes of the vendor-specific
+deployment tool being executed.  Vendor-specific deployment tools elements may enforce rules for
+which attributes are required, depending on the tool.</p>
 
-<p>The <code>serverdeploy</code> task is used to run a "hot" deployment tool for
-vendor-specific J2EE server. The task requires nested elements which define
-the attributes of the vendor-specific deployment tool being executed.
-Vendor-specific deployment tools elements may enforce rules for which
-attributes are required, depending on the tool.
-</p>
-
-<h3>Parameters:</h3>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">action</td>
-    <td valign="top">This is the action to be performed.  For most cases this
-    will be "deploy".  Some tools support additional actions, such as "delete", "list",
-    "undeploy", "update"...</td>
+<h3>Parameters</h3>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>action</td>
+    <td>This is the action to be performed.  For most cases this will be <q>deploy</q>.  Some tools
+      support additional actions, such
+      as <q>delete</q>, <q>list</q>, <q>undeploy</q>, <q>update</q>, ...</td>
     <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">source</td>
-    <td valign="top">A fully qualified path/filename of the component to be deployed.
-    This may be an .ear, .jar, .war, or any other type that is supported by the server.
-    </td>
+    <td>source</td>
+    <td>A fully qualified path/filename of the component to be deployed.  This may be
+      an <samp>.ear</samp>, <samp>.jar</samp>, <samp>.war</samp>, or any other type that is
+      supported by the server.</td>
     <td>Tool dependent</td>
   </tr>
 </table>
 
-<h3>Nested Elements</h3>
+<h3>Parameters specified as nested elements</h3>
 
-<p>The serverdeploy task supports a nested <code>classpath</code> element to set the classpath.</p>
+<p>The <code>serverdeploy</code> task supports a nested <code>classpath</code> element to set the
+classpath.</p>
 
 <h3>Vendor-specific nested elements</h3>
 
-<h3>Parameters used for all tools:</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<p>Also supported are nested vendor-specific elements.</p>
+
+<h3>Parameters used for all tools</h3>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">The classpath to be passed to the JVM running the tool.
-    The classpath may also be supplied as a nested element.</td>
+    <td>classpath</td>
+    <td>The classpath to be passed to the JVM running the tool.  The classpath may also be supplied
+      as a nested element.</td>
     <td>Tool dependent</td>
   </tr>
   <tr>
-    <td valign="top">server</td>
-    <td valign="top">The address or URL for the server where the component will be deployed.</td>
+    <td>server</td>
+    <td>The address or URL for the server where the component will be deployed.</td>
     <td>Tool dependent</td>
   </tr>
   <tr>
-    <td valign="top">username</td>
-    <td valign="top">The user with privileges to deploy applications to the server.</td>
+    <td>username</td>
+    <td>The user with privileges to deploy applications to the server.</td>
     <td>Tool dependent</td>
   </tr>
   <tr>
-    <td valign="top">password</td>
-    <td valign="top">The password of the user with privileges to deploy applications to the server.</td>
+    <td>password</td>
+    <td>The password of the user with privileges to deploy applications to the server.</td>
     <td>Tool dependent</td>
   </tr>
 </table>
 
-<p>Also supported are nested vendor-specific elements.</p>
-
-<a name="serverdeploy_generic">
-<h3>Generic element</h3>
-This element is provided for generic Java-based deployment tools.
-The generic task accepts (but does not require) nested <code>arg</code>
-and <code>jvmarg</code> elements.
-A JVM will be spawned with the provided attributes.  It is recommended
-that a vendor-specific element be used over the generic one if at all
-possible.
+<h3 id="serverdeploy_generic">Generic element</h3>
+<p>This element is provided for generic Java-based deployment tools.  The generic task accepts (but
+does not require) nested <code>arg</code> and <code>jvmarg</code> elements.  A JVM will be spawned
+with the provided attributes.  It is recommended that a vendor-specific element be used over the
+generic one if at all possible.</p>
 <p>The following attributes are supported by the generic element.</p>
-<p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">classname</td>
-    <td valign="top">This is the fully qualified classname of the Java based
-    deployment tool to execute.</td>
+    <td>classname</td>
+    <td>This is the fully qualified classname of the Java based deployment tool to execute.</td>
     <td>Yes</td>
   </tr>
 </table>
-</p>
 
-<h3>Nested Elements</h3>
-<p>The generic element supports nested <code>&lt;arg&gt;</code> and <code>&lt;jvmarg&gt;</code> elements.</p>
+<h4>Nested elements</h4>
+<p>The generic element supports nested <code>&lt;arg&gt;</code> and <code>&lt;jvmarg&gt;</code>
+elements.</p>
 
 <h3>Example</h3>
 
-<p>This example shows the use of generic deploy element to deploy a component
-using a Java based deploy tool:</p>
+<p>This example shows the use of generic deploy element to deploy a component using a Java based
+deploy tool:</p>
 
 <pre>
-    &lt;serverdeploy action=&quot;deploy&quot; source=&quot;${lib.dir}/ejb_myApp.ear&quot;&gt;
-        &lt;generic classname="com.yamato.j2ee.tools.deploy.DeployTool"
-            classpath=&quot;${classpath}&quot;
-            username=&quot;${user.name}&quot;
-            password=&quot;${user.password}&quot;&gt;
-            &lt;arg value="-component=WildStar"/&gt;
-            &lt;arg value="-force"/&gt;
-            &lt;jvmarg value="-ms64m"/&gt;
-            &lt;jvmarg value="-mx128m"/&gt;
-        &lt;/generic&gt;
-    &lt;/serverdeploy&gt;
-</pre>
-
-<a name="serverdeploy_weblogic">
-<h3>WebLogic element</h3>
-<p>
-The WebLogic element contains additional attributes to run the
-<code>weblogic.deploy</code> deployment tool.
-<p>Valid actions for the tool are <code>deploy</code>, <code>undeploy</code>,
-<code>list</code>, <code>update</code>, and <code>delete</code>.
-<p>If the action is <code>deploy</code> or <code>update</code>,
-the <code>application</code> and <code>source</code> attributes must be set.
-If the action is <code>undeploy</code> or <code>delete</code>,
-the <code>application</code> attribute must be set.  If the <code>username</code>
-attribute is omitted, it defaults to "system".  The <code>password</code> attribute is
-required for all actions.
-<p>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td valign="top"><b>Required</b></td>
+&lt;serverdeploy action=&quot;deploy&quot; source=&quot;${lib.dir}/ejb_myApp.ear&quot;&gt;
+    &lt;generic classname="com.yamato.j2ee.tools.deploy.DeployTool"
+             classpath=&quot;${classpath}&quot;
+             username=&quot;${user.name}&quot;
+             password=&quot;${user.password}&quot;&gt;
+        &lt;arg value="-component=WildStar"/&gt;
+        &lt;arg value="-force"/&gt;
+        &lt;jvmarg value="-ms64m"/&gt;
+        &lt;jvmarg value="-mx128m"/&gt;
+    &lt;/generic&gt;
+&lt;/serverdeploy&gt;</pre>
+
+<h3 id="serverdeploy_weblogic">WebLogic element</h3>
+<p>The WebLogic element contains additional attributes to run the <code>weblogic.deploy</code>
+deployment tool.</p>
+<p>Valid actions for the tool are <q>deploy</q>, <q>undeploy</q>, <q>list</q>, <q>update</q>,
+and <q>delete</q>.</p>
+<p>If the action is <q>deploy</q> or <q>update</q>, the <var>application</var> and <var>source</var>
+attributes must be set.  If the action is <q>undeploy</q> or <q>delete</q>,
+the <var>application</var> attribute must be set.  If the <var>username</var> attribute is omitted,
+it defaults to <q>system</q>.  The <var>password</var> attribute is required for all actions.</p>
+
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">application</td>
-    <td valign="top">This is the name of the application being deployed</td>
+    <td>application</td>
+    <td>This is the name of the application being deployed</td>
     <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">component</td>
-    <td valign="top">This is the component string for deployment targets.
-    It is in the form <code>&lt;component&gt;:&lt;target1&gt;,&lt;target2&gt;...</code>
-    Where component is the archive name (minus the .jar, .ear, .war
-    extension).  Targets are the servers where the components will be deployed</td>
+    <td>component</td>
+    <td>This is the component string for deployment targets.  It is in the
+      form <code>&lt;component&gt;:&lt;target1&gt;,&lt;target2&gt;...</code>  Where component is the
+      archive name (minus the <samp>.jar</samp>, <samp>.ear</samp>, <samp>.war</samp> extension).
+      Targets are the servers where the components will be deployed</td>
     <td>no</td>
   </tr>
   <tr>
-    <td valign="top">debug</td>
-    <td valign="top">If set to true, additional information will be
-    printed during the deployment process.</td>
+    <td>debug</td>
+    <td>If set to <q>true</q>, additional information will be printed during the deployment
+      process.</td>
     <td>No</td>
   </tr>
 </table>
 
-
 <h3>Examples</h3>
 
-<p>This example shows the use of serverdeploy to deploy a component to a WebLogic server:</p>
+<p>This example shows the use of <code>serverdeploy</code> to deploy a component to a WebLogic
+server:</p>
 
 <pre>
-    &lt;serverdeploy action=&quot;deploy&quot; source=&quot;${lib.dir}/ejb_myApp.ear&quot;&gt;
-        &lt;weblogic application=&quot;myapp&quot;
-            server=&quot;t3://myserver:7001&quot;
-            classpath=&quot;${weblogic.home}/lib/weblogic.jar&quot;
-            username=&quot;${user.name}&quot;
-            password=&quot;${user.password}&quot;
-            component=&quot;ejb_foobar:myserver,productionserver&quot;
-            debug=&quot;true&quot;/&gt;
-    &lt;/serverdeploy&gt;
-</pre>
+&lt;serverdeploy action=&quot;deploy&quot; source=&quot;${lib.dir}/ejb_myApp.ear&quot;&gt;
+    &lt;weblogic application=&quot;myapp&quot;
+              server=&quot;t3://myserver:7001&quot;
+              classpath=&quot;${weblogic.home}/lib/weblogic.jar&quot;
+              username=&quot;${user.name}&quot;
+              password=&quot;${user.password}&quot;
+              component=&quot;ejb_foobar:myserver,productionserver&quot;
+              debug=&quot;true&quot;/&gt;
+&lt;/serverdeploy&gt;</pre>
 
-<p>This example shows serverdeploy being used to delete a component from a
-WebLogic server:</p>
+<p>This example shows <code>serverdeploy</code> being used to delete a component from a WebLogic
+server:</p>
 
 <pre>
-    &lt;serverdeploy action=&quot;delete&quot; source=&quot;${lib.dir}/ejb_myApp.jar&quot;/&gt
-        &lt;weblogic application=&quot;myapp&quot;
-            server=&quot;t3://myserver:7001&quot;
-            classpath=&quot;${weblogic.home}/lib/weblogic.jar&quot;
-            username=&quot;${user.name}&quot;
-            password=&quot;${user.password}&quot;/&gt;
-    &lt;/serverdeploy&gt;
-</pre>
-
-<a name="serverdeploy_jonas">
-<h3>JOnAS (Java Open Application Server) element</h3>
-<p>
-The JOnAS element contains additional attributes to run the
-<code>JonasAdmin</code> deployment tool.
-<p>Valid actions for the tool are <code>deploy</code>, <code>undeploy</code>,
-<code>list</code> and <code>update</code>.
-<p>You can't use <code>user</code> and <code>password</code> property with this 
-task.
-<p>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td valign="top"><b>Required</b></td>
+&lt;serverdeploy action=&quot;delete&quot; source=&quot;${lib.dir}/ejb_myApp.jar&quot;/&gt
+    &lt;weblogic application=&quot;myapp&quot;
+              server=&quot;t3://myserver:7001&quot;
+              classpath=&quot;${weblogic.home}/lib/weblogic.jar&quot;
+              username=&quot;${user.name}&quot;
+              password=&quot;${user.password}&quot;/&gt;
+&lt;/serverdeploy&gt;</pre>
+
+<h3 id="serverdeploy_jonas">JOnAS (Java Open Application Server) element</h3>
+<p>The JOnAS element contains additional attributes to run the <code>JonasAdmin</code> deployment
+tool.</p>
+<p>Valid actions for the tool are <q>deploy</q>, <q>undeploy</q>, <q>list</q> and <q>update</q>.</p>
+<p>You can't use <var>user</var> and <var>password</var> property with this task.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">jonasroot</td>
-    <td valign="top">The root directory for JOnAS.</td>
+    <td>jonasroot</td>
+    <td>The root directory for JOnAS.</td>
     <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">orb</td>
-    <td valign="top">Choose your ORB : RMI, JEREMIE, DAVID, ... If omitted, it defaults
-     to the one present in classpath. The corresponding JOnAS JAR is
-     automatically added to the classpath. If your orb is DAVID (RMI/IIOP) you must 
-     specify davidhost and davidport properties.</td>
-    <td>No</td>
+    <td>orb</td>
+    <td>Choose your ORB: <q>RMI</q>, <q>JEREMIE</q>, <q>DAVID</q>, ... The corresponding JOnAS JAR
+      is automatically added to the classpath. If your <var>orb</var> is <q>DAVID</q> (RMI/IIOP) you
+      must specify <var>davidhost</var> and <var>davidport</var> properties.</td>
+    <td>No; defaults to the ORB present in classpath</td>
   </tr>
   <tr>
-    <td valign="top">davidhost</td>
-    <td valign="top">The value for the system property : <code>david.CosNaming.default_host</code> .</td>
+    <td>davidhost</td>
+    <td>The value for the system property: <code>david.CosNaming.default_host</code>.</td>
     <td>No</td>
   </tr>
   <tr>
-    <td valign="top">davidport</td>
-    <td valign="top">The value for the system property : <code>david.CosNaming.default_port</code> .</td>
+    <td>davidport</td>
+    <td>The value for the system property: <code>david.CosNaming.default_port</code>.</td>
     <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classname</td>
-    <td valign="top">This is the fully qualified classname of the Java based
-    deployment tool to execute. Default to <code>org.objectweb.jonas.adm.JonasAdmin</code></td>
-    <td>No</td>
+    <td>classname</td>
+    <td>This is the fully qualified classname of the Java based deployment tool to execute.</td>
+    <td>No; default is <code>org.objectweb.jonas.adm.JonasAdmin</code></td>
   </tr>
-
 </table>
 
-<h3>Nested Elements</h3>
-<p>The jonas element supports nested <code>&lt;arg&gt;</code> and <code>&lt;jvmarg&gt;</code> elements.</p>
-
+<h4>Nested elements</h4>
+<p>The <code>jonas</code> element supports nested <code>&lt;arg&gt;</code>
+and <code>&lt;jvmarg&gt;</code> elements.</p>
 
 <h3>Examples</h3>
 
-<p>This example shows the use of serverdeploy to deploy a component to a JOnAS server:</p>
+<p>This example shows the use of <code>serverdeploy</code> to deploy a component to a JOnAS
+server:</p>
 
 <pre>
-    &lt;serverdeploy action=&quot;deploy&quot; source=&quot;${lib.dir}/ejb_myApp.jar&quot;&gt;
-        &lt;jonas server=&quot;MyJOnAS&quot; jonasroot="${jonas.root}"&gt;
-
-           &lt;classpath&gt;
-               &lt;pathelement path=&quot;${jonas.root}/lib/RMI_jonas.jar&quot;/&gt;
-               &lt;pathelement path=&quot;${jonas.root}/config/&quot;/&gt;
-           &lt;/classpath&gt;
-        &lt;/jonas&gt;
-    &lt;/serverdeploy&gt;
-</pre>
+&lt;serverdeploy action=&quot;deploy&quot; source=&quot;${lib.dir}/ejb_myApp.jar&quot;&gt;
+    &lt;jonas server=&quot;MyJOnAS&quot; jonasroot="${jonas.root}"&gt;
+       &lt;classpath&gt;
+           &lt;pathelement path=&quot;${jonas.root}/lib/RMI_jonas.jar&quot;/&gt;
+           &lt;pathelement path=&quot;${jonas.root}/config/&quot;/&gt;
+       &lt;/classpath&gt;
+    &lt;/jonas&gt;
+&lt;/serverdeploy&gt;</pre>
 
-<p>This example shows serverdeploy being used to list the components from a
-JOnAS server and a WebLogic server:</p>
+<p>This example shows <code>serverdeploy</code> being used to list the components from a JOnAS
+server and a WebLogic server:</p>
 
 <pre>
-    &lt;serverdeploy action=&quot;list&quot;/&gt
-        &lt;jonas jonasroot=&quot;${jonas.root}&quot; orb=&quot;JEREMIE&quot;/&gt;
-        &lt;weblogic application=&quot;myapp&quot
-            server=&quot;t3://myserver:7001&quot;
-            classpath=&quot;${weblogic.home}/lib/weblogic.jar&quot;
-            username=&quot;${user.name}&quot;
-            password=&quot;${user.password}&quot;/&gt;
-    &lt;/serverdeploy&gt;
-</pre>
-
-
+&lt;serverdeploy action=&quot;list&quot;/&gt
+    &lt;jonas jonasroot=&quot;${jonas.root}&quot; orb=&quot;JEREMIE&quot;/&gt;
+    &lt;weblogic application=&quot;myapp&quot
+              server=&quot;t3://myserver:7001&quot;
+              classpath=&quot;${weblogic.home}/lib/weblogic.jar&quot;
+              username=&quot;${user.name}&quot;
+              password=&quot;${user.password}&quot;/&gt;
+&lt;/serverdeploy&gt;</pre>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/setpermissions.html ant-1.10.3/manual/Tasks/setpermissions.html
--- ant-1.9.10/manual/Tasks/setpermissions.html	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/manual/Tasks/setpermissions.html	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,96 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<html>
+
+<head>
+<meta http-equiv="Content-Language" content="en-us">
+<link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
+<title>SetPermissions Task</title>
+</head>
+
+<body>
+
+<h2 id="setpermissions">SetPermissions</h2>
+<p><em>Since Ant 1.10.0</em>.</p>
+<h3>Description</h3>
+<p>Changes the file permissions using Java's NIO support for permissions.</p>
+<p>This task provides a subset of the platform specific abilities of <a href="chmod.html">chmod</a>
+and <a href="attrib.html">attrib</a> in a platform independent way.</p>
+<p>If no permissions are specified either via the mode or the permissions attribute, then all
+permissions will be removed from the nested resources.</p>
+<p>The task accepts arbitrary resources as part of the nested resource collections, but not all
+resources support setting permissions. This task won't do anything for resources that don't support
+setting permissions&mdash;for example URLs.</p>
+<p>The permissions are applied to all resources contained within the nested resources
+collections. You may want to ensure the collection only returns files or directories if you want
+different sets of permissions to apply to either type of resource.</p>
+
+<h3>Parameters</h3>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>permissions</td>
+    <td>The permissions to set as comma separated list of names
+      of <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/file/attribute/PosixFilePermission.html"
+      target="_top">PosixFilePermission</a> values.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>mode</td>
+    <td>The permissions to set as traditional Unix three-digit octal number.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>nonPosixMode</td>
+    <td>What to do if changing the permissions of a file is not possible because the file-system
+      doesn't support POSIX file permissions. Possible options are <q>fail</q> (fail the
+      build), <q>pass</q> (just log an error), <q>tryDosOrFail</q> (at least try to set the
+      read-only flag on DOS file systems, fail if that isn't possible either)
+      and <q>tryDosOrPass</q> (at least try to set the read-only flag on DOS file systems, just log
+      an error if that isn't possible either).</td>
+    <td>No; defaults to <q>fail</q></td>
+  </tr>
+  <tr>
+    <td>failonerror</td>
+    <td>Whether to stop the build if setting permissions fails.</td>
+    <td>No; defaults to <q>true</q></td>
+  </tr>
+</table>
+<h3>Parameters specified as nested elements</h3>
+
+<h4>any resource collection</h4>
+<p><a href="../Types/resources.html#collection">resource collections</a> are used to select groups
+of resources.</p>
+<h3>Examples</h3>
+<pre>
+&lt;setpermissions mode=&quot;755&quot;&gt;
+  &lt;file file=&quot;${dist}/start.sh&quot;/&gt;
+&lt;/setpermissions&gt;</pre>
+<p>makes the <samp>start.sh</samp> file readable and executable for anyone and in addition writable
+by the owner.</p>
+<pre>
+&lt;setpermissions permissions=&quot;OWNER_READ,OWNER_WRITE,OWNER_EXECUTE,OTHERS_READ,OTHERS_EXECUTE,GROUP_READ,GROUP_EXECUTE&quot;&gt;
+  &lt;file file=&quot;${dist}/start.sh&quot;/&gt;
+&lt;/setpermissions&gt;</pre>
+<p>makes the <samp>start.sh</samp> file readable and executable for anyone and in addition writable
+by the owner.</p>
+</body>
+</html>
diff -Nru ant-1.9.10/manual/Tasks/setproxy.html ant-1.10.3/manual/Tasks/setproxy.html
--- ant-1.9.10/manual/Tasks/setproxy.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/setproxy.html	2018-03-24 12:37:12.000000000 +0000
@@ -14,207 +14,86 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-    
+
 <html>
 <head>
   <meta http-equiv="Content-Language" content="en-us">
+  <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
   <title>Setproxy Task</title>
 </head>
 
-<body bgcolor="#ffffff" text="#000000" link="#525D76"
-      alink="#525D76" vlink="#525D76">
+<body>
+<h2>Setproxy Task</h2>
 
-<table border="0" width="100%" cellspacing="4">
+<h3 id="description">Description</h3>
+<p>Sets Java's web proxy properties, so that tasks and code run in the same JVM can have
+through-the-firewall access to remote web sites, and remote FTP sites. You can nominate an HTTP and
+FTP proxy, or a SOCKS server, reset the server settings, or do nothing at all.</p>
 
-  <!-- PAGE HEADER -->
+<h3 id="attributes">Parameters</h3>
+<table class="attr">
   <tr>
-    <td>
-      <table border="0" width="100%"><tr>
-          <td valign="bottom">
-            <font size="+3" face="arial,helvetica,sanserif"><strong>Setproxy Task</strong></font>
-            <br><font face="arial,helvetica,sanserif">Sets Java's web proxy properties, so that tasks and code run in the same JVM can have through-the-firewall access to remote web sites, and remote ftp sites.</font>
-          </td>
-          <td>
-            <!-- PROJECT LOGO -->
-            <a href="http://ant.apache.org/">
-              <img src="../images/ant_logo_large.gif" align="right" alt="Apache Ant" border="0">
-            </a>
-          </td>
-      </tr></table>
-    </td>
-  </tr>
-
-  <!-- START RIGHT SIDE MAIN BODY -->
-  <tr>
-    <td  valign="top" align="left">
-
-          <!-- Applying task/long-description -->
-    <!-- Start Description -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-
-      <tr><td bgcolor="#525D76">
-        <font color="#ffffff" face="arial,helvetica.sanserif">
-          <a name="description">
-          <strong>Description</strong></a></font>
-      </td></tr>
-
-      <tr><td><blockquote>
-        Sets Java's web proxy properties, so that tasks and code run in the same JVM can have through-the-firewall access to remote web sites, and remote ftp sites. You can nominate an http and ftp proxy, or a socks server, reset the server settings, or do nothing at all. <p> Examples <pre>&lt;setproxy/&gt;</pre> do nothing <pre>&lt;setproxy proxyhost="firewall"/&gt;</pre> set the proxy to firewall:80 <pre>&lt;setproxy proxyhost="firewall" proxyport="81"/&gt;</pre> set the proxy to firewall:81 <pre>&lt;setproxy proxyhost=""/&gt;</pre> stop using the http proxy; don't change the socks settings <pre>&lt;setproxy socksproxyhost="socksy"/&gt;</pre> use socks via socksy:1080 <pre>&lt;setproxy socksproxyhost=""/&gt;</pre> stop using the socks server. <p> You can set a username and password for http with the <tt>proxyHost</tt> and <tt>proxyPassword</tt> attributes. On Java1.4 and above these can also be used against SOCKS5 servers. </p>
-      </blockquote></td></tr>
-
-    </table>
-    <!-- End Description -->
-
- <!-- Ignore -->
-
-
-
-    <!-- Start Attributes -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-      <tr><td bgcolor="#525D76">
-        <font color="#ffffff" face="arial,helvetica.sanserif">
-          <a name="attributes">
-          <strong>Parameters</strong></a></font>
-      </td></tr>
-      <tr><td><blockquote>
-        <table>
-          <tr>
-        <td bgcolor="#cccccc" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Attribute</b></font>
-        </td>
-        <td bgcolor="#cccccc" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Description</b></font>
-        </td>
-        <td bgcolor="#cccccc" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Type</b></font>
-        </td>
-        <td bgcolor="#cccccc" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Requirement</b></font>
-        </td>
-          </tr>
-    <!-- Attribute Group -->    
-    
-    <!-- Attribute Group -->    
-        <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">nonproxyhosts</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">A list of hosts to bypass the proxy on. These should be separated with the vertical bar character '|'. Only in Java 1.4 does ftp use this list. e.g. fozbot.corp.sun.com|*.eng.sun.com</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">String</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left" rowspan="7">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Optional</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">proxyhost</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">the HTTP/ftp proxy host. Set this to "" for the http proxy option to be disabled</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">String</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">proxypassword</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Set the password for the proxy. Used only if the proxyUser is set.</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">String</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">proxyport</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">the HTTP/ftp proxy port number; default is 80</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">int</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">proxyuser</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">set the proxy user. Probably requires a password to accompany this setting. Default=""</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">String</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">socksproxyhost</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">The name of a Socks server. Set to "" to turn socks proxying off.</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">String</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">socksproxyport</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Set the ProxyPort for socks connections. The default value is 1080</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">int</font>
-        </td>
-    </tr>
-
-
-        </table>
-      </blockquote></td></tr>
-
-    </table>
-    <!-- End Attributes -->
-
-    <!-- Start Elements -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-
-      <tr><td bgcolor="#525D76">
-        <font color="#ffffff" face="arial,helvetica.sanserif">
-          <a name="elements">
-          <strong>Parameters as nested elements</strong></a></font>
-      </td></tr>
-
-      <tr><td><blockquote>
-
-      </blockquote></td></tr>
-
-    </table>
-    <!-- End Elements -->
-
-
-    </td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Type</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>nonproxyhosts</td>
+    <td>A list of hosts to bypass the proxy on. These should be separated with the vertical bar
+      character <q>|</q>. Only in Java 1.4 does FTP use this
+      list. e.g. <samp>fozbot.corp.sun.com|*.eng.sun.com</samp></td>
+    <td>String</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>proxyhost</td>
+    <td>the HTTP/FTP proxy host. Set this to <q></q> for the HTTP proxy option to be disabled.</td>
+    <td>String</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>proxypassword</td>
+    <td>Set the password for the proxy. Used only if the <var>proxyUser</var> is set.</td>
+    <td>String</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>proxyport</td>
+    <td>the HTTP/FTP proxy port number</td>
+    <td>int</td>
+    <td>No; default is <q>80</q></td>
+  </tr>
+  <tr>
+    <td>proxyuser</td>
+    <td>set the proxy user. Probably requires a password to accompany this setting.</td>
+    <td>String</td>
+    <td>No; default is <q></q></td>
+  </tr>
+  <tr>
+    <td>socksproxyhost</td>
+    <td>The name of a SOCKS server. Set to <q></q> to turn SOCKS proxying off.</td>
+    <td>String</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>socksproxyport</td>
+    <td>Set the ProxyPort for SOCKS connections.</td>
+    <td>int</td>
+    <td>No; default is <q>1080</q></td>
   </tr>
-  <!-- END RIGHT SIDE MAIN BODY -->
-
 </table>
 
+<h3>Examples</h3>
+<pre>&lt;setproxy/&gt;</pre> do nothing
+<pre>&lt;setproxy proxyhost="firewall"/&gt;</pre> set the proxy to firewall:80
+<pre>&lt;setproxy proxyhost="firewall" proxyport="81"/&gt;</pre> set the proxy to <samp>firewall:81</samp>
+<pre>&lt;setproxy proxyhost=""/&gt;</pre> stop using HTTP proxy; don't change SOCKS settings
+<pre>&lt;setproxy socksproxyhost="socksy"/&gt;</pre> use SOCKS via socksy:1080
+<pre>&lt;setproxy socksproxyhost=""/&gt;</pre> stop using the SOCKS server.
+<p>You can set a username and password for http with the <var>proxyHost</var>
+and <var>proxyPassword</var> attributes. On Java 1.4 and above these can also be used against SOCKS
+5 servers.</p>
+
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/signjar.html ant-1.10.3/manual/Tasks/signjar.html
--- ant-1.9.10/manual/Tasks/signjar.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/signjar.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,276 +24,253 @@
 
 <body>
 
-<h2><a name="signjar">SignJar</a></h2>
+<h2 id="signjar">SignJar</h2>
 <h3>Description</h3>
 <p>Signing a jar allows users to authenticate the publisher.</p>
-<p>Signs JAR files with the <a target="_blank" href="http://docs.oracle.com/javase/7/docs/technotes/tools/windows/jarsigner.html"><tt>jarsigner</tt> command line tool</a>.
-It will take a named file in the <tt>jar</tt> attribute, and an optional
-<tt>destDir</tt> or <tt>signedJar</tt> attribute. Nested paths are also
-supported; here only an (optional) <tt>destDir</tt> is allowed. If a destination
-directory or explicit JAR file name is not provided, JARs are signed in place.
-</p>
-<p>
-Dependency rules
-</p>
+<p>Signs JAR files with
+the <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/jarsigner.html"
+target="_top"><kbd>jarsigner</kbd></a> command line tool.  It will take a named file in
+the <var>jar</var> attribute, and an optional <var>destDir</var> or <var>signedJar</var>
+attribute. Nested paths are also supported; here only an (optional) <var>destDir</var> is
+allowed. If a destination directory or explicit JAR file name is not provided, JARs are signed in
+place.</p>
+<p>Dependency rules</p>
 <ul>
-<li>Nonexistent destination JARs are created/signed</li>
-<li>Out of date destination JARs are created/signed</li>
-<li>If a destination file and a source file are the same,
-and <tt>lazy</tt> is true, the JAR is only signed if it does not
-contain a signature by this alias.</li>
-<li>If a destination file and a source file are the same,
-and <tt>lazy</tt> is false, the JAR is signed.</li>
+  <li>Nonexistent destination JARs are created/signed</li>
+  <li>Out of date destination JARs are created/signed</li>
+  <li>If a destination file and a source file are the same, and <var>lazy</var> is <q>true</q>, the
+    JAR is only signed if it does not contain a signature by this alias.</li>
+  <li>If a destination file and a source file are the same, and <var>lazy</var> is <q>false</q>, the
+    JAR is signed.</li>
 </ul>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">jar</td>
-    <td valign="top">the jar file to sign</td>
-    <td valign="top" align="center">Yes, unless nested paths have
-      been used.</td>
+    <td>jar</td>
+    <td>the jar file to sign</td>
+    <td>Yes, unless nested paths have been used</td>
   </tr>
   <tr>
-    <td valign="top">alias</td>
-    <td valign="top">the alias to sign under</td>
-    <td valign="top" align="center">Yes.</td>
+    <td>alias</td>
+    <td>the alias to sign under</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">storepass</td>
-    <td valign="top">password for keystore integrity.</td>
-    <td valign="top" align="center">Yes.</td>
+    <td>storepass</td>
+    <td>password for keystore integrity. Ant will not use
+    the <code>-storepass</code> command line argument but send the
+    password to jarsigner when it prompts for it.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">keystore</td>
-    <td valign="top">keystore location</td>
-    <td valign="top" align="center">No</td>
+    <td>keystore</td>
+    <td>keystore location</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">storetype</td>
-    <td valign="top">keystore type</td>
-    <td valign="top" align="center">No</td>
+    <td>storetype</td>
+    <td>keystore type</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">keypass</td>
-    <td valign="top">password for private key (if different)</td>
-    <td valign="top" align="center">No</td>
+    <td>keypass</td>
+    <td>password for private key (if different)</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">sigfile</td>
-    <td valign="top">name of .SF/.DSA file</td>
-    <td valign="top" align="center">No</td>
+    <td>sigfile</td>
+    <td>name of <samp>.SF</samp>/<samp>.DSA</samp> file</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">signedjar</td>
-    <td valign="top">name of signed JAR file. This can only be set when
-    the <tt>jar</tt> attribute is set.</td>
-    <td valign="top" align="center">No.</td>
+    <td>signedjar</td>
+    <td>name of signed JAR file. This can only be set when the <var>jar</var> attribute is set.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">(true | false) verbose output when signing</td>
-    <td valign="top" align="center">No; default false</td>
+    <td>verbose</td>
+    <td>(<q>true|false</q>) verbose output when signing</td>
+    <td>No; default <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">strict</td>
-    <td valign="top">(true | false) strict checking when signing.<br/><em>since Ant 1.9.1</em>.</td>
-    <td valign="top" align="center">No; default false</td>
+    <td>strict</td>
+    <td>(<q>true|false</q>) strict checking when signing.<br/><em>since Ant 1.9.1</em>.</td>
+    <td>No; default <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">internalsf</td>
-    <td valign="top">(true | false) include the .SF file inside the signature
-block</td>
-    <td valign="top" align="center">No; default false</td>
+    <td>internalsf</td>
+    <td>(<q>true|false</q>) include the <samp>.SF</samp> file inside the signature block</td>
+    <td>No; default <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">sectionsonly</td>
-    <td valign="top">(true | false) don't compute hash of entire manifest</td>
-    <td valign="top" align="center">No; default false</td>
+    <td>sectionsonly</td>
+    <td>(<q>true|false</q>) don't compute hash of entire manifest</td>
+    <td>No; default <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">lazy</td>
-    <td valign="top">flag to control whether the presence of a signature
-  file means a JAR is signed. This is only used when the target JAR matches
-  the source JAR</td>
-    <td valign="top" align="center">No; default false</td>
+    <td>lazy</td>
+    <td>flag to control whether the presence of a signature file means a JAR is signed. This is only
+      used when the target JAR matches the source JAR</td>
+    <td>No; default <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">maxmemory</td>
-    <td valign="top">Specifies the maximum memory the jarsigner VM will use. Specified in the
-                     style of standard java memory specs (e.g. 128m = 128 MBytes)</td>
-    <td valign="top" align="center">No</td>
+    <td>maxmemory</td>
+    <td>Specifies the maximum memory the <kbd>jarsigner</kbd> JVM will use. Specified in the style
+      of standard Java memory specs (e.g. <q>128m</q> = 128 MBytes)</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">preservelastmodified</td>
-    <td valign="top">Give the signed files the same last modified
-      time as the original jar files.</td>
-    <td valign="top" align="center">No; default false.</td>
+    <td>preservelastmodified</td>
+    <td>Give the signed files the same last modified time as the original jar files.</td>
+    <td>No; default <q>false</q>.</td>
   </tr>
   <tr>
-    <td valign="top">tsaurl</td>
-    <td valign="top">URL for a timestamp authority for timestamped
-    JAR files in Java1.5+</td>
-    <td valign="top" align="center">No</td>
+    <td>tsaurl</td>
+    <td>URL for a timestamp authority for timestamped JAR files in Java 5+</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">tsacert</td>
-    <td valign="top">alias in the keystore for a timestamp authority for
-    timestamped JAR files in Java1.5+</td>
-    <td valign="top" align="center">No</td>
+    <td>tsacert</td>
+    <td>alias in the keystore for a timestamp authority for timestamped JAR files in Java 5+</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">tsaproxyhost</td>
-    <td valign="top">proxy host to be used when connecting to TSA server</td>
-    <td valign="top" align="center">No</td>
+    <td>tsaproxyhost</td>
+    <td>proxy host to be used when connecting to TSA server</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">tsaproxyport</td>
-    <td valign="top">proxy port to be used when connecting to TSA server</td>
-    <td valign="top" align="center">No</td>
+    <td>tsaproxyport</td>
+    <td>proxy port to be used when connecting to TSA server</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">executable</td>
-    <td valign="top">Specify a particular <code>jarsigner</code> executable
-      to use in place of the default binary (found in the same JDK as
-      Apache Ant is running in).<br/>
-      Must support the same command line options as the Sun JDK
-      jarsigner command.
-      <em>since Ant 1.8.0</em>.</td>
-    <td align="center" valign="top">No</td>
+    <td>executable</td>
+    <td>Specify a particular <kbd>jarsigner</kbd> executable to use in place of the default binary
+      (found in the same JDK as Apache Ant is running in).<br/>Must support the same command line
+      options as the Sun JDK <kbd>jarsigner</kbd> command.  <em>since Ant 1.8.0</em>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">force</td>
-    <td valign="top">Whether to force signing of the jar file even if
-      it doesn't seem to be out of date or already signed.
-      <em>since Ant 1.8.0</em>.</td>
-    <td align="center" valign="top">No; default false</td>
+    <td>force</td>
+    <td>Whether to force signing of the jar file even if it doesn't seem to be out of date or
+      already signed.  <em>since Ant 1.8.0</em>.</td>
+    <td>No; default <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">sigalg</td>
-    <td valign="top">name of signature algorithm</td>
-    <td valign="top" align="center">No</td>
+    <td>sigalg</td>
+    <td>name of signature algorithm</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">digestalg</td>
-    <td valign="top">name of digest algorithm</td>
-    <td valign="top" align="center">No</td>
+    <td>digestalg</td>
+    <td>name of digest algorithm</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>tsadigestalg</td>
+    <td>name of TSA digest algorithm. <em>since Ant 1.10.2</em></td>
+    <td>No</td>
   </tr>
 </table>
 <h3>Parameters as nested elements</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">path</td>
-    <td valign="top">path of JAR files to sign. <em>since Ant 1.7</em></td>
-    <td valign="top" align="center">No</td>
+    <td>path</td>
+    <td>path of JAR files to sign. <em>since Ant 1.7</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">fileset</td>
-    <td valign="top">fileset of JAR files to sign. </td>
-    <td valign="top" align="center">No</td>
+    <td>fileset</td>
+    <td>fileset of JAR files to sign.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">mapper</td>
-    <td valign="top">A mapper to rename jar files during signing</td>
-    <td valign="top" align="center">No, and only one can be supplied</td>
+    <td>mapper</td>
+    <td>A mapper to rename jar files during signing</td>
+    <td>No, and only one can be supplied</td>
   </tr>
   <tr>
-    <td valign="top">sysproperty</td>
-    <td valign="top">JVM system properties, with the syntax of Ant
-    <a href="exec.html#env">environment variables</a> </td>
-    <td valign="top" align="center">No, and only one can be supplied</td>
+    <td>sysproperty</td>
+    <td>JVM system properties, with the syntax of Ant <a href="exec.html#env">environment
+      variables</a></td>
+    <td>No, and only one can be supplied</td>
   </tr>
  </table>
 
-
 <h3>Examples</h3>
-<p>For instructions on generating a code signing certificate, see the <a target="_blank" href="http://docs.oracle.com/javase/7/docs/technotes/tools/windows/keytool.html">keytool documentation</a> and/or instructions from your certificate authority.</p>
-  <blockquote><pre>
+<p>For instructions on generating a code signing certificate, see
+the <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/keytool.html"
+target="_top">keytool documentation</a> and/or instructions from your certificate authority.</p>
+<pre>
 &lt;signjar jar=&quot;${dist}/lib/ant.jar&quot;
-alias=&quot;apache-group&quot; storepass=&quot;secret&quot;/&gt;
-</pre></blockquote>
-<p>
-  signs the ant.jar with alias &quot;apache-group&quot; accessing the
-  keystore and private key via &quot;secret&quot; password.
-</p>
-  <blockquote><pre>
+         alias=&quot;apache-group&quot; storepass=&quot;secret&quot;/&gt;</pre>
+<p>signs the <samp>ant.jar</samp> with alias <q>apache-group</q> accessing the keystore and private
+key via <q>secret</q> password.</p>
+<pre>
 &lt;signjar destDir="signed"
-    alias="testonly" keystore="testkeystore"
-    storepass="apacheant"
-    preservelastmodified="true"&gt;
+         alias="testonly" keystore="testkeystore"
+         storepass="apacheant"
+         preservelastmodified="true"&gt;
   &lt;path&gt;
-    &lt;fileset dir="dist" includes="**/*.jar" /&gt;
+    &lt;fileset dir="dist" includes="**/*.jar"/&gt;
   &lt;/path&gt;
-  &lt;flattenmapper /&gt;
-&lt;/signjar&gt;
-</pre></blockquote>
-<p>
-Sign all JAR files matching the dist/**/*.jar pattern, copying them to the
-directory "signed" afterwards. The flatten mapper means that they will
-all be copied to this directory, not to subdirectories.
-
-</p>
-  <blockquote><pre>
-&lt;signjar
-    alias="testonly" keystore="testkeystore"
-    storepass="apacheant"
-    lazy="true"
-    &gt;
+  &lt;flattenmapper/&gt;
+&lt;/signjar&gt;</pre>
+<p>Sign all JAR files matching the <samp>dist/**/*.jar</samp> pattern, copying them to the
+directory <samp>signed</samp> afterwards. The flatten mapper means that they will all be copied to
+this directory, not to subdirectories.</p>
+<pre>
+&lt;signjar alias="testonly" keystore="testkeystore"
+         storepass="apacheant"
+         lazy="true"&gt;
   &lt;path&gt;
-    &lt;fileset dir="dist" includes="**/*.jar" /&gt;
+    &lt;fileset dir="dist" includes="**/*.jar"/&gt;
   &lt;/path&gt;
-&lt;/signjar&gt;
-</pre></blockquote>
-<p>
-Sign all the JAR files in dist/**/*.jar <i>in-situ</i>. Lazy signing is used,
-so the files will only be signed if they are not already signed.
-</p>
-  <blockquote><pre>
-&lt;signjar
-    alias="testonly" keystore="testkeystore"
-    storepass="apacheant"
-    sigalg="MD5withRSA"
-    digestalg="SHA1"&gt;
+&lt;/signjar&gt;</pre>
+<p>Sign all the JAR files in <samp>dist/**/*.jar</samp> <em>in-situ</em>. Lazy signing is used, so
+the files will only be signed if they are not already signed.</p>
+<pre>
+&lt;signjar alias="testonly" keystore="testkeystore"
+         storepass="apacheant"
+         sigalg="MD5withRSA"
+         digestalg="SHA1"&gt;
   &lt;path&gt;
-    &lt;fileset dir="dist" includes="**/*.jar" /&gt;
+    &lt;fileset dir="dist" includes="**/*.jar"/&gt;
   &lt;/path&gt;
-&lt;/signjar&gt;
-</pre></blockquote>
-<p>
-Sign all the JAR files in dist/**/*.jar using the digest algorithm SHA1 and the
-signature algorithm MD5withRSA. This is especially useful when you want to use
-the JDK 7 jarsigner (which uses SHA256 and SHA256withRSA as default) to create
-signed jars that will be deployed on platforms not supporting SHA256 and
-SHA256withRSA.
-</p>
+&lt;/signjar&gt;</pre>
+<p>Sign all the JAR files in <samp>dist/**/*.jar</samp> using the digest algorithm SHA1 and the
+signature algorithm MD5withRSA. This is especially useful when you want to use the JDK
+7 <kbd>jarsigner</kbd> (which uses SHA256 and SHA256withRSA as default) to create signed jars that
+will be deployed on platforms not supporting SHA256 and SHA256withRSA.</p>
 <h3>About timestamp signing</h3>
 
-<p>Timestamps record the date and time that a signature took place, allowing the signature to be verified as of that point in time.
-With trusted timestamping, users can verify that signing occurred before a certificate's expiration or revocation. Without this timestamp, users can only verify the signature as of their current date.</p>
+<p>Timestamps record the date and time that a signature took place, allowing the signature to be
+verified as of that point in time.  With trusted timestamping, users can verify that signing
+occurred before a certificate's expiration or revocation. Without this timestamp, users can only
+verify the signature as of their current date.</p>
 
-<p>
-Timestamped JAR files were introduced in Java1.5 and supported in Ant since
-Ant 1.7. Since Ant 1.9.5, Ant can use unauthenticated proxies for this signing process.
-</p>
+<p>Timestamped JAR files were introduced in Java 5; they are supported <em>since Ant
+1.7</em>. Unauthenticated proxies can be used to access TSAs <em>since Ant 1.9.5</em>.</p>
 
-<p>Common public timestamp authorities include
-  <ul>
-    <li>http://timestamp.verisign.com</li>
-	<li>http://tsa.starfieldtech.com</li>
-	<li>https://timestamp.geotrust.com/tsa</li>
-	<li>Others (see your certificate authority)</li>
-  </ul></p>
+<p>Common public timestamp authorities include</p>
+<ul>
+  <li>http://timestamp.verisign.com</li>
+  <li>http://tsa.starfieldtech.com</li>
+  <li>https://timestamp.geotrust.com/tsa</li>
+  <li>Others (see your certificate authority)</li>
+</ul>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/sleep.html ant-1.10.3/manual/Tasks/sleep.html
--- ant-1.9.10/manual/Tasks/sleep.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/sleep.html	2018-03-24 12:37:12.000000000 +0000
@@ -23,63 +23,58 @@
 
 <body>
 
-<h2><a name="sleep">Sleep</a></h2>
+<h2 id="sleep">Sleep</h2>
 <h3>Description</h3>
-<p> A task for sleeping a short period of time, useful when a build or deployment 
-  process requires an interval between tasks.</p>
+<p>A task for sleeping a short period of time, useful when a build or deployment process requires an
+interval between tasks.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr> 
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr> 
-    <td valign="top">hours</td>
-    <td valign="top">hours to to add to the sleep time</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr> 
-    <td valign="top">minutes</td>
-    <td valign="top"> minutes to add to the sleep time</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr> 
-    <td valign="top">seconds</td>
-    <td valign="top">seconds to add to the sleep time</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr> 
-    <td valign="top">milliseconds</td>
-    <td valign="top">milliseconds to add to the sleep time</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr> 
-    <td valign="top">failonerror</td>
-    <td valign="top">flag controlling whether to break the build on an error. 
-    </td>
-    <td align="center" valign="top">No</td>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>hours</td>
+    <td>hours to to add to the sleep time</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>minutes</td>
+    <td>minutes to add to the sleep time</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>seconds</td>
+    <td>seconds to add to the sleep time</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>milliseconds</td>
+    <td>milliseconds to add to the sleep time</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>failonerror</td>
+    <td>flag controlling whether to break the build on an error</td>
+    <td>No</td>
   </tr>
 </table>
-<p>The sleep time is the sum of specified values, hours, minutes seconds and milliseconds. 
-  A negative value can be supplied to any of them provided the total sleep time 
-  is positive</p>
-<p>Note that sleep times are always hints to be interpred by the OS how it feels 
-  - small times may either be ignored or rounded up to a minimum timeslice. Note 
-  also that the system clocks often have a fairly low granularity too, which complicates 
-  measuring how long a sleep actually took.</p>
+<p>The sleep time is the sum of specified values, hours, minutes seconds and milliseconds.  A
+negative value can be supplied to any of them provided the total sleep time is positive</p>
+<p>Note that sleep times are always hints to be interpreted by the OS how it feels&mdash;small times
+may either be ignored or rounded up to a minimum timeslice. Note also that the system clocks often
+have a fairly low granularity too, which complicates measuring how long a sleep actually took.</p>
 <h3>Examples</h3>
-<pre>   &lt;sleep milliseconds=&quot;10&quot;/&gt;</pre>
-Sleep for about 10 mS. 
-<pre>   &lt;sleep seconds=&quot;2&quot;/&gt;</pre>
-Sleep for about 2 seconds. 
-<pre>   &lt;sleep hours=&quot;1&quot; minutes=&quot;-59&quot; seconds=&quot;-58&quot;/&gt;</pre>
-<p>Sleep for one hour less 59:58, or two seconds again </p>
-<pre>   &lt;sleep/&gt;</pre>
-Sleep for no time at all. This may yield the CPU time to another thread or process. 
-
+<pre>&lt;sleep milliseconds=&quot;10&quot;/&gt;</pre>
+<p>Sleep for about 10 ms.</p>
+<pre>&lt;sleep seconds=&quot;2&quot;/&gt;</pre>
+<p>Sleep for about 2 seconds.</p>
+<pre>&lt;sleep hours=&quot;1&quot; minutes=&quot;-59&quot; seconds=&quot;-58&quot;/&gt;</pre>
+<p>Sleep for one hour less 59:58, or two seconds again.</p>
+<pre>&lt;sleep/&gt;</pre>
+<p>Sleep for no time at all. This may yield the CPU time to another thread or process.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/sos.html ant-1.10.3/manual/Tasks/sos.html
--- ant-1.9.10/manual/Tasks/sos.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/sos.html	2018-03-24 12:37:12.000000000 +0000
@@ -14,177 +14,161 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-
-  <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
   <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
-<title>SOS Tasks</title>
-
+  <title>SOS Tasks</title>
 </head>
 <body>
 
-<div align="center">
 <h1>SourceOffSite Tasks User Manual</h1>
-
-<div align="left">by
+<p>by</p>
 <ul>
-<li><a href="mailto:jesse@cryptocard.com">Jesse Stockall</a></li>
+  <li><a href="mailto:jesse@cryptocard.com">Jesse Stockall</a></li>
 </ul>
-Version 1.1 2002/01/23
-<br>
-<br>
+<p>Version 1.1 2002/01/23</p>
 
-<hr width="100%" size="2">
+<hr/>
 <h2>Contents</h2>
 
 <ul>
-    <li><a href="#intro">Introduction</a></li>
-    <li><a href="#tasks">The Tasks</a></li>
-
+  <li><a href="#intro">Introduction</a></li>
+  <li><a href="#tasks">The Tasks</a></li>
 </ul>
-<br>
 
-<h2><a name="intro">Introduction</a> </h2>
+<h2 id="intro">Introduction</h2>
 
-<p>These tasks provide an interface to the <a href="http://msdn.microsoft.com/ssafe/default.asp" target="_top">
-Microsoft Visual SourceSafe</a> SCM via <a href="http://www.sourcegear.com">
-SourceGear's</a> <a href="http://sourcegear.com/sos/index.htm">SourceOffSite</a>
-product. SourceOffSite is an add-on to Microsoft's VSS, that allows remote
-development teams and tele-commuters that need fast and secure read/write
-access to a centralized SourceSafe database via any TCP/IP connection. SOS
-provides Linux ,Solaris &amp; Windows clients. The
-<code> org.apache.tools.ant.taskdefs.optional.sos</code>
-package consists  of a simple framework to support SOS functionality as well
-as some Apache Ant tasks  encapsulating frequently used SOS commands.  Although it
-is possible to use  these commands on the desktop,  they were primarily intended
-to be used by  automated build systems. These tasks have been tested with
-SourceOffSite  version 3.5.1 connecting to VisualSourceSafe 6.0. The tasks
-have been tested with Linux, Solaris &amp; Windows2000.</p>
-
-<h2><a name="tasks">The Tasks</a> </h2>
-
-<table border="0" cellspacing="0" cellpadding="3">
-       <tbody>
-         <tr>
-           <td><a href="#SOSGet">sosget</a></td>
-           <td>Retrieves a read-only copy of the specified project or file.</td>
-         </tr>
-         <tr>
-           <td><a href="#SOSLabel">soslabel</a></td>
-           <td>Assigns a label to the specified project.</td>
-         </tr>
-         <tr>
-           <td><a href="#SOSCheckIn">soscheckin</a></td>
-           <td>Updates VSS with changes made to a checked out file or project,
-           and unlocks the VSS master copy.</td>
-         </tr>
-         <tr>
-           <td><a href="#SOSCheckOut">soscheckout</a></td>
-           <td>Retrieves a read-write copy of the specified project
-           or file, locking the&nbsp;VSS master copy</td>
-         </tr>
+<p>These tasks provide an interface to
+the <a href="https://msdn.microsoft.com/en-us/library/3h0544kx(v=vs.80).aspx"
+target="_top">Microsoft Visual SourceSafe</a> SCM via <a href="https://sourcegear.com"
+target="_top">SourceGear's</a> <a href="https://sourcegear.com/sos/" target="_top">SourceOffSite</a>
+product. SourceOffSite is an add-on to Microsoft's VSS, that allows remote development teams and
+tele-commuters that need fast and secure read/write access to a centralized SourceSafe database via
+any TCP/IP connection. SOS provides Linux, Solaris &amp; Windows
+clients. The <code class="code">org.apache.tools.ant.taskdefs.optional.sos</code> package consists
+of a simple framework to support SOS functionality as well as some Apache Ant tasks encapsulating
+frequently used SOS commands.  Although it is possible to use these commands on the desktop, they
+were primarily intended to be used by automated build systems. These tasks have been tested with
+SourceOffSite version 3.5.1 connecting to VisualSourceSafe 6.0. The tasks have been tested with
+Linux, Solaris &amp; Windows 2000.</p>
 
+<h2 id="tasks">The Tasks</h2>
+
+<table>
+  <tbody>
+    <tr>
+      <td><a href="#SOSGet">sosget</a></td>
+      <td>Retrieves a read-only copy of the specified project or file.</td>
+    </tr>
+    <tr>
+      <td><a href="#SOSLabel">soslabel</a></td>
+      <td>Assigns a label to the specified project.</td>
+    </tr>
+    <tr>
+      <td><a href="#SOSCheckIn">soscheckin</a></td>
+      <td>Updates VSS with changes made to a checked out file or project,
+        and unlocks the VSS master copy.</td>
+    </tr>
+    <tr>
+      <td><a href="#SOSCheckOut">soscheckout</a></td>
+      <td>Retrieves a read-write copy of the specified project or file, locking the VSS master
+        copy</td>
+    </tr>
   </tbody>
 </table>
-     <br>
-
-<hr width="100%" size="2">
+<hr/>
 <h2>Task Descriptions</h2>
 
-<h2><a name="SOSGet"></a>SOSGet<br>
-     </h2>
+<h2 id="SOSGet">SOSGet</h2>
 <h3>Description</h3>
-             Task to perform GET commands with SOS<br>
+<p>Task to perform <var>Get</var> commands with SOS</p>
 <h3>Parameters</h3>
-     </div>
-     </div>
 
-<table border="1">
-     <tbody>
-       <tr>
-          <th>Attribute</th>
-          <th>Values</th>
-          <th>Required</th>
-        </tr>
-        <tr>
-          <td>soscmd</td>
-          <td>Directory which contains soscmd(.exe) <br>
-          soscmd(.exe) must be in the path if this is not specified</td>
-          <td>No</td>
-        </tr>
-        <tr>
-           <td>vssserverpath</td>
-           <td>path to the srcsafe.ini  - eg. \\server\vss\srcsafe.ini</td>
-           <td>Yes</td>
-        </tr>
-        <tr>
-           <td>sosserverpath</td>
-           <td>address &amp; port of the SOS server  - eg. 192.168.0.1:8888</td>
-           <td>Yes</td>
-        </tr>
-        <tr>
-           <td>projectpath</td>
-           <td>SourceSafe project path - eg. $/SourceRoot/Project1</td>
-           <td>Yes</td>
-        </tr>
-        <tr>
-           <td>file</td>
-           <td>Filename to act upon<br>
-           If no file is specified then act upon the project</td>
-           <td>No</td>
-        </tr>
-        <tr>
-           <td>username</td>
-           <td>SourceSafe username</td>
-           <td>Yes</td>
-        </tr>
-        <tr>
-           <td>password</td>
-           <td>SourceSafe password</td>
-           <td>No</td>
-        </tr>
-        <tr>
-           <td>localpath</td>
-           <td>Override the working directory and get to the specified path</td>
-           <td>No</td>
-        </tr>
-        <tr>
-           <td>soshome</td>
-           <td>The path to the SourceOffSite home directory</td>
-           <td>No</td>
-        </tr>
-        <tr>
-           <td>nocompress</td>
-           <td>true or false - disable compression</td>
-           <td>No</td>
-        </tr>
-        <tr>
-           <td>recursive</td>
-           <td>true or false - Only works with the GetProject command</td>
-           <td>No</td>
-        </tr>
-        <tr>
-           <td>version</td>
-           <td>a version number to get - Only works with the GetFile command</td>
-           <td>No</td>
-        </tr>
-        <tr>
-           <td>label</td>
-           <td>a label version to get - Only works with the GetProject command</td>
-           <td>No</td>
-        </tr>
-        <tr>
-           <td>nocache</td>
-           <td>true or false - Only needed if SOSHOME is set as an environment variable</td>
-           <td>No</td>
-        </tr>
-        <tr>
-           <td>verbose</td>
-           <td>true or false - Status messages are displayed</td>
-           <td>No</td>
-        </tr>
+<table class="attr">
+  <thead>
+    <tr>
+      <th>Attribute</th>
+      <th>Values</th>
+      <th>Required</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>soscmd</td>
+      <td>Directory which contains <kbd>soscmd(.exe)</kbd></td>
+      <td>No; by default, the executable must be in the path</td>
+    </tr>
+    <tr>
+      <td>vssserverpath</td>
+      <td>path to the <samp>srcsafe.ini</samp>&mdash;eg. <samp>\\server\vss\srcsafe.ini</samp></td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td>sosserverpath</td>
+      <td>address &amp; port of the SOS server&mdash;eg. <samp>192.168.0.1:8888</samp></td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td>projectpath</td>
+      <td>SourceSafe project path&mdash;eg. <samp>$/SourceRoot/Project1</samp></td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td>file</td>
+      <td>Filename to act upon</td>
+      <td>No; by default, act upon the project</td>
+    </tr>
+    <tr>
+      <td>username</td>
+      <td>SourceSafe username</td>
+      <td>Yes</td>
+    </tr>
+    <tr>
+      <td>password</td>
+      <td>SourceSafe password</td>
+      <td>No</td>
+    </tr>
+    <tr>
+      <td>localpath</td>
+      <td>Override the working directory and get to the specified path</td>
+      <td>No</td>
+    </tr>
+    <tr>
+      <td>soshome</td>
+      <td>The path to the SourceOffSite home directory</td>
+      <td>No</td>
+    </tr>
+    <tr>
+      <td>nocompress</td>
+      <td><q>true|false</q>&mdash;disable compression</td>
+      <td>No</td>
+    </tr>
+    <tr>
+      <td>recursive</td>
+      <td><q>true|false</q>&mdash;Only works with the <var>GetProject</var> command</td>
+      <td>No</td>
+    </tr>
+    <tr>
+      <td>version</td>
+      <td>a version number to get&mdash;Only works with the <var>GetFile</var> command</td>
+      <td>No</td>
+    </tr>
+    <tr>
+      <td>label</td>
+      <td>a label version to get&mdash;Only works with the <var>GetProject</var> command</td>
+      <td>No</td>
+    </tr>
+    <tr>
+      <td>nocache</td>
+      <td><q>true|false</q>&mdash;Only needed if <code>SOSHOME</code> is set as an environment
+        variable</td>
+      <td>No</td>
+    </tr>
+    <tr>
+      <td>verbose</td>
+      <td><q>true|false</q>&mdash;Status messages are displayed</td>
+      <td>No</td>
+    </tr>
   </tbody>
 </table>
 
@@ -198,73 +182,72 @@
         localpath=&quot;tmp&quot;
         projectpath=&quot;$/SourceRoot/project1&quot;
         sosserverpath=&quot;192.168.10.6:8888&quot;
-        vssserverpath=&quot;d:\vss\srcsafe.ini&quot;/&gt;
-</pre>
-<small>Connects to a SourceOffsite server on 192.168.10.6:8888 with
-build,build as the username &amp; password. The SourceSafe  database resides
-on the same box as the SOS server  &amp; the VSS database  is at
-&quot;d:\vss\srcsafe.ini&quot; Does a recursive GetProject on
-$/SourceRoot/project1, using tmp as the working
-directory. </small><br>
-<br>
+        vssserverpath=&quot;d:\vss\srcsafe.ini&quot;/&gt;</pre>
+<p>Connects to a SourceOffsite server on <samp>192.168.10.6:8888</samp>
+with <q>build</q>, <q>build</q> as the username &amp; password. The SourceSafe database resides on
+the same box as the SOS server &amp; the VSS database is at <samp>d:\vss\srcsafe.ini</samp>. Does a
+recursive <var>GetProject</var> on <samp>$/SourceRoot/project1</samp>, using <samp>tmp</samp> as the
+working directory.</p>
 
-<hr width="100%" size="2">
-<h2><a name="SOSLabel"></a>SOSLabel</h2>
+<hr/>
+<h2 id="SOSLabel">SOSLabel</h2>
 
 <h3>Description</h3>
-             Task to perform Label commands with SOS<br>
+<p>Task to perform <var>Label</var> commands with SOS</p>
 <h3>Parameters</h3>
 
-<table border="1">
-    <tbody><tr>
+<table class="attr">
+  <thead>
+    <tr>
       <th>Attribute</th>
       <th>Values</th>
       <th>Required</th>
     </tr>
+  </thead>
+  <tbody>
     <tr>
       <td>soscmd</td>
-      <td>Directory which contains soscmd(.exe) <br>
-      soscmd(.exe) must be in the path if this is not specified</td>
-      <td>No</td>
+      <td>Directory which contains <kbd>soscmd(.exe)</kbd></td>
+      <td>No; by default, the executable must be in the path</td>
     </tr>
     <tr>
-       <td>vssserverpath</td>
-       <td>path to the srcsafe.ini  - eg. \\server\vss\srcsafe.ini</td>
-       <td>Yes</td>
+      <td>vssserverpath</td>
+      <td>path to the <samp>srcsafe.ini</samp>&mdash;eg. <samp>\\server\vss\srcsafe.ini</samp></td>
+      <td>Yes</td>
     </tr>
     <tr>
-       <td>sosserverpath</td>
-       <td>address and port of the SOS server  - eg. 192.168.0.1:8888</td>
-       <td>Yes</td>
+      <td>sosserverpath</td>
+      <td>address and port of the SOS server&mdash;eg. <samp>192.168.0.1:8888</samp></td>
+      <td>Yes</td>
     </tr>
     <tr>
-       <td>projectpath</td>
-       <td>SourceSafe project path - eg. $/SourceRoot/Project1</td>
-       <td>Yes</td>
+      <td>projectpath</td>
+      <td>SourceSafe project path&mdash;eg. <samp>$/SourceRoot/Project1</samp></td>
+      <td>Yes</td>
     </tr>
     <tr>
-       <td>username</td>
-       <td>SourceSafe username</td>
-       <td>Yes</td>
+      <td>username</td>
+      <td>SourceSafe username</td>
+      <td>Yes</td>
     </tr>
     <tr>
-       <td>password</td>
-       <td>SourceSafe password</td>
-       <td>No</td>
+      <td>password</td>
+      <td>SourceSafe password</td>
+      <td>No</td>
     </tr>
     <tr>
-       <td>label</td>
-       <td>The label to apply to a project</td>
-       <td>Yes</td>
+      <td>label</td>
+      <td>The label to apply to a project</td>
+      <td>Yes</td>
     </tr>
     <tr>
-       <td>comment</td>
-       <td>A comment to be applied to all files being labeled</td>
-       <td>No</td>
+      <td>comment</td>
+      <td>A comment to be applied to all files being labeled</td>
+      <td>No</td>
     </tr>
     <tr>
        <td>verbose</td>
-       <td>true or false - Status messages are displayed</td>
+       <td><q>true|false</q>&mdash;Status messages are displayed</td>
        <td>No</td>
     </tr>
   </tbody>
@@ -277,101 +260,99 @@
           label=&quot;test label&quot;
           projectpath=&quot;$/SourceRoot/project1&quot;
           sosserverpath=&quot;192.168.10.6:8888&quot;
-          vssserverpath=&quot;d:\vss\srcsafe.ini&quot;/&gt;
-</pre>
-
-<small>Connects to a SourceOffsite server on 192.168.10.6:8888 with
-build,build as the username &amp; password. The SourceSafe database resides
-on the same box as  the  SOS server  &amp; the VSS database is at
-&quot;d:\vss\srcsafe.ini&quot;. Labels the $/SourceRoot/project1
-project with &quot;test label&quot;.</small><br>
-<br>
-
-<hr width="100%" size="2"><br>
+          vssserverpath=&quot;d:\vss\srcsafe.ini&quot;/&gt;</pre>
+<p>Connects to a SourceOffsite server on <samp>192.168.10.6:8888</samp>
+with <q>build</q>, <q>build</q> as the username &amp; password. The SourceSafe database resides on
+the same box as the SOS server &amp; the VSS database is at <samp>d:\vss\srcsafe.ini</samp>. Labels
+the <samp>$/SourceRoot/project1</samp> project with <q>test label</q>.</p>
 
-<h2><a name="SOSCheckIn"></a>SOSCheckIn</h2>
+<hr/>
+<h2 id="SOSCheckIn">SOSCheckIn</h2>
 
 <h3>Description</h3>
-        Task to perform CheckIn commands with SOS<br>
+<p>Task to perform <var>CheckIn</var> commands with SOS</p>
 <h3>Parameters</h3>
-<table border="1">
-       <tbody>
+<table class="attr">
+  <thead>
     <tr>
       <th>Attribute</th>
       <th>Values</th>
       <th>Required</th>
     </tr>
+  </thead>
+  <tbody>
     <tr>
       <td>soscmd</td>
-      <td>Directory which contains soscmd(.exe) <br>
-      soscmd(.exe) must be in the path if this is not specified</td>
-      <td>No</td>
+      <td>Directory which contains <kbd>soscmd(.exe)</kbd></td>
+      <td>No; by default, the executable must be in the path</td>
     </tr>
     <tr>
-       <td>vssserverpath</td>
-       <td>path to the srcsafe.ini  - eg. \\server\vss\srcsafe.ini</td>
-       <td>Yes</td>
+      <td>vssserverpath</td>
+      <td>path to the <samp>srcsafe.ini</samp>&mdash;eg. <samp>\\server\vss\srcsafe.ini</samp></td>
+      <td>Yes</td>
     </tr>
     <tr>
-       <td>sosserverpath</td>
-       <td>address and port of the SOS server  - eg. 192.168.0.1:8888</td>
-       <td>Yes</td>
+      <td>sosserverpath</td>
+      <td>address and port of the SOS server&mdash;eg. <samp>192.168.0.1:8888</samp></td>
+      <td>Yes</td>
     </tr>
     <tr>
-       <td>projectpath</td>
-       <td>SourceSafe project path - eg. $/SourceRoot/Project1</td>
-       <td>Yes</td>
+      <td>projectpath</td>
+      <td>SourceSafe project path&mdash;eg. <samp>$/SourceRoot/Project1</samp></td>
+      <td>Yes</td>
     </tr>
     <tr>
-       <td>file</td>
-       <td>Filename to act upon<br> If no file is specified then act upon the project</td>
-       <td>No</td>
+      <td>file</td>
+      <td>Filename to act upon</td>
+      <td>No; by default, act upon the project</td>
     </tr>
     <tr>
-       <td>username</td>
-       <td>SourceSafe username</td>
-       <td>Yes</td>
+      <td>username</td>
+      <td>SourceSafe username</td>
+      <td>Yes</td>
     </tr>
     <tr>
-       <td>password</td>
-       <td>SourceSafe password</td>
-       <td>No</td>
+      <td>password</td>
+      <td>SourceSafe password</td>
+      <td>No</td>
     </tr>
     <tr>
-       <td>localpath</td>
-       <td>Override the working directory and get to the specified path</td>
-       <td>No</td>
+      <td>localpath</td>
+      <td>Override the working directory and get to the specified path</td>
+      <td>No</td>
     </tr>
     <tr>
-       <td>soshome</td>
-       <td>The path to the SourceOffSite home directory</td>
-       <td>No</td>
+      <td>soshome</td>
+      <td>The path to the SourceOffSite home directory</td>
+      <td>No</td>
     </tr>
     <tr>
-       <td>nocompress</td>
-       <td>true or false - disable compression</td>
-       <td>No</td>
+      <td>nocompress</td>
+      <td><q>true|false</q>&mdash;disable compression</td>
+      <td>No</td>
     </tr>
     <tr>
-       <td>recursive</td>
-       <td>true or false - Only works with the CheckOutProject command</td>
-       <td>No</td>
+      <td>recursive</td>
+      <td><q>true|false</q>&mdash;Only works with the <var>CheckOutProject</var> command</td>
+      <td>No</td>
     </tr>
     <tr>
-       <td>nocache</td>
-       <td>true or false - Only needed if SOSHOME is set as an environment variable</td>
-       <td>No</td>
+      <td>nocache</td>
+      <td><q>true|false</q>&mdash;Only needed if <code>SOSHOME</code> is set as an environment
+        variable</td>
+      <td>No</td>
     </tr>
     <tr>
-       <td>verbose</td>
-       <td>true or false - Status messages are displayed</td>
-       <td>No</td>
+      <td>verbose</td>
+      <td><q>true|false</q>&mdash;Status messages are displayed</td>
+      <td>No</td>
     </tr>
-    <tr><td>comment</td>
-       <td>A comment to be applied to all files being checked in</td>
-       <td>No</td>
+    <tr>
+      <td>comment</td>
+      <td>A comment to be applied to all files being checked in</td>
+      <td>No</td>
     </tr>
- </tbody>
+  </tbody>
 </table>
 
 <h3>Example</h3>
@@ -383,101 +364,98 @@
             comment=&quot;comment abc&quot;
             projectpath=&quot;$/SourceRoot/project1&quot;
             sosserverpath=&quot;server1:8888&quot;
-            vssserverpath=&quot;\\server2\vss\srcsafe.ini&quot;/&gt;
-</pre>
+            vssserverpath=&quot;\\server2\vss\srcsafe.ini&quot;/&gt;</pre>
 
-<small>Connects to a SourceOffsite server on server1:8888 with build,build as
-the username &amp; password. The SourceSafe database resides on a different
-box (server2) &amp; the VSS database is on a share called
-&quot;vss&quot;. Checks-in only the &quot;foobar.txt&quot; file adding
-a comment of &quot;comment abc&quot;. Extra status messages will be
-displayed on screen.</small><br>
-<br>
+<p>Connects to a SourceOffsite server on <samp>server1:8888</samp> with <q>build</q>, <q>build</q>
+as the username &amp; password. The SourceSafe database resides on a different box
+(<samp>server2</samp>) &amp; the VSS database is on a share called <samp>vss</samp>. Checks-in only
+the <samp>foobar.txt</samp> file adding a comment of <q>comment abc</q>. Extra status messages will
+be displayed on screen.</p>
 
-<hr width="100%" size="2">
-<h2><a name="SOSCheckOut"></a>SOSCheckOut</h2>
+<hr/>
+<h2 id="SOSCheckOut">SOSCheckOut</h2>
 
 <h3>Description</h3>
-       Task to perform CheckOut commands with SOS<br>
+<p>Task to perform <var>CheckOut</var> commands with SOS</p>
 
 <h3>Parameters</h3>
 
-<table border="1">
-       <tbody>
+<table class="attr">
+  <thead>
     <tr>
       <th>Attribute</th>
       <th>Values</th>
       <th>Required</th>
     </tr>
+  </thead>
+  <tbody>
     <tr>
       <td>soscmd</td>
-      <td>Directory which contains soscmd(.exe) <br>
-      soscmd(.exe) must be in the path if this is not specified</td>
-      <td>No</td>
+      <td>Directory which contains <kbd>soscmd(.exe)</kbd></td>
+      <td>No; by default, the executable must be in the path</td>
     </tr>
     <tr>
-       <td>vssserverpath</td>
-       <td>path to the srcsafe.ini  - eg. \\server\vss\srcsafe.ini</td>
-       <td>Yes</td>
+      <td>vssserverpath</td>
+      <td>path to the <samp>srcsafe.ini</samp>&mdash;eg. <samp>\\server\vss\srcsafe.ini</samp></td>
+      <td>Yes</td>
     </tr>
     <tr>
-       <td>sosserverpath</td>
-       <td>address and port of the SOS server  - eg. 192.168.0.1:8888</td>
-       <td>Yes</td>
+      <td>sosserverpath</td>
+      <td>address and port of the SOS server&mdash;eg. <samp>192.168.0.1:8888</samp></td>
+      <td>Yes</td>
     </tr>
     <tr>
-       <td>projectpath</td>
-       <td>SourceSafe project path - eg. $/SourceRoot/Project1</td>
-       <td>Yes</td>
+      <td>projectpath</td>
+      <td>SourceSafe project path&mdash;eg. <samp>$/SourceRoot/Project1</samp></td>
+      <td>Yes</td>
     </tr>
     <tr>
-       <td>file</td>
-       <td>Filename to act upon<br> If no file is specified then act upon the project</td>
-       <td>No</td>
+      <td>file</td>
+      <td>Filename to act upon</td>
+      <td>No; by default, act upon the project</td>
     </tr>
     <tr>
-       <td>username</td>
-       <td>SourceSafe username</td>
-       <td>Yes</td>
+      <td>username</td>
+      <td>SourceSafe username</td>
+      <td>Yes</td>
     </tr>
     <tr>
-       <td>password</td>
-       <td>SourceSafe password</td>
-       <td>No</td>
+      <td>password</td>
+      <td>SourceSafe password</td>
+      <td>No</td>
     </tr>
     <tr>
-       <td>localpath</td>
-       <td>Override the working directory and get to the specified path</td>
-       <td>No</td>
+      <td>localpath</td>
+      <td>Override the working directory and get to the specified path</td>
+      <td>No</td>
     </tr>
     <tr>
-       <td>soshome</td>
-       <td>The path to the SourceOffSite home directory</td>
-       <td>No</td>
+      <td>soshome</td>
+      <td>The path to the SourceOffSite home directory</td>
+      <td>No</td>
     </tr>
     <tr>
-       <td>nocompress</td>
-       <td>true or false - disable compression</td>
-       <td>No</td>
+      <td>nocompress</td>
+      <td><q>true|false</q>&mdash;disable compression</td>
+      <td>No</td>
     </tr>
     <tr>
-       <td>recursive</td>
-       <td>true or false - Only works with the CheckOutProject command</td>
-       <td>No</td>
+      <td>recursive</td>
+      <td><q>true|false</q>&mdash;Only works with the <var>CheckOutProject</var> command</td>
+      <td>No</td>
     </tr>
     <tr>
-       <td>nocache</td>
-       <td>true or false - Only needed if SOSHOME is set as an environment variable</td>
-       <td>No</td>
+      <td>nocache</td>
+      <td><q>true|false</q>&mdash;Only needed if <code>SOSHOME</code> is set as an environment variable</td>
+      <td>No</td>
     </tr>
     <tr>
-       <td>verbose</td>
-       <td>true or false - Status messages are displayed</td>
-       <td>No</td>
+      <td>verbose</td>
+      <td><q>true|false</q>&mdash;Status messages are displayed</td>
+      <td>No</td>
     </tr>
   </tbody>
 </table>
-     <br>
 
 <h3>Example</h3>
 <pre>
@@ -487,17 +465,13 @@
              password=&quot;build&quot;
              projectpath=&quot;$/SourceRoot/project1&quot;
              sosserverpath=&quot;192.168.10.6:8888&quot;
-             vssserverpath=&quot;\\server2\vss\srcsafe.ini&quot;/&gt;
-</pre>
-
-<small>Connects to a SourceOffsite server on server1:8888 with build,build as
-the username &amp; password. The SourceSafe database resides on a different
-box (server2) &amp; the VSS database is on a share called
-&quot;vss&quot;. Checks-out &quot;project1&quot;, Only the
-&quot;project1&quot; directory will be locked as the recursive option
-was not set. Extra status messages will be displayed on screen. The
-soscmd(.exe) file to be used resides in /usr/local/bin.</small><br>
-<br>
+             vssserverpath=&quot;\\server2\vss\srcsafe.ini&quot;/&gt;</pre>
+<p>Connects to a SourceOffsite server on <samp>server1:8888</samp> with <q>build</q>, <q>build</q>
+as the username &amp; password. The SourceSafe database resides on a different box
+(<samp>server2</samp>) &amp; the VSS database is on a share
+called <samp>vss</samp>. Checks-out <q>project1</q>, only the <samp>project1</samp> directory will
+be locked as the recursive option was not set. Extra status messages will be displayed on
+screen. The <code>soscmd(.exe)</code> file to be used resides in <samp>/usr/local/bin</samp>.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/sound.html ant-1.10.3/manual/Tasks/sound.html
--- ant-1.9.10/manual/Tasks/sound.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/sound.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,67 +24,56 @@
 
 <body>
 
-<h2><a name="sound">Sound</a></h2>
+<h2 id="sound">Sound</h2>
 <h3>Description</h3>
-<p>Plays a sound-file at the end of the build, according to whether
-the build failed or succeeded. You can specify either a specific
-sound-file to play, or, if a directory is specified, the
-<code>&lt;sound&gt;</code> task will randomly select a file to play.
-Note: At this point, the random selection is based on all the files
-in the directory, not just those ending in appropriate suffixes
-for sound-files, so be sure you only have sound-files in the 
-directory you specify.</p>
-<p>More precisely <code>&lt;sound&gt;</code> registers a hook that is
-triggered when the build finishes. Therefore you have to place this
-task as top level or inside a target which is always executed.</p>
-<p>
-Unless you are running on Java 1.3 or later, you need the Java Media Framework
-on the classpath (javax.sound). 
-</p>
+<p>Plays a sound file at the end of the build, according to whether the build failed or
+succeeded. You can specify either a specific sound file to play, or, if a directory is specified,
+the <code>&lt;sound&gt;</code> task will randomly select a file to play. <strong>Note</strong>: At
+this point, the random selection is based on all the files in the directory, not just those ending
+in appropriate suffixes for sound files, so be sure you only have sound files in the directory you
+specify.</p>
+<p>More precisely <code>&lt;sound&gt;</code> registers a hook that is triggered when the build
+finishes. Therefore you have to place this task as top level or inside a target which is always
+executed.</p>
+<p>Unless you are running on Java 1.3 or later, you need the Java Media Framework on the classpath
+(<code class="code">javax.sound</code>).</p>
 
-
-<h3>Nested Elements</h3>
+<h3>Parameters specified as nested elements</h3>
 <h4>success</h4>
 <p>Specifies the sound to be played if the build succeeded.</p>
+
 <h4>fail</h4>
 <p>Specifies the sound to be played if the build failed.</p>
 
-<h3>Nested Element Parameters</h3>
-<p>
-The following attributes may be used on the <code>&lt;success&gt;</code> 
+<h4>Nested element parameters</h4>
+<p>The following attributes may be used on the <code>&lt;success&gt;</code>
 and <code>&lt;fail&gt;</code> elements:</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">source</td>
-    <td valign="top">the path to a sound-file directory, or the name of a
-specific sound-file, to be played. If this file does not exist, an error message
-will be logged.
-    </td>
-    <td valign="top" align="center">Yes</td>
+    <td>source</td>
+    <td>the path to a sound file directory, or the name of a specific sound file, to be played. If
+      this file does not exist, an error message will be logged.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">loops</td>
-    <td valign="top">the number of extra times to play the sound-file;
-      default is <code>0</code>.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>loops</td>
+    <td>the number of extra times to play the sound file.</td>
+    <td>No; default is <q>0</q></td>
   </tr>
   <tr>
-    <td valign="top">duration</td>
-    <td valign="top">the amount of time (in milliseconds) to play
-      the sound-file.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>duration</td>
+    <td>the amount of time (in milliseconds) to play the sound file.</td>
+    <td>No</td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;target name=&quot;fun&quot; if=&quot;fun&quot; unless=&quot;fun.done&quot;&gt;
   &lt;sound&gt;
@@ -92,18 +81,11 @@
     &lt;fail source=&quot;${user.home}/sounds/ohno.wav&quot; loops=&quot;2&quot;/&gt;
   &lt;/sound&gt;
   &lt;property name=&quot;fun.done&quot; value=&quot;true&quot;/&gt;
-&lt;/target&gt;
-</pre>
-</blockquote>
-plays the <code>bell.wav</code> sound-file if the build succeeded, or
-the <code>ohno.wav</code> sound-file if the build failed, three times,
-if the <code>fun</code> property is set to <code>true</code>.
-If the target
-is a dependency of an &quot;initialization&quot; target that other
-targets depend on, the
-<code>fun.done</code> property prevents the target from being executed
-more than once.
-<blockquote>
+&lt;/target&gt;</pre>
+<p>plays the <samp>bell.wav</samp> sound file if the build succeeded, or the <samp>ohno.wav</samp>
+sound file if the build failed, three times, if the <code>fun</code> property is set to <q>true</q>.
+If the target is a dependency of an "initialization" target that other targets depend on,
+the <code>fun.done</code> property prevents the target from being executed more than once.</p>
 <pre>
 &lt;target name=&quot;fun&quot; if=&quot;fun&quot; unless=&quot;fun.done&quot;&gt;
   &lt;sound&gt;
@@ -113,11 +95,7 @@
   &lt;property name=&quot;fun.done&quot; value=&quot;true&quot;/&gt;
 &lt;/target&gt;
 </pre>
-</blockquote>
-randomly selects a sound-file to play when the build succeeds or fails.
-
-
+<p>randomly selects a sound file to play when the build succeeds or fails.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/splash.html ant-1.10.3/manual/Tasks/splash.html
--- ant-1.9.10/manual/Tasks/splash.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/splash.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,131 +24,110 @@
 
 <body>
 
-<h2><a name="Splash">Splash</a></h2>
+<h2 id="splash">Splash</h2>
 <p>by Les Hughes (leslie.hughes@rubus.com)
 <h3>Description</h3>
-<p>This task creates a splash screen. The splash screen is displayed
-for the duration of the build and includes a handy progress bar as
-well. Use in conjunction with the sound task to provide interest
-whilst waiting for your builds to complete...</p>
+<p>This task creates a splash screen. The splash screen is displayed for the duration of the build
+and includes a handy progress bar as well. Use in conjunction with the <code>sound</code> task to
+provide interest whilst waiting for your builds to complete...</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-    <td align="center" valign="top"><b>Default</b></td>
-  </tr>
-  <tr>
-    <td valign="top">imageurl</td>
-    <td valign="top">A URL pointing to an image to display.</td>
-    <td valign="top" align="center">No</td>
-    <td valign="top" align="center">antlogo.gif from the classpath</td>
-  </tr>
- 
-  <tr>
-    <td valign="top">showduration</td>
-    <td valign="top">Initial period to pause the build to show the
-    splash in milliseconds.</td>
-    <td valign="top" align="center">No</td>
-    <td valign="top" align="center">5000 ms</td>
-  </tr>
-  <tr>
-    <td valign="top">progressregexp</td>
-    <td valign="top">Progress regular expression which is used to
-      parse the output and dig out current progress. Exactly one group
-      pattern must exists, and it represents the progress number (0-100)
-      (i.e "Progress: (.*)%")<br/>
-      <em>since Apache Ant 1.8.0</em></td>
-    <td valign="top" align="center">No</td>
-    <td valign="top" align="center">progress is increased every action
-      and log output line</td>
-  </tr>
-  <tr>
-    <td valign="top">displaytext</td>
-    <td valign="top">display text presented in the splash window<br/>
-      <em>since Ant 1.8.0</em></td>
-    <td valign="top" align="center">No</td>
-    <td valign="top" align="center">Building ...</td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>imageurl</td>
+    <td>A URL pointing to an image to display.</td>
+    <td>No; defaults to <samp>antlogo.gif</samp> from the classpath</td>
+  </tr>
+  <tr>
+    <td>showduration</td>
+    <td>Initial period to pause the build to show the splash in milliseconds.</td>
+    <td>No; defaults to <q>5000</q></td>
+  </tr>
+  <tr>
+    <td>progressregexp</td>
+    <td>Progress regular expression which is used to parse the output and dig out current
+      progress. Exactly one group pattern must exists, and it represents the progress number (0-100)
+      (i.e <q>Progress: (.*)%</q>)<br/><em>since Apache Ant 1.8.0</em></td>
+    <td>No; defaults to progress increase with every action and logged output line</td>
+  </tr>
+  <tr>
+    <td>displaytext</td>
+    <td>display text presented in the splash window<br/><em>since Ant 1.8.0</em></td>
+    <td>No; defaults to <q class="no-break">Building ...</q></td>
   </tr>
 </table>
 <h3>Deprecated properties</h3>
 
-The following properties can be used to configure the proxy settings to retrieve
-an image from behind a firewall. However, the settings apply not just to this
-task, but to all following tasks. Therefore they are now deprecated in 
-preference to the <code>&lt;setproxy&gt;</code> task, that makes it clear to readers of
-the build exactly what is going on.
+<p>The following properties can be used to configure the proxy settings to retrieve an image from
+behind a firewall. However, the settings apply not just to this task, but to all following
+tasks. Therefore they are now deprecated in preference to the <code>&lt;setproxy&gt;</code> task,
+that makes it clear to readers of the build exactly what is going on.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top">useproxy</td>
-    <td valign="top">Use a proxy to access imgurl. Note: Only tested
-    on JDK 1.2.2 and above</td>
-    <td valign="top" align="center">No</td>
-    <td valign="top" align="center">None</td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">proxy</td>
-    <td valign="top">IP or hostname of the proxy server</td>
-    <td valign="top" align="center">No</td>
-    <td valign="top" align="center">None</td>
+    <td>useproxy</td>
+    <td>Use a proxy to access <var>imgurl</var>.<br/>Note: Only tested on JDK 1.2.2 and above</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">port</td>
-    <td valign="top">Proxy portnumber</td>
-    <td valign="top" align="center">No</td>
-    <td valign="top" align="center">None</td>
+    <td>proxy</td>
+    <td>IP or hostname of the proxy server</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">user</td>
-    <td valign="top">User to authenticate to the proxy as.</td>
-    <td valign="top" align="center">No</td>
-    <td valign="top" align="center">None</td>
-
+    <td>port</td>
+    <td>Proxy port number</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">password</td>
-    <td valign="top">Proxy password</td>
-    <td valign="top" align="center">No</td>
-    <td valign="top" align="center">None</td>
+    <td>user</td>
+    <td>User to authenticate to the proxy as</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>password</td>
+    <td>Proxy password</td>
+    <td>No</td>
   </tr>
-
 </table>
 <h3>Examples</h3>
-<blockquote><pre>
-&lt;splash/&gt;
-</pre></blockquote>
-<p>Splash <code>images/ant_logo_large.gif</code> from the classpath.</p>
-<blockquote><pre>
+<pre>&lt;splash/&gt;</pre>
+<p>Splash <samp>images/ant_logo_large.gif</samp> from the classpath.</p>
+<pre>
 &lt;splash imageurl=&quot;http://jakarta.apache.org/images/jakarta-logo.gif&quot;
-           useproxy=&quot;true&quot;
-           showduration=&quot;5000&quot;/&gt;
+        useproxy=&quot;true&quot;
+        showduration=&quot;5000&quot;/&gt;
 
-</pre></blockquote>
+</pre>
 <p>Splashes the jakarta logo, for an initial period of 5 seconds.</p>
 
 <p>Splash with controlled progress and nondefault text</p>
-<blockquote><pre>
-        &lt;target name="test_new_features"&gt;
-                &lt;echo&gt;New features&lt;/echo&gt;
-                &lt;splash progressRegExp="Progress: (.*)%" showduration="0" displayText="Test text"/&gt;
-                &lt;sleep seconds="1"/&gt;
-                &lt;echo&gt;Progress: 10%&lt;/echo&gt;
-                &lt;sleep seconds="1"/&gt;
-                &lt;echo&gt;Progress: 20%&lt;/echo&gt;
-                &lt;sleep seconds="1"/&gt;
-                &lt;echo&gt;Progress: 50%&lt;/echo&gt;
-                &lt;sleep seconds="1"/&gt;
-                &lt;echo&gt;Progress: 70%&lt;/echo&gt;
-                &lt;sleep seconds="1"/&gt;
-                &lt;echo&gt;Progress: 100%&lt;/echo&gt;
-                &lt;sleep seconds="3"/&gt;
-        &lt;/target&gt;
-</pre></blockquote>
-
-
+<pre>
+&lt;target name="test_new_features"&gt;
+    &lt;echo&gt;New features&lt;/echo&gt;
+    &lt;splash progressRegExp="Progress: (.*)%" showduration="0" displayText="Test text"/&gt;
+    &lt;sleep seconds="1"/&gt;
+    &lt;echo&gt;Progress: 10%&lt;/echo&gt;
+    &lt;sleep seconds="1"/&gt;
+    &lt;echo&gt;Progress: 20%&lt;/echo&gt;
+    &lt;sleep seconds="1"/&gt;
+    &lt;echo&gt;Progress: 50%&lt;/echo&gt;
+    &lt;sleep seconds="1"/&gt;
+    &lt;echo&gt;Progress: 70%&lt;/echo&gt;
+    &lt;sleep seconds="1"/&gt;
+    &lt;echo&gt;Progress: 100%&lt;/echo&gt;
+    &lt;sleep seconds="3"/&gt;
+&lt;/target&gt;
+</pre>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/sql.html ant-1.10.3/manual/Tasks/sql.html
--- ant-1.9.10/manual/Tasks/sql.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/sql.html	2018-03-24 12:37:12.000000000 +0000
@@ -22,446 +22,389 @@
 </head>
 <body>
 
-<h2><a name="sql">Sql</a></h2>
+<h2 id="sql">Sql</h2>
 <h3>Description</h3>
-<p>Executes a series of SQL statements via JDBC to a database. Statements can 
-either be read in from a text file using the <i>src</i> attribute or from 
-between the enclosing SQL tags.</p>
-
-<p>Multiple statements can be provided, separated by semicolons (or the 
-defined <i>delimiter</i>). Individual lines within the statements can be 
-commented using either --, // or REM at the start of the line.</p>
-
-<p>The <i>autocommit</i> attribute specifies whether auto-commit should be 
-turned on or off whilst executing the statements. If auto-commit is turned 
-on each statement will be executed and committed. If it is turned off the 
-statements will all be executed as one transaction.</p>
-
-<p>The <i>onerror</i> attribute specifies how to proceed when an error occurs 
-during the execution of one of the statements. 
-The possible values are: <b>continue</b> execution, only show the error;
-<b>stop</b> execution, log the error but don't fail the task
-and <b>abort</b> execution and transaction and fail task.</p>
-
-<p>
-<b>Proxies</b>. Some JDBC drivers (including the Oracle thin driver), 
-    use the JVM's proxy settings to route their JDBC operations to the database.
-    Since Apache Ant1.7, Ant running on Java1.5 or later defaults to 
-    <a href="../proxy.html">using
-    the proxy settings of the operating system</a>. 
-    Accordingly, the OS proxy settings need to be valid, or Ant's proxy
-    support disabled with <code>-noproxy</code> option.
-</p>
+<p>Executes a series of SQL statements via JDBC to a database. Statements can either be read in from
+a text file using the <var>src</var> attribute or from between the enclosing SQL tags.</p>
+
+<p>Multiple statements can be provided, separated by semicolons (or the
+defined <var>delimiter</var>). Individual lines within the statements can be commented using
+either <q>--</q>, <q>//</q> or <q>REM</q> at the start of the line.</p>
+
+<p>The <var>autocommit</var> attribute specifies whether auto-commit should be turned on or off
+whilst executing the statements. If auto-commit is turned <q>on</q> each statement will be executed
+and committed. If it is turned <q>off</q> the statements will all be executed as one
+transaction.</p>
+
+<p>The <var>onerror</var> attribute specifies how to proceed when an error occurs during the
+execution of one of the statements.  The possible values are: <q>continue</q> execution, only show
+the error; <q>stop</q> execution, log the error but don't fail the task and <q>abort</q> execution
+and transaction and fail task.</p>
+
+<p><strong>Proxies</strong>. Some JDBC drivers (including the Oracle thin driver), use the JVM's
+proxy settings to route their JDBC operations to the database.  <em>Since Apache Ant 1.7</em>, Ant
+running on Java 5 or later defaults to <a href="../proxy.html">using the proxy settings of the
+operating system</a>.  Accordingly, the OS proxy settings need to be valid, or Ant's proxy support
+disabled with <kbd>-noproxy</kbd> option.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
-<tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
-</tr>
-<tr>
-  <td width="12%" valign="top">driver</td>
-  <td width="78%" valign="top">Class name of the jdbc driver</td>
-  <td width="10%" valign="top">Yes</td>
-</tr>
-<tr>
-  <td width="12%" valign="top">url</td>
-  <td width="78%" valign="top">Database connection url</td>
-  <td width="10%" valign="top">Yes</td>
-</tr>
-<tr>
-  <td width="12%" valign="top">userid</td>
-  <td width="78%" valign="top">Database user name</td>
-  <td width="10%" valign="top">Yes</td>
-</tr>
-<tr>
-  <td width="12%" valign="top">password</td>
-  <td width="78%" valign="top">Database password</td>
-  <td width="10%" valign="top">Yes</td>
-</tr>
-<tr>
-  <td width="12%" valign="top">src</td>
-  <td width="78%" valign="top">File containing SQL statements</td>
-  <td width="10%" valign="top">Yes, unless statements enclosed within tags</td>
-</tr>
-<tr>
-  <td valign="top">encoding</td>
-  <td valign="top">The encoding of the files containing SQL statements</td>
-  <td align="center">No - defaults to default JVM encoding</td>
-</tr>
-<tr>
-  <td valign="top">outputencoding</td>
-  <td valign="top">The encoding of the files holding
-    results.  <em>since 1.9.4</em</td>
-  <td align="center">No - defaults to default JVM encoding</td>
-</tr>
-<tr>
-  <td width="12%" valign="top">delimiter</td>
-  <td width="78%" valign="top">String that separates SQL statements</td>
-  <td width="10%" valign="top">No, default &quot;;&quot;</td>
-</tr>
-<tr>
-  <td width="12%" valign="top">autocommit</td>
-  <td width="78%" valign="top">Auto commit flag for database connection (default false)</td>
-  <td width="10%" valign="top">No, default &quot;false&quot;</td>
-</tr>
-<tr>
-  <td width="12%" valign="top">print</td>
-  <td width="78%" valign="top">Print result sets from the statements (default false)</td>
-  <td width="10%" valign="top">No, default &quot;false&quot;</td>
-</tr>
-<tr>
-  <td width="12%" valign="top">showheaders</td>
-  <td width="78%" valign="top">Print headers for result sets from the statements (default true)</td>
-  <td width="10%" valign="top">No, default &quot;true&quot;</td>
-</tr>
-<tr>
-  <td width="12%" valign="top">showtrailers</td>
-  <td width="78%" valign="top">Print trailer for number of rows affected (default true)</td>
-  <td width="10%" valign="top">No, default &quot;true&quot;</td>
-</tr>
-<tr>
-  <td width="12%" valign="top">output</td>
-  <td width="78%" valign="top">Output file for result sets (defaults to System.out)
-    <b>Since Ant 1.8</b> can specify any Resource that supports output (see
-    <a href="../develop.html#set-magic">note</a>).
-  </td>
-  <td width="10%" valign="top">No (print to System.out by default)</td>
-</tr>
-  <tr>
-    <td valign="top">append</td>
-    <td valign="top">whether output should be appended to or overwrite
-    an existing file.  Defaults to false.</td>
-    <td align="center" valign="top">No, ignored if <i>output</i> does not
-      specify a filesystem destination.</td>
-  </tr>
-<tr>
-  <td width="12%" valign="top">classpath</td>
-  <td width="78%" valign="top">Classpath used to load driver</td>
-  <td width="10%" valign="top">No (use system classpath)</td>
-</tr>
-  <tr>
-    <td width="12%" valign="top">classpathref</td>
-    <td width="78%" valign="top">The classpath to use, given as a <a href="../using.html#references">reference</a> to a path defined elsewhere.</td>
-  <td width="10%" valign="top">No (use system classpath)</td>
-  </tr>
-<tr>
-  <td width="12%" valign="top">onerror</td>
-  <td width="78%" valign="top">Action to perform when statement fails: continue, stop, abort</td>
-  <td width="10%" valign="top">No, default &quot;abort&quot;</td>
-</tr>
-<tr>
-  <td width="12%" valign="top">rdbms</td>
-  <td width="78%" valign="top">Execute task only if this rdbms</td>
-  <td width="10%" valign="top">No (no restriction)</td>
-</tr>
-<tr>
-  <td width="12%" valign="top">version</td>
-  <td width="78%" valign="top">Execute task only if rdbms version match</td>
-  <td width="10%" valign="top">No (no restriction)</td>
-</tr>
-<tr>
-  <td width="12%" valign="top">caching</td>
-  <td width="78%" valign="top">Should the task cache loaders and the driver?</td>
-  <td width="10%" valign="top">No (default=true)</td>
-</tr>
-
-<tr>
-  <td width="12%" valign="top">delimitertype</td>
-  <td width="78%" valign="top">Control whether the delimiter will only be recognized on a line by itself.<br>
-    Can be "normal" -anywhere on the line, or "row", meaning it must be on a line by itself</td>
-  <td width="10%" valign="top">No (default:normal)</td>
-</tr>
-
-<tr>
-  <td width="12%" valign="top">keepformat</td>
-  <td width="78%" valign="top">Control whether the format of the sql will be preserved.<br>
-    Useful when loading packages and procedures.
-  <td width="10%" valign="top">No (default=false)</td>
-</tr>
-
-<tr>
-  <td width="12%" valign="top">escapeprocessing</td>
-  <td width="78%" valign="top">Control whether the Java statement
-    object will perform escape substitution.<br>
-    See <a
-    href="http://docs.oracle.com/javase/7/docs/api/java/sql/Statement.html#setEscapeProcessing%28boolean%29">Statement's
-    API docs</a> for details.  <em>Since Ant 1.6</em>.
-  <td width="10%" valign="top">No (default=true)</td>
-</tr>
-
-<tr>
-  <td width="12%" valign="top">expandproperties</td>
-  <td width="78%" valign="top">Set to true to turn on property expansion in
-  nested SQL, inline in the task or nested transactions. <em>Since Ant 1.7</em>.
-  <td width="10%" valign="top">No (default=true)</td>
-</tr>
-
-<tr>
-  <td width="12%" valign="top">rawblobs</td>
-  <td width="78%" valign="top">If true, will write raw streams rather than hex encoding when
-    printing BLOB results. <em>Since Ant 1.7.1</em>.</td>
-  <td width="10%" valign="top">No, default <em>false</em></td>
-</tr>
-
-<tr>
-  <td width="12%" valign="top">failOnConnectionError</td>
-  <td width="78%" valign="top">If false, will only print a warning
-    message and not execute any statement if the task fails to connect
-    to the database.  <em>Since Ant 1.8.0</em>.</td>
-  <td width="10%" valign="top">No, default <em>true</em></td>
-</tr>
-
-<tr>
-  <td width="12%" valign="top">strictDelimiterMatching</td>
-  <td width="78%" valign="top">If false, delimiters will be searched
-    for in a case-insensitive manner (i.e. delimiter="go" matches "GO")
-    and surrounding whitespace will be ignored (delimiter="go" matches
-    "GO ").  <em>Since Ant 1.8.0</em>.</td>
-  <td width="10%" valign="top">No, default <em>true</em></td>
-</tr>
-
-<tr>
-  <td width="12%" valign="top">showWarnings</td>
-  <td width="78%" valign="top">If true, SQLWarnings will be logged at
-    the WARN level.  <em>Since Ant 1.8.0</em>.<br/>
-    <b>Note:</b> even if the attribute is set to false, warnings that
-    apply to the connection will be logged at the verbose level.</td>
-  <td width="10%" valign="top">No, default <em>false</em></td>
-</tr>
-
-<tr>
-  <td width="12%" valign="top">treatWarningsAsErrors</td>
-  <td width="78%" valign="top">If true, SQLWarnings will be treated
-    like errors - and the logic selected via the onError attribute
-    applies.
-    <em>Since Ant 1.8.0</em>.</td>
-  <td width="10%" valign="top">No, default <em>false</em></td>
-</tr>
-
-<tr>
-  <td width="12%" valign="top">csvColumnSeparator</td>
-  <td width="78%" valign="top">The column separator used when printing
-    the results.
-    <em>Since Ant 1.8.0</em>.</td>
-  <td width="10%" valign="top">No, default <em>','</em></td>
-</tr>
-
-<tr>
-  <td width="12%" valign="top">csvQuoteCharacter</td>
-  <td width="78%" valign="top">The character used to quote column
-    values.<br/>
-    If set, columns that contain either the column separator or the
-    quote character itself will be surrounded by the quote character.
-    The quote character itself will be doubled if it appears inside of
-    the column's value.<br/>
-    <b>Note:</b> BLOB values will never be quoted.
-    <em>Since Ant 1.8.0</em>.</td>
-  <td width="10%" valign="top">No, default is not set (i.e. no quoting
-    ever occurs)</td>
-</tr>
-
-<tr>
-  <td width="12%" valign="top">forceCsvQuoteChar</td>
-  <td width="78%" valign="top">If true, quoting always occurs</td>
-  <td width="10%" valign="top">No, default is not set (i.e. quoting
-    occurs only where needed)</td>
-</tr>
-
-<tr>
-  <td valign="top">errorproperty</td>
-  <td valign="top">The name of a property to set in the event of an
-    error.  <em>Since Ant 1.8.0</em></td>
-  <td align="center" valign="top">No</td>
-</tr>
-<tr>
-  <td valign="top">warningproperty</td>
-  <td valign="top">The name of a property to set in the event of an
-    warning.  <em>Since Ant 1.8.0</em></td>
-  <td align="center" valign="top">No</td>
-</tr>
-<tr>
-  <td valign="top">rowcountproperty</td>
-  <td valign="top">The name of a property to set to the number of rows
-    updated by the first statement/transaction that actually returned
-    a row count.  <em>Since Ant 1.8.0</em></td>
-  <td align="center" valign="top">No</td>
-</tr>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>driver</td>
+    <td>Class name of the jdbc driver</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>url</td>
+    <td>Database connection URL</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>userid</td>
+    <td>Database user name</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>password</td>
+    <td>Database password</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>src</td>
+    <td>File containing SQL statements</td>
+    <td>Yes, unless statements enclosed within tags</td>
+  </tr>
+  <tr>
+    <td>encoding</td>
+    <td>The encoding of the files containing SQL statements</td>
+    <td>No; defaults to default JVM character encoding</td>
+  </tr>
+  <tr>
+    <td>outputencoding</td>
+    <td>The encoding of the files holding results.  <em>since Ant 1.9.4</em></td>
+    <td>No; defaults to default JVM character encoding</td>
+  </tr>
+  <tr>
+    <td>delimiter</td>
+    <td>String that separates SQL statements</td>
+    <td>No; defaults to <q>;;</q></td>
+  </tr>
+  <tr>
+    <td>autocommit</td>
+    <td>Auto commit flag for database connection</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>print</td>
+    <td>Print result sets from the statements</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>showheaders</td>
+    <td>Print headers for result sets from the statements</td>
+    <td>No; defaults to <q>true</q></td>
+  </tr>
+  <tr>
+    <td>showtrailers</td>
+    <td>Print trailer for number of rows affected</td>
+    <td>No; defaults to <q>true</q></td>
+  </tr>
+  <tr>
+    <td>output</td>
+    <td>Output file for result sets.  <em>Since Ant 1.8</em> can specify any Resource that supports
+      output (see <a href="../develop.html#set-magic">note</a>).</td>
+    <td>No; print to <code>System.out</code> by default</td>
+  </tr>
+  <tr>
+    <td>append</td>
+    <td>whether output should be appended to or overwrite an existing file.</td>
+    <td>No; defaults to <q>false</q>, ignored if <var>output</var> does not specify a filesystem
+      destination</td>
+  </tr>
+  <tr>
+    <td>classpath</td>
+    <td>Classpath used to load driver</td>
+    <td>No; defaults to system classpath</td>
+  </tr>
+  <tr>
+    <td>classpathref</td>
+    <td>The classpath to use, given as a <a href="../using.html#references">reference</a> to a path
+      defined elsewhere.</td>
+    <td>No; defaults to system classpath</td>
+  </tr>
+  <tr>
+    <td>onerror</td>
+    <td>Action to perform when statement fails: <q>continue</q>, <q>stop</q>, <q>abort</q></td>
+    <td>No; defaults to <q>abort</q></td>
+  </tr>
+  <tr>
+    <td>rdbms</td>
+    <td>Execute task only if this rdbms</td>
+    <td>No; unrestricted by default</td>
+  </tr>
+  <tr>
+    <td>version</td>
+    <td>Execute task only if rdbms version match</td>
+    <td>No; unrestricted by default</td>
+  </tr>
+  <tr>
+    <td>caching</td>
+    <td>Should the task cache loaders and the driver?</td>
+    <td>No; defaults to <q>true</q></td>
+  </tr>
+  <tr>
+    <td>delimitertype</td>
+    <td>Control whether the delimiter will only be recognized on a line by itself.<br/>Can
+      be <q>normal</q>&mdash;anywhere on the line, or <q>row</q>, meaning it must be on a line by
+      itself</td>
+    <td>No; defaults to <q>normal</q></td>
+  </tr>
+  <tr>
+    <td>keepformat</td>
+    <td>Control whether the format of SQL will be preserved.<br/>Useful when loading packages and
+      procedures.
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>escapeprocessing</td>
+    <td>Control whether the Java statement object will perform escape substitution.<br/>
+      See <a href="https://docs.oracle.com/javase/8/docs/api/java/sql/Statement.html#setEscapeProcessing-boolean-"
+      target="_top">Statement's API docs</a> for details.  <em>Since Ant 1.6</em>.
+    <td>No; defaults to <q>true</q></td>
+  </tr>
+  <tr>
+    <td>expandproperties</td>
+    <td>Set to true to turn on property expansion in nested SQL, inline in the task or nested
+      transactions. <em>Since Ant 1.7</em>.
+    <td>No; defaults to <q>true</q></td>
+  </tr>
+  <tr>
+    <td>rawblobs</td>
+    <td>If <q>true</q>, will write raw streams rather than hex encoding when printing BLOB
+      results. <em>Since Ant 1.7.1</em>.</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>failOnConnectionError</td>
+    <td>If <q>false</q>, will only print a warning message and not execute any statement if the task
+      fails to connect to the database.  <em>Since Ant 1.8.0</em>.</td>
+    <td>No; defaults to <q>true</q></td>
+  </tr>
+  <tr>
+    <td>strictDelimiterMatching</td>
+    <td>If <q>false</q>, delimiters will be searched for in a case-insensitive manner
+      (i.e. <var>delimiter</var>=<q>go</q> matches <q>GO</q>) and surrounding whitespace will be
+      ignored (<var>delimiter</var>=<q>go</q> matches <q>GO </q>).  <em>Since Ant 1.8.0</em>.</td>
+    <td>No; defaults to <q>true</q></td>
+  </tr>
+  <tr>
+    <td>showWarnings</td>
+    <td>If <q>true</q>, SQLWarnings will be logged at the <q>warning</q> level.  <em>Since Ant
+      1.8.0</em>.<br/><strong>Note</strong>: even if the attribute is set to <q>false</q>, warnings
+      that apply to the connection will be logged at the <q>verbose</q> level.</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>treatWarningsAsErrors</td>
+    <td>If <q>true</q>, SQLWarnings will be treated like errors&mdash;and the logic selected via
+      the <var>onError</var> attribute applies.  <em>Since Ant 1.8.0</em>.</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>csvColumnSeparator</td>
+    <td>The column separator used when printing the results.  <em>Since Ant 1.8.0</em>.</td>
+    <td>No; defaults to <q>,</q></td>
+  </tr>
+  <tr>
+    <td>csvQuoteCharacter</td>
+    <td>The character used to quote column values.<br/>If set, columns that contain either the
+      column separator or the quote character itself will be surrounded by the quote character.  The
+      quote character itself will be doubled if it appears inside of the column's
+      value.<br/><strong>Note</strong>: BLOB values will never be quoted.  <em>Since Ant
+      1.8.0</em>.</td>
+    <td>No; default is not set (i.e. no quoting ever occurs)</td>
+  </tr>
+  <tr>
+    <td>forceCsvQuoteChar</td>
+    <td>If <q>true</q>, quoting always occurs</td>
+    <td>No; default is not set (i.e. quoting occurs only where needed)</td>
+  </tr>
+  <tr>
+    <td>errorproperty</td>
+    <td>The name of a property to set in the event of an error.  <em>Since Ant 1.8.0</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>warningproperty</td>
+    <td>The name of a property to set in the event of an warning.  <em>Since Ant 1.8.0</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>rowcountproperty</td>
+    <td>The name of a property to set to the number of rows updated by the first
+      statement/transaction that actually returned a row count.  <em>Since Ant 1.8.0</em></td>
+    <td>No</td>
+  </tr>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
 <h4>transaction</h4>
-<p>Use nested <code>&lt;transaction&gt;</code> 
-elements to specify multiple blocks of commands to the executed
-executed in the same connection but different transactions. This
-is particularly useful when there are multiple files to execute
-on the same schema.</p>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+<p>Use nested <code>&lt;transaction&gt;</code> elements to specify multiple blocks of commands to
+the executed executed in the same connection but different transactions. This is particularly useful
+when there are multiple files to execute on the same schema.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">src</td>
-    <td valign="top">File containing SQL statements</td>
-    <td valign="top" align="center">Yes, unless statements enclosed within tags</td>
+    <td>src</td>
+    <td>File containing SQL statements</td>
+    <td>Yes, unless statements enclosed within tags</td>
   </tr>
 </table>
-<p>The <code>&lt;transaction&gt;</code> element supports any <a
-href="../Types/resources.html">resource</a> or single element
-resource collection as nested element to specify the resource
-containing the SQL statements.</p>
-
-<h4>any <a href="../Types/resources.html">resource</a> or resource
-collection</h4>
-
-<p>You can specify multiple sources via nested resource collection
-elements.  Each resource of the collection will be run in a
-transaction of its own.  Prior to Ant 1.7 only filesets were
-supported.  Use a sort resource collection to get a predictable order
-of transactions. </p>
+<p>The <code>&lt;transaction&gt;</code> element supports
+any <a href="../Types/resources.html">resource</a> or single element resource collection as nested
+element to specify the resource containing the SQL statements.</p>
+
+<h4>any <a href="../Types/resources.html">resource</a> or resource collection</h4>
+
+<p>You can specify multiple sources via nested resource collection elements.  Each resource of the
+collection will be run in a transaction of its own.  Prior to Ant 1.7 only filesets were supported.
+Use a sort resource collection to get a predictable order of transactions.</p>
 
 <h4>classpath</h4>
-<p><code>Sql</code>'s <em>classpath</em> attribute is a <a
-href="../using.html#path">PATH like structure</a> and can also be set via a nested
-<em>classpath</em> element. It is used to load the JDBC classes.</p>
+<p><code>Sql</code>'s <em>classpath</em> attribute is a <a href="../using.html#path">path-like
+structure</a> and can also be set via a nested <em>classpath</em> element. It is used to load the
+JDBC classes.</p>
 
 <h4>connectionProperty</h4>
 <p><em>Since Ant 1.8.0</em></p>
-<p>Use nested <code>&lt;connectionProperty&gt;</code> elements to
-  specify additional JDBC properties that need to be set when
-  connecting to the database.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<p>Use nested <code>&lt;connectionProperty&gt;</code> elements to specify additional JDBC properties
+that need to be set when connecting to the database.</p>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">Name of the property</td>
-    <td valign="top" align="center">Yes</td>
+    <td>name</td>
+    <td>Name of the property</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">Value of the property</td>
-    <td valign="top" align="center">Yes</td>
+    <td>value</td>
+    <td>Value of the property</td>
+    <td>Yes</td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<blockquote><pre>&lt;sql
-    driver=&quot;org.database.jdbcDriver&quot;
-    url=&quot;jdbc:database-url&quot;
-    userid=&quot;sa&quot;
-    password=&quot;pass&quot;
-    src=&quot;data.sql&quot;
-/&gt;
-</pre></blockquote>
-
-<p>Connects to the database given in <i>url</i> as the sa user using the 
-org.database.jdbcDriver and executes the SQL statements contained within 
-the file data.sql</p>
-
-<blockquote><pre>&lt;sql
-    driver=&quot;org.database.jdbcDriver&quot;
-    url=&quot;jdbc:database-url&quot;
-    userid=&quot;sa&quot;
-    password=&quot;pass&quot;
-    src=&quot;data.sql&quot;&gt;
+<pre>
+&lt;sql driver=&quot;org.database.jdbcDriver&quot;
+     url=&quot;jdbc:database-url&quot;
+     userid=&quot;sa&quot;
+     password=&quot;pass&quot;
+     src=&quot;data.sql&quot;/&gt;</pre>
+
+<p>Connects to the database given in <var>url</var> as the <q>sa</q> user using
+the <code>org.database.jdbcDriver</code> and executes the SQL statements contained within the
+file <samp>data.sql</samp></p>
+
+<pre>
+&lt;sql driver=&quot;org.database.jdbcDriver&quot;
+     url=&quot;jdbc:database-url&quot;
+     userid=&quot;sa&quot;
+     password=&quot;pass&quot;
+     src=&quot;data.sql&quot;&gt;
   &lt;connectionProperty name=&quot;internal_logon&quot; value=&quot;SYSDBA&quot;&gt;
-&lt;/sql&gt;
-</pre></blockquote>
+&lt;/sql&gt;</pre>
 
-<p>Connects to the database given in <i>url</i> as the sa user using
-the org.database.jdbcDriver and executes the SQL statements contained
-within the file data.sql.  Also sets the
-property <i>internal_logon</i> to the value <i>SYSDBA</i>.</p>
-
-<blockquote><pre>&lt;sql
-    driver=&quot;org.database.jdbcDriver&quot;
-    url=&quot;jdbc:database-url&quot;
-    userid=&quot;sa&quot;
-    password=&quot;pass&quot;
-    &gt;
+<p>Connects to the database given in <var>url</var> as the <q>sa</q> user using
+the <code>org.database.jdbcDriver</code> and executes the SQL statements contained within the
+file <samp>data.sql</samp>.  Also sets the property <code>internal_logon</code> to the
+value <q>SYSDBA</q>.</p>
+
+<pre>
+&lt;sql driver=&quot;org.database.jdbcDriver&quot;
+     url=&quot;jdbc:database-url&quot;
+     userid=&quot;sa&quot;
+     password=&quot;pass&quot;&gt;
 insert
 into table some_table
 values(1,2,3,4);
 
 truncate table some_other_table;
-&lt;/sql&gt;
-</pre></blockquote>
+&lt;/sql&gt;</pre>
 
-<p>Connects to the database given in <i>url</i> as the sa
- user using the org.database.jdbcDriver and executes the two SQL statements 
- inserting data into some_table and truncating some_other_table. Ant Properties
- in the nested text will not be expanded.</p>
-
-<p>Note that you may want to enclose your statements in
-<code>&lt;![CDATA[</code> ... <code>]]&gt;</code> sections so you don't
-need to escape <code>&lt;</code>, <code>&gt;</code> <code>&amp;</code>
-or other special characters. For example:</p>
-
-<blockquote><pre>&lt;sql
-    driver=&quot;org.database.jdbcDriver&quot;
-    url=&quot;jdbc:database-url&quot;
-    userid=&quot;sa&quot;
-    password=&quot;pass&quot;
-    &gt;&lt;![CDATA[
+<p>Connects to the database given in <var>url</var> as the <q>sa</q> user using
+the <code>org.database.jdbcDriver</code> and executes the two SQL statements inserting data
+into <samp>some_table</samp> and truncating <samp>some_other_table</samp>. Ant Properties in the
+nested text will not be expanded.</p>
+
+<p>Note that you may want to enclose your statements in <code>&lt;![CDATA[</code>
+... <code>]]&gt;</code> sections so you don't need to
+escape <code>&lt;</code>, <code>&gt;</code>, <code>&amp;</code> or other special characters. For
+example:</p>
+
+<pre>
+&lt;sql driver=&quot;org.database.jdbcDriver&quot;
+     url=&quot;jdbc:database-url&quot;
+     userid=&quot;sa&quot;
+     password=&quot;pass&quot;&gt;&lt;![CDATA[
 
 update some_table set column1 = column1 + 1 where column2 &lt; 42;
 
-]]&gt;&lt;/sql&gt;
-</pre></blockquote>
+]]&gt;&lt;/sql&gt;</pre>
 
-The following command turns property expansion in nested text on (it is off purely for backwards
-compatibility), then creates a new user in the HSQLDB database using Ant properties. 
+<p>The following command turns property expansion in nested text on (it is off purely for backwards
+compatibility), then creates a new user in the HSQLDB database using Ant properties.</p>
 
-<blockquote><pre>&lt;sql
-    driver="org.hsqldb.jdbcDriver";
-    url="jdbc:hsqldb:file:${database.dir}"
-    userid="sa"
-    password=""
-    expandProperties="true"
-    &gt;
+<pre>
+&lt;sql driver="org.hsqldb.jdbcDriver";
+     url="jdbc:hsqldb:file:${database.dir}"
+     userid="sa"
+     password=""
+     expandProperties="true"&gt;
   &lt;transaction&gt;
     CREATE USER ${newuser} PASSWORD ${newpassword}
   &lt;/transaction&gt;
-&lt;/sql&gt;
-</pre></blockquote>
+&lt;/sql&gt;</pre>
 
-
-<p>The following connects to the database given in url as the sa user using 
-the org.database.jdbcDriver and executes the SQL statements contained within 
-the files data1.sql, data2.sql and data3.sql and then executes the truncate 
-operation on <i>some_other_table</i>.</p>
-
-<blockquote><pre>&lt;sql
-    driver=&quot;org.database.jdbcDriver&quot;
-    url=&quot;jdbc:database-url&quot;
-    userid=&quot;sa&quot;
-    password=&quot;pass&quot; &gt;
+<p>The following connects to the database given in <var>url</var> as the <q>sa</q> user using
+the <code>org.database.jdbcDriver</code> and executes the SQL statements contained within the
+files <samp>data1.sql</samp>, <samp>data2.sql</samp> and <samp>data3.sql</samp> and then executes
+the truncate operation on <samp>some_other_table</samp>.</p>
+
+<pre>
+&lt;sql driver=&quot;org.database.jdbcDriver&quot;
+     url=&quot;jdbc:database-url&quot;
+     userid=&quot;sa&quot;
+     password=&quot;pass&quot;&gt;
   &lt;transaction  src=&quot;data1.sql&quot;/&gt;
   &lt;transaction  src=&quot;data2.sql&quot;/&gt;
   &lt;transaction  src=&quot;data3.sql&quot;/&gt;
   &lt;transaction&gt;
     truncate table some_other_table;
   &lt;/transaction&gt;
-&lt;/sql&gt;
-</pre></blockquote>
+&lt;/sql&gt;</pre>
 
-<p>The following example does the same as (and may execute additional
-SQL files if there are more files matching the pattern
-<code>data*.sql</code>) but doesn't guarantee that data1.sql will be
-run before <code>data2.sql</code>.</p>
-
-<blockquote><pre>&lt;sql
-    driver=&quot;org.database.jdbcDriver&quot;
-    url=&quot;jdbc:database-url&quot;
-    userid=&quot;sa&quot;
-    password=&quot;pass&quot;&gt;
+<p>The following example does the same as (and may execute additional SQL files if there are more
+files matching the pattern <samp>data*.sql</samp>) but doesn't guarantee that <samp>data1.sql</samp>
+will be run before <samp>data2.sql</samp>.</p>
+
+<pre>
+&lt;sql driver=&quot;org.database.jdbcDriver&quot;
+     url=&quot;jdbc:database-url&quot;
+     userid=&quot;sa&quot;
+     password=&quot;pass&quot;&gt;
   &lt;path&gt;
     &lt;fileset dir=&quot;.&quot;&gt;
       &lt;include name=&quot;data*.sql&quot;/&gt;
@@ -470,49 +413,43 @@
   &lt;transaction&gt;
     truncate table some_other_table;
   &lt;/transaction&gt;
-&lt;/sql&gt;
-</pre></blockquote>
+&lt;/sql&gt;</pre>
 
-<p>The following connects to the database given in url as the sa user using the 
-org.database.jdbcDriver and executes the SQL statements contained within the 
-file data.sql, with output piped to outputfile.txt, searching /some/jdbc.jar 
-as well as the system classpath for the driver class.</p>
-
-<blockquote><pre>&lt;sql
-    driver=&quot;org.database.jdbcDriver&quot;
-    url=&quot;jdbc:database-url&quot;
-    userid=&quot;sa&quot;
-    password=&quot;pass&quot;
-    src=&quot;data.sql&quot;
-    print=&quot;yes&quot;
-    output=&quot;outputfile.txt&quot;
-    &gt;
-&lt;classpath&gt;
-	&lt;pathelement location=&quot;/some/jdbc.jar&quot;/&gt;
-&lt;/classpath&gt;
-&lt;/sql&gt;
-</pre></blockquote>
-
-<p>The following will only execute if the RDBMS is &quot;oracle&quot; and the version 
-starts with &quot;8.1.&quot;</p>
-
-<blockquote><pre>&lt;sql
-    driver=&quot;org.database.jdbcDriver&quot;
-    url=&quot;jdbc:database-url&quot;
-    userid=&quot;sa&quot;
-    password=&quot;pass&quot;
-    src=&quot;data.sql&quot;
-    rdbms=&quot;oracle&quot;
-    version=&quot;8.1.&quot;
-    &gt;
+<p>The following connects to the database given in <var>url</var> as the <q>sa</q> user using
+the <code>org.database.jdbcDriver</code> and executes the SQL statements contained within the
+file <samp>data.sql</samp>, with output piped to <samp>outputfile.txt</samp>,
+searching <samp>/some/jdbc.jar</samp> as well as the system classpath for the driver class.</p>
+
+<pre>
+&lt;sql driver=&quot;org.database.jdbcDriver&quot;
+     url=&quot;jdbc:database-url&quot;
+     userid=&quot;sa&quot;
+     password=&quot;pass&quot;
+     src=&quot;data.sql&quot;
+     print=&quot;yes&quot;
+     output=&quot;outputfile.txt&quot;&gt;
+  &lt;classpath&gt;
+    &lt;pathelement location=&quot;/some/jdbc.jar&quot;/&gt;
+  &lt;/classpath&gt;
+&lt;/sql&gt;</pre>
+
+<p>The following will only execute if the RDBMS is <q>oracle</q> and the version starts
+with <q>8.1.</q></p>
+
+<pre>
+&lt;sql driver=&quot;org.database.jdbcDriver&quot;
+     url=&quot;jdbc:database-url&quot;
+     userid=&quot;sa&quot;
+     password=&quot;pass&quot;
+     src=&quot;data.sql&quot;
+     rdbms=&quot;oracle&quot;
+     version=&quot;8.1.&quot;&gt;
 insert
 into table some_table
 values(1,2,3,4);
 
 truncate table some_other_table;
-&lt;/sql&gt;
-</pre></blockquote>
-
+&lt;/sql&gt;</pre>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/sshexec.html ant-1.10.3/manual/Tasks/sshexec.html
--- ant-1.9.10/manual/Tasks/sshexec.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/sshexec.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,285 +24,246 @@
 
 <body>
 
-<h2><a name="sshexec">SSHEXEC</a></h2>
+<h2 id="sshexec">SSHEXEC</h2>
+<p><em>Since Apache Ant 1.6</em></p>
 <h3>Description</h3>
 
-<p><em>since Apache Ant 1.6</em></p>
+<p>Runs a command on a remote machine running SSH daemon.</p>
 
-<p>Runs a command on a remote machine running SSH daemon.
-</p>
-
-<p><b>Note:</b> This task depends on external libraries not included
-in the Ant distribution.  See <a
-href="../install.html#librarydependencies">Library Dependencies</a>
-for more information.  This task has been tested with jsch-0.1.29 and above
-and won't work with versions of jsch earlier than
-0.1.28.</p>
+<p><strong>Note</strong>: This task depends on external libraries not included in the Ant
+distribution.  See <a href="../install.html#librarydependencies">Library Dependencies</a> for more
+information.  This task has been tested with JSCh 0.1.29 and above and won't work with versions of
+JSCh earlier than 0.1.28.</p>
 
 <p>See also the <a href="scp.html">scp task</a></p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">host</td>
-    <td valign="top">The hostname or IP address of the remote host to which you wish to connect.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>host</td>
+    <td>The hostname or IP address of the remote host to which you wish to connect.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">username</td>
-    <td valign="top">The username on the remote host to which you are connecting.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>username</td>
+    <td>The username on the remote host to which you are connecting.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">command</td>
-    <td valign="top">The command to run on the remote host.</td>
-    <td valian="top" align="center">Either this or commandResource must be set</td>
+    <td>command</td>
+    <td>The command to run on the remote host.</td>
+    <td rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
-    <td valign="top">commandResource</td>
-    <td valign="top">The resource (file) that contains the commands to run on the remote host.
-    Since Ant 1.7.1</td>
-    <td valian="top" align="center">Either this or command must be set</td>
+    <td>commandResource</td>
+    <td class="left">The resource (file) that contains the commands to run on the remote
+    host.  <em>Since Ant 1.7.1</em></td>
   </tr>
   <tr>
-    <td valign="top">port</td>
-    <td valign="top">The port to connect to on the remote host.</td>
-    <td valian="top" align="center">No, defaults to 22.</td>
+    <td>port</td>
+    <td>The port to connect to on the remote host.</td>
+    <td>No; defaults to <q>22</q></td>
   </tr>
   <tr>
-    <td valign="top">trust</td>
-
-    <td valign="top">This trusts all unknown hosts if set to yes/true.<br>
-      <strong>Note</strong> If you set this to false (the default), the
-      host you connect to must be listed in your knownhosts file, this
-      also implies that the file exists.</td>
-    <td valian="top" align="center">No, defaults to No.</td>
+    <td>trust</td>
+    <td>This trusts all unknown hosts if set to <q>yes</q>
+      or <q>true</q>.<br/><strong>Note</strong>: If you set this to <q>false</q> (the default), the
+      host you connect to must be listed in your <var>knownhosts</var> file, this also implies that
+      the file exists.</td>
+    <td>No; defaults to <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">knownhosts</td>
-    <td valign="top">This sets the known hosts file to use to validate
-    the identity of the remote host.  This must be a SSH2 format file.
-    SSH1 format is not supported.</td>
-    <td valian="top" align="center">No, defaults to
-    ${user.home}/.ssh/known_hosts.</td>
+    <td>knownhosts</td>
+    <td>This sets the known hosts file to use to validate the identity of the remote host.  This
+      must be a SSH2 format file.  SSH1 format is not supported.</td>
+    <td>No; defaults to <q>${user.home}/.ssh/known_hosts</q></td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-     <td valign="top">Whether to halt the build if the command does not complete successfully.
-     </td>
-     <td valign="top" align="center">No; defaults to true.</td>
+    <td>failonerror</td>
+    <td>Whether to halt the build if the command does not complete successfully.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">password</td>
-     <td valign="top">The password.</td>
-     <td valign="top" align="center">Not if you are using key based
-     authentication or the password has been given in the file or
-     todir attribute.</td>
+    <td>password</td>
+    <td>The password.</td>
+    <td>Yes, unless you are using key based authentication or the password has been given in the
+      file or <var>todir</var> attribute.</td>
   </tr>
   <tr>
-    <td valign="top">keyfile</td>
-     <td valign="top">Location of the file holding the private key.</td>
-     <td valign="top" align="center">Yes, if you are using key based
-     authentication.</td>
+    <td>keyfile</td>
+    <td>Location of the file holding the private key.</td>
+    <td>Yes, if you are using key based authentication</td>
   </tr>
   <tr>
-    <td valign="top">passphrase</td>
-     <td valign="top">Passphrase for your private key.</td>
-     <td valign="top" align="center">No, defaults to an empty string.</td>
+    <td>passphrase</td>
+    <td>Passphrase for your private key.</td>
+    <td>No; defaults to an empty string</td>
   </tr>
   <tr>
-    <td valign="top">suppresssystemout</td>
-    <td valign="top">Whether to suppress system out.
-      <em>since Ant 1.9.0</em></td>
-    <td align="center" valign="top">No, defaults to false</td>
+    <td>suppresssystemout</td>
+    <td>Whether to suppress system out. <em>since Ant 1.9.0</em></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">suppresssystemerr</td>
-    <td valign="top">Whether to suppress system err.
-      <em>since Ant 1.9.4</em></td>
-    <td align="center" valign="top">No, defaults to false</td>
+    <td>suppresssystemerr</td>
+    <td>Whether to suppress <code>System.err</code>. <em>since Ant 1.9.4</em></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">output</td>
-    <td valign="top">Name of a file to which to write the output.</td>
-    <td align="center" valign="top">No</td>
+    <td>output</td>
+    <td>Name of a file to which to write the output.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">errorOutput</td>
-    <td valign="top">The file to which the standard error of the
-    command should be redirected.  <em>since Ant 1.9.4</em></td>
-    <td align="center" valign="top">No</td>
+    <td>errorOutput</td>
+    <td>The file to which the standard error of the command should be redirected.  <em>since Ant
+      1.9.4</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">append</td>
-    <td valign="top">Whether output file should be appended to or overwritten. Defaults to false, meaning overwrite any existing file.</td>
-    <td align="center" valign="top">No</td>
+    <td>append</td>
+    <td>Whether <var>output</var> file should be appended to or overwritten.</td>
+    <td>No; defaults to <q>false</q>, meaning overwrite any existing file</td>
   </tr>
   <tr>
-    <td valign="top">errAppend</td>
-    <td valign="top">Whether errorOutput file should be appended to or
-    overwritten. Defaults to false, meaning overwrite any existing
-    file.  <em>since Ant 1.9.4</em></td>
-    <td align="center" valign="top">No</td>
+    <td>errAppend</td>
+    <td>Whether <var>errorOutput</var> file should be appended to or overwritten. <em>since Ant
+      1.9.4</em></td>
+    <td>No; defaults to <q>false</q>, meaning overwrite any existing file</td>
   </tr>
   <tr>
-    <td valign="top">outputproperty</td>
-    <td valign="top">The name of a property in which the output of the 
-      command should be stored.  If you use the commandResource
-      attribute, each command's output will be prefixed by the
+    <td>outputproperty</td>
+    <td>The name of a property in which the output of the command should be stored.  If you use
+      the <var>commandResource</var> attribute, each command's output will be prefixed by the
       command itself.</td>
-    <td align="center" valign="top">No</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">errorproperty</td>
-    <td valign="top">The name of a property in which the standard error of the
-      command should be stored.  <em>since Ant 1.9.4</em></td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">resultproperty</td>
-    <td valign="top">the name of a property in which the return code
-      of the command should be stored. Only of interest if
-      failonerror=false.  <em>since Ant 1.9.4</em></td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">timeout</td>
-    <td valign="top">Stop the command if it doesn't finish within the
-      specified time (given in milliseconds <b>unlike telnet, which
-        expects a timeout in seconds</b>).
-      Defaults to 0 which means &quot;wait forever&quot;.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">input</td>
-    <td valign="top">A file from which the executed command's standard
-      input is taken. This attribute is mutually exclusive with the
-      inputstring and inputproperty attributes.<br/>
-      When executing more than one command via commandResource, input
-      will be read for each command.
-      <em>since Ant 1.8.0</em></td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">Determines whether sshexec outputs verbosely to the user.<br/> 
-    Similar output is generated as the ssh commandline tool wit the -v option. 
-    <em>since Ant 1.8.0</em></td>
-    <td align="center">No, defaults to false</td>
-  </tr>
-  <tr>
-    <td valign="top">inputproperty</td>
-    <td valign="top">Name of a property who's content serves as the
-      input stream for the executed command. This attribute is
-      mutually exclusive with the input and inputstring
-      attributes.<br/>
-      When executing more than one command via commandResource, input
-      will be read for each command.
-      <em>since Ant 1.8.0</em></td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">inputstring</td>
-    <td valign="top">A string which serves as the input stream for the
-      executed command. This attribute is mutually exclusive with the
-      input and inputproperty attributes.<br/>
-      When executing more than one command via commandResource, input
-      will be read for each command.
-      <em>since Ant 1.8.3</em></td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">usepty</td>
-    <td valign="top">Whether to allocate a pseudo-tty (like ssh -t).
-      <em>since Ant 1.8.3</em></td>
-    <td align="center" valign="top">No, defaults to false</td>
-  </tr>
-  <tr>
-    <td valign="top">useSystemIn</td>
-    <td valign="top">Whether to pass the current standard input to the
-      remote process.
-      <em>since Ant 1.9.4</em></td>
-    <td align="center" valign="top">No, defaults to false</td>
-  </tr>
-  <tr>
-    <td valign="top">serverAliveIntervalSeconds</td>
-    <td valign="top">Sets a timeout interval in seconds after which if no data has
-      been received from the server, the task will send a message through
-      the encrypted channel to request a response from the server.
-      <em>since Ant 1.9.7</em></td>
-    <td align="center" valign="top">No, the default is 0, indicating
-      that these messages will not be sent to the server</td>
-  </tr>
-  <tr>
-    <td valign="top">serverAliveCountMax</td>
-    <td valign="top">The number of server alive messages which may be
-      sent without receiving any messages back from the server. Only
-      used if serverAliveIntervalSeconds is not 0.
-      <em>since Ant 1.9.7</em></td>
-    <td align="center" valign="top">No, defaults to 3</td>
+    <td>errorproperty</td>
+    <td>The name of a property in which the standard error of the command should be
+      stored.  <em>since Ant 1.9.4</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>resultproperty</td>
+    <td>the name of a property in which the return code of the command should be stored. Only of
+      interest if <var>failonerror</var>=<q>false</q>.  <em>since Ant 1.9.4</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>timeout</td>
+    <td>Stop the command if it doesn't finish within the specified time (given in
+      milliseconds <strong>unlike <code>telnet</code>, which expects a timeout in
+      seconds</strong>).</td>
+    <td>No; defaults to <q>0</q> which means <q>never</q></td>
+  </tr>
+  <tr>
+    <td>input</td>
+    <td>A file from which the executed command's standard input is taken. This attribute is mutually
+      exclusive with the <var>inputstring</var> and <var>inputproperty</var> attributes.<br/>  When
+      executing more than one command via <var>commandResource</var>, input will be read for each
+      command.  <em>since Ant 1.8.0</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>verbose</td>
+    <td>Determines whether <code>sshexec</code> outputs verbosely to the user.<br/>  Similar output
+      is generated as the <kbd>ssh</kbd> command line tool with the <kbd>-v</kbd>
+      option.  <em>since Ant 1.8.0</em></td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>inputproperty</td>
+    <td>Name of a property content of which serves as the input stream for the executed
+      command. This attribute is mutually exclusive with the <var>input</var>
+      and <var>inputstring</var> attributes.<br/>  When executing more than one command
+      via <var>commandResource</var>, input will be read for each command.  <em>since Ant
+      1.8.0</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>inputstring</td>
+    <td>A string which serves as the input stream for the executed command. This attribute is
+      mutually exclusive with the <var>input</var> and <var>inputproperty</var> attributes.<br/>
+      When executing more than one command via <var>commandResource</var>, input will be read for
+      each command.  <em>since Ant 1.8.3</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>usepty</td>
+    <td>Whether to allocate a pseudo-tty (like <kbd>ssh -t</kbd>).  <em>since Ant 1.8.3</em></td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>useSystemIn</td>
+    <td>Whether to pass the current standard input to the remote process.  <em>since Ant
+      1.9.4</em></td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>serverAliveIntervalSeconds</td>
+    <td>Sets a timeout interval in seconds after which if no data has been received from the server,
+      the task will send a message through the encrypted channel to request a response from the
+      server.  <em>since Ant 1.9.7</em></td>
+    <td>No, the default is <q>0</q>, indicating that these messages will not be sent to the
+      server</td>
+  </tr>
+  <tr>
+    <td>serverAliveCountMax</td>
+    <td>The number of server alive messages which may be sent without receiving any messages back
+      from the server. Only used if <var>serverAliveIntervalSeconds</var> is
+      not <q>0</q>.  <em>since Ant 1.9.7</em></td>
+    <td>No; defaults to <q>3</q></td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<p><b>Run a command on a remote machine using password authentication</b></p>
-<pre>
-  &lt;sshexec host=&quot;somehost&quot;
-	username=&quot;dude&quot;
-	password=&quot;yo&quot;
-	command=&quot;touch somefile&quot;/&gt;
-</pre>
-
-<p><b>Run a command on a remote machine using key authentication</b></p>
-<pre>
-  &lt;sshexec host=&quot;somehost&quot;
-	username=&quot;dude&quot;
-	keyfile=&quot;${user.home}/.ssh/id_dsa&quot;
-	passphrase=&quot;yo its a secret&quot;
-	command=&quot;touch somefile&quot;/&gt;
-</pre>
-
-<p><b>Run a command on a remote machine using key authentication with no passphrase</b></p>
-<pre>
-  &lt;sshexec host=&quot;somehost&quot;
-	username=&quot;dude&quot;
-	keyfile=&quot;${user.home}/.ssh/id_dsa&quot;
-	command=&quot;touch somefile&quot;/&gt;
-</pre>
-
-<p><b>Run a set of commands from a command resource (file) on a remote machine using key authentication with no passphrase</b></p>
-<pre>
-  &lt;sshexec host=&quot;somehost&quot;
-	username=&quot;dude&quot;
-	keyfile=&quot;${user.home}/.ssh/id_dsa&quot;
-	commandResource=&quot;to_run&quot;/&gt;
-</pre>
-
-
-<p><strong>Security Note:</strong>  Hard coding passwords and/or usernames
-in sshexec task can be a serious security hole.  Consider using variable
-substitution and include the password on the command line.  For example:<br>
+<p><strong>Run a command on a remote machine using password authentication</strong></p>
 <pre>
-  &lt;sshexec host=&quot;somehost&quot;
-	username=&quot;${username}&quot;
-	password=&quot;${password}&quot;
-	command=&quot;touch somefile&quot;/&gt;
-</pre>
-Invoking ant with the following command line:
-<pre>
-    ant -Dusername=me -Dpassword=mypassword target1 target2
-</pre>
-
-Is slightly better, but the username/password is exposed to all users
-on an Unix system (via the ps command). The best approach is to use
-the
-<code>&lt;input&gt;</code> task and/or retrieve the password from a (secured)
-.properties file.
-</p>
+&lt;sshexec host=&quot;somehost&quot;
+         username=&quot;dude&quot;
+         password=&quot;yo&quot;
+         command=&quot;touch somefile&quot;/&gt;</pre>
+
+<p><strong>Run a command on a remote machine using key authentication</strong></p>
+<pre>
+&lt;sshexec host=&quot;somehost&quot;
+         username=&quot;dude&quot;
+         keyfile=&quot;${user.home}/.ssh/id_dsa&quot;
+         passphrase=&quot;yo its a secret&quot;
+         command=&quot;touch somefile&quot;/&gt;</pre>
+
+<p><strong>Run a command on a remote machine using key authentication with no passphrase</strong></p>
+<pre>
+&lt;sshexec host=&quot;somehost&quot;
+         username=&quot;dude&quot;
+         keyfile=&quot;${user.home}/.ssh/id_dsa&quot;
+         command=&quot;touch somefile&quot;/&gt;</pre>
+
+<p><strong>Run a set of commands from a command resource (file) on a remote machine using key authentication with no passphrase</strong></p>
+<pre>
+&lt;sshexec host=&quot;somehost&quot;
+         username=&quot;dude&quot;
+         keyfile=&quot;${user.home}/.ssh/id_dsa&quot;
+         commandResource=&quot;to_run&quot;/&gt;</pre>
+
+<p><strong>Security Note</strong>: Hardcoding passwords and/or usernames in <var>sshexec</var> task
+can be a serious security hole. Consider using variable substitution and include the password on the
+command line. For example:</p>
+<pre>
+&lt;sshexec host=&quot;somehost&quot;
+         username=&quot;${username}&quot;
+         password=&quot;${password}&quot;
+         command=&quot;touch somefile&quot;/&gt;</pre>
+<p>Invoking Ant with the following command line:</p>
+<pre class="input">ant -Dusername=me -Dpassword=mypassword target1 target2</pre>
+<p>is slightly better, but the username/password is exposed to all users on an Unix system (via
+the <kbd>ps</kbd> command). The best approach is to use the <code>&lt;input&gt;</code> task and/or
+retrieve the password from a (secured) <samp>.properties</samp> file.</p>
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/sshsession.html ant-1.10.3/manual/Tasks/sshsession.html
--- ant-1.9.10/manual/Tasks/sshsession.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/sshsession.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,265 +24,227 @@
 
 <body>
 
-<h2><a name="sshsession">SSHSESSION</a></h2>
+<h2 id="sshsession">SSHSESSION</h2>
+<p><em>Since Apache Ant 1.8.0</em></p>
 <h3>Description</h3>
 
-<p><em>since Apache Ant 1.8.0</em></p>
+<p>A Task which establishes an SSH connection with a remote machine running SSH daemon, optionally
+establishes any number of local or remote tunnels over that connection, then executes any nested
+tasks before taking down the connection.</p>
+
+<p><strong>Note</strong>: This task depends on external libraries not included in the Ant
+distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a> for more
+information.  This task has been tested with JSCh 0.1.33 and above and won't work with versions of
+JSCh earlier than 0.1.28.</p>
 
-<p>A Task which establishes an SSH connection with a remote machine
-running SSH daemon, optionally establishes any number of local or
-remote tunnels over that connection, then executes any nested tasks
-before taking down the connection.
-</p>
-
-<p><b>Note:</b> This task depends on external libraries not included
-in the Ant
-distribution. See <a href="../install.html#librarydependencies">Library
-Dependencies</a> for more information.  This task has been tested with
-jsch-0.1.33 and above and won't work with versions of jsch earlier
-than 0.1.28.</p>
-
-<p>See also the <a href="sshexec.html">sshexec</a>
-and <a href="scp.html">scp</a> tasks</p>
+<p>See also the <a href="sshexec.html">sshexec</a> and <a href="scp.html">scp</a> tasks</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">host</td>
-    <td valign="top">The hostname or IP address of the remote host to which you wish to connect.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>host</td>
+    <td>The hostname or IP address of the remote host to which you wish to connect.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">username</td>
-    <td valign="top">The username on the remote host to which you are connecting.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>username</td>
+    <td>The username on the remote host to which you are connecting.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">port</td>
-    <td valign="top">The port to connect to on the remote host.</td>
-    <td valian="top" align="center">No, defaults to 22.</td>
+    <td>port</td>
+    <td>The port to connect to on the remote host.</td>
+    <td>No; defaults to <q>22</q></td>
   </tr>
   <tr>
   <tr>
-    <td valign="top">localtunnels</td>
-    <td valign="top">A comma-delimited list of
-      colon-delimited <code>lport:rhost:rport</code> triplets defining
-      local port forwarding.<br>  If
-      nested <a href="#LocalTunnel">localtunnel</a> elements are also
+    <td>localtunnels</td>
+    <td>A comma-delimited list of colon-delimited <samp>lport:rhost:rport</samp> triplets defining
+      local port forwarding.<br/>If nested <a href="#LocalTunnel">localtunnel</a> elements are also
       provided, both sets of tunnels will be established.</td>
-    <td valian="top" align="center">No</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">remotetunnels</td>
-    <td valign="top">A comma-delimited list of
-      colon-delimited <code>rport:lhost:lport</code> triplets defining
-      remote port forwarding.<br>  If
-      nested <a href="#RemoteTunnel">remotetunnel</a> elements are
+    <td>remotetunnels</td>
+    <td>A comma-delimited list of colon-delimited <samp>rport:lhost:lport</samp> triplets defining
+      remote port forwarding.<br/>  If nested <a href="#RemoteTunnel">remotetunnel</a> elements are
       also provided, both sets of tunnels will be established.</td>
-    <td valian="top" align="center">No</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">trust</td>
-    
-    <td valign="top">This trusts all unknown hosts if set to yes/true.<br>
-      <strong>Note</strong> If you set this to false (the default), the
-      host you connect to must be listed in your knownhosts file, this
-      also implies that the file exists.</td>
-    <td valian="top" align="center">No, defaults to No.</td>
+    <td>trust</td>
+    <td>This trusts all unknown hosts if set to <q>yes</q>
+      or <q>true</q>.<br/><strong>Note</strong>: If you set this to <q>false</q> (the default), the
+      host you connect to must be listed in your <var>knownhosts</var> file, this also implies that
+      the file exists.</td>
+    <td>No; defaults to <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">knownhosts</td>
-    <td valign="top">This sets the known hosts file to use to validate
-      the identity of the remote host.	This must be a SSH2 format file.
-      SSH1 format is not supported.</td>
-    <td valian="top" align="center">No, defaults to
-      ${user.home}/.ssh/known_hosts.</td>
+    <td>knownhosts</td>
+    <td>This sets the known hosts file to use to validate the identity of the remote host. This must
+      be a SSH2 format file.  SSH1 format is not supported.</td>
+    <td>No; defaults to <q>${user.home}/.ssh/known_hosts</q></td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">Whether to halt the build if the command does not complete successfully.
-    </td>
-    <td valign="top" align="center">No; defaults to true.</td>
+    <td>failonerror</td>
+    <td>Whether to halt the build if the command does not complete successfully.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">password</td>
-    <td valign="top">The password.</td>
-    <td valign="top" align="center">Not if you are using key based
-      authentication or the password has been given in the file or
-      todir attribute.</td>
+    <td>password</td>
+    <td>The password.</td>
+    <td>Yes, unless you are using key based authentication or the password has been given in the
+      file or <var>todir</var> attribute</td>
   </tr>
   <tr>
-    <td valign="top">keyfile</td>
-    <td valign="top">Location of the file holding the private key.</td>
-    <td valign="top" align="center">Yes, if you are using key based
-      authentication.</td>
+    <td>keyfile</td>
+    <td>Location of the file holding the private key.</td>
+    <td>Yes, if you are using key based authentication</td>
   </tr>
   <tr>
-    <td valign="top">passphrase</td>
-    <td valign="top">Passphrase for your private key.</td>
-    <td valign="top" align="center">No, defaults to an empty string.</td>
+    <td>passphrase</td>
+    <td>Passphrase for your private key.</td>
+    <td>No; defaults to an empty string</td>
   </tr>
   <tr>
-    <td valign="top">timeout</td>
-    <td valign="top">Give up if the connection cannot be established
-      within the specified time (given in milliseconds). Defaults to 0
-      which means &quot;wait forever&quot;.</td>
-    <td align="center" valign="top">No</td>
+    <td>timeout</td>
+    <td>Give up if the connection cannot be established within the specified time (given in
+      milliseconds).</td>
+    <td>No; defaults to <q>0</q> which means <q>never</q></td>
   </tr>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
 
-<a name="LocalTunnel"><h4>localtunnel</h4></a>
-<p>Optionally, any number of localtunnel elements can be used to
-define local port forwarding over the SSH connection.  If the
-localtunnels parameter was also specified, both sets of tunnels will
-be established.</p>
+<h4 id="LocalTunnel">localtunnel</h4>
+<p>Optionally, any number of <code>localtunnel</code> elements can be used to define local port
+forwarding over the SSH connection.  If the <var>localtunnels</var> parameter was also specified,
+both sets of tunnels will be established.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">lport</td>
-    <td valign="top">The number of the local port to be forwarded.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>lport</td>
+    <td>The number of the local port to be forwarded.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">rhost</td>
-    <td valign="top">The hostname or IP address of the remote host to
-      which the local port should be forwarded.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>rhost</td>
+    <td>The hostname or IP address of the remote host to which the local port should be
+      forwarded.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">rport</td>
-    <td valign="top">The number of the port on the remote host to
-      which the local port should be forwarded.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>rport</td>
+    <td>The number of the port on the remote host to which the local port should be forwarded.</td>
+    <td>Yes</td>
   </tr>
 </table>
 
-<a name="RemoteTunnel"><h4>remotetunnel</h4></a>
-<p>Optionally, any number of remotetunnel elements can be used to
-define remote port forwarding over the SSH connection.  If the
-remotetunnels parameter was also specified, both sets of tunnels will
-be established.</p>
+<h4 id="RemoteTunnel">remotetunnel</h4>
+<p>Optionally, any number of <code>remotetunnel</code> elements can be used to define remote port
+forwarding over the SSH connection.  If the <var>remotetunnels</var> parameter was also specified,
+both sets of tunnels will be established.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">rport</td>
-    <td valign="top">The number of the remote port to be forwarded.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>rport</td>
+    <td>The number of the remote port to be forwarded.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">lhost</td>
-    <td valign="top">The hostname or IP address of the local host to
-      which the remote port should be forwarded.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>lhost</td>
+    <td>The hostname or IP address of the local host to which the remote port should be
+      forwarded.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">lport</td>
-    <td valign="top">The number of the port on the local host to which
-      the remote port should be forwarded.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>lport</td>
+    <td>The number of the port on the local host to which the remote port should be forwarded.</td>
+    <td>Yes</td>
   </tr>
 </table>
 
-<a name="Sequential"><h4>sequential</h4></a>
-<p>The sequential element is a required parameter.  It is a container
-for nested Tasks which are to be executed once the SSH connection is
-established and all local and/or remote tunnels established.</p>
+<h4 id="Sequential">sequential</h4>
+<p>The <code>sequential</code> element is a required parameter.  It is a container for nested Tasks
+which are to be executed once the SSH connection is established and all local and/or remote tunnels
+established.</p>
 
 <h3>Examples</h3>
-<p><b>Connect to a remote machine using password authentication,
-forward the local cvs port to the remote host, and execute a cvs
-command locally, which can use the tunnel.</b></p>
+<p><strong>Connect to a remote machine using password authentication, forward the local CVS port to
+the remote host, and execute a CVS command locally, which can use the tunnel.</strong></p>
 <pre>
-  &lt;sshsession host=&quot;somehost&quot;
-    username=&quot;dude&quot;
-    password=&quot;yo&quot;
-    localtunnels=&quot;2401:localhost:2401&quot;
-  &gt;
-    &lt;sequential&gt;
-      &lt;cvs  command=&quot;update ${cvs.parms} ${module}&quot;
-        cvsRoot=&quot;${cvs.root}&quot;
-        dest=&quot;${local.root}&quot;
-        failonerror=&quot;true&quot;
-      /&gt;
-    &lt;/sequential&gt;
-  &lt;/sshsession&gt;
-</pre>
+&lt;sshsession host=&quot;somehost&quot;
+            username=&quot;dude&quot;
+            password=&quot;yo&quot;
+            localtunnels=&quot;2401:localhost:2401&quot;&gt;
+  &lt;sequential&gt;
+    &lt;cvs command=&quot;update ${cvs.parms} ${module}&quot;
+         cvsRoot=&quot;${cvs.root}&quot;
+         dest=&quot;${local.root}&quot;
+         failonerror=&quot;true&quot;/&gt;
+  &lt;/sequential&gt;
+&lt;/sshsession&gt;</pre>
 
-<p><b>Do the same thing using nested localtunnel element.</b></p>
-<pre>
-  &lt;sshsession host=&quot;somehost&quot;
-    username=&quot;dude&quot;
-    password=&quot;yo&quot;
-  &gt;
-    &lt;localtunnel lport=&quot;2401&quot; rhost=&quot;localhost&quot; rport=&quot;2401&quot;/&gt;
-    &lt;sequential&gt;
-      &lt;cvs  command=&quot;update ${cvs.parms} ${module}&quot;
-        cvsRoot=&quot;${cvs.root}&quot;
-        dest=&quot;${local.root}&quot;
-        failonerror=&quot;true&quot;
-    /&gt;
-    &lt;/sequential&gt;
-  &lt;/sshsession&gt;
-</pre>
-
-<p><b>Connect to a remote machine using key authentication, forward
-port 1080 to port 80 of an intranet server which is not directly
-accessible, then run a get task using that tunnel.</b></p>
+<p><strong>Do the same thing using nested <code>localtunnel</code> element.</strong></p>
 <pre>
-  &lt;sshsession host=&quot;somehost&quot;
-  username=&quot;dude&quot;
-  keyfile=&quot;${user.home}/.ssh/id_dsa&quot;
-  passphrase=&quot;yo its a secret&quot;/&gt;
-    &lt;LocalTunnel lport=&quot;1080&quot; rhost=&quot;intranet.mycomp.com&quot; rport=&quot;80&quot;/&gt;
-    &lt;sequential&gt;
-      &lt;get src=&quot;http://localhost:1080/somefile&quot; dest=&quot;temp/somefile&quot;/&gt;
-    &lt;/sequential&gt;
-  &lt;/sshsession&gt;
-</pre>
-
-
-<p><strong>Security Note:</strong> Hard coding passwords or
-passphrases and/or usernames in sshsession task can be a serious
-security hole. Consider using variable substitution and include the
-password on the command line. For example:<br>
+&lt;sshsession host=&quot;somehost&quot;
+            username=&quot;dude&quot;
+            password=&quot;yo&quot;&gt;
+  &lt;localtunnel lport=&quot;2401&quot; rhost=&quot;localhost&quot; rport=&quot;2401&quot;/&gt;
+  &lt;sequential&gt;
+    &lt;cvs command=&quot;update ${cvs.parms} ${module}&quot;
+         cvsRoot=&quot;${cvs.root}&quot;
+         dest=&quot;${local.root}&quot;
+         failonerror=&quot;true&quot;/&gt;
+  &lt;/sequential&gt;
+&lt;/sshsession&gt;</pre>
+
+<p><strong>Connect to a remote machine using key authentication, forward port 1080 to port 80 of an
+intranet server which is not directly accessible, then run a <code>get</code> task using that
+tunnel.</strong></p>
 <pre>
-  &lt;sshsession host=&quot;somehost&quot;
-  username=&quot;${username}&quot;
-  password=&quot;${password}&quot;
-  localtunnels=&quot;2401:localhost:2401&quot;&gt;
-    &lt;sequential&gt;
-      &lt;sometask/&gt;
-    &lt;/sequential&gt;
-  &lt;/sshsession&gt;
-</pre>
-
-Invoking ant with the following command line:
+&lt;sshsession host=&quot;somehost&quot;
+            username=&quot;dude&quot;
+            keyfile=&quot;${user.home}/.ssh/id_dsa&quot;
+            passphrase=&quot;yo its a secret&quot;/&gt;
+  &lt;LocalTunnel lport=&quot;1080&quot; rhost=&quot;intranet.mycomp.com&quot; rport=&quot;80&quot;/&gt;
+  &lt;sequential&gt;
+    &lt;get src=&quot;http://localhost:1080/somefile&quot; dest=&quot;temp/somefile&quot;/&gt;
+  &lt;/sequential&gt;
+&lt;/sshsession&gt;</pre>
+
+<p><strong>Security Note</strong>: Hardcoding passwords or passphrases and/or usernames
+in <code>sshsession</code> task can be a serious security hole. Consider using variable substitution
+and include the password on the command line. For example:</p>
 <pre>
-    ant -Dusername=me -Dpassword=mypassword target1 target2
-</pre>
-
-Is slightly better, but the username/password is exposed to all users
-on an Unix system (via the ps command). The best approach is to use
-the
-<code>&lt;input&gt;</code> task and/or retrieve the password from a (secured)
-.properties file.
-</p>
+&lt;sshsession host=&quot;somehost&quot;
+            username=&quot;${username}&quot;
+            password=&quot;${password}&quot;
+            localtunnels=&quot;2401:localhost:2401&quot;&gt;
+  &lt;sequential&gt;
+    &lt;sometask/&gt;
+  &lt;/sequential&gt;
+&lt;/sshsession&gt;</pre>
+
+<p>Invoking Ant with the following command line:</p>
+<pre class="input">ant -Dusername=me -Dpassword=mypassword target1 target2</pre>
+<p>is slightly better, but the username/password is exposed to all users on an Unix system (via
+the <kbd>ps</kbd> command). The best approach is to use the <code>&lt;input&gt;</code> task and/or
+retrieve the password from a (secured) <samp>.properties</samp> file.</p>
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/style.html ant-1.10.3/manual/Tasks/style.html
--- ant-1.9.10/manual/Tasks/style.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/style.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,566 +24,504 @@
 
 <body>
 
-<h2><a name="style">XSLT</a></h2>
-<p><em>The name <code>style</code> is a deprecated name for the same task.</em></p>
+<h2 id="style">XSLT</h2>
+<p><em>The name <code>style</code> is a <u>deprecated</u> name for the same task.</em></p>
 <h3>Description</h3>
 <p>Process a set of documents via XSLT.</p>
-<p>This is useful for building views of XML based documentation,
-or for generating code.</p>
-<p><b>Note:</b> If you are using JDK 1.4 or higher, this task does not require external libraries
-not supplied in the Apache Ant distribution. However, often the built in XSL engine is not as up
-to date as a fresh download, so an update is still highly recommended
-  in particular since the built-in XSLT processors of Java 5 (and to a
-  certain extent Java 6) are known to have serious issues.
-See <a href="../install.html#librarydependencies">Library Dependencies</a> for more information.</p>
-<p>It is possible to refine the set of files that are being processed. This can be
-done with the <i>includes</i>, <i>includesfile</i>, <i>excludes</i>, <i>excludesfile</i> and <i>defaultexcludes</i>
-attributes. With the <i>includes</i> or <i>includesfile</i> attribute you specify the files you want to
-have included by using patterns. The <i>exclude</i> or <i>excludesfile</i> attribute is used to specify
-the files you want to have excluded. This is also done with patterns. And
-finally with the <i>defaultexcludes</i> attribute, you can specify whether you
-want to use default exclusions or not. See the section on <a
-href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
+<p>This is useful for building views of XML based documentation, or for generating code.</p>
+<p><strong>Note</strong>: If you are using JDK 1.4 or higher, this task does not require external
+libraries not supplied in the Apache Ant distribution. However, often the built in XSL engine is not
+as up to date as a fresh download, so an update is still highly recommended in particular since the
+built-in XSLT processors of Java 5 (and to a certain extent Java 6) are known to have serious
+issues.  See <a href="../install.html#librarydependencies">Library Dependencies</a> for more
+information.</p>
+<p>It is possible to refine the set of files that are being processed. This can be done with
+the <var>includes</var>, <var>includesfile</var>, <var>excludes</var>, <var>excludesfile</var>
+and <var>defaultexcludes</var> attributes. With the <var>includes</var> or <var>includesfile</var>
+attribute you specify the files you want to have included by using patterns. The <var>exclude</var>
+or <var>excludesfile</var> attribute is used to specify the files you want to have excluded. This is
+also done with patterns. And finally with the <var>defaultexcludes</var> attribute, you can specify
+whether you want to use default exclusions or not. See the section
+on <a href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
 inclusion/exclusion of files works, and how to write patterns.</p>
 <p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and supports all
-  attributes of <code>&lt;fileset&gt;</code> (<code>dir</code> becomes <code>basedir</code>)
-  as well as the nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code>
-  and <code>&lt;patternset&gt;</code> elements.</p>
-
-<p><b>Note</b>: Unlike other similar tasks, this task treats
-directories that have been matched by the include/exclude patterns of
-the implicit fileset in a special way.  It will apply the stylesheets
-to all files contain in them as well.  Since the default include
-pattern is <code>**</code> this means it will apply the stylesheet to
-all files.  If you specify an excludes pattern, it may still work on
-the files matched by those patterns because the parent directory has
-been matched.  If this behavior is not what you want, set the
-scanincludedirectories attribute to false.</p>
-
-<p>Starting with Ant 1.7 this task supports nested <a
-href="../Types/resources.html#collection">resource collection</a>s
-in addition to (or instead of, depending on the useImplicitFileset
-attribute) the implicit fileset formed by this task.</p>
-
-<p>This task supports the use of a nested <code>&lt;param&gt;</code> element which is used to pass values
-  to an <code>&lt;xsl:param&gt;</code> declaration.</p>
-<p>This task supports the use of a nested <a href="../Types/xmlcatalog.html">xmlcatalog</a>
-element which is used to perform Entity and URI resolution.</p>
-
-<p><b>Note on XSLT extension functions</b>: when using the default
-  TraX implementation of the Java class library and
-  a <code>SecurityManager</code> is active - e.g. when running from
-  within an IDE - XSLT extension functions cannot be used as "secure
-  processing" is active in Java 7 and above. Ant contains a special
-  "hack" that allows XSLT extensions to be used in Java 7 and 8, but
-  this hack fails for Java 9. If you want to use extensions like the
-  redirect extension that are provided by the Java class library
-  itself, you can allow them by enabling the
-  feature <code>http://www.oracle.com/xml/jaxp/properties/enableExtensionFunctions</code>
-  in Java 9 and above. If you need to use an extension function not
-  provided by Java itself you can set the
-  attribute <code>jdk.xml.transform.extensionClassLoader</code> to a
-  classloader (reference to an Ant PATH-like structure).</p>
+attributes of <code>&lt;fileset&gt;</code> (<var>dir</var> becomes <var>basedir</var>) as well
+as the nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code>
+and <code>&lt;patternset&gt;</code> elements.</p>
+
+<p><strong>Note</strong>: Unlike other similar tasks, this task treats directories that have been
+matched by the include/exclude patterns of the implicit fileset in a special way.  It will apply the
+stylesheets to all files contain in them as well.  Since the default <var>includes</var> pattern
+is <code>**</code> this means it will apply the stylesheet to all files.  If you specify
+an <var>excludes</var> pattern, it may still work on the files matched by those patterns because the
+parent directory has been matched.  If this behavior is not what you want, set
+the <var>scanincludedirectories</var> attribute to <q>false</q>.</p>
+
+<p><em>Since Ant 1.7</em>, this task supports
+nested <a href="../Types/resources.html#collection">resource collections</a> in addition to (or
+instead of, depending on the <var>useImplicitFileset</var> attribute) the implicit fileset formed by
+this task.</p>
+
+<p>This task supports the use of a nested <code>&lt;param&gt;</code> element which is used to pass
+values to an <code>&lt;xsl:param&gt;</code> declaration.</p>
+<p>This task supports the use of a nested <a href="../Types/xmlcatalog.html">xmlcatalog</a> element
+which is used to perform Entity and URI resolution.</p>
+
+<p><strong>Note on XSLT extension functions</strong>: when using the default TrAX implementation of
+the Java class library and a <code>SecurityManager</code> is active&mdash;e.g. when running from
+within an IDE&mdash;XSLT extension functions cannot be used as "secure processing" is active in Java
+7 and above. Ant contains a special "hack" that allows XSLT extensions to be used in Java 7 and 8,
+but this hack fails for Java 9. If you want to use extensions like the redirect extension that are
+provided by the Java class library itself, you can allow them by enabling the
+feature <var>http://www.oracle.com/xml/jaxp/properties/enableExtensionFunctions</var> in Java 9 and
+above. If you need to use an extension function not provided by Java itself you can set the
+attribute <var>jdk.xml.transform.extensionClassLoader</var> to a classloader (reference to an Ant
+path-like structure).</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">basedir</td>
-    <td valign="top">where to find the source XML file, default is the
-      project's basedir.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">destdir</td>
-    <td valign="top">directory in which to store the results.</td>
-    <td align="center" valign="top">Yes, unless in and out have been
-      specified.</td>
-  </tr>
-  <tr>
-    <td valign="top">extension</td>
-    <td valign="top">desired file extension to be used for the targets. If not
-      specified, the default is &quot;.html&quot;.  Will be ignored if
-      a nested <code>&lt;mapper&gt;</code> or both <code>in</code> and
-      <code>out</code> have been specified.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">style</td>
-    <td valign="top">name of the stylesheet to use - given either relative
-      to the project's basedir or as an absolute path.<br/>
-      <br/>
-      Alternatively, a nested element which ant can interpret as a resource
-      can be used to indicate where to find the stylesheet<br/>
-      <em>deprecated variation :</em> <br/>
-      If the stylesheet cannot be found, and if you have specified the
-      attribute basedir for the task, ant will assume that the style
-      attribute is relative to the basedir of the task.
-    </td>
-    <td align="center" valign="top">No, if the location of
-        the stylesheet is specified using a nested &lt;style&gt; element</td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">the classpath to use when looking up the XSLT
-      processor.</td>
-    <td align="center" valign="top">No</td>
+    <td>basedir</td>
+    <td>where to find the source XML file.</td>
+    <td>No; defaults to the project's <var>basedir</var></td>
   </tr>
   <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">the classpath to use, given as <a
-      href="../using.html#references">reference</a> to a path defined elsewhere.</td>
-    <td align="center" valign="top">No</td>
+    <td>destdir</td>
+    <td>directory in which to store the results.</td>
+    <td>Yes, unless <var>in</var> and <var>out</var> have been specified.</td>
   </tr>
   <tr>
-    <td valign="top">force</td>
-    <td valign="top">Recreate target files, even if they are newer
-      than their corresponding source files or the stylesheet.</td>
-    <td valign="top" align="center">No; default is false</td>
+    <td>extension</td>
+    <td>desired file extension to be used for the targets.</td>
+    <td>No; default is <q>.html</q>, ignored if a nested <code>&lt;mapper&gt;</code> or
+      both <var>in</var> and <var>out</var> have been specified</td>
   </tr>
   <tr>
-    <td valign="top">processor</td>
-
-    <td valign="top">name of the XSLT processor to use.
-      Permissible value is :<ul>
-      <li>&quot;trax&quot; for a TraX compliant processor (ie JAXP interface
-      implementation such as Xalan 2 or Saxon)</li></ul>
-      Defaults to trax.
-      <br/>
-      Support for xalan1 has been removed in ant 1.7.
-      </td>
-    <td align="center" valign="top">No</td>
+    <td>style</td>
+    <td>name of the stylesheet to use&mdash;given either relative to the
+      project's <var>basedir</var> or as an absolute path.<br/>  Alternatively, a nested element
+      which Ant can interpret as a resource can be used to indicate where to find the
+      stylesheet.<br/><em><u>Deprecated</u> variation</em>:<br/> If the stylesheet cannot be found,
+      and if you have specified the attribute <var>basedir</var> for the task, Ant will assume that
+      the <var>style</var> attribute is relative to the <var>basedir</var> of the task.</td>
+    <td>No, if the location of the stylesheet is specified using a nested <code>&lt;style&gt;</code>
+      element</td>
+  </tr>
+  <tr>
+    <td>classpath</td>
+    <td>the classpath to use when looking up the XSLT processor.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>classpathref</td>
+    <td>the classpath to use, given as <a href="../using.html#references">reference</a> to a path
+      defined elsewhere.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">includes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be included.
-      All files are included when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>force</td>
+    <td>Recreate target files, even if they are newer than their corresponding source files or the
+      stylesheet.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top">the name of a file. Each line of this file is taken to be
-      an include pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>processor</td>
+    <td>name of the XSLT processor to use.  Permissible value is:
+      <ul>
+        <li><q>trax</q> for a TraX compliant processor (ie JAXP interface implementation such as
+          Xalan 2 or Saxon)</li>
+      </ul>
+      Support for Xalan 1 has been removed <em>since Ant 1.7</em>.
+    </td>
+    <td>No; defaults to <q>trax</q></td>
   </tr>
   <tr>
-    <td valign="top">excludes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be excluded.
-      No files (except default excludes) are excluded when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>includes</td>
+    <td>comma- or space-separated list of patterns of files that must be included.</td>
+    <td>No; defaults to all (<q>**</q>)</td>
   </tr>
   <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top">the name of a file. Each line of this file is taken to be
-      an exclude pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>includesfile</td>
+    <td>name of a file. Each line of this file is taken to be an include pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">defaultexcludes</td>
-    <td valign="top">indicates whether default excludes should be used or not
-      (&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>excludes</td>
+    <td>comma- or space-separated list of patterns of files that must be excluded.</td>
+    <td>No; defaults to default excludes or none if <var>defaultexcludes</var> is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">in</td>
-    <td valign="top">specifies a single XML document to be styled. Should be used
-      with the out attribute.</td>
-    <td valign="top" align="center">No</td>
+    <td>excludesfile</td>
+    <td>name of a file. Each line of this file is taken to be an exclude pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">out</td>
-    <td valign="top">specifies the output name for the styled result from the
-      in attribute.</td>
-    <td valign="top" align="center">No</td>
+    <td>defaultexcludes</td>
+    <td>indicates whether default excludes should be used or not (<q>yes|no</q>).</td>
+    <td>No; defaults to <q>yes</q></td>
   </tr>
   <tr>
-    <td valign="top">scanincludeddirectories</td>
-    <td valign="top">If any directories are matched by the
-      includes/excludes patterns, try to transform all files in these
-      directories.  Default is <code>true</code></td>
-    <td valign="top" align="center">No</td>
+    <td>in</td>
+    <td>specifies a single XML document to be styled. Should be used
+      with the <var>out</var> attribute.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">reloadstylesheet</td>
-    <td valign="top">Control whether the stylesheet transformer is created
-    anew for every transform operation. If you set this to true, performance may
-    suffer, but you may work around a bug in certain Xalan-J versions.
-    Default is <code>false</code>.  <em>Since Ant 1.5.2</em>.</td>
-    <td valign="top" align="center">No</td>
+    <td>out</td>
+    <td>specifies the output name for the styled result from the <var>in</var> attribute.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">useImplicitFileset</td>
-    <td valign="top">Whether the implicit fileset formed by this task
-    shall be used.  If you set this to false you must use nested
-    resource collections - or the in attribute, in which case this
-    attribute has no impact anyway.  Default is <code>true</code>.
-    <em>Since Ant 1.7</em>.</td>
-    <td valign="top" align="center">No</td>
+    <td>scanincludeddirectories</td>
+    <td>If any directories are matched by the <var>includes</var>/<var>excludes</var> patterns, try
+      to transform all files in these directories.
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">filenameparameter</td>
-    <td valign="top">Specifies a xsl parameter for accessing the name
-    of the current processed file. If not set, the file name is not
-    passed to the transformation.
-    <em>Since Ant 1.7</em>.</td>
-    <td valign="top" align="center">No</td>
+    <td>reloadstylesheet</td>
+    <td>Control whether the stylesheet transformer is created anew for every transform operation. If
+      you set this to <q>true</q>, performance may suffer, but you may work around a bug in certain
+      Xalan versions.  <em>Since Ant 1.5.2</em>.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">filedirparameter</td>
-    <td valign="top">Specifies a xsl parameter for accessing the directory
-    of the current processed file. For files in the current directory a
-    value of '.' will be passed to the transformation.
-    If not set, the directory is not passed to the transformation. 
-    <em>Since Ant 1.7</em>.</td>
-    <td valign="top" align="center">No</td>
+    <td>useImplicitFileset</td>
+    <td>Whether the implicit fileset formed by this task shall be used.  If you set this
+      to <q>false</q> you must use nested resource collections&mdash;or the <var>in</var> attribute,
+      in which case this attribute has no impact anyway. <em>Since Ant 1.7</em>.</td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">suppressWarnings</td>
-    <td valign="top">Whether processor warnings shall be suppressed.
-    This option requires support by the processor, it is supported by
-    the trax processor bundled with Ant. 
-    <em>Since Ant 1.8.0</em>.</td>
-    <td valign="top" align="center">No, default is false.</td>
+    <td>filenameparameter</td>
+    <td>Specifies an XSL parameter for accessing the name of the current processed file. If not set,
+      the file name is not passed to the transformation.  <em>Since Ant 1.7</em>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">failOnError</td>
-    <td valign="top">Whether the build should fail if any error
-    occurs.  Note that transformation errors can still be suppressed by
-    setting failOnTransformationError to false even if this attribute
-    is true.
-    <em>Since Ant 1.8.0</em>.</td>
-    <td valign="top" align="center">No, default is true.</td>
+    <td>filedirparameter</td>
+    <td>Specifies a XSL parameter for accessing the directory of the current processed file. For
+      files in the current directory, a value of <q>.</q> will be passed to the transformation.  If
+      not set, the directory is not passed to the transformation.  <em>Since Ant 1.7</em>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">failOnTransformationError</td>
-    <td valign="top">Whether the build should fail if an error occurs
-    while transforming the document.  Note that this attribute has no
-    effect of <code>failOnError</code> is false.
-    <em>Since Ant 1.8.0</em>.</td>
-    <td valign="top" align="center">No, default is true.</td>
+    <td>suppressWarnings</td>
+    <td>Whether processor warnings shall be suppressed.  This option requires support by the
+      processor, it is supported by the TrAX processor bundled with Ant.  <em>Since Ant
+      1.8.0</em>.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">failOnNoResources</td>
-    <td valign="top">Whether the build should fail if the nested
-    resource collection is empty.  Note that this attribute has no
-    effect of <code>failOnError</code> is false.
-    <em>Since Ant 1.8.0</em>.</td>
-    <td valign="top" align="center">No, default is true.</td>
+    <td>failOnError</td>
+    <td>Whether the build should fail if any error occurs.  Note that transformation errors can
+      still be suppressed by setting <var>failOnTransformationError</var> to <q>false</q> even if
+      this attribute is <q>true</q>.  <em>Since Ant 1.8.0</em>.</td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+  <tr>
+    <td>failOnTransformationError</td>
+    <td>Whether the build should fail if an error occurs while transforming the document.  Note that
+      this attribute has no effect if <var>failOnError</var> is <q>false</q>.  <em>Since Ant
+      1.8.0</em>.</td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+  <tr>
+    <td>failOnNoResources</td>
+    <td>Whether the build should fail if the nested resource collection is empty.  Note that this
+      attribute has no effect of <var>failOnError</var> is <q>false</q>.  <em>Since Ant
+      1.8.0</em>.</td>
+    <td>No; default is <q>true</q></td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 
-<h4>any <a href="../Types/resources.html#collection">resource
-collection</a></h4>
+<h4>any <a href="../Types/resources.html#collection">resource collection</a></h4>
 
-<p><em>since Ant 1.7</em></p>
+<p><em>Since Ant 1.7</em></p>
 
-<p>Use resource collections to specify resources that the stylesheet
-should be applied to.  Use a nested mapper and the task's destdir
-attribute to specify the output files.</p>
+<p>Use resource collections to specify resources that the stylesheet should be applied to.  Use a
+nested mapper and the task's <q>destdir</q> attribute to specify the output files.</p>
 
-<h4><a name="classpath">classpath</a></h4>
+<h4 id="classpath">classpath</h4>
 <p>The classpath to load the processor from can be specified via a
-nested <code>&lt;classpath&gt;</code>, as well - that is, a
-<a href="../using.html#path">path</a>-like structure.</p>
+nested <code>&lt;classpath&gt;</code>, as well&mdash;that is,
+a <a href="../using.html#path">path-like structure</a>.</p>
 
 <h4>xmlcatalog</h4>
-<p>The <a href="../Types/xmlcatalog.html">xmlcatalog</a>
-element is used to perform Entity and URI resolution.</p>
+<p>The <a href="../Types/xmlcatalog.html">xmlcatalog</a> element is used to perform Entity and URI
+resolution.</p>
 
 <h4>param</h4>
-<p>Param is used to pass a parameter to the XSL stylesheet.</p>
-<blockquote>
-<h4>Parameters</h4>
-<table width="60%" border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">name</td>
-    <td valign="top">Name of the XSL parameter</td>
-    <td align="center" valign="top">Yes</td>
-  </tr>
-  <tr>
-    <td valign="top">expression</td>
-    <td valign="top">
-        The value to be placed into the param or an XPath expression
-        (depending on <code>type</code>).
-    </td>
-    <td align="center" valign="top">Yes</td>
-  </tr>
+<p><code>Param</code> is used to pass a parameter to the XSL stylesheet.</p>
+
+<h5>Parameters</h5>
+<table class="attr">
   <tr>
-    <td valign="top">type</td>
-    <td valign="top">
-        Data type of the parameter. Possible values are:
-        <ul>
-            <li><code>STRING</code></li>
-            <li><code>BOOLEAN</code></li>
-            <li><code>INT</code></li>
-            <li><code>LONG</code></li>
-            <li><code>DOUBLE</code></li>
-            <li><code>XPATH_STRING</code></li>
-            <li><code>XPATH_BOOLEAN</code></li>
-            <li><code>XPATH_NUMBER</code></li>
-            <li><code>XPATH_NODE</code></li>
-            <li><code>XPATH_NODESET</code></li>
-        </ul>
-        <em>since Ant 1.9.3</em>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>name</td>
+    <td>Name of the XSL parameter</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>expression</td>
+    <td>The value to be placed into the param or an XPath expression (depending
+    on <var>type</var>).</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>Data type of the parameter. Possible values are:
+      <ul>
+        <li><q>STRING</q></li>
+        <li><q>BOOLEAN</q></li>
+        <li><q>INT</q></li>
+        <li><q>LONG</q></li>
+        <li><q>DOUBLE</q></li>
+        <li><q>XPATH_STRING</q></li>
+        <li><q>XPATH_BOOLEAN</q></li>
+        <li><q>XPATH_NUMBER</q></li>
+        <li><q>XPATH_NODE</q></li>
+        <li><q>XPATH_NODESET</q></li>
+      </ul><em>since Ant 1.9.3</em>
     </td>
-    <td align="center" valign="top">No; default is <code>STRING</code></td>
+    <td>No; default is <q>STRING</q></td>
   </tr>
   <tr>
-    <td valign="top">if</td>
-    <td valign="top">The param will only be passed <a href="../properties.html#if+unless">if this property is set</a>.</td>
-    <td align="center" valign="top">No</td>
+    <td>if</td>
+    <td>The param will only be passed <a href="../properties.html#if+unless">if this property is
+      set</a>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">unless</td>
-    <td valign="top">The param will not be passed <a href="../properties.html#if+unless">if this property is set</a>.</td>
-    <td align="center" valign="top">No</td>
+    <td>unless</td>
+    <td>The param will not be passed <a href="../properties.html#if+unless">if this property is
+      set</a>.</td>
+    <td>No</td>
   </tr>
-
 </table>
-</blockquote>
-
-  <p>      
-      The <code>XPATH_*</code> types says that the <code>expression</code> is not just a primitive-type value but an XPath expression.
-      This expression will be evaluated on an empty XML document and the result will be passed to the XSLT transformer as a parameter of given type.
-      In these expressions the declared Ant properties can be used as XPath variables e.g. <code>$someProperty</code>.
-      So you can compute something using standard XPath functions and operators.
-  </p>
-  <p>
-      If you write <code>${someProperty}</code> instead of <code>$someProperty</code>,
-      the value will be simply substituted by Ant before evaluating the XPath expression
-      (this substitution works also for primitive types).
-  </p>
-
-<h4>outputproperty ('trax' processors only)</h4>
-<p>Used to specify how you wish the result tree to be output
-as specified in the <a href="http://www.w3.org/TR/xslt#output">
-XSLT specifications</a>.
-<blockquote>
-<h4>Parameters</h4>
-<table width="60%" border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">name</td>
-    <td valign="top">Name of the property</td>
-    <td align="center" valign="top">Yes</td>
-  </tr>
-  <tr>
-    <td valign="top">value</td>
-    <td valign="top">value of the property.</td>
-    <td align="center" valign="top">Yes</td>
+<p>The <q>XPATH_*</q> types says that the <var>expression</var> is not just a primitive-type value
+but an XPath expression.  This expression will be evaluated on an empty XML document and the result
+will be passed to the XSLT transformer as a parameter of given type.  In these expressions the
+declared Ant properties can be used as XPath variables e.g. <code>$someProperty</code>.  So you can
+compute something using standard XPath functions and operators.</p>
+<p>If you write <code>${someProperty}</code> instead of <code>$someProperty</code>, the value will
+be simply substituted by Ant before evaluating the XPath expression (this substitution works also
+for primitive types).</p>
+
+<h4>outputproperty (<var>trax</var> processors only)</h4>
+<p>Used to specify how you wish the result tree to be output as specified in
+the <a href="https://www.w3.org/TR/xslt#output" target="_top">XSLT specifications</a>.
+
+<h5>Parameters</h5>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>name</td>
+    <td>Name of the property</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>value</td>
+    <td>Value of the property</td>
+    <td>Yes</td>
   </tr>
 </table>
-</blockquote>
 
-<h4><a name="factory">factory ('trax' processors only)</a></h4>
-Used to specify factory settings.
-<blockquote>
-<h4>Parameters</h4>
-<table width="60%" border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">name</td>
-    <td valign="top">fully qualified classname of the
-    transformer factory to use. For example
-      <tt>org.apache.xalan.processor.TransformerFactoryImpl</tt>
-       or <tt>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</tt>
-       or <tt>net.sf.saxon.TransformerFactoryImpl</tt>...
-    </td>
-    <td align="center" valign="top">No. Defaults to the JAXP lookup mechanism.</td>
+<h4 id="factory">factory (<var>trax</var> processors only)</h4>
+<p><em>Since Ant 1.9.8</em></p>
+<p>Used to specify factory settings.</p>
+
+<h5>Parameters</h5>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>name</td>
+    <td>fully qualified classname of the transformer factory to use. For
+       example <code>org.apache.xalan.processor.TransformerFactoryImpl</code>
+       or <code>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</code>
+       or <code>net.sf.saxon.TransformerFactoryImpl</code>...</td>
+    <td>No; defaults to the JAXP lookup mechanism</td>
   </tr>
 </table>
-<h3>Parameters specified as nested elements</h3>
-<h4>attribute</h4>
-<p>Used to specify settings of the processor factory.
-The attribute names and values are entirely processor specific
-so you must be aware of the implementation to figure them out.
-Read the documentation of your processor.
-For example, in Xalan 2.x:
+<h5>Parameters specified as nested elements</h5>
+<h6>attribute</h6>
+<p>Used to specify settings of the processor factory.  The attribute names and values are entirely
+processor specific so you must be aware of the implementation to figure them out.  Read the
+documentation of your processor.  For example, in Xalan 2.x:</p>
 <ul>
-<li>http://xml.apache.org/xalan/features/optimize (boolean)</li>
-<li>http://xml.apache.org/xalan/features/incremental (boolean)</li>
-<li>...</li>
+  <li><var>http://xml.apache.org/xalan/features/optimize</var> (boolean)</li>
+  <li><var>http://xml.apache.org/xalan/features/incremental</var> (boolean)</li>
+  <li>...</li>
 </ul>
-And in Saxon 7.x:
+<p>And in Saxon 7.x:</p>
 <ul>
-<li>http://saxon.sf.net/feature/allow-external-functions (boolean)</li>
-<li>http://saxon.sf.net/feature/timing (boolean)</li>
-<li>http://saxon.sf.net/feature/traceListener (string)</li>
-<li>http://saxon.sf.net/feature/treeModel (integer)</li>
-<li>http://saxon.sf.net/feature/linenumbering (integer)</li>
-<li>...</li>
+  <li><var>http://saxon.sf.net/feature/allow-external-functions</var> (boolean)</li>
+  <li><var>http://saxon.sf.net/feature/timing</var> (boolean)</li>
+  <li><var>http://saxon.sf.net/feature/traceListener</var> (string)</li>
+  <li><var>http://saxon.sf.net/feature/treeModel</var> (integer)</li>
+  <li><var>http://saxon.sf.net/feature/linenumbering</var> (integer)</li>
+  <li>...</li>
 </ul>
 <blockquote>
-<h4>Parameters</h4>
-<table width="60%" border="1" cellpadding="2" cellspacing="0">
+<h6>Parameters</h6>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">Name of the attribute</td>
-    <td align="center" valign="top">Yes</td>
+    <td>name</td>
+    <td>Name of the attribute</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">value of the attribute.</td>
-    <td align="center" valign="middle" rowspan="3">Exactly one of these</td>
+    <td>value</td>
+    <td>Value of the attribute.</td>
+    <td rowspan="3">Exactly one of these</td>
   </tr>
   <tr>
-    <td valign="top">valueref</td>
-    <td valign="top">value of the attribute is the value of the
-      project reference with the given id. <em>since Ant 1.9.8</em></td>
+    <td>valueref</td>
+    <td class="left">Value of the attribute is the value of the project reference with the given
+      id. <em>since Ant 1.9.8</em></td>
   </tr>
   <tr>
-    <td valign="top">classloaderforpath</td>
-    <td valign="top">value of the attribute is a classloader that uses
-      the classpath specified by a path that is the project reference
-      with the given id. <em>since Ant 1.9.8</em></td>
+    <td>classloaderforpath</td>
+    <td class="left">Value of the attribute is a classloader that uses the classpath specified by a
+      path that is the project reference with the given <var>id</var>. <em>since Ant 1.9.8</em></td>
   </tr>
 </table>
+</blockquote>
 
-<h4>Examples</h4>
+<h5>Examples</h5>
 
 <pre>
-  &lt;path id="extension-path"&gt;
-    ...
-  &lt;/path&gt;
+&lt;path id="extension-path"&gt;
+  ...
+&lt;/path&gt;
 
+&lt;xslt ...&gt;
+  &lt;factory&gt;
+    &lt;attribute name="jdk.xml.transform.extensionClassLoader"
+               classloaderforpath="extension-path"/&gt;
+  &lt;/factory&gt;
+&lt;/xslt ...&gt;</pre>
 
-  &lt;xslt ...&gt;
-    &lt;factory&gt;
-      &lt;attribute name="jdk.xml.transform.extensionClassLoader"
-                 classloaderforpath="extension-path"/&gt;
-    &lt;/factory&gt;
-  &lt;/xslt ...&gt;
-</pre>
-<p>Sets the classloader to use when loading extension functions to a
-  classloader using the <code>path</code> with the
-  id <code>extension-path</code>.
-</blockquote>
-<h4>feature</h4>
-<p><em>since Ant 1.9.8</em></p>
-<p>Used to specify settings of the processor factory.  The feature
-names are mostly processor specific so you must be aware of the
-implementation to figure them out.  Read the documentation of your
-processor. The only feature all implementations are required to
-support
-is <code>http://javax.xml.XMLConstants/feature/secure-processing</code>.
+<p>Sets the classloader to use when loading extension functions to a classloader using
+the <code>path</code> with the id <code>extension-path</code>.</p>
+
+<h6>feature</h6>
+<p>Used to specify settings of the processor factory.  The feature names are mostly processor
+specific so you must be aware of the implementation to figure them out.  Read the documentation of
+your processor. The only feature all implementations are required to support
+is <var>http://javax.xml.XMLConstants/feature/secure-processing</var>.
 <blockquote>
-<h4>Parameters</h4>
-<table width="60%" border="1" cellpadding="2" cellspacing="0">
+<h6>Parameters</h6>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">Name of the feature</td>
-    <td align="center" valign="top">Yes</td>
+    <td>name</td>
+    <td>Name of the feature</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">value of the feature. A boolean value
-    (i.e. permitted values are true,false,yes,no,on,off).</td>
-    <td align="center" valign="top">No, defaults to false</td>
+    <td>value</td>
+    <td>Value of the feature. A boolean value (i.e. permitted values
+      are <q>true</q>, <q>false</q>, <q>yes</q>, <q>no</q>, <q>on</q>, <q>off</q>).</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
 </table>
 </blockquote>
-</blockquote>
+
 <h4>mapper</h4>
 
-<p><em>since Ant 1.6.2</em></p>
+<p><em>Since Ant 1.6.2</em></p>
 
-<p>You can define filename transformations by using a nested <a
-href="../Types/mapper.html">mapper</a> element. The default mapper
-used by <code>&lt;xslt&gt;</code> removes the file extension from the
-source file and adds the extension specified via the extension
-attribute.</p>
+<p>You can define filename transformations by using a
+nested <a href="../Types/mapper.html">mapper</a> element. The default mapper used
+by <code>&lt;xslt&gt;</code> removes the file extension from the source file and adds the extension
+specified via the extension attribute.</p>
 
 <h4>style</h4>
 
 <p><em>Since Ant 1.7</em></p>
 
-<p>The nested style element can be used to specify your stylesheet in terms
-of Ant's <a href="../Types/resources.html">resource</a> types.  With
-this element, the stylesheet should be specified as a nested resource or
-single-element collection.  Alternatively, use the <code>refid</code> to
-specify the resource or collection as a reference.</p>
+<p>The nested <code>style</code> element can be used to specify your stylesheet in terms of
+Ant's <a href="../Types/resources.html">resource</a> types.  With this element, the stylesheet
+should be specified as a nested resource or single-element collection.  Alternatively, use
+the <var>refid</var> to specify the resource or collection as a reference.</p>
 
 <h4>sysproperty</h4>
-<p>Use nested <code>&lt;sysproperty&gt;</code> elements to specify
-system properties required by the factory or transformation.  These
-properties will be made available to the VM during the execution of
-the class. The attributes for this element are the same as
-for <a href="exec.html#env">environment variables</a>.</p>
 
-<p><em>since Ant 1.8.0</em>.</p>
+<p><em>Since Ant 1.8.0</em>.</p>
+<p>Use nested <code>&lt;sysproperty&gt;</code> elements to specify system properties required by the
+factory or transformation.  These properties will be made available to JVM during the execution of
+the class. The attributes for this element are the same as for <a href="exec.html#env">environment
+variables</a>.</p>
 
 <h4>syspropertyset</h4>
 
+<p><em>Since Ant 1.8.0</em>.</p>
+
 <p>You can specify a set of properties to be used as system properties
 with <a href="../Types/propertyset.html">syspropertyset</a>s.</p>
 
-<p><em>since Ant 1.8.0</em>.</p>
-
 <h3>Examples</h3>
-<blockquote>
-  <pre>
+<pre>
 &lt;xslt basedir=&quot;doc&quot; destdir=&quot;build/doc&quot;
        extension=&quot;.html&quot; style=&quot;style/apache.xsl&quot;/&gt;</pre>
-  <h4>Using an xmlcatalog</h4>
-  <pre>
+<h4>Using an xmlcatalog</h4>
+<pre>
 &lt;xslt basedir=&quot;doc&quot; destdir=&quot;build/doc&quot;
       extension=&quot;.html&quot; style=&quot;style/apache.xsl&quot;&gt;
   &lt;xmlcatalog refid=&quot;mycatalog&quot;/&gt;
 &lt;/xslt&gt;
 
 &lt;xslt basedir=&quot;doc&quot; destdir=&quot;build/doc&quot;
-   extension=&quot;.html&quot; style=&quot;style/apache.xsl&quot;&gt;
+      extension=&quot;.html&quot; style=&quot;style/apache.xsl&quot;&gt;
    &lt;xmlcatalog&gt;
        &lt;dtd
          publicId=&quot;-//ArielPartners//DTD XML Article V1.0//EN&quot;
          location=&quot;com/arielpartners/knowledgebase/dtd/article.dtd&quot;/&gt;
    &lt;/xmlcatalog&gt;
-&lt;/xslt&gt;
-</pre>
-  <h4>Using XSL parameters</h4>
-  <p>Simple String parameter:</p>
+&lt;/xslt&gt;</pre>
+<h4>Using XSL parameters</h4>
+<p>Simple String parameter:</p>
 <pre>
 &lt;xslt basedir=&quot;doc&quot; destdir=&quot;build/doc&quot;
       extension=&quot;.html&quot; style=&quot;style/apache.xsl&quot;&gt;
   &lt;param name=&quot;date&quot; expression=&quot;07-01-2000&quot;/&gt;
 &lt;/xslt&gt;</pre>
 
-  <p>Then if you declare a global parameter &quot;date&quot; with the top-level
-  element &lt;xsl:param name=&quot;date&quot;/&gt;, the variable
-  <code>$date</code> will subsequently have the value 07-01-2000.
-  </p>
-  
-  <p>Various data types and XPath expressions:</p>
-  
-  <pre>&lt;property name="antProperty1" value="ANT_PROPERTY_1"/&gt;
+<p>Then if you declare a global parameter <q>date</q> with the top-level element <code>&lt;xsl:param
+name=&quot;date&quot;/&gt;</code>, the variable <code>$date</code> will subsequently have the value
+07-01-2000.</p>
+
+<p>Various data types and XPath expressions:</p>
+
+<pre>
+&lt;property name="antProperty1" value="ANT_PROPERTY_1"/&gt;
 &lt;property name="antProperty2" value="ANT_PROPERTY_2"/&gt;
 &lt;property name="antProperty3" value="3"/&gt;
 &lt;property name="antProperty4" value="substring-before"/&gt;
@@ -594,43 +532,43 @@
 --&gt;
 
 &lt;xslt in="in.xml" out="out.xml" style="template.xsl"&gt;
-  
+
   &lt;!-- Simple String parameter: --&gt;
   &lt;param name="p0" expression="some nice string" type="STRING"/&gt;
-  
+
   &lt;!-- A value substituted by Ant --&gt;
   &lt;param name="p1" expression="some string with ${antProperty1} constructed by Ant" type="STRING"/&gt;
-  
+
   &lt;!-- XPath resulting in: and this is done in XPath: ANT_PROPERTY_2 --&gt;
   &lt;param name="p2" expression="concat('and this is done in XPath: ', $antProperty2)" type="XPATH_STRING"/&gt;
-  
+
   &lt;!-- Some XPath math, result: 42 --&gt;
   &lt;param name="p3" expression="64 * 64 div 128 + 10" type="XPATH_NUMBER"/&gt;
-  
+
   &lt;!-- Some numeric parameter: --&gt;
   &lt;param name="p4" expression="123.45" type="DOUBLE"/&gt;
-  
+
   &lt;!-- XPath expression, result: true boolean --&gt;
   &lt;param name="p5" expression="$antProperty1 = 'ANT_PROPERTY_1'" type="XPATH_BOOLEAN"/&gt;
-  
+
   &lt;!-- First one is an XPath variable, second one is a text substituted by Ant, result: true boolean --&gt;
   &lt;param name="p6" expression="$antProperty2 = '${antProperty2}'" type="XPATH_BOOLEAN"/&gt;
-  
+
   &lt;!-- Some XPath math with a variable, result: 64 --&gt;
   &lt;param name="p7" expression="$antProperty3 * 4 * 5 + 4" type="XPATH_NUMBER"/&gt;
-  
-  &lt;!-- 
+
+  &lt;!--
     XPath expression with substituted function name and a variable:
     substring-before($antProperty2, '_')
     result: ANT
   --&gt;
   &lt;param name="p8" expression="${antProperty4}($antProperty2, '_')" type="XPATH_STRING"/&gt;
-  
+
   &lt;!-- Without type attribute: --&gt;
   &lt;param name="p9" expression="default type is String"/&gt;
 &lt;/xslt&gt;</pre>
 
-  <h4>Using output properties</h4>
+<h4>Using output properties</h4>
 <pre>
 &lt;xslt in=&quot;doc.xml&quot; out=&quot;build/doc/output.xml&quot;
       style=&quot;style/apache.xsl&quot;&gt;
@@ -638,10 +576,9 @@
   &lt;outputproperty name=&quot;standalone&quot; value=&quot;yes&quot;/&gt;
   &lt;outputproperty name=&quot;encoding&quot; value=&quot;iso8859_1&quot;/&gt;
   &lt;outputproperty name=&quot;indent&quot; value=&quot;yes&quot;/&gt;
-&lt;/xslt&gt;
-</pre>
+&lt;/xslt&gt;</pre>
 
-  <h4>Using factory settings</h4>
+<h4>Using factory settings</h4>
 <pre>
 &lt;xslt in=&quot;doc.xml&quot; out=&quot;build/doc/output.xml&quot;
       style=&quot;style/apache.xsl&quot;&gt;
@@ -650,15 +587,15 @@
   &lt;/factory&gt;
 &lt;/xslt&gt;</pre>
 
-  <h4>Using a mapper</h4>
+<h4>Using a mapper</h4>
 <pre>
 &lt;xslt basedir=&quot;in&quot; destdir=&quot;out&quot;
       style=&quot;style/apache.xsl&quot;&gt;
   &lt;mapper type=&quot;glob&quot; from=&quot;*.xml.en&quot; to=&quot;*.html.en&quot;/&gt;
 &lt;/xslt&gt;</pre>
 
-  <h4>Using a nested resource to define the stylesheet</h4>
-    <pre>
+<h4>Using a nested resource to define the stylesheet</h4>
+<pre>
 &lt;xslt in="data.xml" out="${out.dir}/out.xml"&gt;
     &lt;style&gt;
         &lt;url url="${printParams.xsl.url}"/&gt;
@@ -666,25 +603,24 @@
     &lt;param name="set" expression="value"/&gt;
 &lt;/xslt&gt;</pre>
 
-  <h4>Print the current processed file name</h4>
+<h4>Print the current processed file name</h4>
 <pre>
 &lt;project&gt;
   &lt;xslt style=&quot;printFilename.xsl&quot; destdir=&quot;out&quot; basedir=&quot;in&quot; extension=&quot;.txt&quot;
         filenameparameter=&quot;filename&quot;
-        filedirparameter=&quot;filedir&quot;
-  /&gt;
+        filedirparameter=&quot;filedir&quot;/&gt;
 &lt;/project&gt;
 
 &lt;xsl:stylesheet
-  version=&quot;1.0&quot;
-  xmlns:xsl=&quot;http://www.w3.org/1999/XSL/Transform&quot;&gt;
+     version=&quot;1.0&quot;
+     xmlns:xsl=&quot;http://www.w3.org/1999/XSL/Transform&quot;&gt;
 
-    &lt;xsl:param name=&quot;filename&quot;&gt;&lt;/xsl:param&gt;
-    &lt;xsl:param name=&quot;filedir&quot;&gt;.&lt;/xsl:param&gt;
+  &lt;xsl:param name=&quot;filename&quot;&gt;&lt;/xsl:param&gt;
+  &lt;xsl:param name=&quot;filedir&quot;&gt;.&lt;/xsl:param&gt;
 
-&lt;xsl:template match=&quot;/&quot;&gt;
-  Current file is &lt;xsl:value-of select=&quot;$filename&quot;/&gt; in directory &lt;xsl:value-of select=&quot;$filedir&quot;/&gt;.
-&lt;/xsl:template&gt;
+  &lt;xsl:template match=&quot;/&quot;&gt;
+    Current file is &lt;xsl:value-of select=&quot;$filename&quot;/&gt; in directory &lt;xsl:value-of select=&quot;$filedir&quot;/&gt;.
+  &lt;/xsl:template&gt;
 
 &lt;/xsl:stylesheet&gt;
 </pre>
@@ -694,12 +630,9 @@
 <pre>
 &lt;xslt ...&gt;
     &lt;sysproperty key="org.apache.xerces.xni.parser.XMLParserConfiguration"
-                 value="org.apache.xerces.parsers.XIncludeParserConfiguration"
-     /&gt;
+                 value="org.apache.xerces.parsers.XIncludeParserConfiguration"/&gt;
 &lt;xslt&gt;
 </pre>
-</blockquote>
-
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/subant.html ant-1.10.3/manual/Tasks/subant.html
--- ant-1.9.10/manual/Tasks/subant.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/subant.html	2018-03-24 12:37:12.000000000 +0000
@@ -18,591 +18,246 @@
 <html>
 <head>
   <meta http-equiv="Content-Language" content="en-us">
+  <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
   <title>Subant Task</title>
 </head>
 
-<body bgcolor="#ffffff" text="#000000" link="#525D76"
-      alink="#525D76" vlink="#525D76">
-
-<table border="0" width="100%" cellspacing="4">
+<body>
+<h2>Subant Task</h2>
+<p><em>Since Apache Ant 1.6</em></p>
+<h3 id="description">Description</h3>
+<p>Calls a given target for all defined sub-builds.  This is an extension of Ant for bulk project
+execution.  <strong>This task must not be used outside of a <code>target</code> if it invokes the
+same build file it is part of.</strong></p>
+
+<p><code>subant</code> uses <code>ant</code> internally so many things said
+in <a href="ant.html"><code>ant</code>'s manual page</a> apply here as well.</p>
+
+<h3 id="Use with directories">Use with directories</h3>
+<p><code>subant</code> can be used with directory sets to execute a build from different
+directories.  2 different options are offered:</p>
+<ul>
+  <li>to run the same build file <samp>/somepath/otherpath/mybuild.xml</samp> with different base
+    directories, use the <var>genericantfile</var> attribute</li>
+  <li>if you want to
+    run <samp>directory1/mybuild.xml</samp>, <samp>directory2/mybuild.xml</samp>, <samp>...</samp>,
+    use the <var>antfile</var> attribute. The <code>subant</code> task does not set the base
+    directory for you in this case, because you can specify it in each build file.</li>
+</ul>
 
-  <!-- PAGE HEADER -->
+<h3 id="attributes">Parameters</h3>
+<table class="attr">
   <tr>
-    <td>
-      <table border="0" width="100%"><tr>
-          <td valign="bottom">
-            <font size="+3" face="arial,helvetica,sanserif"><strong>Subant Task</strong></font>
-            <br><font face="arial,helvetica,sanserif">Calls a given target for all defined sub-builds.</font>
-          </td>
-          <td>
-            <!-- PROJECT LOGO -->
-            <a href="http://ant.apache.org/">
-              <img src="../images/ant_logo_large.gif" align="right" alt="Apache Ant" border="0">
-            </a>
-          </td>
-      </tr></table>
-    </td>
-  </tr>
-
-  <!-- START RIGHT SIDE MAIN BODY -->
-  <tr>
-    <td  valign="top" align="left">
-
-          <!-- Applying task/description -->
-    <!-- Start Description -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-
-      <tr><td bgcolor="#525D76">
-        <font color="#ffffff" face="arial,helvetica.sanserif">
-          <a name="description">
-          <strong>Description</strong></a></font>
-      </td></tr>
-
-      <tr><td><blockquote>
-<p>
-            Calls a given target for all defined sub-builds.
-            This is an extension
-            of ant for bulk project execution.
-
-            <strong>This task must not be used outside of a
-                <code>target</code> if it invokes the same build file it is
-                part of.</strong>
-        </p>
-        <p><em>Since Apache Ant 1.6</em></p>
-
-<p><code>subant</code> uses <code>ant</code> internally so many things
-  said in <a href="ant.html"><code>ant</code>'s manual page</a> apply
-  here as well.</p>
-
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <!-- Subsection heading -->
-      <tr><td bgcolor="#828DA6">
-          <font color="#ffffff" face="arial,helvetica.sanserif">
-                              <a name="Use with directories">
-          <strong>Use with directories</strong></a></font>
-      </td></tr>
-      <!-- Subsection body -->
-      <tr><td>
-        <p>
-                subant can be used with directory sets to execute a build from different directories.
-                2 different options are offered :
-            </p>
-<ul>
-                <li>
-                    to run the same build file <code>/somepath/otherpath/mybuild.xml</code>
-                    with different base directories, use the genericantfile attribute
-                </li>
-                <li>if you want to run <code>directory1/mybuild.xml</code>, <code>directory2/mybuild.xml</code>, <code>....</code>,
-                    use the antfile attribute. The subant task does not set the base directory for you in this case, because you can specify it in each build file.
-                </li>
-            </ul>
-
-      </td></tr>
-    </table>
-
-      </blockquote></td></tr>
-
-    </table>
-    <!-- End Description -->
-
- <!-- Ignore -->
-
-
-
-    <!-- Start Attributes -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-      <tr><td bgcolor="#525D76">
-        <font color="#ffffff" face="arial,helvetica.sanserif">
-          <a name="attributes">
-          <strong>Parameters</strong></a></font>
-      </td></tr>
-      <tr><td><blockquote>
-        <table>
-          <tr>
-        <td bgcolor="#cccccc" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Attribute</b></font>
-        </td>
-        <td bgcolor="#cccccc" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Description</b></font>
-        </td>
-        <td bgcolor="#cccccc" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Type</b></font>
-        </td>
-        <td bgcolor="#cccccc" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Requirement</b></font>
-        </td>
-          </tr>
-    <!-- Attribute Group -->
-
-    <!-- Attribute Group -->
-        <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">antfile</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Build file name, to use in conjunction with directories.<br> Defaults to "build.xml".<br> If <code>genericantfile</code> is set, this attribute is ignored.</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">String</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left" rowspan="10">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Optional</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">buildpath</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Set the buildpath to be used to find sub-projects.</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Path</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">buildpathref</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Buildpath to use, by reference.</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Reference</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">failonerror</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Sets whether to fail with a build exception on error, or go on.</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">boolean</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">genericantfile</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Build file path, to use in conjunction with directories.<br> Use <code>genericantfile</code>, in order to run the same build file with different basedirs.<br> If this attribute is set, <code>antfile</code> is ignored.</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">File</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">inheritall</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1"
-                        face="arial,helvetica,sanserif">Corresponds to
-                        <code>&lt;ant&gt;</code>'s
-                        <code>inheritall</code> attribute but defaults
-                        to false in this task..</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">boolean</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">inheritrefs</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Corresponds to <code>&lt;ant&gt;</code>'s <code>inheritrefs</code> attribute.</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">boolean</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">output</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Corresponds to <code>&lt;ant&gt;</code>'s <code>output</code> attribute.</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">String</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">target</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif"></font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">String</font>
-        </td>
-    </tr>
-
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">verbose</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-            Enable/ disable log messages showing when each sub-build path is entered/ exited.
-            The default value is false.</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">boolean</font>
-        </td>
-    </tr>
-
-
-        </table>
-      </blockquote></td></tr>
-
-    </table>
-    <!-- End Attributes -->
-
-    <!-- Start Elements -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-
-      <tr><td bgcolor="#525D76">
-        <font color="#ffffff" face="arial,helvetica.sanserif">
-          <a name="elements">
-          <strong>Parameters as nested elements</strong></a></font>
-      </td></tr>
-
-      <tr><td><blockquote>
-    <!-- Start Element -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-      <tr><td bgcolor="#828DA6">
-        <font color="#ffffff" face="arial,helvetica.sanserif" size="-1">
-          <strong>any filesystem based <a href="../Types/resources.html#collection">resource collection</a></strong></font>
-      </td></tr>
-      <tr><td><blockquote>
-        This includes <code>&lt;fileset&gt;</code>,
-        <code>&lt;dirset&gt;</code> and <code>&lt;filelist&gt;</code>
-        which are the nested resource collections supported prior
-        to Ant 1.7.
- <!-- Ignore -->
- <!-- Ignore -->
-
-      </blockquote></td></tr>
-    </table>
-    <!-- End Element -->
-    <!-- Start Element -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-      <tr><td bgcolor="#828DA6">
-        <font color="#ffffff" face="arial,helvetica.sanserif" size="-1">
-          <strong>dirset</strong> (org.apache.tools.ant.types.DirSet)</font>
-      </td></tr>
-      <tr><td><blockquote>
-        Adds a directory set to the implicit build path. <p> <em>Note that the directories will be added to the build path in no particular order, so if order is significant, one should use a file list instead!</em>
- <!-- Ignore -->
- <!-- Ignore -->
-
-      </blockquote></td></tr>
-    </table>
-    <!-- End Element -->
-    <!-- Start Element -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-      <tr><td bgcolor="#828DA6">
-        <font color="#ffffff" face="arial,helvetica.sanserif" size="-1">
-          <strong>filelist</strong> (org.apache.tools.ant.types.FileList)</font>
-      </td></tr>
-      <tr><td><blockquote>
-        Adds an ordered file list to the implicit build path. <p> <em>Note that contrary to file and directory sets, file lists can reference non-existent files or directories!</em>
- <!-- Ignore -->
- <!-- Ignore -->
-
-      </blockquote></td></tr>
-    </table>
-    <!-- End Element -->
-    <!-- Start Element -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-      <tr><td bgcolor="#828DA6">
-        <font color="#ffffff" face="arial,helvetica.sanserif" size="-1">
-          <strong>fileset</strong> (org.apache.tools.ant.types.FileSet)</font>
-      </td></tr>
-      <tr><td><blockquote>
-        Adds a file set to the implicit build path. <p> <em>Note that the directories will be added to the build path in no particular order, so if order is significant, one should use a file list instead!</em>
- <!-- Ignore -->
- <!-- Ignore -->
-
-      </blockquote></td></tr>
-    </table>
-    <!-- End Element -->
-    <!-- Start Element -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-      <tr><td bgcolor="#828DA6">
-        <font color="#ffffff" face="arial,helvetica.sanserif" size="-1">
-          <strong>property</strong> (org.apache.tools.ant.taskdefs.Property)</font>
-      </td></tr>
-      <tr><td><blockquote>
-        Corresponds to <code>&lt;ant&gt;</code>'s nested <code>&lt;property&gt;</code> element.
-
-<p>When more than one nested <code>&lt;property&gt;</code> element
-  would set a property of the same name, the one declared last will
-  win.  This is for backwards compatibility reasons even so it is
-  different from the way <code>&lt;property&gt;</code> tasks in build
-  files behave.</p>
-
- <!-- Ignore -->
- <!-- Ignore -->
-
-      </blockquote></td></tr>
-    </table>
-    <!-- End Element -->
-    <!-- Start Element -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-      <tr><td bgcolor="#828DA6">
-        <font color="#ffffff" face="arial,helvetica.sanserif" size="-1">
-          <strong>propertyset</strong> (org.apache.tools.ant.types.PropertySet)</font>
-      </td></tr>
-      <tr><td><blockquote>
-        Corresponds to <code>&lt;ant&gt;</code>'s nested <code>&lt;propertyset&gt;</code> element.
- <!-- Ignore -->
- <!-- Ignore -->
-
-      </blockquote></td></tr>
-    </table>
-    <!-- End Element -->
-    <!-- Start Element -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-      <tr><td bgcolor="#828DA6">
-        <font color="#ffffff" face="arial,helvetica.sanserif" size="-1">
-          <strong>buildpath</strong> (org.apache.tools.ant.types.Path)</font>
-      </td></tr>
-      <tr><td><blockquote>
-        Creates a nested build path, and add it to the implicit build path.
- <!-- Ignore -->
- <!-- Ignore -->
-
-      </blockquote></td></tr>
-    </table>
-    <!-- End Element -->
-    <!-- Start Element -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-      <tr><td bgcolor="#828DA6">
-        <font color="#ffffff" face="arial,helvetica.sanserif" size="-1">
-          <strong>buildpathelement</strong> (org.apache.tools.ant.types.Path.PathElement)</font>
-      </td></tr>
-      <tr><td><blockquote>
-        Creates a nested <code>&lt;buildpathelement&gt;</code>, and add it to the implicit build path.
- <!-- Ignore -->
- <!-- Ignore -->
-
-      </blockquote></td></tr>
-    </table>
-    <!-- End Element -->
-
-
-
-
-<!-- manually written -->
-    <!-- Start Element -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-      <tr><td bgcolor="#828DA6">
-        <font color="#ffffff" face="arial,helvetica.sanserif" size="-1">
-          <strong>target</strong> (org.apache.tools.ant.taskdefs.Ant.TargetElement)</font>
-      </td></tr>
-      <tr><td><blockquote>
-        You can specify multiple targets using nested <code>&lt;target&gt;</code> elements
-        instead of using the target attribute.  These will be executed as if
-        Ant had been invoked with a single target whose dependencies are the
-        targets so specified, in the order specified.
- <!-- Ignore -->
- <!-- Ignore -->
-      <table border="1" cellpadding="2" cellspacing="0">
-        <tr>
-          <td valign="top"><b>Attribute</b></td>
-          <td valign="top"><b>Description</b></td>
-          <td align="center" valign="top"><b>Required</b></td>
-        </tr>
-        <tr>
-          <td valign="top">name</td>
-          <td valign="top">The name of the called target.</td>
-          <td valign="top" align="center">Yes</td>
-        </tr>
-      </table>
-      <p><em>since Ant 1.7</em>.</p>
-      </blockquote></td></tr>
-    </table>
-    <!-- End Element -->
-<!-- manually written end -->
-
-      </blockquote></td></tr>
-
-    </table>
-    <!-- End Elements -->
-
-
-
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-
-      <tr><td bgcolor="#525D76">
-          <font color="#ffffff" face="arial,helvetica.sanserif">
-                              <a name="examples">
-          <strong>Examples</strong></a></font>
-      </td></tr>
-
-      <tr><td><blockquote style="">
-        <pre>
-        &lt;project name="subant" default="subant1"&gt;
-            &lt;property name="build.dir" value="subant.build"/&gt;
-            &lt;target name="subant1"&gt;
-                &lt;subant target=""&gt;
-                    &lt;property name="build.dir" value="subant1.build"/&gt;
-                    &lt;property name="not.overloaded" value="not.overloaded"/&gt;
-                    &lt;fileset dir="." includes="*/build.xml"/&gt;
-                &lt;/subant&gt;
-            &lt;/target&gt;
-        &lt;/project&gt;
-        </pre>
-<p>
-            this snippet build file will run ant in each subdirectory of the project directory,
-            where a file called build.xml can be found.
-            The property build.dir will have the value subant1.build in the ant projects called by subant.
-        </p>
-<pre>
-          &lt;subant target=""&gt;
-              &lt;propertyset&gt;
-                  &lt;propertyref prefix="toplevel"/&gt;
-                  &lt;mapper type="glob" from="foo*" to="bar*"/&gt;
-              &lt;/propertyset&gt;
-              &lt;fileset dir="." includes="*/build.xml"/&gt;
-          &lt;/subant&gt;
-        </pre>
-<p>
-            this snippet build file will run ant in each subdirectory of the project directory,
-            where a file called build.xml can be found.
-            All properties whose name starts with "foo" are passed, their names are changed to start with "bar" instead
-        </p>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Type</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>antfile</td>
+    <td>Build file name, to use in conjunction with directories.</td>
+    <td>String</td>
+    <td>No; defaults to <q>build.xml</q>, ignored if <var>genericantfile</var> is set</td>
+  </tr>
+  <tr>
+    <td>buildpath</td>
+    <td>Set the buildpath to be used to find sub-projects.</td>
+    <td>Path</td>
+    <td rowspan="8">No</td>
+  </tr>
+  <tr>
+    <td>buildpathref</td>
+    <td>Buildpath to use, by reference.</td>
+    <td class="left">Reference</td>
+  </tr>
+  <tr>
+    <td>failonerror</td>
+    <td>Sets whether to fail with a build exception on error, or go on.</td>
+    <td class="left">boolean</td>
+  </tr>
+  <tr>
+    <td>genericantfile</td>
+    <td>Build file path, to use in conjunction with directories.<br/>  Use <var>genericantfile</var>,
+      in order to run the same build file with different <var>basedir</var>s.<br/>  If this attribute
+      is set, <var>antfile</var> is ignored.</td>
+    <td class="left">File</td>
+  </tr>
+  <tr>
+    <td>inheritall</td>
+    <td>Corresponds to <code>&lt;ant&gt;</code>'s <var>inheritall</var> attribute but defaults
+      to <q>false</q> in this task.</td>
+    <td class="left">boolean</td>
+  </tr>
+  <tr>
+    <td>inheritrefs</td>
+    <td>Corresponds to <code>&lt;ant&gt;</code>'s <var>inheritrefs</var> attribute.</td>
+    <td class="left">boolean</td>
+  </tr>
+  <tr>
+    <td>output</td>
+    <td>Corresponds to <code>&lt;ant&gt;</code>'s <var>output</var> attribute.</td>
+    <td class="left">String</td>
+  </tr>
+  <tr>
+    <td>target</td>
+    <td>&nbsp;</td>
+    <td class="left">String</td>
+  </tr>
+  <tr>
+    <td>verbose</td>
+    <td>Enable/disable log messages showing when each sub-build path is entered/exited.</td>
+    <td>boolean</td>
+    <td>No; default is <q>false</q></td>
+  </tr>
+</table>
+<h3 id="elements">Parameters as nested elements</h3>
+<h4>any filesystem based <a href="../Types/resources.html#collection">resource collection</a></h4>
+<p>This includes <code>&lt;fileset&gt;</code>, <code>&lt;dirset&gt;</code>
+and <code>&lt;filelist&gt;</code> which are the nested resource collections supported prior to Ant
+1.7.</p>
+<h4><strong>dirset</strong> (org.apache.tools.ant.types.DirSet)</h4>
+Adds a directory set to the implicit build path.
+<p><em>Note that the directories will be added to the build path in no particular order, so if order
+is significant, one should use a file list instead!</em></p>
+<h4><strong>filelist</strong> (org.apache.tools.ant.types.FileList)</h4>
+<p>Adds an ordered file list to the implicit build path.</p>
+<p><em>Note that contrary to file and directory sets, file lists can reference non-existent files or
+directories!</em></p>
+<h4><strong>fileset</strong> (org.apache.tools.ant.types.FileSet)</h4>
+<p>Adds a file set to the implicit build path.</p>
+<p><em>Note that the directories will be added to the build path in no particular order, so if order
+is significant, one should use a file list instead!</em></p>
+<h4><strong>property</strong> (org.apache.tools.ant.taskdefs.Property)</h4>
+<p>Corresponds to <code>&lt;ant&gt;</code>'s nested <code>&lt;property&gt;</code> element.</p>
+<p>When more than one nested <code>&lt;property&gt;</code> element would set a property of the same
+name, the one declared last will win.  This is for backwards compatibility reasons even so it is
+different from the way <code>&lt;property&gt;</code> tasks in build files behave.</p>
+<h4><strong>propertyset</strong> (org.apache.tools.ant.types.PropertySet)</h4>
+<p>Corresponds to <code>&lt;ant&gt;</code>'s nested <code>&lt;propertyset&gt;</code> element.</p>
+<h4><strong>buildpath</strong> (org.apache.tools.ant.types.Path)</h4>
+<p>Creates a nested build path, and add it to the implicit build path.</p>
+<h4><strong>buildpathelement</strong> (org.apache.tools.ant.types.Path.PathElement)</h4>
+<p>Creates a nested <code>&lt;buildpathelement&gt;</code>, and add it to the implicit build
+path.</p>
+<h4><strong>target</strong> (org.apache.tools.ant.taskdefs.Ant.TargetElement)</h4>
+<p><em>Since Ant 1.7</em>.</p>
+<p>You can specify multiple targets using nested <code>&lt;target&gt;</code> elements instead of
+using the target attribute.  These will be executed as if Ant had been invoked with a single target
+whose dependencies are the targets so specified, in the order specified.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>name</td>
+    <td>The name of the called target.</td>
+    <td>Yes</td>
+  </tr>
+</table>
+<h3 id="examples">Examples</h3>
 <pre>
-          &lt;subant target="compile" genericantfile="/opt/project/build1.xml"&gt;
-              &lt;dirset dir="." includes="projects*"/&gt;
-          &lt;/subant&gt;
-        </pre>
-<p>
-            assuming the subdirs of the project dir are called projects1, projects2, projects3
-            this snippet will execute the compile target of /opt/project/build1.xml,
-            setting the basedir to projects1, projects2, projects3
-        </p>
-
-        <!-- manually written -->
-        <p>Now a little more complex - but useful - scenario. Assume that we have
-        a directory structure like this:</p>
-        <pre>
-        root
-          |  common.xml
-          |  build.xml
-          |
-          +-- modules
-                +-- modA
-                |     +-- src
-                +-- modB
-                      +-- src
-
-        <u><b>common.xml:</b></u><br>
-        &lt;project&gt;
-            &lt;property name="src.dir"      value="src"/&gt;
-            &lt;property name="build.dir"    value="build"/&gt;
-            &lt;property name="classes.dir"  value="${build.dir}/classes"/&gt;
-
-            &lt;target name="compile"&gt;
-                &lt;mkdir dir="${classes.dir}"/&gt;
-                &lt;javac srcdir="${src.dir}" destdir="${classes.dir}"/&gt;
-            &lt;/target&gt;
-
-            &lt;!-- more targets --&gt;
-        &lt;/project&gt;
-
-        <u><b>build.xml:</b></u><br>
-        &lt;project&gt;
-
-            &lt;macrodef name="iterate"&gt;
-                &lt;attribute name="target"/&gt;
-                &lt;sequential&gt;
-                    &lt;subant target="@{target}"&gt;
-                        &lt;fileset dir="modules" includes="*/build.xml"/&gt;
-                    &lt;/subant&gt;
-                &lt;/sequential&gt;
-            &lt;/macrodef&gt;
-
-
-            &lt;target name="compile"&gt;
-                &lt;iterate target="compile"/&gt;
-            &lt;/target&gt;
-
-            &lt;!-- more targets --&gt;
-        &lt;/project&gt;
-
-        <u><b>modules/modA/build.xml:</b></u><br>
-        &lt;project name="modA"&gt;
-            &lt;import file="../../common.xml"/&gt;
-        &lt;/project&gt;
-        </pre>
-
-        <p>This results in very small buildfiles in the modules, maintainable
-        buildfile (common.xml) and a clear project structure. Additionally
-        the root buildfile is capable to run the whole build over all
-        modules.
-        </p>
-
-        <pre>
-        &lt;subant failonerror="false"&gt;
-            &lt;fileset dir="." includes="**/build.xml" excludes="build.xml"/&gt;
-            &lt;target name="clean"/&gt;
-            &lt;target name="build"/&gt;
+&lt;project name="subant" default="subant1"&gt;
+    &lt;property name="build.dir" value="subant.build"/&gt;
+    &lt;target name="subant1"&gt;
+        &lt;subant target=""&gt;
+            &lt;property name="build.dir" value="subant1.build"/&gt;
+            &lt;property name="not.overloaded" value="not.overloaded"/&gt;
+            &lt;fileset dir="." includes="*/build.xml"/&gt;
         &lt;/subant&gt;
-        </pre>
-
-        <p>Does a &quot;clean build&quot; for each subproject.</p>
-        <p><b>Hint:</b> because buildfiles are plain xml, you could generate the
-        masterbuildfile from the common buildfile by using a XSLT transformation:
-        </p>
-
-        <pre>
-        &lt;xslt in=&quot;common.xml&quot;
-              out=&quot;master.xml&quot;
-              style=&quot;${ant.home}/etc/common2master.xsl&quot;
-        /&gt;
-        </pre>
-
-        <!-- manually written -->
-
-      </blockquote></td></tr>
-
-    </table>
-
-    </td>
-  </tr>
-  <!-- END RIGHT SIDE MAIN BODY -->
+    &lt;/target&gt;
+&lt;/project&gt;</pre>
+<p>this snippet build file will run <kbd>ant</kbd> in each subdirectory of the project directory,
+where a file called <samp>build.xml</samp> can be found.  The property <code>build.dir</code> will
+have the value <q>subant1.build</q> in the Ant projects called by <code>subant</code>.</p>
+<pre>
+&lt;subant target=""&gt;
+    &lt;propertyset&gt;
+        &lt;propertyref prefix="toplevel"/&gt;
+        &lt;mapper type="glob" from="foo*" to="bar*"/&gt;
+    &lt;/propertyset&gt;
+    &lt;fileset dir="." includes="*/build.xml"/&gt;
+&lt;/subant&gt;</pre>
+<p>this snippet build file will run <kbd>ant</kbd> in each subdirectory of the project directory,
+where a file called <samp>build.xml</samp> can be found.  All properties whose name starts
+with <q>foo</q> are passed, their names are changed to start with <q>bar</q> instead</p>
+<pre>
+&lt;subant target="compile" genericantfile="/opt/project/build1.xml"&gt;
+    &lt;dirset dir="." includes="projects*"/&gt;
+&lt;/subant&gt;</pre>
+<p>assuming the subdirs of the project dir are
+called <samp>projects1</samp>, <samp>projects2</samp>, <samp>projects3</samp> this snippet will
+execute the compile target of <samp>/opt/project/build1.xml</samp>, setting the <var>basedir</var>
+to <q>projects1</q>, <q>projects2</q>, <q>projects3</q></p>
+<p>Now a little more complex&mdash;but useful&mdash;scenario. Assume that we have a directory
+structure like this:</p>
+<pre>
+root
+  |  common.xml
+  |  build.xml
+  |
+  +-- modules
+        +-- modA
+        |     +-- src
+        +-- modB
+              +-- src
+
+<b>common.xml:</b><br/>
+&lt;project&gt;
+    &lt;property name="src.dir"      value="src"/&gt;
+    &lt;property name="build.dir"    value="build"/&gt;
+    &lt;property name="classes.dir"  value="${build.dir}/classes"/&gt;
+
+    &lt;target name="compile"&gt;
+        &lt;mkdir dir="${classes.dir}"/&gt;
+        &lt;javac srcdir="${src.dir}" destdir="${classes.dir}"/&gt;
+    &lt;/target&gt;
+
+    &lt;!-- more targets --&gt;
+&lt;/project&gt;
+
+<b>build.xml:</b><br/>
+&lt;project&gt;
+    &lt;macrodef name="iterate"&gt;
+        &lt;attribute name="target"/&gt;
+        &lt;sequential&gt;
+            &lt;subant target="@{target}"&gt;
+                &lt;fileset dir="modules" includes="*/build.xml"/&gt;
+            &lt;/subant&gt;
+        &lt;/sequential&gt;
+    &lt;/macrodef&gt;
+
+    &lt;target name="compile"&gt;
+        &lt;iterate target="compile"/&gt;
+    &lt;/target&gt;
+
+    &lt;!-- more targets --&gt;
+&lt;/project&gt;
+
+<b>modules/modA/build.xml:</b><br/>
+&lt;project name="modA"&gt;
+    &lt;import file="../../common.xml"/&gt;
+&lt;/project&gt;</pre>
+
+<p>This results in very small build files in the modules, maintainable build file
+(<samp>common.xml</samp>) and a clear project structure. Additionally the root build file is capable
+to run the whole build over all modules.</p>
 
-</table>
+<pre>
+&lt;subant failonerror="false"&gt;
+    &lt;fileset dir="." includes="**/build.xml" excludes="build.xml"/&gt;
+    &lt;target name="clean"/&gt;
+    &lt;target name="build"/&gt;
+&lt;/subant&gt;</pre>
+
+<p>Does a &quot;clean build&quot; for each subproject.</p>
+<p><strong>Hint</strong>: because build files are plain xml, you could generate the master build
+file from the common build file by using a XSLT transformation:</p>
 
+<pre>
+&lt;xslt in=&quot;common.xml&quot;
+      out=&quot;master.xml&quot;
+      style=&quot;${ant.home}/etc/common2master.xsl&quot;/&gt;</pre>
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/symlink.html ant-1.10.3/manual/Tasks/symlink.html
--- ant-1.9.10/manual/Tasks/symlink.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/symlink.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,123 +24,101 @@
 
 <body>
 
-<h2><a name="symlink">Symlink</a></h2>
+<h2 id="symlink">Symlink</h2>
 <h3>Description</h3>
-<p> Manages symbolic links on Unix based platforms. Can be used to
-make an individual link, delete a link, create multiple links from properties files, 
-or create properties files describing links in the specified directories.
-Existing links are not overwritten by default.
-
-<p><a href="../Types/fileset.html">FileSet</a>s are used to select a
-set of links to record, or a set of property files to create links from. </p>
+<p>Manages symbolic links on platforms where Java supports symbolic links.  Can be used to make an
+individual link, delete a link, create multiple links from properties files, or create properties
+files describing links in the specified directories. Existing files are not overwritten by
+default.</p>
+<p><a href="../Types/fileset.html">FileSet</a>s are used to select a set of links to record, or a
+set of property files to create links from.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>action</td>
+    <td>The type of action to perform, may be <q>single</q>, "<q>record</q>, <q>recreate</q>
+      or <q>delete</q>.</td>
+    <td>No; defaults to <q>single</q></td>
+  </tr>
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">action</td>
-    <td valign="top">The type of action to perform, may be "single", 
-    "record", "recreate" or "delete".</td>
-    <td valign="top" align="center">No, defaults to single.</td>
-  </tr>
-  <tr>
-    <td valign="top">link</td>
-    <td valign="top">The name of the link to be created or deleted.<br/>
-      <b>Note</b> this attribute is resolved against the current
-      working directory rather than the project's basedir for
-      historical reasons.  It is recommended you always use an
-      absolute path or a path like <code>${basedir}/some-path</code>
-      as its value.
+    <td>link</td>
+    <td>The name of the link to be created or deleted.<br/><strong>Note</strong>: this attribute is
+      resolved against the current working directory rather than the project's <var>basedir</var>
+      for historical reasons.  It is recommended you always use an absolute path or a path
+      like <samp>${basedir}/some-path</samp> as its value.
     </td>
-    <td valign="center" align="center" >required for 
-    action="single" or "delete". Ignored in other actions.</td>
+    <td>Yes, for <var>action</var>=<q>single</q> or <q>delete</q>; ignored in other actions</td>
   </tr>
   <tr>
-    <td valign="top">resource</td>
-    <td valign="top">The resource the link should point to.</td>
-    <td valign="top" align="center">required for action="single". Ignored in other actions.</td>
+    <td>resource</td>
+    <td>The resource the link should point to.</td>
+    <td>Yes, for <var>action</var>=<q>single</q>; ignored in other actions</td>
   </tr>
   <tr>
-    <td valign="top">linkfilename</td>
-    <td valign="top">The name of the properties file to create in 
-    each included directory.</td>
-    <td valign="top" align="center">required for action="record". 
-    Ignored in other actions.</td>
+    <td>linkfilename</td>
+    <td>The name of the properties file to create in each included directory.</td>
+    <td>Yes, for <var>action</var>=<q>record</q>; ignored in other actions</td>
   </tr>
   <tr>
-    <td valign="top">overwrite</td>
-    <td valign="top">Overwrite existing links or not.</td>
-    <td valign="top" align="center">No; defaults to false.</td>
+    <td>overwrite</td>
+    <td>Overwrite existing files or not. If overwrite is set to <q>true</q>, then any existing file,
+      specified by the link attribute, will be overwritten irrespective of whether or not the
+      existing file is a symbolic link.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-     <td valign="top">Stop build if true, log a warning message, but do not stop the build,
-       when the an error occurs if false.
-     </td>
-     <td valign="top" align="center">No; defaults to true.</td>
+    <td>failonerror</td>
+    <td>Stop build if true, log a warning message, but do not stop the build, when the an error
+      occurs if <q>false</q>.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
- 
+
 <h4>fileset</h4>
- <p><a href="../Types/fileset.html">FileSet</a>s
- are used when action = "record" to select directories and linknames to be recorded. 
- They are also used when action = "recreate" to specify both the name of the property 
- files to be processed, and the directories in which they can be found. At least one 
- fileset is required for each case.</p>
- 
-<h3>Examples</h3>
+<p><a href="../Types/fileset.html">FileSet</a>s are used when <var>action</var>=<q>record</q> to
+select directories and link names to be recorded.  They are also used
+when <var>action</var>=<q>recreate</q> to specify both the name of the property files to be
+processed, and the directories in which they can be found. At least one fileset is required for each
+case.</p>
 
-  <p> Make a link named "foo" to a resource named "bar.foo" in subdir:</p>
-  <pre>
-  &lt;symlink link="${dir.top}/foo" resource="${dir.top}/subdir/bar.foo"/&gt;
-  </pre>
- 
-  <p> Record all links in subdir and it's descendants in files named
-  "dir.links"</p>
-  <pre>
-  &lt;symlink action="record" linkfilename="dir.links"&gt;
-     &lt;fileset dir="${dir.top}" includes="subdir&#47;**"/&gt;
-  &lt;/symlink&gt;
-  </pre>
- 
-  <p> Recreate the links recorded in the previous example:</p>
-  <pre>
-  &lt;symlink action="recreate"&gt;
-     &lt;fileset dir="${dir.top}" includes="subdir&#47;**&#47;dir.links"/&gt;  
-  &lt;/symlink&gt;
-  </pre>
- 
- <p> Delete a link named "foo":
- <pre>
- &lt;symlink action="delete" link="${dir.top}/foo"/&gt;
- </pre>
-
-  <p><strong>Java 1.2 and earlier:</strong> Due to limitations on executing system
-  level commands in Java versions earlier than 1.3 this task may have difficulty
-  operating with a relative path in ANT_HOME. The typical symptom is an 
-  IOException where Apache Ant can't find /some/working/directory${ANT_HOME}/bin/antRun
-  or something similar. The workaround is to change your ANT_HOME environment
-  variable to an absolute path, which will remove the /some/working/directory portion
-  of the above path and allow ant to find the correct commandline execution script.
- 
-  <p><strong>LIMITATIONS:</strong> Because Java has no direct support for
-  handling symlinks this task divines them by comparing canonical and
-  absolute paths. On non-unix systems this may cause false positives.
-  Furthermore, any operating system on which the command
-  <code>ln -s &lt;linkname&gt; &lt;resourcename&gt;</code> is not a valid 
-  command on the command line will not be able to use action="single" or 
-  action="recreate". Action="record" and action=delete should still work. Finally, 
-  the lack of support for symlinks in Java means that all links are recorded as 
-  links to the <strong>canonical</strong> resource name. Therefore the link:
-  <code>link --> subdir/dir/../foo.bar</code> will be recorded as
-  <code>link=subdir/foo.bar</code> and restored as
-  <code>link --> subdir/foo.bar</code></p>
+<h3>Examples</h3>
 
+<p>Make a link named <samp>foo</samp> to a resource named <samp>bar.foo</samp>
+in <samp>subdir</samp>:</p>
+<pre>&lt;symlink link="${dir.top}/foo" resource="${dir.top}/subdir/bar.foo"/&gt;</pre>
+
+<p>Record all links in <samp>subdir</samp> and it's descendants in files
+named <samp>dir.links</samp></p>
+<pre>
+&lt;symlink action="record" linkfilename="dir.links"&gt;
+    &lt;fileset dir="${dir.top}" includes="subdir/**"/&gt;
+&lt;/symlink&gt;</pre>
+
+<p>Recreate the links recorded in the previous example:</p>
+<pre>
+&lt;symlink action="recreate"&gt;
+    &lt;fileset dir="${dir.top}" includes="subdir/**/dir.links"/&gt;
+&lt;/symlink&gt;</pre>
+
+<p>Delete a link named <samp>foo</samp>:</p>
+<pre>&lt;symlink action="delete" link="${dir.top}/foo"/&gt;</pre>
+
+<p><strong>Java 1.2 and earlier</strong>: Due to limitations on executing system level commands in
+Java versions earlier than 1.3 this task may have difficulty operating with a relative path
+in <code>ANT_HOME</code>. The typical symptom is an <code>IOException</code> where Apache Ant can't
+find <samp>/some/working/directory${ANT_HOME}/bin/antRun</samp> or something similar. The workaround
+is to change your <code>ANT_HOME</code> environment variable to an absolute path, which will remove
+the <samp>/some/working/directory</samp> portion of the above path and allow Ant to find the correct
+command line execution script.</p>
 
+<p><strong>Note</strong>: <em>Since Ant 1.10.2</em>, this task relies on the symbolic link support
+introduced in Java 7 through the <code class="code">java.nio.file.Files</code> APIs</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/sync.html ant-1.10.3/manual/Tasks/sync.html
--- ant-1.9.10/manual/Tasks/sync.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/sync.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,143 +24,120 @@
 
 <body>
 
-<h2><a name="get">Sync</a></h2>
+<h2 id="get">Sync</h2>
 <p><em>Since Apache Ant 1.6</em></p>
 <h3>Description</h3>
 
 <p>Synchronize a target directory from the files defined in one or
-more <a href="../Types/resources.html#collection">Resource Collection</a>s.</p>
+more <a href="../Types/resources.html#collection">resource collections</a>.</p>
 
-<p>Any file in the target directory that has not been matched by at
-least one of the nested resource collections gets removed.  I.e. if you exclude a
-file in your sources and a file of that name is present in the target
-dir, it will get removed from the target.</p>
+<p>Any file in the target directory that has not been matched by at least one of the nested resource
+collections gets removed.  I.e. if you exclude a file in your sources and a file of that name is
+present in the target dir, it will get removed from the target.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">todir</td>
-    <td valign="top">the target directory to sync with the resource collections</td>
-    <td align="center" valign="top">Yes</td>
-  </tr>  
-  <tr>
-    <td valign="top">overwrite</td>
-    <td valign="top">Overwrite existing files even if the destination
-      files are newer.</td>
-    <td valign="top" align="center">No; defaults to false.</td>
-  </tr>
-  <tr>
-    <td valign="top">includeEmptyDirs</td>
-     <td valign="top">Copy any empty directories included in the
-       resource collection(s).<br/>
-       <b>Note</b> this attribute also controls the behavior for any
-       nested &lt;preserveintarget&gt; element.  If this attribute is
-       false (the default) empty directories that only exist in the
-       target directory will be removed even if they are matched by
-       the patterns of &lt;preserveintarget&gt;.  This can be
-       overridden by &lt;preserveintarget&gt;'s
-       preserveEmptyDirs attribute.
-     </td>
-     <td valign="top" align="center">No; defaults to false.</td>
-  </tr>
-  <tr>
-    <td valign="top">failonerror</td>
-     <td valign="top">If is set to false, log a warning message, but do not stop the build,
-       when one of the nested filesets points to a directory that
-       doesn't exist.
-     </td>
-     <td valign="top" align="center">No; defaults to true.</td>
-  </tr>
-  <tr>
-    <td valign="top">verbose</td>
-     <td valign="top">Log the files that are being copied.</td>
-     <td valign="top" align="center">No; defaults to false.</td>
-  </tr>
-  <tr>
-    <td valign="top">granularity</td>
-    <td valign="top">The number of milliseconds leeway to give before
-    deciding a file is out of date. This is needed because not every
-    file system supports tracking the last modified time to the
-    millisecond level. Default is 0 milliseconds, or 2 seconds on DOS
-    systems.  This can also be useful if source and target files live
-    on separate machines with clocks being out of sync.  <em>since Ant
-    1.6.2</em>.</td>
-     <td valign="top" align="center">No.</td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>todir</td>
+    <td>the target directory to sync with the resource collections</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>overwrite</td>
+    <td>Overwrite existing files even if the destination files are newer.</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>includeEmptyDirs</td>
+    <td>Copy any empty directories included in the resource
+      collection(s).<br/><strong>Note</strong>: this attribute also controls the behavior for any
+      nested <code>&lt;preserveintarget&gt;</code> element.  If this attribute is <q>false</q> (the
+      default) empty directories that only exist in the target directory will be removed even if
+      they are matched by the patterns of <code>&lt;preserveintarget&gt;</code>.  This can be
+      overridden by <code>&lt;preserveintarget&gt;</code>'s <var>preserveEmptyDirs</var>
+      attribute.</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>failonerror</td>
+    <td>If set to <q>false</q>, log a warning message, but do not stop the build, when one of the
+      nested filesets points to a directory that doesn't exist.</td>
+    <td>No; defaults to <q>true</q></td>
+  </tr>
+  <tr>
+    <td>verbose</td>
+    <td>Log the files that are being copied.</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>granularity</td>
+    <td>The number of milliseconds leeway to give before deciding a file is out of date. This is
+      needed because not every file system supports tracking the last modified time to the
+      millisecond level.  This can also be useful if source and target files live on separate
+      machines with clocks being out of sync.  <em>since Ant 1.6.2</em>.</td>
+    <td>No; default is 0 milliseconds, or 2 seconds on DOS systems.</td>
   </tr>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
 
-<h4>fileset or any other resource collection</h4>
-<p><a href="../Types/resources.html#collection">Resource
-Collection</a>s are used to select groups of files to copy.</p>
-<p>Prior to Ant 1.7 only <code>&lt;fileset&gt;</code> has been
-supported as a nested element.</p>
+<h4>any resource collection</h4>
+<p><a href="../Types/resources.html#collection">resource collections</a> are used to select groups
+of files to copy.</p>
+<p>Prior to Ant 1.7 only <code>&lt;fileset&gt;</code> has been supported as a nested element.</p>
 
 <h4>preserveInTarget</h4>
 
 <p><em>Since Ant 1.7.0</em></p>
 
-<p>Specifies files or directories that should be kept in the target
-directory even if they are not present in one of the source
-directories.</p>
-
-<p>This nested element is like a <a
-href="../Types/fileset.html">FileSet</a> except that it doesn't
-support the dir attribute and the usedefaultexcludes attribute
-defaults to false.</p>
-
-<h5>Additional Parameters</h5>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">preserveEmptyDirs</td>
-    <td valign="top">Overrules the includeEmptydirs setting for
-      directories matched by this element.  If you want to preserve
-      empty directories that are not in your source directory you can
-      either set the task's includeemptydirs attribute or this one.
-      If the two attribute values conflict, this attribute
-      "wins".</td>
-    <td align="center" valign="top">No, defaults to the value of the
-      task's includeemptydirs attribute</td>
-  </tr>  
+<p>Specifies files or directories that should be kept in the target directory even if they are not
+present in one of the source directories.</p>
+
+<p>This nested element is like a <a href="../Types/fileset.html">FileSet</a> except that it doesn't
+support the <var>dir</var> attribute and the <var>usedefaultexcludes</var> attribute defaults
+to <q>false</q>.</p>
+
+<h5>Additional parameters</h5>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>preserveEmptyDirs</td>
+    <td>Overrules the <var>includeEmptydirs</var> setting for directories matched by this element.
+      If you want to preserve empty directories that are not in your source directory you can either
+      set the task's <var>includeemptydirs</var> attribute or this one.  If the two attribute values
+      conflict, this attribute "wins".</td>
+    <td>No; defaults to the value of the task's <var>includeemptydirs</var> attribute</td>
+  </tr>
 </table>
 
 <h3>Examples</h3>
 
-<blockquote><pre>
+<pre>
 &lt;sync todir=&quot;site&quot;&gt;
   &lt;fileset dir=&quot;generated-site&quot;/&gt;
-&lt;/sync&gt;
-</pre></blockquote>
-<p>overwrites all files in <em>site</em> with newer files from
-<em>generated-site</em>, deletes files from <em>site</em> that are not
-present in <em>generated-site</em>.</p>
+&lt;/sync&gt;</pre>
+<p>overwrites all files in <samp>site</samp> with newer files from <samp>generated-site</samp>,
+deletes files from <samp>site</samp> that are not present in <samp>generated-site</samp>.</p>
 
-<blockquote><pre>
+<pre>
 &lt;sync todir=&quot;site&quot;&gt;
   &lt;fileset dir=&quot;generated-site&quot;/&gt;
   &lt;preserveintarget&gt;
     &lt;include name=&quot;**/CVS/**&quot;/&gt;
   &lt;/preserveintarget&gt;
-&lt;/sync&gt;
-</pre></blockquote>
-<p>overwrites all files in <em>site</em> with newer files from
-<em>generated-site</em>, deletes files from <em>site</em> that are not
-present in <em>generated-site</em> but keeps all files in any
-<em>CVS</em> sub-directory.</p>
-
-
+&lt;/sync&gt;</pre>
+<p>overwrites all files in <samp>site</samp> with newer files from <samp>generated-site</samp>,
+deletes files from <samp>site</samp> that are not present in <samp>generated-site</samp> but keeps
+all files in any <samp>CVS</samp> sub-directory.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/tar.html ant-1.10.3/manual/Tasks/tar.html
--- ant-1.9.10/manual/Tasks/tar.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/tar.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,183 +24,162 @@
 
 <body>
 
-<h2><a name="tar">Tar</a></h2>
+<h2 id="tar">Tar</h2>
 <h3>Description</h3>
 <p>Creates a tar archive.</p>
-<p>The <i>basedir</i> attribute is the reference directory from where to tar.</p>
-<p>This task is a <a href="../dirtasks.html#directorybasedtasks">directory based task</a>
-and, as such, forms an implicit <a href="../Types/fileset.html">Fileset</a>. This
-defines which files, relative to the <i>basedir</i>, will be included in the
-archive. The tar task supports all the attributes of Fileset to refine the
-set of files to be included in the implicit fileset.</p>
-
-<p>In addition to the implicit fileset, the tar task supports nested
-      resource collections and a special form of filesets. These
-filesets are extended to allow control over the access mode, username and groupname
-to be applied to the tar entries. This is useful, for example, when preparing archives for
-  Unix systems where some files need to have execute permission.  By
-  default this task will use Unix permissions of 644 for files and 755
-  for directories.</p>
-
-<p>Early versions of tar did not support path lengths greater than 100
-  characters. Over time several incompatible extensions have been
-  developed until a new POSIX standard was created that added so
-  called PAX extension headers (as the pax utility first introduced
-  them) that among another things addressed file names longer than 100
-  characters.  All modern implementations of tar support PAX extension
-  headers.</p>
-
-<p>Ant's tar support predates the standard with PAX extension headers,
-  it supports different dialects that can be enabled using the
-  <i>longfile</i> attribute.
-If the longfile attribute is set to <code>fail</code>, any long paths will
-cause the tar task to fail.  If the longfile attribute is set to
-<code>truncate</code>, any long paths will be truncated to the 100 character
-maximum length prior to adding to the archive. If the value of the longfile
-attribute is set to <code>omit</code> then files containing long paths will be
-omitted from the archive.  Either option ensures that the archive can be
-untarred by any compliant version of tar.</p>
-
-<p>If the loss of path or file
-information is not acceptable, and it rarely is, longfile may be set to the
-value <code>gnu</code> or <code>posix</code>.  With <code>posix</code>
-  Ant will add PAX extension headers, with <code>gnu</code> it adds
-  GNU tar specific extensions that newer versions of GNU tar call
-  "oldgnu".  GNU tar still creates these extensions by default but
-  supports PAX extension headers as well.  Either choice will produce
-  a tar file which
-can have arbitrary length paths. Note however, that the resulting archive will
-only be able to be untarred with tar tools that support the chosen format.
-
-<p>The default for the longfile
-attribute is <code>warn</code> which behaves just like the gnu option except
-that it produces a warning for each file path encountered that does not match
-the limit.  It uses gnu rather than posix for backwards compatibility
-  reasons.</p>
+<p>The <var>basedir</var> attribute is the reference directory from where to tar.</p>
+<p>This task is a <a href="../dirtasks.html#directorybasedtasks">directory based task</a> and, as
+such, forms an implicit <a href="../Types/fileset.html">Fileset</a>. This defines which files,
+relative to the <var>basedir</var>, will be included in the archive. The <code>tar</code> task
+supports all the attributes of Fileset to refine the set of files to be included in the implicit
+fileset.</p>
+
+<p>In addition to the implicit fileset, the <code>tar</code> task supports nested resource
+collections and a special form of filesets. These filesets are extended to allow control over the
+access mode, username and groupname to be applied to the tar entries. This is useful, for example,
+when preparing archives for Unix systems where some files need to have execute permission.  By
+default this task will use Unix permissions of 644 for files and 755 for directories.</p>
+
+<p>Early versions of <kbd>tar</kbd> utility did not support paths longer than 100 characters. Over
+time several incompatible extensions have been developed until a new POSIX standard was created that
+added so called PAX extension headers (as the <kbd>pax</kbd> utility first introduced them) that
+among another things addressed file names longer than 100 characters.  All modern implementations
+of <kbd>tar</kbd> support PAX extension headers.</p>
+
+<p>Ant's <kbd>tar</kbd> support predates the standard with PAX extension headers, it supports
+different dialects that can be enabled using the <var>longfile</var> attribute.  If
+the <var>longfile</var> attribute is set to <q>fail</q>, any long paths will cause
+the <code>tar</code> task to fail.  If the <var>longfile</var> attribute is set to <q>truncate</q>,
+any long paths will be truncated to the 100 character maximum length prior to adding to the
+archive. If the value of the <var>longfile</var> attribute is set to <q>omit</q> then files
+containing long paths will be omitted from the archive.  Either option ensures that the archive can
+be untarred by any compliant version of <kbd>tar</kbd>.</p>
+
+<p>If the loss of path or file information is not acceptable, and it rarely is, <var>longfile</var>
+may be set to the value <q>gnu</q> or <q>posix</q>.  With <q>posix</q> Ant will add PAX extension
+headers, with <q>gnu</q> it adds GNU <kbd>tar</kbd> specific extensions that newer versions of
+GNU <kbd>tar</kbd> call <q>oldgnu</q>.  GNU <kbd>tar</kbd> still creates these extensions by default
+but supports PAX extension headers as well.  Either choice will produce a tar file which can have
+arbitrary length paths. Note however, that the resulting archive will only be able to be untarred
+with <kbd>tar</kbd> tools that support the chosen format.</p>
+
+<p>The default for the <var>longfile</var> attribute is <q>warn</q> which behaves just like
+the <q>gnu</q> option except that it produces a warning for each filepath encountered that does not
+match the limit.  It uses <q>gnu</q> rather than <q>posix</q> for backwards compatibility
+reasons.</p>
 
-<p>To achivieve best interoperability you should use
-  either <code>fail</code> or <code>posix</code> for the longfile attribute.</p>
+<p>To achieve best interoperability you should use either <q>fail</q> or <q>posix</q> for
+the <var>longfile</var> attribute.</p>
 
-<p>This task can perform compression by setting the compression attribute to "gzip"
-or "bzip2".</p>
+<p>This task can perform compression by setting the <var>compression</var> attribute
+to <q>gzip</q>, <q>bzip2</q>, or <q>xz</q>.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td valign="top" align="center"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">destfile</td>
-    <td valign="top">the tar-file to create.</td>
-    <td align="center" valign="top">Yes</td>
+    <td>destfile</td>
+    <td>the tar file to create.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">basedir</td>
-    <td valign="top">the directory from which to tar the files.</td>
-    <td align="center" valign="top">No</td>
+    <td>basedir</td>
+    <td>the directory from which to tar the files.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">longfile</td>
-    <td valign="top">Determines how long files (&gt;100 chars) are to be
-       handled.  Allowable values are &quot;truncate&quot;, &quot;fail&quot;,
-       &quot;warn&quot;, &quot;omit&quot;, &quot;gnu&quot; and &quot;posix&quot;.  Default is
-       &quot;warn&quot;.</td>
-    <td valign="top" align="center">No</td>
+    <td>longfile</td>
+    <td>Determines how long filenames (&gt; 100 chars) are to be handled.  Allowed values
+      are <q>truncate</q>, <q>fail</q>, <q>warn</q>, <q>omit</q>, <q>gnu</q> and <q>posix</q>.</td>
+    <td>No; default is <q>warn</q></td>
   </tr>
   <tr>
-    <td valign="top">includes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      included. All files are included when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>includes</td>
+    <td>comma- or space-separated list of patterns of files that must be included.</td>
+    <td>No; defaults to all (<q>**</q>)</td>
   </tr>
   <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an include pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>includesfile</td>
+    <td>name of a file. Each line of this file is taken to be an include pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">excludes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      excluded. No files (except default excludes) are excluded when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>excludes</td>
+    <td>comma- or space-separated list of patterns of files that must be excluded.</td>
+    <td>No; defaults to default excludes or none if <var>defaultexcludes</var> is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an exclude pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>excludesfile</td>
+    <td>name of a file. Each line of this file is taken to be an exclude pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">defaultexcludes</td>
-    <td valign="top">indicates whether default excludes should be used or not
-      (&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>defaultexcludes</td>
+    <td>indicates whether default excludes should be used or not (<q>yes|no</q>).</td>
+    <td>No; defaults to <q>yes</q></td>
   </tr>
   <tr>
-    <td valign="top">compression</td>
-    <td valign="top">compression method.  Allowable values are 
-       &quot;none&quot;, &quot;gzip&quot; and &quot;bzip2&quot;.  Default is
-       &quot;none&quot;.</td>
-    <td valign="top" align="center">No</td>
+    <td>compression</td>
+    <td>compression method.  Allowable values are <q>none</q>, <q>gzip</q>, <q>xz</q>
+      and <q>bzip2</q>.</td>
+    <td>No; default is <q>warn</q></td>
   </tr>
   <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">The character encoding to use for filenames
-    inside the tar file.  For a list of possible values see the <a
-                href="http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html">Supported Encodings</a>.<br/>
-    Defaults to the platform's default character encoding.
-      <em>Since Ant 1.9.5</em>
-    <td align="center" valign="top">No</td>
+    <td>encoding</td>
+    <td>The character encoding to use for filenames inside the tar file.  For a list of possible
+      values see
+      the <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html"
+      target="_top">Supported Encodings</a>.<br/><em>Since Ant 1.9.5</em>
+    <td>No; defaults to default JVM character encoding</td>
   </tr>
 </table>
 
-<h3>Nested Elements</h3>
+<h3>Parameters specified as nested elements</h3>
 
-The tar task supports nested <a
-href="../Types/tarfileset.html">tarfileset</a> elements. These are
-extended <a href="../Types/fileset.html">FileSets</a> which,
-in addition to the standard elements, support one additional
-attributes
+<p>The task supports nested <a href="../Types/tarfileset.html">tarfileset</a> elements. These
+are extended <a href="../Types/fileset.html">FileSets</a> which, in addition to the standard
+elements, support one additional attributes</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td valign="top" align="center"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">preserveLeadingSlashes</td>
-    <td valign="top">Indicates whether leading `/'s should
-    be preserved in the file names. Default is <code>false</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>preserveLeadingSlashes</td>
+    <td>Indicates whether leading <q>/</q> should be preserved in the file names.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
 </table>
 
 <h4>any other resource collection</h4>
-<p><a href="../Types/resources.html#collection">Resource
-Collection</a>s are used to select groups of files to archive.</p>
-<p>Prior to Apache Ant 1.7 only <code>&lt;fileset&gt;</code> has been
-supported as a nested element.</p>
+<p><a href="../Types/resources.html#collection">resource collections</a> are used to select groups
+of files to archive.</p>
+<p>Prior to Apache Ant 1.7 only <code>&lt;fileset&gt;</code> has been supported as a nested
+element.</p>
 
 <h3>Examples</h3>
 <pre>
 &lt;tar destfile=&quot;${dist}/manual.tar&quot; basedir=&quot;htdocs/manual&quot;/&gt;
 &lt;gzip destfile=&quot;${dist}/manual.tar.gz&quot; src=&quot;${dist}/manual.tar&quot;/&gt;</pre>
-<p>tars all files in the <code>htdocs/manual</code> directory into a file called <code>manual.tar</code>
-in the <code>${dist}</code>  directory, then applies the gzip task to compress
-it.</p>
+
+<p>tars all files in the <samp>htdocs/manual</samp> directory into a file
+called <samp>manual.tar</samp> in the <samp>${dist}</samp> directory, then applies
+the <code>gzip</code> task to compress it.</p>
 
 <pre>
 &lt;tar destfile=&quot;${dist}/manual.tar&quot;
      basedir=&quot;htdocs/manual&quot;
-     excludes=&quot;mydocs/**, **/todo.html&quot;
-/&gt;</pre>
-<p>tars all files in the <code>htdocs/manual</code> directory into a file called <code>manual.tar</code>
-in the <code>${dist}</code> directory. Files in the directory <code>mydocs</code>,
-or files with the name <code>todo.html</code> are excluded.</p>
+     excludes=&quot;mydocs/**, **/todo.html&quot;/&gt;</pre>
+
+<p>tars all files in the <samp>htdocs/manual</samp> directory into a file
+called <samp>manual.tar</samp> in the <samp>${dist}</samp> directory. Files in the
+directory <samp>mydocs</samp>, or files with the name <samp>todo.html</samp> are excluded.</p>
 
 <pre>
 &lt;tar destfile=&quot;${basedir}/docs.tar&quot;&gt;
@@ -215,14 +194,11 @@
     &lt;include name=&quot;*.html&quot;/&gt;
   &lt;/tarfileset&gt;
 &lt;/tar&gt;</pre>
-<p>
-  Writes the file <code>docs/readme.txt</code> as
-  <code>/usr/doc/ant/README</code> into the archive. All
-  <code>*.html</code> files in the <code>docs</code> directory are
-  prefixed by <code>/usr/doc/ant</code>, so for example
-  <code>docs/index.html</code> is written as
-  <code>/usr/doc/ant/index.html</code> to the archive.
-</p>
+
+<p>Writes the file <samp>docs/readme.txt</samp> as <samp>/usr/doc/ant/README</samp> into the
+archive. All <samp>*.html</samp> files in the <samp>docs</samp> directory are prefixed
+by <samp>/usr/doc/ant</samp>, so for example <samp>docs/index.html</samp> is written
+as <samp>/usr/doc/ant/index.html</samp> to the archive.</p>
 
 <pre>
 &lt;tar longfile=&quot;gnu&quot;
@@ -236,46 +212,35 @@
     &lt;exclude name=&quot;${dist.name}/bootstrap.sh&quot;/&gt;
     &lt;exclude name=&quot;${dist.name}/build.sh&quot;/&gt;
   &lt;/tarfileset&gt;
-&lt;/tar&gt;
-</pre>
-<p>This example shows building a tar which uses the GNU extensions for long paths and
-where some files need to be marked as executable (mode 755)
-and the rest are use the default mode (read-write by owner). The first
-fileset selects just the executable files. The second fileset must exclude
-the executable files and include all others. </p>
-
-
-
-<p><strong>Note: </strong> The tar task does not ensure that a file is only selected
-by one resource collection. If the same file is selected by more than one collection, it will be included in the
-tar file twice, with the same path.</p>
-
-<p><strong>Note:</strong> The patterns in the include and exclude
-elements are considered to be relative to the corresponding dir
-attribute as with all other filesets.  In the example above,
-<code>${dist.name}</code> is not an absolute path, but a simple name
-of a directory, so <code>${dist.name}</code> is a valid path relative
-to <code>${dist.name}/..</code>.</p>
+&lt;/tar&gt;</pre>
 
+<p>This example shows building a tar which uses the GNU extensions for long paths and where some
+files need to be marked as executable (mode 755) and the rest are use the default mode (read-write
+by owner). The first fileset selects just the executable files. The second fileset must exclude the
+executable files and include all others.</p>
+
+<p><strong>Note</strong>: The <code>tar</code> task does not ensure that a file is only selected by
+one resource collection. If the same file is selected by more than one collection, it will be
+included in the tar file twice, with the same path.</p>
+
+<p><strong>Note</strong>: The patterns in the <code>include</code> and <code>exclude</code> elements
+are considered to be relative to the corresponding <var>dir</var> attribute as with all other
+filesets.  In the example above, <samp>${dist.name}</samp> is not an absolute path, but a simple
+name of a directory, so <samp>${dist.name}</samp> is a valid path relative
+to <samp>${dist.name}/..</samp>.</p>
 
 <pre>
 &lt;tar destfile="release.tar.gz" compression="gzip"&gt;
   &lt;zipfileset src="release.zip"/&gt;
-&lt;/tar&gt;
-</pre>
-<p>Re-packages a ZIP archive as a GZip compressed tar archive.  If
-Unix file permissions have been stored as part of the ZIP file, they
-will be retained in the resulting tar archive.</p>
+&lt;/tar&gt;</pre>
 
+<p>Re-packages a ZIP archive as a GZip compressed tar archive.  If Unix file permissions have been
+stored as part of the ZIP file, they will be retained in the resulting tar archive.</p>
 
-<p><strong>Note:</strong>
-  Please note the tar task creates a tar file, it does not append 
-  to an existing tar file. The existing tar file is replaced instead.
-  As with most tasks in Ant, the task only takes action if the output
-  file (the tar file in this case) is older than the input files, or
-  if the output file does not exist.
-</p>
+<p><strong>Note</strong>: Please note the <code>tar</code> task creates a tar file, it does not
+append to an existing tar file. The existing tar file is replaced instead.  As with most tasks in
+Ant, the task only takes action if the output file (the tar file in this case) is older than the
+input files, or if the output file does not exist.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/taskdef.html ant-1.10.3/manual/Tasks/taskdef.html
--- ant-1.9.10/manual/Tasks/taskdef.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/taskdef.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,21 +24,18 @@
 
 <body>
 
-<h2><a name="taskdef">Taskdef</a></h2>
+<h2 id="taskdef">Taskdef</h2>
 <h3>Description</h3>
-  <p>Adds a task definition to the current project, such that this new task can be
-    used in the current project.</p>
-  <p>This task is a form of <a href="typedef.html">Typedef</a> with the
-    attributes "adapter" and "adaptto" set to the values 
-    "org.apache.tools.ant.TaskAdapter" and "org.apache.tools.ant.Task"
-    respectively.  Anything said in the <a href="typedef.html">manual
-      page of typedef</a> applies to taskdef as well.</p>
+<p>Adds a task definition to the current project, such that this new task can be used in the current
+project.</p>
+<p>This task is a form of <a href="typedef.html">Typedef</a> with the attributes <var>adapter</var>
+and <var>adaptto</var> set to the values <q>org.apache.tools.ant.TaskAdapter</q>
+and <q>org.apache.tools.ant.Task</q> respectively.  Anything said in
+the <a href="typedef.html">manual page of typedef</a> applies to <code>taskdef</code> as well.</p>
 <h3>Examples</h3>
-<pre>  &lt;taskdef name=&quot;myjavadoc&quot; classname=&quot;com.mydomain.JavadocTask&quot;/&gt;</pre>
-<p>makes a task called <code>myjavadoc</code> available to Apache Ant. The class <code>com.mydomain.JavadocTask</code>
-implements the task.</p>
-
+<pre>&lt;taskdef name=&quot;myjavadoc&quot; classname=&quot;com.mydomain.JavadocTask&quot;/&gt;</pre>
+<p>makes a task called <code>myjavadoc</code> available to Apache Ant. The
+class <code>com.mydomain.JavadocTask</code> implements the task.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/telnet.html ant-1.10.3/manual/Tasks/telnet.html
--- ant-1.9.10/manual/Tasks/telnet.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/telnet.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,93 +24,86 @@
 
 <body>
 
-<h2><a name="telnet">Telnet</a></h2>
+<h2 id="telnet">Telnet</h2>
 <h3>Description</h3>
-Task to automate a remote telnet session. The task uses 
-nested <tt>&lt;read&gt;</tt> to indicate strings to wait for, and
-<tt>&lt;write&gt;</tt> tags to specify text to send.  
-
-<p>If you do specify a userid and password, the system will 
-assume a common unix prompt to wait on. This behavior can be easily over-ridden.</p>
-<p><b>Note:</b> This task depends on external libraries not included in the Apache Ant distribution.
-See <a href="../install.html#librarydependencies">Library Dependencies</a> for more information.</p>
+<p>Task to automate a remote telnet session. The task uses nested <code>&lt;read&gt;</code> to
+indicate strings to wait for, and <code>&lt;write&gt;</code> tags to specify text to send.</p>
+
+<p>If you do specify a userid and password, the system will assume a common Unix prompt to wait
+on. This behavior can be easily overridden.</p>
+<p><strong>Note</strong>: This task depends on external libraries not included in the Apache Ant
+distribution.  See <a href="../install.html#librarydependencies">Library Dependencies</a> for more
+information.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
     <th>Required</th>
   </tr>
   <tr>
-     <td>userid</td>
-     <td>the login id to use on the telnet server.</td>
-     <td>Only if password is specified</td>
+    <td>userid</td>
+    <td>the login id to use on the telnet server.</td>
+    <td>Only if <var>password</var> is specified</td>
   </tr>
   <tr>
-     <td>password</td>
-     <td>the login password to use on the telnet server.</td>
-     <td>Only if userid is specified</td>
+    <td>password</td>
+    <td>the login password to use on the telnet server.</td>
+    <td>Only if <var>userid</var> is specified</td>
   </tr>
   <tr>
-     <td>server</td>
-     <td>the address of the remote telnet server.</td>
-     <td>Yes</td>
+    <td>server</td>
+    <td>the address of the remote telnet server.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-     <td>port</td>
-     <td>the port number of the remote telnet server. Defaults to port 23.</td>
-     <td>No</td>
+    <td>port</td>
+    <td>the port number of the remote telnet server.</td>
+    <td>No; defaults to <q>23</q></td>
   </tr>
   <tr>
-     <td>initialCR</td>
-     <td>send a cr after connecting (&quot;yes&quot;). Defaults to &quot;no&quot;.</td>
-     <td>No</td>
+    <td>initialCR</td>
+    <td>send a cr after connecting if <q>yes</q>.</td>
+    <td>No; defaults to <q>no</q></td>
   </tr>
   <tr>
-     <td>timeout</td>
-     <td>set a default timeout to wait for a response. Specified in seconds. Default is no timeout.</td>
-     <td>No</td>
+    <td>timeout</td>
+    <td>set a default timeout to wait for a response. Specified in seconds.</td>
+    <td>No; default is no timeout</td>
   </tr>
 </table>
-<h3><a name="nested">Nested Elements</a></h3>
-The commands to send to the server, and responses to wait for, are
-described as nested elements.  
+<h3 id="nested">Parameters specified as nested elements</h3>
+<p>The commands to send to the server, and responses to wait for, are described as nested
+elements.</p>
 
 <h4>read</h4>
 
-<p>declare (as a text child of this element) a string to wait for.
-The element supports the timeout attribute, which overrides any
-timeout specified for the task as a whole. It also has a <tt>string</tt>
-attribute, which is an alternative to specifying the string as 
-a text element.
-</p>
-<i>Always declare an opening and closing
-<code>&lt;read&gt;</code> element to ensure that statements are not sent before
-the connection is ready, and that the connection is not broken before
-the final command has completed.
-</i>
+<p>declare (as a text child of this element) a string to wait for.  The element supports
+the <var>timeout</var> attribute, which overrides any timeout specified for the task as a whole. It
+also has a <var>string</var> attribute, which is an alternative to specifying the string as a text
+element.</p>
+<p><em>Always declare an opening and closing <code>&lt;read&gt;</code> element to ensure that
+statements are not sent before the connection is ready, and that the connection is not broken before
+the final command has completed.</em></p>
+
 <h4>write</h4>
+<p>describes the text to send to the server. The <var>echo</var> boolean attribute controls whether
+the string is echoed to the local log; this is <q>true</q> by default.</p>
 
-<p>describes the text to send to the server. The <tt>echo</tt> boolean
-attribute controls whether the string is echoed to the local log; 
-this is "true" by default
-</p>
 <h3>Examples</h3>
-A simple example of connecting to a server and running a command.  This assumes
- a prompt of &quot;ogin:&quot; for the userid, and a prompt of &quot;assword:&quot;
- for the password.
+<p>A simple example of connecting to a server and running a command.  This assumes a prompt
+of <q>ogin:</q> for the userid, and a prompt of <q>assword:</q> for the password.</p>
 
-<blockquote><pre>
+<pre>
 &lt;telnet userid=&quot;bob&quot; password=&quot;badpass&quot; server=&quot;localhost&quot;&gt;
    &lt;read&gt;/home/bob&lt;/read&gt;
    &lt;write&gt;ls&lt;/write&gt;
    &lt;read string=&quot;/home/bob&quot;/&gt;
-&lt;/telnet&gt;
-</pre></blockquote>
+&lt;/telnet&gt;</pre>
 
-This task can be rewritten as:
-<blockquote><pre>
+<p>This task can be rewritten as:</p>
+<pre>
 &lt;telnet server=&quot;localhost&quot;&gt;
    &lt;read&gt;ogin:&lt;/read&gt;
    &lt;write&gt;bob&lt;/write&gt;
@@ -119,37 +112,32 @@
    &lt;read&gt;/home/bob&lt;/read&gt;
    &lt;write&gt;ls&lt;/write&gt;
    &lt;read&gt;/home/bob&lt;/read&gt;
-&lt;/telnet&gt;
-</pre></blockquote>
+&lt;/telnet&gt;</pre>
 
-A timeout can be specified at the <code>&lt;telnet&gt;</code> level or at the <code>&lt;read&gt;</code> level. 
-This will connect, issue a sleep command that is suppressed from displaying and wait 
-10 seconds before quitting.
-<blockquote><pre>
+<p>A timeout can be specified at the <code>&lt;telnet&gt;</code> level or at
+the <code>&lt;read&gt;</code> level.  This will connect, issue a <kbd>sleep</kbd> command that is
+suppressed from displaying and wait 10 seconds before quitting.</p>
+
+<pre>
 &lt;telnet userid=&quot;bob&quot; password=&quot;badpass&quot; server=&quot;localhost&quot; timeout=&quot;20&quot;&gt;
    &lt;read&gt;/home/bob&lt;/read&gt;
    &lt;write echo=&quot;false&quot;&gt;sleep 15&lt;/write&gt;
    &lt;read timeout=&quot;10&quot;&gt;/home/bob&lt;/read&gt;
-&lt;/telnet&gt;
-</pre></blockquote>
+&lt;/telnet&gt;</pre>
 
-The task can be used with other ports as well:
-<blockquote><pre>
+<p>The task can be used with other ports as well:</p>
+<pre>
 &lt;telnet port=&quot;80&quot; server=&quot;localhost&quot; timeout=&quot;20&quot;&gt;
    &lt;read/&gt;
    &lt;write&gt;GET / http/0.9&lt;/write&gt;
    &lt;write/&gt;
    &lt;read timeout=&quot;10&quot;&gt;&amp;lt;/HTML&amp;gt;&lt;/read&gt;
-&lt;/telnet&gt;
-</pre></blockquote>
-<p>
-To use this task against the WinNT telnet service, you need to configure the service to use 
-classic authentication rather than NTLM negotiated authentication. 
-This can be done in the Telnet Server Admin app: 
-select "display/change registry settings", then "NTLM", then set the value of NTLM to 1.
-</p>
+&lt;/telnet&gt;</pre>
 
+<p>To use this task against the Windows NT telnet service, you need to configure the service to use
+classic authentication rather than NTLM negotiated authentication.  This can be done in the Telnet
+Server Admin app: select <q>display/change registry settings</q>, then <q>NTLM</q>, then set the
+value of NTLM to 1.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/tempfile.html ant-1.10.3/manual/Tasks/tempfile.html
--- ant-1.9.10/manual/Tasks/tempfile.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/tempfile.html	2018-03-24 12:37:12.000000000 +0000
@@ -14,216 +14,74 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-    
+
 <html>
 <head>
   <meta http-equiv="Content-Language" content="en-us">
+  <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
   <title>Tempfile Task</title>
 </head>
 
-<body bgcolor="#ffffff" text="#000000" link="#525D76"
-      alink="#525D76" vlink="#525D76">
-
-<table border="0" width="100%" cellspacing="4">
-
-  <!-- PAGE HEADER -->
+<body>
+<h2>Tempfile Task</h2>
+<h3 id="description">Description</h3>
+<p>This task sets a property to the name of a temporary file.
+Unlike <code class="code">java.io.File.createTempFile</code>, this task does not actually create the
+temporary file, but it does guarantee that the file did not exist when the task was executed.</p>
+<h3 id="attributes">Parameters</h3>
+<table class="attr">
   <tr>
-    <td>
-      <table border="0" width="100%"><tr>
-          <td valign="bottom">
-            <font size="+3" face="arial,helvetica,sanserif"><strong>Tempfile  Task</strong></font>
-            <br><font face="arial,helvetica,sanserif">This task sets a property to the name of a temporary file.</font>
-          </td>
-          <td>
-            <!-- PROJECT LOGO -->
-            <a href="http://ant.apache.org/">
-              <img src="../images/ant_logo_large.gif" align="right" alt="Apache Ant" border="0">
-            </a>
-          </td>
-      </tr></table>
-    </td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Type</th>
+    <th>Required</th>
   </tr>
-
-  <!-- START RIGHT SIDE MAIN BODY -->
   <tr>
-    <td  valign="top" align="left">
-
-          <!-- Applying task/long-description -->
-    <!-- Start Description -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-
-      <tr><td bgcolor="#525D76">
-        <font color="#ffffff" face="arial,helvetica.sanserif">
-          <a name="description">
-          <strong>Description</strong></a></font>
-      </td></tr>
-
-      <tr><td><blockquote>
-
-          This task sets a property to the name of a temporary file.
-          Unlike <code>java.io.File.createTempFile</code>,
-          this task does not actually create the temporary file, but it does guarantee that the
-          file did not exist when the task was executed.
-
-          <p>Examples:
-
-          <pre>&lt;tempfile property="temp.file"/&gt;</pre>
-
-          create a temporary file
-
-          <pre>&lt;tempfile property="temp.file" suffix=".xml"/&gt;</pre>
-
-          create a temporary file with the <code>.xml</code> suffix
-
-          <pre>&lt;tempfile property="temp.file" destDir="build"/&gt;</pre>
-
-          create a temporary file in the <code>build</code> subdirectory
-
-      </blockquote></td></tr>
-
-    </table>
-    <!-- End Description -->
-
- <!-- Ignore -->
-
-
-
-    <!-- Start Attributes -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-      <tr><td bgcolor="#525D76">
-        <font color="#ffffff" face="arial,helvetica.sanserif">
-          <a name="attributes">
-          <strong>Parameters</strong></a></font>
-      </td></tr>
-      <tr><td><blockquote>
-        <table>
-          <tr>
-        <td bgcolor="#cccccc" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Attribute</b></font>
-        </td>
-        <td bgcolor="#cccccc" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Description</b></font>
-        </td>
-        <td bgcolor="#cccccc" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Type</b></font>
-        </td>
-        <td bgcolor="#cccccc" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif"><b>Requirement</b></font>
-        </td>
-          </tr>
-    <!-- Attribute Group -->    
-        <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">property</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Sets the property you wish to assign the temporary file to.</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">String</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left" rowspan="1">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Required</font>
-        </td>
-    </tr>
-
-    <!-- Attribute Group -->    
-        <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">destdir</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Sets the destination directory. If not set, the basedir directory is used instead.</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">File</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left" rowspan="5">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Optional</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">prefix</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Sets the optional prefix string for the temp file.</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">String</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">suffix</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Sets the optional suffix string for the temp file.</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">String</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">deleteonexit</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Whether the temp file will be marked for deletion on normal exit of the Java Virtual Machine (even though the file may never be created); default <em>false</em>. <strong>Since Apache Ant 1.7</strong></font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">boolean</font>
-        </td>
-    </tr>
-    <!-- Attribute -->
-    <tr>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">createfile</font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">Whether the temp file should be created by this task; default <em>false</em>.<strong>Since Ant 1.8</strong></font>
-        </td>
-        <td bgcolor="#eeeeee" valign="top" align="left">
-          <font color="#000000" size="-1" face="arial,helvetica,sanserif">boolean</font>
-        </td>
-    </tr>
-
-        </table>
-      </blockquote></td></tr>
-
-    </table>
-    <!-- End Attributes -->
-
-    <!-- Start Elements -->
-    <table border="0" cellspacing="0" cellpadding="2" width="100%">
-      <tr><td>&nbsp;</td></tr>
-
-      <tr><td bgcolor="#525D76">
-        <font color="#ffffff" face="arial,helvetica.sanserif">
-          <a name="elements">
-          <strong>Parameters as nested elements</strong></a></font>
-      </td></tr>
-
-      <tr><td><blockquote>
-
-      </blockquote></td></tr>
-
-    </table>
-    <!-- End Elements -->
-
-
-    </td>
+    <td>property</td>
+    <td>Sets the property you wish to assign the temporary file to.</td>
+    <td>String</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>destdir</td>
+    <td>Sets the destination directory.</td>
+    <td>File</td>
+    <td>No; defaults to <var>basedir</var></td>
+  </tr>
+  <tr>
+    <td>prefix</td>
+    <td>Sets the optional prefix string for the temp file.</td>
+    <td>String</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>suffix</td>
+    <td>Sets the optional suffix string for the temp file.</td>
+    <td>String</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>deleteonexit</td>
+    <td>Whether the temp file will be marked for deletion on normal exit of JVM (even though the
+      file may never be created). <em>Since Apache Ant 1.7</em></td>
+    <td>boolean</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>createfile</td>
+    <td>Whether the temp file should be created by this task. <em>Since Ant 1.8</em></td>
+    <td>boolean</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
-  <!-- END RIGHT SIDE MAIN BODY -->
-
 </table>
+<h3>Examples</h3>
+<pre>&lt;tempfile property="temp.file"/&gt;</pre>
+<p>create a temporary file</p>
+
+<pre>&lt;tempfile property="temp.file" suffix=".xml"/&gt;</pre>
+<p>create a temporary file with the <code>.xml</code> suffix</p>
 
+<pre>&lt;tempfile property="temp.file" destDir="build"/&gt;</pre>
+<p>create a temporary file in the <code>build</code> subdirectory</p>
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/touch.html ant-1.10.3/manual/Tasks/touch.html
--- ant-1.9.10/manual/Tasks/touch.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/touch.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,136 +24,124 @@
 
 <body>
 
-<h2><a name="touch">Touch</a></h2>
+<h2 id="touch">Touch</h2>
 <h3>Description</h3>
 
-<p>Changes the modification time of a resource and possibly creates it
-at the same time. In addition to working with a single file, this Task
-can also work on <a href="../Types/resources.html">resources</a> and
-resource collections (which also includes directories).  Prior to Apache Ant
-1.7 only FileSet or <a href="../Types/filelist.html">Filelist</a>
-(since Ant 1.6) have been supported.</p>
-
-<p>Ant uses the API of <code>java.io.File</code> to set the last
-  modification time which has some limitations.  For example the
-  timestamp granularity depends on the operating system and sometimes
-  the operating system may allow a granularity smaller than
-  milliseconds.  If you need more control you have to fall back to
-  the <code>&lt;exec&gt;</code> task and native commands.</p>
-
-<p>Starting with Ant 1.8.2 Ant will log a warning message if it fails
-  to change the file modification time.  This will happen if you try
-  to change the modification time of a file you do not own on many
-  Unix systems, for example.</p>
+<p>Changes the modification time of a resource and possibly creates it at the same time. In addition
+to working with a single file, this Task can also work
+on <a href="../Types/resources.html">resources</a> and resource collections (which also includes
+directories).  Prior to Apache Ant 1.7 only FileSet or <a href="../Types/filelist.html">Filelist</a>
+(<em>since Ant 1.6</em>) were supported.</p>
+
+<p>Ant uses the API of <code class="code">java.io.File</code> to set the last modification time
+which has some limitations.  For example, the timestamp granularity depends on the operating system
+and sometimes the operating system may allow a granularity smaller than milliseconds.  If you need
+more control you have to fall back to the <code>&lt;exec&gt;</code> task and native commands.</p>
+
+<p><em>Since Ant 1.8.2</em>, a warning message is logged upon failure to change the file
+modification time.  This will happen if you try to change the modification time of a file you do not
+own on many Unix systems, for example.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">The name of the file.</td>
-    <td valign="top" align="center">Unless a nested resource collection element
-       has been specified.</td>
+    <td>file</td>
+    <td>The name of the file.</td>
+    <td>Unless a nested resource collection element has been specified</td>
   </tr>
   <tr>
-    <td valign="top">millis</td>
-    <td valign="top">Specifies the new modification time of the file
-       in milliseconds since midnight Jan 1 1970.</td>
-    <td valign="center" align="center" rowspan="2">No--datetime takes
-       precedence, however if both are omitted the current time is assumed.</td>
+    <td>millis</td>
+    <td>Specifies the new modification time of the file in milliseconds since midnight Jan 1
+      1970.</td>
+    <td rowspan="2">No; <var>datetime</var> takes precedence, however if both are omitted then
+      current time is assumed</td>
   </tr>
   <tr>
-    <td valign="top">datetime</td>
-    <td valign="top">Specifies the new modification time of the file. The 
-       special value &quot;now&quot; indicates the current time 
-       (now supported since Ant 1.8).</td>
+    <td>datetime</td>
+    <td class="left">Specifies the new modification time of the file.  <em>Since Ant 1.8</em>, the
+      special value <q>now</q> indicates the current time.</td>
   </tr>
   <tr>
-    <td valign="top">pattern</td>
-    <td valign="top">SimpleDateFormat-compatible pattern string using
-       the current locale.
-       Defaults to "MM/dd/YYYY hh:mm a" or "MM/dd/yyyy hh:mm:ss a"
-       using the US locale.
-       <b>Since Ant 1.6.3</b></td>
-    <td valign="top" align="center">No</td>
+    <td>pattern</td>
+    <td>SimpleDateFormat-compatible pattern string using the current locale. <em>Since Ant
+      1.6.3</em></td>
+    <td>No; defaults to <q>MM/dd/YYYY hh:mm a</q> or <q>MM/dd/yyyy hh:mm:ss a</q> using the US
+      locale.</td>
   </tr>
   <tr>
-    <td valign="top">mkdirs</td>
-    <td valign="top">Whether to create nonexistent parent
-       directories when touching new files. <b>Since Ant 1.6.3</b></td>
-    <td valign="top" align="center">No, default <i>false</i>.</td>
+    <td>mkdirs</td>
+    <td>Whether to create nonexistent parent directories when touching new files. <em>Since Ant
+      1.6.3</em></td>
+    <td>No; default <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">Whether to log the creation of new files.
-       <b>Since Ant 1.6.3</b></td>
-    <td valign="top" align="center">No, default <i>true</i>.</td>
+    <td>verbose</td>
+    <td>Whether to log the creation of new files.  <em>Since Ant 1.6.3</em></td>
+    <td>No; default <q>true</q></td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 <h4>any resource collection</h4>
 
-<p>You can use any number of nested resource collection elements to
-define the resources for this task and refer to resources defined
-elsewhere.  <b>Note:</b> resources passed to this task must implement
-the <code>org.apache.tools.ant.types.resources.Touchable</code>
-interface, this is true for all filesystem-based resources like those
-returned by path, fileset ot filelist.</p>
-
-<p>For backwards compatibility directories matched by nested filesets
-will be "touched" as well, use a &lt;type&gt; selector to suppress
-this.  This only applies to filesets nested into the task directly,
-not to filesets nested into a path or any other resource
-collection.</p>
+<p>You can use any number of nested resource collection elements to define the resources for this
+task and refer to resources defined elsewhere. <strong>Note</strong>: resources passed to this task
+must implement the <code class="code">org.apache.tools.ant.types.resources.Touchable</code>
+interface, this is true for all filesystem-based resources like those returned by path, fileset ot
+filelist.</p>
+
+<p>For backwards compatibility directories matched by nested filesets will be "touched" as well, use
+a <var>type</var> selector to suppress this.  This only applies to filesets nested into the task
+directly, not to filesets nested into a path or any other resource collection.</p>
 
 <h4>mapper</h4>
-<p><em>Since Ant 1.6.3,</em> a nested <a href="../Types/mapper.html">
-    mapper</a> can be specified.  Files specified via nested
-    <code>fileset</code>s, <code>filelist</code>s, or the <code>file</code>
-    attribute are mapped using the specified mapper.  For each file mapped,
-    the resulting files are touched. If no time has been specified and
-    the original file exists its timestamp will be used.
-    If no time has been specified and the original file does not exist the 
-    current time is used. Since Ant 1.8 the task settings (<code>millis</code>,
-    and <code>datetime</code>) have priority over the timestamp of the original
-    file.</p>
+<p><em>Since Ant 1.6.3</em>, a nested <a href="../Types/mapper.html">mapper</a> can be specified.
+Files specified via nested <code>fileset</code>s, <code>filelist</code>s, or the <code>file</code>
+attribute are mapped using the specified mapper.  For each file mapped, the resulting files are
+touched. If no time has been specified and the original file exists its timestamp will be used.  If
+no time has been specified and the original file does not exist the current time is used. <em>Since
+Ant 1.8</em>, the task settings (<var>millis</var> and <var>datetime</var>) have priority over the
+timestamp of the original file.</p>
 <h3>Examples</h3>
-<pre>  &lt;touch file=&quot;myfile&quot;/&gt;</pre>
-<p>creates <code>myfile</code> if it doesn't exist and changes the
-modification time to the current time.</p>
-<pre>  &lt;touch file=&quot;myfile&quot; datetime=&quot;06/28/2000 2:02 pm&quot;/&gt;</pre>
-<p>creates <code>myfile</code> if it doesn't exist and changes the
-modification time to Jun, 28 2000 2:02 pm (14:02 for those used to 24
-hour times).</p>
-<pre>  &lt;touch datetime=&quot;09/10/1974 4:30 pm&quot;&gt;
-    &lt;fileset dir=&quot;src_dir&quot;/&gt;
-  &lt;/touch&gt;</pre>
-<p>changes the modification time to Oct, 09 1974 4:30 pm of all files and directories 
-  found in <code>src_dir</code>. </p>
-<pre>  &lt;touch file=&quot;myfile&quot; datetime=&quot;06/28/2000 2:02:17 pm&quot;/&gt;</pre>
-<p>creates <code>myfile</code> if it doesn't exist and changes the
-modification time to Jun, 28 2000 2:02:17 pm (14:02:17 for those used to 24
-hour times), if the filesystem allows a precision of one second - a
-time close to it otherwise.</p>
-<pre>  &lt;touch file=&quot;foo&quot;&gt;
-    &lt;mapper type=&quot;glob&quot; from=&quot;foo&quot; to=&quot;bar&quot; /&gt;
-  &lt;/touch&gt;
-</pre>
-<p>creates <code>bar</code> if it doesn't exist and changes the
-modification time to that of <code>foo</code>.</p>
-
-<pre>  &lt;touch file=&quot;foo&quot; datetime=&quot;now&quot;&gt;
-    &lt;mapper type=&quot;regexp&quot; from=&quot;^src(.*)\.java&quot; to=&quot;shadow\1.empty&quot; /&gt;
-  &lt;/touch&gt;
-</pre>
-<p>creates files in the <code>shadow</code> directory for every java file in the
-   <code>src</code> directory if it doesn't exist and changes the modification
-   time of those files to the current time.</p>
 
+<pre>&lt;touch file=&quot;myfile&quot;/&gt;</pre>
+<p>creates <samp>myfile</samp> if it doesn't exist and changes the modification time to the current
+time.</p>
+
+<pre>&lt;touch file=&quot;myfile&quot; datetime=&quot;06/28/2000 2:02 pm&quot;/&gt;</pre>
+<p>creates <samp>myfile</samp> if it doesn't exist and changes the modification time to Jun, 28 2000
+2:02 pm (14:02 for those used to 24 hour time).</p>
+
+<pre>
+&lt;touch datetime=&quot;09/10/1974 4:30 pm&quot;&gt;
+    &lt;fileset dir=&quot;src_dir&quot;/&gt;
+&lt;/touch&gt;</pre>
+<p>changes the modification time to Oct, 09 1974 4:30 pm of all files and directories found
+in <samp>src_dir</samp>.</p>
+
+<pre>&lt;touch file=&quot;myfile&quot; datetime=&quot;06/28/2000 2:02:17 pm&quot;/&gt;</pre>
+<p>creates <samp>myfile</samp> if it doesn't exist and changes the modification time to Jun, 28 2000
+2:02:17 pm (14:02:17 for those used to 24 hour time), if the filesystem allows a precision of one
+second&mdash;a time close to it otherwise.</p>
+
+<pre>
+&lt;touch file=&quot;foo&quot;&gt;
+    &lt;mapper type=&quot;glob&quot; from=&quot;foo&quot; to=&quot;bar&quot;/&gt;
+&lt;/touch&gt;</pre>
+<p>creates <samp>bar</samp> if it doesn't exist and changes the modification time to that
+of <samp>foo</samp>.</p>
+
+<pre>
+&lt;touch file=&quot;foo&quot; datetime=&quot;now&quot;&gt;
+    &lt;mapper type=&quot;regexp&quot; from=&quot;^src(.*)\.java&quot; to=&quot;shadow\1.empty&quot;/&gt;
+&lt;/touch&gt;</pre>
+<p>creates files in the <samp>shadow</samp> directory for every <samp>.java</samp> file in
+the <samp>src</samp> directory if it doesn't exist and changes the modification time of those files
+to the current time.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/translate.html ant-1.10.3/manual/Tasks/translate.html
--- ant-1.9.10/manual/Tasks/translate.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/translate.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,27 +24,19 @@
 
 <body>
 
-<h2><a name="translate">Translate</a></h2>
+<h2 id="translate">Translate</h2>
 <h3>Description</h3>
-<p>Identifies keys in files delimited by special tokens
-and translates them with values read from resource bundles.
-</p>
-<p>
-A resource bundle contains locale-specific key-value pairs.
-A resource bundle is a hierarchical set of property files.
-A bundle name makes up its base family name.  Each file that
-makes up this bundle has this name plus its locale.  For example,
-if the resource bundle name is MyResources, the file that contains
-German text will take the name MyResources_de.  In addition to
-language, country and variant are also used to form the files in
-the bundle.
-</p>
-<p>
-The resource bundle lookup searches for resource files with various
-suffixes on the basis of (1) the desired locale and (2) the default
-locale (basebundlename), in the following order from lower-level
-(more specific) to parent-level (less specific):
-</p>
+<p>Identifies keys in files delimited by special tokens and translates them with values read from
+resource bundles.</p>
+<p>A resource bundle contains locale-specific key-value pairs.  A resource bundle is a hierarchical
+set of property files.  A bundle name makes up its base family name.  Each file that makes up this
+bundle has this name plus its locale.  For example, if the resource bundle name
+is <samp>MyResources</samp>, the file that contains German text will take the
+name <samp>MyResources_de</samp>.  In addition to language, country and variant are also used to
+form the files in the bundle.</p>
+<p>The resource bundle lookup searches for resource files with various suffixes on the basis of (1)
+the desired locale and (2) the default locale (basebundlename), in the following order from
+lower-level (more specific) to parent-level (less specific):</p>
 <pre>
 basebundlename + &quot;_&quot; + language1 + &quot;_&quot; + country1 + &quot;_&quot; + variant1
 basebundlename + &quot;_&quot; + language1 + &quot;_&quot; + country1
@@ -54,129 +46,103 @@
 basebundlename + &quot;_&quot; + language2 + &quot;_&quot; + country2
 basebundlename + &quot;_&quot; + language2
 </pre>
-<p>
-The file names generated thus are appended with the string &quot;.properties&quot;
-to make up the file names that are to be used.
-</p>
-<p>
-File encoding is supported.  The encoding scheme of the source files,
-destination files and the bundle files can be specified.
-
-Destination files can be explicitly overwritten using the
-<var>forceoverwrite</var> attribute.  If <var>forceoverwrite</var>
-is false, the destination file is overwritten only if either the
-source file or any of the files that make up the bundle have been
-modified after the destination file was last modified.
-</p>
-<p>
-<em>New in Apache Ant 1.6:</em><br>
-Line endings of source files are preserved in the translated files.
-</p>
-<p><a href="../Types/fileset.html">FileSet</a>s are used to select files to
-translate.
-</p>
+<p>The file names generated thus are appended with the string <samp>.properties</samp> to make up
+the file names that are to be used.</p>
+<p>File encoding is supported.  The encoding scheme of the source files, destination files and the
+bundle files can be specified.</p>
+<p>Destination files can be explicitly overwritten using the <var>forceoverwrite</var> attribute.
+If <var>forceoverwrite</var> is <q>false</q>, the destination file is overwritten only if either the
+source file or any of the files that make up the bundle have been modified after the destination
+file was last modified.</p>
+<p><em>Since Apache Ant 1.6</em> line endings of source files are preserved in the translated
+files.</p>
+<p><a href="../Types/fileset.html">FileSet</a>s are used to select files to translate.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">todir</td>
-    <td valign="top">Destination directory where destination files are
-      to be created.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>todir</td>
+    <td>Destination directory where destination files are to be created.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">starttoken</td>
-    <td valign="top">The starting token to identify keys.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>starttoken</td>
+    <td>The starting token to identify keys.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">endtoken</td>
-    <td valign="top">The ending token to identify keys.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>endtoken</td>
+    <td>The ending token to identify keys.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">bundle</td>
-    <td valign="top">Family name of resource bundle.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>bundle</td>
+    <td>Family name of resource bundle.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">bundlelanguage</td>
-    <td valign="top">
-        Locale specific language of resource bundle.  Defaults to
-        default locale's language.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>bundlelanguage</td>
+    <td>Locale specific language of resource bundle.</td>
+    <td>No; defaults to default locale's language</td>
   </tr>
   <tr>
-    <td valign="top">bundlecountry</td>
-    <td valign="top">
-        Locale specific country of resource bundle.  Defaults to
-        default locale's country.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>bundlecountry</td>
+    <td>Locale specific country of resource bundle.</td>
+    <td>No; defaults to default locale's country</td>
   </tr>
   <tr>
-    <td valign="top">bundlevariant</td>
-    <td valign="top">
-        Locale specific variant of resource bundle.  Defaults to
-        the default variant of the country and language being used.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>bundlevariant</td>
+    <td>Locale specific variant of resource bundle.</td>
+    <td>No; defaults to <var>bundlelanguage</var>_<var>bundlecountry</var></td>
   </tr>
   <tr>
-    <td valign="top">srcencoding</td>
-    <td valign="top">Source file encoding scheme.  Defaults to
-    system default file encoding.</td>
-    <td valign="top" align="center">No</td>
+    <td>srcencoding</td>
+    <td>Source file encoding scheme.</td>
+    <td>No; defaults to default JVM character encoding</td>
   </tr>
   <tr>
-    <td valign="top">destencoding</td>
-    <td valign="top">Destination file encoding scheme.  Defaults to
-    source file encoding.</td>
-    <td valign="top" align="center">No</td>
+    <td>destencoding</td>
+    <td>Destination file encoding scheme.</td>
+    <td>No; defaults to <var>srcencoding</var></td>
   </tr>
   <tr>
-    <td valign="top">bundleencoding</td>
-    <td valign="top">Resource Bundle file encoding scheme.  Defaults to
-    source file encoding.</td>
-    <td valign="top" align="center">No</td>
+    <td>bundleencoding</td>
+    <td>Resource Bundle file encoding scheme.</td>
+    <td>No; defaults to <var>srcencoding</var></td>
   </tr>
   <tr>
-    <td valign="top">forceoverwrite</td>
-    <td valign="top">Overwrite existing files even if the destination
-      files are newer. Defaults to &quot;no&quot;.</td>
-    <td valign="top" align="center">No</td>
+    <td>forceoverwrite</td>
+    <td>Overwrite existing files even if the destination files are newer.</td>
+    <td>No; defaults to <q>no</q></td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 
 <h4>fileset</h4>
- <p><a href="../Types/fileset.html">FileSets</a> are used to select files that
- contain keys for which value translated files are to be generated.
-</p>
+<p><a href="../Types/fileset.html">FileSets</a> are used to select files that contain keys for which
+value translated files are to be generated.</p>
+
 <h3>Examples</h3>
-<p><b>Translate source file encoded in english into its japanese
-equivalent using a resource bundle encoded in japanese.
-</b></p>
+<p><strong>Translate source file encoded in English into its Japanese equivalent using a resource
+bundle encoded in Japanese.</strong></p>
 <pre>
-  &lt;translate toDir=&quot;$(dest.dir}/ja&quot;
-        starttoken=&quot;#&quot;
-        endtoken=&quot;#&quot;
-        bundle=&quot;resource/BaseResource&quot;
-        bundlelanguage=&quot;ja&quot;
-        forceoverwrite=&quot;yes&quot;
-        srcencoding=&quot;ISO8859_1&quot;
-        destencoding=&quot;SJIS&quot;
-        bundleencoding=&quot;SJIS&quot;&gt;
-        &lt;fileset dir=&quot;${src.dir}&quot;&gt;
-            &lt;include name=&quot;**/*.jsp&quot;/&gt;
-        &lt;/fileset&gt;
-  &lt;/translate&gt;
-</pre>
+&lt;translate toDir=&quot;$(dest.dir}/ja&quot;
+           starttoken=&quot;#&quot;
+           endtoken=&quot;#&quot;
+           bundle=&quot;resource/BaseResource&quot;
+           bundlelanguage=&quot;ja&quot;
+           forceoverwrite=&quot;yes&quot;
+           srcencoding=&quot;ISO8859_1&quot;
+           destencoding=&quot;SJIS&quot;
+           bundleencoding=&quot;SJIS&quot;&gt;
+    &lt;fileset dir=&quot;${src.dir}&quot;&gt;
+        &lt;include name=&quot;**/*.jsp&quot;/&gt;
+    &lt;/fileset&gt;
+&lt;/translate&gt;</pre>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/truncate.html ant-1.10.3/manual/Tasks/truncate.html
--- ant-1.9.10/manual/Tasks/truncate.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/truncate.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,86 +24,78 @@
 
 <body>
 
-<h2><a name="touch">Truncate</a></h2>
+<h2 id="touch">Truncate</h2>
+<p><em>Since Apache Ant 1.7.1</em></p>
 <h3>Description</h3>
 
-<p>Set the length of one or more files, as the intermittently available
-<code>truncate</code> Unix utility/function. In addition to working with
-a single file, this Task can also work on
-<a href="../Types/resources.html">resources</a> and resource collections.
-<strong>Since Apache Ant 1.7.1</strong>.
-</p>
+<p>Set the length of one or more files, as the <code>truncate</code> Unix function or GNU
+utility. In addition to working with a single file, this Task can also work
+on <a href="../Types/resources.html">resources</a> and resource collections.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">The name of the file.</td>
-    <td valign="top" align="center">Unless a nested resource collection element
-       has been specified.</td>
+    <td>file</td>
+    <td>The name of the file.</td>
+    <td>Unless a nested resource collection element has been specified</td>
   </tr>
   <tr>
-    <td valign="top">length</td>
-    <td valign="top">Specifies the new file length (in bytes) to set.
-                     The following suffixes are supported:
+    <td>length</td>
+    <td>Specifies the new file length (in bytes) to set.  The following suffixes are supported:
       <ul>
-        <li>K : Kilobytes (1024 bytes)</li>
-        <li>M : Megabytes (1024 K)</li>
-        <li>G : Gigabytes (1024 M)</li>
-        <li>T : Terabytes (1024 G)</li>
-        <li>P : Petabytes (1024 T)</li>
+        <li><q>K</q> : Kilobytes (1024 bytes)</li>
+        <li><q>M</q> : Megabytes (1024 K)</li>
+        <li><q>G</q> : Gigabytes (1024 M)</li>
+        <li><q>T</q> : Terabytes (1024 G)</li>
+        <li><q>P</q> : Petabytes (1024 T)</li>
       </ul>
     </td>
-    <td valign="center" align="center" rowspan="2">At most one of these.
-      Omitting both implies <code>length="0"</code>.
+    <td rowspan="2">At most one of these; omitting both implies <var>length</var>=<q>0</q>
     </td>
   </tr>
   <tr>
-    <td valign="top">adjust</td>
-    <td valign="top">Specifies the number of bytes
-      (and positive/negative direction)
-      by which to adjust file lengths.  The same suffixes are supported
-      for this attribute as for the <code>length</code> attribute.
+    <td>adjust</td>
+    <td class="left">Specifies the number of bytes (and positive/negative direction) by which to
+      adjust file lengths.  The same suffixes are supported for this attribute as for
+      the <var>length</var> attribute.
     </td>
   </tr>
   <tr>
-    <td valign="top">create</td>
-    <td valign="top">Whether to create nonexistent files.</td>
-    <td valign="top" align="center">No, default <i>true</i>.</td>
+    <td>create</td>
+    <td>Whether to create nonexistent files.</td>
+    <td>No; default <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">mkdirs</td>
-    <td valign="top">Whether to create nonexistent parent
-       directories when creating new files.</td>
-    <td valign="top" align="center">No, default <i>false</i>.</td>
+    <td>mkdirs</td>
+    <td>Whether to create nonexistent parent directories when creating new files.</td>
+    <td>No; default <q>false</q></td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 <h4>any resource collection</h4>
 
-<p>You can use any number of nested resource collection elements to
-define the resources for this task and refer to resources defined
-elsewhere.  <b>Note:</b> resources passed to this task are expected
-to be filesystem-based.</p>
+<p>You can use any number of nested resource collection elements to define the resources for this
+task and refer to resources defined elsewhere.  <strong>Note</strong>: resources passed to this task
+are expected to be filesystem-based.</p>
 
 <h3>Examples</h3>
 
-<pre>  &lt;truncate file="foo" /&gt;</pre>
-<p>Sets the length of file <code>foo</code> to zero.</p>
+<pre>&lt;truncate file="foo"/&gt;</pre>
+<p>Sets the length of file <samp>foo</samp> to zero.</p>
 
-<pre>  &lt;truncate file="foo" length="1K" /&gt;</pre>
-<p>Sets the length of file <code>foo</code> to 1 kilobyte (1024 bytes).</p>
+<pre>&lt;truncate file="foo" length="1K"/&gt;</pre>
+<p>Sets the length of file <samp>foo</samp> to 1 kilobyte (1024 bytes).</p>
 
-<pre>  &lt;truncate file="foo" adjust="1K" /&gt;</pre>
-<p>Adjusts the length of file <code>foo</code> upward by 1 kilobyte.</p>
+<pre>&lt;truncate file="foo" adjust="1K"/&gt;</pre>
+<p>Adjusts the length of file <samp>foo</samp> upward by 1 kilobyte.</p>
 
-<pre>  &lt;truncate file="foo" adjust="-1M" /&gt;</pre>
-<p>Adjusts the length of file <code>foo</code> downward by 1 megabyte.</p>
+<pre>&lt;truncate file="foo" adjust="-1M"/&gt;</pre>
+<p>Adjusts the length of file <samp>foo</samp> downward by 1 megabyte.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/tstamp.html ant-1.10.3/manual/Tasks/tstamp.html
--- ant-1.9.10/manual/Tasks/tstamp.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/tstamp.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,144 +24,128 @@
 
 <body>
 
-<h2><a name="tstamp">Tstamp</a></h2>
+<h2 id="tstamp">Tstamp</h2>
 
 <h3>Description</h3>
-<p>Sets the <code>DSTAMP</code>, <code>TSTAMP</code>, and <code>TODAY</code>
-properties in the current project. By default,
-the <code>DSTAMP</code> property is in the
-format &quot;yyyyMMdd&quot;, <code>TSTAMP</code> is in the
-format &quot;hhmm&quot;, and <code>TODAY</code> is in the
-format &quot;MMMM dd yyyy&quot;. Use the nested <code>&lt;format&gt;</code> element
-to specify a different format.</p>
-
-<p>These properties can be used in the build-file, for instance, to create
-time-stamped filenames, or used to replace placeholder tags inside documents
-to indicate, for example, the release date. The best place for this task is
-probably in an initialization target.</p>
-
-<p><em>Since Ant 1.9.10</em> the magic
-  property <code>ant.tstamp.now</code> can be used to specify a fixed
-  date value in order to create reproducible builds. Its value must be
-  a number and is interpreted as seconds since the epoch (midnight
-  1970-01-01).</p>
+<p>Sets the <code>DSTAMP</code>, <code>TSTAMP</code>, and <code>TODAY</code> properties in the
+current project. By default, the <code>DSTAMP</code> property is in the
+format <q>yyyyMMdd</q>, <code>TSTAMP</code> is in the format <q>hhmm</q>, and <code>TODAY</code> is
+in the format <q>MMMM dd yyyy</q>. Use the nested <code>&lt;format&gt;</code> element to specify a
+different format.</p>
+
+<p>These properties can be used in the build file, for instance, to create timestamped filenames, or
+used to replace placeholder tags inside documents to indicate, for example, the release date. The
+best place for this task is probably in an initialization target.</p>
+
+<p><em>Since Ant 1.10.2</em> the magic property <code>ant.tstamp.now</code> can be used to specify a
+fixed date value in order to create reproducible builds. Its value must be a number and is
+interpreted as seconds since the epoch (midnight 1970-01-01). With <code>ant.tstamp.now.iso</code>
+you could also specify that value in ISO-8601 format (<code>1972-04-17T08:07:00Z</code>). If you
+specify a value in an invalid format an INFO message will be logged and the value will be
+ignored.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">prefix</td>
-    <td valign="top">Prefix used for all properties set. The default is no prefix.</td>
-    <td align="center" valign="top">No</td>
+    <td>prefix</td>
+    <td>Prefix used for all properties set.</td>
+    <td>No; default is no prefix</td>
   </tr>
 </table>
 
-<h3>Nested Elements</h3>
-The Tstamp task supports a <code>&lt;format&gt;</code> nested element that
-allows a property to be set to the current date and time in a given format.
-The date/time patterns are as defined in the Java
-<a href="http://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html">SimpleDateFormat</a> class.
-The format element also allows offsets to be applied to the time to generate different time values.
-<br><br>
-<table width="60%" border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">property</td>
-    <td valign="top">
-        The property to receive the date/time string in the given pattern.
-    </td>
-    <td align="center" valign="top">Yes</td>
-  </tr>
-  <tr>
-    <td valign="top">pattern</td>
-    <td valign="top">The date/time pattern to be used. The values are as defined by the Java SimpleDateFormat class.</td>
-    <td align="center" valign="top">Yes</td>
+<h3>Parameters specified as nested elements</h3>
+<p>The task supports a <code>&lt;format&gt;</code> nested element that allows a property to be set
+to the current date and time in a given format.  The date/time patterns are as defined in the
+Java <a href="https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html"
+target="_top">SimpleDateFormat</a> class.  The format element also allows offsets to be applied to
+the time to generate different time values.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>property</td>
+    <td>The property to receive the date/time string in the given pattern.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">timezone</td>
-    <td valign="top">The timezone to use for displaying time. The values are as defined by the Java <a href="http://docs.oracle.com/javase/7/docs/api/java/util/TimeZone.html">TimeZone</a> class.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">offset</td>
-    <td valign="top">The numeric offset to the current time</td>
-    <td align="center" valign="top">No</td>
+    <td>pattern</td>
+    <td>The date/time pattern to be used. The values are as defined by the Java SimpleDateFormat
+      class.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">unit</td>
-    <td valign="top">The unit of the offset to be applied to the current time.
-                     Valid Values are
-                     <ul>
-                        <li>millisecond</li>
-                        <li>second</li>
-                        <li>minute</li>
-                        <li>hour</li>
-                        <li>day</li>
-                        <li>week</li>
-                        <li>month</li>
-                        <li>year</li>
-                     </ul>
+    <td>timezone</td>
+    <td>The timezone to use for displaying time. The values are as defined by the
+      Java <a href="https://docs.oracle.com/javase/8/docs/api/java/util/TimeZone.html"
+      target="_top">TimeZone</a> class.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>offset</td>
+    <td>The numeric offset to the current time</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>unit</td>
+    <td>The unit of the offset to be applied to the current time.  Valid values are
+      <ul>
+        <li><q>millisecond</q></li>
+        <li><q>second</q></li>
+        <li><q>minute</q></li>
+        <li><q>hour</q></li>
+        <li><q>day</q></li>
+        <li><q>week</q></li>
+        <li><q>month</q></li>
+        <li><q>year</q></li>
+      </ul>
     </td>
-    <td align="center" valign="top">No</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">locale</td>
-    <td valign="top">The locale used to create date/time string. The general
-      form is &quot;language, country, variant&quot; but either variant or variant and
-      country may be omitted. For more information please refer to documentation
-      for the
-      <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Locale.html">Locale</a>
-      class.</td>
-    <td align="center" valign="top">No</td>
+    <td>locale</td>
+    <td>The locale used to create date/time string. The general form is <q>language[, country[,
+      variant]]</q> (either <q>variant</q> or both <q>variant</q> and <q>country</q> may be
+      omitted). For more information please refer to documentation for
+      the <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Locale.html"
+      target="_top">Locale</a> class.</td>
+    <td>No</td>
   </tr>
 </table>
 
 <h3>Examples</h3>
 
-<pre>
-  &lt;tstamp/&gt;
-</pre>
+<pre>&lt;tstamp/&gt;</pre>
+<p>sets the standard <code>DSTAMP</code>, <code>TSTAMP</code>, and <code>TODAY</code> properties
+according to the default formats.</p>
 
-<p>
-sets the standard <code>DSTAMP</code>, <code>TSTAMP</code>,
-and <code>TODAY</code> properties according to the default formats.</p>
 <pre>
-  &lt;tstamp&gt;
+&lt;tstamp&gt;
     &lt;format property=&quot;TODAY_GB&quot; pattern=&quot;d-MMMM-yyyy&quot; locale=&quot;en,GB&quot;/&gt;
-  &lt;/tstamp&gt;
-</pre>
-<p>
-sets the standard properties as well as the property
-<code>TODAY_UK</code> with the date/time pattern &quot;d-MMMM-yyyy&quot;
-using English locale (eg. 21-May-2001).</p>
-
-<pre>
-  &lt;tstamp&gt;
-      &lt;format property=&quot;touch.time&quot; pattern=&quot;MM/dd/yyyy hh:mm aa&quot;
-              offset=&quot;-5&quot; unit=&quot;hour&quot;/&gt;
-  &lt;/tstamp&gt;
-</pre>
-<p>
-Creates a timestamp, in the property touch.time, 5 hours before the current time. The format in this example
-is suitable for use with the <code>&lt;touch&gt;</code> task. The standard properties are set also.</p>
+&lt;/tstamp&gt;</pre>
+<p>sets the standard properties as well as the property <code>TODAY_UK</code> with the date/time
+pattern <q>d-MMMM-yyyy</q> using English locale (eg. 21-May-2001).</p>
 
 <pre>
-  &lt;tstamp prefix="start"/&gt;
-</pre>
-<p>
-Sets three properties with the standard formats, prefixed with "start.":
-<code>start.DSTAMP</code>, <code>start.TSTAMP</code>, and <code>start.TODAY</code>.</p>
-
-
-
+&lt;tstamp&gt;
+    &lt;format property=&quot;touch.time&quot; pattern=&quot;MM/dd/yyyy hh:mm aa&quot;
+            offset=&quot;-5&quot; unit=&quot;hour&quot;/&gt;
+&lt;/tstamp&gt;</pre>
+<p>Creates a timestamp, in the property <code>touch.time</code>, 5 hours before the current
+time. The format in this example is suitable for use with the <code>&lt;touch&gt;</code> task. The
+standard properties are set also.</p>
+
+<pre>&lt;tstamp prefix="start"/&gt;</pre>
+<p>Sets three properties with the standard formats, prefixed
+with <q>start.</q>: <code>start.DSTAMP</code>, <code>start.TSTAMP</code>,
+and <code>start.TODAY</code>.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/typedef.html ant-1.10.3/manual/Tasks/typedef.html
--- ant-1.9.10/manual/Tasks/typedef.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/typedef.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,246 +24,178 @@
 
 <body>
 
-<h2><a name="typedef">Typedef</a></h2>
+<h2 id="typedef">Typedef</h2>
 <h3>Description</h3>
-  <p>
-    Adds a task or a data type definition to the current project
-    such that this new type or task can be used in the current project.
-  </p>
-  <p>
-    A Task is any class that extends org.apache.tools.ant.Task or
-    can be adapted as a Task using an adapter class.
-  </p>
-  <p>
-    Data types are things like <a href="../using.html#path">paths</a> or
-    <a href="../Types/fileset.html">filesets</a> that can be defined at
-    the project level and referenced via their ID attribute.
-    Custom data types usually need custom tasks to put them to good use.
-  </p>
-  <p>
-    Two attributes are needed to make a definition: the name that
-    identifies this data type uniquely, and the full name of the class
-    (including its package name) that implements this type.
-  </p>
-  <p>
-    You can also define a group of definitions at once using the file or
-    resource attributes.  These attributes point to files in the format of
-    Java property files or an xml format.
-  </p>
-  <p>
-    For property files each line defines a single data type in the
-    format:</p>
-  <pre>
-    typename=fully.qualified.java.classname
-  </pre>
-    
-  <p>
-    The xml format is described in the
-    <a href="../Types/antlib.html">Antlib</a> section.
-  </p>
-
-  <p>If you are defining tasks or types that share the same classpath
-    with multiple taskdef or typedef tasks, the corresponding classes
-    will be loaded by different
-    Java <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/ClassLoader.html">ClassLoaders</a>.
-    Two classes with the same name loaded via different ClassLoaders
-    are not the same class from the point of view of the Java VM, they
-    don't share static variables and instances of these classes can't
-    access private methods or attributes of instances defined by "the
-    other class" of the same name.  They don't even belong to the same
-    Java package and can't access package private code, either.</p>
-
-  <p>The best way to load several tasks/types that are supposed to
-    cooperate with each other via shared Java code is to use the
-    resource attribute and an antlib descriptor.  If this is not
-    possible, the second best option is to use the loaderref attribute
-    and specify the same name for each and every typedef/taskdef -
-    this way the classes will share the same ClassLoader.  Note that
-    the typedef/taskdef tasks must use identical classpath definitions
-    (this includes the order of path components) for the loaderref
-    attribute to work.</p>
+<p>Adds a task or a data type definition to the current project such that this new type or task can
+be used in the current project.</p>
+<p>A Task is any class that extends <code class="code">org.apache.tools.ant.Task</code> or can be adapted
+as a Task using an adapter class.</p>
+<p>Data types are things like <a href="../using.html#path">paths</a>
+or <a href="../Types/fileset.html">filesets</a> that can be defined at the project level and
+referenced via their <var>id</var> attribute.  Custom data types usually need custom tasks to put
+them to good use.</p>
+<p>Two attributes are needed to make a definition: the name that identifies this data type uniquely,
+and the full name of the class (including its package name) that implements this type.</p>
+<p>You can also define a group of definitions at once using the file or resource attributes.  These
+attributes point to files in the format of Java property files or an xml format.</p>
+<p>For property files each line defines a single data type in the format:</p>
+<pre>typename=fully.qualified.java.classname</pre>
+<p>The xml format is described in the <a href="../Types/antlib.html">Antlib</a> section.</p>
+
+<p>If you are defining tasks or types that share the same classpath with
+multiple <code>taskdef</code> or <code>typedef</code> tasks, the corresponding classes will be
+loaded by different
+Java <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/ClassLoader.html"
+target="_top">ClassLoaders</a>.  Two classes with the same name loaded via different ClassLoaders
+are not the same class from the point of view of JVM, they don't share static variables and
+instances of these classes can't access private methods or attributes of instances defined by "the
+other class" of the same name.  They don't even belong to the same Java package and can't access
+package private code, either.</p>
+
+<p>The best way to load several tasks/types that are supposed to cooperate with each other via
+shared Java code is to use the <var>resource</var> attribute and an <code>antlib</code> descriptor.
+If this is not possible, the second best option is to use the <var>loaderref</var> attribute and
+specify the same name for each and every <code>typedef</code>/<code>taskdef</code>&mdash;this way
+the classes will share the same <code>ClassLoader</code>.  Note that
+the <code>typedef</code>/<code>taskdef</code> tasks must use identical classpath definitions (this
+includes the order of path components) for the <var>loaderref</var> attribute to work.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">name</td>
-    <td valign="top">the name of the data type</td>
-    <td valign="top" align="center">Yes, unless the file or resource type
-      attributes have been specified.</td>
-  </tr>
-  <tr>
-    <td valign="top">classname</td>
-    <td valign="top">the full class name implementing the data type</td>
-    <td valign="top" align="center">Yes, unless file or resource
-      have been specified.</td>
-  </tr>
-  <tr>
-    <td valign="top">file</td>
-    <td valign="top">Name of the file to load definitions from.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">resource</td>
-    <td valign="top">
-      Name of the resource to load definitions from.
-      If multiple resources by this name are found along the classpath,
-      and the format is "properties", the first resource will be loaded;
-      otherwise all such resources will be loaded.
-    </td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">format</td>
-    <td valign="top">The format of the file or resource. The values
-      are "properties" or "xml". If the value is "properties" the file/resource
-      is a property file contains name to classname pairs. If the value
-      is "xml", the file/resource is an xml file/resource structured according
-      to <a href="../Types/antlib.html">Antlib</a>.
-      The default is "properties" unless the file/resource name ends with
-      ".xml", in which case the format attribute will have the value "xml".
-      <b>since Apache Ant 1.6</b>
-    </td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">classpath</td> <td valign="top">the classpath to
-      use when looking up <code>classname</code>.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">
-      a reference to a classpath to use when looking up <code>classname</code>.
-    </td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">loaderRef</td>
-    <td valign="top">the name of the loader that is
-      used to load the class, constructed from the specified classpath. Use
-      this to allow multiple tasks/types to be loaded with the same loader,
-      so they can call each other. <b>since Ant 1.5</b> </td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">onerror</td>
-    <td valign="top">The action to take if there was a failure in defining the
-      type. The values are <i>fail</i>: cause a build exception; <i>report</i>:
-      output a warning, but continue; <i>ignore</i>: do nothing.
-      <b>since Ant 1.6</b>
-      An additional value is <i>failall</i>: cause all behavior of fail,
-      as well as a build exception for the resource or file attribute
-      if the resource or file is not found. <b>since Ant 1.7</b>
-      The default is <i>fail</i>.
-    </td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">adapter</td>
-    <td valign="top">A class that is used to adapt the defined class to
-      another interface/class. The adapter class must implement the interface
-      "org.apache.tools.ant.TypeAdapter". The adapter class will be used
-      to wrap the defined class unless the defined class implements/extends
-      the class defined by the attribute "adaptto".
-      If "adaptto" is not set, the defined class will always be wrapped.
-      <b>since Ant 1.6</b>
-    </td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">adaptto</td>
-    <td valign="top">This attribute is used in conjunction with the
-      adapter attribute.
-      If the defined class does not implement/extend the interface/class
-      specified by this attribute, the adaptor class will be used
-      to wrap the class. <b>since Ant 1.6</b>
-    </td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">uri</td>
-    <td valign="top">
-      The uri that this definition should live in.
-      <b>since Ant 1.6</b>
-    </td>
-    <td valign="top" align="center">No</td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>name</td>
+    <td>the name of the data type</td>
+    <td rowspan="2">Yes, unless <var>file</var> or <var>resource</var> attributes have been
+      specified.</td>
+  </tr>
+  <tr>
+    <td>classname</td>
+    <td class="left">the full class name implementing the data type</td>
+  </tr>
+  <tr>
+    <td>file</td>
+    <td>Name of the file to load definitions from.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>resource</td>
+    <td>Name of the resource to load definitions from.  If multiple resources by this name are found
+      along the classpath, and <var>format</var> is <q>properties</q>, the first resource will be
+      loaded; otherwise all such resources will be loaded.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>format</td>
+    <td>The format of the file or resource. The values are <q>properties</q>" or <q>xml</q>. If the
+      value is <q>properties</q> the file/resource is a property file contains name-classname
+      pairs. If the value is <q>xml</q>, the file/resource is an XML file/resource structured
+      according to <a href="../Types/antlib.html">Antlib</a>.  The default is <q>properties</q>
+      unless the file/resource name ends with <samp>.xml</samp>, in which case the <var>format</var>
+      attribute will have the value <q>xml</q>.  <em>Since Ant 1.6</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>classpath</td>
+    <td>the classpath to use when looking up <var>classname</var>.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>classpathref</td>
+    <td>a reference to a classpath to use when looking up <var>classname</var>.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>loaderRef</td>
+    <td>the name of the loader that is used to load the class, constructed from the specified
+      classpath. Use this to allow multiple tasks/types to be loaded with the same loader, so they
+      can call each other. <em>Since Ant 1.5</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>onerror</td>
+    <td>The action to take if there was a failure in defining the type. The values are <q>fail</q>:
+      cause a build exception; <q>report</q>: output a warning, but continue; <q>ignore</q>: do
+      nothing.  <em>Since Ant 1.6</em>, an additional value is <q>failall</q>: cause all behavior of
+      fail, as well as a build exception for the resource or file attribute if the resource or file
+      is not found.</td>
+    <td>No; default is <q>fail</q> (<em>since Ant 1.7</em>)</td>
+  </tr>
+  <tr>
+    <td>adapter</td>
+    <td>A class that is used to adapt the defined class to another interface/class. The adapter
+      class must implement the interface <code>org.apache.tools.ant.TypeAdapter</code>. The adapter
+      class will be used to wrap the defined class unless the defined class implements/extends the
+      class defined by the attribute <q>adaptto</q>.  If <q>adaptto</q> is not set, the defined
+      class will always be wrapped.  <em>Since Ant 1.6</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>adaptto</td>
+    <td>This attribute is used in conjunction with the adapter attribute.  If the defined class does
+      not implement/extend the interface/class specified by this attribute, the adaptor class will
+      be used to wrap the class. <em>Since Ant 1.6</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>uri</td>
+    <td>The uri that this definition should live in.  <em>Since Ant 1.6</em></td>
+    <td>No</td>
   </tr>
 </table>
-  <h3>Parameters specified as nested elements</h3>
-  <h4>classpath</h4>
-  <p><code>Typedef</code>'s <i>classpath</i> attribute is a 
-    <a href="../using.html#path">path-like structure</a> and can also be set
-    via a nested <i>classpath</i> element.</p>
+<h3>Parameters specified as nested elements</h3>
+<h4>classpath</h4>
+<p><code>Typedef</code>'s <var>classpath</var> attribute is a <a href="../using.html#path">path-like
+structure</a> and can also be set via a nested <code>classpath</code> element.</p>
 
 <h3>Examples</h3>
-  The following fragment defines define a type called <i>urlset</i>.
-  <pre>
-    &lt;typedef name="urlset" classname="com.mydomain.URLSet"/&gt; </pre>
-  The data type is now available to Ant. The
-  class <code>com.mydomain.URLSet</code> implements this type.</p>
-
-
-  <p>
-    Assuming a class <i>org.acme.ant.RunnableAdapter</i> that
-    extends Task and implements <i>org.apache.tools.ant.TypeAdapter</i>,
-    and in the execute method invokes <i>run</i> on the proxied object,
-    one may use a Runnable class as an Ant task. The following fragment
-    defines a task called <i>runclock</i>.
-  </p>
-  <pre>
-    &lt;typedef name="runclock"
-             classname="com.acme.ant.RunClock"
-             adapter="org.acme.ant.RunnableAdapter"/&gt;
-  </pre>
-
-
-  <p>
-    The following fragment shows the use of the classpathref and
-    loaderref to load up two definitions.
-  </p>
-  <pre>
-    &lt;path id="lib.path"&gt;
-      &lt;fileset dir="lib" includes="lib/*.jar"/&gt;
-    &lt;/path&gt;
-
-    &lt;typedef name="filter1"
-             classname="org.acme.filters.Filter1"
-             classpathref="lib.path"
-             loaderref="lib.path.loader"
-             /&gt;
-    &lt;typedef name="filter2"
-             classname="org.acme.filters.Filter2"
-             loaderref="lib.path.loader"
-             /&gt;
-  </pre>
-  
-  
-  <p>
-    If you want to load an antlib into a special xml-namespace, the <tt>uri</tt> attribute
-    is important:
-  </p>
-  <pre>
-  &lt;project xmlns:antcontrib="antlib:net.sf.antcontrib"&gt;
+<p>The following fragment defines define a type called <code>urlset</code>.</p>
+<pre>&lt;typedef name="urlset" classname="com.mydomain.URLSet"/&gt;</pre>
+<p>The data type is now available to Ant. The class <code>com.mydomain.URLSet</code> implements this
+type.</p>
+
+<p>Assuming a class <code>org.acme.ant.RunnableAdapter</code> that extends Task and
+implements <code class="code">org.apache.tools.ant.TypeAdapter</code>, and in
+the <code class="code">execute()</code> method invokes <code class="code">run()</code> on the
+proxied object, one may use a <code>Runnable</code> class as an Ant task. The following fragment
+defines a task called <code>runclock</code>.</p>
+<pre>
+&lt;typedef name="runclock"
+         classname="com.acme.ant.RunClock"
+         adapter="org.acme.ant.RunnableAdapter"/&gt;</pre>
+
+<p>The following fragment shows the use of the <var>classpathref</var> and <var>loaderref</var> to
+load up two definitions.</p>
+<pre>
+&lt;path id="lib.path"&gt;
+    &lt;fileset dir="lib" includes="lib/*.jar"/&gt;
+&lt;/path&gt;
+
+&lt;typedef name="filter1"
+         classname="org.acme.filters.Filter1"
+         classpathref="lib.path"
+         loaderref="lib.path.loader"/&gt;
+&lt;typedef name="filter2"
+         classname="org.acme.filters.Filter2"
+         loaderref="lib.path.loader"/&gt;</pre>
+
+<p>If you want to load an antlib into a special xml-namespace, the <tt>uri</tt> attribute is
+important:</p>
+<pre>
+&lt;project xmlns:antcontrib="antlib:net.sf.antcontrib"&gt;
      &lt;taskdef uri="antlib:net.sf.antcontrib"
               resource="net/sf/antcontrib/antlib.xml"
-              classpath="path/to/ant-contrib.jar"/&gt;
-  </pre>
-            
-<p>Here the namespace
-  declaration <code>xmlns:antcontrib="antlib:net.sf.antcontrib"</code>
-  allows tasks and types of the AntContrib Antlib to be used with the
-  <code>antcontrib</code> prefix
-  like <code>&lt;antcontrib:if&gt;</code>.
-  The normal rules of XML namespaces apply and you can declare the
-  prefix at any element to make it usable for the element it is
-  declared on as well as all its child elements.</p>
+              classpath="path/to/ant-contrib.jar"/&gt;</pre>
 
+<p>Here the namespace declaration <code>xmlns:antcontrib="antlib:net.sf.antcontrib"</code> allows
+tasks and types of the Ant-Contrib Antlib to be used with the <samp>antcontrib</samp> prefix
+like <code>&lt;antcontrib:if&gt;</code>.  The normal rules of XML namespaces apply and you can
+declare the prefix at any element to make it usable for the element it is declared on as well as all
+its child elements.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/unpack.html ant-1.10.3/manual/Tasks/unpack.html
--- ant-1.9.10/manual/Tasks/unpack.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/unpack.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,94 +24,85 @@
 
 <body>
 
-<h2><a name="unpack">GUnzip/BUnzip2</a></h2>
+<h2 id="unpack">GUnzip/BUnzip2/UnXZ</h2>
 <h3>Description</h3>
-<p>Expands a resource packed using GZip or BZip2.</p>
+<p>Expands a resource packed using GZip, BZip2 or XZ.</p>
 
-<p>If <i>dest</i> is a directory the name of the destination file is
-the same as <i>src</i> (with the &quot;.gz&quot; or &quot;.bz2&quot;
-extension removed if present). If <i>dest</i> is omitted, the parent
-dir of <i>src</i> is taken. The file is only expanded if the source
-resource is newer than the destination file, or when the destination file
-does not exist.</p>
+<p>If <var>dest</var> is a directory the name of the destination file is the same as <var>src</var>
+(with the <q>.gz</q>, <q>.bz2</q> or <q>.xz</q> extension removed if present). If <var>dest</var> is
+omitted, the parent dir of <var>src</var> is taken. The file is only expanded if the source resource
+is newer than the destination file, or when the destination file does not exist.</p>
+
+<p>XZ compression support has been added <em>since Apache Ant 1.10.1</em> and depends on external
+libraries not included in the Ant distribution.
+See <a href="../install.html#librarydependencies">Library Dependencies</a> for more information.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">src</td>
-    <td valign="top">the file to expand.</td>
-    <td align="center" valign="top">Yes, or a nested resource collection.</td>
+    <td>src</td>
+    <td>the file to expand.</td>
+    <td>Yes, or a nested resource collection</td>
   </tr>
   <tr>
-    <td valign="top">dest</td>
-    <td valign="top">the destination file or directory.</td>
-    <td align="center" valign="top">No</td>
+    <td>dest</td>
+    <td>the destination file or directory.</td>
+    <td>No</td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 
-<h4>any <a href="../Types/resources.html">resource</a> or single element
-resource collection</h4>
+<h4>any <a href="../Types/resources.html">resource</a> or single element resource collection</h4>
 
-<p>The specified resource will be used as src.</p>
+<p>The specified resource will be used as <var>src</var>.</p>
 
 <h3>Examples</h3>
-<blockquote><pre>
-&lt;gunzip src=&quot;test.tar.gz&quot;/&gt;
-</pre></blockquote>
-<p>expands <i>test.tar.gz</i> to <i>test.tar</i></p>
-<blockquote><pre>
-&lt;bunzip2 src=&quot;test.tar.bz2&quot;/&gt;
-</pre></blockquote>
-<p>expands <i>test.tar.bz2</i> to <i>test.tar</i></p>
-<blockquote><pre>
-&lt;gunzip src=&quot;test.tar.gz&quot; dest=&quot;test2.tar&quot;/&gt;
-</pre></blockquote>
-<p>expands <i>test.tar.gz</i> to <i>test2.tar</i></p>
-<blockquote><pre>
-&lt;gunzip src=&quot;test.tar.gz&quot; dest=&quot;subdir&quot;/&gt;
-</pre></blockquote>
-<p>expands <i>test.tar.gz</i> to <i>subdir/test.tar</i> (assuming
-subdir is a directory).</p>
-<blockquote><pre>
-&lt;gunzip dest=&quot;.&quot;&gt;
-  &lt;url url="http://example.org/archive.tar.gz"/&gt;
-&lt;/gunzip&gt;
-</pre></blockquote>
-<p>downloads <i>http://example.org/archive.tar.gz</i> and expands it
-to <i>archive.tar</i> in the project's basedir on the fly.</p>
+<pre>&lt;gunzip src=&quot;test.tar.gz&quot;/&gt;</pre>
+<p>expands <samp>test.tar.gz</samp> to <samp>test.tar</samp></p>
 
-<h3>Related tasks</h3>
+<pre>&lt;bunzip2 src=&quot;test.tar.bz2&quot;/&gt;</pre>
+<p>expands <samp>test.tar.bz2</samp> to <samp>test.tar</samp></p>
+
+<pre>&lt;unxz src=&quot;test.tar.xz&quot;/&gt;</pre>
+<p>expands <samp>test.tar.xz</samp> to <samp>test.tar</samp></p>
+
+<pre>&lt;gunzip src=&quot;test.tar.gz&quot; dest=&quot;test2.tar&quot;/&gt;</pre>
+<p>expands <samp>test.tar.gz</samp> to <samp>test2.tar</samp></p>
+
+<pre>&lt;gunzip src=&quot;test.tar.gz&quot; dest=&quot;subdir&quot;/&gt;</pre>
+<p>expands <samp>test.tar.gz</samp> to <samp>subdir/test.tar</samp> (assuming subdir is a
+directory).</p>
 
 <pre>
-&lt;gunzip src="some-archive.gz" dest="some-dest-dir"/&gt;
+&lt;gunzip dest=&quot;.&quot;&gt;
+  &lt;url url="http://example.org/archive.tar.gz"/&gt;
+&lt;/gunzip&gt;
 </pre>
+<p>downloads <samp>http://example.org/archive.tar.gz</samp> and expands it
+to <samp>archive.tar</samp> in the project's <var>basedir</var> on the fly.</p>
 
-is identical to
+<h3>Related tasks</h3>
 
+<pre>&lt;gunzip src="some-archive.gz" dest="some-dest-dir"/&gt;</pre>
+<p>is identical to</p>
 <pre>
 &lt;copy todir="some-dest-dir"&gt;
   &lt;gzipresource&gt;
     &lt;file file="some-archive.gz"/&gt;
   &lt;/gzipresource&gt;
   &lt;mapper type="glob" from="*.gz" to="*"/&gt;
-&lt;/copy&gt;
-</pre>
-
-<p>The same is also true for <code>&lt;bunzip2&gt;</code> and
-<code>&lt;bzip2resource&gt;</code>.  <code>&lt;copy&gt;</code> offers
-additional features like <a
-href="../Types/filterchain.html">filtering files</a> on the fly,
-allowing a file to be mapped to multiple destinations, preserving the
-last modified time or a configurable file system timestamp
-granularity.</p>
-
+&lt;/copy&gt;</pre>
 
+<p>The same is also true for <code>&lt;bunzip2&gt;</code> and <code>&lt;bzip2resource&gt;</code>
+or <code>&lt;unxz&gt;</code> and <code>&lt;xzresource&gt;</code>.  <code>&lt;copy&gt;</code> offers
+additional features like <a href="../Types/filterchain.html">filtering files</a> on the fly,
+allowing a file to be mapped to multiple destinations, preserving the last modified time or a
+configurable file system timestamp granularity.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/untar.html ant-1.10.3/manual/Tasks/untar.html
--- ant-1.9.10/manual/Tasks/untar.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/untar.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,12 +24,11 @@
 
 <body>
 
-<h2><a name="untar">Untar</a></h2>
+<h2 id="untar">Untar</h2>
 <h3>Description</h3>
 <p>Untars a tarfile.</p>
 
-This document has moved <A HREF="unzip.html">here</A>
+This document has moved <a href="unzip.html">here</a>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/unzip.html ant-1.10.3/manual/Tasks/unzip.html
--- ant-1.9.10/manual/Tasks/unzip.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/unzip.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,130 +24,106 @@
 
 <body>
 
-<h2><a name="unzip">Unjar/Untar/Unwar/Unzip</a></h2>
+<h2 id="unzip">Unjar/Untar/Unwar/Unzip</h2>
 <h3>Description</h3>
 <p>Unzips a zip-, war-, or jar file.</p>
-<p><a href="../Types/patternset.html">PatternSet</a>s are used to select files to extract
-<I>from</I> the archive.  If no patternset is used, all files are extracted.
-</p>
-
-<p><a href="../Types/resources.html#collection">Resource
-Collection</a>s may be used to select archived files to perform
-unarchival upon.  Only file system based resource collections are
-supported by Unjar/Unwar/Unzip, this includes <a
-href="../Types/fileset.html">fileset</a>, <a
-href="../Types/filelist.html">filelist</a>, <a
-href="../using.html#path">path</a>, and <a
-href="../Types/resources.html#files">files</a>.
-Untar supports arbitrary resource collections.
-Prior to Apache Ant 1.7 only fileset has been supported as a nested element.</p>
-
-<p>You can define filename transformations by using a nested <a href="../Types/mapper.html">mapper</a> element.  The default mapper is the
-<a href="../Types/mapper.html#identity-mapper">identity mapper</a>.
-</p>
-<p>File permissions will not be restored on extracted files.</p>
-<p>The untar task recognizes the long pathname entries used by GNU tar.<p>
+<p><a href="../Types/patternset.html">PatternSet</a>s are used to select files to
+extract <em>from</em> the archive.  If no patternset is used, all files are extracted.</p>
 
-<p><b>Please note</b> that different ZIP tools handle timestamps
-differently when it comes to applying timezone offset calculations of
-files.  Some ZIP libraries will store the timestamps as they've been
-read from the filesystem while others will modify the timestamps both
-when reading and writing the files to make all timestamps use the same
-timezone.  A ZIP archive created by one library may extract files with
-"wrong timestamps" when extracted by another library.</p>
-
-<p>Ant's ZIP classes use the same algorithm as the InfoZIP tools and
-zlib (timestamps get adjusted), Windows' "compressed folders" function
-and WinZIP don't change the timestamps.  This means that using the
-unzip task on files created by Windows' compressed folders function
-may create files with timestamps that are "wrong", the same is true if
-you use Windows' functions to extract an Ant generated ZIP
-archive.</p>
+<p><a href="../Types/resources.html#collection">resource collections</a> may be used to select
+archived files to perform unarchival upon.  Only file system based resource collections are
+supported by <code>Unjar</code>/<code>Unwar</code>/<code>Unzip</code>, this
+includes <a href="../Types/fileset.html">fileset</a>, <a href="../Types/filelist.html">filelist</a>, <a href="../using.html#path">path</a>,
+and <a href="../Types/resources.html#files">files</a>. <code>Untar</code> supports arbitrary
+resource collections.  Prior to Apache Ant 1.7 only <code>fileset</code> has been supported as a
+nested element.</p>
+
+<p>You can define filename transformations by using a
+nested <a href="../Types/mapper.html">mapper</a> element.  The default mapper is the
+<a href="../Types/mapper.html#identity-mapper">identity mapper</a>.</p>
+<p>File permissions will not be restored on extracted files.</p>
+<p>The <code>untar</code> task recognizes the long pathname entries used by GNU tar.<p>
 
+<p><strong>Please note</strong> that different ZIP tools handle timestamps differently when it comes
+to applying timezone offset calculations of files.  Some ZIP libraries will store the timestamps as
+they've been read from the filesystem while others will modify the timestamps both when reading and
+writing the files to make all timestamps use the same timezone.  A ZIP archive created by one
+library may extract files with "wrong timestamps" when extracted by another library.</p>
+
+<p>Ant's ZIP classes use the same algorithm as the InfoZIP tools and zlib (timestamps get adjusted),
+Windows' "compressed folders" function and WinZIP don't change the timestamps.  This means that
+using the <code>unzip</code> task on files created by Windows' compressed folders function may
+create files with timestamps that are "wrong", the same is true if you use Windows' functions to
+extract an Ant generated ZIP archive.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>src</td>
+    <td>archive file to expand.</td>
+    <td>Yes, unless filesets are used</td>
+  </tr>
+  <tr>
+    <td>dest</td>
+    <td>directory where to store the expanded files.</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>overwrite</td>
+    <td>Overwrite files, even if they are newer than the corresponding entries in the archive
+      (<q>true|false</q>).</td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+  <tr>
+    <td>compression</td>
+    <td><strong>Note</strong>: This attribute is only available for the <code>untar</code> task.<br/>
+      compression method.  Allowable values are <q>none</q>, <q>gzip</q>, <q>xz</q>
+      and <q>bzip2</q>.</td>
+    <td>No; default is <q>none</q></td>
+  </tr>
+  <tr>
+    <td>encoding</td>
+    <td>The character encoding that has been used for filenames inside the zip file.  For a list of
+      possible values see
+      the <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html"
+      target="_top">Supported Encodings</a>.<br/>  Use the magic value <q>native-encoding</q> for
+      default JVM character encoding.<br/>  See also the <a href="zip.html#encoding">discussion in
+      the zip task page</a></td>
+    <td>No; defaults to <q>UTF8</q> for <code>unzip</code> and default JVM character encoding
+      for <code>untar</code> task</td>
+  </tr>
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">src</td>
-    <td valign="top">archive file to expand.</td>
-    <td align="center" valign="top">Yes, if filesets are not used.</td>
-  </tr>
-  <tr>
-    <td valign="top">dest</td>
-    <td valign="top">directory where to store the expanded files.</td>
-    <td align="center" valign="top">Yes</td>
-  </tr>
-  <tr>
-    <td valign="top">overwrite</td>
-    <td valign="top">Overwrite files, even if they are newer than the
-      corresponding entries in the archive (true or false, default is
-      true).</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">compression</td>
-    <td valign="top"><b>Note:</b> This attribute is only available for
-    the <code>untar</code> task.<br>
-    compression method.  Allowable values are &quot;none&quot;,
-    &quot;gzip&quot; and &quot;bzip2&quot;.  Default is
-    &quot;none&quot;.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">
-    The character encoding that has been used for filenames
-    inside the zip file.  For a list of possible values see the <a
-    href="http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html">Supported Encodings</a>.<br/>
-    Defaults to &quot;UTF8&quot; for the <code>unzip</code> and the
-    platform's default encoding for the <code>untar</code> task.  Use
-    the magic value
-    <code>native-encoding</code> for the platform's default character
-    encoding.
-      <br/>See also the <a href="zip.html#encoding">discussion in the
-      zip task page</a></td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">failOnEmptyArchive</td>
-    <td valign="top">whether trying to extract an empty archive is an
-      error. <em>since Ant 1.8.0</em></td>
-    <td valign="top" align="center">No, defaults to false</td>
-  </tr>
-  <tr>
-    <td valign="top">stripAbsolutePathSpec</td>
-    <td valign="top">whether Ant should remove leading '/' or '\'
-      characters from the extracted file name before extracting it.
-      Note that this changes the entry's name before applying
-      include/exclude patterns and before using the nested mappers (if
-      any).  <em>since Ant 1.8.0</em></td>
-    <td valign="top" align="center">No, defaults to false</td>
-  </tr>
-  <tr>
-    <td valign="top">scanForUnicodeExtraFields</td>
-    <td valign="top"><b>Note:</b> This attribute is not available for
-    the <code>untar</code> task.<br>
-      If the archive contains uncode extra fields then use them to set
-      the file names, ignoring the specified encoding.
-      <br/>See also the <a href="zip.html#encoding">discussion in the
-      zip task page</a></td>
-    <td align="center" valign="top">No, defaults to true</td>
+    <td>failOnEmptyArchive</td>
+    <td>whether trying to extract an empty archive is an error. <em>since Ant 1.8.0</em></td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>stripAbsolutePathSpec</td>
+    <td>whether Ant should remove leading <q>/</q> or <q>\</q> characters from the extracted file
+      name before extracting it.  Note that this changes the entry name before
+      applying <code>include</code>/<code>exclude</code> patterns and before using the nested
+      mappers (if any).  <em>since Ant 1.8.0</em></td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>scanForUnicodeExtraFields</td>
+    <td><strong>Note</strong>: This attribute is not available for the <code>untar</code> task.<br/>
+      If the archive contains Unicode extra fields then use them to set the file names, ignoring the
+      specified encoding.  <br/>See also the <a href="zip.html#encoding">discussion in the zip task
+      page</a></td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
 </table>
 <h3>Examples</h3>
-<pre>
-&lt;unzip src=&quot;${tomcat_src}/tools-src.zip&quot; dest=&quot;${tools.home}&quot;/&gt;
-</pre>
-<p>
+<pre>&lt;unzip src=&quot;${tomcat_src}/tools-src.zip&quot; dest=&quot;${tools.home}&quot;/&gt;</pre>
 <pre>
 &lt;gunzip src=&quot;tools.tar.gz&quot;/&gt;
-&lt;untar src=&quot;tools.tar&quot; dest=&quot;${tools.home}&quot;/&gt;
-</pre>
+&lt;untar src=&quot;tools.tar&quot; dest=&quot;${tools.home}&quot;/&gt;</pre>
 <pre>
 &lt;unzip src=&quot;${tomcat_src}/tools-src.zip&quot;
        dest=&quot;${tools.home}&quot;&gt;
@@ -155,9 +131,7 @@
         &lt;include name=&quot;**/*.java&quot;/&gt;
         &lt;exclude name=&quot;**/Test*.java&quot;/&gt;
     &lt;/patternset&gt;
-&lt;/unzip&gt;
-</pre>
-<p>
+&lt;/unzip&gt;</pre>
 <pre>
 &lt;unzip dest=&quot;${tools.home}&quot;&gt;
     &lt;patternset&gt;
@@ -168,17 +142,14 @@
         &lt;include name=&quot;**/*.zip&quot;/&gt;
         &lt;exclude name=&quot;**/tmp*.zip&quot;/&gt;
     &lt;/fileset&gt;
-&lt;/unzip&gt;
-</pre>
-<p>
+&lt;/unzip&gt;</pre>
 <pre>
 &lt;unzip src=&quot;apache-ant-bin.zip&quot; dest=&quot;${tools.home}&quot;&gt;
     &lt;patternset&gt;
         &lt;include name=&quot;apache-ant/lib/ant.jar&quot;/&gt;
     &lt;/patternset&gt;
     &lt;mapper type=&quot;flatten&quot;/&gt;
-&lt;/unzip&gt;
-</pre>
+&lt;/unzip&gt;</pre>
 
 <h3>Related tasks</h3>
 
@@ -188,10 +159,9 @@
     &lt;include name="some-pattern"/&gt;
   &lt;/patternset&gt;
   &lt;mapper type=&quot;some-mapper&quot;/&gt;
-&lt;/unzip&gt;
-</pre>
+&lt;/unzip&gt;</pre>
 
-is identical to
+<p>is identical to</p>
 
 <pre>
 &lt;copy todir="some-dir" preservelastmodified="true"&gt;
@@ -201,21 +171,19 @@
     &lt;/patternset&gt;
   &lt;/zipfileset&gt;
   &lt;mapper type=&quot;some-mapper&quot;/&gt;
-&lt;/copy&gt;
-</pre>
+&lt;/copy&gt;</pre>
 
-<p>The same is also true for <code>&lt;untar&gt;</code> and
-<code>&lt;tarfileset&gt;</code>.  <code>&lt;copy&gt;</code> offers
-additional features like <a href="../Types/filterchain.html">filtering files</a> on the fly,
-allowing a file to be mapped to multiple destinations or a
-configurable file system timestamp granularity.</p>
+<p>The same is also true for <code>&lt;untar&gt;</code>
+and <code>&lt;tarfileset&gt;</code>.  <code>&lt;copy&gt;</code> offers additional features
+like <a href="../Types/filterchain.html">filtering files</a> on the fly, allowing a file to be
+mapped to multiple destinations or a configurable file system timestamp granularity.</p>
 
 <pre>&lt;zip destfile=&quot;new.jar&quot;&gt;
   &lt;zipfileset src=&quot;old.jar&quot;&gt;
     &lt;exclude name=&quot;do/not/include/this/class&quot;/&gt;
   &lt;/zipfileset&gt;
-&lt;/zip&gt;
-</pre>
+&lt;/zip&gt;</pre>
+
 <p>&quot;Deletes&quot; files from a zipfile.</p>
 
 <pre>
@@ -223,11 +191,11 @@
   &lt;patternset&gt;
     &lt;include name=&quot;images/&quot;/&gt;
   &lt;/patternset&gt;
-&lt;/unzip&gt;
-</pre>
-<p>This extracts all images from <tt>ant.jar</tt> which are stored in the <tt>images</tt> directory
-of the Jar (or somewhere under it). While extracting the directory structure (<tt>images</tt>)
-will be taken.</p>
+&lt;/unzip&gt;</pre>
+
+<p>This extracts all images from <samp>ant.jar</samp> which are stored in the <samp>images</samp>
+directory of the Jar (or somewhere under it). While extracting the directory structure
+(<samp>images</samp>) will be taken.</p>
 
 <pre>
 &lt;unzip src=&quot;${ant.home}/lib/ant.jar&quot; dest=&quot;...&quot;&gt;
@@ -235,10 +203,11 @@
     &lt;include name=&quot;**/ant_logo_large.gif&quot;/&gt;
     &lt;include name=&quot;**/LICENSE.txt&quot;/&gt;
   &lt;/patternset&gt;
-&lt;/unzip&gt;
-</pre>
-<p>This extracts the two files <tt>ant_logo_large.gif</tt> and <tt>LICENSE.txt</tt> from the
-<tt>ant.jar</tt>. More exactly: it extracts all files with these names from anywhere in the source file. While extracting the directory structure will be taken.</p>
+&lt;/unzip&gt;</pre>
+
+<p>This extracts the two files <samp>ant_logo_large.gif</samp> and <samp>LICENSE.txt</samp> from
+the <samp>ant.jar</samp>. More exactly: it extracts all files with these names from anywhere in the
+source file. While extracting the directory structure will be taken.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/uptodate.html ant-1.10.3/manual/Tasks/uptodate.html
--- ant-1.9.10/manual/Tasks/uptodate.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/uptodate.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,154 +24,129 @@
 
 <body>
 
-<h2><a name="uptodate">Uptodate</a></h2>
+<h2 id="uptodate">Uptodate</h2>
 <h3>Description</h3>
-<p>Sets a property if a target file or set of target files is more up-to-date
-than a source file or set of source files. A single source file is specified
-using the <code>srcfile</code> attribute. A set of source files is specified
-using the nested <code>&lt;srcfiles&gt;</code>
-elements. These are <a href="../Types/fileset.html">FileSet</a>s,
-whereas multiple target files are specified using a nested
-<a href="../Types/mapper.html"><code>&lt;mapper&gt;</code></a> element.</p>
-<p>By default, the value of the property is set to <code>true</code> if
-the timestamp of the source file(s) is not more recent than the timestamp of
-the corresponding target file(s). You can set the value to something other
-than the default by specifying the <code>value</code> attribute.</p>
+<p>Sets a property if a target file or set of target files is more up-to-date than a source file or
+set of source files. A single source file is specified using the <var>srcfile</var> attribute. A set
+of source files is specified using the nested <code>&lt;srcfiles&gt;</code> elements. These
+are <a href="../Types/fileset.html">FileSet</a>s, whereas multiple target files are specified using
+a nested <a href="../Types/mapper.html"><code>&lt;mapper&gt;</code></a> element.</p>
+<p>By default, the value of the property is set to <q>true</q> if the timestamp of the source
+file(s) is not more recent than the timestamp of the corresponding target file(s). You can set the
+value to something other than the default by specifying the <var>value</var> attribute.</p>
 <p>If a <code>&lt;srcfiles&gt;</code> element is used, without also specifying
-a <code>&lt;mapper&gt;</code> element, the default behavior is to use a
-<a href="../Types/mapper.html#merge-mapper">merge mapper</a>, with the
-<code>to</code> attribute set to the value of the
-<code>targetfile</code> attribute.</p>
-<p>Normally, this task is used to set properties that are useful to avoid
-target execution depending on the relative age of the specified files.</p>
+a <code>&lt;mapper&gt;</code> element, the default behavior is to use
+a <a href="../Types/mapper.html#merge-mapper">merge mapper</a>, with the <var>to</var> attribute set
+to the value of the <var>targetfile</var> attribute.</p>
+<p>Normally, this task is used to set properties that are useful to avoid target execution depending
+on the relative age of the specified files.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">property</td>
-    <td valign="top">The name of the property to set.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>property</td>
+    <td>The name of the property to set.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">The value to set the property to.</td>
-    <td valign="top" align="center">No; defaults to <code>true</code>.</td>
+    <td>value</td>
+    <td>The value to set the property to.</td>
+    <td>No; defaults to <q>true</q>.</td>
   </tr>
   <tr>
-    <td valign="top">srcfile</td>
-    <td valign="top">The file to check against the target file(s).</td>
-    <td valign="top" align="center">Yes, unless a nested
+    <td>srcfile</td>
+    <td>The file to check against the target file(s).</td>
+    <td>Yes, unless a nested
     <code>&lt;srcfiles&gt;</code> or <code>&lt;srcresources&gt;</code>
     element is present.</td>
   </tr>
   <tr>
-    <td valign="top">targetfile</td>
-    <td valign="top">The file for which we want to determine the status.</td>
-    <td valign="top" align="center">Yes, unless a nested
-      <code>&lt;mapper&gt;</code> element is present.</td>
+    <td>targetfile</td>
+    <td>The file for which we want to determine the status.</td>
+    <td>Yes, unless a nested <code>&lt;mapper&gt;</code> element is present.</td>
   </tr>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
-<h4><a name="srcfiles">srcfiles</a></h4>
-<p>The nested <code>&lt;srcfiles&gt;</code> element is a
-<a href="../Types/fileset.html">fileset</a> and allows you to
-specify a set of files to check against the target file(s).</p>
-
-<p><strong>Note:</strong> You can specify either the <code>srcfile</code>
-attribute or nested <code>&lt;srcfiles&gt;</code> elements, but not both.
-
-<p>Note that the task will completely ignore any directories that seem
-  to be matched by the srcfiles fileset, it will only consider normal
-  files.  If you need logic that applies to directories as well, use a
-  nested srcresource and a dirset (for example).</p>
-
-<h4><a name="srcresources">srcresources</a></h4>
-<p>The nested <code>&lt;srcresources&gt;</code> element is a <a
-href="../Types/resources.html#union">union</a> and allows you to
-specify a collection of resources to check against the target file(s).
-<em>Since Apache Ant 1.7</em></p>
-
-<h4><a name="mapper">mapper</a></h4>
-<p>The nested <code>&lt;mapper&gt;</code> element allows you to specify
-a set of target files to check for being up-to-date with respect to a
-set of source files.</p>
-   <p>
-      The mapper "to" attribute is relative to the target file, or to
-      the "dir" attribute of the nested srcfiles element.
-   </p>
-  <p>
-    <em>Since Ant 1.6.3</em>,
-    one can use a filenamemapper type in place of the mapper element.
-  </p>
+<h4 id="srcfiles">srcfiles</h4>
+<p>The nested <code>&lt;srcfiles&gt;</code> element is a <a href="../Types/fileset.html">fileset</a>
+and allows you to specify a set of files to check against the target file(s).</p>
+
+<p><strong>Note</strong>: You can specify either the <var>srcfile</var> attribute or
+nested <code>&lt;srcfiles&gt;</code> elements, but not both.
+
+<p>Note that the task will completely ignore any directories that seem to be matched by
+the <var>srcfiles</var> fileset, it will only consider normal files.  If you need logic that applies
+to directories as well, use a nested <code>srcresources</code> element and a <code>dirset</code>
+(for example).</p>
+
+<h4 id="srcresources">srcresources</h4>
+<p><em>Since Apache Ant 1.7</em></p>
+<p>The nested <code>&lt;srcresources&gt;</code> element is
+a <a href="../Types/resources.html#union">union</a> and allows you to specify a collection of
+resources to check against the target file(s).</p>
+
+<h4 id="mapper">mapper</h4>
+<p>The nested <code>&lt;mapper&gt;</code> element allows you to specify a set of target files to
+check for being up-to-date with respect to a set of source files.</p>
+<p>The mapper <var>to</var> attribute is relative to the target file, or to the <var>dir</var>
+attribute of the nested <code>srcfiles</code> element.</p>
+<p><em>Since Ant 1.6.3</em>, one can use a <code>filenamemapper</code> type in place of the mapper
+element.</p>
 <h3>Examples</h3>
-<pre>  &lt;uptodate property=&quot;xmlBuild.notRequired&quot; targetfile=&quot;${deploy}\xmlClasses.jar&quot; &gt;
-    &lt;srcfiles dir= &quot;${src}/xml&quot; includes=&quot;**/*.dtd&quot;/&gt;
-  &lt;/uptodate&gt;</pre>
-<p>sets the property <code>xmlBuild.notRequired</code> to <code>true</code>
-if the <code>${deploy}/xmlClasses.jar</code> file is more up-to-date than
-any of the DTD files in the <code>${src}/xml</code> directory.</p>
+<pre>
+&lt;uptodate property=&quot;xmlBuild.notRequired&quot; targetfile=&quot;${deploy}\xmlClasses.jar&quot;&gt;
+  &lt;srcfiles dir=&quot;${src}/xml&quot; includes=&quot;**/*.dtd&quot;/&gt;
+&lt;/uptodate&gt;</pre>
+<p>sets the property <code>xmlBuild.notRequired</code> to <q>true</q> if
+the <samp>${deploy}/xmlClasses.jar</samp> file is more up-to-date than any of the DTD files in
+the <samp>${src}/xml</samp> directory.</p>
 <p>This can be written as:</p>
-<pre>  &lt;uptodate property=&quot;xmlBuild.notRequired&quot;&gt;
-    &lt;srcfiles dir= &quot;${src}/xml&quot; includes=&quot;**/*.dtd&quot;/&gt;
-    &lt;mapper type=&quot;merge&quot; to=&quot;${deploy}\xmlClasses.jar&quot;/&gt;
-  &lt;/uptodate&gt;</pre>
-as well.
-
-The <code>xmlBuild.notRequired</code> property can then be used in a
-<code>&lt;target&gt;</code> tag's <code>unless</code> attribute to
-conditionally run that target. For example, running the following target:</p>
+<pre>
+&lt;uptodate property=&quot;xmlBuild.notRequired&quot;&gt;
+  &lt;srcfiles dir= &quot;${src}/xml&quot; includes=&quot;**/*.dtd&quot;/&gt;
+  &lt;mapper type=&quot;merge&quot; to=&quot;${deploy}\xmlClasses.jar&quot;/&gt;
+&lt;/uptodate&gt;</pre>
+<p>as well.</p>
+
+<p>The <code>xmlBuild.notRequired</code> property can then be used in a <code>&lt;target&gt;</code>
+tag's <var>unless</var> attribute to conditionally run that target. For example, running the
+following target:</p>
 <pre>
 &lt;target name=&quot;xmlBuild&quot; depends=&quot;chkXmlBuild&quot; unless=&quot;xmlBuild.notRequired&quot;&gt;
   ...
-&lt;/target&gt;
-</pre>
-will first run the <code>chkXmlBuild</code> target, which contains
-the <code>&lt;uptodate&gt;</code> task that determines whether
-<code>xmlBuild.notRequired</code> gets set. The property named in
-the <code>unless</code> attribute is then checked for being set/not set.
-If it did get set (ie., the jar file is up-to-date),
-then the <code>xmlBuild</code> target won't be run.
-</p>
-
-<p> The following example shows a single source file being checked
-against a single target file:</p>
-<pre>  &lt;uptodate property=&quot;isUpToDate&quot;
-            srcfile=&quot;/usr/local/bin/testit&quot;
-            targetfile=&quot;${build}/.flagfile&quot;/&gt;
-</pre>
-<p>sets the property <code>isUpToDate</code> to <code>true</code>
-if <code>/usr/local/bin/testit</code> is not newer than
-<code>${build}/.flagfile</code>.</p>
-</p>
-  <p>
-    The following shows usage of a relative mapper.
-  </p>
-  <pre>
-    &lt;uptodate property="checkUptodate.uptodate"&gt;
-      &lt;srcfiles dir="src" includes="*"/&gt;
-      &lt;mapper type="merge" to="../dest/output.done"/&gt;
-    &lt;/uptodate&gt;
-    &lt;echo message="checkUptodate result: ${checkUptodate.uptodate}"/&gt;
-  </pre>
-  <p>
-    The previous example can be a bit confusing, so it may be better to
-    use absolute paths:
-  </p>
-  <pre>
-    &lt;property name="dest.dir" location="dest"/&gt;
-    &lt;uptodate property="checkUptodate.uptodate"&gt;
-      &lt;srcfiles dir="src" includes="*"/&gt;
-      &lt;mapper type="merge" to="${dest.dir}/output.done"/&gt;
-    &lt;/uptodate&gt;
-  </pre>
-
+&lt;/target&gt;</pre>
+<p>will first run the <q>chkXmlBuild</q> target, which contains the <code>&lt;uptodate&gt;</code>
+task that determines whether <code>xmlBuild.notRequired</code> gets set. The property named in
+the <var>unless</var> attribute is then checked for being set/not set.  If it did get set (ie., the
+jar file is up-to-date), then the <q>xmlBuild</q> target won't be run.</p>
 
+<p>The following example shows a single source file being checked against a single target file:</p>
+<pre>
+&lt;uptodate property=&quot;isUpToDate&quot;
+          srcfile=&quot;/usr/local/bin/testit&quot;
+          targetfile=&quot;${build}/.flagfile&quot;/&gt;
+</pre>
+<p>sets the property <code>isUpToDate</code> to <q>true</q> if <samp>/usr/local/bin/testit</samp> is
+not newer than <samp>${build}/.flagfile</samp>.</p>
+<p>The following shows usage of a relative mapper.</p>
+<pre>
+&lt;uptodate property="checkUptodate.uptodate"&gt;
+  &lt;srcfiles dir="src" includes="*"/&gt;
+  &lt;mapper type="merge" to="../dest/output.done"/&gt;
+&lt;/uptodate&gt;
+&lt;echo message="checkUptodate result: ${checkUptodate.uptodate}"/&gt;</pre>
+<p>The previous example can be a bit confusing, so it may be better to use absolute paths:</p>
+<pre>
+&lt;property name="dest.dir" location="dest"/&gt;
+&lt;uptodate property="checkUptodate.uptodate"&gt;
+  &lt;srcfiles dir="src" includes="*"/&gt;
+  &lt;mapper type="merge" to="${dest.dir}/output.done"/&gt;
+&lt;/uptodate&gt;</pre>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/verifyjar.html ant-1.10.3/manual/Tasks/verifyjar.html
--- ant-1.9.10/manual/Tasks/verifyjar.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/verifyjar.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,122 +24,114 @@
 
 <body>
 
-<h2><a name="verifyjar">VerifyJar</a></h2>
+<h2 id="verifyjar">VerifyJar</h2>
 <h3>Description</h3>
-<p>Verifies JAR files with the <tt>jarsigner</tt> command line tool.
-It will take a named file in the <tt>jar</tt> attribute. Nested paths are also
-supported
-</p>
-
+<p>Verifies JAR files with
+the <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/jarsigner.html"
+target="_top"><kbd>jarsigner</kbd></a> command line tool.  It will take a named file in
+the <var>jar</var> attribute. Nested paths are also supported.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">jar</td>
-    <td valign="top">the jar file to verify</td>
-    <td valign="top" align="center">Yes, unless nested paths have
-      been used.</td>
+    <td>jar</td>
+    <td>the jar file to verify</td>
+    <td>Yes, unless nested paths have been used</td>
   </tr>
   <tr>
-    <td valign="top">alias</td>
-    <td valign="top">the alias to verify under</td>
-    <td valign="top" align="center">Yes.</td>
+    <td>alias</td>
+    <td>the alias to verify under</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">storepass</td>
-    <td valign="top">password for keystore integrity.</td>
-    <td valign="top" align="center">Yes.</td>
+    <td>storepass</td>
+    <td>password for keystore integrity.
+    Note that
+    jarsigner does not read the password from stdin during
+    verification, so the password must be send via a command line
+    interface and may be visible to other users of the system.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">keystore</td>
-    <td valign="top">keystore location</td>
-    <td valign="top" align="center">No</td>
+    <td>keystore</td>
+    <td>keystore location</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">storetype</td>
-    <td valign="top">keystore type</td>
-    <td valign="top" align="center">No</td>
+    <td>storetype</td>
+    <td>keystore type</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">keypass</td>
-    <td valign="top">password for private key (if different)</td>
-    <td valign="top" align="center">No</td>
+    <td>keypass</td>
+    <td>password for private key (if different)</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">certificates</td>
-    <td valign="top">(true | false) display information about certificates</td>
-    <td valign="top" align="center">No; default false</td>
+    <td>certificates</td>
+    <td>(<q>true|false</q>) display information about certificates</td>
+    <td>No; default <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">verbose</td>
-    <td valign="top">(true | false) verbose output when verifying</td>
-    <td valign="top" align="center">No; default false</td>
+    <td>verbose</td>
+    <td>(<q>true|false</q>) verbose output when verifying</td>
+    <td>No; default <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">strict</td>
-    <td valign="top">(true | false) strict checking when verifying.<br/><em>since Ant 1.9.1</em>.</td>
-    <td valign="top" align="center">No; default false</td>
+    <td>strict</td>
+    <td>(<q>true|false</q>) strict checking when verifying.<br/><em>since Ant 1.9.1</em>.</td>
+    <td>No; default <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">maxmemory</td>
-    <td valign="top">Specifies the maximum memory the jarsigner VM will use. Specified in the
-                     style of standard java memory specs (e.g. 128m = 128 MBytes)</td>
-    <td valign="top" align="center">No</td>
+    <td>maxmemory</td>
+    <td>Specifies the maximum memory the <kbd>jarsigner</kbd> JVM will use. Specified in the style
+      of standard Java memory specs (e.g. <q>128m</q> = 128 MBytes)</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">executable</td>
-    <td valign="top">Specify a particular <code>jarsigner</code> executable
-      to use in place of the default binary (found in the same JDK as
-      Apache Ant is running in).<br/>
-      Must support the same command line options as the Sun JDK
-      jarsigner command.
-      <em>since Ant 1.8.0</em>.</td>
-    <td align="center" valign="top">No</td>
-  </tr>  
+    <td>executable</td>
+    <td>Specify a particular <kbd>jarsigner</kbd> executable to use in place of the default binary
+      (found in the same JDK as Apache Ant is running in).<br/>  Must support the same command line
+      options as the Sun JDK <kbd>jarsigner</kbd> command.  <em>since Ant 1.8.0</em>.</td>
+    <td>No</td>
+  </tr>
 </table>
 <h3>Parameters as nested elements</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">path</td>
-    <td valign="top">path of JAR files to verify. <em>since Ant 1.7</em></td>
-    <td valign="top" align="center">No</td>
+    <td>path</td>
+    <td>path of JAR files to verify. <em>since Ant 1.7</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">fileset</td>
-    <td valign="top">fileset of JAR files to verify. </td>
-    <td valign="top" align="center">No</td>
+    <td>fileset</td>
+    <td>fileset of JAR files to verify.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">sysproperty</td>
-    <td valign="top">JVM system properties, with the syntax of Ant
-    <a href="exec.html#env">environment variables</a> </td>
-    <td valign="top" align="center">No, and only one can be supplied</td>
+    <td>sysproperty</td>
+    <td>JVM system properties, with the syntax of Ant <a href="exec.html#env">environment
+      variables</a></td>
+    <td>No, and only one can be supplied</td>
   </tr>
  </table>
 
-
 <h3>Examples</h3>
-  <blockquote><pre>
+<pre>
 &lt;verifyjar jar=&quot;${dist}/lib/ant.jar&quot;
-alias=&quot;apache-group&quot; storepass=&quot;secret&quot;/&gt;
-</pre></blockquote>
-<p>
-  verifies the ant.jar with alias &quot;apache-group&quot; accessing the
-  keystore and private key via &quot;secret&quot; password.
-</p>
-
-
+           alias=&quot;apache-group&quot; storepass=&quot;secret&quot;/&gt;</pre>
+<p>verifies the <samp>ant.jar</samp> with alias <q>apache-group</q> accessing the keystore and
+private key via <q>secret</q> password.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/vss.html ant-1.10.3/manual/Tasks/vss.html
--- ant-1.9.10/manual/Tasks/vss.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/vss.html	2018-03-24 12:37:12.000000000 +0000
@@ -17,330 +17,310 @@
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
-<title>Microsoft Visual SourceSafe(VSS) Tasks</title>
+<title>Microsoft Visual SourceSafe (VSS) Tasks</title>
 </head>
 <body>
 <h1>Microsoft Visual SourceSafe Tasks User Manual</h1>
 <p>by</p>
 <ul>
-    <li>Craig Cottingham</li>
-    <li>Andrew Everitt</li>
-    <li>Balazs Fejes 2</li>
-    <li><a href="mailto:Glenn_Twiggs@bmc.com">Glenn_Twiggs@bmc.com</a></li>
-    <li>Martin Poeschl (<a href="mailto:mpoeschl@marmot.at">mpoeschl@marmot.at</a>)</li>
-    <li>Phillip Wells</li>
-    <li>Jon Skeet (<a href="mailto:jon.skeet@peramon.com">jon.skeet@peramon.com</a>)</li>
-    <li>Nigel Magnay (<a href="mailto:nigel.magnay@parsec.co.uk">nigel.magnay@parsec.co.uk</a>)</li>
-    <li>Gary S. Weaver</li>
-    <li>Jesse Stockall</li>
- </ul>
-<hr>
+  <li>Craig Cottingham</li>
+  <li>Andrew Everitt</li>
+  <li>Balazs Fejes 2</li>
+  <li><a href="mailto:Glenn_Twiggs@bmc.com">Glenn_Twiggs@bmc.com</a></li>
+  <li>Martin Poeschl (<a href="mailto:mpoeschl@marmot.at">mpoeschl@marmot.at</a>)</li>
+  <li>Phillip Wells</li>
+  <li>Jon Skeet (<a href="mailto:jon.skeet@peramon.com">jon.skeet@peramon.com</a>)</li>
+  <li>Nigel Magnay (<a href="mailto:nigel.magnay@parsec.co.uk">nigel.magnay@parsec.co.uk</a>)</li>
+  <li>Gary S. Weaver</li>
+  <li>Jesse Stockall</li>
+</ul>
+<hr/>
 <h2>Contents</h2>
 <ul>
-    <li><a href="#intro">Introduction</a></li>
-    <li><a href="#tasks">The Tasks</a></li>
+  <li><a href="#intro">Introduction</a></li>
+  <li><a href="#tasks">The Tasks</a></li>
 </ul>
-<br>
-<h2><a name="intro">Introduction</a></h2>
-<p>These tasks provide an interface to the
-<a href="http://msdn.microsoft.com/ssafe/default.asp" target="_top">Microsoft Visual SourceSafe</a> SCM.
-The <code>org.apache.tools.ant.taskdefs.optional.vss</code> package consists of a simple framework to support
-vss functionality as well as some Apache Ant tasks encapsulating frequently used vss commands.
-Although it is possible to use these commands on the desktop,
-they were primarily intended to be used by automated build systems.</p>
-<p>
-If you get a CreateProcess IOError=2 when running these, it means
-that ss.exe was not found. Check to see if you can run it from the
-command line -you may need to alter your path, or set the <tt>ssdir</tt>
-property.
-<h2><a name="tasks">The Tasks</a></h2>
-
-<table border="0" cellspacing="0" cellpadding="3">
-    <tr>
-        <td><a href="#vssget">vssget</a></td>
-        <td>Retrieves a copy of the specified VSS file(s).</td>
-    </tr>
-    <tr>
-        <td><a href="#vsslabel">vsslabel</a></td>
-        <td>Assigns a label to the specified version or current version of a file or project.</td>
-    </tr>
-    <tr>
-        <td><a href="#vsshistory">vsshistory</a></td>
-        <td>Shows the history of a file or project in VSS.</td>
-    </tr>
-    <tr>
-        <td><a href="#vsscheckin">vsscheckin</a></td>
-        <td>Updates VSS with changes made to a checked out file, and unlocks the VSS master copy.</td>
-    </tr>
-    <tr>
-        <td><a href="#vsscheckout">vsscheckout</a></td>
-        <td>Copies a file from the current project to the current folder, for the purpose of editing.</td>
-    </tr>
-    <tr>
-        <td><a href="#vssadd">vssadd</a></td>
-        <td>Adds a new file into the VSS Archive</td>
-    </tr>
-    <tr>
-        <td><a href="#vsscp">vsscp</a></td>
-        <td>Change the current project being used in VSS</td>
-    </tr>
-    <tr>
-        <td><a href="#vsscreate">vsscreate</a></td>
-        <td>Creates a project in VSS.</td>
-    </tr>
+
+<br/>
+<h2 id="intro">Introduction</h2>
+<p>These tasks provide an interface to
+the <a href="https://msdn.microsoft.com/en-us/library/3h0544kx(v=vs.80).aspx"
+target="_top">Microsoft Visual SourceSafe</a> SCM.
+The <code class="code">org.apache.tools.ant.taskdefs.optional.vss</code> package consists of a
+simple framework to support VSS functionality as well as some Apache Ant tasks encapsulating
+frequently used VSS commands.  Although it is possible to use these commands on the desktop, they
+were primarily intended to be used by automated build systems.</p>
+<p>If you get a <code class="output">CreateProcess error=2</code> when running these, it means
+that <kbd>ss.exe</kbd> was not found. Check to see if you can run it from the command line&mdash;you
+may need to alter your path, or set the <var>ssdir</var> property.</p>
+<h2 id="tasks">The Tasks</h2>
+
+<table>
+  <tr><th>Task</th><th>Description</th></tr>
+  <tr>
+    <td><a href="#vssget">vssget</a></td>
+    <td>Retrieves a copy of the specified VSS file(s).</td>
+  </tr>
+  <tr>
+    <td><a href="#vsslabel">vsslabel</a></td>
+    <td>Assigns a label to the specified version or current version of a file or project.</td>
+  </tr>
+  <tr>
+    <td><a href="#vsshistory">vsshistory</a></td>
+    <td>Shows the history of a file or project in VSS.</td>
+  </tr>
+  <tr>
+    <td><a href="#vsscheckin">vsscheckin</a></td>
+    <td>Updates VSS with changes made to a checked out file, and unlocks the VSS master copy.</td>
+  </tr>
+  <tr>
+    <td><a href="#vsscheckout">vsscheckout</a></td>
+    <td>Copies a file from the current project to the current folder, for the purpose of editing.</td>
+  </tr>
+  <tr>
+    <td><a href="#vssadd">vssadd</a></td>
+    <td>Adds a new file into the VSS Archive</td>
+  </tr>
+  <tr>
+    <td><a href="#vsscp">vsscp</a></td>
+    <td>Change the current project being used in VSS</td>
+  </tr>
+  <tr>
+    <td><a href="#vsscreate">vsscreate</a></td>
+    <td>Creates a project in VSS.</td>
+  </tr>
 </table>
 
-<hr>
+<hr/>
 <h2>Task Descriptions</h2>
 
 <!-- VSSGET -->
 
-<h2><a name="vssget">VssGet</a></h2>
+<h2 id="vssget">VssGet</h2>
 <h3>Description</h3>
-Task to perform GET commands to Microsoft Visual SourceSafe.
-<p>If you specify two or more attributes from version, date and
-label only one will be used in the order version, date, label.</p>
+<p>Task to perform GET commands to Microsoft Visual SourceSafe.</p>
+<p>If you specify two or more attributes from version, date and label only one will be used in the
+order version, date, label.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
     <th>Required</th>
   </tr>
   <tr>
-     <td>vsspath</td>
-     <td>SourceSafe path which specifies the project/file(s) you wish to
-         perform the action on.</td>
-     <td>Yes</td>
+    <td>vsspath</td>
+    <td>SourceSafe path which specifies the project/file(s) you wish to perform the action on.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-     <td>login</td>
-     <td>username[,password] - The username and password needed to get access
-         to VSS. Note that you may need to specify both (if you have a password) -
-         Ant/VSS will hang if you leave the password out and VSS does not accept
-         login without a password. </td>
-     <td>No</td>
+    <td>login</td>
+    <td><q>username[,password]</q>&mdash;The username and password needed to get access to VSS. Note
+      that you may need to specify both (if you have a password)&mdash;Ant/VSS will hang if you
+      leave the password out and VSS does not accept login without a password.</td>
+    <td>No</td>
   </tr>
   <tr>
-     <td>localpath</td>
-     <td>Override the working directory and get to the specified path</td>
-     <td>No</td>
+    <td>localpath</td>
+    <td>Override the working directory and get to the specified path</td>
+    <td>No</td>
   </tr>
   <tr>
-     <td>ssdir</td>
-     <td>directory where <code>ss.exe</code> resides. By default the
-         task expects it to be in the PATH.</td>
-     <td>No</td>
+    <td>ssdir</td>
+    <td>directory where <kbd>ss.exe</kbd> resides.</td>
+    <td>No; by default expected to be in <code>PATH</code></td>
   </tr>
   <tr>
-     <td>serverPath</td>
-     <td>directory where <code>srcsafe.ini</code> resides.</td>
-     <td>No</td>
+    <td>serverPath</td>
+    <td>directory where <samp>srcsafe.ini</samp> resides.</td>
+    <td>No</td>
   </tr>
   <tr>
-     <td>writable</td>
-     <td>true or false; default false</td>
-     <td>No</td>
+    <td>writable</td>
+    <td><q>true|false</q></td>
+    <td>No; default <q>false</q></td>
   </tr>
   <tr>
-     <td>recursive</td>
-     <td>true or false; default false. Note however that in the SourceSafe UI
-     , there is a setting accessed via Tools/Options/GeneralTab called
-     &quot;Act on projects recursively&quot;.  If this setting is checked,
-     then the recursive attribute is effectively ignored, and the get
-     will always be done recursively
-     </td>
-     <td>No</td>
+    <td>recursive</td>
+    <td><q>true|false</q>. Note however that in the SourceSafe UI there is a setting accessed
+      via <q>Tools/Options/GeneralTab</q> called <q>Act on projects recursively</q>.  If this
+      setting is checked, then the <var>recursive</var> attribute is effectively ignored, and get
+      will always be done recursively</td>
+    <td>No; default <q>false</q></td>
   </tr>
   <tr>
-     <td>version</td>
-     <td>a version number to get</td>
-     <td rowspan="3">No, only one of these allowed</td>
+    <td>version</td>
+    <td>a version number to get</td>
+    <td rowspan="3">No; only one of these may be used</td>
   </tr>
   <tr>
-     <td>date</td>
-     <td>a date stamp to get at</td>
+    <td>date</td>
+    <td class="left">a date stamp to get at</td>
   </tr>
   <tr>
-     <td>label</td>
-     <td>a label to get for</td>
+    <td>label</td>
+    <td class="left">a label to get for</td>
   </tr>
   <tr>
-     <td>quiet</td>
-     <td>suppress output (off by default)</td>
-     <td>No</td>
+    <td>quiet</td>
+    <td>suppress output</td>
+    <td>No; defaults to <q>off</q></td>
   </tr>
   <tr>
-     <td>autoresponse</td>
-     <td>What to respond with (sets the -I option). By default, -I- is
-     used; values of Y or N will be appended to this.</td>
-     <td>No</td>
+    <td>autoresponse</td>
+    <td>What to respond with (sets the <kbd>-I</kbd> option). By default, <kbd>-I-</kbd> is
+      used; values of <q>Y</q> or <q>N</q> will be appended to this.</td>
+    <td>No</td>
   </tr>
   <tr>
     <td>writablefiles</td>
-    <td>Behavior when local files are writable. Valid options are: <code>replace</code>, 
-        <code>skip</code> and <code>fail</code>; Defaults to <code>fail</code>
-        <br><code>skip</code> implies <code>failonerror=false</code></td>
-    <td>No</td>
+    <td>Behavior when local files are writable. Valid options are: <q>replace</q>, <q>skip</q>
+      and <q>fail</q>; <q>skip</q> implies <var>failonerror</var>=<q>false</q></td>
+    <td>No; defaults to <q>fail</q></td>
   </tr>
   <tr>
     <td>failonerror</td>
-    <td>Stop the buildprocess if ss.exe exits with a returncode of 100. Defaults to true</td>
-    <td>No</td>
+    <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code <q>100</q></td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
     <td>filetimestamp</td>
-    <td>Set the behavior for timestamps of local files. Valid options are <code>current</code>, 
-        <code>modified</code>, or <code>updated</code>. Defaults to <code>current</code>.</td> 
-    <td>No</td>
+    <td>Set the behavior for timestamps of local files. Valid options
+      are <q>current</q>, <q>modified</q>, or <q>updated</q>.</td>
+    <td>No; defaults to <q>current</q></td>
   </tr>
 </table>
 <p>Note that only one of version, date or label should be specified</p>
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;vssget localPath=&quot;C:\mysrc\myproject&quot;
         recursive=&quot;true&quot;
         label=&quot;Release1&quot;
         login=&quot;me,mypassword&quot;
         vsspath=&quot;$/source/aProject&quot;
-        writable=&quot;true&quot;/&gt;
-</pre>
-</blockquote>
-<p>Does a get on the VSS-Project <i>$/source/myproject</i> using the username
-<i>me</i> and the password <i>mypassword</i>. It will recursively get the files
-which are labeled <i>Release1</i> and write them to the local directory
-<i>C:\mysrc\myproject</i>. The local files will be writable.</p>
-<hr>
+        writable=&quot;true&quot;/&gt;</pre>
 
-<!-- VSSLABEL -->
+<p>Does a get on the VSS Project <samp>$/source/myproject</samp> using the username <q>me</q> and
+the password <q>mypassword</q>. It will recursively get the files which are labeled <q>Release1</q>
+and write them to the local directory <samp>C:\mysrc\myproject</samp>. The local files will be
+writable.</p>
 
-<h2><a name="vsslabel">VssLabel</a></h2>
+<hr/>
+<!-- VSSLABEL -->
+<h2 id="vsslabel">VssLabel</h2>
 <h3>Description</h3>
-Task to perform LABEL commands to Microsoft Visual SourceSafe.
-<p>Assigns a label to the specified version or current version of a file or
-project.</p>
+<p>Task to perform LABEL commands to Microsoft Visual SourceSafe.</p>
+<p>Assigns a label to the specified version or current version of a file or project.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
+<table class="attr">
   <tr>
-     <td>vsspath</td>
-     <td>SourceSafe path which specifies the project/file(s) you wish to
-         perform the action on.</td>
-     <td>Yes</td>
+    <th>Attribute</th>
+    <th>Values</th>
+    <th>Required</th>
   </tr>
   <tr>
-     <td>login</td>
-     <td>username[,password] - The username and password needed to get access
-         to VSS. Note that you may need to specify both (if you have a password) -
-         Ant/VSS will hang if you leave the password out and VSS does not accept
-         login without a password. </td>
-     <td>No</td>
+    <td>vsspath</td>
+    <td>SourceSafe path which specifies the project/file(s) you wish to perform the action on.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-     <td>ssdir</td>
-     <td>directory where <code>ss.exe</code> resides. By default the
-         task expects it to be in the PATH.</td>
-     <td>No</td>
+    <td>login</td>
+    <td><q>username[,password]</q>&mdash;The username and password needed to get access to VSS. Note
+      that you may need to specify both (if you have a password)&mdash;Ant/VSS will hang if you
+      leave the password out and VSS does not accept login without a password.</td>
+    <td>No</td>
   </tr>
   <tr>
-     <td>serverPath</td>
-     <td>directory where <code>srcsafe.ini</code> resides.</td>
-     <td>No</td>
+    <td>ssdir</td>
+    <td>directory where <kbd>ss.exe</kbd> resides.</td>
+    <td>No; by default expected to be in <code>PATH</code></td>
   </tr>
-   <tr>
-      <td>label</td>
-      <td>A label to apply to the hierarchy</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>version</td>
-      <td>An existing file or project version to label. By default the current
-      version is labeled.</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>comment</td>
-      <td>The comment to use for this label. Empty or '-' for no comment.</td>
-      <td>No</td>
-   </tr>
-  <tr>
-     <td>autoresponse</td>
-     <td>What to respond with (sets the -I option). By default, -I- is
-     used; values of Y or N will be appended to this.</td>
-     <td>No</td>
+  <tr>
+    <td>serverPath</td>
+    <td>directory where <samp>srcsafe.ini</samp> resides.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td>failonerror</td>
-    <td>Stop the buildprocess if ss.exe exits with a returncode of 100. Defaults to true</td>
+    <td>label</td>
+    <td>A label to apply to the hierarchy</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>version</td>
+    <td>An existing file or project version to label. By default the current version is
+      labeled.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>comment</td>
+    <td>The comment to use for this label. Empty or <q>-</q> for no comment.</td>
     <td>No</td>
   </tr>
+  <tr>
+    <td>autoresponse</td>
+    <td>What to respond with (sets the <kbd>-I</kbd> option). By default, <kbd>-I-</kbd> is
+      used; values of <q>Y</q> or <q>N</q> will be appended to this.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>failonerror</td>
+    <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code <q>100</q>.</td>
+    <td>No; defaults to <q>true</q></td>
+  </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;vsslabel vsspath=&quot;$/source/aProject&quot;
           login=&quot;me,mypassword&quot;
-          label=&quot;Release1&quot;/&gt;
-</pre>
-</blockquote>
-<p>Labels the current version of the VSS project <i>$/source/aProject</i> with
-the label <i>Release1</i> using the username <i>me</i> and the password
-<i>mypassword</i>.
-</p>
-<blockquote>
+          label=&quot;Release1&quot;/&gt;</pre>
+
+<p>Labels the current version of the VSS project <samp>$/source/aProject</samp> with the
+label <q>Release1</q> using the username <q>me</q> and the password <q>mypassword</q>.</p>
+
 <pre>
 &lt;vsslabel vsspath=&quot;$/source/aProject/myfile.txt&quot;
           version=&quot;4&quot;
-          label=&quot;1.03.004&quot;/&gt;
-</pre>
-</blockquote>
-<p>Labels version 4 of the VSS file <i>$/source/aProject/myfile.txt</i> with the
-label <i>1.03.004</i>. If this version already has a label, the operation (and
-the build) will fail.
-</p>
-<hr>
+          label=&quot;1.03.004&quot;/&gt;</pre>
 
-<!-- VSSHISTORY -->
+<p>Labels version 4 of the VSS file <samp>$/source/aProject/myfile.txt</samp> with the
+label <q>1.03.004</q>. If this version already has a label, the operation (and the build) will
+fail.</p>
 
-<h2><a name="vsshistory">VssHistory</a></h2>
+<hr/>
+<!-- VSSHISTORY -->
+<h2 id="vsshistory">VssHistory</h2>
 <h3>Description</h3>
 Task to perform HISTORY commands to Microsoft Visual SourceSafe.
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
     <th>Required</th>
   </tr>
   <tr>
-     <td>vsspath</td>
-     <td>SourceSafe path which specifies the project/file(s) you wish to
-         perform the action on.</td>
-     <td>Yes</td>
+    <td>vsspath</td>
+    <td>SourceSafe path which specifies the project/file(s) you wish to perform the action on.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-     <td>login</td>
-     <td>username[,password] - The username and password needed to get access
-         to VSS. Note that you may need to specify both (if you have a password) -
-         Ant/VSS will hang if you leave the password out and VSS does not accept
-         login without a password. </td>
-     <td>No</td>
+    <td>login</td>
+    <td><q>username[,password]</q>&mdash;The username and password needed to get access to VSS. Note
+      that you may need to specify both (if you have a password)&mdash;Ant/VSS will hang if you
+      leave the password out and VSS does not accept login without a password.</td>
+    <td>No</td>
   </tr>
   <tr>
-     <td>ssdir</td>
-     <td>directory where <code>ss.exe</code> resides. By default the
-         task expects it to be in the PATH.</td>
-     <td>No</td>
+    <td>ssdir</td>
+    <td>directory where <kbd>ss.exe</kbd> resides.</td>
+    <td>No; by default expected to be in <code>PATH</code></td>
   </tr>
   <tr>
-     <td>serverPath</td>
-     <td>directory where <code>srcsafe.ini</code> resides.</td>
-     <td>No</td>
+    <td>serverPath</td>
+    <td>directory where <samp>srcsafe.ini</samp> resides.</td>
+    <td>No</td>
   </tr>
   <tr>
     <td>fromDate</td>
@@ -354,10 +334,10 @@
   </tr>
   <tr>
     <td>dateFormat</td>
-    <td>Format of dates in fromDate and toDate. Used when calculating dates with
-      the numdays attribute. This string uses the formatting rules of SimpleDateFormat.
-      Defaults to DateFormat.SHORT.</td>
-    <td>No</td>
+    <td>Format of dates in <var>fromDate</var> and <var>toDate</var>. Used when calculating dates
+      with the <var>numdays</var> attribute. This string uses the formatting rules of
+      SimpleDateFormat.</td>
+    <td>No; defaults to <code>DateFormat.SHORT</code></td>
   </tr>
   <tr>
     <td>fromLabel</td>
@@ -381,13 +361,13 @@
   </tr>
   <tr>
     <td>recursive</td>
-    <td>true or false</td>
+    <td><q>true|false</q></td>
     <td>No</td>
   </tr>
   <tr>
     <td>style</td>
-    <td>brief, codediff, default or nofile. The default is default.</td>
-    <td>No</td>
+    <td><q>brief</q>, <q>codediff</q>, <q>default</q> or <q>nofile</q>.</td>
+    <td>No; defaults to <q>default</q></td>
   </tr>
   <tr>
     <td>user</td>
@@ -396,43 +376,39 @@
   </tr>
   <tr>
     <td>failonerror</td>
-    <td>Stop the buildprocess if ss.exe exits with a returncode of 100. Defaults to true</td>
-    <td>No</td>
+    <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code <q>100</q></td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
 </table>
 
 <h4>Specifying the time-frame</h4>
 <p>There are different ways to specify what time-frame you wish to evaluate:</p>
 <ul>
-  <li>Changes between two dates: Specify both <code>fromDate</code> and <code>toDate</code> </li>
-  <li>Changes before a date: Specify <code>toDate</code></li>
-  <li>Changes after a date: Specify <code>fromDate</code></li>
-  <li>Changes X Days before a date: Specify <code>toDate</code> and (negative!) <code>numDays</code></li>
-  <li>Changes X Days after a date: Specify <code>fromDate</code> and <code>numDays</code></li>
+  <li>Changes between two dates: Specify both <var>fromDate</var> and <var>toDate</var></li>
+  <li>Changes before a date: Specify <var>toDate</var></li>
+  <li>Changes after a date: Specify <var>fromDate</var></li>
+  <li>Changes X Days before a date: Specify <var>toDate</var> and (negative!) <var>numDays</var></li>
+  <li>Changes X Days after a date: Specify <var>fromDate</var> and <var>numDays</var></li>
 </ul>
 
-
 <h3>Examples</h3>
-<blockquote>
-  <pre>
+
+<pre>
 &lt;vsshistory vsspath=&quot;$/myProject&quot; recursive=&quot;true&quot;
             fromLabel=&quot;Release1&quot;
-            toLabel=&quot;Release2&quot;/&gt;
-</pre>
-</blockquote>
-<p>Shows all changes between &quot;Release1&quot; and &quot;Release2&quot;.</p>
+            toLabel=&quot;Release2&quot;/&gt;</pre>
+
+<p>Shows all changes between <q>Release1</q> and <q>Release2</q>.</p>
 
-<blockquote>
-  <pre>
+<pre>
 &lt;vsshistory vsspath=&quot;$/myProject&quot; recursive=&quot;true&quot;
             fromDate=&quot;01.01.2001&quot;
-            toDate=&quot;31.03.2001&quot;/&gt;
-</pre>
-</blockquote>
-<p>Shows all changes between January 1st 2001 and March 31st 2001 (in Germany, date must be specified according to your locale).</p>
+            toDate=&quot;31.03.2001&quot;/&gt;</pre>
 
-<blockquote>
-  <pre>
+<p>Shows all changes between January 1st 2001 and March 31st 2001 (in Germany, date must be
+specified according to your locale).</p>
+
+<pre>
 &lt;tstamp&gt;
   &lt;format property=&quot;to.tstamp&quot; pattern=&quot;M-d-yy;h:mma&quot;/&gt;
 &lt;/tstamp&gt;
@@ -440,19 +416,17 @@
 &lt;vsshistory vsspath=&quot;$/myProject&quot; recursive=&quot;true&quot;
             numDays=&quot;-14&quot;
             dateFormat=&quot;M-d-yy;h:mma&quot;
-            toDate=&quot;${to.tstamp}&quot;/&gt;
-</pre>
-</blockquote>
+            toDate=&quot;${to.tstamp}&quot;/&gt;</pre>
+
 <p>Shows all changes in the 14 days before today.</p>
-<hr>
 
+<hr/>
 <!-- VSSCHECKIN -->
-
-<h2><a name="vsscheckin">VssCheckin</a></h2>
+<h2 id="vsscheckin">VssCheckin</h2>
 <h3>Description</h3>
-Task to perform CHECKIN commands to Microsoft Visual SourceSafe.
+<p>Task to perform CHECKIN commands to Microsoft Visual SourceSafe.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -460,16 +434,14 @@
   </tr>
   <tr>
      <td>vsspath</td>
-     <td>SourceSafe path which specifies the project/file(s) you wish to
-         perform the action on.</td>
+     <td>SourceSafe path which specifies the project/file(s) you wish to perform the action on.</td>
      <td>Yes</td>
   </tr>
   <tr>
      <td>login</td>
-     <td>username[,password] - The username and password needed to get access
-         to VSS. Note that you may need to specify both (if you have a password) -
-         Ant/VSS will hang if you leave the password out and VSS does not accept
-         login without a password. </td>
+     <td><q>username[,password]</q>&mdash;The username and password needed to get access to
+       VSS. Note that you may need to specify both (if you have a password)&mdash;Ant/VSS will hang
+       if you leave the password out and VSS does not accept login without a password.</td>
      <td>No</td>
   </tr>
   <tr>
@@ -479,295 +451,278 @@
   </tr>
   <tr>
      <td>ssdir</td>
-     <td>directory where <code>ss.exe</code> resides. By default the
-         task expects it to be in the PATH.</td>
-     <td>No</td>
+     <td>directory where <kbd>ss.exe</kbd> resides.</td>
+     <td>No; by default expected to be in <code>PATH</code></td>
   </tr>
   <tr>
-     <td>serverPath</td>
-     <td>directory where <code>srcsafe.ini</code> resides.</td>
-     <td>No</td>
+    <td>serverPath</td>
+    <td>directory where <samp>srcsafe.ini</samp> resides.</td>
+    <td>No</td>
   </tr>
   <tr>
-     <td>writable</td>
-     <td>true or false</td>
-     <td>No</td>
+    <td>writable</td>
+    <td><q>true|false</q></td>
+    <td>No</td>
   </tr>
   <tr>
-     <td>recursive</td>
-     <td>true or false</td>
-     <td>No</td>
+    <td>recursive</td>
+    <td><q>true|false</q></td>
+    <td>No</td>
   </tr>
   <tr>
-     <td>comment</td>
-     <td>Comment to use for the files that where checked in.</td>
-     <td>No</td>
+    <td>comment</td>
+    <td>Comment to use for the files that where checked in.</td>
+    <td>No</td>
   </tr>
   <tr>
-     <td>autoresponse</td>
-     <td>'Y', 'N' or empty. Specify how to reply to questions from VSS.</td>
-     <td>No</td>
+    <td>autoresponse</td>
+    <td><q>Y</q>, <q>N</q> or empty. Specify how to reply to questions from VSS.</td>
+    <td>No</td>
   </tr>
   <tr>
     <td>failonerror</td>
-    <td>Stop the buildprocess if ss.exe exits with a returncode of 100. Defaults to true</td>
-    <td>No</td>
+    <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code <q>100</q>.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;vsscheckin vsspath=&quot;$/test/test*&quot;
             localpath=&quot;D:\build\&quot;
             comment=&quot;Modified by automatic build&quot;/&gt;
 </pre>
-</blockquote>
-<p>Checks in the file(s) named <i>test*</i> in the project <i>$/test</i> using
-the local directory <i>D:\build</i>.</p>
-<hr>
 
-<!-- VSSCHECKOUT -->
+<p>Checks in the file(s) named <samp>test*</samp> in the project <samp>$/test</samp> using the local
+directory <samp>D:\build</samp>.</p>
 
-<h2><a name="vsscheckout">VssCheckout</a></h2>
+<hr/>
+<!-- VSSCHECKOUT -->
+<h2 id="vsscheckout">VssCheckout</h2>
 <h3>Description</h3>
-Task to perform CHECKOUT commands to Microsoft Visual SourceSafe.
-<p>If you specify two or more attributes from version, date and
-label only one will be used in the order version, date, label.</p>
+<p>Task to perform CHECKOUT commands to Microsoft Visual SourceSafe.</p>
+<p>If you specify two or more attributes from <var>version</var>, <var>date</var>
+and <var>label</var> only one will be used in the
+order <var>version</var>, <var>date</var>, <var>label</var>.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
     <th>Required</th>
   </tr>
   <tr>
-     <td>vsspath</td>
-     <td>SourceSafe path which specifies the project/file(s) you wish to
-         perform the action on.</td>
-     <td>Yes</td>
+    <td>vsspath</td>
+    <td>SourceSafe path which specifies the project/file(s) you wish to perform the action on.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-     <td>login</td>
-     <td>username[,password] - The username and password needed to get access
-         to VSS. Note that you may need to specify both (if you have a password) -
-         Ant/VSS will hang if you leave the password out and VSS does not accept
-         login without a password. </td>
-     <td>No</td>
+    <td>login</td>
+    <td><q>username[,password]</q>&mdash;The username and password needed to get access to VSS. Note
+      that you may need to specify both (if you have a password)&mdash;Ant/VSS will hang if you
+      leave the password out and VSS does not accept login without a password.</td>
+    <td>No</td>
   </tr>
   <tr>
-     <td>localpath</td>
-     <td>Override the working directory and get to the specified path</td>
-     <td>No</td>
+    <td>localpath</td>
+    <td>Override the working directory and get to the specified path</td>
+    <td>No</td>
   </tr>
   <tr>
-     <td>ssdir</td>
-     <td>directory where <code>ss.exe</code> resides. By default the
-         task expects it to be in the PATH.</td>
-     <td>No</td>
+    <td>ssdir</td>
+    <td>directory where <kbd>ss.exe</kbd> resides.</td>
+    <td>No; by default expected to be in <code>PATH</code></td>
   </tr>
   <tr>
-     <td>serverPath</td>
-     <td>directory where <code>srcsafe.ini</code> resides.</td>
-     <td>No</td>
+    <td>serverPath</td>
+    <td>directory where <samp>srcsafe.ini</samp> resides.</td>
+    <td>No</td>
   </tr>
   <tr>
-     <td>writable</td>
-     <td>true or false</td>
-     <td>No</td>
+    <td>writable</td>
+    <td><q>true|false</q></td>
+    <td>No</td>
   </tr>
   <tr>
-     <td>recursive</td>
-     <td>true or false</td>
-     <td>No</td>
+    <td>recursive</td>
+    <td><q>true|false</q></td>
+    <td>No</td>
   </tr>
   <tr>
-     <td>version</td>
-     <td>a version number to get</td>
-     <td rowspan="3">No, only one of these allowed</td>
+    <td>version</td>
+    <td>a version number to get</td>
+    <td rowspan="3">No; only one of these may be used</td>
   </tr>
   <tr>
-     <td>date</td>
-     <td>a date stamp to get at</td>
+    <td>date</td>
+    <td class="left">a date stamp to get at</td>
   </tr>
   <tr>
-     <td>label</td>
-     <td>a label to get for</td>
+    <td>label</td>
+    <td class="left">a label to get for</td>
   </tr>
   <tr>
     <td>writablefiles</td>
-    <td>Behavior when local files are writable. Valid options are: <code>replace</code>, 
-        <code>skip</code> and <code>fail</code>; Defaults to <code>fail</code>
-        <br><code>skip</code> implies <code>failonerror=false</code></td>
-    <td>No</td>
+    <td>Behavior when local files are writable. Valid options are: <q>replace</q>, <q>skip</q>
+      and <q>fail</q>; <q>skip</q> implies <var>failonerror</var>=<q>false</q></td>
+    <td>No; defaults to <q>fail</q></td>
   </tr>
   <tr>
     <td>failonerror</td>
-    <td>Stop the buildprocess if ss.exe exits with a returncode of 100. Defaults to true</td>
-    <td>No</td>
+    <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code <q>100</q>.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
     <td>filetimestamp</td>
-    <td>Set the behavior for timestamps of local files. Valid options are <code>current</code>, 
-        <code>modified</code>, or <code>updated</code>. Defaults to <code>current</code>.</td> 
-    <td>No</td>
+    <td>Set the behavior for timestamps of local files. Valid options
+      are <q>current</q>, <q>modified</q>, or <q>updated</q>.</td>
+    <td>No; defaults to <q>current</q></td>
   </tr>
   <tr>
     <td>getlocalcopy</td>
-    <td>Set the behavior to retrieve local copies of the files. Defaults to true.</td> 
-    <td>No</td>
+    <td>Set the behavior to retrieve local copies of the files.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;vsscheckout vsspath=&quot;$/test&quot;
              localpath=&quot;D:\build&quot;
              recursive=&quot;true&quot;
-             login=&quot;me,mypass&quot;/&gt;
-</pre>
-</blockquote>
-<p>Does a recursive checkout of the project <i>$/test</i> to the directory D:\build.
-</p>
-<hr>
+             login=&quot;me,mypass&quot;/&gt;</pre>
 
-<!-- VSSADD -->
+<p>Does a recursive checkout of the project <samp>$/test</samp> to the
+directory <samp>D:\build</samp>.</p>
 
-<h2><a name="vssadd">VssAdd</a></h2>
+<hr/>
+<!-- VSSADD -->
+<h2 id="vssadd">VssAdd</h2>
 <h3>Description</h3>
 Task to perform ADD commands to Microsoft Visual SourceSafe.
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
     <th>Required</th>
   </tr>
   <tr>
-     <td>localpath</td>
-     <td>Specify the local file(s) to add to VSS</td>
-     <td>Yes</td>
+    <td>localpath</td>
+    <td>Specify the local file(s) to add to VSS</td>
+    <td>Yes</td>
   </tr>
   <tr>
-     <td>login</td>
-     <td>username[,password] - The username and password needed to get access
-         to VSS. Note that you may need to specify both (if you have a password) -
-         Ant/VSS will hang if you leave the password out and VSS does not accept
-         login without a password. </td>
-     <td>No</td>
+    <td>login</td>
+    <td><q>username[,password]</q>&mdash;The username and password needed to get access to VSS. Note
+      that you may need to specify both (if you have a password)&mdash;Ant/VSS will hang if you
+      leave the password out and VSS does not accept login without a password.</td>
+    <td>No</td>
   </tr>
   <tr>
-     <td>ssdir</td>
-     <td>directory where <code>ss.exe</code> resides. By default the
-         task expects it to be in the PATH.</td>
-     <td>No</td>
+    <td>ssdir</td>
+    <td>directory where <kbd>ss.exe</kbd> resides.</td>
+    <td>No; by default expected to be in <code>PATH</code></td>
   </tr>
   <tr>
-     <td>serverPath</td>
-     <td>directory where <code>srcsafe.ini</code> resides.</td>
-     <td>No</td>
+    <td>serverPath</td>
+    <td>directory where <samp>srcsafe.ini</samp> resides.</td>
+    <td>No</td>
   </tr>
   <tr>
-     <td>writable</td>
-     <td>true or false</td>
-     <td>No</td>
+    <td>writable</td>
+    <td><q>true|false</q></td>
+    <td>No</td>
   </tr>
   <tr>
-     <td>recursive</td>
-     <td>true or false</td>
-     <td>No</td>
+    <td>recursive</td>
+    <td><q>true|false</q></td>
+    <td>No</td>
   </tr>
   <tr>
-     <td>comment</td>
-     <td>Comment to use for the files that where checked in.</td>
-     <td>No</td>
+    <td>comment</td>
+    <td>Comment to use for the files that where checked in.</td>
+    <td>No</td>
   </tr>
   <tr>
-     <td>autoresponse</td>
-     <td>'Y', 'N' or empty. Specify how to reply to questions from VSS.</td>
-     <td>No</td>
+    <td>autoresponse</td>
+    <td><q>Y</q>, <q>N</q> or empty. Specify how to reply to questions from VSS.</td>
+    <td>No</td>
   </tr>
   <tr>
     <td>failonerror</td>
-    <td>Stop the buildprocess if ss.exe exits with a returncode of 100. Defaults to true</td>
-    <td>No</td>
+    <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code <q>100</q>.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<blockquote>
+
 <pre>
 &lt;vssadd localpath=&quot;D:\build\build.00012.zip&quot;
-            comment=&quot;Added by automatic build&quot;/&gt;
-</pre>
-</blockquote>
-<p>Add the file named build.00012.zip into the project current working
-directory (see vsscp).</p>
-<hr>
+        comment=&quot;Added by automatic build&quot;/&gt;</pre>
 
-<!-- VSSCP -->
+<p>Add the file named <samp>build.00012.zip</samp> into the project current working directory
+(see <code>vsscp</code>).</p>
 
-<h2><a name="vsscp">VssCp</a></h2>
+<hr/>
+<!-- VSSCP -->
+<h2 id="vsscp">VssCp</h2>
 <h3>Description</h3>
 <p>Task to perform CP (Change Project) commands to Microsoft Visual SourceSafe.</p>
-<p>This task is typically used before a VssAdd in order to set the target project</p>
+<p>This task is typically used before a <code>VssAdd</code> in order to set the target project</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
     <th>Required</th>
   </tr>
   <tr>
-     <td>vsspath</td>
-     <td>SourceSafe path which specifies the project you wish to
-         make the current project.</td>
-     <td>Yes</td>
+    <td>vsspath</td>
+    <td>SourceSafe path which specifies the project you wish to make the current project.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-     <td>login</td>
-     <td>username[,password] - The username and password needed to get access
-         to VSS. Note that you may need to specify both (if you have a password) -
-         Ant/VSS will hang if you leave the password out and VSS does not accept
-         login without a password. </td>
-     <td>No</td>
+    <td>login</td>
+    <td><q>username[,password]</q>&mdash;The username and password needed to get access to VSS. Note
+      that you may need to specify both (if you have a password)&mdash;Ant/VSS will hang if you
+      leave the password out and VSS does not accept login without a password.</td>
+    <td>No</td>
   </tr>
   <tr>
-     <td>ssdir</td>
-     <td>directory where <code>ss.exe</code> resides. By default the
-         task expects it to be in the PATH.</td>
-     <td>No</td>
+    <td>ssdir</td>
+    <td>directory where <kbd>ss.exe</kbd> resides.</td>
+    <td>No; by default expected to be in <code>PATH</code></td>
   </tr>
   <tr>
-     <td>serverPath</td>
-     <td>directory where <code>srcsafe.ini</code> resides.</td>
-     <td>No</td>
+    <td>serverPath</td>
+    <td>directory where <samp>srcsafe.ini</samp> resides.</td>
+    <td>No</td>
   </tr>
   <tr>
     <td>failonerror</td>
-    <td>Stop the buildprocess if ss.exe exits with a returncode of 100. Defaults to true</td>
-    <td>No</td>
+    <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code <q>100</q>.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<blockquote>
-<pre>
-&lt;vsscp vsspath=&quot;$/Projects/ant&quot;/&gt;
-</pre>
-</blockquote>
-<p>Sets the current VSS project to <i>$/Projects/ant</i>.</p>
-<hr>
 
-<!-- VSSCREATE -->
+<pre>&lt;vsscp vsspath=&quot;$/Projects/ant&quot;/&gt;</pre>
 
- <h2><a name="vsscreate">VssCreate</a></h2>
- <h3>Description</h3>
- Task to perform CREATE commands to Microsoft Visual Source Safe.
- <p>Creates a new project in VSS.</p>
+<p>Sets the current VSS project to <samp>$/Projects/ant</samp>.</p>
+
+<hr/>
+<!-- VSSCREATE -->
+<h2 id="vsscreate">VssCreate</h2>
+<h3>Description</h3>
+<p>Task to perform CREATE commands to Microsoft Visual Source Safe.</p>
+<p>Creates a new project in VSS.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
     <th>Attribute</th>
     <th>Values</th>
@@ -775,7 +730,7 @@
   </tr>
   <tr>
     <td>login</td>
-    <td>username,password</td>
+    <td><q>username,password</q></td>
     <td>No</td>
   </tr>
   <tr>
@@ -785,39 +740,36 @@
   </tr>
   <tr>
     <td>ssdir</td>
-    <td>directory where <code>ss.exe</code> resides. By default the task expects it to be in the PATH.</td>
-    <td>No</td>
+    <td>directory where <kbd>ss.exe</kbd> resides.</td>
+    <td>No; by default expected to be in <code>PATH</code></td>
   </tr>
   <tr>
     <td>quiet</td>
-    <td>suppress output (off by default)</td>
-    <td>No</td>
-   </tr>
+    <td>suppress output</td>
+    <td>No; defaults to <q>off</q></td>
+  </tr>
   <tr>
     <td>failOnError</td>
-    <td>fail if there is an error creating the project (true by default)</td>
-    <td>No</td>
+    <td>fail if there is an error creating the project.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
     <td>autoresponse</td>
-    <td>What to respond with (sets the -I option). By default, -I- is used; values of Y or N will be appended to this.</td>
+    <td>What to respond with (sets the <kbd>-I</kbd> option). By default, <kbd>-I-</kbd> is
+      used; values of <q>Y</q> or <q>N</q> will be appended to this.</td>
     <td>No</td>
   </tr>
   <tr>
     <td>comment</td>
-    <td>The comment to use for this label. Empty or '-' for no comment.</td>
+    <td>The comment to use for this label. Empty or <q>-</q> for no comment.</td>
     <td>No</td>
   </tr>
 </table>
 <h3>Examples</h3>
-<blockquote>
-<pre>
-&lt;vsscreate vsspath=&quot;$/existingProject/newProject&quot;/&gt;
-</pre>
-</blockquote>
-<p>Creates the VSS-Project <i>$/existingProject/newProject</i>.</p>
-<hr>
 
-<!-- Footer -->
+<pre>&lt;vsscreate vsspath=&quot;$/existingProject/newProject&quot;/&gt;</pre>
+
+<p>Creates the VSS Project <samp>$/existingProject/newProject</samp>.</p>
+
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/waitfor.html ant-1.10.3/manual/Tasks/waitfor.html
--- ant-1.9.10/manual/Tasks/waitfor.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/waitfor.html	2018-03-24 12:37:12.000000000 +0000
@@ -26,108 +26,95 @@
 
 <h2>Waitfor</h2>
 <h3>Description</h3>
-<p>Blocks execution until a set of specified conditions become true. This is intended
-  to be used with the <a href="parallel.html">parallel</a> task to
-  synchronize a set of processes.</p>
-<p>The conditions to wait for are defined in <a href="waitfor.html#nested">nested elements</a>,
-if multiple conditions are specified, then the task will wait until all conditions are true..</p>
-<p></p>
-<p>If both maxwait and maxwaitunit are not specified, the maxwait is 3 minutes (180000 milliseconds).</p>
-<p>If the <code>timeoutproperty</code> attribute has been set, a
-property of that name will be created if the condition didn't come
-true within the specified time.</p>
+<p>Blocks execution until a set of specified conditions become true. This is intended to be used
+with the <a href="parallel.html">parallel</a> task to synchronize a set of processes.</p>
+<p>The conditions to wait for are defined in <a href="waitfor.html#nested">nested elements</a>, if
+multiple conditions are specified, then the task will wait until all conditions are true.</p>
+<p>If both <var>maxwait</var> and <var>maxwaitunit</var> are not specified,
+default <var>maxwait</var> is 3 minutes (180000 milliseconds).</p>
+<p>If the <var>timeoutproperty</var> attribute has been set, a property of that name will be created
+if the condition didn't come true within the specified time.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">maxwait</td>
-    <td valign="top">The maximum amount of time to wait for all the required conditions
-      to become true before failing the task. Defaults to 180000 maxwaitunits.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">maxwaitunit</td>
-    <td valign="top">The unit of time that must be used to interpret the value of the
-    maxwait attribute.  Defaults to millisecond.
-                     Valid Values are
-                     <ul>
-                        <li>millisecond</li>
-                        <li>second</li>
-                        <li>minute</li>
-                        <li>hour</li>
-                        <li>day</li>
-                        <li>week</li>
-                     </ul>
-      </td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">checkevery</td>
-    <td valign="top">The amount of time to wait between each test of the conditions.
-      Defaults to 500 checkeveryunits.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">checkeveryunit</td>
-    <td valign="top">The unit of time that must be used to interpret the value of the
-    checkevery attribute.  Defaults to millisecond.
-                     Valid Values are
-                     <ul>
-                        <li>millisecond</li>
-                        <li>second</li>
-                        <li>minute</li>
-                        <li>hour</li>
-                        <li>day</li>
-                        <li>week</li>
-                     </ul>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>maxwait</td>
+    <td>The maximum amount of time to wait for all the required conditions to become true before
+      failing the task.</td>
+    <td>No; defaults to 180000 <var>maxwaitunit</var>s</td>
+  </tr>
+  <tr>
+    <td>maxwaitunit</td>
+    <td>The unit of time that must be used to interpret the value of the <var>maxwait</var>
+      attribute.  Valid values are
+      <ul>
+        <li><q>millisecond</q></li>
+        <li><q>second</q></li>
+        <li><q>minute</q></li>
+        <li><q>hour</q></li>
+        <li><q>day</q></li>
+        <li><q>week</q></li>
+      </ul>
     </td>
-    <td valign="top" align="center">No</td>
+    <td>No; defaults to <q>millisecond</q></td>
   </tr>
   <tr>
-    <td valign="top">timeoutproperty</td>
-    <td valign="top">the name of the property to set if maxwait has
-      been exceeded.</td>
-    <td valign="top" align="center">No</td>
+    <td>checkevery</td>
+    <td>The amount of time to wait between each test of the conditions.</td>
+    <td>No; defaults to 500 <var>checkeveryunit</var>s</td>
+  </tr>
+  <tr>
+    <td>checkeveryunit</td>
+    <td>The unit of time that must be used to interpret the value of the <var>checkevery</var>
+      attribute.  Valid values are
+      <ul>
+        <li><q>millisecond</q></li>
+        <li><q>second</q></li>
+        <li><q>minute</q></li>
+        <li><q>hour</q></li>
+        <li><q>day</q></li>
+        <li><q>week</q></li>
+      </ul>
+    </td>
+    <td>No; defaults to <q>millisecond</q></td>
+  </tr>
+  <tr>
+    <td>timeoutproperty</td>
+    <td>the name of the property to set if <var>maxwait</var> has been exceeded.</td>
+    <td>No</td>
   </tr>
 </table>
-<h3><a name="nested">Nested Elements</a></h3>
 
-<p>The available conditions that satisfy the
-<code>&lt;waitfor&gt;</code> task are the same as those for the
-<a href="condition.html"><code>&lt;condition&gt;</code></a> task. See
-<a href="conditions.html">here</a> for the full list.</p>
+<h3 id="nested">Parameters specified as nested elements</h3>
+<p>The available conditions that satisfy the <code>&lt;waitfor&gt;</code> task are the same as those
+for the <a href="condition.html"><code>&lt;condition&gt;</code></a>
+task. See <a href="conditions.html">here</a> for the full list.</p>
 
 <h3>Examples</h3>
-<blockquote><pre>
+<pre>
 &lt;waitfor maxwait="30" maxwaitunit="second"&gt;
-        &lt;available file="errors.log"/&gt;
-&lt;/waitfor&gt;
-</pre></blockquote>
-<p>waits up to 30 seconds for a file called errors.log to appear.</p>
-<blockquote><pre>
+    &lt;available file="errors.log"/&gt;
+&lt;/waitfor&gt;</pre>
+<p>waits up to 30 seconds for a file called <samp>errors.log</samp> to appear.</p>
+<pre>
 &lt;waitfor maxwait="3" maxwaitunit="minute" checkevery="500"&gt;
-        &lt;http url="http://localhost/myapp/index.html"/&gt;
-&lt;/waitfor&gt;
-</pre></blockquote>
-<p>waits up to 3 minutes (and checks every 500 milliseconds) for a web server on localhost
-  to serve up the specified URL.</p>
-<blockquote><pre>
+    &lt;http url="http://localhost/myapp/index.html"/&gt;
+&lt;/waitfor&gt;</pre>
+<p>waits up to 3 minutes (and checks every 500 milliseconds) for a web server
+on <samp>localhost</samp> to serve up the specified URL.</p>
+<pre>
 &lt;waitfor maxwait="10" maxwaitunit="second"&gt;
-        &lt;and&gt;
-            &lt;socket server="dbserver" port="1521"/&gt;
-            &lt;http url="http://webserver/mypage.html"/&gt;
-        &lt;/and&gt;
-&lt;/waitfor&gt;
-</pre></blockquote>
-<p>waits up to 10 seconds for a server on the dbserver machine to begin listening
-  on port 1521 and for the http://webserver/mypage.html web page
-  to become available.</p>
-
+    &lt;and&gt;
+        &lt;socket server="dbserver" port="1521"/&gt;
+        &lt;http url="http://webserver/mypage.html"/&gt;
+    &lt;/and&gt;
+&lt;/waitfor&gt;</pre>
+<p>waits up to 10 seconds for a server on the <samp>dbserver</samp> machine to begin listening on
+port 1521 and for the <samp>http://webserver/mypage.html</samp> web page to become available.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/war.html ant-1.10.3/manual/Tasks/war.html
--- ant-1.9.10/manual/Tasks/war.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/war.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,285 +24,248 @@
 
 <body>
 
-<h2><a name="war">War</a></h2>
+<h2 id="war">War</h2>
 <h3>Description</h3>
-<p>An extension of the <a href="jar.html">Jar</a> task with special
-treatment for files that should end up in the
-<code>WEB-INF/lib</code>, <code>WEB-INF/classes</code> or
-<code>WEB-INF</code> directories of the Web Application Archive.</p>
-<p>(The War task is a shortcut for specifying the particular layout of a WAR file.
-The same thing can be accomplished by using the <i>prefix</i> and <i>fullpath</i>
-attributes of zipfilesets in a Zip or Jar task.)</p>
-<p>The extended zipfileset element from the zip task
-    (with attributes <i>prefix</i>, <i>fullpath</i>, and <i>src</i>)
-    is available in the War task. The task is also resource-enabled
-    and will add nested resources and resource collections to the archive.</p>
-
-<p>
-    Before Servlet API 2.5/Java EE 5, a WEB-INF/web.xml file was mandatory in a
-    WAR file, so this task failed if the <code>webxml</code> attribute was missing.
-    As the web.xml file is now optional, the <code>webxml</code> attribute may now
-    be made optional. However, as most real web applications do need a web.xml file,
-    it is not optional by default. The task will fail if the file is not
-    included, unless the <code>needxmlfile</code> attribute
-    is set to <code>false</code>. The task
-    will warn if more than one web.xml file is added to the JAR  
-    through the filesets.
-</p>
-
-
-<p><b>Please note that the Zip format allows multiple files of the same
-fully-qualified name to exist within a single archive.  This has been
-documented as causing various problems for unsuspecting users.  If you wish
-to avoid this behavior you must set the <code>duplicate</code> attribute
-to a value other than its default, <code>&quot;add&quot;</code>.</b></p>
+<p>An extension of the <a href="jar.html">Jar</a> task with special treatment for files that should
+end up in the <samp>WEB-INF/lib</samp>, <samp>WEB-INF/classes</samp> or <samp>WEB-INF</samp>
+directories of the Web Application Archive.</p>
+
+<p>(The <code>War</code> task is a shortcut for specifying the particular layout of a WAR file.  The
+same thing can be accomplished by using the <var>prefix</var> and <var>fullpath</var> attributes
+of <code>zipfileset</code>s in a <code>Zip</code> or <code>Jar</code> task.)</p>
+<p>The extended <code>zipfileset</code> element from the <code>zip</code> task (with
+attributes <var>prefix</var>, <var>fullpath</var>, and <var>src</var>) is available in
+the <code>War</code> task. The task is also resource-enabled and will add nested resources and
+resource collections to the archive.</p>
+
+<p>Before Servlet API 2.5/Java EE 5, a <samp>WEB-INF/web.xml</samp> file was mandatory in a WAR
+file, so this task failed if the <var>webxml</var> attribute was missing.  As
+the <samp>web.xml</samp> file is now optional, the <var>webxml</var> attribute may now be made
+optional. However, as most real web applications do need a <samp>web.xml</samp> file, it is not
+optional by default. The task will fail if the file is not included, unless
+the <var>needxmlfile</var> attribute is set to <q>false</q>. The task will warn if more than
+one <samp>web.xml</samp> file is added to the JAR through the filesets.</p>
+
+<p><strong>Please note that the Zip format allows multiple files of the same fully-qualified name to
+exist within a single archive.  This has been documented as causing various problems for
+unsuspecting users.  If you wish to avoid this behavior you must set the <var>duplicate</var>
+attribute to a value other than its default, <q>add</q>.</strong></p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">destfile</td>
-    <td valign="top">the WAR file to create.</td>
-    <td align="center" valign="top" rowspan="2">Exactly one of the two.</td>
+    <td>destfile</td>
+    <td>the WAR file to create.</td>
+    <td rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
-    <td valign="top">warfile</td>
-    <td valign="top"><i>Deprecated</i> name of the file to create
-    -use <tt>destfile</tt> instead.</td>
+    <td>warfile</td>
+    <td class="left"><em><u>Deprecated</u></em> name of the file to
+      create&mdash;use <var>destfile</var> instead.</td>
   </tr>
   <tr>
-    <td valign="top">webxml</td>
-    <td valign="top">The servlet configuration descriptor to use (WEB-INF/web.xml).</td>
-    <td valign="top" align="center">Yes, unless <tt>needxmlfile</tt> is true,
-    the file is pulled in via a nested fileset, or an existing WAR file is
-    being updated.</td>
+    <td>webxml</td>
+    <td>The servlet configuration descriptor to use (<samp>WEB-INF/web.xml</samp>).</td>
+    <td>Yes, unless <var>needxmlfile</var> is <q>true</q>, the file is pulled in via a nested
+      fileset, or an existing WAR file is being updated.</td>
   </tr>
   <tr>
-    <td valign="top">needxmlfile</td>
-    <td valign="top">Flag to indicate whether or not the web.xml file is needed.
-        It should be set to false when generating
-        servlet 2.5+ WAR files without a web.xml file.
-        <em>Since Apache Ant 1.7</em></td>
-    <td valign="top" align="center">No -default "true"</td>
+    <td>needxmlfile</td>
+    <td>Flag to indicate whether or not the <samp>web.xml</samp> file is needed.  It should be set
+      to <q>false</q> when generating servlet 2.5+ WAR files without a <samp>web.xml</samp>
+      file.  <em>Since Apache Ant 1.7</em></td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">basedir</td>
-    <td valign="top">the directory from which to jar the files.</td>
-    <td valign="top" align="center">No</td>
+    <td>basedir</td>
+    <td>the directory from which to jar the files.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">compress</td>
-    <td valign="top">Not only store data but also compress them,
-    defaults to true.  Unless you set the <em>keepcompression</em>
-    attribute to false, this will apply to the entire archive, not
-    only the files you've added while updating.</td>
-    <td align="center" valign="top">No</td>
+    <td>compress</td>
+    <td>Not only store data but also compress them.  Unless you set the <var>keepcompression</var>
+      attribute to <q>false</q>, this will apply to the entire archive, not only the files you've
+      added while updating.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">keepcompression</td>
-    <td valign="top">For entries coming from existing archives (like
-    nested <em>zipfileset</em>s or while updating the archive), keep
-    the compression as it has been originally instead of using the
-    <em>compress</em> attribute.  Defaults false.  <em>Since Ant
-    1.6</em></td>
-    <td align="center" valign="top">No</td>
+    <td>keepcompression</td>
+    <td>For entries coming from existing archives (like nested <var>zipfileset</var>s or while
+      updating the archive), keep the compression as it has been originally instead of using
+      the <var>compress</var> attribute. <em>Since Ant 1.6</em></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">The character encoding to use for filenames
-      inside the archive.  Defaults to UTF8. <strong>It is not
-      recommended to change this value as the created archive will most
-      likely be unreadable for Java otherwise.</strong>
-      <br/>See also the <a href="zip.html#encoding">discussion in the
-      zip task page</a></td>
-    <td align="center" valign="top">No</td>
+    <td>encoding</td>
+    <td>The character encoding to use for filenames inside the archive. <strong>It is not
+      recommended to change this value as the created archive will most likely be unreadable for
+      Java otherwise.</strong>  <br/>See also the <a href="zip.html#encoding">discussion in the zip
+      task page</a></td>
+    <td>No; defaults to <q>UTF8</q></td>
   </tr>
   <tr>
-    <td valign="top">filesonly</td>
-    <td valign="top">Store only file entries, defaults to false</td>
-    <td align="center" valign="top">No</td>
+    <td>filesonly</td>
+    <td>Store only file entries</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">includes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      included. All files are included when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>includes</td>
+    <td>Comma- or space-separated list of patterns of files that must be included.</td>
+    <td>No; defaults to all (<q>**</q>)</td>
   </tr>
   <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an include pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>includesfile</td>
+    <td>Name of a file. Each line of this file is taken to be an include pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">excludes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      excluded. No files (except default excludes) are excluded when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>excludes</td>
+    <td>Comma- or space-separated list of patterns of files that must be excluded.</td>
+    <td>No; defaults to default excludes or none if <var>defaultexcludes</var> is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an exclude pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>excludesfile</td>
+    <td>Name of a file. Each line of this file is taken to be an exclude pattern</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">defaultexcludes</td>
-    <td valign="top">indicates whether default excludes should be used or not
-      (&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>defaultexcludes</td>
+    <td>Indicates whether default excludes should be used or not (<q>yes|no</q>).</td>
+    <td>No; defaults to <q>yes</q></td>
   </tr>
   <tr>
-    <td valign="top">manifest</td>
-    <td valign="top">the manifest file to use.</td>
-    <td valign="top" align="center">No</td>
+    <td>manifest</td>
+    <td>the manifest file to use.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">filesetmanifest</td>
-    <td valign="top">behavior when a Manifest is found in a zipfileset or zipgroupfileset file is found.  Valid values are &quot;skip&quot;, &quot;merge&quot;, and &quot;mergewithoutmain&quot;.  &quot;merge&quot; will merge all of the manifests together, and merge this into any other specified manifests.  &quot;mergewithoutmain&quot; merges everything but the Main section of the manifests.  Default value is &quot;skip&quot;.
+    <td>filesetmanifest</td>
+    <td>behavior when a manifest is found in a <code>zipfileset</code>
+      or <code>zipgroupfileset</code> file.  Valid values are <q>skip</q>, <q>merge</q>,
+      and <q>mergewithoutmain</q>.  <q>merge</q> will merge all of the manifests together, and merge
+      this into any other specified manifests.  <q>mergewithoutmain</q> merges everything but the
+      Main section of the manifests.
     </td>
-    <td valign="top" align="center">No</td>
+    <td>No; defaults to <q>skip</q></td>
   </tr>
   <tr>
-    <td valign="top">whenmanifestonly</td>
-    <td valign="top">behavior when no files match.  Valid values are &quot;fail&quot;, &quot;skip&quot;, and &quot;create&quot;.  Default is &quot;create&quot;.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">update</td>
-    <td valign="top">indicates whether to update or overwrite
-      the destination file if it already exists.  Default is &quot;false&quot;.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">duplicate</td>
-    <td valign="top">behavior when a duplicate file is found.  Valid values are &quot;add&quot;, &quot;preserve&quot;, and &quot;fail&quot;.  The default value is &quot;add&quot;.  </td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">roundup</td>
-    <td valign="top">Whether the file modification times will be
-    rounded up to the next even number of seconds.<br>
-    Zip archives store file modification times with a granularity of
-    two seconds, so the times will either be rounded up or down.  If
-    you round down, the archive will always seem out-of-date when you
-    rerun the task, so the default is to round up.  Rounding up may
-    lead to a different type of problems like JSPs inside a web
-    archive that seem to be slightly more recent than precompiled
-    pages, rendering precompilation useless.<br>
-    Defaults to true.  <em>Since Ant 1.6.2</em></td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">level</td>
-    <td valign="top">Non-default level at which file compression should be
-    performed. Valid values range from 0 (no compression/fastest) to 9
-    (maximum compression/slowest). <em>Since Ant 1.7</em></td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">preserve0permissions</td>
-    <td valign="top">when updating an archive or adding entries from a
-    different archive Ant will assume that a Unix permissions value of
-    0 (nobody is allowed to do anything to the file/directory) means
-    that the permissions haven't been stored at all rather than real
-    permissions and will instead apply its own default values.<br/>
-    Set this attribute to true if you really want to preserve the
-      original permission field.<em>since Ant 1.8.0</em>
-    </td>
-    <td valign="top" align="center">No, default is false</td>
+    <td>whenmanifestonly</td>
+    <td>behavior when no files match.  Valid values are <q>fail</q>, <q>skip</q>,
+      and <q>create</q>.</td>
+    <td>No; defaults to <q>create</q></td>
+  </tr>
+  <tr>
+    <td>update</td>
+    <td>indicates whether to update or overwrite the destination file if it already exists.</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>duplicate</td>
+    <td>behavior when a duplicate file is found.  Valid values are <q>add</q>, <q>preserve</q>,
+      and <q>fail</q>.</td>
+    <td>No; defaults to <q>add</q></td>
+  </tr>
+  <tr>
+    <td>roundup</td>
+    <td>Whether the file modification times will be rounded up to the next even number of
+      seconds.<br/>Zip archives store file modification times with a granularity of 2 seconds, so
+      the times will either be rounded up or down.  If you round down, the archive will always seem
+      out-of-date when you rerun the task, so the default is to round up.  Rounding up may lead to a
+      different type of problems like JSPs inside a web archive that seem to be slightly more recent
+      than precompiled pages, rendering precompilation useless. <em>Since Ant 1.6.2</em></td>
+    <td>No; defaults to <q>true</q></td>
+  </tr>
+  <tr>
+    <td>level</td>
+    <td>Non-default level at which file compression should be performed. Valid values range
+      from <q>0</q> (no compression/fastest) to <q>9</q> (maximum compression/slowest). <em>Since
+      Ant 1.7</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">useLanguageEncodingFlag</td>
-    <td valign="top">Whether to set the language encoding flag if the
-      encoding is UTF-8.  This setting doesn't have any effect if the
-      encoding is not UTF-8.
-      <em>Since Ant 1.8.0</em>.
-      <br/>See also the <a href="zip.html#encoding">discussion in the
-      zip task page</a></td>
-    <td valign="top" align="center">No, default is true</td>
-  </tr>
-  <tr>
-    <td valign="top">createUnicodeExtraFields</td>
-    <td valign="top">Whether to create unicode extra fields to store
-      the file names a second time inside the entry's metadata.
-      <br>Possible values are "never", "always" and "not-encodeable"
-      which will only add Unicode extra fields if the file name cannot
-      be encoded using the specified encoding.
-      <em>Since Ant 1.8.0</em>.
-      <br/>See also the <a href="zip.html#encoding">discussion in the
-      zip task page</a></td>
-    <td align="center" valign="top">No, default is "never"</td>
-  </tr>
-  <tr>
-    <td valign="top">fallbacktoUTF8</td>
-    <td valign="top">Whether to use UTF-8 and the language encoding
-      flag instead of the specified encoding if a file name cannot be
-      encoded using the specified encoding.
-      <em>Since Ant 1.8.0</em>.
-      <br/>See also the <a href="zip.html#encoding">discussion in the
-      zip task page</a></td>
-    <td align="center" valign="top">No, default is false</td>
-  </tr>
-  <tr>
-    <td valign="top">mergeClassPathAttributes</td>
-    <td valign="top">Whether to merge the Class-Path attributes found
-      in different manifests (if merging manifests).  If false, only
-      the attribute of the last merged manifest will be preserved.
-      <em>Since Ant 1.8.0</em>.
-      <br/>unless you also set flattenAttributes to true this may
-      result in manifests containing multiple Class-Path attributes
-      which violates the manifest specification.</td>
-    <td align="center" valign="top">No, default is false</td>
-  </tr>
-  <tr>
-    <td valign="top">flattenAttributes</td>
-    <td valign="top">Whether to merge attributes occurring more than
-      once in a section (this can only happen for the Class-Path
-      attribute) into a single attribute.
-      <em>Since Ant 1.8.0</em>.</td>
-    <td align="center" valign="top">No, default is false</td>
-  </tr>
-  <tr>
-    <td valign="top">zip64Mode</td>
-    <td valign="top">When to use Zip64 extensions for entries.  The
-      possible values are "never", "always" and "as-needed".
-      <em>Since Ant 1.9.1</em>.
-      <br/>See also the <a href="zip.html#zip64">discussion in the
-      zip task page</a></td>
-    <td align="center" valign="top">No, default is "never"</td>
+    <td>preserve0permissions</td>
+    <td>when updating an archive or adding entries from a different archive Ant will assume that a
+      Unix permissions value of 0 (nobody is allowed to do anything to the file/directory) means
+      that the permissions haven't been stored at all rather than real permissions and will instead
+      apply its own default values.<br/>  Set this attribute to <q>true</q> if you really want to
+      preserve the original permission field. <em>since Ant 1.8.0</em></td>
+    <td>No; default is <q>false</q></td>
+  </tr>
+  <tr>
+    <td>useLanguageEncodingFlag</td>
+    <td>Whether to set the language encoding flag if the encoding is UTF-8.  This setting doesn't
+      have any effect if the encoding is not UTF-8. <em>Since Ant 1.8.0</em>.  <br/>See also
+      the <a href="zip.html#encoding">discussion in the zip task page</a></td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+  <tr>
+    <td>createUnicodeExtraFields</td>
+    <td>Whether to create Unicode extra fields to store the file names a second time inside the
+      entry's metadata.<br/>Possible values are <q>never</q>, <q>always</q>
+      and <q>not-encodeable</q> which will only add Unicode extra fields if the file name cannot be
+      encoded using the specified encoding. <em>Since Ant 1.8.0</em>.<br/>See also
+      the <a href="zip.html#encoding">discussion in the zip task page</a></td>
+    <td>No; default is <q>never</q></td>
+  </tr>
+  <tr>
+    <td>fallbacktoUTF8</td>
+    <td>Whether to use UTF-8 and the language encoding flag instead of the specified encoding if a
+      file name cannot be encoded using the specified encoding. <em>Since Ant 1.8.0</em>.<br/>See
+      also the <a href="zip.html#encoding">discussion in the zip task page</a></td>
+    <td>No; default is <q>false</q></td>
+  </tr>
+  <tr>
+    <td>mergeClassPathAttributes</td>
+    <td>Whether to merge the <code>Class-Path</code> attributes found in different manifests (if
+      merging manifests).  If <q>false</q>, only the attribute of the last merged manifest will be
+      preserved.  <em>Since Ant 1.8.0</em>.<br/>Unless you also set <var>flattenAttributes</var>
+      to <q>true</q> this may result in manifests containing multiple <code>Class-Path</code>
+      attributes which violates the manifest specification.</td>
+    <td>No; default is false</td>
+  </tr>
+  <tr>
+    <td>flattenAttributes</td>
+    <td>Whether to merge attributes occurring more than once in a section (this can only happen for
+      the <code>Class-Path</code> attribute) into a single attribute. <em>Since Ant 1.8.0</em>.</td>
+    <td>No; default is <q>false</q></td>
+  </tr>
+  <tr>
+    <td>zip64Mode</td>
+    <td>When to use Zip64 extensions for entries.  The possible values
+      are <q>never</q>, <q>always</q> and <q>as-needed</q>.  <em>Since Ant 1.9.1</em>.<br/>See also
+      the <a href="zip.html#zip64">discussion in the zip task page</a></td>
+    <td>No; default is <q>never</q></td>
   </tr>
 </table>
 
-<h3>Nested elements</h3>
+<h3>Parameters specified as nested elements</h3>
 
 <h4>lib</h4>
-<p>The nested <code>lib</code> element specifies a <a
-href="../Types/fileset.html">FileSet</a>. All files included in this fileset will
-end up in the <code>WEB-INF/lib</code> directory of the war file.</p>
+<p>The nested <code>lib</code> element specifies a <a href="../Types/fileset.html">FileSet</a>. All
+files included in this fileset will end up in the <samp>WEB-INF/lib</samp> directory of the war
+file.</p>
 
 <h4>classes</h4>
-<p>The nested <code>classes</code> element specifies a <a
-href="../Types/fileset.html">FileSet</a>. All files included in this fileset will
-end up in the <code>WEB-INF/classes</code> directory of the war file.</p>
+<p>The nested <code>classes</code> element specifies
+a <a href="../Types/fileset.html">FileSet</a>. All files included in this fileset will end up in
+the <samp>WEB-INF/classes</samp> directory of the war file.</p>
 
 <h4>webinf</h4>
-<p>The nested <code>webinf</code> element specifies a <a
-href="../Types/fileset.html">FileSet</a>. All files included in this fileset will
-end up in the <code>WEB-INF</code> directory of the war file. If this
-fileset includes a file named <code>web.xml</code>, the file is
-ignored and you will get a warning.</p>
+<p>The nested <code>webinf</code> element specifies
+a <a href="../Types/fileset.html">FileSet</a>. All files included in this fileset will end up in
+the <samp>WEB-INF</samp> directory of the war file. If this fileset includes a file
+named <samp>web.xml</samp>, the file is ignored and you will get a warning.</p>
 
 <h4>metainf</h4>
-<p>The nested <code>metainf</code> element specifies a <a
-href="../Types/fileset.html">FileSet</a>. All files included in this fileset will
-end up in the <code>META-INF</code> directory of the war file. If this
-fileset includes a file named <code>MANIFEST.MF</code>, the file is
-ignored and you will get a warning.</p>
+<p>The nested <code>metainf</code> element specifies
+a <a href="../Types/fileset.html">FileSet</a>. All files included in this fileset will end up in
+the <samp>META-INF</samp> directory of the war file. If this fileset includes a file
+named <samp>MANIFEST.MF</samp>, the file is ignored and you will get a warning.</p>
 
 <h4>manifest, indexjars, service</h4>
 These are inherited from <a href="jar.html">&lt;jar&gt;</a>
@@ -318,9 +281,8 @@
 src/html/myapp/index.html
 src/jsp/myapp/front.jsp
 src/graphics/images/gifs/small/logo.gif
-src/graphics/images/gifs/large/logo.gif
-</pre>
-then the war file <code>myapp.war</code> created with
+src/graphics/images/gifs/large/logo.gif</pre>
+then the war file <samp>myapp.war</samp> created with
 <pre>
 &lt;war destfile=&quot;myapp.war&quot; webxml=&quot;src/metadata/myapp.xml&quot;&gt;
   &lt;fileset dir=&quot;src/html/myapp&quot;/&gt;
@@ -331,9 +293,8 @@
   &lt;classes dir=&quot;build/main&quot;/&gt;
   &lt;zipfileset dir=&quot;src/graphics/images/gifs&quot;
               prefix=&quot;images&quot;/&gt;
-&lt;/war&gt;
-</pre>
-will consist of
+&lt;/war&gt;</pre>
+<p>will consist of</p>
 <pre>
 WEB-INF/web.xml
 WEB-INF/lib/jdbc2.jar
@@ -342,23 +303,19 @@
 index.html
 front.jsp
 images/small/logo.gif
-images/large/logo.gif
-</pre>
+images/large/logo.gif</pre>
 using Ant's default manifest file. The content of
-<code>WEB-INF/web.xml</code> is identical to
-<code>src/metadata/myapp.xml</code>.
-
-<p>We regularly receive bug reports that this task is creating the WEB-INF
-directory as web-inf (all lower case), and thus it is our fault your webapp doesn't work. The cause
-of these complaints lies in WinZip, which turns an all upper-case
-directory into an all lower case one in a fit of helpfulness. Please check that
-<code>jar xvf yourwebapp.war</code> shows the same behaviour before filing another
-report.<br/>
-Winzip has an option allowing all uppercase names (which is off by default!).  It can be enabled by:
-Menu "Options" -> "Configuration",  "View" property/tab page, then "General" group box has an option called "Allow all uppercase file names".
-</p>
-
+<samp>WEB-INF/web.xml</samp> is identical to
+<samp>src/metadata/myapp.xml</samp>.
 
+<p>We regularly receive bug reports that this task is creating the <samp>WEB-INF</samp> directory
+as <samp>web-inf</samp> (all lower case), and thus it is our fault your webapp doesn't work. The
+cause of these complaints lies in WinZip, which turns an all upper-case directory into an all
+lower-case one in a fit of helpfulness. Please check that <code>jar xvf yourwebapp.war</code> shows
+the same behaviour before filing another report.<br/>WinZip has an option allowing all uppercase
+names (which is off by default!).  It can be enabled by: Menu <q>Options</q>
+&rarr; <q>Configuration</q>, <q>View</q> property/tab page, then <q>General</q> group box has an
+option called <q>Allow all uppercase file names</q>.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/whichresource.html ant-1.10.3/manual/Tasks/whichresource.html
--- ant-1.9.10/manual/Tasks/whichresource.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/whichresource.html	2018-03-24 12:37:12.000000000 +0000
@@ -14,107 +14,76 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-    
+
 <html>
   <head>
     <meta http-equiv="Content-Language" content="en-us">
-      <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
-        <title>Whichresource Task</title>
-      </link>
-    </meta>
+    <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
+    <title>Whichresource Task</title>
   </head>
 
-
   <body>
-    <h2><a name="whichresource">Whichresource</a></h2>
+    <h2 id="whichresource">Whichresource</h2>
     <h3>Description</h3>
-    <p>
-      Find a class or resource on the supplied classpath, or the
-      system classpath if none is supplied.
-      The named property is set if the item can be found.
-      For example:
-    </p>
-<blockquote><pre>
-  &lt;whichresource resource="/log4j.properties" property="log4j.url" &gt;
-</pre></blockquote>
+    <p>Find a class or resource on the supplied classpath, or the system classpath if none is
+      supplied.  The named property is set if the item can be found.  For example:</p>
+    <pre>&lt;whichresource resource="/log4j.properties" property="log4j.url"/&gt;</pre>
     <h3>Parameters</h3>
-    <table border="1" cellpadding="2" cellspacing="0">
+    <table class="attr">
       <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
       <tr>
-        <td valign="top">property</td>
-        <td valign="top">
-          The property to fill with the URL of the resource of class.
-        </td>
-        <td valign="top" align="center">Yes</td>
+        <td>property</td>
+        <td>The property to fill with the URL of the resource of class.</td>
+        <td>Yes</td>
       </tr>
       <tr>
-        <td valign="top">class</td>
-        <td valign="top">
-          The name of the class to look for.
-        </td>
-        <td valign="top" align="center" rowspan="2">Exactly one of these.</td>
+        <td>class</td>
+        <td>The name of the class to look for.</td>
+        <td rowspan="2">Exactly one of these</td>
       </tr>
       <tr>
-        <td valign="top">resource</td>
-        <td valign="top">
-          The name of the resource to look for.
-        </td>
+        <td>resource</td>
+        <td class="left">The name of the resource to look for.</td>
       </tr>
       <tr>
-        <td valign="top">classpath</td>
-        <td valign="top">
-          The classpath to use when looking up <code>class</code>
-          or <code>resource</code>.
-        </td>
-        <td align="center" valign="top">No</td>
+        <td>classpath</td>
+        <td>The classpath to use when looking up <var>class</var> or <var>resource</var>.</td>
+        <td>No</td>
       </tr>
       <tr>
-        <td valign="top">classpathref</td>
-        <td valign="top">
-          The classpath to use, given as a
-          <a href="../using.html#references">reference</a>
-          to a path defined elsewhere.
-          <em>Since Apache Ant 1.7.1.</em>
-        </td>
-        <td align="center" valign="top">No</td>
+        <td>classpathref</td>
+        <td>The classpath to use, given as a <a href="../using.html#references">reference</a> to a
+          path defined elsewhere.  <em>Since Apache Ant 1.7.1</em>.</td>
+        <td>No</td>
       </tr>
     </table>
     <h3>Parameters specified as nested elements</h3>
     <h4>classpath</h4>
-    <p>
-      <code>Whichresource</code>'s <code>classpath</code> attribute is a
-      <a href="../using.html#path">path-like structure</a> and can also be
-      set via a nested <code>&lt;classpath&gt;</code> element.
-    </p>
+    <p><code>Whichresource</code>'s <var>classpath</var> attribute is
+      a <a href="../using.html#path">path-like structure</a> and can also be set via a
+      nested <code>&lt;classpath&gt;</code> element.</p>
     <h3>Examples</h3>
-    <p>
-      The following shows using a classpath reference.
-    </p>
-<blockquote><pre>
-  &lt;path id="bsf.classpath"&gt;
-    &lt;fileset dir="${user.home}/lang/bsf" includes="*.jar"/&gt;
-  &lt;/path&gt;
-  &lt;whichresource property="bsf.class.location"
-                 class="org.apache.bsf.BSFManager"
-                 classpathref="bsf.classpath"/&gt;
-  &lt;echo&gt;${bsf.class.location}&lt;/echo&gt;
-</pre></blockquote>
-    <p>
-      The following shows using a nested classpath.
-    </p>
-<blockquote><pre>
-  &lt;whichresource
-    property="ant-contrib.antlib.location"
-    resource="net/sf/antcontrib/antlib.xml"&gt;
-    &lt;classpath&gt;
-      &lt;path path="f:/testing/ant-contrib/target/ant-contrib.jar"/&gt;
-    &lt;/classpath&gt;
-  &lt;/whichresource&gt;
-  &lt;echo&gt;${ant-contrib.antlib.location}&lt;/echo&gt;
-</pre></blockquote>
+    <p>The following shows using a classpath reference.</p>
+    <pre>
+&lt;path id="bsf.classpath"&gt;
+  &lt;fileset dir="${user.home}/lang/bsf" includes="*.jar"/&gt;
+&lt;/path&gt;
+&lt;whichresource property="bsf.class.location"
+               class="org.apache.bsf.BSFManager"
+               classpathref="bsf.classpath"/&gt;
+&lt;echo&gt;${bsf.class.location}&lt;/echo&gt;</pre>
+    <p>The following shows using a nested classpath.</p>
+    <pre>
+&lt;whichresource property="ant-contrib.antlib.location"
+               resource="net/sf/antcontrib/antlib.xml"&gt;
+  &lt;classpath&gt;
+    &lt;path path="f:/testing/ant-contrib/target/ant-contrib.jar"/&gt;
+  &lt;/classpath&gt;
+&lt;/whichresource&gt;
+&lt;echo&gt;${ant-contrib.antlib.location}&lt;/echo&gt;</pre>
   </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/wljspc.html ant-1.10.3/manual/Tasks/wljspc.html
--- ant-1.9.10/manual/Tasks/wljspc.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/wljspc.html	2018-03-24 12:37:12.000000000 +0000
@@ -15,65 +15,58 @@
    limitations under the License.
 -->
 <html>
-<head><link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
-<title>WLJSPC Task</title></head>
+  <head>
+    <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
+    <title>WLJSPC Task</title>
+  </head>
 <body>
 <h1>wljspc</h1>
 <h3>Description</h3>
-<p>Class to precompile JSP's using weblogic's jsp compiler (weblogic.jspc)</p>
-Tested only on Weblogic 4.5.1 - NT4.0 and Solaris 5.7,5.8<br>
+<p>Class to precompile JSP's using WebLogic JSP compiler (<code>weblogic.jspc</code>)</p>
+<p>Tested only on WebLogic 4.5.1&mdash;NT 4.0 and Solaris 7 &amp; 8</p>
 <h3>Parameters</h3>
-<table border="1" cellPadding="2" cellSpacing="0">
-  <tbody>
+<table class="attr">
+  <thead>
     <tr>
       <th>Attribute</th>
       <th>Values</th>
       <th>Required</th>
     </tr>
+  </thead>
+  <tbody>
     <tr>
       <td>src</td>
-      <td>root of source tree for JSP, ie, the document root for your weblogic server</td>
+      <td>root of source tree for JSP, ie, the document root for your WebLogic server</td>
       <td>Yes</td>
     </tr>
     <tr>
-      <td>
-dest</td>
-      <td> root of destination directory, what you have set as WorkingDir in the weblogic properties</td>
+      <td>dest</td>
+      <td>root of destination directory, what you have set as <code>WorkingDir</code> in the
+        WebLogic properties</td>
       <td>Yes</td>
     </tr>
     <tr>
-      <td>
-package</td>
-      <td> start package name under which your JSP's would be compiled</td>
+      <td>package</td>
+      <td>start package name under which your JSPs would be compiled</td>
       <td>Yes</td>
     </tr>
     <tr>
-      <td>
-classpath</td>
-      <td>Class path to use when compiling jsp's</td>
+      <td>classpath</td>
+      <td>Class path to use when compiling JSPs</td>
       <td>Yes</td>
     </tr>
   </tbody>
 </table>
-<p>
-<br>
-
-A classpath should be set which contains the weblogic classes as well as all application classes<br>
-referenced by the JSP. The system classpath is also appended when the jspc is called, so you may<br>
-choose to put everything in the classpath while calling Apache Ant. However, since presumably the JSP's will reference<br>
-classes being build by Ant, it would be better to explicitly add the classpath in the task<br>
-<br>
-The task checks timestamps on the JSP's and the generated classes, and compiles<br>
-only those files that have changed.<br>
-<br>
-It follows the weblogic naming convention of putting classes in<br>
-<b> _dirName/_fileName.class for dirname/fileName.jsp   </b><br>
-<br>
-</p>
-<h3><br>
-Example<br>
-</h3>
-<p>
+<p>A classpath should be set which contains the WebLogic classes as well as all application classes
+referenced by JSP. The system classpath is also appended when the <code>jspc</code> is called, so
+you may choose to put everything in the classpath while calling Apache Ant. However, since
+presumably JSPs will reference classes being build by Ant, it would be better to explicitly add the
+classpath in the task.</p>
+<p>The task checks timestamps on the JSP's and the generated classes, and compiles only those files
+that have changed.</p>
+<p>It follows the WebLogic naming convention of putting classes in <samp>_dirName/_fileName.class
+for dirname/fileName.jsp</samp></p>
+<h3>Example</h3>
 <pre>
 &lt;target name="jspcompile" depends="compile"&gt;
   &lt;wljspc src="c:\\weblogic\\myserver\\public_html" dest="c:\\weblogic\\myserver\\serverclasses" package="myapp.jsp"&gt
@@ -82,17 +75,14 @@
       &lt;pathelement path="${compile.dest}"/&gt;
     &lt;/classpath&gt;
   &lt;/wljspc&gt;
-&lt;/target&gt;
-</pre>
-
-</p>
+&lt;/target&gt;</pre>
 
 <h3>Limitations</h3>
 <ul>
-<li>This works only on weblogic 4.5.1</li>
-<li>It compiles the files thru the Classic compiler only.</li>
-<li>Since it is my experience that weblogic jspc throws out of memory error on being given too
-many files at one go, it is called multiple times with one jsp file each.</li>
+  <li>This works only on WebLogic 4.5.1</li>
+  <li>It compiles the files through the Classic compiler only.</li>
+  <li>Since it is my experience that <code>weblogic.jspc</code> throws out of memory error on being
+    given too many files at one go, it is called multiple times with one JSP file each.</li>
 </ul>
 
 </body>
diff -Nru ant-1.9.10/manual/Tasks/xmlproperty.html ant-1.10.3/manual/Tasks/xmlproperty.html
--- ant-1.9.10/manual/Tasks/xmlproperty.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/xmlproperty.html	2018-03-24 12:37:12.000000000 +0000
@@ -22,268 +22,236 @@
 
 <body>
 
-<h2><a name="xmlproperty">XmlProperty</a></h2>
+<h2 id="xmlproperty">XmlProperty</h2>
 <h3>Description</h3>
-<p>
-Loads property values from a well-formed xml file. There are no other restrictions
-than "well-formed". You can choose the layout you want. For example this XML property file:
+<p>Loads property values from a well-formed xml file. There are no other restrictions than
+"well-formed". You can choose the layout you want. For example this XML property file:</p>
 <pre>
   &lt;root&gt;
     &lt;properties&gt;
       &lt;foo&gt;bar&lt;/foo&gt;
     &lt;/properties&gt;
-  &lt;/root&gt;
-</pre>
-is roughly equivalent to this Java property file:
-<pre>
-  root.properties.foo = bar
-</pre>
-
-<p>
-By default, this load
-does <em>no</em> processing of the input.  In particular, unlike the
-<a href="property.html">Property task</a>, property references
-(i.e., <samp>${foo}</samp>) are not resolved.
-<p>
-<a name="semanticAttributes">
-<h3>Semantic Attributes</h3>
-</a>
-Input processing can be enabled by using the <b>semanticAttributes</b>
-attribute.  If this attribute is set to <i>true</i> (its default is
-<i>false</i>), the following processing occurs as the input XML file
-is loaded:
+  &lt;/root&gt;</pre>
+<p>is roughly equivalent to this Java property file:</p>
+<pre>root.properties.foo = bar</pre>
+
+<p>By default, this load does <em>no</em> processing of the input.  In particular, unlike
+the <a href="property.html">Property task</a>, property references (i.e., <samp>${foo}</samp>) are
+not resolved.</p>
+<h3 id="semanticAttributes">Semantic attributes</h3>
+<p>Input processing can be enabled by using the <var>semanticAttributes</var> attribute.  If this
+attribute is set to <q>true</q> (its default is <q>false</q>), the following processing occurs as
+the input XML file is loaded:/p>
 <ul>
   <li>Property references are resolved.</li>
   <li>The following attributes are treated differently:
     <ul>
-      <li><b>id</b>: The property is associated with the given id value.</li>
-      <li><b>location</b>: The property is treated as a file location</li>
-      <li><b>refid</b>: The property is set to the value of the
-          referenced property.</li>
-      <li><b>value</b>: The property is set to the value indicated.</li>
+      <li><var>id</var>: The property is associated with the given id value.</li>
+      <li><var>location</var>: The property is treated as a file location</li>
+      <li><var>refid</var>: The property is set to the value of the referenced property.</li>
+      <li><var>value</var>: The property is set to the value indicated.</li>
     </ul>
   </li>
-  <li><a href="../using.html#path">Path-like Structures</a> can be defined
-      by use of the following attributes:
+  <li><a href="../using.html#path">path-like structures</a> can be defined by use of the following
+    attributes:
     <ul>
-      <li><b>pathid</b>: The given id is used to identify a path.  The
-          nested XML tag name is ignored.  Child elements can be used
-          (XML tag names are ignored) to identify elements of the path.</li>
+      <li><var>pathid</var>: The given <var>id</var> is used to identify a path.  The nested XML tag
+        name is ignored.  Child elements can be used (XML tag names are ignored) to identify
+        elements of the path.</li>
     </ul>
   </li>
 </ul>
-<p>
-For example, with semantic attribute processing enabled, this XML property
-file:
+<p>For example, with semantic attribute processing enabled, this XML property file:</p>
 <pre>
-  &lt;root&gt;
-    &lt;properties&gt;
-      &lt;foo location="bar"/&gt;
-      &lt;quux&gt;${root.properties.foo}&lt;/quux&gt;
-    &lt;/properties&gt;
-  &lt;/root&gt;
-</pre>
-is roughly equivalent to the following fragments in a build.xml file:
-<pre>
-  &lt;property name="root.properties.foo" location="bar"/&gt;
-  &lt;property name="root.properties.quux" value="${root.properties.foo}"/&gt;
-</pre>
-
-</p>
+&lt;root&gt;
+  &lt;properties&gt;
+    &lt;foo location="bar"/&gt;
+    &lt;quux&gt;${root.properties.foo}&lt;/quux&gt;
+  &lt;/properties&gt;
+&lt;/root&gt;</pre>
+<p>is roughly equivalent to the following fragments in a <samp>build.xml</samp> file:</p>
+<pre>
+&lt;property name="root.properties.foo" location="bar"/&gt;
+&lt;property name="root.properties.quux" value="${root.properties.foo}"/&gt;</pre>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">The XML file to parse.</td>
-    <td valign="top" align="center">Yes, or a nested resource collection.</td>
+    <td>file</td>
+    <td>The XML file to parse.</td>
+    <td>Yes, or a nested resource collection</td>
   </tr>
   <tr>
-    <td valign="top">prefix</td>
-    <td valign="top">The prefix to prepend to each property</td>
-    <td valign="top" align="center">No</td>
+    <td>prefix</td>
+    <td>The prefix to prepend to each property.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">keepRoot</td>
-    <td valign="top">Keep the xml root tag as the
-                     first value in the property name.</td>
-    <td valign="top" align="center">No, default is <i>true</i>.</td>
+    <td>keepRoot</td>
+    <td>Keep the XML root tag as the first value in the property name.</td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">validate</td>
-    <td valign="top">Validate the input file (e.g. by a DTD). Otherwise the XML must only be well-formed.</td>
-    <td valign="top" align="center">No, default is <i>false</i>.</td>
+    <td>validate</td>
+    <td>Validate the input file (e.g. by a DTD). Otherwise the XML must only be well-formed.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">collapseAttributes</td>
-    <td valign="top">Treat attributes as nested elements.</td>
-    <td valign="top" align="center">No, default is <i>false</i>.</td>
+    <td>collapseAttributes</td>
+    <td>Treat attributes as nested elements.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">semanticAttributes</td>
-    <td valign="top">Enable special handling of certain attribute names.
-                     See the <a href="#semanticAttributes">Semantic Attributes</a>
-                     section for more information.</td>
-    <td valign="top" align="center">No, default is <i>false</i>.</td>
+    <td>semanticAttributes</td>
+    <td>Enable special handling of certain attribute names.  See
+      the <a href="#semanticAttributes">Semantic Attributes</a> section for more information.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">includeSemanticAttribute</td>
-    <td valign="top">Include the semantic attribute name
-                     as part of the property name.  Ignored if
-                     <i>semanticAttributes</i> is not set to <i>true</i>.
-                     See the <a href="#semanticAttributes">Semantic Attributes</a>
-                     section for more information.</td>
-    <td valign="top" align="center">No, default is <i>false</i>.</td>
+    <td>includeSemanticAttribute</td>
+    <td>Include the semantic attribute name as part of the property name.  Ignored
+      if <var>semanticAttributes</var> is not set to <q>true</q>.  See
+      the <a href="#semanticAttributes">Semantic Attributes</a> section for more information.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">rootDirectory</td>
-    <td valign="top">The directory to use for resolving file references. Ignored
-                     if <i>semanticAttributes</i> is not set to <i>true</i>.</td>
-    <td valign="top" align="center">No, default is <i>${basedir}</i>.</td>
+    <td>rootDirectory</td>
+    <td>The directory to use for resolving file references. Ignored if <var>semanticAttributes</var>
+      is not set to <q>true</q>.</td>
+    <td>No; default is <var>basedir</var></td>
   </tr>
   <tr>
-    <td valign="top">delimiter</td>
-    <td valign="top">Delimiter for splitting multiple values.<br><i>since Apache Ant 1.7.1</i></td>
-    <td valign="top" align="center">No, defaults to comma</td>
+    <td>delimiter</td>
+    <td>Delimiter for splitting multiple values.<br/><em>since Apache Ant 1.7.1</em></td>
+    <td>No; defaults to <q>,</q> (comma)</td>
   </tr>
 </table>
 
-<h3><a name="nested">Nested Elements</a></h3>
+<h3 id="nested">Parameters specified as nested elements</h3>
 <h4>xmlcatalog</h4>
-<p>The <a href="../Types/xmlcatalog.html"><tt>&lt;xmlcatalog&gt;</tt></a>
-element is used to perform entity resolution.</p>
+<p>The <a href="../Types/xmlcatalog.html"><code>&lt;xmlcatalog&gt;</code></a> element is used to
+perform entity resolution.</p>
 
-<h4>any <a href="../Types/resources.html">resource</a> or single element
-resource collection</h4>
+<h4>any <a href="../Types/resources.html">resource</a> or single element resource collection</h4>
 
 <p>The specified resource will be used as input.</p>
 
-<a name="examples">
-<h3>Examples</h3>
-</a>
+<h3 id="examples">Examples</h3>
 
-<h4>Non-semantic Attributes</h4>
+<h4>Non-semantic attributes</h4>
 
-<p>Here is an example xml file that does not have any semantic attributes.</p>
+<p>Here is an example XML file that does not have any semantic attributes.</p>
 
 <pre>
-   &lt;root-tag myattr="true"&gt;
-    &lt;inner-tag someattr="val"&gt;Text&lt;/inner-tag&gt;
-    &lt;a2&gt;&lt;a3&gt;&lt;a4&gt;false&lt;/a4&gt;&lt;/a3&gt;&lt;/a2&gt;
-   &lt;/root-tag&gt;
-</pre>
+&lt;root-tag myattr="true"&gt;
+  &lt;inner-tag someattr="val"&gt;Text&lt;/inner-tag&gt;
+  &lt;a2&gt;&lt;a3&gt;&lt;a4&gt;false&lt;/a4&gt;&lt;/a3&gt;&lt;/a2&gt;
+&lt;/root-tag&gt;</pre>
 
 <h5>default loading</h5>
-<p>This entry in a build file:
-<pre>   &lt;xmlproperty file="somefile.xml"/&gt;</pre>
-is equivalent to the following properties:
-<pre>
-   root-tag(myattr)=true
-   root-tag.inner-tag=Text
-   root-tag.inner-tag(someattr)=val
-   root-tag.a2.a3.a4=false
-</pre>
-
-<h5>collapseAttributes=false</h5>
-<p>This entry in a build file:
-<pre>   &lt;xmlproperty file="somefile.xml" collapseAttributes="true"/&gt;</pre>
-is equivalent to the following properties:
-<pre>
-   root-tag.myattr=true
-   root-tag.inner-tag=Text
-   root-tag.inner-tag.someatt=val
-   root-tag.a2.a3.a4=false
-</pre>
-
-<h5>keepRoot=false</h5>
-<p>This entry in a build file:
-<pre>   &lt;xmlproperty file="somefile.xml" keepRoot="false"/&gt;</pre>
-is equivalent to the following properties:
-<pre>
-   inner-tag=Text
-   inner-tag(someattr)=val
-   a2.a3.a4=false
-</pre>
-
-<h4>Semantic Attributes</h4>
-
-<p>Here is an example xml file that has semantic attributes.</p>
-<pre>
-  &lt;root-tag&gt;
-    &lt;version value="0.0.1"/&gt;
-    &lt;build folder="build"&gt;
-      &lt;classes id="build.classes" location="${build.folder}/classes"/&gt;
-      &lt;reference refid="build.classes"/&gt;
-    &lt;/build&gt;
-    &lt;compile&gt;
-      &lt;classpath pathid="compile.classpath"&gt;
-        &lt;pathelement location="${build.classes}"/&gt;
-      &lt;/classpath&gt;
-    &lt;/compile&gt;
-    &lt;run-time&gt;
-      &lt;jars&gt;*.jar&lt;/jars&gt;
-      &lt;classpath pathid="run-time.classpath"&gt;
-        &lt;path refid="compile.classpath"/&gt;
-        &lt;pathelement path="${run-time.jars}"/&gt;
-      &lt;/classpath&gt;
-    &lt;/run-time&gt;
-  &lt;/root-tag&gt;
-</pre>
-
-<h5>default loading (semanticAttributes=true)</h5>
-<p>This entry in a build file:
-<pre>   &lt;xmlproperty file="somefile.xml" keepRoot="false"
-                semanticAttributes="true"/&gt;</pre>
-is equivalent to the following entries in a build file:
-<pre>
-  &lt;property name="version" value="0.0.1"/&gt;
-  &lt;property name="build.folder" value="build"/&gt;
-  &lt;property name="build.classes" location="${build.folder}/classes" id="build.classes"/&gt;
-  &lt;property name="build.reference" refid="build.classes"/&gt;
-
-  &lt;property name="run-time.jars" value="*.jar"/&gt;
-
-  &lt;path id="compile.classpath"&gt;
-    &lt;pathelement location="${build.classes}"/&gt;
-  &lt;/path&gt;
-
-  &lt;path id="run-time.classpath"&gt;
-    &lt;path refid="compile.classpath"/&gt;
-    &lt;pathelement path="${run-time.jars}"/&gt;
-  &lt;/path&gt;
-</pre>
-
-<h5>includeSemanticAttribute="true"</h5>
-<p>This entry in a build file:
-<pre>   &lt;xmlproperty file="somefile.xml"
-                semanticAttributes="true" keepRoot="false"
-                includeSemanticAttribute="true"/&gt;
-</pre>
-is equivalent to the following entries in a build file:
-<pre>
-  &lt;property name="version.value" value="0.0.1"/&gt;
-  &lt;property name="build.folder" value="build"/&gt;
-  &lt;property name="build.classes.location" location="${build.folder}/classes"/&gt;
-  &lt;property name="build.reference.refid" refid="build.classes"/&gt;
-
-  &lt;property name="run-time.jars" value="*.jar"/&gt;
-
-  &lt;path id="compile.classpath"&gt;
-    &lt;pathelement location="${build.classes}"/&gt;
-  &lt;/path&gt;
-
-  &lt;path id="run-time.classpath"&gt;
-    &lt;path refid="compile.classpath"/&gt;
-    &lt;pathelement path="${run-time.jars}"/&gt;
-  &lt;/path&gt;
-</pre>
-
-
+<p>This entry in a build file:</p>
+<pre>&lt;xmlproperty file="somefile.xml"/&gt;</pre>
+<p>is equivalent to the following properties:</p>
+<pre>
+root-tag(myattr)=true
+root-tag.inner-tag=Text
+root-tag.inner-tag(someattr)=val
+root-tag.a2.a3.a4=false</pre>
+
+<h5><var>collapseAttributes</var>=<q>false</q></h5>
+<p>This entry in a build file:</p>
+<pre>&lt;xmlproperty file="somefile.xml" collapseAttributes="true"/&gt;</pre>
+<p>is equivalent to the following properties:</p>
+<pre>
+root-tag.myattr=true
+root-tag.inner-tag=Text
+root-tag.inner-tag.someatt=val
+root-tag.a2.a3.a4=false</pre>
+
+<h5><var>keepRoot</var>=<q>false</q></h5>
+<p>This entry in a build file:</p>
+<pre>&lt;xmlproperty file="somefile.xml" keepRoot="false"/&gt;</pre>
+<p>is equivalent to the following properties:</p>
+<pre>
+inner-tag=Text
+inner-tag(someattr)=val
+a2.a3.a4=false</pre>
+
+<h4>Semantic attributes</h4>
+
+<p>Here is an example XML file that has semantic attributes.</p>
+<pre>
+&lt;root-tag&gt;
+  &lt;version value="0.0.1"/&gt;
+  &lt;build folder="build"&gt;
+    &lt;classes id="build.classes" location="${build.folder}/classes"/&gt;
+    &lt;reference refid="build.classes"/&gt;
+  &lt;/build&gt;
+  &lt;compile&gt;
+    &lt;classpath pathid="compile.classpath"&gt;
+      &lt;pathelement location="${build.classes}"/&gt;
+    &lt;/classpath&gt;
+  &lt;/compile&gt;
+  &lt;run-time&gt;
+    &lt;jars&gt;*.jar&lt;/jars&gt;
+    &lt;classpath pathid="run-time.classpath"&gt;
+      &lt;path refid="compile.classpath"/&gt;
+      &lt;pathelement path="${run-time.jars}"/&gt;
+    &lt;/classpath&gt;
+  &lt;/run-time&gt;
+&lt;/root-tag&gt;</pre>
+
+<h5>default loading (<var>semanticAttributes</var>=<q>true</q>)</h5>
+<p>This entry in a build file:</p>
+<pre>
+&lt;xmlproperty file="somefile.xml" keepRoot="false"
+             semanticAttributes="true"/&gt;</pre>
+<p>is equivalent to the following entries in a build file:</p>
+<pre>
+&lt;property name="version" value="0.0.1"/&gt;
+&lt;property name="build.folder" value="build"/&gt;
+&lt;property name="build.classes" location="${build.folder}/classes" id="build.classes"/&gt;
+&lt;property name="build.reference" refid="build.classes"/&gt;
+
+&lt;property name="run-time.jars" value="*.jar"/&gt;
+
+&lt;path id="compile.classpath"&gt;
+  &lt;pathelement location="${build.classes}"/&gt;
+&lt;/path&gt;
+
+&lt;path id="run-time.classpath"&gt;
+  &lt;path refid="compile.classpath"/&gt;
+  &lt;pathelement path="${run-time.jars}"/&gt;
+&lt;/path&gt;</pre>
+
+<h5><var>includeSemanticAttribute</var>=<q>true</q></h5>
+<p>This entry in a build file:</p>
+<pre>
+&lt;xmlproperty file="somefile.xml"
+             semanticAttributes="true" keepRoot="false"
+             includeSemanticAttribute="true"/&gt;</pre>
+<p>is equivalent to the following entries in a build file:</p>
+<pre>
+&lt;property name="version.value" value="0.0.1"/&gt;
+&lt;property name="build.folder" value="build"/&gt;
+&lt;property name="build.classes.location" location="${build.folder}/classes"/&gt;
+&lt;property name="build.reference.refid" refid="build.classes"/&gt;
+
+&lt;property name="run-time.jars" value="*.jar"/&gt;
+
+&lt;path id="compile.classpath"&gt;
+  &lt;pathelement location="${build.classes}"/&gt;
+&lt;/path&gt;
+
+&lt;path id="run-time.classpath"&gt;
+  &lt;path refid="compile.classpath"/&gt;
+  &lt;pathelement path="${run-time.jars}"/&gt;
+&lt;/path&gt;</pre>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Tasks/xmlvalidate.html ant-1.10.3/manual/Tasks/xmlvalidate.html
--- ant-1.9.10/manual/Tasks/xmlvalidate.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/xmlvalidate.html	2018-03-24 12:37:12.000000000 +0000
@@ -23,202 +23,180 @@
 
 <body>
 
-<h2><a name="xmlvalidate">XMLValidate</a></h2>
+<h2 id="xmlvalidate">XMLValidate</h2>
 <h3>Description</h3>
 
-<p>This task checks that XML files are valid (or only well formed). The
-task uses the SAX2 parser implementation provided by JAXP by default
-(probably the one that is used by Apache Ant itself), but one can specify any
-SAX1/2 parser if needed.</p>
-
-<p>This task supports the use of nested
-  <li><a href="../Types/xmlcatalog.html"><tt>&lt;xmlcatalog&gt;</tt></a> elements</li>
-  <li><tt>&lt;dtd&gt;</tt> elements which are used to resolve DTDs and entities</li>
-  <li><tt>&lt;attribute&gt;</tt> elements which are used to set features on the parser.
-      These can be any number of
-      <a href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description"><tt>http://xml.org/sax/features/</tt></a>
-      or other features that your parser may support.</li>
-  <li><tt>&lt;property&gt;</tt> elements, containing string properties
-</p>
-
-<p><b>Warning</b> : JAXP creates by default a non namespace aware parser.
-The <tt>"http://xml.org/sax/features/namespaces"</tt> feature is set
-by default to <tt>false</tt> by the JAXP implementation used by ant. To validate
-a document containing namespaces,
-set the namespaces feature to <tt>true</tt> explicitly by nesting the following element:
-<pre>
-  &lt;attribute name="http://xml.org/sax/features/namespaces" value="true"/&gt;
-</pre>
-If you are using for instance a <tt>xsi:noNamespaceSchemaLocation</tt> attribute in your XML files,
-you will need this namespace support feature.
-</p>
-<p>If you are using a parser not generated by JAXP, by using the <tt>classname</tt> attribute of xmlvalidate, this warning
-may not apply.</p>
-
+<p>This task checks that XML files are valid (or only well formed). The task uses the SAX2 parser
+implementation provided by JAXP by default (probably the one that is used by Apache Ant itself), but
+one can specify any SAX1/2 parser if needed.</p>
+
+<p>This task supports the use of nested</p>
+<ul>
+  <li><a href="../Types/xmlcatalog.html"><code>&lt;xmlcatalog&gt;</code></a> elements</li>
+  <li><code>&lt;dtd&gt;</code> elements which are used to resolve DTDs and entities</li>
+  <li><code>&lt;attribute&gt;</code> elements which are used to set features on the parser.  These
+    can be any number
+    of <a href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description"
+    target="_top"><code>http://xml.org/sax/features/</code></a> or other features that your parser
+    may support.</li>
+  <li><code>&lt;property&gt;</code> elements, containing string properties</li>
+</ul>
+
+<p><strong>Warning</strong>: By default, JAXP creates a non namespace aware parser.
+The <var>http://xml.org/sax/features/namespaces</var> feature is set by default to <q>false</q> by
+the JAXP implementation used by Ant. To validate a document containing namespaces, set the
+namespaces feature to <q>true</q> explicitly by nesting the following element:</p>
+<pre>&lt;attribute name="http://xml.org/sax/features/namespaces" value="true"/&gt;</pre>
+<p>If you are using for instance a <code>xsi:noNamespaceSchemaLocation</code> attribute in your XML
+files, you will need this namespace support feature.</p>
+<p>If you are using a parser not generated by JAXP, by using the <var>classname</var> attribute
+of <code>xmlvalidate</code>, this warning may not apply.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">the file(s) you want to check. (optionally can use an embedded fileset)</td>
-    <td valign="top" align="center">No</td>
+    <td>file</td>
+    <td>the file(s) you want to check.</td>
+    <td>Yes, unless an embedded <code>&lt;fileset&gt;</code> is specified</td>
   </tr>
   <tr>
-    <td valign="top">lenient</td>
-    <td valign="top">
-      if true, only check the XML document is well formed
-        (ignored if the specified parser is a SAX1 parser)
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>lenient</td>
+    <td>if <q>true</q>, only check the XML document is well formed (ignored if the specified parser
+      is a SAX1 parser).</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classname</td>
-    <td valign="top">the parser to use.</td>
-    <td align="center" valign="top">No</td>
+    <td>classname</td>
+    <td>the parser to use.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">where to find the parser class. Optionally can use an embedded <tt>&lt;classpath&gt;</tt> element.</td>
-    <td align="center" valign="top">No</td>
+    <td>classpathref</td>
+    <td>where to find the parser class.</td>
+    <td>No, can use an embedded <code>&lt;classpath&gt;</code> element</td>
   </tr>
   <tr>
-    <td valign="top">failonerror</td>
-    <td valign="top">fails on a error if set to true (defaults to true).</td>
-    <td align="center" valign="top">No</td>
+    <td>failonerror</td>
+    <td>fails on a error if set to <q>true</q>.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">warn</td>
-    <td valign="top">log parser warn events.</td>
-    <td align="center" valign="top">No</td>
+    <td>warn</td>
+    <td>log parser warn events.</td>
+    <td>No</td>
   </tr>
 </table>
 
-<h3><a name="nested">Nested Elements</a></h3>
+<h3 id="nested">Parameters specified as nested elements</h3>
 <h4>dtd</h4>
-<p>
-<tt>&lt;dtd&gt;</tt> is used to specify different locations for DTD resolution.
-</p>
-<table border="1" cellpadding="2" cellspacing="0">
-<tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
-</tr>
-  <tr>
-    <td valign="top">publicId</td>
-    <td valign="top">Public ID of the DTD to resolve</td>
-    <td align="center" valign="top">Yes</td>
-  </tr>
-  <tr>
-    <td valign="top">location</td>
-    <td valign="top">Location of the DTD to use, which can be a file,
-    a resource, or a URL</td>
-    <td align="center" valign="top">Yes</td>
+<p><code>&lt;dtd&gt;</code> is used to specify different locations for DTD resolution.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>publicId</td>
+    <td>Public ID of the DTD to resolve</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>location</td>
+    <td>Location of the DTD to use, which can be a file, a resource, or a URL</td>
+    <td>Yes</td>
   </tr>
 </table>
 <h4>xmlcatalog</h4>
-<p>The <a href="../Types/xmlcatalog.html"><tt>&lt;xmlcatalog&gt;</tt></a>
-element is used to perform entity resolution.</p>
+<p>The <a href="../Types/xmlcatalog.html"><code>&lt;xmlcatalog&gt;</code></a> element is used to
+perform entity resolution.</p>
 <h4>attribute</h4>
-<p>The <tt>&lt;attribute&gt;</tt> element is used to set parser features.<br>
-Features usable with the xerces parser are defined here :
- <a href="http://xml.apache.org/xerces-j/features.html">Setting features</a><br>
-
-SAX features are defined here:
- <a href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description"><tt>http://xml.org/sax/features/</tt></a><br>
- </p>
-<table border="1" cellpadding="2" cellspacing="0">
-<tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
-</tr>
-  <tr>
-    <td valign="top">name</td>
-    <td valign="top">The name of the feature</td>
-    <td align="center" valign="top">Yes</td>
-  </tr>
-  <tr>
-    <td valign="top">value</td>
-    <td valign="top">The boolean value of the feature</td>
-    <td align="center" valign="top">Yes</td>
+<p>The <code>&lt;attribute&gt;</code> element is used to set parser features.</p>
+<p>Features usable with the Xerces parser are defined
+here: <a href="https://xml.apache.org/xerces-j/features.html" target="_top">Setting Features</a></p>
+<p>SAX features are defined
+here: <a href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description"
+target="_top">SAX2 Standard Feature Flags</a></p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>name</td>
+    <td>The name of the feature</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>value</td>
+    <td>The boolean value of the feature</td>
+    <td>Yes</td>
   </tr>
 </table>
-</p>
 
 <h4>property</h4>
-<p>The <tt>&lt;property&gt;</tt> element is used to set properties.
-These properties are defined here for the xerces XML parser implementation :
- <a href="http://xml.apache.org/xerces-j/properties.html">XML Parser properties</a>
-Properties can be used to set the schema used to validate the XML file.
-</p>
-<table border="1" cellpadding="2" cellspacing="0">
-<tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
-</tr>
-  <tr>
-    <td valign="top">name</td>
-    <td valign="top">The name of the feature</td>
-    <td align="center" valign="top">Yes</td>
-  </tr>
-  <tr>
-    <td valign="top">value</td>
-    <td valign="top">The string value of the property</td>
-    <td align="center" valign="top">Yes</td>
+<p>The <code>&lt;property&gt;</code> element is used to set properties.  These properties are
+defined here for the Xerces XML parser
+implementation: <a href="https://xml.apache.org/xerces-j/properties.html" target="_top">XML Parser
+properties</a>. Properties can be used to set the schema used to validate the XML file.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>name</td>
+    <td>The name of the feature</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>value</td>
+    <td>The string value of the property</td>
+    <td>Yes</td>
   </tr>
 </table>
-</p>
-
 
 <h3>Examples</h3>
-<pre>
-&lt;xmlvalidate file="toto.xml"/&gt;
-</pre>
-Validate toto.xml
+<pre>&lt;xmlvalidate file="toto.xml"/&gt;</pre>
+<p>Validate <samp>toto.xml</samp></p>
 <pre>
 &lt;xmlvalidate failonerror="no" lenient="yes" warn="yes"
              classname="org.apache.xerces.parsers.SAXParser"&gt;
              classpath="lib/xerces.jar"&gt;
   &lt;fileset dir="src" includes="style/*.xsl"/&gt;
-&lt;/xmlvalidate&gt;
-</pre>
-Validate all .xsl files in src/style, but only warn if there is an error, rather than
-halt the build.
+&lt;/xmlvalidate&gt;</pre>
+<p>Validate all <samp>.xsl</samp> files in <samp>src/style</samp>, but only warn if there is an
+error, rather than halt the build.</p>
 <pre>
-
 &lt;xmlvalidate file="struts-config.xml" warn="false"&gt;
   &lt;dtd publicId="-//Apache Software Foundation//DTD Struts Configuration 1.0//EN"
        location="struts-config_1_0.dtd"/&gt;
-&lt;/xmlvalidate&gt;
-</pre>
+&lt;/xmlvalidate&gt;</pre>
 
-Validate a struts configuration, using a local copy of the DTD. 
-<pre> 
+<p>Validate a struts configuration, using a local copy of the DTD.</p>
+<pre>
 &lt;xmlvalidate failonerror="no"&gt;
   &lt;fileset dir="${project.dir}" includes="**/*.xml"/&gt;
   &lt;xmlcatalog refid="mycatalog"/&gt;
-&lt;/xmlvalidate&gt;
-</pre>
+&lt;/xmlvalidate&gt;</pre>
 
-Scan all XML files in the project, using a predefined catalog to map URIs to local files.
+<p>Scan all XML files in the project, using a predefined catalog to map URIs to local files.</p>
 <pre>
 &lt;xmlvalidate failonerror="no"&gt;
   &lt;fileset dir="${project.dir}" includes="**/*.xml"/&gt;
   &lt;xmlcatalog&gt;
-       &lt;dtd
-         publicId=&quot;-//ArielPartners//DTD XML Article V1.0//EN&quot;
+    &lt;dtd publicId=&quot;-//ArielPartners//DTD XML Article V1.0//EN&quot;
          location=&quot;com/arielpartners/knowledgebase/dtd/article.dtd&quot;/&gt;
   &lt;/xmlcatalog&gt;
-&lt;/xmlvalidate&gt;
-</pre>
-Scan all XML files in the project, using the catalog defined inline.
+&lt;/xmlvalidate&gt;</pre>
+<p>Scan all XML files in the project, using the catalog defined inline.</p>
 
 <pre>
 &lt;xmlvalidate failonerror="yes" lenient="no" warn="yes"&gt;
@@ -226,38 +204,28 @@
   &lt;attribute name="http://xml.org/sax/features/validation" value="true"/&gt;
   &lt;attribute name="http://apache.org/xml/features/validation/schema"  value="true"/&gt;
   &lt;attribute name="http://xml.org/sax/features/namespaces" value="true"/&gt;
-&lt;/xmlvalidate&gt;
-</pre>
-Validate all .xml files in xml directory with the parser configured to perform XSD validation.
-Note: The parser must support the feature
-<code>http://apache.org/xml/features/validation/schema</code>.
-The <a href="schemavalidate.html">schemavalidate</a> task is better for validating
-W3C XML Schemas, as it extends this task with the right options automatically enabled,
-and makes it easy to add a list of schema files/URLs to act as sources.
+&lt;/xmlvalidate&gt;</pre>
+<p>Validate all <samp>.xml</samp> files in <samp>xml</samp> directory with the parser configured to
+perform XSD validation.  Note: The parser must support the
+feature <var>http://apache.org/xml/features/validation/schema</var>. The <a href="schemavalidate.html">schemavalidate</a>
+task is better for validating W3C XML Schemas, as it extends this task with the right options
+automatically enabled, and makes it easy to add a list of schema files/URLs to act as sources.</p>
 
 <pre>
-<!-- Converts path to URL format -->
+&lt;!-- Convert path to URL format --&gt;
 &lt;pathconvert dirsep="/" property="xsd.file"&gt;
 &lt;path&gt;
    &lt;pathelement location="xml/doc.xsd"/&gt;
 &lt;/path&gt;
 &lt;/pathconvert&gt;
 
-&lt;xmlvalidate file="xml/endpiece-noSchema.xml" lenient="false"
-  failonerror="true" warn="true"&gt;
-  &lt;attribute name="http://apache.org/xml/features/validation/schema"
-  value="true"/&gt;
+&lt;xmlvalidate file="xml/endpiece-noSchema.xml" lenient="false" failonerror="true" warn="true"&gt;
+  &lt;attribute name="http://apache.org/xml/features/validation/schema" value="true"/&gt;
   &lt;attribute name="http://xml.org/sax/features/namespaces" value="true"/&gt;
-  &lt;property
-  name="http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation"
-  value="${xsd.file}"/&gt;
-&lt;/xmlvalidate&gt;
-</pre>
-<br>
-Validate the file xml/endpiece-noSchema.xml against the schema xml/doc.xsd.
-<br>
-
-
+  &lt;property name="http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation"
+            value="${xsd.file}"/&gt;
+&lt;/xmlvalidate&gt;</pre>
+<p>Validate the file <samp>xml/endpiece-noSchema.xml</samp> against the
+schema <samp>xml/doc.xsd</samp>.</p>
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Tasks/zip.html ant-1.10.3/manual/Tasks/zip.html
--- ant-1.9.10/manual/Tasks/zip.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Tasks/zip.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,528 +24,461 @@
 
 <body>
 
-<h2><a name="zip">Zip</a></h2>
+<h2 id="zip">Zip</h2>
 <h3>Description</h3>
 <p>Creates a zipfile.</p>
-<p>The <i>basedir</i> attribute is the reference directory from where to zip.</p>
+<p>The <var>basedir</var> attribute is the reference directory from where to zip.</p>
 <p>Note that file permissions will not be stored in the resulting zipfile.</p>
-<p>It is possible to refine the set of files that are being zipped. This can be
-done with the <i>includes</i>, <i>includesfile</i>, <i>excludes</i>, <i>excludesfile</i> and <i>defaultexcludes</i>
-attributes. With the <i>includes</i> or <i>includesfile</i> attribute you specify the files you want to
-have included by using patterns. The <i>exclude</i> or <i>excludesfile</i> attribute is used to specify
-the files you want to have excluded. This is also done with patterns. And
-finally with the <i>defaultexcludes</i> attribute, you can specify whether you
-want to use default exclusions or not. See the section on <a
-href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
-inclusion/exclusion of files works, and how to write patterns. </p>
-<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and
-supports most attributes of <code>&lt;fileset&gt;</code>
-(<code>dir</code> becomes <code>basedir</code>) as well as the nested
-<code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and
-<code>&lt;patternset&gt;</code> elements.</p>
-<p>Or, you may place within it nested file sets, or references to file sets.
-In this case <code>basedir</code> is optional; the implicit file set is <i>only used</i>
-if <code>basedir</code> is set. You may use any mixture of the implicit file set
-(with <code>basedir</code> set, and optional attributes like <code>includes</code>
-and optional subelements like <code>&lt;include&gt;</code>); explicit nested
-<code>&lt;fileset&gt;</code> elements so long as at least one fileset total is specified. The ZIP file will
-only reflect the relative paths of files <i>within</i> each fileset. The Zip task and its derivatives know a special form of a fileset named zipfileset that has additional attributes (described below). </p>
-<p>The Zip task also supports the merging of multiple zip files into the zip file. 
-This is possible through either the <i>src</i> attribute of any nested filesets 
-or by using the special nested fileset <i>zipgroupfileset</i>.</p>
-
-<p>The <code>update</code> parameter controls what happens if the ZIP
-file already exists. When set to <code>yes</code>, the ZIP file is
-updated with the files specified. (New files are added; old files are
-replaced with the new versions.) When set to <code>no</code> (the
-default) the ZIP file is overwritten if any of the files that would be
-added to the archive are newer than the entries inside the archive.
-Please note that ZIP files store file modification times with a
-granularity of two seconds.  If a file is less than two seconds newer
-than the entry in the archive, Apache Ant will not consider it newer.</p>
-
-<p>The <code>whenempty</code> parameter controls what happens when no files match.
-If <code>skip</code> (the default), the ZIP is not created and a warning is issued.
-If <code>fail</code>, the ZIP is not created and the build is halted with an error.
-If <code>create</code>, an empty ZIP file (explicitly zero entries) is created,
-which should be recognized as such by compliant ZIP manipulation tools.</p>
-<p>This task will now use the platform's default character encoding
-for filenames - this is consistent with the command line ZIP tools,
-but causes problems if you try to open them from within Java and your
-filenames contain non US-ASCII characters. Use the encoding attribute
-and set it to UTF8 to create zip files that can safely be read by
-Java.  For a more complete discussion,
+
+<p>It is possible to refine the set of files that are being zipped. This can be done with
+the <var>includes</var>, <var>includesfile</var>, <var>excludes</var>, <var>excludesfile</var>
+and <var>defaultexcludes</var> attributes. With the <var>includes</var> or <var>includesfile</var>
+attribute you specify the files you want to have included by using patterns. The <var>exclude</var>
+or <var>excludesfile</var> attribute is used to specify the files you want to have excluded. This is
+also done with patterns. And finally with the <var>defaultexcludes</var> attribute, you can specify
+whether you want to use default exclusions or not. See the section
+on <a href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
+inclusion/exclusion of files works, and how to write patterns.</p>
+
+<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and supports most
+attributes of <code>&lt;fileset&gt;</code> (<var>dir</var> becomes <var>basedir</var>) as well as
+the nested <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code>
+and <code>&lt;patternset&gt;</code> elements.</p>
+
+<p>Or, you may place within it nested file sets, or references to file sets.  In this
+case <var>basedir</var> is optional; the implicit file set is <em>only used</em>
+if <var>basedir</var> is set. You may use any mixture of the implicit file set
+(with <var>basedir</var> set, and optional attributes like <var>includes</var> and optional
+subelements like <code>&lt;include&gt;</code>); explicit nested <code>&lt;fileset&gt;</code>
+elements so long as at least one fileset total is specified. The ZIP file will only reflect the
+relative paths of files <em>within</em> each fileset. The Zip task and its derivatives know a
+special form of a fileset named <code>zipfileset</code> that has additional attributes (described
+below).</p>
+
+<p>The Zip task also supports the merging of multiple zip files into the zip file.  This is possible
+through either the <var>src</var> attribute of any nested filesets or by using the special nested
+fileset <code>zipgroupfileset</code>.</p>
+
+<p>The <var>update</var> parameter controls what happens if the ZIP file already exists. When set
+to <q>yes</q>, the ZIP file is updated with the files specified. (New files are added; old files are
+replaced with the new versions.) When set to <q>no</q> (the default) the ZIP file is overwritten if
+any of the files that would be added to the archive are newer than the entries inside the archive.
+Please note that ZIP files store file modification times with a granularity of 2 seconds.  If a file
+is less than 2 seconds newer than the entry in the archive, Apache Ant will not consider it
+newer.</p>
+
+<p>The <var>whenempty</var> parameter controls what happens when no files match.  If <q>skip</q>
+(the default), the ZIP is not created and a warning is issued.  If <q>fail</q>, the ZIP is not
+created and the build is halted with an error.  If <q>create</q>, an empty ZIP file (explicitly zero
+entries) is created, which should be recognized as such by compliant ZIP manipulation tools.</p>
+
+<p>This task will now use default JVM character encoding for filenames&mdash;this is consistent with
+the command line ZIP tools, but causes problems if you try to open them from within Java and your
+filenames contain non US-ASCII characters. Use the <var>encoding</var> attribute and set it
+to <q>UTF8</q> to create zip files that can safely be read by Java.  For a more complete discussion,
 see <a href="#encoding">below</a></p>
 
-<p>Starting with Ant 1.5.2, <code>&lt;zip&gt;</code> can store Unix permissions
-inside the archive (see description of the filemode and dirmode
-attributes for <a href="../Types/zipfileset.html">&lt;zipfileset&gt;</a>).
-Unfortunately there is no portable way to store these permissions.
-Ant uses the algorithm used by <a href="http://www.info-zip.org">Info-Zip's</a>
-implementation of the zip and unzip commands - these are the default
-versions of zip and unzip for many Unix and Unix-like systems.</p>
-
-<p><b>Please note that the zip format allows multiple files of the same
-fully-qualified name to exist within a single archive.  This has been
-documented as causing various problems for unsuspecting users.  If you wish
-to avoid this behavior you must set the <code>duplicate</code> attribute
-to a value other than its default, <code>&quot;add&quot;</code>.</b></p>
-
-<p><b>Please also note</b> that different ZIP tools handle timestamps
-differently when it comes to applying timezone offset calculations of
-files.  Some ZIP libraries will store the timestamps as they've been
-read from the filesystem while others will modify the timestamps both
-when reading and writing the files to make all timestamps use the same
-timezone.  A ZIP archive created by one library may extract files with
-"wrong timestamps" when extracted by another library.</p>
-
-<p>Ant's ZIP classes use the same algorithm as the InfoZIP tools and
-zlib (timestamps get adjusted), Windows' "compressed folders" function
-and WinZIP don't change the timestamps.  This means that using the
-unzip task on files created by Windows' compressed folders function
-may create files with timestamps that are "wrong", the same is true if
-you use Windows' functions to extract an Ant generated ZIP
-archive.</p>
+<p><em>Since Ant 1.5.2</em>, <code>&lt;zip&gt;</code> can store Unix permissions inside the archive
+(see description of the <var>filemode</var> and <var>dirmode</var> attributes
+for <a href="../Types/zipfileset.html">&lt;zipfileset&gt;</a>).  Unfortunately there is no portable
+way to store these permissions.  Ant uses the algorithm used by <a href="http://www.info-zip.org"
+target="_top">Info-Zip's</a> implementation of the <kbd>zip</kbd> and <kbd>unzip</kbd>
+commands&mdash;these are the default versions of <kbd>zip</kbd> and <kbd>unzip</kbd> for many
+Unix(-like) systems.</p>
+
+<p><strong>Please note that the zip format allows multiple files of the same fully-qualified name to
+exist within a single archive.  This has been documented as causing various problems for
+unsuspecting users.  If you wish to avoid this behavior you must set the <var>duplicate</var>
+attribute to a value other than its default, <q>add</q>.</strong></p>
+
+<p><strong>Please also note</strong> that different ZIP tools handle timestamps differently when it
+comes to applying timezone offset calculations of files.  Some ZIP libraries will store the
+timestamps as they've been read from the filesystem while others will modify the timestamps both
+when reading and writing the files to make all timestamps use the same timezone.  A ZIP archive
+created by one library may extract files with "wrong timestamps" when extracted by another
+library.</p>
+
+<p>Ant's ZIP classes use the same algorithm as the InfoZIP tools and zlib (timestamps get adjusted),
+Windows' "compressed folders" function and WinZIP don't change the timestamps.  This means that
+using the <code>unzip</code> task on files created by Windows' compressed folders function may
+create files with timestamps that are "wrong", the same is true if you use Windows' functions to
+extract an Ant generated ZIP archive.</p>
 
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td valign="top" align="center"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">destfile</td>
-    <td valign="top">the zip-file to create.</td>
-    <td align="center" valign="top" rowspan="2">Exactly one of the two.</td>
+    <td>destfile</td>
+    <td>the zip file to create.</td>
+    <td rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
-    <td valign="top">zipfile</td>
-    <td valign="top">the <i>deprecated</i> old name of destfile.</td>
+    <td>zipfile</td>
+    <td class="left"><em><u>deprecated</u></em> old name of <var>destfile</var>.</td>
   </tr>
   <tr>
-    <td valign="top">basedir</td>
-    <td valign="top">the directory from which to zip the files.</td>
-    <td align="center" valign="top">No</td>
+    <td>basedir</td>
+    <td>the directory from which to zip the files.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">compress</td>
-    <td valign="top">Not only store data but also compress them,
-    defaults to true.  Unless you set the <em>keepcompression</em>
-    attribute to false, this will apply to the entire archive, not
-    only the files you've added while updating.</td>
-    <td align="center" valign="top">No</td>
+    <td>compress</td>
+    <td>Not only store data but also compress them.  Unless you set the <var>keepcompression</var>
+      attribute to <q>false</q>, this will apply to the entire archive, not only the files you've
+      added while updating.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">keepcompression</td>
-    <td valign="top">For entries coming from existing archives (like
-    nested <em>zipfileset</em>s or while updating the archive), keep
-    the compression as it has been originally instead of using the
-    <em>compress</em> attribute.  Defaults false.  <em>Since Ant
-    1.6</em></td>
-    <td align="center" valign="top">No</td>
+    <td>keepcompression</td>
+    <td>For entries coming from existing archives (like nested <code>zipfileset</code>s or while
+      updating the archive), keep the compression as it has been originally instead of using
+      the <var>compress</var> attribute. <em>Since Ant 1.6</em></td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">The character encoding to use for filenames
-    inside the zip file.  For a list of possible values see the <a
-                href="http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html">Supported Encodings</a>.<br/>
-    Defaults to the platform's default character encoding.
-      <br/>See also the <a href="#encoding">discussion below</a></td>
-    <td align="center" valign="top">No</td>
+    <td>encoding</td>
+    <td>The character encoding to use for filenames inside the zip file.  For a list of possible
+      values see
+      the <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html"
+      target="_top">Supported Encodings</a>.</td>
+    <td>No; defaults to default JVM character encoding</td>
   </tr>
   <tr>
-    <td valign="top">filesonly</td>
-    <td valign="top">Store only file entries, defaults to false</td>
-    <td align="center" valign="top">No</td>
+    <td>filesonly</td>
+    <td>Store only file entries.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">includes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      included. All files are included when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>includes</td>
+    <td>comma- or space-separated list of patterns of files that must be included.</td>
+    <td>No; defaults to all (<q>**</q>)</td>
   </tr>
   <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an include pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>includesfile</td>
+    <td>name of a file. Each line of this file is taken to be an include pattern.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">excludes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      excluded. No files (except default excludes) are excluded when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>excludes</td>
+    <td>comma- or space-separated list of patterns of files that must be excluded.</td>
+    <td>No; defaults to default excludes or none if <var>defaultexcludes</var> is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top">the name of a file. Each line of this file is
-      taken to be an exclude pattern</td>
-    <td valign="top" align="center">No</td>
+    <td>excludesfile</td>
+    <td>name of a file. Each line of this file is taken to be an exclude pattern.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">defaultexcludes</td>
-    <td valign="top">indicates whether default excludes should be used or not
-      (&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>defaultexcludes</td>
+    <td>indicates whether default excludes should be used or not (<q>yes|no</q>).</td>
+    <td>No; defaults to <q>yes</q></td>
   </tr>
   <tr>
-    <td valign="top">update</td>
-    <td valign="top">indicates whether to update or overwrite
-      the destination file if it already exists.  Default is &quot;false&quot;.</td>
-    <td valign="top" align="center">No</td>
+    <td>update</td>
+    <td>indicates whether to update or overwrite the destination file if it already exists.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">whenempty</td>
-    <td valign="top">behavior when no files match.  Valid values are &quot;fail&quot;, &quot;skip&quot;, and &quot;create&quot;.  Default is &quot;skip&quot;.</td>
-    <td valign="top" align="center">No</td>
+    <td>whenempty</td>
+    <td>behavior when no files match.  Valid values are <q>fail</q>, <q>skip</q>,
+      and <q>create</q>.</td>
+    <td>No; default is <q>skip</q></td>
   </tr>
   <tr>
-    <td valign="top">duplicate</td>
-    <td valign="top">behavior when a duplicate file is found.  Valid values are &quot;add&quot;, &quot;preserve&quot;, and &quot;fail&quot;. The default value is &quot;add&quot;.  </td>
-    <td valign="top" align="center">No</td>
+    <td>duplicate</td>
+    <td>behavior when a duplicate file is found.  Valid values are <q>add</q>, <q>preserve</q>,
+      and <q>fail</q>.</td>
+    <td>No; default is <q>add</q></td>
   </tr>
   <tr>
-    <td valign="top">roundup</td>
-    <td valign="top">Whether the file modification times will be
-    rounded up to the next even number of seconds.<br>
-    Zip archives store file modification times with a granularity of
-    two seconds, so the times will either be rounded up or down.  If
-    you round down, the archive will always seem out-of-date when you
-    rerun the task, so the default is to round up.  Rounding up may
-    lead to a different type of problems like JSPs inside a web
-    archive that seem to be slightly more recent than precompiled
-    pages, rendering precompilation useless.<br>
-    Defaults to true.  <em>Since Ant 1.6.2</em></td>
-    <td align="center" valign="top">No</td>
+    <td>roundup</td>
+    <td>Whether the file modification times will be rounded up to the next even number of
+      seconds.<br/>Zip archives store file modification times with a granularity of 2 seconds, so
+      the times will either be rounded up or down. If you round down, the archive will always seem
+      out-of-date when you rerun the task, so the default is to round up.  Rounding up may lead to a
+      different type of problems like JSPs inside a web archive that seem to be slightly more recent
+      than precompiled pages, rendering precompilation useless. <em>Since Ant 1.6.2</em></td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">comment</td>
-    <td valign="top">Comment to store in the archive. <em>Since Ant 1.6.3</em></td>
-    <td valign="top" align="center">No</td>
+    <td>comment</td>
+    <td>Comment to store in the archive. <em>Since Ant 1.6.3</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">level</td>
-    <td valign="top">Non-default level at which file compression should be
-    performed. Valid values range from 0 (no compression/fastest) to 9
-    (maximum compression/slowest). <em>Since Ant 1.7</em></td>
-    <td valign="top" align="center">No</td>
+    <td>level</td>
+    <td>Non-default level at which file compression should be performed. Valid values range
+      from <q>0</q> (no compression/fastest) to <q>9</q> (maximum compression/slowest). <em>Since
+      Ant 1.7</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">preserve0permissions</td>
-    <td valign="top">when updating an archive or adding entries from a
-    different archive Ant will assume that a Unix permissions value of
-    0 (nobody is allowed to do anything to the file/directory) means
-    that the permissions haven't been stored at all rather than real
-    permissions and will instead apply its own default values.<br/>
-    Set this attribute to true if you really want to preserve the
-      original permission field.<em>since Ant 1.8.0</em>
+    <td>preserve0permissions</td>
+    <td>when updating an archive or adding entries from a different archive Ant will assume that a
+      Unix permissions value of 0 (nobody is allowed to do anything to the file/directory) means
+      that the permissions haven't been stored at all rather than real permissions and will instead
+      apply its own default values.<br/>  Set this attribute to <q>true</q> if you really want to
+      preserve the original permission field. <em>Since Ant 1.8.0</em>
     </td>
-    <td valign="top" align="center">No, default is false</td>
+    <td>No; default is <q>false</q></td>
+  </tr>
+  <tr>
+    <td>useLanguageEncodingFlag</td>
+    <td>Whether to set the language encoding flag if the encoding is UTF-8. This setting doesn't
+      have any effect if the encoding is not UTF-8.  <em>Since Ant 1.8.0</em>.<br/>See also
+      the <a href="#encoding">discussion below</a></td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">useLanguageEncodingFlag</td>
-    <td valign="top">Whether to set the language encoding flag if the
-      encoding is UTF-8.  This setting doesn't have any effect if the
-      encoding is not UTF-8.
-      <em>Since Ant 1.8.0</em>.
-      <br/>See also the <a href="#encoding">discussion below</a></td>
-    <td align="center" valign="top">No, default is true</td>
-  </tr>
-  <tr>
-    <td valign="top">createUnicodeExtraFields</td>
-    <td valign="top">Whether to create unicode extra fields to store
-      the file names a second time inside the entry's metadata.
-      <br>Possible values are "never", "always" and "not-encodeable"
-      which will only add Unicode extra fields if the file name cannot
-      be encoded using the specified encoding.
-      <em>Since Ant 1.8.0</em>.
-      <br/>See also the <a href="#encoding">discussion below</a></td>
-    <td align="center" valign="top">No, default is "never"</td>
-  </tr>
-  <tr>
-    <td valign="top">fallbacktoUTF8</td>
-    <td valign="top">Whether to use UTF-8 and the language encoding
-      flag instead of the specified encoding if a file name cannot be
-      encoded using the specified encoding.
-      <em>Since Ant 1.8.0</em>.
-      <br/>See also the <a href="#encoding">discussion below</a></td>
-    <td align="center" valign="top">No, default is false</td>
-  </tr>
-  <tr>
-    <td valign="top">zip64Mode</td>
-    <td valign="top">When to use Zip64 extensions for entries.  The
-      possible values are "never", "always" and "as-needed".
-      <em>Since Ant 1.9.1</em>.
-      <br/>See also the <a href="#zip64">discussion below</a></td>
-    <td align="center" valign="top">No, default is "as-needed"</td>
+    <td>createUnicodeExtraFields</td>
+    <td>Whether to create Unicode extra fields to store the file names a second time inside the
+      entry's metadata.<br/>Possible values are <q>never</q>, <q>always</q>
+      and <q>not-encodeable</q> which will only add Unicode extra fields if the file name cannot be
+      encoded using the specified encoding.  <em>Since Ant 1.8.0</em>.<br/>See also
+      the <a href="#encoding">discussion below</a></td>
+    <td>No; default is <q>never</q></td>
+  </tr>
+  <tr>
+    <td>fallbacktoUTF8</td>
+    <td>Whether to use UTF-8 and the language encoding flag instead of the specified encoding if a
+      file name cannot be encoded using the specified encoding.  <em>Since Ant 1.8.0</em>.<br/>See
+      also the <a href="#encoding">discussion below</a></td>
+    <td>No; default is <q>false</q></td>
+  </tr>
+  <tr>
+    <td>zip64Mode</td>
+    <td>When to use Zip64 extensions for entries.  The possible values
+      are <q>never</q>, <q>always</q> and <q>as-needed</q>.  <em>Since Ant 1.9.1</em>.<br/>See also
+      the <a href="#zip64">discussion below</a></td>
+    <td>No; default is <q>as-needed</q></td>
   </tr>
 </table>
 
-<h3><a name="encoding">Encoding of File Names</a></h3>
+<h3 id="encoding">Encoding of file names</h3>
+
+<p>Traditionally the ZIP archive format uses CodePage 437 as encoding for file name, which is not
+sufficient for many international character sets.</p>
 
-<p>Traditionally the ZIP archive format uses CodePage 437 as encoding
-  for file name, which is not sufficient for many international
-  character sets.</p>
-
-<p>Over time different archivers have chosen different ways to work
-  around the limitation - the <code>java.util.zip</code> packages
-  simply uses UTF-8 as its encoding for example.</p>
-
-<p>Ant has been offering the encoding attribute of the zip and unzip
-  task as a way to explicitly specify the encoding to use (or expect)
-  since Ant 1.4.  It defaults to the platform's default encoding for
-  zip and UTF-8 for jar and other jar-like tasks (war, ear, ...) as
-  well as the unzip family of tasks.</p>
-
-<p>More recent versions of the ZIP specification introduce something
-  called the &quot;language encoding flag&quot; which can be used to
-  signal that a file name has been encoded using UTF-8.  Starting with
-  Ant 1.8.0 all zip-/jar- and similar archives written by Ant will set
-  this flag, if the encoding has been set to UTF-8.  Our
-  interoperabilty tests with existing archivers didn't show any ill
-  effects (in fact, most archivers ignore the flag to date), but you
-  can turn off the "language encoding flag" by setting the attribute
-  <code>useLanguageEncodingFlag</code> to <code>false</code> on the
-  zip-task if you should encounter problems.</p>
-
-<p>The unzip (and similar tasks) -task will recognize the language
-  encoding flag and ignore the encoding set on the task if it has been
-  found.</p>
-
-<p>The InfoZIP developers have introduced new ZIP extra fields that
-  can be used to add an additional UTF-8 encoded file name to the
-  entry's metadata.  Most archivers ignore these extra fields.  The
-  zip family of tasks support an
-  option <code>createUnicodeExtraFields</code> since Ant 1.8.0 which
-  makes Ant write these extra fields either for all entries ("always")
-  or only those whose name cannot be encoded using the specified
-  encoding (not-encodeable), it defaults to "never" since the extra
-  fields create bigger archives.</p>
-
-<p>The fallbackToUTF8 attribute of zip can be used to create archives
-  that use the specified encoding in the majority of cases but UTF-8 and
-  the language encoding flag for filenames that cannot be encoded
-  using the specified encoding.</p>
-
-<p>The unzip-task will recognize the unicode extra fields by default
-  and read the file name information from them, unless you set the
-  optional attribute <code>scanForUnicodeExtraFields</code> to
-  false.</p>
-
-<h4>Recommendations for Interoperability</h4>
-
-<p>The optimal setting of flags depends on the archivers you expect as
-  consumers/producers of the ZIP archives.  Below are some test
-  results which may be superseeded with later versions of each
-  tool.</p>
+<p>Over time different archivers have chosen different ways to work around the
+limitation&mdash;the <code class="code">java.util.zip</code> packages simply uses UTF-8 as its
+encoding for example.</p>
+
+<p>Ant has been offering the <q>encoding</q> attribute of the <code>zip</code>
+and <code>unzip</code> task as a way to explicitly specify the encoding to use (or expect) <em>since
+Ant 1.4</em>.  It defaults to default JVM character encoding for <code>zip</code> and UTF-8
+for <code>jar</code> and other jar-like tasks (<code>war</code>, <code>ear</code>, ...) as well as
+the <code>unzip</code> family of tasks.</p>
+
+<p>More recent versions of the ZIP specification introduce something called the <q>language encoding
+flag</q> which can be used to signal that a file name has been encoded using UTF-8. <em>Since Ant
+1.8.0</em>, all zip, jar and similar archives written by Ant will set this flag, if the encoding has
+been set to UTF-8.  Our interoperability tests with existing archivers didn't show any ill effects
+(in fact, most archivers ignore the flag to date), but you can turn off the <q>language encoding
+flag</q> by setting the attribute <var>useLanguageEncodingFlag</var> to <q>false</q> on
+the <code>zip</code> task if you should encounter problems.</p>
+
+<p>The <code>unzip</code> task (and similar tasks) will recognize the language encoding flag and
+ignore the encoding set on the task if it has been found.</p>
+
+<p>The InfoZIP developers have introduced new ZIP extra fields that can be used to add an additional
+UTF-8 encoded file name to the entry's metadata.  Most archivers ignore these extra
+fields.  <em>Since Ant 1.8.0</em>, the <code>zip</code> family of tasks support an
+option <var>createUnicodeExtraFields</var>, which makes Ant write these extra fields either for all
+entries (<q>always</q>) or only those whose name cannot be encoded using the specified encoding
+(<q>not-encodeable</q>), it defaults to <q>never</q> since the extra fields create bigger
+archives.</p>
+
+<p>The <var>fallbackToUTF8</var> attribute of <code>zip</code> can be used to create archives that
+use the specified encoding in the majority of cases but UTF-8 and the language encoding flag for
+filenames that cannot be encoded using the specified encoding.</p>
+
+<p>The <code>unzip</code> task will recognize the Unicode extra fields by default and read the file
+name information from them, unless you set the optional
+attribute <var>scanForUnicodeExtraFields</var> to <q>false</q>.</p>
+
+<h4>Recommendations for interoperability</h4>
+
+<p>The optimal setting of flags depends on the archivers you expect as consumers/producers of the
+ZIP archives.  Below are some test results which may be superseded with later versions of each
+tool.</p>
 
 <ul>
-  <li>The java.util.zip package used by the jar executable or to read
-    jars from your CLASSPATH reads and writes UTF-8 names, it doesn't
-    set or recognize any flags or unicode extra fields.</li>
-
-  <li>Starting with Java7 <code>java.util.zip</code> writes UTF-8 by
-    default and uses the language encoding flag.  It is possible to
-    specify a different encoding when reading/writing ZIPs via new
-    constructors.  The package now recognizes the language encoding
-    flag when reading and ignores the Unicode extra fields.</li>
-
-  <li>7Zip writes CodePage 437 by default but uses UTF-8 and the
-    language encoding flag when writing entries that cannot be encoded
-    as CodePage 437 (similar to the zip task with fallbacktoUTF8 set
-    to true).  It recognizes the language encoding flag when reading
-    and ignores the unicode extra fields.</li>
-
-  <li>WinZIP writes CodePage 437 and uses unicode extra fields by
-    default.  It recognizes the unicode extra field and the language
-    encoding flag when reading.</li>
-
-  <li>Windows' "compressed folder" feature doesn't recognize any flag
-    or extra field and creates archives using the platforms default
-    encoding - and expects archives to be in that encoding when reading
-    them.</li>
-
-  <li>InfoZIP based tools can recognize and write both, it is a
-    compile time option and depends on the platform so your mileage
-    may vary.</li>
-
-  <li>PKWARE zip tools recognize both and prefer the language encoding
-    flag.  They create archives using CodePage 437 if possible and UTF-8
-    plus the language encoding flag for file names that cannot be
-    encoded as CodePage 437.</li>
+  <li>The <code class="code">java.util.zip</code> package used by the <kbd>jar</kbd> executable or
+    to read jars from your <code>CLASSPATH</code> reads and writes UTF-8 names, it doesn't set or
+    recognize any flags or unicode extra fields.</li>
+  <li>Since Java 7, <code class="code">java.util.zip</code> writes UTF-8 by default and uses the
+    language encoding flag.  It is possible to specify a different encoding when reading/writing
+    ZIPs via new constructors.  The package now recognizes the language encoding flag when reading
+    and ignores the Unicode extra fields.</li>
+  <li>7Zip writes CodePage 437 by default but uses UTF-8 and the language encoding flag when writing
+    entries that cannot be encoded as CodePage 437 (similar to the <code>zip</code> task
+    with <var>fallbacktoUTF8</var> set to <q>true</q>).  It recognizes the language encoding flag
+    when reading and ignores the Unicode extra fields.</li>
+  <li>WinZIP writes CodePage 437 and uses Unicode extra fields by default.  It recognizes the
+    Unicode extra field and the language encoding flag when reading.</li>
+  <li>Windows' "compressed folder" feature doesn't recognize any flag or extra field and creates
+    archives using the default platform encoding&mdash;and expects archives to be in that encoding
+    when reading them.</li>
+  <li>InfoZIP based tools can recognize and write both, it is a compile time option and depends on
+    the platform so your mileage may vary.</li>
+  <li>PKWARE zip tools recognize both and prefer the language encoding flag.  They create archives
+    using CodePage 437 if possible and UTF-8 plus the language encoding flag for file names that
+    cannot be encoded as CodePage 437.</li>
 </ul>
 
 <p>So, what to do?</p>
 
-<p>If you are creating jars, then java.util.zip is your main
-  consumer.  We recommend you set the encoding to UTF-8 and keep the
-  language encoding flag enabled.  The flag won't help or hurt
-  java.util.zip prior to Java7 but archivers that support it will show
-  the correct file names.</p>
-
-<p>For maximum interop it is probably best to set the encoding to
-  UTF-8, enable the language encoding flag and create unicode extra
-  fields when writing ZIPs.  Such archives should be extracted
-  correctly by java.util.zip, 7Zip, WinZIP, PKWARE tools and most
-  likely InfoZIP tools.  They will be unusable with Windows'
-  "compressed folders" feature and bigger than archives without the
-  unicode extra fields, though.</p>
-
-<p>If Windows' "compressed folders" is your primary consumer, then
-  your best option is to explicitly set the encoding to the target
-  platform.  You may want to enable creation of unicode extra fields
-  so the tools that support them will extract the file names
-  correctly.</p>
-
-<h3><a name="zip64">Zip64 extensions</a></h3>
-
-<p>Zip64 extensions provide a way to create archives bigger than 4GB
-  or holding more than 65535 entries - or add individual entries
-  bigger than 4GB using the ZIP extension field mechanism.  These
-  extensions are supported by most modern ZIP implementations.</p>
-
-<p>When Ant writes compressed entries into the archive it creates it
-  doesn't know the compressed size of an entry before it has been
-  written.  Unfortunately the decision whether a Zip64 extra field
-  will be written has to be made before writing the entry's
-  content.</p>
-
-<p>Starting with Ant 1.9.0 Ant supports Zip64 extensions but didn't
-  provide any control over their usage, starting with Ant 1.9.1 a
-  new <em>zip64mode</em> attribute was added to the <code>zip</code>
-  family of tasks.  It supports three values:
+<p>If you are creating jars, then <code class="code">java.util.zip</code> is your main consumer.  We
+recommend you set the encoding to UTF-8 and keep the language encoding flag enabled.  The flag won't
+help or hurt <code class="code">java.util.zip</code> prior to Java 7 but archivers that support it
+will show the correct file names.</p>
+
+<p>For maximum interoparability it is probably best to set the encoding to UTF-8, enable the
+language encoding flag and create Unicode extra fields when writing ZIPs.  Such archives should be
+extracted correctly by <code class="code">java.util.zip</code>, 7Zip, WinZIP, PKWARE tools and most
+likely InfoZIP tools.  They will be unusable with Windows' "compressed folders" feature and bigger
+than archives without the Unicode extra fields, though.</p>
+
+<p>If Windows' "compressed folders" is your primary consumer, then your best option is to explicitly
+set the encoding to the target platform.  You may want to enable creation of Unicode extra fields so
+the tools that support them will extract the file names correctly.</p>
+
+<h3 id="zip64">Zip64 extensions</h3>
+
+<p>Zip64 extensions provide a way to create archives bigger than 4 GB or holding more than 65535
+entries&mdash;or add individual entries bigger than 4 GB using the ZIP extension field mechanism.
+These extensions are supported by most modern ZIP implementations.</p>
+
+<p>When Ant writes compressed entries into the archive it creates it doesn't know the compressed
+size of an entry before it has been written.  Unfortunately the decision whether a Zip64 extra field
+will be written has to be made before writing the entry's content.</p>
+
+<p>Ant 1.9.0 introduced support for Zip64 extensions but didn't provide any control over their
+usage. <em>Since Ant 1.9.1</em>, a new <var>zip64mode</var> attribute was added to
+the <code>zip</code> family of tasks.  It supports three values:
 
 <ul>
-  <li><em>never</em> means no Zip64 extra fields will ever be
-    written, this is the behavior of Ant 1.8.x and earlier and the
-    default behavior of <code>jar</code>, <code>ear</code>
-    and <code>war</code> starting with Ant 1.9.1.</li>
-  <li><em>always</em> means Zip64 extra fields are written for all
-    entries.</li>
-  <li><em>as-needed</em> means Zip64 extra fields are written for all
-    compressed entries to the "local file header" (by default these
-    are all files but not the directories) but only written to the
-    central directory if the entry really required Zip64 features.
-    This is the default behavior of Ant 1.9.0 and remains the default
-    behavior of the <code>zip</code> task.</li>
+  <li><q>never</q> means no Zip64 extra fields will ever be written. This is the behavior of Ant
+    prior to 1.9.0 and the default behavior of <code>jar</code>, <code>ear</code>
+    and <code>war</code> <em>since Ant 1.9.1</em>.</li>
+  <li><q>always</q> means Zip64 extra fields are written for all entries.</li>
+  <li><q>as-needed</q> means Zip64 extra fields are written for all compressed entries to the "local
+    file header" (by default these are all files but not the directories) but only written to the
+    central directory if the entry really required Zip64 features.  This is the default behavior of
+    Ant 1.9.0 and remains the default behavior of the <code>zip</code> task.</li>
 </ul>
 
-<p><em>as-needed</em> provides a good compromise if you don't know
-  whether you archive will exceed the limits of traditional zip files
-  but don't want to waste too much space (the Zip64 extensions take up
-  extra space).  Unfortunately some ZIP implementations don't
-  understand Zip64 extra fields or fail to parse archives with extra
-  fields in local file headers that are not present in the central
-  directory, one such implementation is the java.util.zip package of
-  Java5, that's why the <code>jar</code> tasks default
-  to <em>never</em>.  Archives created with <em>as-needed</em> can be
-  read without problems with Java6 and later.</p>
+<p><q>as-needed</q> provides a good compromise if you don't know whether you archive will exceed the
+limits of traditional zip files but don't want to waste too much space (the Zip64 extensions take up
+extra space).  Unfortunately some ZIP implementations don't understand Zip64 extra fields or fail to
+parse archives with extra fields in local file headers that are not present in the central
+directory, one such implementation is the <code class="code">java.util.zip</code> package of Java 5,
+that's why the <code>jar</code> tasks default to <q>never</q>.  Archives created
+with <q>as-needed</q> can be read without problems with Java 6 and later.</p>
 
 <h3>Parameters specified as nested elements</h3>
 
 <h4>any resource collection</h4>
-<p><a href="../Types/resources.html#collection">Resource
-Collection</a>s are used to select groups of files to archive.</p>
-<p>Prior to Ant 1.7 only <code>&lt;fileset&gt;</code> and
-<code>&lt;zipfileset&gt;</code> have been supported as nested elements.</p>
-
-<a name="zipgroupfileset" />
-<h4>zipgroupfileset</h4>
-<p>A <code>&lt;zipgroupfileset&gt;</code> allows for multiple zip files to be 
-merged into the archive. Each file found in this fileset is added to the archive 
-the same way that <i>zipfileset src</i> files are added.</p>
-
-<p><code>&lt;zipgroupfileset&gt;</code> is
-  a <a href="../Types/fileset.html">fileset</a> and supports all
-  of its attributes and nested elements.</a>
+<p><a href="../Types/resources.html#collection">resource collections</a> are used to select groups
+of files to archive.</p>
+<p>Prior to Ant 1.7 only <code>&lt;fileset&gt;</code> and <code>&lt;zipfileset&gt;</code> have been
+supported as nested elements.</p>
+
+<h4 id="zipgroupfileset">zipgroupfileset</h4>
+<p>A <code>&lt;zipgroupfileset&gt;</code> allows for multiple zip files to be merged into the
+archive. Each file found in this fileset is added to the archive the same way
+that <code>zipfileset</code> <var>src</var> files are added.</p>
+
+<p><code>&lt;zipgroupfileset&gt;</code> is a <a href="../Types/fileset.html">fileset</a> and
+supports all of its attributes and nested elements.</p>
 
 <h3>Examples</h3>
-<pre>  &lt;zip destfile=&quot;${dist}/manual.zip&quot;
-       basedir=&quot;htdocs/manual&quot;
-  /&gt;</pre>
-<p>zips all files in the <code>htdocs/manual</code> directory into a file called <code>manual.zip</code>
-in the <code>${dist}</code> directory.</p>
-<pre>  &lt;zip destfile=&quot;${dist}/manual.zip&quot;
-       basedir=&quot;htdocs/manual&quot;
-       update=&quot;true&quot;
-  /&gt;</pre>
-<p>zips all files in the <code>htdocs/manual</code> directory into a file called <code>manual.zip</code>
-in the <code>${dist}</code> directory. If <code>manual.zip</code>
-doesn't exist, it is created; otherwise it is updated with the
-new/changed files.</p>
-<pre>  &lt;zip destfile=&quot;${dist}/manual.zip&quot;
-       basedir=&quot;htdocs/manual&quot;
-       excludes=&quot;mydocs/**, **/todo.html&quot;
-  /&gt;</pre>
-<p>zips all files in the <code>htdocs/manual</code> directory. Files in the directory <code>mydocs</code>,
-or files with the name <code>todo.html</code> are excluded.</p>
-<pre>  &lt;zip destfile=&quot;${dist}/manual.zip&quot;
-       basedir=&quot;htdocs/manual&quot;
-       includes=&quot;api/**/*.html&quot;
-       excludes=&quot;**/todo.html&quot;
-  /&gt;</pre>
-<p>zips all files in the <code>htdocs/manual</code> directory. Only html files under the directory <code>api</code>
-are zipped, and files with the name <code>todo.html</code> are excluded.</p>
-<pre>  &lt;zip destfile=&quot;${dist}/manual.zip&quot;&gt;
-    &lt;fileset dir=&quot;htdocs/manual&quot;/&gt;
-    &lt;fileset dir=&quot;.&quot; includes=&quot;ChangeLog.txt&quot;/&gt;
-  &lt;/zip&gt;</pre>
-<p>zips all files in the <code>htdocs/manual</code> directory, and also adds the file <code>ChangeLog.txt</code> in the
-current directory. <code>ChangeLog.txt</code> will be added to the top of the ZIP file, just as if
-it had been located at <code>htdocs/manual/ChangeLog.txt</code>.</p>
-<pre>  &lt;zip destfile=&quot;${dist}/manual.zip&quot;&gt;
-    &lt;zipfileset dir=&quot;htdocs/manual&quot; prefix=&quot;docs/user-guide&quot;/&gt;
-    &lt;zipfileset dir=&quot;.&quot; includes=&quot;ChangeLog27.txt&quot; fullpath=&quot;docs/ChangeLog.txt&quot;/&gt;
-    &lt;zipfileset src=&quot;examples.zip&quot; includes=&quot;**/*.html&quot; prefix=&quot;docs/examples&quot;/&gt;
-  &lt;/zip&gt;</pre>
-<p>zips all files in the <code>htdocs/manual</code> directory into the <code>docs/user-guide</code> directory
-in the archive, adds the file <code>ChangeLog27.txt</code> in the
-current directory as <code>docs/ChangeLog.txt</code>, and includes all the html files in <code>examples.zip</code> 
-under <code>docs/examples</code>.  The archive might end up containing the files:</p>
-<pre>    docs/user-guide/html/index.html
+<pre>
+&lt;zip destfile=&quot;${dist}/manual.zip&quot;
+     basedir=&quot;htdocs/manual&quot;/&gt;</pre>
+<p>zips all files in the <samp>htdocs/manual</samp> directory into a file
+called <samp>manual.zip</samp> in the <samp>${dist}</samp> directory.</p>
+<pre>
+&lt;zip destfile=&quot;${dist}/manual.zip&quot;
+     basedir=&quot;htdocs/manual&quot;
+     update=&quot;true&quot;/&gt;</pre>
+<p>zips all files in the <samp>htdocs/manual</samp> directory into a file
+called <samp>manual.zip</samp> in the <samp>${dist}</samp> directory. If <samp>manual.zip</samp>
+doesn't exist, it is created; otherwise it is updated with the new/changed files.</p>
+<pre>
+&lt;zip destfile=&quot;${dist}/manual.zip&quot;
+     basedir=&quot;htdocs/manual&quot;
+     excludes=&quot;mydocs/**, **/todo.html&quot;/&gt;</pre>
+<p>zips all files in the <samp>htdocs/manual</samp> directory. Files in the
+directory <samp>mydocs</samp>, or files with the name <samp>todo.html</samp> are excluded.</p>
+<pre>
+&lt;zip destfile=&quot;${dist}/manual.zip&quot;
+     basedir=&quot;htdocs/manual&quot;
+     includes=&quot;api/**/*.html&quot;
+     excludes=&quot;**/todo.html&quot;/&gt;</pre>
+<p>zips all files in the <samp>htdocs/manual</samp> directory. Only <samp>html</samp> files under
+the directory <samp>api</samp> are zipped, and files with the name <samp>todo.html</samp> are
+excluded.</p>
+<pre>
+&lt;zip destfile=&quot;${dist}/manual.zip&quot;&gt;
+  &lt;fileset dir=&quot;htdocs/manual&quot;/&gt;
+  &lt;fileset dir=&quot;.&quot; includes=&quot;ChangeLog.txt&quot;/&gt;
+&lt;/zip&gt;</pre>
+<p>zips all files in the <samp>htdocs/manual</samp> directory, and also adds the
+file <samp>ChangeLog.txt</samp> in the current directory. <samp>ChangeLog.txt</samp> will be added
+to the top of the ZIP file, just as if it had been located
+at <samp>htdocs/manual/ChangeLog.txt</samp>.</p>
+<pre>
+&lt;zip destfile=&quot;${dist}/manual.zip&quot;&gt;
+  &lt;zipfileset dir=&quot;htdocs/manual&quot; prefix=&quot;docs/user-guide&quot;/&gt;
+  &lt;zipfileset dir=&quot;.&quot; includes=&quot;ChangeLog27.txt&quot; fullpath=&quot;docs/ChangeLog.txt&quot;/&gt;
+  &lt;zipfileset src=&quot;examples.zip&quot; includes=&quot;**/*.html&quot; prefix=&quot;docs/examples&quot;/&gt;
+&lt;/zip&gt;</pre>
+<p>zips all files in the <samp>htdocs/manual</samp> directory into the <samp>docs/user-guide</samp>
+directory in the archive, adds the file <samp>ChangeLog27.txt</samp> in the current directory
+as <samp>docs/ChangeLog.txt</samp>, and includes all the <samp>html</samp> files
+in <samp>examples.zip</samp> under <samp>docs/examples</samp>.  The archive might end up containing
+the files:</p>
+<pre>
+    docs/user-guide/html/index.html
     docs/ChangeLog.txt
-    docs/examples/index.html
-</pre>
-<p>
-The code
+    docs/examples/index.html</pre>
+<p>The code</p>
 <pre>
-  &lt;zip destfile=&quot;${dist}/manual.zip&quot;&gt;
-    &lt;zipfileset dir=&quot;htdocs/manual&quot; prefix=&quot;docs/user-guide&quot;/&gt;
-    &lt;zipgroupfileset dir=&quot;.&quot; includes=&quot;examples*.zip&quot;/&gt;
-  &lt;/zip&gt;
-</pre>
-<p>
-<p>zips all files in the <code>htdocs/manual</code> directory into the <code>docs/user-guide</code> directory in the archive and includes all the files in any file that matches <code>examples*.zip</code>, such as all files within <code>examples1.zip</code> or <code>examples_for_brian.zip</code>.
-The same can be achieved with
+&lt;zip destfile=&quot;${dist}/manual.zip&quot;&gt;
+  &lt;zipfileset dir=&quot;htdocs/manual&quot; prefix=&quot;docs/user-guide&quot;/&gt;
+  &lt;zipgroupfileset dir=&quot;.&quot; includes=&quot;examples*.zip&quot;/&gt;
+&lt;/zip&gt;</pre>
+<p>zips all files in the <samp>htdocs/manual</samp> directory into the <samp>docs/user-guide</samp>
+directory in the archive and includes all the files in any file that
+matches <samp>examples*.zip</samp>, such as all files within <samp>examples1.zip</samp>
+or <samp>examples_for_brian.zip</samp>.  The same can be achieved with</p>
 <pre>
-  &lt;zip destfile=&quot;${dist}/manual.zip&quot;&gt;
-    &lt;mappedresources&gt;
-      &lt;fileset dir=&quot;htdocs/manual&quot;/&gt;
-      &lt;globmapper from="*" to="docs/user-guide/*"/&gt;
-    &lt;/mappedresources&gt;
-    &lt;archives&gt;
-      &lt;zips&gt;
-        &lt;fileset dir=&quot;.&quot; includes=&quot;examples*.zip&quot;/&gt;
-      &lt;/zips&gt;
-    &lt;/archives&gt;
-  &lt;/zip&gt;
-</pre>
+&lt;zip destfile=&quot;${dist}/manual.zip&quot;&gt;
+  &lt;mappedresources&gt;
+    &lt;fileset dir=&quot;htdocs/manual&quot;/&gt;
+    &lt;globmapper from="*" to="docs/user-guide/*"/&gt;
+  &lt;/mappedresources&gt;
+  &lt;archives&gt;
+    &lt;zips&gt;
+      &lt;fileset dir=&quot;.&quot; includes=&quot;examples*.zip&quot;/&gt;
+    &lt;/zips&gt;
+  &lt;/archives&gt;
+&lt;/zip&gt;</pre>
 
-The next example
+<p>The next example</p>
 
 <pre>
 &lt;zip destfile="release.zip"&gt;
   &lt;tarfileset src="release.tar"/&gt;
-&lt;/zip&gt;
-</pre>
-
-<p>re-packages a TAR archive as a ZIP archive.  If Unix file
-permissions have been stored as part of the TAR file, they will be
-retained in the resulting ZIP archive.</p>
-
+&lt;/zip&gt;</pre>
 
+<p>re-packages a TAR archive as a ZIP archive.  If Unix file permissions have been stored as part of
+the TAR file, they will be retained in the resulting ZIP archive.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/tasksoverview.html ant-1.10.3/manual/tasksoverview.html
--- ant-1.9.10/manual/tasksoverview.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/tasksoverview.html	2018-03-24 12:37:12.000000000 +0000
@@ -23,407 +23,357 @@
 </head>
 
 <body>
-<a name="top"></a>
-<h2>Overview of Apache Ant Tasks</h2>
+<h2 id="top">Overview of Apache Ant Tasks</h2>
 <p>Given the large number of tasks available with Ant, it may be
 difficult to get an overall view of what each task can do.  The following
 tables provide a short description of each task and a link to the complete
 documentation.</p>
 
-<a href="#archive">Archive Tasks</a><br>
-<a href="#audit">Audit/Coverage Tasks</a><br>
-<a href="#compile">Compile Tasks</a><br>
-<a href="#deploy">Deployment Tasks</a><br>
-<a href="#doc">Documentation Tasks</a><br>
-<a href="#ejb">EJB Tasks</a><br>
-<a href="#exec">Execution Tasks</a><br>
-<a href="#file">File Tasks</a><br>
-<a href="#extensions">Java2 Extensions Tasks</a><br>
-<a href="#log">Logging Tasks</a><br>
-<a href="#mail">Mail Tasks</a><br>
-<a href="#misc">Miscellaneous Tasks</a><br>
-<a href="#preproc">Pre-process Tasks</a><br>
-<a href="#prop">Property Tasks</a><br>
-<a href="#remote">Remote Tasks</a><br>
-<a href="#scm">SCM Tasks</a><br>
-<a href="#testing">Testing Tasks</a><br>
-
-
-<p></p>
-<table width="100%" border="0" cellpadding="4" cellspacing="0">
-<th align="left">
-<font size="+0" face="arial,helvetica,sanserif">
-<a name="archive">Archive Tasks</a>
-</font>
-</th>
-<font size="-1" face="arial,helvetica,sanserif">
-<th align="right"><a href="#top">[Back to top]</a></th>
-</font>
-</table>
-<table width="100%" border="1" cellpadding="4" cellspacing="0">
-  <tr valign="top">
-    <th nowrap>Task Name</th>
-    <th nowrap>Description</th>
+<a href="#archive">Archive Tasks</a><br/>
+<a href="#audit">Audit/Coverage Tasks</a><br/>
+<a href="#compile">Compile Tasks</a><br/>
+<a href="#deploy">Deployment Tasks</a><br/>
+<a href="#doc">Documentation Tasks</a><br/>
+<a href="#ejb">EJB Tasks</a><br/>
+<a href="#exec">Execution Tasks</a><br/>
+<a href="#file">File Tasks</a><br/>
+<a href="#extensions">Java Extensions Tasks</a><br/>
+<a href="#log">Logging Tasks</a><br/>
+<a href="#mail">Mail Tasks</a><br/>
+<a href="#misc">Miscellaneous Tasks</a><br/>
+<a href="#preproc">Pre-process Tasks</a><br/>
+<a href="#prop">Property Tasks</a><br/>
+<a href="#remote">Remote Tasks</a><br/>
+<a href="#scm">SCM Tasks</a><br/>
+<a href="#testing">Testing Tasks</a><br/>
+
+<div class="float" id="archive">
+    <span class="left">Archive Tasks</span>
+    <span class="right"><a href="#top" style="text-decoration:none;">&#x1f51d;</a></span>
+</div>
+
+<table>
+  <tr>
+    <th>Task Name</th>
+    <th>Description</th>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/unpack.html">BUnzip2</a></td>
-    <td><p>Expands a file packed using GZip or BZip2.</p></td>
+  <tr>
+    <td><a href="Tasks/unpack.html">GUnzip/BUnzip2/UnXZ</a></td>
+    <td><p>Expands a file packed using GZip, BZip2 or XZ.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/pack.html">BZip2</a></td>
-    <td><p>Packs a file using the GZip or BZip2 algorithm. This task
+  <tr>
+    <td><a href="Tasks/pack.html">GZip/BZip2/XZ</a></td>
+    <td><p>Packs a file using the GZip, BZip2 or XZ algorithm. This task
      does not do any dependency checking; the output file is always
      generated</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/cab.html">Cab</a></td>
-    <td><p>Creates Microsoft CAB archive files. It is invoked
-     similar to the <a href="Tasks/jar.html">Jar</a> or
-     <a href="Tasks/zip.html">Zip</a> tasks. This task will work on
-     Windows using the external <i>cabarc</i> tool (provided by Microsoft),
-     which must be located in your executable path.</p></td>
+  <tr>
+    <td><a href="Tasks/cab.html">Cab</a></td>
+    <td><p>Creates Microsoft CAB archive files. It is invoked similar
+     to the <a href="Tasks/jar.html">Jar</a>
+     or <a href="Tasks/zip.html">Zip</a> tasks. This task will work on
+     Windows using the external <code>cabarc</code> tool (provided by
+     Microsoft), which must be located in your executable
+     path.</p></td>
    </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/ear.html">Ear</a></td>
-    <td><p>An extension of the <a href="Tasks/jar.html">Jar</a> task with
-     special treatment for files that should end up in an
+  <tr>
+    <td><a href="Tasks/ear.html">Ear</a></td>
+    <td><p>An extension of the <a href="Tasks/jar.html">Jar</a> task
+     with special treatment for files that should end up in an
      Enterprise Application archive.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/gunzip.html">GUnzip</a></td>
-    <td><p>Expands a GZip file.</p></td>
-  </tr>
-
-  <tr valign="top">
-    <td nowrap><a href="Tasks/gzip.html">GZip</a></td>
-    <td><p>GZips a set of files.</p></td>
-  </tr>
-
-  <tr valign="top">
-    <td nowrap><a href="Tasks/jar.html">Jar</a></td>
+  <tr>
+    <td><a href="Tasks/jar.html">Jar</a></td>
     <td><p>Jars a set of files.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/jlink.html">Jlink</a></td>
-    <td><p><i>Deprecated.</i> Use the <code>zipfileset</code>
-     and <code>zipgroupfileset</code> attributes of the
-     <a href="Tasks/jar.html">Jar</a> or
-     <a href="Tasks/zip.html">Zip</a> tasks instead.</p></td>
+  <tr>
+    <td><a href="Tasks/jlink.html">Jlink</a></td>
+    <td><p><em><u>Deprecated</u></em>. Use the <code>zipfileset</code>
+     and <code>zipgroupfileset</code> attributes of
+     the <a href="Tasks/jar.html">Jar</a>
+     or <a href="Tasks/zip.html">Zip</a> tasks instead.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/manifest.html">Manifest</a></td>
+  <tr>
+    <td><a href="Tasks/manifest.html">Manifest</a></td>
     <td><p>Creates a manifest file.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/rpm.html">Rpm</a></td>
-    <td><p>Invokes the <i>rpm</i> executable to build a Linux installation
-     file. This task currently only works on Linux or other Unix platforms
-     with RPM support.</p></td>
+  <tr>
+    <td><a href="Tasks/rpm.html">Rpm</a></td>
+    <td><p>Invokes the <kbd>rpm</kbd> executable to build a Linux
+     installation file. This task currently only works on Linux or
+     other Unix platforms with RPM support.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/signjar.html">SignJar</a></td>
-    <td><p>Signs a jar or zip file with the <i>javasign</i>
+  <tr>
+    <td><a href="Tasks/signjar.html">SignJar</a></td>
+    <td><p>Signs a jar or zip file with the <kbd>javasign</kbd>
      command-line tool.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/tar.html">Tar</a></td>
+  <tr>
+    <td><a href="Tasks/tar.html">Tar</a></td>
     <td><p>Creates a tar archive.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/unzip.html">Unjar</a></td>
+  <tr>
+    <td><a href="Tasks/unzip.html">Unjar</a></td>
     <td><p>Unzips a jarfile.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/untar.html">Untar</a></td>
+  <tr>
+    <td><a href="Tasks/unzip.html">Untar</a></td>
     <td><p>Untars a tarfile.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/unzip.html">Unwar</a></td>
+  <tr>
+    <td><a href="Tasks/unzip.html">Unwar</a></td>
     <td><p>Unzips a warfile.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/unzip.html">Unzip</a></td>
+  <tr>
+    <td><a href="Tasks/unzip.html">Unzip</a></td>
     <td><p>Unzips a zipfile.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/war.html">War</a></td>
+  <tr>
+    <td><a href="Tasks/war.html">War</a></td>
     <td><p>An extension of the <a href="Tasks/jar.html">Jar</a> task
-     with special treatment for files that should end up in the
-     <code>WEB-INF/lib</code>, <code>WEB-INF/classes</code>, or
-     <code>WEB-INF</code> directories of the Web Application Archive.</p></td>
+     with special treatment for files that should end up in
+     the <samp>WEB-INF/lib</samp>, <samp>WEB-INF/classes</samp>,
+     or <samp>WEB-INF</samp> directories of the Web Application
+     Archive.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/zip.html">Zip</a></td>
+  <tr>
+    <td><a href="Tasks/zip.html">Zip</a></td>
     <td><p>Creates a zipfile.</p></td>
   </tr>
 </table>
 
-<p></p>
-<table width="100%" border="0" cellpadding="4" cellspacing="0">
-<th align="left">
-<font size="+0" face="arial,helvetica,sanserif">
-<a name="audit">Audit/Coverage Tasks</a>
-</font></th>
-<font size="-1" face="arial,helvetica,sanserif">
-<th align="right"><a href="#top">[Back to top]</a></th>
-</font>
-</table>
-<table width="100%" border="1" cellpadding="4" cellspacing="0">
-  <tr valign="top">
-    <th nowrap>Task Name</th>
+<div class="float" id="audit">
+    <span class="left">Audit/Coverage Tasks</span>
+    <span class="right"><a href="#top" style="text-decoration:none;">&#x1f51d;</a></span>
+</div>
+
+<table>
+  <tr>
+    <th>Task Name</th>
     <th>Description</th>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/jdepend.html">JDepend</a></td>
-    <td><p>Invokes the <a href="http://www.clarkware.com/software/JDepend.html">
-     JDepend</a> parser. This parser &quot;traverses a set of Java source-file
-     directories and generates design-quality metrics for each Java
-     package&quot;.</p></td>
+  <tr>
+    <td><a href="Tasks/jdepend.html">JDepend</a></td>
+    <td><p>Invokes
+     the <a href="http://www.clarkware.com/software/JDepend.html"
+     target="_top">JDepend</a> parser. This parser &quot;traverses a
+     set of Java source-file directories and generates design-quality
+     metrics for each Java package&quot;.</p></td>
    </tr>
-
 </table>
 
-<p></p>
-<table width="100%" border="0" cellpadding="4" cellspacing="0">
-<th align="left">
-<font size="+0" face="arial,helvetica,sanserif">
-<a name="compile">Compile Tasks</a>
-</font></th>
-<font size="-1" face="arial,helvetica,sanserif">
-<th align="right"><a href="#top">[Back to top]</a></th>
-</font>
-</table>
-<table width="100%" border="1" cellpadding="4" cellspacing="0">
-  <tr valign="top">
-    <th nowrap>Task Name</th>
+<div class="float" id="compile">
+    <span class="left">Compile Tasks</span>
+    <span class="right"><a href="#top" style="text-decoration:none;">&#x1f51d;</a></span>
+</div>
+
+<table>
+  <tr>
+    <th>Task Name</th>
     <th>Description</th>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/depend.html">Depend</a></td>
-    <td><p>Determines which classfiles are out-of-date with respect to their
-     source, removing the classfiles of any other classes that depend on the
-     out-of-date classes, forcing the re-compile of the removed classfiles.
-     Typically used in conjunction with the
+  <tr>
+    <td><a href="Tasks/depend.html">Depend</a></td>
+    <td><p>Determines which class files are out-of-date with respect
+     to their source, removing the class files of any other classes
+     that depend on the out-of-date classes, forcing the re-compile of
+     the removed class files.  Typically used in conjunction with the
      <a href="Tasks/javac.html">Javac</a> task.</p></td>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/javac.html">Javac</a></td>
+  <tr>
+    <td><a href="Tasks/javac.html">Javac</a></td>
     <td><p>Compiles the specified source file(s) within the running
-     (Ant) VM, or in another VM if the <code>fork</code> attribute is
+     (Ant) JVM, or in another JVM if the <var>fork</var> attribute is
      specified.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/apt.html">Apt</a></td>
-    <td><p>Runs the annotation processor tool (apt), and then optionally compiles
-   the original code, and any generated source code.</p></td>
-  </tr>
-
-  <tr valign="top">
-    <td nowrap><a href="Tasks/jspc.html">JspC</a></td>
-    <td><p>Runs the JSP compiler. It can be used to precompile JSP pages
-     for fast initial invocation of JSP pages, deployment on a server without
-     the full JDK installed, or simply to syntax-check the pages without
-     deploying them. The <a href="Tasks/javac.html">Javac</a> task
-     can be used to compile the generated Java source.
-     (For Weblogic JSP compiles,
-     see the <a href="Tasks/wljspc.html">Wljspc</a> task.)</p></td>
-  </tr>
-
-  <tr valign="top">
-    <td nowrap><a href="Tasks/netrexxc.html">NetRexxC</a></td>
-    <td><p>Compiles a
-     <a href="http://www2.hursley.ibm.com/netrexx" target="_top">NetRexx</a>
-     source tree within the running (Ant) VM.</p></td>
-  </tr>
-
-  <tr valign="top">
-    <td nowrap><a href="Tasks/rmic.html">Rmic</a></td>
-    <td><p>Runs the <i>rmic</i> compiler on the specified file(s).</p></td>
-  </tr>
-
-  <tr valign="top">
-    <td nowrap><a href="Tasks/wljspc.html">Wljspc</a></td>
-    <td><p>Compiles JSP pages using Weblogic's JSP compiler,
-     <i>weblogic.jspc</i>. (For non-Weblogic JSP compiles, see the
-     <a href="Tasks/jspc.html">JspC</a> task.</p></td>
+  <tr>
+    <td><a href="Tasks/jspc.html">JspC</a></td>
+    <td><p>Runs the JSP compiler. It can be used to precompile JSP
+     pages for fast initial invocation of JSP pages, deployment on a
+     server without the full JDK installed, or simply to syntax-check
+     the pages without deploying
+     them. The <a href="Tasks/javac.html">Javac</a> task can be used
+     to compile the generated Java source.  (For WebLogic JSP
+     compiler, see the <a href="Tasks/wljspc.html">Wljspc</a>
+     task.)</p></td>
+  </tr>
+
+  <tr>
+    <td><a href="Tasks/netrexxc.html">NetRexxC</a></td>
+    <td><p>Compiles
+     a <a href="https://www.ibm.com/software/awdtools/netrexx/library.html"
+     target="_top">NetRexx</a> source tree within the running (Ant)
+     JVM.</p></td>
+  </tr>
+
+  <tr>
+    <td><a href="Tasks/rmic.html">Rmic</a></td>
+    <td><p>Runs the <kbd>rmic</kbd> compiler on the specified file(s).</p></td>
+  </tr>
+
+  <tr>
+    <td><a href="Tasks/wljspc.html">Wljspc</a></td>
+    <td><p>Compiles JSP pages using WebLogic JSP
+     compiler, <code>weblogic.jspc</code>. (For non-WebLogic JSP
+     compiler, see the <a href="Tasks/jspc.html">JspC</a>
+     task.</p></td>
   </tr>
-
 </table>
 
-<p></p>
-<table width="100%" border="0" cellpadding="4" cellspacing="0">
-<th align="left">
-<font size="+0" face="arial,helvetica,sanserif">
-<a name="deploy">Deployment Tasks</a>
-</font></th>
-<font size="-1" face="arial,helvetica,sanserif">
-<th align="right"><a href="#top">[Back to top]</a></th>
-</font>
-</table>
-<table width="100%" border="1" cellpadding="4" cellspacing="0">
-  <tr valign="top">
-    <th nowrap>Task Name</th>
+<div class="float" id="deploy">
+    <span class="left">Deployment Tasks</span>
+    <span class="right"><a href="#top" style="text-decoration:none;">&#x1f51d;</a></span>
+</div>
+
+<table>
+  <tr>
+    <th>Task Name</th>
     <th>Description</th>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/serverdeploy.html">ServerDeploy</a></td>
-    <td><p>Task to run a &quot;hot&quot; deployment tool for vendor-specific
-     J2EE server.
-    </p></td>
+  <tr>
+    <td><a href="Tasks/serverdeploy.html">ServerDeploy</a></td>
+    <td><p>Runs a &quot;hot&quot; deployment tool for vendor-specific
+     J2EE server.</p></td>
   </tr>
 </table>
 
-<p></p>
-<table width="100%" border="0" cellpadding="4" cellspacing="0">
-<th align="left">
-<font size="+0" face="arial,helvetica,sanserif">
-<a name="doc">Documentation Tasks</a>
-</font></th>
-<font size="-1" face="arial,helvetica,sanserif">
-<th align="right"><a href="#top">[Back to top]</a></th>
-</font>
-</table>
-<table width="100%" border="1" cellpadding="4" cellspacing="0">
-  <tr valign="top">
-    <th nowrap>Task Name</th>
+<div class="float" id="doc">
+    <span class="left">Documentation Tasks</span>
+    <span class="right"><a href="#top" style="text-decoration:none;">&#x1f51d;</a></span>
+</div>
+
+<table>
+  <tr>
+    <th>Task Name</th>
     <th>Description</th>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/javadoc.html">Javadoc/<i>Javadoc2</i></a></td>
-    <td><p>Generates code documentation using the <i>javadoc</i> tool.
-     The Javadoc2 task is deprecated; use the Javadoc task instead.</p></td>
+  <tr>
+    <td><a href="Tasks/javadoc.html">Javadoc</a></td>
+    <td><p>Generates code documentation using the <kbd>javadoc</kbd>
+     tool. <em>The <code>Javadoc2</code> task is <u>deprecated</u>; use
+     the <code>Javadoc</code> task instead.</em></p></td>
   </tr>
-
 </table>
 
-<p></p>
-<table width="100%" border="0" cellpadding="4" cellspacing="0">
-<th align="left">
-<font size="+0" face="arial,helvetica,sanserif">
-<a name="ejb">EJB Tasks</a>
-</font></th>
-<font size="-1" face="arial,helvetica,sanserif">
-<th align="right"><a href="#top">[Back to top]</a></th>
-</font>
-</table>
-<table width="100%" border="1" cellpadding="4" cellspacing="0">
-  <tr valign="top">
-    <th nowrap>Task Name</th>
+<div class="float" id="ejb">
+    <span class="left">EJB Tasks</span>
+    <span class="right"><a href="#top" style="text-decoration:none;">&#x1f51d;</a></span>
+</div>
+
+<table>
+  <tr>
+    <th>Task Name</th>
     <th>Description</th>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/ejb.html">EJB Tasks</a></td>
+  <tr>
+    <td><a href="Tasks/ejb.html">EJB Tasks</a></td>
     <td><p>(See the documentation describing the EJB tasks.)</p></td>
   </tr>
 </table>
 
-<p></p>
-<table width="100%" border="0" cellpadding="4" cellspacing="0">
-<th align="left">
-<font size="+0" face="arial,helvetica,sanserif">
-<a name="exec">Execution Tasks</a>
-</font></th>
-<font size="-1" face="arial,helvetica,sanserif">
-<th align="right"><a href="#top">[Back to top]</a></th>
-</font>
-</table>
-<table width="100%" border="1" cellpadding="4" cellspacing="0">
-  <tr valign="top">
-    <th nowrap>Task Name</th>
+<div class="float" id="exec">
+    <span class="left">Execution Tasks</span>
+    <span class="right"><a href="#top" style="text-decoration:none;">&#x1f51d;</a></span>
+</div>
+
+<table>
+  <tr>
+    <th>Task Name</th>
     <th>Description</th>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/ant.html">Ant</a></td>
+  <tr>
+    <td><a href="Tasks/ant.html">Ant</a></td>
     <td><p>Runs Ant on a supplied buildfile, optionally
      passing properties (with possibly new values).
      This task can be used to build sub-projects.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/antcall.html">AntCall</a></td>
+  <tr>
+    <td><a href="Tasks/antcall.html">AntCall</a></td>
     <td><p>Runs another target within the same buildfile, optionally
      passing properties (with possibly new values).</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/apply.html">Apply/<i>ExecOn</i></a></td>
-    <td><p>Executes a system command. When the <code>os</code> attribute is
+  <tr>
+    <td><a href="Tasks/apply.html">Apply/<em>ExecOn</em></a></td>
+    <td><p>Executes a system command. When the <var>os</var> attribute is
      specified, the command is only executed when Ant is run on one
      of the specified operating systems.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/dependset.html">Dependset</a></td>
-    <td><p>This task compares a set of source files with a set of target
+  <tr>
+    <td><a href="Tasks/dependset.html">Dependset</a></td>
+    <td><p>Compares a set of source files with a set of target
      files.  If any of the source files is newer than any of
-     the target files, all the target files are removed. </p></td>
+     the target files, all the target files are removed.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/exec.html">Exec</a></td>
-    <td><p>Executes a system command. When the <code>os</code> attribute
+  <tr>
+    <td><a href="Tasks/exec.html">Exec</a></td>
+    <td><p>Executes a system command. When the <var>os</var> attribute
      is specified, the command is only executed when Ant is run on one of
      the specified operating systems.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/java.html">Java</a></td>
-    <td><p>Executes a Java class within the running (Ant) VM, or in
-     another VM if the <code>fork</code> attribute is specified.</p></td>
+  <tr>
+    <td><a href="Tasks/java.html">Java</a></td>
+    <td><p>Executes a Java class within the running (Ant) JVM, or in
+     another JVM if the <var>fork</var> attribute is specified.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/parallel.html">Parallel</a></td>
+  <tr>
+    <td><a href="Tasks/parallel.html">Parallel</a></td>
     <td><p>A container task that can contain other Ant tasks.
      Each nested task specified within the <code>&lt;parallel&gt;</code>
      tag will be executed in its own thread.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/sequential.html">Sequential</a></td>
+  <tr>
+    <td><a href="Tasks/sequential.html">Sequential</a></td>
     <td><p>A container task that can contain other Ant tasks.
      The nested tasks are simply executed in sequence. Its primary use is
      to support the sequential execution of a subset of tasks within
      the <code>&lt;parallel&gt;</code> tag.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/sleep.html">Sleep</a></td>
-    <td><p> A task for suspending execution for a specified period of time.
+  <tr>
+    <td><a href="Tasks/sleep.html">Sleep</a></td>
+    <td><p>Suspends execution for a specified period of time.
      Useful when a build or deployment process requires an interval between
      tasks.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/subant.html">Subant</a></td>
-    <td><p> Calls a given target for all defined sub-builds. This is an extension of ant for bulk project execution.</p></td>
+  <tr>
+    <td><a href="Tasks/subant.html">Subant</a></td>
+    <td><p>Calls a given target for all defined sub-builds. This is an
+     extension of ant for bulk project execution.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/waitfor.html">Waitfor</a></td>
+  <tr>
+    <td><a href="Tasks/waitfor.html">Waitfor</a></td>
     <td><p>Blocks execution until a set of specified conditions become true.
      This task is intended to be used with the
      <a href="Tasks/parallel.html">Parallel</a> task to synchronize
@@ -431,768 +381,721 @@
   </tr>
 </table>
 
-<p></p>
-<table width="100%" border="0" cellpadding="4" cellspacing="0">
-<th align="left">
-<font size="+0" face="arial,helvetica,sanserif">
-<a name="file">File Tasks</a>
-</font></th>
-<font size="-1" face="arial,helvetica,sanserif">
-<th align="right"><a href="#top">[Back to top]</a></th>
-</font>
-</table>
-<table width="100%" border="1" cellpadding="4" cellspacing="0">
-  <tr valign="top">
-    <th nowrap>Task Name</th>
+<div class="float" id="file">
+    <span class="left">File Tasks</span>
+    <span class="right"><a href="#top" style="text-decoration:none;">&#x1f51d;</a></span>
+</div>
+
+<table>
+  <tr>
+    <th>Task Name</th>
     <th>Description</th>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/attrib.html">Attrib</a></td>
+  <tr>
+    <td><a href="Tasks/attrib.html">Attrib</a></td>
     <td><p>Changes the permissions and/or attributes of a file or all
-    files inside the specified directories. Currently, it has effect
-    only under Windows.</p></td>
+     files inside the specified directories. Currently, it has effect
+     only under Windows.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/checksum.html">Checksum</a></td>
+  <tr>
+    <td><a href="Tasks/checksum.html">Checksum</a></td>
     <td><p>Generates a checksum for a file or set of files. This task can
      also be used to perform checksum verifications.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/chgrp.html">Chgrp</a></td>
+  <tr>
+    <td><a href="Tasks/chgrp.html">Chgrp</a></td>
     <td><p>Changes the group ownership of a file or all files inside
-    the specified directories. Currently, it has effect only under
-    Unix.</p></td>
+     the specified directories. Currently, it has effect only under
+     Unix.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/chmod.html">Chmod</a></td>
+  <tr>
+    <td><a href="Tasks/chmod.html">Chmod</a></td>
     <td><p>Changes the permissions of a file or all files inside the
      specified directories. Currently, it has effect only under Unix.
      The permissions are also UNIX style, like the arguments for the
-    <i>chmod</i> command.</p></td>
+     <kbd>chmod</kbd> command.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/chown.html">Chown</a></td>
+  <tr>
+    <td><a href="Tasks/chown.html">Chown</a></td>
     <td><p>Changes the owner of a file or all files inside the
-    specified directories. Currently, it has effect only under
-    Unix.</p></td>
+     specified directories. Currently, it has effect only under
+     Unix.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/concat.html">Concat</a></td>
+  <tr>
+    <td><a href="Tasks/concat.html">Concat</a></td>
     <td><p>Concatenates multiple files into a single one or to Ant's
      logging system.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/copy.html">Copy</a></td>
+  <tr>
+    <td><a href="Tasks/copy.html">Copy</a></td>
     <td><p>Copies a file or Fileset to a new file or directory.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/copydir.html"><i>Copydir</i></a></td>
-    <td><p><i>Deprecated.</i>  Use the
-     <a href="Tasks/copy.html">Copy</a> task instead.</p></td>
+  <tr>
+    <td><a href="Tasks/copydir.html"><em>Copydir</em></a></td>
+    <td><p><em><u>Deprecated</u></em>.  Use
+     the <a href="Tasks/copy.html">Copy</a> task instead.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/copyfile.html"><i>Copyfile</i></a></td>
-    <td><p><i>Deprecated.</i>  Use the
-     <a href="Tasks/copy.html">Copy</a> task instead.</p></td>
+  <tr>
+    <td><a href="Tasks/copyfile.html"><em>Copyfile</em></a></td>
+    <td><p><em><u>Deprecated</u></em>.  Use
+     the <a href="Tasks/copy.html">Copy</a> task instead.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/delete.html">Delete</a></td>
+  <tr>
+    <td><a href="Tasks/delete.html">Delete</a></td>
     <td><p>Deletes either a single file, all files and sub-directories
-     in a specified directory, or a set of files specified by one or more
-     <a href="Types/fileset.html">FileSet</a>s.</p></td>
+     in a specified directory, or a set of files specified by one or
+     more <a href="Types/fileset.html">FileSet</a>s.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/deltree.html"><i>Deltree</i></a></td>
-    <td><p><i>Deprecated.</i>  Use the
-     <a href="Tasks/delete.html">Delete</a> task instead.</p></td>
+  <tr>
+    <td><a href="Tasks/deltree.html"><em>Deltree</em></a></td>
+    <td><p><em><u>Deprecated</u></em>.  Use
+     the <a href="Tasks/delete.html">Delete</a> task instead.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/filter.html">Filter</a></td>
-    <td><p>Sets a token filter for this project, or reads multiple token
-     filters from a specified file and sets these as filters. Token filters
-     are used by all tasks that perform file-copying operations.</p></td>
+  <tr>
+    <td><a href="Tasks/filter.html">Filter</a></td>
+    <td><p>Sets a token filter for this project, or reads multiple
+     token filters from a specified file and sets these as
+     filters. Token filters are used by all tasks that perform
+     file-copying operations.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/fixcrlf.html">FixCRLF</a></td>
-    <td><p>Modifies a file to add or remove tabs, carriage returns, linefeeds,
-     and EOF characters.</p></td>
+  <tr>
+    <td><a href="Tasks/fixcrlf.html">FixCRLF</a></td>
+    <td><p>Modifies a file to add or remove tabs, carriage returns,
+     linefeeds, and EOF characters.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/get.html">Get</a></td>
+  <tr>
+    <td><a href="Tasks/get.html">Get</a></td>
     <td><p>Gets a file from a URL.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/mkdir.html">Mkdir</a></td>
-    <td><p>Creates a directory. Non-existent parent directories are created,
-     when necessary.</p></td>
+  <tr>
+    <td><a href="Tasks/mkdir.html">Mkdir</a></td>
+    <td><p>Creates a directory. Non-existent parent directories are
+     created, when necessary.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/move.html">Move</a></td>
-    <td><p>Moves a file to a new file or directory, or a set(s) of file(s) to
-     a new directory.</p></td>
+  <tr>
+    <td><a href="Tasks/move.html">Move</a></td>
+    <td><p>Moves a file to a new file or directory, or a set(s) of
+     file(s) to a new directory.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/patch.html">Patch</a></td>
-    <td><p>Applies a &quot;diff&quot; file to originals.</p></td>
+  <tr>
+    <td><a href="Tasks/patch.html">Patch</a></td>
+      <td><p>Applies a <q>diff</q> file to originals.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/rename.html"><i>Rename</i></a></td>
-    <td><p><i>Deprecated.</i>  Use the <a href="Tasks/move.html">Move</a>
-    task instead.</p></td>
+  <tr>
+    <td><a href="Tasks/rename.html"><em>Rename</em></a></td>
+    <td><p><em><u>Deprecated</u></em>.  Use
+    the <a href="Tasks/move.html">Move</a> task instead.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/renameextensions.html">
-     <i>RenameExtensions</i></a></td>
-    <td><p><i>Deprecated</i>. Use the <a href="Tasks/move.html">Move</a>
-     task with a <a href="Types/mapper.html#glob-mapper">glob mapper</a>
+  <tr>
+    <td><a href="Tasks/renameextensions.html"><em>RenameExtensions</em></a></td>
+    <td><p><em><u>Deprecated</u></em>. Use
+     the <a href="Tasks/move.html">Move</a> task with
+     a <a href="Types/mapper.html#glob-mapper">glob mapper</a>
      instead.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/replace.html">Replace</a></td>
-    <td><p>Replace is a directory-based task for replacing the occurrence
-     of a given string with another string in selected file.</p></td>
+  <tr>
+    <td><a href="Tasks/replace.html">Replace</a></td>
+    <td><p>Replaces the occurrence of a given string with another
+     string in a file or set of files.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/replaceregexp.html">
-     ReplaceRegExp</a></td>
-    <td><p>Directory-based task for replacing the occurrence of a given
-     regular expression with a substitution pattern in a file or set of
-     files.</p></td>
+  <tr>
+    <td><a href="Tasks/replaceregexp.html">ReplaceRegExp</a></td>
+    <td><p>Replaces the occurrence of a given regular expression with
+     a substitution pattern in a file or set of files.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/sync.html">Sync</a></td>
-    <td><p>Synchronize two directory trees.</p></td>
+  <tr>
+    <td><a href="Tasks/setpermissions.html">SetPermissions</a></td>
+    <td><p>Changes the permissions of a collection of resources.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/tempfile.html">Tempfile</a></td>
-    <td><p>Generates a name for a new temporary file and sets the specified
-     property to that name.</p></td>
+  <tr>
+    <td><a href="Tasks/sync.html">Sync</a></td>
+    <td><p>Synchronizes two directory trees.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/touch.html">Touch</a></td>
-    <td><p>Changes the modification time of a file and possibly creates it at
-     the same time.</p></td>
+  <tr>
+    <td><a href="Tasks/tempfile.html">Tempfile</a></td>
+    <td><p>Generates a name for a new temporary file and sets the
+     specified property to that name.</p></td>
   </tr>
-</table>
 
-<p></p>
-<table width="100%" border="0" cellpadding="4" cellspacing="0">
-<th align="left">
-<font size="+0" face="arial,helvetica,sanserif">
-<a name="extensions">Java2 Extensions Tasks</a>
-</font></th>
-<font size="-1" face="arial,helvetica,sanserif">
-<th align="right"><a href="#top">[Back to top]</a></th>
-</font>
+  <tr>
+    <td><a href="Tasks/touch.html">Touch</a></td>
+    <td><p>Changes the modification time of a file and possibly
+     creates it at the same time.</p></td>
+  </tr>
 </table>
-<table width="100%" border="1" cellpadding="4" cellspacing="0">
-  <tr valign="top">
-    <th nowrap>Task Name</th>
+
+<div class="float" id="extensions">
+    <span class="left">Java Extensions Tasks</span>
+    <span class="right"><a href="#top" style="text-decoration:none;">&#x1f51d;</a></span>
+</div>
+
+<table>
+  <tr>
+    <th>Task Name</th>
     <th>Description</th>
   </tr>
 
-  <tr valign="top">
-    <td nowrap>
+  <tr>
+    <td>
     <a href="Tasks/jarlib-available.html">Jarlib-available</a></td>
-    <td><p>Check whether an extension is present in a FileSet or an
-      ExtensionSet. If the extension is present, the specified property is
-     set.</p>
+    <td><p>Checks whether an extension is present in a FileSet or an
+      ExtensionSet. If the extension is present, the specified
+      property is set.</p>
     </td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap>
+  <tr>
+    <td>
     <a href="Tasks/jarlib-display.html">Jarlib-display</a></td>
-    <td><p>Display the &quot;Optional Package&quot; and
-      &quot;Package Specification&quot; information contained within the
-      specified jars.</p>
+    <td><p>Displays the <q>Optional Package</q> and <q>Package
+     Specification</q> information contained within the specified
+     jars.</p>
     </td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap>
+  <tr>
+    <td>
     <a href="Tasks/jarlib-manifest.html">Jarlib-manifest</a></td>
-    <td><p>Task to generate a manifest that declares all the dependencies
-      in manifest. The dependencies are determined by looking in the
-      specified path and searching for Extension/&quot;Optional Package&quot;
-      specifications in the manifests of the jars.</p>
+    <td><p>Generates a manifest that declares all the dependencies in
+     manifest. The dependencies are determined by looking in the
+     specified path and searching for <q>Extension</q>/<q>Optional
+     Package</q> specifications in the manifests of the jars.</p>
     </td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap>
+  <tr>
+    <td>
     <a href="Tasks/jarlib-resolve.html">Jarlib-resolve</a></td>
-    <td><p>Try to locate a jar to satisfy an extension, and place the
-      location of the jar into the specified property.</p>
+    <td><p>Tries to locate a jar to satisfy an extension, and places the
+     location of the jar into the specified property.</p>
     </td>
   </tr>
 </table>
 
-<p></p>
-<p></p>
-<table width="100%" border="0" cellpadding="4" cellspacing="0">
-<th align="left">
-<font size="+0" face="arial,helvetica,sanserif">
-<a name="log">Logging Tasks</a>
-</font></th>
-<font size="-1" face="arial,helvetica,sanserif">
-<th align="right"><a href="#top">[Back to top]</a></th>
-</font>
-</table>
-<table width="100%" border="1" cellpadding="4" cellspacing="0">
-  <tr valign="top">
-    <th nowrap>Task Name</th>
+<div class="float" id="log">
+    <span class="left">Logging Tasks</span>
+    <span class="right"><a href="#top" style="text-decoration:none;">&#x1f51d;</a></span>
+</div>
+
+<table>
+  <tr>
+    <th>Task Name</th>
     <th>Description</th>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/recorder.html">Record</a></td>
+  <tr>
+    <td><a href="Tasks/recorder.html">Record</a></td>
     <td><p>Runs a listener that records the logging output of the
-     build-process events to a file. Several recorders can exist
+     build process events to a file. Several recorders can exist
      at the same time. Each recorder is associated with a file.</p></td>
   </tr>
 </table>
 
-<p></p>
-<table width="100%" border="0" cellpadding="4" cellspacing="0">
-<th align="left">
-<font size="+0" face="arial,helvetica,sanserif">
-<a name="mail">Mail Tasks</a>
-</font></th>
-<font size="-1" face="arial,helvetica,sanserif">
-<th align="right"><a href="#top">[Back to top]</a></th>
-</font>
-</table>
-<table width="100%" border="1" cellpadding="4" cellspacing="0">
-  <tr valign="top">
-    <th nowrap>Task Name</th>
+<div class="float" id="mail">
+    <span class="left">Mail Tasks</span>
+    <span class="right"><a href="#top" style="text-decoration:none;">&#x1f51d;</a></span>
+</div>
+
+<table>
+  <tr>
+    <th>Task Name</th>
     <th>Description</th>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/mail.html">Mail</a></td>
-    <td><p>A task to send SMTP email.</p></td>
+  <tr>
+    <td><a href="Tasks/mail.html">Mail</a></td>
+    <td><p>Sends SMTP email.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/mimemail.html">MimeMail</a></td>
-    <td><p><i>Deprecated</i>. Use the <a href="Tasks/mail.html">Mail</a>
-     task instead.</p></td>
+  <tr>
+    <td><a href="Tasks/mimemail.html"><em>MimeMail</em></a></td>
+    <td><p><em><u>Deprecated</u></em>. Use
+     the <a href="Tasks/mail.html">Mail</a> task instead.</p></td>
   </tr>
-
 </table>
 
-<p></p>
-<table width="100%" border="0" cellpadding="4" cellspacing="0">
-<th align="left">
-<font size="+0" face="arial,helvetica,sanserif">
-<a name="misc">Miscellaneous Tasks</a>
-</font></th>
-<font size="-1" face="arial,helvetica,sanserif">
-<th align="right"><a href="#top">[Back to top]</a></th>
-</font>
-</table>
-<table width="100%" border="1" cellpadding="4" cellspacing="0">
-  <tr valign="top">
-    <th nowrap>Task Name</th>
+<div class="float" id="misc">
+    <span class="left">Miscellaneous Tasks</span>
+    <span class="right"><a href="#top" style="text-decoration:none;">&#x1f51d;</a></span>
+</div>
+
+<table>
+  <tr>
+    <th>Task Name</th>
     <th>Description</th>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/defaultexcludes.html">Defaultexcludes</a></td>
-    <td><p>Modify the list of default exclude patterns from within
-    your build file.</p></td>
+  <tr>
+    <td><a href="Tasks/defaultexcludes.html">Defaultexcludes</a></td>
+    <td><p>Modifies the list of default exclude patterns from within
+     your build file.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/echo.html">Echo</a></td>
+  <tr>
+    <td><a href="Tasks/echo.html">Echo</a></td>
     <td><p>Echoes text to <code>System.out</code> or to a file.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/fail.html">Fail</a></td>
-    <td><p>Exits the current build by throwing a BuildException,
-     optionally printing additional information.</p></td>
+  <tr>
+    <td><a href="Tasks/fail.html">Fail</a></td>
+    <td><p>Exits the current build by throwing
+     a <code>BuildException</code>, optionally printing additional
+     information.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/genkey.html">GenKey</a></td>
+  <tr>
+    <td><a href="Tasks/genkey.html">GenKey</a></td>
     <td><p>Generates a key in keystore.</p></td>
   </tr>
-  
-  
-  <tr valign="top">
-    <td nowrap><a href="Tasks/hostinfo.html">HostInfo</a></td>
-    <td><p>Sets properties related to the provided host, or to
-    the host the process is run on.</p></td>
+
+  <tr>
+    <td><a href="Tasks/hostinfo.html">HostInfo</a></td>
+    <td><p>Sets properties related to the provided host, or to the
+     host the process is run on.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/input.html">Input</a></td>
-    <td><p>Allows user interaction during the build process by displaying a
-     message and reading a line of input from the console.</p></td>
+  <tr>
+    <td><a href="Tasks/input.html">Input</a></td>
+    <td><p>Allows user interaction during the build process by
+     displaying a message and reading a line of input from the
+     console.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/script.html">Script</a></td>
-    <td><p>Executes a script in a
-     <a href="http://jakarta.apache.org/bsf/"
-      target="_top">Apache BSF</a>-supported language.</p></td>
+  <tr>
+    <td><a href="Tasks/script.html">Script</a></td>
+    <td><p>Executes a script in
+     a <a href="https://jakarta.apache.org/bsf/" target="_top">Apache
+     BSF</a>-supported language.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/sound.html">Sound</a></td>
-    <td><p>Plays a sound file at the end of the build, according to whether
-     the build failed or succeeded.</p></td>
+  <tr>
+    <td><a href="Tasks/sound.html">Sound</a></td>
+    <td><p>Plays a sound file at the end of the build, according to
+     whether the build failed or succeeded.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/splash.html">Splash</a></td>
+  <tr>
+    <td><a href="Tasks/splash.html">Splash</a></td>
     <td><p>Displays a splash screen.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/sql.html">Sql</a></td>
-    <td><p>Executes a series of SQL statements via JDBC to a database.
-     Statements can either be read in from a text file using the
-     <code>src</code> attribute, or from between the enclosing SQL
+  <tr>
+    <td><a href="Tasks/sql.html">Sql</a></td>
+    <td><p>Executes a series of SQL statements via JDBC to a
+     database. Statements can either be read in from a text file using
+     the <code>src</code> attribute, or from between the enclosing SQL
      tags.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/taskdef.html">Taskdef</a></td>
-    <td><p>Adds a task definition to the current project, such that this
-     new task can be used in the current project.</p></td>
-  </tr>
-
-  <tr valign="top">
-    <td nowrap><a href="Tasks/tstamp.html">TStamp</a></td>
-    <td><p>Sets the <code>DSTAMP</code>, <code>TSTAMP</code>, and
-     <code>TODAY</code> properties in the current project, based on
-     the current date and time.</p></td>
-  </tr>
-
-  <tr valign="top">
-    <td nowrap><a href="Tasks/typedef.html">Typedef</a></td>
-    <td><p>Adds a data-type definition to the current project, such that this
-     new type can be used in the current project.</p></td>
-  </tr>
-
-  <tr valign="top">
-    <td nowrap><a href="Tasks/xmlvalidate.html">XmlValidate</a></td>
-    <td><p>Checks that XML files are valid (or only well-formed). This task
-     uses the XML parser that is currently used by Ant by default, but any SAX1/2
-     parser can be specified, if needed.</p></td>
+  <tr>
+    <td><a href="Tasks/taskdef.html">Taskdef</a></td>
+    <td><p>Adds a task definition to the current project, such that
+     this new task can be used in the current project.</p></td>
+  </tr>
+
+  <tr>
+    <td><a href="Tasks/tstamp.html">TStamp</a></td>
+    <td><p>Sets the <code>DSTAMP</code>, <code>TSTAMP</code>,
+     and <code>TODAY</code> properties in the current project, based
+     on the current date and time.</p></td>
   </tr>
-</table>
 
-<p></p>
-<table width="100%" border="0" cellpadding="4" cellspacing="0">
-<th align="left">
-<font size="+0" face="arial,helvetica,sanserif">
-<a name="preproc">Pre-process Tasks</a>
-</font></th>
-<font size="-1" face="arial,helvetica,sanserif">
-<th align="right"><a href="#top">[Back to top]</a></th>
-</font>
+  <tr>
+    <td><a href="Tasks/typedef.html">Typedef</a></td>
+    <td><p>Adds a data-type definition to the current project, such
+     that this new type can be used in the current project.</p></td>
+  </tr>
+
+  <tr>
+    <td><a href="Tasks/xmlvalidate.html">XmlValidate</a></td>
+    <td><p>Checks that XML files are valid (or only well-formed). This
+     task uses the XML parser that is currently used by Ant by
+     default, but any SAX1/2 parser can be specified, if
+     needed.</p></td>
+  </tr>
 </table>
-<table width="100%" border="1" cellpadding="4" cellspacing="0">
-  <tr valign="top">
-    <th nowrap>Task Name</th>
+
+<div class="float" id="preproc">
+    <span class="left">Pre-process Tasks</span>
+    <span class="right"><a href="#top" style="text-decoration:none;">&#x1f51d;</a></span>
+</div>
+
+<table>
+  <tr>
+    <th>Task Name</th>
     <th>Description</th>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/antlr.html">ANTLR</a></td>
-    <td><p>Invokes the <a HREF="http://www.antlr.org/" target="_top">ANTLR</a>
-     Translator generator on a grammar file.</p></td>
+  <tr>
+    <td><a href="Tasks/antlr.html">ANTLR</a></td>
+    <td><p>Invokes the <a href="https://www.antlr.org/"
+     target="_top">ANTLR</a> Translator generator on a grammar
+     file.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/antstructure.html">AntStructure</a></td>
-    <td><p>Generates a DTD for Ant buildfiles that contains information
-     about all tasks currently known to Ant.</p></td>
+  <tr>
+    <td><a href="Tasks/antstructure.html">AntStructure</a></td>
+    <td><p>Generates a DTD for Ant buildfiles that contains
+     information about all tasks currently known to Ant.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/import.html">Import</a></td>
-    <td><p>Import another build file and potentially override targets
-    in it with targets of your own.</p></td>
+  <tr>
+    <td><a href="Tasks/import.html">Import</a></td>
+    <td><p>Imports another build file and potentially overrides
+     targets in it with targets of your own.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/include.html">Include</a></td>
-    <td><p>Include another build file.</p></td>
+  <tr>
+    <td><a href="Tasks/include.html">Include</a></td>
+    <td><p>Includes another build file.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/javacc.html">JavaCC</a></td>
-    <td><p>Invokes the
-     <a HREF="http://javacc.dev.java.net/" target="_top">
-     JavaCC</a> compiler-compiler on a grammar file.</p></td>
+  <tr>
+    <td><a href="Tasks/javacc.html">JavaCC</a></td>
+    <td><p>Invokes the <a href="https://javacc.org/"
+     target="_top">JavaCC</a> compiler-compiler on a grammar
+     file.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/javah.html">Javah</a></td>
+  <tr>
+    <td><a href="Tasks/javah.html">Javah</a></td>
     <td><p>Generates JNI headers from a Java class.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/jjdoc.html">JJDoc</a></td>
-    <td><p>Invokes the <a href="http://javacc.dev.java.net/">
-     JJDoc</a> documentation generator for the JavaCC compiler-compiler.
-     JJDoc takes a JavaCC parser specification and produces documentation
-     for the BNF grammar.  It can operate in three modes, determined by
-     command line options. This task only invokes JJDoc if the grammar file
-     is newer than the generated BNF grammar documentation.</p></td>
-  </tr>
-
-  <tr valign="top">
-    <td nowrap><a href="Tasks/jjtree.html">JJTree</a></td>
-    <td><p>Invokes the <a href="http://javacc.dev.java.net/">
-     JJTree</a> preprocessor for the JavaCC compiler-compiler. It inserts
-     parse-tree building actions at various places in the JavaCC source that
-     it generates. The output of JJTree is run through JavaCC to create the
-     parser. This task only invokes JJTree if the grammar file is newer than
-     the generated JavaCC file.</p></td>
-  </tr>
-
-  <tr valign="top">
-    <td nowrap><a href="Tasks/macrodef.html">Macrodef</a></td>
-    <td><p>Define a new task as a macro built-up upon other tasks.</p></td>
-  </tr>
-
-  <tr valign="top">
-    <td nowrap><a href="Tasks/native2ascii.html">
-     Native2Ascii</a></td>
-    <td><p>Converts files from native encodings to ASCII with escaped Unicode.
-      A common usage is to convert source files maintained in a native
-      operating system encoding to ASCII, prior to compilation.</p></td>
-  </tr>
-
-  <tr valign="top">
-    <td nowrap><a href="Tasks/presetdef.html">Presetdef</a></td>
-    <td><p>Define a new task by instrumenting an existing task with
-    default values for attributes or child elements.</p>
+  <tr>
+    <td><a href="Tasks/jjdoc.html">JJDoc</a></td>
+    <td><p>Invokes the <a href="https://javacc.org/"
+     target="_top">JJDoc</a> documentation generator for the JavaCC
+     compiler-compiler.  JJDoc takes a JavaCC parser specification and
+     produces documentation for the BNF grammar.  It can operate in
+     three modes, determined by command line options. This task only
+     invokes JJDoc if the grammar file is newer than the generated BNF
+     grammar documentation.</p></td>
+  </tr>
+
+  <tr>
+    <td><a href="Tasks/jjtree.html">JJTree</a></td>
+    <td><p>Invokes the <a href="https://javacc.org/"
+     target="_top">JJTree</a> preprocessor for the JavaCC
+     compiler-compiler. It inserts parse-tree building actions at
+     various places in the JavaCC source that it generates. The output
+     of JJTree is run through JavaCC to create the parser. This task
+     only invokes JJTree if the grammar file is newer than the
+     generated JavaCC file.</p></td>
+  </tr>
+
+  <tr>
+    <td><a href="Tasks/macrodef.html">Macrodef</a></td>
+    <td><p>Defines a new task as a macro built-up upon other tasks.</p></td>
+  </tr>
+
+  <tr>
+    <td><a href="Tasks/native2ascii.html">Native2Ascii</a></td>
+    <td><p>Converts files from native encodings to ASCII with escaped
+     Unicode.  A common usage is to convert source files maintained in
+     a native operating system encoding to ASCII, prior to
+     compilation.</p></td>
+  </tr>
+
+  <tr>
+    <td><a href="Tasks/presetdef.html">Presetdef</a></td>
+    <td><p>Defines a new task by instrumenting an existing task with
+     default values for attributes or child elements.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/translate.html">Translate</a></td>
+  <tr>
+    <td><a href="Tasks/translate.html">Translate</a></td>
     <td><p>Identifies keys in files, delimited by special tokens, and
      translates them with values read from resource bundles.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/style.html">XSLT</a></td>
+  <tr>
+    <td><a href="Tasks/style.html">XSLT</a></td>
     <td><p>Processes a set of documents via XSLT.</p></td>
   </tr>
-
 </table>
 
-<p></p>
-<table width="100%" border="0" cellpadding="4" cellspacing="0">
-<th align="left">
-<font size="+0" face="arial,helvetica,sanserif">
-<a name="prop">Property Tasks</a>
-</font></th>
-<font size="-1" face="arial,helvetica,sanserif">
-<th align="right"><a href="#top">[Back to top]</a></th>
-</font>
-</table>
-<table width="100%" border="1" cellpadding="4" cellspacing="0">
-  <tr valign="top">
-    <th nowrap>Task Name</th>
+<div class="float" id="prop">
+    <span class="left">Property Tasks</span>
+    <span class="right"><a href="#top" style="text-decoration:none;">&#x1f51d;</a></span>
+</div>
+
+<table>
+  <tr>
+    <th>Task Name</th>
     <th>Description</th>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/available.html">Available</a></td>
-    <td><p>Sets a property if a specified file, directory, class in the
-     classpath, or JVM system resource is available at runtime.</p></td>
+  <tr>
+    <td><a href="Tasks/available.html">Available</a></td>
+    <td><p>Sets a property if a specified file, directory, class in
+     the classpath, or JVM system resource is available at
+     run time.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/basename.html">Basename</a></td>
-    <td><p>Sets a property to the last element of a specified path.
+  <tr>
+    <td><a href="Tasks/basename.html">Basename</a></td>
+    <td><p>Sets a property to the last element of a specified path.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/buildnumber.html">BuildNumber</a></td>
-    <td><p>Task that can be used to track build numbers.
+  <tr>
+    <td><a href="Tasks/buildnumber.html">BuildNumber</a></td>
+    <td><p>Helps tracking build numbers.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/condition.html">Condition</a></td>
-    <td><p>Sets a property if a certain condition holds true; this is a
-     generalization of <a href="Tasks/available.html">Available</a> and
-     <a href="Tasks/uptodate.html">Uptodate</a>.</p></td>
+  <tr>
+    <td><a href="Tasks/condition.html">Condition</a></td>
+    <td><p>Sets a property if a certain condition holds true; this is
+     a generalization of <a href="Tasks/available.html">Available</a>
+     and <a href="Tasks/uptodate.html">Uptodate</a>.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/dirname.html">Dirname</a></td>
+  <tr>
+    <td><a href="Tasks/dirname.html">Dirname</a></td>
     <td><p>Sets a property to the value of the specified file up to,
-     but not including, the last path element.
+     but not including, the last path element.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap>
-    <a href="Tasks/echoproperties.html">Echoproperties</a><br>
-
-    </td>
+  <tr>
+    <td><a href="Tasks/echoproperties.html">Echoproperties</a></td>
     <td><p>Lists the current properties.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/loadfile.html">LoadFile</a></td>
+  <tr>
+    <td><a href="Tasks/loadfile.html">LoadFile</a></td>
     <td><p>Loads a file into a property.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/loadproperties.html">LoadProperties</a></td>
-    <td><p>Load a file's contents as Ant properties. This task is
-     equivalent to using <code>&lt;property file=&quot;...&quot;/&gt;</code>
-     except that it supports nested <code>&lt;filterchain&gt;</code> elements,
-     and it cannot be specified outside a target.</p></td>
+  <tr>
+    <td><a href="Tasks/loadproperties.html">LoadProperties</a></td>
+    <td><p>Loads a file's contents as Ant properties. This task is
+     equivalent to using <code>&lt;property
+     file=&quot;...&quot;/&gt;</code> except that it supports
+     nested <code>&lt;filterchain&gt;</code> elements, and it cannot
+     be specified outside a target.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/makeurl.html">MakeURL</a></td>
+  <tr>
+    <td><a href="Tasks/makeurl.html">MakeURL</a></td>
     <td><p>Creates a URL (list) from a file/fileset or path</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/pathconvert.html">PathConvert</a></td>
-    <td><p>Converts a nested path, path reference, filelist reference, or
-     fileset reference to the form usable on a specified platform and/or
-     to a list of items separated by the specified separator and stores
-     the result in the specified property.</p></td>
+  <tr>
+    <td><a href="Tasks/pathconvert.html">PathConvert</a></td>
+    <td><p>Converts a nested path, path reference, filelist reference,
+     or fileset reference to the form usable on a specified platform
+     and/or to a list of items separated by the specified separator
+     and stores the result in the specified property.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/property.html">Property</a></td>
+  <tr>
+    <td><a href="Tasks/property.html">Property</a></td>
     <td><p>Sets a property (by name and value), or set of properties
      (from a file or resource) in the project.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/propertyfile.html">
-     PropertyFile</a></td>
-    <td><p>Creates or modifies property files. Useful when wanting to make
-     unattended modifications to configuration files for application
-     servers and applications. Typically used for things such as
-     automatically generating a build number and saving it to a build
-     properties file, or doing date manipulation.<p></td>
+  <tr>
+    <td><a href="Tasks/propertyfile.html">PropertyFile</a></td>
+    <td><p>Creates or modifies property files. Useful when wanting to
+     make unattended modifications to configuration files for
+     application servers and applications. Typically used for things
+     such as automatically generating a build number and saving it to
+     a build properties file, or doing date manipulation.<p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/uptodate.html">Uptodate</a></td>
-    <td><p>Sets a property if a given target file is newer than a set of
-     source files.</p></td>
+  <tr>
+    <td><a href="Tasks/uptodate.html">Uptodate</a></td>
+    <td><p>Sets a property if a given target file is newer than a set
+     of source files.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/whichresource.html">Whichresource</a></td>
-    <td><p>Find a class or resource.</p></td>
+  <tr>
+    <td><a href="Tasks/whichresource.html">Whichresource</a></td>
+    <td><p>Finds a class or resource.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/xmlproperty.html">XmlProperty</a></td>
+  <tr>
+    <td><a href="Tasks/xmlproperty.html">XmlProperty</a></td>
     <td><p>Loads property values from a well-formed XML file.</p></td>
   </tr>
 </table>
 
-<p></p>
-<table width="100%" border="0" cellpadding="4" cellspacing="0">
-<th align="left">
-<font size="+0" face="arial,helvetica,sanserif">
-<a name="remote">Remote Tasks</a>
-</font></th>
-<font size="-1" face="arial,helvetica,sanserif">
-<th align="right"><a href="#top">[Back to top]</a></th>
-</font>
-</table>
-<table width="100%" border="1" cellpadding="4" cellspacing="0">
-  <tr valign="top">
-    <th nowrap>Task Name</th>
+<div class="float" id="remote">
+    <span class="left">Remote Tasks</span>
+    <span class="right"><a href="#top" style="text-decoration:none;">&#x1f51d;</a></span>
+</div>
+
+<table>
+  <tr>
+    <th>Task Name</th>
     <th>Description</th>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/ftp.html">FTP</a></td>
-    <td><p>Implements a basic FTP client that can send, receive,
-     list, and delete files, and create directories.</p></td>
+  <tr>
+    <td><a href="Tasks/ftp.html">FTP</a></td>
+    <td><p>Implements a basic FTP client that can send, receive, list,
+     and delete files, and create directories.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/rexec.html">Rexec</a></td>
-    <td><p>Task to automate a remote rexec session.</p></td>
+  <tr>
+    <td><a href="Tasks/rexec.html">Rexec</a></td>
+    <td><p>Automates a <code>rexec</code> session.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/scp.html">Scp</a></td>
-    <td><p>Copy files to or from a remote server using SSH.</p></td>
+  <tr>
+    <td><a href="Tasks/scp.html">Scp</a></td>
+    <td><p>Copies files to or from a remote server using SSH.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/setproxy.html">setproxy</a></td>
-    <td><p>Sets Java's web proxy properties, so that tasks and code run
- in the same JVM can have through-the-firewall access to remote web sites.</p></td>
+  <tr>
+    <td><a href="Tasks/setproxy.html">setproxy</a></td>
+    <td><p>Sets Java's HTTP proxy properties, so that tasks and code
+     run in the same JVM can have access to remote web sites through a
+     firewall.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/sshexec.html">Sshexec</a></td>
-    <td><p>Execute a command on a remote server using SSH.</p></td>
+  <tr>
+    <td><a href="Tasks/sshexec.html">Sshexec</a></td>
+    <td><p>Executes a command on a remote server using SSH.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/telnet.html">Telnet</a></td>
-    <td><p>Task to automate a remote <i>telnet</i> session. This task uses
-     nested <code>&lt;read&gt;</code> and <code>&lt;write&gt;</code> tags
-     to indicate strings to wait for and specify text to send.</p></td>
+  <tr>
+    <td><a href="Tasks/telnet.html">Telnet</a></td>
+    <td><p>Automates a <code>telnet</code> session. This task uses
+     nested <code>&lt;read&gt;</code> and <code>&lt;write&gt;</code>
+     tags to indicate strings to wait for and specify text to
+     send.</p></td>
   </tr>
-
 </table>
 
-<p></p>
-<table width="100%" border="0" cellpadding="4" cellspacing="0">
-<th align="left">
-<font size="+0" face="arial,helvetica,sanserif">
-<a name="scm">SCM Tasks</a>
-</font></th>
-<font size="-1" face="arial,helvetica,sanserif">
-<th align="right"><a href="#top">[Back to top]</a></th>
-</font>
-</table>
-<table width="100%" border="1" cellpadding="4" cellspacing="0">
-  <tr valign="top">
-    <th nowrap>Task Name</th>
+<div class="float" id="scm">
+    <span class="left">SCM Tasks</span>
+    <span class="right"><a href="#top" style="text-decoration:none;">&#x1f51d;</a></span>
+</div>
+
+<table>
+  <tr>
+    <th>Task Name</th>
     <th>Description</th>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/cvs.html">Cvs</a></td>
-    <td><p>Handles packages/modules retrieved from a
-     <a href="http://www.nongnu.org/cvs/" target="_top">CVS</a>
+  <tr>
+    <td><a href="Tasks/cvs.html">Cvs</a></td>
+    <td><p>Handles packages/modules retrieved from
+     a <a href="https://www.nongnu.org/cvs/" target="_top">CVS</a>
      repository.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/changelog.html">CvsChangeLog</a></td>
-    <td><p>Generates an XML report of the changes recorded in a
-     <a href="http://www.nongnu.org/cvs/" target="_top">CVS</a>
+  <tr>
+    <td><a href="Tasks/changelog.html">CvsChangeLog</a></td>
+    <td><p>Generates an XML report of the changes recorded in
+     a <a href="https://www.nongnu.org/cvs/" target="_top">CVS</a>
      repository.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/cvspass.html">CVSPass</a></td>
-    <td><p>Adds entries to a .cvspass file. Adding entries to this file
-     has the same affect as a <i>cvs login</i> command.</p></td>
+  <tr>
+    <td><a href="Tasks/cvspass.html">CVSPass</a></td>
+    <td><p>Adds entries to a <samp>.cvspass</samp> file. Adding
+     entries to this file has the same affect as a <kbd>cvs
+     login</kbd> command.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/cvstagdiff.html">CvsTagDiff</a></td>
-    <td><p>Generates an XML-formatted report file of the changes between
-    two tags or dates recorded in a <a href="http://www.nongnu.org/cvs/"
-    target="_top">CVS</a> repository.</p></td>
+  <tr>
+    <td><a href="Tasks/cvstagdiff.html">CvsTagDiff</a></td>
+    <td><p>Generates an XML-formatted report file of the changes
+     between two tags or dates recorded in
+     a <a href="https://www.nongnu.org/cvs/" target="_top">CVS</a>
+     repository.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/clearcase.html">ClearCase</a></td>
-    <td><p>Tasks to perform the ClearCase cleartool <i>checkin</i>, <i>checkout</i>,
-     <i>uncheckout</i>, <i>update</i>, <i>lock</i>, <i>unlock</i>, <i>mklbtype</i>, <i>rmtype</i>, <i>mklabel</i>, <i>mkattr</i>, <i>mkdir</i>, <i>mkelem</i>, and <i>mkbl</i> commands.</p></td>
+  <tr>
+    <td><a href="Tasks/clearcase.html">ClearCase</a></td>
+    <td><p>Tasks to perform the ClearCase <kbd>cleartool checkin</kbd>,
+     <kbd>checkout</kbd>, <kbd>uncheckout</kbd>, <kbd>update</kbd>,
+     <kbd>lock</kbd>, <kbd>unlock</kbd>, <kbd>mklbtype</kbd>, <kbd>rmtype</kbd>,
+     <kbd>mklabel</kbd>, <kbd>mkattr</kbd>, <kbd>mkdir</kbd>, <kbd>mkelem</kbd>,
+     and <kbd>mkbl</kbd> commands.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/ccm.html">Continuus/Synergy</a></td>
-    <td><p>Tasks to perform the Continuus <i>ccmcheckin</i>,
-     <i>ccmcheckout</i>, <i>ccmcheckintask</i>, <i>ccmreconfigure</i>, and
-     <i>ccmcreateTask</i> commands.</p></td>
+  <tr>
+    <td><a href="Tasks/ccm.html">Continuus/Synergy</a></td>
+    <td><p>Tasks to perform the Continuus <kbd>ccm checkin</kbd>,
+     <kbd>checkout</kbd>, <kbd>reconfigure</kbd>, <em>ccmcheckintask</em>,
+     and <em>ccmcreatetask</em> commands.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/vss.html">
-     Microsoft Visual SourceSafe</a></td>
-    <td><p>Tasks to perform the Visual SourceSafe <i>vssget</i>,
-     <i>vsslabel</i>, <i>vsshistory</i>, <i>vsscheckin</i>,
-     <i>vsscheckout</i>, <i>vssadd</i>, <i>vsscp</i>, and <i>vsscreate</i>
-     commands.</p></td>
+  <tr>
+    <td><a href="Tasks/vss.html">Microsoft Visual SourceSafe</a></td>
+    <td><p>Tasks to perform the Visual SourceSafe <kbd>ss get</kbd>,
+     <kbd>label</kbd>, <kbd>history</kbd>, <kbd>checkin</kbd>,
+     <kbd>checkout</kbd>, <kbd>add</kbd>, <kbd>cp</kbd>,
+     and <kbd>create</kbd> commands.</p></td>
   </tr>
 
-
-
-  <tr valign="top">
-    <td nowrap><a href="Tasks/pvcstask.html">Pvcs</a></td>
-    <td><p>Allows the user extract the latest edition of the source code
-     from a PVCS repository.</p></td>
+  <tr>
+    <td><a href="Tasks/pvcstask.html">Pvcs</a></td>
+    <td><p>Allows the user extract the latest edition of the source
+     code from a PVCS repository.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/sos.html">SourceOffSite</a></td>
-    <td><p>Tasks to perform the SourceOffSite <i>sosget</i>, <i>soslabel</i>,
-     <i>soscheckin</i>, and <i>soscheckout</i> commands.</p></td>
+  <tr>
+    <td><a href="Tasks/sos.html">SourceOffSite</a></td>
+    <td><p>Tasks to perform the SourceOffSite <kbd>sos get</kbd>, <kbd>label</kbd>,
+     <kbd>checkin</kbd>, and <kbd>checkout</kbd> commands.</p></td>
   </tr>
-
 </table>
 
-<p></p>
-<table width="100%" border="0" cellpadding="4" cellspacing="0">
-<th align="left">
-<font size="+0" face="arial,helvetica,sanserif">
-<a name="testing">Testing Tasks</a>
-</font></th>
-<font size="-1" face="arial,helvetica,sanserif">
-<th align="right"><a href="#top">[Back to top]</a></th>
-</font>
-</table>
-<table width="100%" border="1" cellpadding="4" cellspacing="0">
-  <tr valign="top">
-    <th nowrap>Task Name</th>
+<div class="float" id="testing">
+    <span class="left">Testing Tasks</span>
+    <span class="right"><a href="#top" style="text-decoration:none;">&#x1f51d;</a></span>
+</div>
+
+<table>
+  <tr>
+    <th>Task Name</th>
     <th>Description</th>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/junit.html">Junit</a></td>
-    <td><p>Runs tests from the <a href="http://www.junit.org">Junit</a>
-     testing framework. This task has been tested with JUnit 3.0 up to
-     JUnit 3.7; it won't work with versions prior to JUnit 3.0.</p></td>
+  <tr>
+    <td><a href="Tasks/junit.html">Junit</a></td>
+    <td><p>Runs tests from the <a href="https://junit.org"
+     target="_top">Junit</a> testing framework. This task has been
+     tested with JUnit 3.0 and later; it won't work with versions
+     prior to JUnit 3.0.</p></td>
   </tr>
 
-  <tr valign="top">
-    <td nowrap><a href="Tasks/junitreport.html">JunitReport</a></td>
-    <td><p>Merges the individual XML files generated by the
-     <a href="Tasks/junit.html">Junit</a> task and applies a
-     stylesheet on the resulting merged document to provide a browsable
-     report of the testcases results.</p></td>
+  <tr>
+    <td><a href="Tasks/junitreport.html">JunitReport</a></td>
+    <td><p>Merges the individual XML files generated by
+     the <a href="Tasks/junit.html">Junit</a> task and applies a
+     stylesheet on the resulting merged document to provide a
+     browsable report of the testcases results.</p></td>
   </tr>
-
 </table>
 
-
-
-
 </body>
 </html>
diff -Nru ant-1.9.10/manual/toc.html ant-1.10.3/manual/toc.html
--- ant-1.9.10/manual/toc.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/toc.html	2018-03-24 12:37:12.000000000 +0000
@@ -48,4 +48,3 @@
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/tutorial-HelloWorldWithAnt.html ant-1.10.3/manual/tutorial-HelloWorldWithAnt.html
--- ant-1.9.10/manual/tutorial-HelloWorldWithAnt.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/tutorial-HelloWorldWithAnt.html	2018-03-24 12:37:12.000000000 +0000
@@ -22,84 +22,70 @@
 <body>
 <h1>Tutorial: Hello World with Apache Ant</h1>
 
-<p>This document provides a step by step tutorial for starting java programming with Apache Ant.
-It does <b>not</b> contain deeper knowledge about Java or Ant. This tutorial has the goal
-to let you see, how to do the easiest steps in Ant.</p>
-
-
+<p>This document provides a step by step tutorial for starting Java programming with Apache Ant. It
+does <strong>not</strong> contain deeper knowledge about Java or Ant. This tutorial has the goal to let you see, how to
+do the easiest steps in Ant.</p>
 
 <h2>Content</h2>
-<p><ul>
+<ul>
 <li><a href="#prepare">Preparing the project</a></li>
-<li><a href="#four-steps">Enhance the build file</a></li>
+<li><a href="#four-steps">Four steps to a running application</a></li>
 <li><a href="#enhance">Enhance the build file</a></li>
 <li><a href="#ext-libs">Using external libraries</a></li>
 <li><a href="#resources">Resources</a></li>
-</ul></p>
+</ul>
 
+<h2 id="prepare">Preparing the project</h2>
+<p>We want to separate the source from the generated files, so our Java source files will be in <samp>src</samp>
+folder. All generated files should be under <samp>build</samp>, and there split into several subdirectories for the
+individual steps: <samp>classes</samp> for our compiled files and <samp>jar</samp> for our own JAR-file.</p>
 
-<a name="prepare"></a>
-<h2>Preparing the project</h2>
-<p>We want to separate the source from the generated files, so our java source files will
-be in <tt>src</tt> folder. All generated files should be under <tt>build</tt>, and there
-splitted into several subdirectories for the individual steps: <tt>classes</tt> for our compiled
-files and <tt>jar</tt> for our own JAR-file.</p>
-<p>We have to create only the <tt>src</tt> directory. (Because I am working on Windows, here is 
-the win-syntax - translate to your shell):</p>
+<p>We have to create only the <samp>src</samp> directory. (Because I am working on Windows, here is the Windows
+syntax&mdash;translate to your shell):</p>
 
-<pre class="code">
-md src
-</pre>
+<pre class="input">md src</pre>
 
-<p>The following simple Java class just prints a fixed message out to STDOUT,
-so just write this code into <tt>src\oata\HelloWorld.java</tt>.</p>
+<p>The following simple Java class just prints a fixed message out to STDOUT, so just write this code
+into <samp>src\oata\HelloWorld.java</samp>.</p>
 
-<pre class="code">
+<pre>
 package oata;
 
 public class HelloWorld {
     public static void main(String[] args) {
         System.out.println("Hello World");
     }
-}
-</pre>
+}</pre>
 
-<p>Now just try to compile and run that:
-<pre class="code">
+<p>Now just try to compile and run that:</p>
+<pre class="input">
 md build\classes
 javac -sourcepath src -d build\classes src\oata\HelloWorld.java
-java -cp build\classes oata.HelloWorld
-</pre>
+java -cp build\classes oata.HelloWorld</pre>
 which will result in
-<pre class="output">
-Hello World
-</pre>
-</p>
+<pre class="output">Hello World</pre>
 
-<p>Creating a jar-file is not very difficult. But creating a <i>startable</i> jar-file needs more steps: create a
+<p>Creating a jar-file is not very difficult. But creating a <em>startable</em> jar-file needs more steps: create a
 manifest-file containing the start class, creating the target directory and archiving the files.</p>
-<pre class="code">
+<pre class="input">
 echo Main-Class: oata.HelloWorld&gt;myManifest
 md build\jar
 jar cfm build\jar\HelloWorld.jar myManifest -C build\classes .
-java -jar build\jar\HelloWorld.jar
-</pre>
-
-<p><b>Note:</b> Do not have blanks around the &gt;-sign in the <tt>echo Main-Class</tt> instruction because it would 
-falsify it!</p>
+java -jar build\jar\HelloWorld.jar</pre>
 
+<p><strong>Note</strong>: Do not have blanks around the &gt;-sign in the <kbd>echo Main-Class</kbd> instruction because
+it would falsify it!</p>
 
-<a name="four-steps"></a>
-<h2>Four steps to a running application</h2>
-<p>After finishing the java-only step we have to think about our build process. We <i>have</i> to compile our code, otherwise we couldn't
-start the program. Oh - "start" - yes, we could provide a target for that. We <i>should</i> package our application.
-Now it's only one class - but if you want to provide a download, no one would download several hundreds files ...
-(think about a complex Swing GUI - so let us create a jar file. A startable jar file would be nice ... And it's a
-good practise to have a "clean" target, which deletes all the generated stuff. Many failures could be solved just
-by a "clean build".</p>
+<h2 id="four-steps">Four steps to a running application</h2>
+<p>After finishing the Java-only step we have to think about our build process. We <em>have</em> to compile our code,
+otherwise we couldn't start the program. Oh&mdash;<q>start</q>&mdash;yes, we could provide a target for
+that. We <em>should</em> package our application.  Now it's only one class&mdash;but if you want to provide a download,
+no one would download several hundreds files ...  (think about a complex Swing GUI&mdash;so let us create a jar file. A
+startable jar file would be nice ... And it's a good practise to have a <q>clean</q> target, which deletes all the
+generated stuff. Many failures could be solved just by a "clean build".</p>
 
-<p>By default Ant uses <tt>build.xml</tt> as the name for a buildfile, so our <tt>.\build.xml</tt> would be:</p>
-<pre class="code">
+<p>By default Ant uses <samp>build.xml</samp> as the name for a buildfile, so our <samp>.\build.xml</samp> would be:</p>
+<pre>
 &lt;project&gt;
 
     &lt;target name="clean"&gt;
@@ -124,28 +110,24 @@
         &lt;java jar="build/jar/HelloWorld.jar" fork="true"/&gt;
     &lt;/target&gt;
 
-&lt;/project&gt;
-</pre>
+&lt;/project&gt;</pre>
 
 <p>Now you can compile, package and run the application via</p>
-<pre class="code">
+<pre class="input">
 ant compile
 ant jar
-ant run
-</pre>
+ant run</pre>
 <p>Or shorter with</p>
-<pre class="code">
-ant compile jar run
-</pre>
+<pre class="input">ant compile jar run</pre>
 
-<p>While having a look at the buildfile, we will see some similar steps between Ant and the java-only commands:
+<p>While having a look at the buildfile, we will see some similar steps between Ant and the Java-only commands:</p>
 <table>
 <tr>
-  <th>java-only</th>
+  <th>Java-only</th>
   <th>Ant</th>
 </tr>
 <tr>
-  <td valign="top"><pre class="code">
+  <td><pre class="input">
 md build\classes
 javac
     -sourcepath src
@@ -161,15 +143,14 @@
 
 
 
-java -jar build\jar\HelloWorld.jar
-  </pre></td>
-  <td valign="top"><pre class="code">
+java -jar build\jar\HelloWorld.jar</pre></td>
+  <td><pre>
 &lt;mkdir dir="build/classes"/&gt;
 &lt;javac
     srcdir="src"
     destdir="build/classes"/&gt;
-<i>&lt;!-- automatically detected --&gt;</i>
-<i>&lt;!-- obsolete; done via manifest tag --&gt;</i>
+<em>&lt;!-- automatically detected --&gt;</em>
+<em>&lt;!-- obsolete; done via manifest tag --&gt;</em>
 &lt;mkdir dir="build/jar"/&gt;
 &lt;jar
     destfile="build/jar/HelloWorld.jar"
@@ -179,23 +160,18 @@
         &lt;attribute name="Main-Class" value="oata.HelloWorld"/&gt;
     &lt;/manifest&gt;
 &lt;/jar&gt;
-&lt;java jar="build/jar/HelloWorld.jar" fork="true"/&gt;
-  </pre></td>
-</tr></table>
-</p>
-
-
-
-<a name="enhance"></a>
-<h2>Enhance the build file</h2>
-<p>Now we have a working buildfile we could do some enhancements: many time you are referencing the
-same directories, main-class and jar-name are hard coded, and while invocation you have to remember
-the right order of build steps.</p>
-<p>The first and second point would be addressed with <i>properties</i>, the third with a special property - an attribute
-of the &lt;project&gt;-tag and the fourth problem can be solved using dependencies.</p>
+&lt;java jar="build/jar/HelloWorld.jar" fork="true"/&gt;</pre></td>
+</tr>
+</table>
 
+<h2 id="enhance">Enhance the build file</h2>
+<p>Now that we have a working buildfile, we could do some enhancements: many times you are referencing the same
+directories, main-class and jar-name are hardcoded, and while invoking you have to remember the right order of build
+steps.</p>
+<p>The first and second point would be addressed with <em>properties</em>, the third with a special property&mdash;an
+attribute of the <code>&lt;project&gt;</code> tag and the fourth problem can be solved using dependencies.</p>
 
-<pre class="code">
+<pre>
 &lt;project name="HelloWorld" basedir="." default="main"&gt;
 
     &lt;property name="src.dir"     value="src"/&gt;
@@ -234,11 +210,9 @@
 
     &lt;target name="main" depends="clean,run"/&gt;
 
-&lt;/project&gt;
-</pre>
-
+&lt;/project&gt;</pre>
 
-<p>Now it's easier, just do a <tt class="code">ant</tt> and you will get</p>
+<p>Now it's easier, just do a <kbd>ant</kbd> and you will get</p>
 <pre class="output">
 Buildfile: build.xml
 
@@ -257,29 +231,28 @@
 
 main:
 
-BUILD SUCCESSFUL
-</pre>
+BUILD SUCCESSFUL</pre>
 
-
-<a name="ext-libs"></a>
-<h2>Using external libraries</h2>
-<p>Somehow told us not to use syso-statements. For log-Statements we should use a Logging-API - customizable on a high
-degree (including switching off during usual life (= not development) execution). We use Log4J for that, because <ul>
+<h2 id="ext-libs">Using external libraries</h2>
+<p>Somebody told us not to use <code>System</code>-statements. For output, we should use a Logging
+API&mdash;customizable to a high degree (including switching off during usual life (= not development) execution). We
+use Log4J for that, because</p>
+<ul>
 <li>it is not part of the JDK (1.4+) and we want to show how to use external libs</li>
 <li>it can run under JDK 1.2 (as Ant)</li>
 <li>it's highly configurable</li>
 <li>it's from Apache ;-)</li>
-</ul></p>
-<p>We store our external libraries in a new directory <tt>lib</tt>. Log4J can be
-<a href="http://www.apache.org/dist/logging/log4j/1.2.13/logging-log4j-1.2.13.zip">downloaded [1]</a> from Logging's Homepage.
-Create the <tt>lib</tt> directory and extract the log4j-1.2.9.jar into that lib-directory. After that we have to modify
-our java source to use that library and our buildfile so that this library could be accessed during compilation and run.
-</p>
-<p>Working with Log4J is documented inside its manual. Here we use the <i>MyApp</i>-example from the
-<a href="http://logging.apache.org/log4j/docs/manual.html">Short Manual [2]</a>. First we have to modify the java source to
-use the logging framework:</p>
+</ul>
+<p>We store our external libraries in a new directory <samp>lib</samp>. Log4J can
+be <a href="https://archive.apache.org/dist/logging/log4j/1.2.17/log4j-1.2.17.zip" target="_top">downloaded
+[1]</a> from Logging's Homepage.  Create the <samp>lib</samp> directory and extract the <samp>log4j-1.2.17.jar</samp>
+into that directory. After that we have to modify our Java source file to use that library and our buildfile so that
+this library could be accessed during compilation and run.</p>
+<p>Working with Log4J is documented inside its manual. Here we use the <samp>MyApp</samp>-example from
+the <a href="https://logging.apache.org/log4j/1.2/manual.html" target="_top">Short Manual [2]</a>. First we have to
+modify the java source to use the logging framework:</p>
 
-<pre class="code">
+<pre>
 package oata;
 
 <b>import org.apache.log4j.Logger;</b>
@@ -290,19 +263,19 @@
 
     public static void main(String[] args) {
         <b>BasicConfigurator.configure();</b>
-        <font color="blue"><b>logger.info("Hello World");</b></font>          // the old SysO-statement
+        <span style="color:blue"><b>logger.info("Hello World");</b></span>          // the old SysO-statement
     }
-}
-</pre>
+}</pre>
 
 <p>Most of the modifications are "framework overhead" which has to be done once. The blue line is our "old System-out"
 statement.</p>
-<p>Don't try to run <tt>ant</tt> - you will only get lot of compiler errors. Log4J is not inside the classpath so we have
-to do a little work here. But do not change the CLASSPATH environment variable! This is only for this project and maybe
-you would break other environments (this is one of the most famous mistakes when working with Ant). We introduce Log4J
-(or to be more precise: all libraries (jar-files) which are somewhere under <tt>.\lib</tt>) into our buildfile:</p>
+<p>Don't try to run <kbd>ant</kbd>&mdash;you will only get lot of compiler errors. Log4J is not on the classpath so we
+have to do a little work here. But do not change the <code>CLASSPATH</code> environment variable! This is only for this
+project and maybe you would break other environments (this is one of the most famous mistakes when working with Ant). We
+introduce Log4J (or to be more precise: all libraries (jar-files) which are somewhere under <samp>.\lib</samp>) into our
+buildfile:</p>
 
-<pre class="code">
+<pre>
 &lt;project name="HelloWorld" basedir="." default="main"&gt;
     ...
     <b>&lt;property name="lib.dir"     value="lib"/&gt;</b>
@@ -322,59 +295,57 @@
         &lt;java fork="true" <b>classname="${main-class}"</b>&gt;
             <b>&lt;classpath&gt;</b>
                 <b>&lt;path refid="classpath"/&gt;</b>
-                <font color="red"><b>&lt;path location="${jar.dir}/${ant.project.name}.jar"/&gt;</b></font>
+                <span style="color:red"><b>&lt;path location="${jar.dir}/${ant.project.name}.jar"/&gt;</b></span>
             <b>&lt;/classpath&gt;</b>
         &lt;/java&gt;
     &lt;/target&gt;
 
     ...
 
-&lt;/project&gt;
-</pre>
-
-<p>In this example we start our application not via its Main-Class manifest-attribute, because we could not provide
-a jarname <i>and</i> a classpath. So add our class in the red line to the already defined path and start as usual. Running
-<tt>ant</tt> would give (after the usual compile stuff):</p>
-
-<pre class="output">
-[java] 0 [main] INFO oata.HelloWorld  - Hello World
-</pre>
+&lt;/project&gt;</pre>
 
-<p>What's that? <ul>
-<li><i>[java]</i> Ant task running at the moment</li>
-<li><i>0</i> <font size="-1">sorry don't know - some Log4J stuff</font></li>
-<li><i>[main]</i> the running thread from our application </li>
-<li><i>INFO</i> log level of that statement</i>
-<li><i>oata.HelloWorld</i> source of that statement</i>
-<li><i>-</i> separator</li>
-<li><i>Hello World</i> the message</li>
+<p>In this example we start our application not via its <code>Main-Class</code> manifest-attribute, because we could not
+provide a jar-name <em>and</em> a classpath. So add our class in the red line to the already defined path and start as
+usual. Running <kbd>ant</kbd> would give (after the usual compile stuff):</p>
+
+<pre class="output">[java] 0 [main] INFO oata.HelloWorld  - Hello World</pre>
+
+<p>What's that?</p>
+<ul>
+<li><code>[java]</code> Ant task running at the moment</li>
+<li><code>0</code> <small>sorry, don't know&mdash;some Log4J stuff</small></li>
+<li><code>[main]</code> the running thread from our application</li>
+    <li><code>INFO</code> log level of that statement</li>
+    <li><code>oata.HelloWorld</code> source of that statement</li>
+<li><code>-</code> separator</li>
+<li><code>Hello World</code> the message</li>
 </ul>
-For another layout ... have a look inside Log4J's documentation about using other PatternLayout's.</p>
-
+<p>For another layout ... have a look inside Log4J's documentation about using other PatternLayouts.</p>
 
-<a name="config-files">
-<h2>Configuration files</h2>
-<p>Why we have used Log4J? "It's highly configurable"? No - all is hard coded! But that is not the debt of Log4J - it's
-ours. We had coded <tt>BasicConfigurator.configure();</tt> which implies a simple, but hard coded configuration. More
-comfortable would be using a property file. In the java source delete the BasicConfiguration-line from the main() method
-(and the related import-statement). Log4J will search then for a configuration as described in it's manual. Then create 
-a new file <tt>src/log4j.properties</tt>. That's the default name for Log4J's configuration and using that name would make 
-life easier - not only the framework knows what is inside, you too!</p>
+<h2 id="config-files">Configuration files</h2>
+<p>Why we have used Log4J? "It's highly configurable"? No&mdash;all is hardcoded! But that is not the fault of
+Log4J&mdash;it's ours. We had coded <code class="code">BasicConfigurator.configure();</code> which implies a simple, but
+hardcoded configuration. More comfortable would be using a property file. In the Java source file, delete
+the <code class="code">BasicConfiguration</code> line from the <code class="code">main()</code> method (and the
+related <code>import</code> statement). Log4J will search then for a configuration as described in its manual. Then
+create a new file <samp>src/log4j.properties</samp>. That's the default name for Log4J's configuration and using that
+name would make life easier&mdash;not only the framework knows what is inside, you too!</p>
 
-<pre class="code">
+<pre>
 log4j.rootLogger=DEBUG, <b>stdout</b>
 
 log4j.appender.<b>stdout</b>=org.apache.log4j.ConsoleAppender
 
 log4j.appender.<b>stdout</b>.layout=org.apache.log4j.PatternLayout
-log4j.appender.<b>stdout</b>.layout.ConversionPattern=<font color="blue"><b>%m%n</b></font>
+log4j.appender.<b>stdout</b>.layout.ConversionPattern=<span style="color:blue"><b>%m%n</b></span>
 </pre>
 
-<p>This configuration creates an output channel ("Appender") to console named as <tt>stdout</tt> which prints the
-message (%m) followed by a line feed (%n) - same as the earlier System.out.println() :-) Oooh kay - but we haven't
-finished yet. We should deliver the configuration file, too. So we change the buildfile:</p>
+<p>This configuration creates an output channel (<q>Appender</q>) to console named as <code>stdout</code> which prints
+the message (<q>%m</q>) followed by a line feed (<q>%n</q>)&mdash;same as the
+earlier <code class="code">System.out.println()</code> :-) Oooh kay&mdash;but we haven't finished yet. We should deliver
+the configuration file, too. So we change the buildfile:</p>
 
-<pre class="code">
+<pre>
     ...
     &lt;target name="compile"&gt;
         &lt;mkdir dir="${classes.dir}"/&gt;
@@ -383,35 +354,41 @@
             <b>&lt;fileset dir="${src.dir}" excludes="**/*.java"/&gt;</b>
         <b>&lt;/copy&gt;</b>
     &lt;/target&gt;
-    ...
-</pre>
+    ...</pre>
 
-<p>This copies all resources (as long as they haven't the suffix ".java") to the build directory, so we could
+<p>This copies all resources (as long as they haven't the suffix <samp>.java</samp>) to the build directory, so we could
 start the application from that directory and these files will included into the jar.</p>
 
+<h2 id="junit">Testing the class</h2>
+<p>In this step we will introduce the usage of the JUnit [3] test framework in combination with Ant. Because Ant has a
+built-in JUnit 4.12 you could start directly using it. Write a test class
+in <samp>src\oata\HelloWorldTest.java</samp>:</p>
+
+<pre>
+package oata;
+
+import org.junit.Test;
 
-<a name="junit">
-<h2>Testing the class</h2>
-<p>In this step we will introduce the usage of the JUnit [3] testframework in combination with Ant. Because Ant
-has a built-in JUnit 3.8.2 you could start directly using it. Write a test class in <tt>src\HelloWorldTest.java</tt>: </p>
+import static org.junit.Assert.fail;
 
-<pre class="code">
-public class HelloWorldTest extends junit.framework.TestCase {
+public class HelloWorldTest {
 
+    @Test
     public void testNothing() {
     }
-    
+
+    @Test
     public void testWillAlwaysFail() {
         fail("An error message");
     }
-    
+
 }</pre>
 
-<p>Because we dont have real business logic to test, this test class is very small: just show how to start. For 
-further information see the JUnit documentation [3] and the manual of <a href="Tasks/junit.html">junit</a> task.
-Now we add a junit instruction to our buildfile:</p>
+<p>Because we don't have real business logic to test, this test class is very small: just showing how to start. For
+further information see the JUnit documentation [3] and the manual of <a href="Tasks/junit.html">junit</a> task.  Now we
+add a <code>junit</code> instruction to our buildfile:</p>
 
-<pre class="code">
+<pre>
     ...
 
     &lt;path <b>id="application"</b> location="${jar.dir}/${ant.project.name}.jar"/&gt;
@@ -424,48 +401,45 @@
             &lt;/classpath&gt;
         &lt;/java&gt;
     &lt;/target&gt;
-    
+
     <b>&lt;target name="junit" depends="jar"&gt;
         &lt;junit printsummary="yes"&gt;
             &lt;classpath&gt;
                 &lt;path refid="classpath"/&gt;
                 &lt;path refid="application"/&gt;
             &lt;/classpath&gt;
-            
+
             &lt;batchtest fork="yes"&gt;
-                &lt;fileset dir="${src.dir}" includes="*Test.java"/&gt;
+                &lt;fileset dir="${src.dir}" includes="**/*Test.java"/&gt;
             &lt;/batchtest&gt;
         &lt;/junit&gt;
     &lt;/target&gt;</b>
 
-    ...
-
-</pre>
+    ...</pre>
 
-<p>We reuse the path to our own jar file as defined in run-target by
-  giving it an ID and making it globally available.
-The <tt>printsummary=yes</tt> lets us see more detailed information than just a "FAILED" or "PASSED" message.
-How much tests failed? Some errors? Printsummary lets us know. The classpath is set up to find our classes.
-To run tests the <tt>batchtest</tt> here is used, so you could easily add more test classes in the future just
-by naming them <tt>*Test.java</tt>. This is a common naming scheme.</p>
+<p>We reuse the path to our own jar file as defined in <q>run</q>-target by giving it an <var>id</var> and making it
+globally available.  The <var>printsummary</var>=<q>yes</q> lets us see more detailed information than just a "FAILED"
+or "PASSED" message.  How much tests failed? Some errors? <var>printsummary</var> lets us know.  The classpath is set up
+to find our classes.  To run tests the <code>batchtest</code> here is used, so you could easily add more test classes in
+the future just by naming them <code>*Test.java</code>.  This is a common naming scheme.</p>
 
-<p>After a <tt class="code">ant junit</tt> you'll get:</p>
+<p>After a <kbd>ant junit</kbd> you'll get:</p>
 
 <pre class="output">
 ...
 junit:
-    [junit] Running HelloWorldTest
-    [junit] Tests run: 2, Failures: 1, Errors: 0, Time elapsed: 0,01 sec
-    [junit] Test HelloWorldTest FAILED
+    [junit] Running oata.HelloWorldTest
+    [junit] Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0,01 sec
+    [junit] Test oata.HelloWorldTest FAILED
 
 BUILD SUCCESSFUL
-...
-</pre>
+...</pre>
 
-<p>We can also produce a report. Something that you (and other) could read after closing the shell .... 
-There are two steps: 1. let &lt;junit&gt; log the information and 2. convert these to something readable (browsable).<p>
+<p>We can also produce a report. Something that you (and others) could read after closing the shell ...  There are two
+steps: 1. let <code>&lt;junit&gt;</code> log the information and 2. convert these log files to something readable
+(browsable).<p>
 
-<pre class="code">
+<pre>
     ...
     <b>&lt;property name="report.dir"  value="${build.dir}/junitreport"/&gt;</b>
     ...
@@ -476,45 +450,38 @@
                 &lt;path refid="classpath"/&gt;
                 &lt;path refid="application"/&gt;
             &lt;/classpath&gt;
-            
+
             <b>&lt;formatter type="xml"/&gt;</b>
-            
+
             &lt;batchtest fork="yes" <b>todir="${report.dir}"</b>&gt;
-                &lt;fileset dir="${src.dir}" includes="*Test.java"/&gt;
+                &lt;fileset dir="${src.dir}" includes="**/*Test.java"/&gt;
             &lt;/batchtest&gt;
         &lt;/junit&gt;
     &lt;/target&gt;
-    
+
     <b>&lt;target name="junitreport"&gt;
         &lt;junitreport todir="${report.dir}"&gt;
             &lt;fileset dir="${report.dir}" includes="TEST-*.xml"/&gt;
             &lt;report todir="${report.dir}"/&gt;
         &lt;/junitreport&gt;
-    &lt;/target&gt;</b>
-</pre>
-
-<p>Because we would produce a lot of files and these files would be written to the current directory by default,
-we define a report directory, create it before running the <tt>junit</tt> and redirect the logging to it. The log format
-is XML so <tt>junitreport</tt> could parse it. In a second target <tt>junitreport</tt> should create a browsable 
-HTML-report for all generated xml-log files in the report directory. Now you can open the ${report.dir}\index.html and
-see the result (looks something like JavaDoc).<br>
-Personally I use two different targets for junit and junitreport. Generating the HTML report needs some time and you dont
-need the HTML report just for testing, e.g. if you are fixing an error or a integration server is doing a job.
-</p>
-
-
-
-
-<a name="resources"></a>
-<h2>Resources</h2>
-<pre>
-    [1] <a href="http://www.apache.org/dist/logging/log4j/1.2.13/logging-log4j-1.2.13.zip">http://www.apache.org/dist/logging/log4j/1.2.13/logging-log4j-1.2.13.zip</a>
-    [2] <a href="http://logging.apache.org/log4j/docs/manual.html">http://logging.apache.org/log4j/docs/manual.html</a>
-    [3] <a href="http://www.junit.org/index.htm">http://www.junit.org/index.htm</a>
-</pre>
-
-
+    &lt;/target&gt;</b></pre>
 
+<p>Because we would produce a lot of files and these files would be written to the current directory by default, we
+define a report directory, create it before running the <q>junit</q> and redirect the logging to it. The log format is
+XML so <q>junitreport</q> could parse it. In a second target <q>junitreport</q> should create a browsable HTML report
+for all generated XML log files in the report directory. Now you can open the <samp>${report.dir}\index.html</samp> and
+see the result (looks something like JavaDoc).<br/>  Personally I use two different targets
+for <code>&lt;junit&gt;</code> and <code>&lt;junitreport&gt;</code>. Generating the HTML report needs some time and you
+don't need the HTML report just for testing, e.g. if you are fixing an error or a integration server is doing a job.</p>
+
+<h2 id="resources">Resources</h2>
+<ol class="refs">
+  <li><a href="https://archive.apache.org/dist/logging/log4j/1.2.17/log4j-1.2.17.zip"
+         target="_top">https://archive.apache.org/dist/logging/log4j/1.2.17/log4j-1.2.17.zip</a></li>
+  <li><a href="https://logging.apache.org/log4j/1.2/manual.html"
+         target="_top">https://logging.apache.org/log4j/1.2/manual.html</a></li>
+  <li><a href="https://junit.org/junit4" target="_top">https://junit.org/junit4</a></li>
+</ol>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/tutorials.html ant-1.10.3/manual/tutorials.html
--- ant-1.9.10/manual/tutorials.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/tutorials.html	2018-03-24 12:37:12.000000000 +0000
@@ -30,16 +30,14 @@
 <h3>Tutorials</h3>
 
 <p><a href="tutorial-HelloWorldWithAnt.html">Hello World with Apache Ant</a><br/>
-A step by step tutorial for starting java programming with Ant.</p>
+A step by step tutorial for starting Java programming with Ant.</p>
 
 <p><a href="tutorial-writing-tasks.html">Writing Tasks</a><br/>
 A step by step tutorial for writing tasks.</p>
 
 <p><a href="tutorial-tasks-filesets-properties.html">Tasks using Properties, Filesets &amp; Paths</a><br/>
-How to get and set properties and how to use nested filesets and paths 
+How to get and set properties and how to use nested filesets and paths
 while writing tasks. Finally it explains how to contribute tasks to Ant.</p>
 
-
-
 </body>
 </html>
diff -Nru ant-1.9.10/manual/tutorial-tasks-filesets-properties.html ant-1.10.3/manual/tutorial-tasks-filesets-properties.html
--- ant-1.9.10/manual/tutorial-tasks-filesets-properties.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/tutorial-tasks-filesets-properties.html	2018-03-24 12:37:12.000000000 +0000
@@ -22,12 +22,12 @@
 <body>
 <h1>Tutorial: Tasks using Properties, Filesets &amp; Paths</h1>
 
-<p>After reading the tutorial about <a href="tutorial-writing-tasks.html">writing
-tasks [1]</a> this tutorial explains how to get and set properties and how to use
-nested filesets and paths. Finally it explains how to contribute tasks to Apache Ant.</p>
+<p>After reading the tutorial about <a href="tutorial-writing-tasks.html">writing tasks [1]</a> this tutorial explains
+how to get and set properties and how to use nested filesets and paths. Finally it explains how to contribute tasks to
+Apache Ant.</p>
 
 <h2>Content</h2>
-<p><ul>
+<ul>
 <li><a href="#goal">The goal</a></li>
 <li><a href="#buildenvironment">Build environment</a></li>
 <li><a href="#propertyaccess">Property access</a></li>
@@ -37,19 +37,17 @@
 <li><a href="#documentation">Documentation</a></li>
 <li><a href="#contribute">Contribute the new task</a></li>
 <li><a href="#resources">Resources</a></li>
-</ul></p>
-
-
-<h2><a name="goal">The goal</a></h2>
-<p>The goal is to write a task, which searchs in a path for a file and saves the
-location of that file in a property.</p>
-
+</ul>
 
-<h2><a name="buildenvironment">Build environment</a></h2>
-<p>We can use the buildfile from the other tutorial and modify it a little bit.
-That's the advantage of using properties - we can reuse nearly the whole script. :-)</p>
-<pre class="code">
-&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
+<h2 id="goal">The goal</h2>
+<p>The goal is to write a task, which searches in a path for a file and saves the location of that file in a
+property.</p>
+
+<h2 id="buildenvironment">Build environment</h2>
+<p>We can use the buildfile from the other tutorial and modify it a little bit.  That's the advantage of using
+properties&mdash;we can reuse nearly the whole script. :-)</p>
+<pre>
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;project name="<b>FindTask</b>" basedir="." default="test"&gt;
     ...
     &lt;target name="use.init" description="Taskdef's the <b>Find</b>-Task" depends="jar"&gt;
@@ -58,31 +56,28 @@
 
     <b>&lt;!-- the other use.* targets are deleted --&gt;</b>
     ...
-&lt;/project&gt;
-</pre>
+&lt;/project&gt;</pre>
 
-<p>The buildfile is in the archive <a href="tutorial-tasks-filesets-properties.zip">
-tutorial-tasks-filesets-properties.zip [2]</a> in <tt>/build.xml.01-propertyaccess</tt>
-(future version saved as *.02..., final version as build.xml; same for sources).</p>
-
-
-<h2><a name="propertyaccess">Property access</a></h2>
-<p>Our first step is to set a property to a value and print the value of that property.
-So our scenario would be
-<pre class="code">
+<p>The buildfile is in the
+archive <a href="tutorial-tasks-filesets-properties.zip">tutorial-tasks-filesets-properties.zip [2]</a>
+in <samp>/build.xml.01-propertyaccess</samp> (future version saved as *.02..., final version as <samp>build.xml</samp>;
+same for sources).</p>
+
+<h2 id="propertyaccess">Property access</h2>
+<p>Our first step is to set a property to a value and print the value of that property.  So
+our scenario would be</p>
+<pre>
     &lt;find property="test" value="test-value"/&gt;
-    &lt;find print="test"/&gt;
-</pre>
-ok, can be rewritten with the core tasks
-<pre class="code">
+    &lt;find print="test"/&gt;</pre>
+<p>Ok, it can be rewritten with the core tasks</p>
+<pre>
     &lt;property name="test" value="test-value"/&gt;
-    &lt;echo message="${test}"/&gt;
-</pre>
-but I have to start on known ground :-)</p>
-<p>So what to do? Handling three attributes (property, value, print) and an execute method.
-Because this is only an introduction example I don't do much checking:
+    &lt;echo message="${test}"/&gt;</pre>
+<p>but I have to start on known ground :-)</p>
+<p>So what to do? Handling three attributes (<var>property</var>, <var>value</var>, <var>print</var>) and an execute
+method.  Because this is only an introduction example I don't do much checking:</p>
 
-<pre class="code">
+<pre>
 import org.apache.tools.ant.BuildException;
 
 public class Find extends Task {
@@ -107,47 +102,40 @@
             <b>getProject().setNewProperty(property, value)</b>;
         }
     }
-}
-</pre>
+}</pre>
 
-As said in the other tutorial, the property access is done via Project instance.
-We get this instance via the public <tt>getProject()</tt> method which we inherit from
-<tt>Task</tt> (more precise from ProjectComponent). Reading a property is done via
-<tt>getProperty(<i>propertyname</i>)</tt> (very simple, isn't it?). This property returns
-the value as String or <i>null</i> if not set.<br>
-Setting a property is ... not really difficult, but there is more than one setter. You can
-use the <tt>setProperty()</tt> method which will do the job like expected. But there is
-a golden rule in Ant: <i>properties are immutable</i>. And this method sets the property
-to the specified value - whether it has a value before that or not. So we use another
-way. <tt>setNewProperty()</tt> sets the property only if there is no property with that
-name. Otherwise a message is logged.</p>
-
-<p><i>(by the way: a short word to ants "namespaces" (don't
-be confused with xml namespaces:
-an <code>&lt;antcall&gt;</code> creates a new space for property names. All properties from the caller
-are passed to the callee, but the callee can set its own properties without notice by the
-caller.)</i></p>
+<p>As said in the other tutorial, the property access is done via <code class="code">Project</code> instance.  We get
+this instance via the public <code class="code">getProject()</code> method which we inherit
+from <code class="code">Task</code> (more precisely from <code class="code">ProjectComponent</code>). Reading a property
+is done via <code class="code">getProperty(<i>propertyname</i>)</code> (very simple, isn't it?). This property returns
+the value as <code>String</code> or <code>null</code> if not set.<br/>  Setting a property is ... not really difficult,
+but there is more than one setter. You can use the <code class="code">setProperty()</code> method which will do the job
+as expected. But there is a golden rule in Ant: <em>properties are immutable</em>. And this method sets the property to
+the specified value&mdash;whether it has a value before that or not. So we use another
+way. <code class="code">setNewProperty()</code> sets the property only if there is no property with that name. Otherwise
+a message is logged.</p>
+
+<p><em>(By the way, a short explanation of Ant's "namespaces"&mdash;not to be confused with XML namespaces:
+an <code>&lt;antcall&gt;</code> creates a new space for property names. All properties from the caller are passed to the
+callee, but the callee can set its own properties without notice by the caller.)</em></p>
 
-<p>There are some other setter, too (but I haven't used them, so I can't say something
-to them, sorry :-)</p>
+<p>There are some other setters, too (but I haven't used them, so I can't say something to them, sorry :-)</p>
 
-<p>After putting our two line example from above into a target names <tt>use.simple</tt>
-we can call that from our testcase:
+<p>After putting our two line example from above into a target names <code>use.simple</code> we can call that from our
+test case:</p>
 
-<pre class="code">
+<pre>
+import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.Before;
-import org.junit.Assert;
 import org.apache.tools.ant.BuildFileRule;
 
-
 public class FindTest {
 
     @Rule
     public final BuildFileRule buildRule = new BuildFileRule();
 
-
     @Before
     public void setUp() {
         configureProject("build.xml");
@@ -155,38 +143,32 @@
 
     @Test
     public void testSimple() {
-        buildRule.executeTarget("useSimgle");
+        buildRule.executeTarget("useSimple");
         <b>Assert.assertEquals("test-value", buildRule.getLog());</b>
     }
-}
-</pre>
-
-and all works fine.</p>
+}</pre>
 
+<p>and all works fine.</p>
 
-
-<h2><a name="filesets">Using filesets</a></h2>
-<p>Ant provides a common way of bundling files: the fileset. Because you are reading
-this tutorial I think you know them and I don't have to spend more explanations about
-their usage in buildfiles. Our goal is to search a file in path. And on this step the
-path is simply a fileset (or more precise: a collection of filesets). So our usage
-would be
-<pre class="code">
+<h2 id="filesets">Using filesets</h2>
+<p>Ant provides a common way of bundling files: the fileset. Because you are reading this tutorial I think you know them
+and I don't have to spend more explanations about their usage in buildfiles. Our goal is to search for a file in
+path. And in this step the path is simply a fileset (or more precise: a collection of filesets). So our usage would
+be</p>
+<pre>
     &lt;find file="ant.jar" location="location.ant-jar"&gt;
         &lt;fileset dir="${ant.home}" includes="**/*.jar"/&gt;
-    &lt;/find&gt;
-</pre>
-</p>
+    &lt;/find&gt;</pre>
 
-<p>What do we need? A task with two attributes (file, location) and nested
-filesets. Because we had attribute handling already explained in the example above and the
-handling of nested elements is described in the other tutorial the code should be very easy:
-<pre class="code">
+<p>What do we need? A task with two attributes (<var>file</var>, <var>location</var>) and nested filesets. Because we
+had attribute handling already explained in the example above and the handling of nested elements is described in the
+other tutorial, the code should be very easy:</p>
+<pre>
 public class Find extends Task {
 
     private String file;
     private String location;
-    private Vector filesets = new Vector();
+    private List&lt;FileSet&gt; filesets = new ArrayList&lt;&gt;();
 
     public void setFile(String file) {
         this.file = file;
@@ -202,66 +184,57 @@
 
     public void execute() {
     }
-}
-</pre>
-Ok - that task wouldn't do very much, but we can use it in the described manner without
-failure. On next step we have to implement the execute method. And before that we will
-implement the appropriate testcases (TDD - test driven development).</p>
-
-<p>In the other tutorial we have reused the already written targets of our buildfile.
-Now we will configure most of the testcases via java code (sometimes it's much easier
-to write a target than doing it via java coding). What can be tested?<ul>
-<li>not valid configured task (missing file, missing location, missing fileset)</li>
+}</pre>
+<p>Ok&mdash;that task wouldn't do very much, but we can use it in the described manner without failure. In the next step
+we have to implement the execute method. And before that we will implement the appropriate test cases (TDD&mdash;test
+driven development).</p>
+
+<p>In the other tutorial we have reused the already written targets of our buildfile.  Now we will configure most of the
+test cases via Java code (sometimes it's much easier to write a target than doing it via Java coding). What can be
+tested?</p>
+<ul>
+<li>invalid configuration of the task (missing file, missing location, missing fileset)</li>
 <li>don't find a present file</li>
 <li>behaviour if file can't be found</li>
 </ul>
-Maybe you find some more testcases. But this is enough for now.<br>
-For each of these points we create a <tt>testXX</tt> method.</p>
+<p>Maybe you find some more test cases. But this is enough for now.<br/>  For each of these points we create
+a <code class="code">testXX</code> method.</p>
 
-<pre class="code">
+<pre>
 public class FindTest {
 
     @Rule
     public final BuildFileRule buildRule = new BuildFileRule();
 
+    @Rule
+    public ExpectedException tried = ExpectedException.none();
+
     ... // constructor, setUp as above
 
     @Test
     public void testMissingFile() {
+        tried.expect(BuildException.class);
+        tried.expectMessage("file not set");
         <b>Find find = new Find();</b>
-        try {
-            <b>find.execute();</b>
-            fail("No 'no-file'-exception thrown.");
-        } catch (Exception e) {
-            // exception expected
-            String expected = "file not set";
-            assertEquals("Wrong exception message.", expected, e.getMessage());
-        }
+        <b>find.execute();</b>
     }
 
     @Test
     public void testMissingLocation() {
+        tried.expect(BuildException.class);
+        tried.expectMessage("location not set");
         Find find = new Find();
         <b>find.setFile("ant.jar");</b>
-        try {
-            find.execute();
-            fail("No 'no-location'-exception thrown.");
-        } catch (Exception e) {
-            ... // similar to testMissingFile()
-        }
+        find.execute();
     }
 
     @Test
     public void testMissingFileset() {
+        tried.expect(BuildException.class);
+        tried.expectMessage("fileset not set");
         Find find = new Find();
         find.setFile("ant.jar");
         find.setLocation("location.ant-jar");
-        try {
-            find.execute();
-            fail("No 'no-fileset'-exception thrown.");
-        } catch (Exception e) {
-            ... // similar to testMissingFile()
-        }
     }
 
     @Test
@@ -278,65 +251,60 @@
         assertNotNull("Property not set.", result);
         assertTrue("Wrong file found.", result.endsWith("ant.jar"));
     }
-}
-</pre>
+}</pre>
 
-<p>If we run this test class all test cases (except <i>testFileNotPresent</i>) fail. Now we
-can implement our task, so that these test cases will pass.</p>
+<p>If we run this test class all test cases (except <code class="code">testFileNotPresent</code>) fail. Now we can
+implement our task, so that these test cases will pass.</p>
 
-<pre class="code">
+<pre>
     protected void validate() {
-        if (file==null) throw new BuildException("file not set");
-        if (location==null) throw new BuildException("location not set");
-        if (filesets.size()&lt;1) throw new BuildException("fileset not set");
+        if (file == null) throw new BuildException("file not set");
+        if (location == null) throw new BuildException("location not set");
+        if (filesets.size() &lt; 1) throw new BuildException("fileset not set");
     }
 
     public void execute() {
         validate();                                                             // 1
         String foundLocation = null;
-        for(Iterator itFSets = filesets.iterator(); itFSets.hasNext(); ) {      // 2
-            FileSet fs = (FileSet)itFSets.next();
+        for (FileSet fs : filesets) {                                           // 2
             DirectoryScanner ds = fs.getDirectoryScanner(getProject());         // 3
-            String[] includedFiles = ds.getIncludedFiles();
-            for(int i=0; i&lt;includedFiles.length; i++) {
-                String filename = includedFiles[i].replace('\\','/');           // 4
-                filename = filename.substring(filename.lastIndexOf("/")+1);
-                if (foundLocation==null &amp;&amp; file.equals(filename)) {
+            for (String includedFile : ds.getIncludedFiles()) {
+                String filename = includedFile.replace('\\','/');               // 4
+                filename = filename.substring(filename.lastIndexOf("/") + 1);
+                if (foundLocation == null &amp;&amp; file.equals(filename)) {
                     File base  = ds.getBasedir();                               // 5
-                    File found = new File(base, includedFiles[i]);
+                    File found = new File(base, includedFile);
                     foundLocation = found.getAbsolutePath();
                 }
             }
         }
-        if (foundLocation!=null)                                                // 6
+        if (foundLocation != null)                                              // 6
             getProject().setNewProperty(location, foundLocation);
-    }
-</pre>
+    }</pre>
 
-<p>On <b>//1</b> we check the prerequisites for our task. Doing that in a <tt>validate</tt>-method
-is a common way, because we separate the prerequisites from the real work. On <b>//2</b> we iterate
-over all nested filesets. If we don't want to handle multiple filesets, the <tt>addFileset()</tt>
-method has to reject the further calls. We can get the result of a fileset via its DirectoryScanner
-like done in <b>//3</b>. After that we create a platform independent String representation of
-the file path (<b>//4</b>, can be done in other ways of course). We have to do the <tt>replace()</tt>,
-because we work with a simple string comparison. Ant itself is platform independent and can
-therefore run on filesystems with slash (/, e.g. Linux) or backslash (\, e.g. Windows) as
-path separator. Therefore we have to unify that. If we found our file we create an absolute
-path representation on <b>//5</b>, so that we can use that information without knowing the basedir.
-(This is very important on use with multiple filesets, because they can have different basedirs
-and the return value of the directory scanner is relative to its basedir.) Finally we store the
-location of the file as property, if we had found one (<b>//6</b>).</p>
-
-<p>Ok, much more easier in this simple case would be to add the <i>file</i> as additional
-<i>include</i> element to all filesets. But I wanted to show how to handle complex situations
-without being complex :-)</p>
-
-<p>The test case uses the ant property <i>ant.home</i> as reference. This property is set by the
-<tt>Launcher</tt> class which starts ant. We can use that property in our buildfiles as a
-<a href="properties.html#built-in-props">build-in property [3]</a>. But if we create a new ant
-environment we have to set that value for our own. And we use the <code>&lt;junit&gt;</code> task in fork-mode.
-Therefore we have do modify our buildfile:
-<pre class="code">
+<p>On <strong>//1</strong> we check the prerequisites for our task. Doing that in a <code class="code">validate()</code>
+method is a common way, because we separate the prerequisites from the real work. On <strong>//2</strong> we iterate
+over all nested filesets. If we don't want to handle multiple filesets, the <code class="code">addFileset()</code>
+method has to reject the further calls. We can get the result of a fileset via
+its <code class="code">DirectoryScanner</code> like done in <strong>//3</strong>. After that we create a platform
+independent String representation of the file path (<strong>//4</strong>, can be done in other ways of course). We have
+to do the <code class="code">replace()</code>, because we work with a simple string comparison. Ant itself is platform
+independent and can therefore run on filesystems with slash (<q>/</q>, e.g. Linux) or backslash (<q>\</q>, e.g. Windows)
+as path separator. Therefore we have to unify that. If we find our file, we create an absolute path representation
+on <strong>//5</strong>, so that we can use that information without knowing the <var>basedir</var>.  (This is very
+important on use with multiple filesets, because they can have different <var>basedir</var>s and the return value of the
+directory scanner is relative to its <var>basedir</var>.)  Finally we store the location of the file as property, if we
+had found one (<strong>//6</strong>).</p>
+
+<p>Ok, much more easier in this simple case would be to add the <var>file</var> as additional <code>include</code>
+element to all filesets. But I wanted to show how to handle complex situations without being complex :-)</p>
+
+<p>The test case uses the Ant property <code>ant.home</code> as reference. This property is set by
+the <code class="code">Launcher</code> class which starts ant. We can use that property in our buildfiles as
+a <a href="properties.html#built-in-props">build-in property [3]</a>. But if we create a new Ant environment we have to
+set that value for our own. And we use the <code>&lt;junit&gt;</code> task in <var>fork</var> mode.  Therefore we have
+do modify our buildfile:</p>
+<pre>
     &lt;target name="junit" description="Runs the unit tests" depends="jar"&gt;
         &lt;delete dir="${junit.out.dir.xml}"/&gt;
         &lt;mkdir  dir="${junit.out.dir.xml}"/&gt;
@@ -348,114 +316,109 @@
                 &lt;fileset dir="${src.dir}" includes="**/*Test.java"/&gt;
             &lt;/batchtest&gt;
         &lt;/junit&gt;
-    &lt;/target&gt;
-</pre>
-
+    &lt;/target&gt;</pre>
 
-<h2><a name="path">Using nested paths</a></h2>
-<p>A task providing support for filesets is a very comfortable one. But there is another
-possibility of bundling files: the <code>&lt;path&gt;</code>. Fileset are easy if the files are all under
-a common base directory. But if this is not the case you have a problem. Another disadvantage
-is its speed: if you have only a few files in a huge directory structure, why not use a
-<code>&lt;filelist&gt;</code> instead? <code>&lt;path&gt;</code>s combines these datatypes in that way that a path contains
-other paths, filesets, dirsets and filelists. This is why <a href="http://ant-contrib.sourceforge.net/">
-Ant-Contribs [4]</a> <code>&lt;foreach&gt;</code> task is modified to support paths instead of filesets. So we want that,
-too.</p>
+<h2 id="path">Using nested paths</h2>
+<p>A task providing support for filesets is a very comfortable one. But there is another possibility of bundling files:
+the <code>&lt;path&gt;</code>. Filesets are easy if the files are all under a common base directory. But if this is not
+the case, you have a problem. Another disadvantage is its speed: if you have only a few files in a huge directory
+structure, why not use a <code>&lt;filelist&gt;</code> instead? <code>&lt;path&gt;</code>s combines these datatypes in
+that way that a path contains other paths, filesets, dirsets and filelists. This is
+why <a href="http://ant-contrib.sourceforge.net/" target="_top">Ant-Contrib [4]</a> <code>&lt;foreach&gt;</code> task is
+modified to support paths instead of filesets. So we want that, too.</p>
 
 <p>Changing from fileset to path support is very easy:</p>
-<pre class="code">
-<i><b>Change java code from:</b></i>
-    private Vector filesets = new Vector();
+<em><strong>Change Java code from:</strong></em>
+<pre>
+    private List&lt;FileSet&gt; filesets = new ArrayList&lt;&gt;();
     public void addFileset(FileSet fileset) {
         filesets.add(fileset);
-    }
-<i><b>to:</b></i>
-    private Vector paths = new Vector();                      *1
+    }</pre>
+<em><strong>to:</strong></em>
+<pre>
+    private List&lt;Path&gt; paths = new ArrayList&lt;&gt;();             *1
     public void add<b>Path</b>(<b>Path</b> path) {                          *2
         paths.add(path);
-    }
-<i><b>and build file from:</b></i>
+    }</pre>
+<em><strong>and build file from:</strong></em>
+<pre>
     &lt;find file="ant.jar" location="location.ant-jar"&gt;
         &lt;fileset dir="${ant.home}" includes="**/*.jar"/&gt;
-    &lt;/find&gt;
-<i><b>to:</b></i>
+    &lt;/find&gt;</pre>
+<em><strong>to:</strong></em>
+<pre>
     &lt;find file="ant.jar" location="location.ant-jar"&gt;
         <b>&lt;path&gt;</b>                                                *3
             &lt;fileset dir="${ant.home}" includes="**/*.jar"/&gt;
         &lt;/path&gt;
-    &lt;/find&gt;
-</pre>
-<p>On <b>*1</b> we rename only the vector. It�s just for better reading the source. On <b>*2</b>
-we have to provide the right method: an add<i>Name</i>(<i>Type</i> t). Therefore replace the
-fileset with path here. Finally we have to modify our buildfile on <b>*3</b> because our task
-doesn�t support nested filesets any longer. So we wrap the fileset inside a path.</p>
-
-<p>And now we modify the testcase. Oh, not very much to do :-) Renaming the <tt>testMissingFileset()</tt>
-(not really a <i>must-be</i> but better it�s named like the think it does) and update the
-<i>expected</i>-String in that method (now a <tt>path not set</tt> message is expected). The more complex
-test cases base on the buildscript. So the targets <tt>testFileNotPresent</tt> and <tt>testFilePresent</tt> have to be
-modified in the manner described above.</p>
-
-<p>The test are finished. Now we have to adapt the task implementation. The easiest modification is
-in the <tt>validate()</tt> method where we change le last line to <tt>if (paths.size()&lt;1) throw new
-BuildException("path not set");</tt>. In the <tt>execute()</tt> method we have a little more work.
-... mmmh ... in reality it's lesser work, because the Path class does the whole DirectoryScanner-handling
-and creating-absolute-paths stuff for us. So the execute method is just:</p>
+    &lt;/find&gt;</pre>
+<p>On <strong>*1</strong> we rename only the list. It's just for better reading the source. On <strong>*2</strong> we
+have to provide the right method: an <code>add<i>Name</i>(<i>Type</i> t)</code>. Therefore replace the fileset with path
+here. Finally we have to modify our buildfile on <strong>*3</strong> because our task doesn't support nested filesets
+any longer. So we wrap the fileset inside a path.</p>
+
+<p>And now we modify the test case. Oh, not very much to do :-) Renaming
+the <code class="code">testMissingFileset()</code> (not really a <em>must-be</em> but better it's named like the thing
+it does) and update the <var>expected</var>-String in that method (now a <samp>path not set</samp> message is
+expected). The more complex test cases base on the build script. So the targets <var>testFileNotPresent</var>
+and <var>testFilePresent</var> have to be modified in the manner described above.</p>
+
+<p>The test are finished. Now we have to adapt the task implementation. The easiest modification is in
+the <code class="code">validate()</code> method where we change the last line to <code class="code">if
+(paths.size()&lt;1) throw new BuildException("path not set");</code>. In the <code class="code">execute()</code> method
+we have a little more work.  ... mmmh ... in reality it's less work, because the <code class="code">Path</code> class
+does the whole <code class="code">DirectoryScanner</code>-handling and creating-absolute-paths stuff for us. So the
+execute method becomes just:</p>
 
-<pre class="code">
+<pre>
     public void execute() {
         validate();
         String foundLocation = null;
-        for(Iterator itPaths = paths.iterator(); itPaths.hasNext(); ) {
-            Path path = (<b>Path</b>)itPaths.next();                                // 1
-            String[] includedFiles = <b>path.list()</b>;                            // 2
-            for(int i=0; i&lt;includedFiles.length; i++) {
-                String filename = includedFiles[i].replace('\\','/');
-                filename = filename.substring(filename.lastIndexOf("/")+1);
-                if (foundLocation==null &amp;&amp; file.equals(filename)) {
-                    <b>foundLocation = includedFiles[i];</b>                        // 3
+        for (Path path : paths) {                                        // 1
+            for (String includedFile : <b>path.list()</b>) {                    // 2
+                String filename = includedFile.replace('\\','/');
+                filename = filename.substring(filename.lastIndexOf("/") + 1);
+                if (foundLocation == null &amp;&amp; file.equals(filename)) {
+                    <b>foundLocation = includedFile;</b>                        // 3
                 }
             }
         }
-        if (foundLocation!=null)
+        if (foundLocation != null)
             getProject().setNewProperty(location, foundLocation);
     }
 </pre>
 
-<p>Of course we have to do the typecase to Path on <b>//1</b>. On <b>//2</b> and <b>//3</b>
-we see that the Path class does the work for us: no DirectoryScanner (was at 2) and no
-creating of the absolute path (was at 3).</p>
-
-
-
-<h2><a name="returning-list">Returning a list</a></h2>
-<p>So far so good. But could a file be on more than one place in the path? - Of course.<br>
-And would it be good to get all of them? - It depends on ...<p>
-
-<p>In this section we will extend that task to support returning a list of all files.
-Lists as property values are not supported by Ant natively. So we have to see how other
-tasks use lists. The most famous task using lists is Ant-Contribs <code>&lt;foreach&gt;</code>. All list
-elements are concatenated and separated with a customizable separator (default ',').</p>
+<p>Of course we have to iterate through paths on <strong>//1</strong>. On <strong>//2</strong> and <strong>//3</strong>
+we see that the Path class does the work for us: no DirectoryScanner (was at 2) and no creating of the absolute path
+(was at 3).</p>
+
+<h2 id="returning-list">Returning a list</h2>
+<p>So far so good. But could a file be on more than one place in the path?&mdash;Of course.<br/>
+And would it be good to get all of them?&mdash;It depends ...<p>
+
+<p>In this section we will extend that task to support returning a list of all files.  Lists as property values are not
+supported by Ant natively. So we have to see how other tasks use lists. The most famous task using lists is
+Ant-Contrib's <code>&lt;foreach&gt;</code>. All list elements are concatenated and separated with a customizable
+separator (default <q>,</q>).</p>
 
 <p>So we do the following:</p>
 
-<pre class="code">
-    &lt;find ... <b>delimiter=""</b>/&gt; ... &lt;/find&gt;
-</pre>
+<pre>&lt;find ... <b>delimiter=""</b>/&gt; ... &lt;/find&gt;</pre>
 
-<p>If the delimiter is set we will return all found files as list with that delimiter.</p>
+<p>if the delimiter is set, we will return all found files as list with that delimiter.</p>
 
-<p>Therefore we have to<ul>
+<p>Therefore we have to</p>
+<ul>
 <li>provide a new attribute</li>
 <li>collect more than the first file</li>
 <li>delete duplicates</li>
 <li>create the list if necessary</li>
 <li>return that list</li>
-</ul></p>
+</ul>
 
-<p>So we add as testcase:</p>
-<pre class="code">
-<b><i>in the buildfile:</i></b>
+<p>So we add as test case:</p>
+<strong><em>in the buildfile:</em></strong>
+<pre>
     &lt;target name="test.init"&gt;
         &lt;mkdir dir="test1/dir11/dir111"/&gt;                             *1
         &lt;mkdir dir="test1/dir11/dir112"/&gt;
@@ -484,27 +447,25 @@
             &lt;fileset dir="test1"/&gt;
             &lt;fileset dir="test2"/&gt;
         &lt;/delete&gt;
-    &lt;/target&gt;
-
-<b><i>in the test class:</i></b>
+    &lt;/target&gt;</pre>
+<strong><em>in the test class:</em></strong>
+<pre>
     public void testMultipleFiles() {
         executeTarget("testMultipleFiles");
         String result = getProject().getProperty("location.test");
         assertNotNull("Property not set.", result);
         assertTrue("Only one file found.", result.indexOf(";") &gt; -1);
-    }
-</pre>
+    }</pre>
 
-<p>Now we need a directory structure where we CAN find files with the same
-name in different directories. Because we can't sure to have one we create
-one on <b>*1</b> and <b>*2</b>. And of course we clean up that on <b>*4</b>. The creation
-can be done inside our test target or in a separate one, which will be better
-for reuse later (<b>*3</b>).
+<p>Now we need a directory structure where we CAN find files with the same name in different directories. Because we
+can't sure to have one we create one on <strong>*1</strong> and <strong>*2</strong>. And of course we clean up that
+on <strong>*4</strong>. The creation can be done inside our test target or in a separate one, which will be better for
+reuse later (<strong>*3</strong>).
 
 <p>The task implementation is modified as followed:</p>
 
-<pre class="code">
-    private Vector foundFiles = new Vector();
+<pre>
+    private List&lt;String&gt; foundFiles = new ArrayList&lt;&gt;();
     ...
     private String delimiter = null;
     ...
@@ -515,73 +476,65 @@
     public void execute() {
         validate();
         // find all files
-        for(Iterator itPaths = paths.iterator(); itPaths.hasNext(); ) {
-            Path path = (Path)itPaths.next();
-            String[] includedFiles = path.list();
-            for(int i=0; i&lt;includedFiles.length; i++) {
-                String filename = includedFiles[i].replace('\\','/');
+        for (Path path : paths) {
+            for (File includedFile : path.list()) {
+                String filename = includedFile.replace('\\','/');
                 filename = filename.substring(filename.lastIndexOf("/")+1);
-                if (file.equals(filename) &amp;&amp; <b>!foundFiles.contains(includedFiles[i]</b>)) {   // 1
-                    foundFiles.add(includedFiles[i]);
+                if (file.equals(filename) &amp;&amp; <b>!foundFiles.contains(includedFile)</b>) {  // 1
+                    foundFiles.add(includedFile);
                 }
             }
         }
 
         // create the return value (list/single)
         String rv = null;
-        if (foundFiles.size() &gt; 0) {                                        // 2
-            if (delimiter==null) {
+        if (!foundFiles.isEmpty()) {                                                // 2
+            if (delimiter == null) {
                 // only the first
-                rv = (String)foundFiles.elementAt(0);
+                rv = foundFiles.get(0);
             } else {
                 // create list
-                StringBuffer list = new StringBuffer();
-                for(Iterator it=foundFiles.iterator(); it.hasNext(); ) {    // 3
+                StringBuilder list = new StringBuilder();
+                for (String file : foundFiles) {                                    // 3
                     list.append(it.next());
-                    if (<b>it.hasNext()</b>) list.append(delimiter);               // 4
-                }
+                    if (<b>list.length() > 0</b>) list.append(delimiter);                  // 4
+                 }
                 rv = list.toString();
             }
         }
 
         // create the property
-        if (rv!=null)
+        if (rv != null)
             getProject().setNewProperty(location, rv);
-    }
-</pre>
+    }</pre>
 
-<p>The algorithm does: finding all files, creating the return value depending on the users
-wish, returning the value as property. On <b>//1</b> we eliminates the duplicates. <b>//2</b>
-ensures that we create the return value only if we have found one file. On <b>//3</b> we
-iterate over all found files and <b>//4</b> ensures that the last entry has no trailing
-delimiter.</p>
-
-<p>Ok, first searching for all files and then returning only the first one ... You can
-tune the performance of your own :-)</p>
-
-
-<h2><a name="documentation">Documentation</a></h2>
-<p>A task is useless if the only who is able to code the buildfile is the task developer
-(and he only the next few weeks :-). So documentation is also very important. In which
-form you do that depends on your favourite. But inside Ant there is a common format and
-it has advantages if you use that: all task users know that form, this form is requested if
-you decide to contribute your task. So we will doc our task in that form.</p>
+<p>The algorithm does: finding all files, creating the return value depending on the users wish, returning the value as
+property. On <strong>//1</strong> we eliminates the duplicates. <strong>//2</strong> ensures that we create the return
+value only if we have found one file. On <strong>//3</strong> we iterate over all found files and <strong>//4</strong>
+ensures that the last entry has no trailing delimiter.</p>
+
+<p>Ok, first searching for all files and then returning only the first one ... You can tune the performance of your own
+:-)</p>
+
+<h2 id="documentation">Documentation</h2>
+<p>A task is useless if the only who is able to code the buildfile is the task developer (and he only the next few weeks
+:-). So documentation is also very important. In which form you do that depends on your favourite. But inside Ant there
+is a common format and it has advantages if you use that: all task users know that form, this form is requested if you
+decide to contribute your task. So we will doc our task in that form.</p>
 
-<p>If you have a look at the manual page of the <a href="Tasks/java.html">Java task [5]</a>
-   you will see that it:<ul>
+<p>If you have a look at the manual page of the <a href="Tasks/java.html">Java task [5]</a> you will see that it:</p>
+<ul>
 <li>is plain html</li>
 <li>starts with the name</li>
-<li>has sections: description, parameters, nested elements, (maybe return codes) and (most
-important :-) examples</li>
-<li>parameters are listed in a table with columns for attribute name, its description and whether
-  it's required (if you add a feature after an Ant release, provide a <tt>since Ant xx</tt>
-  statement when it's introduced)</li>
+<li>has sections: description, parameters, nested elements, (maybe return codes) and (most important :-) examples</li>
+<li>parameters are listed in a table with columns for attribute name, its description and whether it's required (if you
+add a feature after an Ant release, provide a <em>since Ant xx</em> statement when it's introduced)</li>
 <li>describe the nested elements (since-statement if necessary)</li>
 <li>provide one or more useful examples; first code, then description.</li>
 </ul>
-As a template we have:
+<p>As a template we have:</p>
 
-<pre class="code">
+<pre>
 &lt;html&gt;
 
 &lt;head&gt;
@@ -591,23 +544,23 @@
 
 &lt;body&gt;
 
-&lt;h2&gt;&lt;a name="<b>taskname</b>"&gt;<b>Taskname</b>&lt;/a&gt;&lt;/h2&gt;
+&lt;h2 id=&quot;<b>taskname</b>&quot;&gt;<b>Taskname</b>&lt;/h2&gt;
 &lt;h3&gt;Description&lt;/h3&gt;
-&lt;p&gt; <b>Describe the task.</b>&lt;/p&gt;
+&lt;p&gt;<b>Describe the task.</b>&lt;/p&gt;
 
 &lt;h3&gt;Parameters&lt;/h3&gt;
-&lt;table border="1" cellpadding="2" cellspacing="0"&gt;
+&lt;table class=&quot;attr&quot;&gt;
   &lt;tr&gt;
-    &lt;td valign="top"&gt;&lt;b&gt;Attribute&lt;/b&gt;&lt;/td&gt;
-    &lt;td valign="top"&gt;&lt;b&gt;Description&lt;/b&gt;&lt;/td&gt;
-    &lt;td align="center" valign="top"&gt;&lt;b&gt;Required&lt;/b&gt;&lt;/td&gt;
+    &lt;th&gt;Attribute&lt;/th&gt;
+    &lt;th&gt;Description&lt;/th&gt;
+    &lt;th&gt;Required&lt;/th&gt;
   &lt;/tr&gt;
 
   <b>do this html row for each attribute (including inherited attributes)</b>
   &lt;tr&gt;
-    &lt;td valign="top"&gt;classname&lt;/td&gt;
-    &lt;td valign="top"&gt;the Java class to execute.&lt;/td&gt;
-    &lt;td align="center" valign="top"&gt;Either jar or classname&lt;/td&gt;
+    &lt;td&gt;classname&lt;/td&gt;
+    &lt;td&gt;the Java class to execute.&lt;/td&gt;
+    &lt;td&gt;Either jar or classname&lt;/td&gt;
   &lt;/tr&gt;
 
 &lt;/table&gt;
@@ -626,11 +579,10 @@
 <b>What should that example do?</b>
 
 &lt;/body&gt;
-&lt;/html&gt;
-</pre>
+&lt;/html&gt;</pre>
 
 <p>Here is an example documentation page for our task:</p>
-<pre class="code">
+<pre>
 &lt;html&gt;
 
 &lt;head&gt;
@@ -640,32 +592,32 @@
 
 &lt;body&gt;
 
-&lt;h2&gt;&lt;a name="find"&gt;Find&lt;/a&gt;&lt;/h2&gt;
+&lt;h2 id="find"&gt;Find&lt;/h2&gt;
 &lt;h3&gt;Description&lt;/h3&gt;
-&lt;p&gt;Searchs in a given path for a file and returns the absolute to it as property.
+&lt;p&gt;Searches in a given path for a file and returns the absolute to it as property.
 If delimiter is set this task returns all found locations.&lt;/p&gt;
 
 &lt;h3&gt;Parameters&lt;/h3&gt;
-&lt;table border="1" cellpadding="2" cellspacing="0"&gt;
+&lt;table class=&quot;attr&quot;&gt;
   &lt;tr&gt;
-    &lt;td valign="top"&gt;&lt;b&gt;Attribute&lt;/b&gt;&lt;/td&gt;
-    &lt;td valign="top"&gt;&lt;b&gt;Description&lt;/b&gt;&lt;/td&gt;
-    &lt;td align="center" valign="top"&gt;&lt;b&gt;Required&lt;/b&gt;&lt;/td&gt;
+    &lt;th&gt;Attribute&lt;/th&gt;
+    &lt;th&gt;Description&lt;/th&gt;
+    &lt;th&gt;Required&lt;/th&gt;
   &lt;/tr&gt;
   &lt;tr&gt;
-    &lt;td valign="top"&gt;file&lt;/td&gt;
-    &lt;td valign="top"&gt;The name of the file to search.&lt;/td&gt;
-    &lt;td align="center" valign="top"&gt;yes&lt;/td&gt;
+    &lt;td&gt;file&lt;/td&gt;
+    &lt;td&gt;The name of the file to search.&lt;/td&gt;
+    &lt;td&gt;yes&lt;/td&gt;
   &lt;/tr&gt;
   &lt;tr&gt;
-    &lt;td valign="top"&gt;location&lt;/td&gt;
-    &lt;td valign="top"&gt;The name of the property where to store the location&lt;/td&gt;
-    &lt;td align="center" valign="top"&gt;yes&lt;/td&gt;
+    &lt;td&gt;location&lt;/td&gt;
+    &lt;td&gt;The name of the property where to store the location&lt;/td&gt;
+    &lt;td&gt;yes&lt;/td&gt;
   &lt;/tr&gt;
   &lt;tr&gt;
-    &lt;td valign="top"&gt;delimiter&lt;/td&gt;
-    &lt;td valign="top"&gt;A delimiter to use when returning the list&lt;/td&gt;
-    &lt;td align="center" valign="top"&gt;only if the list is required&lt;/td&gt;
+    &lt;td&gt;delimiter&lt;/td&gt;
+    &lt;td&gt;A delimiter to use when returning the list&lt;/td&gt;
+    &lt;td&gt;only if the list is required&lt;/td&gt;
   &lt;/tr&gt;
 &lt;/table&gt;
 
@@ -676,318 +628,253 @@
 
 &lt;h3&gt;Examples&lt;/h3&gt;
 &lt;pre&gt;
-    &lt;find file="ant.jar" location="loc"&gt;
-        &lt;path&gt;
-            &lt;fileset dir="${ant.home}"/&gt;
-        &lt;path&gt;
-    &lt;/find&gt;
-&lt;/pre&gt;
-Searches in Ants home directory for a file &lt;i&gt;ant.jar&lt;/i&gt; and stores its location in
-property &lt;i&gt;loc&lt;/i&gt; (should be ANT_HOME/bin/ant.jar).
+&lt;find file="ant.jar" location="loc"&gt;
+    &lt;path&gt;
+        &lt;fileset dir="${ant.home}"/&gt;
+    &lt;path&gt;
+&lt;/find&gt;&lt;/pre&gt;
+Searches in Ant's home directory for a file &lt;samp&gt;ant.jar&lt;/samp&gt; and stores its location in
+property &lt;code&gt;loc&lt;/code&gt; (should be &lt;samp&gt;ANT_HOME/bin/ant.jar&lt;/samp&gt;).
 
 &lt;pre&gt;
-    &lt;find file="ant.jar" location="loc" delimiter=";"&gt;
-        &lt;path&gt;
-            &lt;fileset dir="C:/"/&gt;
-        &lt;path&gt;
-    &lt;/find&gt;
-    &lt;echo&gt;ant.jar found in: ${loc}&lt;/echo&gt;
-&lt;/pre&gt;
-Searches in Windows C: drive for all &lt;i&gt;ant.jar&lt;/i&gt; and stores their locations in
-property &lt;i&gt;loc&lt;/i&gt; delimited with &lt;i&gt;';'&lt;/i&gt;. (should need a long time :-)
-After that it prints out the result (e.g. C:/ant-1.5.4/bin/ant.jar;C:/ant-1.6/bin/ant.jar).
+&lt;find file="ant.jar" location="loc" delimiter=";"&gt;
+    &lt;path&gt;
+        &lt;fileset dir="C:/"/&gt;
+    &lt;path&gt;
+&lt;/find&gt;
+&lt;echo&gt;ant.jar found in: ${loc}&lt;/echo&gt;&lt;/pre&gt;
+Searches in Windows C: drive for all &lt;samp&gt;ant.jar&lt;/samp&gt; and stores their locations in
+property &lt;code&gt;loc&lt;/code&gt; delimited with &lt;q&gt;;&lt;/q&gt;. (should need a long time :-)
+After that it prints out the result (e.g. &lt;samp&gt;C:/ant-1.5.4/bin/ant.jar;C:/ant-1.6/bin/ant.jar&lt;/samp&gt;).
 
 &lt;/body&gt;
-&lt;/html&gt;
-</pre>
+&lt;/html&gt;</pre>
 
-
-<h2><a name="contribute">Contribute the new task</a></h2>
-If we decide to contribute our task, we should do some things:<ul>
+<h2 id="contribute">Contribute the new task</h2>
+<p>If we decide to contribute our task, we should do some things:</p>
+<ul>
 <li>is our task welcome? :-) Simply ask on the user list</li>
-<li>is the right package used? </li>
+<li>is the right package used?</li>
 <li>does the code conform to the styleguide?</li>
-<li>do all tests pass? </li>
-<li>does the code compile on JDK 1.2 (and passes all tests there)?</li>
+<li>do all tests pass?</li>
+<li>does the code compile on JDK 5 (and passes all tests there)?</li>
 <li>code under Apache license</li>
 <li>create a patch file</li>
 <li>publishing that patch file</li>
 </ul>
-The <a href="http://ant.apache.org/ant_task_guidelines.html">Ant Task Guidelines [6]</a> support additional
-information on that.</p>
+<p>The <a href="https://ant.apache.org/ant_task_guidelines.html" target="_top">Ant Task Guidelines [6]</a> support
+additional information on that.</p>
 
-<p>Now we will check the "Checklist before submitting a new task" described in that guideline.
+<p>Now we will check the "Checklist before submitting a new task" described in that guideline.</p>
 <ul>
-<li>Java file begins with Apache license statement. <b><i>must do that</i></b></li>
-<li>Task does not depend on GPL or LGPL code. <b><i>ok</i></b></li>
-<li>Source code complies with style guidelines <b><i>have to check (checkstyle)</i></b></li>
-<li>Code compiles and runs on Java1.2 <b><i>have to try</i></b></li>
-<li>Member variables are private, and provide public accessor methods
-        if access is actually needed. <b><i>have to check (checkstyle)</i></b></li>
-<li><i>Maybe</i> Task has failonerror attribute to control failure behaviour <b><i>hasn't</i></b></li>
-<li>New test cases written and succeed <b><i>passed on JDK 1.4, have to try on JDK 1.2</i></b></li>
-<li>Documentation page written <b><i>ok</i></b></li>
-<li>Example task declarations in the documentation tested. <b><i>ok (used in tests)</i></b></li>
-<li>Patch files generated using cvs diff -u <b><i>to do</i></b></li>
-<li>patch files include a patch to defaults.properties to register the
-tasks <b><i>to do</i></b></li>
-<li>patch files include a patch to tasklist.html to link to the new task page <b><i>to do</i></b></li>
-<li>Message to dev contains [SUBMIT] and task name in subject <b><i>to do</i></b></li>
-<li>Message body contains a rationale for the task <b><i>to do</i></b></li>
-<li>Message attachments contain the required files -source, documentation,
-test and patches zipped up to escape the HTML filter. <b><i>to do</i></b></li>
+<li>Java file begins with Apache license statement. <strong><em>must do that</em></strong></li>
+<li>Task does not depend on GPL or LGPL code. <strong><em>ok</em></strong></li>
+<li>Source code complies with style guidelines <strong><em>have to check (checkstyle)</em></strong></li>
+<li>Code compiles and runs on Java 5 <strong><em>have to try</em></strong></li>
+<li>Member variables are private, and provide public accessor methods if access is actually needed. <strong><em>have to
+check (checkstyle)</em></strong></li>
+<li><em>Maybe</em> Task has <var>failonerror</var> attribute to control failure
+behaviour <strong><em>hasn't</em></strong></li>
+<li>New test cases written and succeed <strong><em>passed on JDK 8, have to try on JDK 5</em></strong></li>
+<li>Documentation page written <strong><em>ok</em></strong></li>
+<li>Example task declarations in the documentation tested. <strong><em>ok (used in tests)</em></strong></li>
+<li>Message to dev contains [SUBMIT] and task name in subject <strong><em>to do</em></strong></li>
+<li>Message body contains a rationale for the task <strong><em>to do</em></strong></li>
+<li>Message body contains the URL to GitHub pull request. <strong><em>to do</em></strong></li>
 </ul>
 
-
 <h3>Package / Directories</h3>
-<p>This task does not depend on any external library. Therefore we can use this as
-a core task. This task contains only one class. So we can use the standard package
-for core tasks: <tt>org.apache.tools.ant.taskdefs</tt>. Implementations are in the
-directory <tt>src/main</tt>, tests in <tt>src/testcases</tt> and buildfiles for
-tests in <tt>src/etc/testcases</tt>.</p>
-
-<p>Now we integrate our work into Ants distribution. So first we do an update of our
-cvs tree. If not done yet, you have to checkout the ant module from Apaches cvs server
-as described in <a href="http://ant.apache.org/cvs.html">Access the Source Tree (AnonCVS)
-[7]</a> (password is <i>anoncvs</i>):<pre class="output">
-cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic login                 //1
-cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic checkout ant          //2
-</pre>
-If you have a local copy of Ants sources just do an update
-<pre class="output">
-cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic login
-cd ant                                                                       //3
-cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic update                //4
-</pre></p>
-
-<p>We use the <i>-d</i> flag on <b>//1</b> to specify the cvs directory. You can
-specify the environment variable CVSROOT with that value and after that you haven�t
-to use that flag any more. On <b>//2</b> we get the whole cvs tree of ant. (Sorry,
-but that uses a lot of time ... 10 up to 30 minutes are not unusual ... but this has
-to be done only once :-). A cvs update doesn't use a modulename but you have to be
-inside the directory. Therefore we go into that on <b>//3</b> and do the update
-on <b>//4</b>.</p>
-
-<p>Now we will build our Ant distribution and do a test. So we can see if there
-are any tests failing on our machine. (We can ignore these failing tests on later
-steps; windows syntax used here- translate to xNIX if needed):
-<pre class="output">
-ANTHOME&gt; build                                                    // 1
-ANTHOME&gt; set ANT_HOME=%CD%\dist                                   // 2
-ANTHOME&gt; ant test -Dtest.haltonfailure=false                      // 3
-</pre>
-
-First we have to build our Ant distribution (<b>//1</b>). On <b>//2</b> we set the ANT_HOME
-environment variable to the directory where the new created distribution is stored
-(%CD% is expanded to the current directory on Windows 2000 and XP, on 9x and NT
-write it out). On <b>//3</b> we let Ant do all the tests (which enforced a compile
-of all tests) without stopping on first failure.</p>
-
-<p>Next we apply our work onto Ants sources. Because we haven't modified any, this is
-a relative simple step. <i>(Because I have a local copy of Ant and usually contribute my
-work, I work on the local copy just from the beginning. The advantage: this step isn't
-necessary and saves a lot of work if you modify existing source :-)</i>.
+<p>This task does not depend on any external library. Therefore we can use this as a core task. This task contains only
+one class. So we can use the standard package for core
+tasks: <code class="code">org.apache.tools.ant.taskdefs</code>. Implementations are in the
+directory <samp>src/main</samp>, tests in <samp>src/testcases</samp> and buildfiles for tests
+in <samp>src/etc/testcases</samp>.</p>
+
+<p>Now we integrate our work into Ant distribution. So first we do an update of our Git tree. If not done yet, you
+should clone the Ant repository on GitHub[7], then create a local clone:</p>
+<pre class="input">git clone https://github.com/<em>your-sig</em>/ant.git</pre>
+
+<p>Now we will build our Ant distribution and do a test. So we can see if there are any tests failing on our
+machine. (We can ignore these failing tests on later steps; Windows syntax used here&mdash;translate to UNIX if
+needed):</p>
+<pre class="input">
+ANTREPO&gt; build                                                    // 1
+ANTREPO&gt; set ANT_HOME=%CD%\dist                                   // 2
+ANTREPO&gt; ant test -Dtest.haltonfailure=false                      // 3</pre>
+
+<p>First we have to build our Ant distribution (<strong>//1</strong>). On <strong>//2</strong> we set
+the <code>ANT_HOME</code> environment variable to the directory where the new created distribution is stored
+(<code>%CD%</code> is expanded to the current directory on Windows 2000 and later). On <strong>//3</strong> we let Ant
+do all the tests (which enforced a compile of all tests) without stopping on first failure.</p>
+
+<p>Next we apply our work onto Ant sources. Because we haven't modified any, this is a relatively simple
+step. <em>(Because I have a local Git clone of Ant and usually contribute my work, I work on the local copy just from
+the beginning. The advantage: this step isn't necessary and saves a lot of work if you modify existing sources :-)</em>.
 
 <ul>
-<li>move the Find.java to ANTHOME/src/main/org/apache/tools/ant/taskdefs/Find.java </li>
-<li>move the FindTest.java to ANTHOME/src/testcases/org/apache/tools/ant/taskdefs/FindTest.java </li>
-<li>move the build.xml to ANTHOME/src/etc/testcases/taskdefs/<b>find.xml</b> (!!! renamed !!!)</li>
-<li>add a <tt>package org.apache.tools.ant.taskdefs;</tt> at the beginning of the two java files </li>
-<li>delete all stuff from find.xml keeping the targets "testFileNotPresent", "testFilePresent",
-    "test.init" and "testMultipleFiles" </li>
-<li>delete the dependency to "use.init" in the find.xml </li>
-<li>in FindTest.java change the line <tt>configureProject("build.xml");</tt> to
-    <tt>configureProject("src/etc/testcases/taskdefs/find.xml");</tt> </li>
-<li>move the find.html to ANTHOME/docs/manual/Tasks/find.html </li>
-<li>add a <tt>&lt;a href="Tasks/find.html"&gt;Find&lt;/a&gt;&lt;br&gt;</tt>
-    in the ANTHOME/docs/manual/tasklist.html </li>
+    <li>move the <samp>Find.java</samp> to <samp>ANTREPO/src/main/org/apache/tools/ant/taskdefs/Find.java</samp></li>
+    <li>move the <samp>FindTest.java</samp> to <samp>ANTREPO/src/testcases/org/apache/tools/ant/taskdefs/FindTest.java</samp></li>
+    <li>move the <samp>build.xml</samp> to <samp>ANTREPO/src/etc/testcases/taskdefs/<strong>find.xml</strong></samp> (!!! renamed !!!)</li>
+    <li>add a <code>package org.apache.tools.ant.taskdefs;</code> at the beginning of the two java files</li>
+    <li>delete all stuff from <samp>find.xml</samp> keeping the
+    targets <q>testFileNotPresent</q>, <q>testFilePresent</q>, <q>test.init</q> and <q>testMultipleFiles</q></li>
+    <li>delete the dependency to <q>use.init</q> in the <samp>find.xml</samp></li>
+    <li>in <samp>FindTest.java</samp> change the line <code>configureProject("build.xml");</code>
+    to <code>configureProject("src/etc/testcases/taskdefs/find.xml");</code></li>
+    <li>move the <samp>find.html</samp> to <samp>ANTREPO/docs/manual/Tasks/find.html</samp></li>
+    <li>add a <code>&lt;a href="Tasks/find.html"&gt;Find&lt;/a&gt;&lt;br&gt;</code> in
+    the <samp>ANTREPO/docs/manual/tasklist.html</samp></li>
 </ul>
 
-Now our modifications are done and we will retest it:
-<pre class="output">
-ANTHOME&gt; build
-ANTHOME&gt; ant run-single-test                                      // 1
+<p>Now our modifications are done and we will retest it:</p>
+<pre class="input">
+ANTREPO&gt; build
+ANTREPO&gt; ant run-single-test                                      // 1
              -Dtestcase=org.apache.tools.ant.taskdefs.FindTest    // 2
-             -Dtest.haltonfailure=false
-</pre>
-Because we only want to test our new class, we use the target for single tests, specify
-the test to use and configure not to halt on the first failure - we want to see all
-failures of our own test (<b>//1 + 2</b>).</p>
-
-<p>And ... oh, all tests fail: <i>Ant could not find the task or a class this task relies upon.</i></p>
-
-<p>Ok: in the earlier steps we told Ant to use the Find class for the <code>&lt;find&gt;</code> task (remember the
-<code>&lt;taskdef&gt;</code> statement in the "use.init" target). But now we want to introduce that task as
-a core task. And nobody wants to taskdef the javac, echo, ... So what to do? The answer is the
-src/main/.../taskdefs/default.properties. Here is the mapping between taskname and implementing
-class done. So we add a <tt>find=org.apache.tools.ant.taskdefs.Find</tt> as the last core
-task (just before the <tt># optional tasks</tt> line). Now a second try:
-<pre class="output">
-ANTHOME&gt; build                                                    // 1
-ANTHOME&gt; ant run-single-test
+             -Dtest.haltonfailure=false</pre>
+<p>Because we only want to test our new class, we use the target for single tests, specify the test to use and configure
+not to halt on the first failure&mdash;we want to see all failures of our own test (<strong>//1 + 2</strong>).</p>
+
+<p>And ... oh, all tests fail: <em>Ant could not find the task or a class this task relies upon.</em></p>
+
+<p>Ok: in the earlier steps we told Ant to use the Find class for the <code>&lt;find&gt;</code> task (remember
+the <code>&lt;taskdef&gt;</code> statement in the <q>use.init</q> target). But now we want to introduce that task as a
+core task. And nobody wants to <code>taskdef</code> the <code>javac</code>, <code>echo</code>, ... So what to do? The
+answer is the <samp>src/main/.../taskdefs/default.properties</samp>. Here is the mapping between taskname and
+implementing class done. So we add a <code>find=org.apache.tools.ant.taskdefs.Find</code> as the last core task (just
+before the <code># optional tasks</code> line). Now a second try:</p>
+<pre class="input">
+ANTREPO&gt; build                                                    // 1
+ANTREPO&gt; ant run-single-test
              -Dtestcase=org.apache.tools.ant.taskdefs.FindTest
-             -Dtest.haltonfailure=false
-</pre>
-We have to rebuild (<b>//1</b>) Ant because the test look in the %ANT_HOME%\lib\ant.jar
-(more precise: on the classpath) for the properties file. And we have only modified it in the
-source path. So we have to rebuild that jar. But now all tests pass and we check whether our class
-breaks some other tests.
-<pre class="output">
-ANTHOME&gt; ant test -Dtest.haltonfailure=false
-</pre>
-Because there are a lot of tests this step requires a little bit of time. So use the <i>run-single-test</i>
-during development and do the <i>test</i> only at the end (maybe sometimes during development too).
-We use the <i>-Dtest.haltonfailure=false</i> here because there could be other tests fail and we have
-to look into them.</p>
-
-<p>This test run should show us two things: our test will run and the number of failing tests
-is the same as directly after the cvs update (without our modifications).</p>
-
+             -Dtest.haltonfailure=false</pre>
+<p>We have to rebuild (<strong>//1</strong>) Ant because the test look in the <samp>%ANT_HOME%\lib\ant.jar</samp> (more
+precise: on the classpath) for the properties file. And we have only modified it in the source path. So we have to
+rebuild that jar. But now all tests pass and we check whether our class breaks some other tests.</p>
+<pre class="input">ANTREPO&gt; ant test -Dtest.haltonfailure=false</pre>
+<p>Because there are a lot of tests this step requires a little bit of time. So use the <q>run-single-test</q> during
+development and do the <q>test</q> only at the end (maybe sometimes during development too).  We use
+the <kbd>-Dtest.haltonfailure=false</kbd> here because there could be other tests fail and we have to look into
+them.</p>
 
+<p>This test run should show us two things: our test will run and the number of failing tests is the same as directly
+after <code>git clone</code> (without our modifications).</p>
 
 <h3>Apache license statement</h3>
 <p>Simply copy the license text from one the other source from the Ant source tree.</p>
 
-
-<h3>Test on JDK 1.2</h3>
-<p>Until version 1.5 Ant must be able to run on a JDK 1.1. With version 1.6 this is not a
-requisite any more. But JDK 1.2 is a must-to-work-with. So we have to test that. You can download older
-JDKs from <a href="http://www.oracle.com/technetwork/java/archive-139210.html">Oracle [8]</a>.</p>
-
-<p>Clean the ANT_HOME variable, delete the <i>build, bootstrap</i> and <i>dist</i> directory
-and point JAVA_HOME to the JDK 1.2 home directory. Then do the <tt>build</tt>, set ANT_HOME
-and run <tt>ant test</tt> (like above).</p>
+<h3>Test on JDK 5</h3>
+<p>Ant 1.10 uses Java 8 for development, but Ant 1.9 is actively maintained, too.  That means that Ant code must be able
+to run on a JDK 5. So we have to test that. You can download older JDKs
+from <a href="https://www.oracle.com/technetwork/java/archive-139210.html" target="_top">Oracle [8]</a>.</p>
+
+<p>Clean the <code>ANT_HOME</code> variable, delete the <samp>build</samp>, <samp>bootstrap</samp> and <samp>dist</samp>
+directories, and point <code>JAVA_HOME</code> to the JDK 5 home directory. Then create the patch with your commit,
+checkout 1.9.x branch in Git, apply your patch and do the <code>build</code>, set <code>ANT_HOME</code> and
+run <kbd>ant test</kbd> (like above).</p>
 
 <p>Our test should pass.</p>
 
-
-
 <h3>Checkstyle</h3>
-<p>There are many things we have to ensure. Indentation with 4 spaces, blanks here and there, ...
-(all described in the <a href="http://ant.apache.org/ant_task_guidelines.html">Ant Task Guidelines [6]</a> which
-includes the <a href="http://www.oracle.com/technetwork/java/codeconvtoc-136057.html">Sun code style
-[9]</a>). Because there are so many things we would be happy to have a tool for do the checks.
-There is one: checkstyle. Checkstyle is available at <a href="http://checkstyle.sourceforge.net/">
-Sourceforge [10]</a> and Ant provides with the <tt>check.xml</tt> a buildfile which will do the job
-for us.</p>
-
-<p>Download it and put the checkstyle-*-all.jar into your %USERPROFILE%\.ant\lib directory.
-All jar's stored there are available to Ant so you haven't to add it to you %ANT_HOME%\lib
-directory (this feature was added with Ant 1.6).</p>
-
-<p>So we will run the tests with
-<pre class="output">
-ANTHOME&gt; ant -f check.xml checkstyle htmlreport
-</pre>
-I prefer the HTML report because there are lots of messages and we can navigate faster.
-Open the ANTHOME/build/reports/checkstyle/html/index.html and navigate to the Find.java. Now we
-see that there are some errors: missing whitespaces, unused imports, missing javadocs. So we have
-to do that.</p>
-
-<p>Hint: start at the <b>buttom</b> of the file so the line numbers in the report will keep
-up to date and you will find the next error place much more easier without redoing the checkstyle.</p>
-
-<p>After cleaning up the code according to the messages we delete the reports directory and
-do a second checkstyle run. Now our task isn't listed. That's fine :-)</p>
+<p>There are many things we have to ensure. Indentation with 4 spaces, blanks here and there, ...  (all described in
+the <a href="https://ant.apache.org/ant_task_guidelines.html" target="_top">Ant Task Guidelines [6]</a> which includes
+the <a href="https://www.oracle.com/technetwork/java/codeconvtoc-136057.html" target="_top">Sun code style
+[9]</a>). Because there are so many things we would be happy to have a tool for do the checks.  There is one:
+checkstyle. Checkstyle is available at <a href="http://checkstyle.sourceforge.net/" target="_top">Sourceforge [10]</a>
+and Ant provides with the <samp>check.xml</samp> a buildfile which will do the job for us.</p>
+
+<p>Download it and put the <samp>checkstyle-*-all.jar</samp> into your <samp>%USERPROFILE%\.ant\lib</samp> directory.
+All jar's stored there are available to Ant so you haven't to add it to you <samp>%ANT_HOME%\lib</samp> directory (this
+feature is available <em>since Ant 1.6</em>).</p>
+
+<p>So we will run the tests with</p>
+<pre class="input">ANTREPO&gt; ant -f check.xml checkstyle htmlreport</pre>
+<p>I prefer the HTML report because there are lots of messages and we can navigate faster.  Open
+the <samp>ANTREPO/build/reports/checkstyle/html/index.html</samp> and navigate to the <samp>Find.java</samp>. Now we see
+that there are some errors: missing whitespaces, unused imports, missing javadocs. So we have to do that.</p>
 
+<p>Hint: start at the <strong>bottom</strong> of the file so the line numbers in the report will keep up to date and you
+will find the next error place much more easier without redoing the checkstyle.</p>
 
-
-<!--
-  Couldnt create the diff that way for myself, but that should be documented.
-  But on the other hand this tutorial should not be forgotten any longer so I
-  comment that out.  JHM
-<h3>Creating the diff</h3>
-<p>Creating a diff for Ant is very easy: just start <tt>ant -f patch.xml</tt> and all is done
-automatically. This step requires a cvs executable in your path and internet access (more precise:
-cvs access). As a result we get a file <i> TODO </i>.</p>
--->
-
+<p>After cleaning up the code according to the messages we delete the reports directory and do a second checkstyle
+run. Now our task isn't listed. That's fine :-)</p>
 
 <h3>Publish the task</h3>
-<p>Finally we publish that archive. As described in the <a href="http://ant.apache.org/ant_task_guidelines.html">
-Ant Task Guidelines [7]</a> we can post it on the developer mailinglist or we create a BugZilla
-entry. For both we need some information:</p>
+<p>Finally we publish that archive. As described in the <a href="https://ant.apache.org/ant_task_guidelines.html"
+target="_top">Ant Task Guidelines [7]</a> we can announce it on the developer mailing list, create a BugZilla entry and
+open a GitHub pull request. For both we need some information:</p>
 
-<table border="1">
+<table>
+<tr>
+<!-- this is an empty "table head" -->
+</tr>
 <tr>
   <th>subject</th>
-  <td><i>short description</i></td>
+  <td><em>short description</em></td>
   <td>Task for finding files in a path</td>
 </tr>
 <tr>
   <th>body</th>
-  <td><i>more details about the path</i></td>
-  <td>This new task looks inside a nested <code>&lt;path/&gt;</code> for occurrences of a file and stores
-      all locations as a property. See the included manual for details.</td>
+  <td><em>more details about the path</em></td>
+  <td>This new task looks inside a nested <code>&lt;path/&gt;</code> for occurrences of a file and stores all locations
+      as a property. See the included manual for details.</td>
 </tr>
 <tr>
-  <th>attachments</th>
-  <td><i>all files needed to apply the path</i></td>
-  <td>Archive containing a patch with the new and modified resources</td>
+  <th>pull request reference</th>
+  <td><em>GitHub pull request URL</em></td>
+  <td>https://github.com/apache/ant/pull/0</td>
 </tr>
 </table>
 
-<p>Sending an email with these information is very easy and I think I haven't to show that.
-The other way - BugZilla - is slightly more difficult. But it has the advantage that entries
-will not be forgotten (once per week a report is generated). So I will show this way.</p>
-
-<p>You must have a BugZilla account for that. So open the <a href="http://issues.apache.org/bugzilla/">
-BugZilla Main Page [11]</a> and follow the link
-<a href="http://issues.apache.org/bugzilla/createaccount.cgi">Open a new Bugzilla account [12]</a>
+<p>Sending an email with this information is very easy and I think I haven't to describe that.  BugZilla is slightly
+more difficult.  But the advantage is that entries will not be forgotten (a report is generated once every weekend).  So
+I will describe the process.</p>
+
+<p>First, you must have a BugZilla account. So open the <a href="https://issues.apache.org/bugzilla/"
+target="_top">BugZilla Main Page [11]</a> and follow the
+link <a href="https://issues.apache.org/bugzilla/createaccount.cgi" target="_top">Open a new Bugzilla account [12]</a>
 and the steps described there if you haven't one.</p>
 
 <ol>
-<li>From the BugZilla main page choose <a href="http://issues.apache.org/bugzilla/enter_bug.cgi">Enter
-    a new bug report [13]</a></li>
-<li>Choose "Ant" as product </li>
-<li>Version is the last "Alpha (nightly)" (at this time 1.7)</li>
+<li>From the BugZilla main page choose <a href="https://issues.apache.org/bugzilla/enter_bug.cgi" target="_top">Enter a
+    new bug report [13]</a></li>
+<li>Choose "Ant" as product</li>
+<li>Version is the last "Alpha (nightly)" (at this time 1.10)</li>
 <li>Component is "Core tasks"</li>
 <li>Platform and Severity are ok with "Other" and "Normal"</li>
 <li>Initial State is ok with "New"</li>
 <li>Same with the empty "Assigned to"</li>
-<li>It is not required to add yourself as CC, because you are the reporter and therefore will be
-    informed on changes</li>
-<li>URL: no url required</li>
-<li>Summary: add the <i>subject</i> from the table</li>
-<li>Description: add the <i>body</i> from the table</li>
-<li>Then press "Commit"</li>
-<li>After redirecting to the new created bug entry click "Create a New Attachment"</li>
-<li>Enter the path to your local path file into "File" or choose it via the "File"'s
-    button.</li>
-<li>Enter a short description into "Description", so that you could guess, what the
-    path file includes. Here we could add "Initial Patch".</li>
-<li>The "Content Type" is "auto-detect". You could use the "patch" type, if you only
-    provide a single path file, but we want do upload more that one, included in our
-    patch.zip.</li>
+<li>It is not required to add yourself as CC, because you are the reporter and therefore will be informed on
+    changes</li>
+<li>URL: GitHub pull request URL</li>
+<li>Summary: add the <var>subject</var> from the table</li>
+<li>Description: add the <var>body</var> from the table</li>
 <li>Then press "Commit"</li>
 </ol>
-Now the new task is uploaded into the bug database.
-
-
-<h2><a name="resources">Resources</a></h2>
-&nbsp;&nbsp;[1] <a href="tutorial-writing-tasks.html">tutorial-writing-tasks.html</a><br>
-&nbsp;&nbsp;[2] <a href="tutorial-tasks-filesets-properties.zip">tutorial-tasks-filesets-properties.zip</a><br>
-&nbsp;&nbsp;[3] <a href="properties.html#built-in-props">properties.html#built-in-props</a><br>
-&nbsp;&nbsp;[4] <a href="http://ant-contrib.sourceforge.net/">http://ant-contrib.sourceforge.net/</a><br>
-&nbsp;&nbsp;[5] <a href="Tasks/java.html">Tasks/java.html</a><br>
-&nbsp;&nbsp;[6] <a href="http://ant.apache.org/ant_task_guidelines.html">http://ant.apache.org/ant_task_guidelines.html</a><br>
-&nbsp;&nbsp;[7] <a href="http://ant.apache.org/cvs.html">http://ant.apache.org/cvs.html</a><br>
-&nbsp;&nbsp;[8] <a href="http://www.oracle.com/technetwork/java/archive-139210.html">http://www.oracle.com/technetwork/java/archive-139210.html</a><br>
-&nbsp;&nbsp;[9] <a href="http://www.oracle.com/technetwork/java/codeconvtoc-136057.html">http://www.oracle.com/technetwork/java/codeconvtoc-136057.html</a><br>
-&nbsp;&nbsp;[10] <a href="http://checkstyle.sourceforge.net/">http://checkstyle.sourceforge.net/</a><br>
-&nbsp;&nbsp;[11] <a href="http://issues.apache.org/bugzilla/">http://issues.apache.org/bugzilla/</a><br>
-&nbsp;&nbsp;[12] <a href="http://issues.apache.org/bugzilla/createaccount.cgi">http://issues.apache.org/bugzilla/createaccount.cgi</a><br>
-&nbsp;&nbsp;[13] <a href="http://issues.apache.org/bugzilla/enter_bug.cgi">http://issues.apache.org/bugzilla/enter_bug.cgi</a><br>
-
-
-<!--
-  TODO:
-  - how to create a path (path.xml / command line)
--->
-
-
 
+<p>Now the new task is registered in the bug database.</p>
 
+<h2 id="resources">Resources</h2>
+<ol class="refs">
+    <li><a href="tutorial-writing-tasks.html">tutorial-writing-tasks.html</a></li>
+    <li><a href="tutorial-tasks-filesets-properties.zip">tutorial-tasks-filesets-properties.zip</a></li>
+    <li><a href="properties.html#built-in-props">properties.html#built-in-props</a></li>
+    <li><a href="http://ant-contrib.sourceforge.net/" target="_top">http://ant-contrib.sourceforge.net/</a></li>
+    <li><a href="Tasks/java.html">Tasks/java.html</a></li>
+    <li><a href="https://ant.apache.org/ant_task_guidelines.html"
+           target="_top">https://ant.apache.org/ant_task_guidelines.html</a></li>
+    <li><a href="https://github.com/apache/ant" target="_top">https://github.com/apache/ant</a></li>
+    <li><a href="https://www.oracle.com/technetwork/java/archive-139210.html"
+           target="_top">https://www.oracle.com/technetwork/java/archive-139210.html</a></li>
+    <li><a href="https://www.oracle.com/technetwork/java/codeconvtoc-136057.html"
+           target="_top">https://www.oracle.com/technetwork/java/codeconvtoc-136057.html</a></li>
+    <li><a href="http://checkstyle.sourceforge.net/" target="_top">http://checkstyle.sourceforge.net/</a></li>
+    <li><a href="https://issues.apache.org/bugzilla/" target="_top">https://issues.apache.org/bugzilla/</a></li>
+    <li><a href="https://issues.apache.org/bugzilla/createaccount.cgi"
+           target="_top">https://issues.apache.org/bugzilla/createaccount.cgi</a></li>
+    <li><a href="https://issues.apache.org/bugzilla/enter_bug.cgi"
+           target="_top">https://issues.apache.org/bugzilla/enter_bug.cgi</a></li>
+</ol>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/tutorial-writing-tasks.html ant-1.10.3/manual/tutorial-writing-tasks.html
--- ant-1.9.10/manual/tutorial-writing-tasks.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/tutorial-writing-tasks.html	2018-03-24 12:37:12.000000000 +0000
@@ -17,7 +17,7 @@
 <html>
 <head>
   <title>Tutorial: Writing Tasks</title>
-  <link rel="stylesheet" type="text/css" href="stylesheets/style.css" />
+  <link rel="stylesheet" type="text/css" href="stylesheets/style.css"/>
 </head>
 <body>
 <h1>Tutorial: Writing Tasks</h1>
@@ -41,22 +41,20 @@
 <li><a href="#resources">Resources</a></li>
 </ul>
 
-<a name="buildenvironment"></a>
-<h2>Set up the build environment</h2>
-<p>Apache Ant builds itself, we are using Ant too (why we would write
-a task if not? :-) therefore we should use Ant for our build.</p>
-<p>We choose a directory as root directory. All things will be done
-here if I say nothing different. I will reference this directory
-as <i>root-directory</i> of our project. In this root-directory we
-create a text file names <i>build.xml</i>. What should Ant do for us?</p>
+<h2 id="buildenvironment">Set up the build environment</h2>
+<p>Apache Ant builds itself, we are using Ant too (why we would write a task if not? :-) therefore we should use Ant for
+our build.</p>
+<p>We choose a directory as root directory. All things will be done here if I say nothing different. I will reference
+this directory as <em>root-directory</em> of our project. In this root-directory we create a text file
+names <samp>build.xml</samp>. What should Ant do for us?</p>
 <ul>
 <li>compiles my stuff</li>
 <li>make the jar, so that I can deploy it</li>
 <li>clean up everything</li>
 </ul>
 So the buildfile contains three targets.
-<pre class="code">
-&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
+<pre>
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;project name="MyTask" basedir="." default="jar"&gt;
 
     &lt;target name="clean" description="Delete all generated files"&gt;
@@ -72,16 +70,15 @@
         &lt;jar destfile="MyTask.jar" basedir="classes"/&gt;
     &lt;/target&gt;
 
-&lt;/project&gt;
-</pre>
+&lt;/project&gt;</pre>
 
-This buildfile uses often the same value (src, classes, MyTask.jar), so we should rewrite that
-using <code>&lt;property&gt;</code>s. On second there are some handicaps: <code>&lt;javac&gt;</code> requires that the destination
-directory exists; a call of "clean" with a non existing classes directory will fail; "jar" requires
-the execution of some steps before. So the refactored code is:
+This buildfile uses often the same value (<samp>src</samp>, <samp>classes</samp>, <samp>MyTask.jar</samp>), so we should
+rewrite that using <code>&lt;property&gt;</code>s. On second there are some handicaps: <code>&lt;javac&gt;</code>
+requires that the destination directory exists; a call of <q>clean</q> with a non existing classes directory will
+fail; <q>jar</q> requires the execution of some steps before. So the refactored code is:
 
-<pre class="code">
-&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
+<pre>
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;project name="MyTask" basedir="." default="jar"&gt;
 
     <b>&lt;property name="src.dir" value="src"/&gt;</b>
@@ -101,38 +98,29 @@
         &lt;jar destfile="${ant.project.name}.jar" basedir="${classes.dir}"/&gt;
     &lt;/target&gt;
 
-&lt;/project&gt;
-</pre>
-<i>ant.project.name</i> is one of the
-<a href="http://ant.apache.org/manual/properties.html#built-in-props" target="_blank">
-build-in properties [1]</a> of Ant.
-
-
-<a name="write1"></a>
-<h2>Write the Task</h2>
-
-Now we write the simplest Task - a HelloWorld-Task (what else?). Create a text file
-<i>HelloWorld.java</i> in the src-directory with:
-<pre class="code">
+&lt;/project&gt;</pre>
+<p><code>ant.project.name</code> is one of the <a href="properties.html#built-in-props" target="_top">build-in
+properties [1]</a> of Ant.</p>
+
+<h2 id="write1">Write the Task</h2>
+
+<p>Now we write the simplest Task&mdash;a HelloWorld Task (what else?). Create a text file <samp>HelloWorld.java</samp>
+in the src-directory with:</p>
+<pre>
 public class HelloWorld {
     public void execute() {
         System.out.println("Hello World");
     }
-}
-</pre>
-and we can compile and jar it with <tt>ant</tt> (default target is "jar" and via
-its <i>depends</i>-clause the "compile" is executed before).
-
-
-
-<a name="use1"></a>
-<h2>Use the Task</h2>
-<p>But after creating the jar we want to use our new Task. Therefore we need a
-new target "use". Before we can use our new task we have to declare it with
-<a href="http://ant.apache.org/manual/Tasks/taskdef.html" target="_blank">
-<code>&lt;taskdef&gt;</code> [2]</a>. And for easier process we change the default clause:</p>
-<pre class="code">
-&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
+}</pre>
+<p>and we can compile and jar it with <kbd>ant</kbd> (default target is <q>jar</q> and via its <var>depends</var>
+attribute the <q>compile</q> is executed before).</p>
+
+<h2 id="use1">Use the Task</h2>
+<p>But after creating the jar we want to use our new Task. Therefore we need a new target <q>use</q>. Before we can use
+our new task we have to declare it with <a href="Tasks/taskdef.html" target="_top"><code>&lt;taskdef&gt;</code>
+[2]</a>.  And for easier process we change the <var>default</var> attribute:</p>
+<pre>
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;project name="MyTask" basedir="." default="<b>use</b>"&gt;
 
     ...
@@ -142,13 +130,12 @@
         &lt;helloworld/&gt;
     &lt;/target&gt;</b>
 
-&lt;/project&gt;
-</pre>
+&lt;/project&gt;</pre>
 
-<p>Important is the <i>classpath</i>-attribute. Ant searches in its /lib directory for
-tasks and our task isn't there. So we have to provide the right location. </p>
+<p>Important is the <var>classpath</var> attribute. Ant searches in its <samp>/lib</samp> directory for tasks and our
+task isn't there. So we have to provide the right location.</p>
 
-<p>Now we can type in <tt>ant</tt> and all should work ...</p>
+<p>Now we can type in <kbd>ant</kbd> and all should work ...</p>
 <pre class="output">
 Buildfile: build.xml
 
@@ -163,23 +150,18 @@
 [helloworld] Hello World
 
 BUILD SUCCESSFUL
-Total time: 3 seconds
-</pre>
-
+Total time: 3 seconds</pre>
 
-
-<a name="TaskAdapter"></a>
-<h2>Integration with TaskAdapter</h2>
-<p>Our class has nothing to do with Ant. It extends no superclass and implements
-no interface. How does Ant know to integrate? Via name convention: our class provides
-a method with signature <tt>public void execute()</tt>. This class is wrapped by Ant's
-<tt>org.apache.tools.ant.TaskAdapter</tt> which is a task and uses reflection for
-setting a reference to the project and calling the <i>execute()</i> method.</p>
-
-<p><i>Setting a reference to the project</i>? Could be interesting. The Project class
-gives us some nice abilities: access to Ant's logging facilities getting and setting
-properties and much more. So we try to use that class:</p>
-<pre class="code">
+<h2 id="TaskAdapter">Integration with TaskAdapter</h2>
+<p>Our class has nothing to do with Ant. It extends no superclass and implements no interface. How does Ant know to
+integrate? Via name convention: our class provides a method with signature <code class="code">public void
+execute()</code>. This class is wrapped by Ant's <code class="code">org.apache.tools.ant.TaskAdapter</code> which is a
+task and uses reflection for setting a reference to the project and calling the <code class="code">execute()</code>
+method.</p>
+
+<p><em>Setting a reference to the project</em>? Could be interesting. The Project class gives us some nice abilities:
+access to Ant's logging facilities getting and setting properties and much more. So we try to use that class:</p>
+<pre>
 import org.apache.tools.ant.Project;
 
 public class HelloWorld {
@@ -194,24 +176,19 @@
         String message = project.getProperty("ant.project.name");
         project.log("Here is project '" + message + "'.", Project.MSG_INFO);
     }
-}
-</pre>
-and the execution with <tt>ant</tt> will show us the expected
+}</pre>
+<p>and the execution with <kbd>ant</kbd> will show us the expected</p>
 <pre class="output">
 use:
-Here is project 'MyTask'.
-</pre>
-
+Here is project 'MyTask'.</pre>
 
-<a name="derivingFromTask"></a>
-<h2>Deriving from Ant's Task</h2>
-<p>Ok, that works ... But usually you will extend <tt>org.apache.tools.ant.Task</tt>.
-That class is integrated in Ant, get's the project-reference, provides documentation
-fields, provides easier access to the logging facility and (very useful) gives you
-the exact location where <i>in the buildfile</i> this task instance is used.</p>
+<h2 id="derivingFromTask">Deriving from Ant's Task</h2>
+<p>Ok, that works ... But usually you will extend <code class="code">org.apache.tools.ant.Task</code>.  That class is
+integrated in Ant, gets the project reference, provides documentation fields, provides easier access to the logging
+facility and (very useful) gives you the exact location where <em>in the buildfile</em> this task instance is used.</p>
 
-<p>Oki-doki - let's us use some of these:</p>
-<pre class="code">
+<p>Oki-doki&mdash;let's us use some of these:</p>
+<pre>
 import org.apache.tools.ant.Task;
 
 public class HelloWorld extends Task {
@@ -225,35 +202,33 @@
         // where this task is used?
         log("I am used in: " +  getLocation() );
     }
-}
-</pre>
+}</pre>
 <p>which gives us when running</p>
 <pre class="output">
 use:
 [helloworld] Here is project 'MyTask'.
-[helloworld] I am used in: C:\tmp\anttests\MyFirstTask\build.xml:23:
-</pre>
+[helloworld] I am used in: C:\tmp\anttests\MyFirstTask\build.xml:23:</pre>
 
-<a name="accessTaskProject"></a>
-<h2>Accessing the Task's Project</h2>
-<p>The parent project of your custom task may be accessed through method <code>getProject()</code>.  However, do not call this from the custom task constructor, as the return value will be null.  Later, when node attributes or text are set, or method <code>execute()</code> is called, the Project object is available.</p>
+<h2 id="accessTaskProject">Accessing the Task's Project</h2>
+<p>The parent project of your custom task may be accessed through method <code class="code">getProject()</code>.
+However, do not call this from the custom task constructor, as the return value will be null.  Later, when node
+attributes or text are set, or method <code class="code">execute()</code> is called, the Project object is
+available.</p>
 <p>Here are two useful methods from class Project:</p>
 <ul>
-  <li><code>String getProperty(String propertyName)</code></li>
-  <li>
-    <code>String replaceProperties(String value)</code>
-  </li>
+  <li><code class="code">String getProperty(String propertyName)</code></li>
+  <li><code class="code">String replaceProperties(String value)</code></li>
 </ul>
 
-<p>The method <code>replaceProperties()</code> is discussed further in section <a href="#NestedText">Nested Text</a>.</p>
+<p>The method <code class="code">replaceProperties()</code> is discussed further in section <a href="#NestedText">Nested
+Text</a>.</p>
 
-<a name="attributes"></a>
-<h2>Attributes</h2>
-<p>Now we want to specify the text of our message (it seems that we are
-rewriting the <code>&lt;echo/&gt;</code> task :-). First we well do that with an attribute.
-It is very easy - for each attribute provide a <tt>public void set<code>&lt;attributename&gt;</code>(<code>&lt;type&gt;</code>
-newValue)</tt> method and Ant will do the rest via reflection.</p>
-<pre class="code">
+<h2 id="attributes">Attributes</h2>
+<p>Now we want to specify the text of our message (it seems that we are rewriting the <code>&lt;echo/&gt;</code> task
+:-). First we well do that with an attribute.  It is very easy&mdash;for each attribute provide
+a <code class="code">public void set<i>Attributename</i>(<i>Type</i> newValue)</code> method and Ant will do the rest
+via reflection.</p>
+<pre>
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.BuildException;
 
@@ -265,51 +240,48 @@
     }
 
     public void execute() {
-        if (message==null) {
+        if (message == null) {
             throw new BuildException("No message set.");
         }
         log(message);
     }
 
-}
-</pre>
-<p>Oh, what's that in execute()? Throw a <i>BuildException</i>? Yes, that's the usual
-way to show Ant that something important is missed and complete build should fail. The
-string provided there is written as build-failes-message. Here it's necessary because
-the log() method can't handle a <i>null</i> value as parameter and throws a NullPointerException.
-(Of course you can initialize the <i>message</i> with a default string.)</p>
+}</pre>
+<p>Oh, what's that in <code class="code">execute()</code>? Throw a <code>BuildException</code>? Yes, that's the usual
+way to show Ant that something important is missed and complete build should fail. The string provided there is written
+as build-fails-message. Here it's necessary because the <code class="code">log()</code> method can't handle
+a <code>null</code> value as parameter and throws a <code>NullPointerException</code>.  (Of course you can initialize
+the <var>message</var> with a default string.)</p>
 
 <p>After that we have to modify our buildfile:</p>
-<pre class="code">
+<pre>
     &lt;target name="use" description="Use the Task" depends="jar"&gt;
         &lt;taskdef name="helloworld"
                  classname="HelloWorld"
                  classpath="${ant.project.name}.jar"/&gt;
         &lt;helloworld <b>message="Hello World"</b>/&gt;
-    &lt;/target&gt;
-</pre>
+    &lt;/target&gt;</pre>
 <p>That's all.</p>
 
-<p>Some background for working with attributes: Ant supports any of these datatypes as
-arguments of the set-method:</p><ul>
-<li>elementary data type like <i>int</i>, <i>long</i>, ...</li>
-<li>its wrapper classes like <i>java.lang.Integer</i>, <i>java.lang.Long</i>, ...</li>
-<li><i>java.lang.String</i></li>
-<li>some more classes (e.g. <i>java.io.File</i>; see
-    <a href="develop.html#set-magic">Manual
-    'Writing Your Own Task' [3]</a>)</li>
+<p>Some background for working with attributes: Ant supports any of these datatypes as arguments of the set-method:</p>
+<ul>
+<li>primitive data types like <code class="code">int</code>, <code class="code">long</code>, ...</li>
+<li>their wrapper classes like <code class="code">java.lang.Integer</code>, <code class="code">java.lang.Long</code>,
+...</li>
+<li><code class="code">java.lang.String</code></li>
+<li>some other classes (e.g. <code class="code">java.io.File</code>; see <a href="develop.html#set-magic">Manual
+'Writing Your Own Task' [3]</a>)</li>
 <li>Any Java Object parsed from Ant 1.8's <a href="Tasks/propertyhelper.html">Property
 Helper</a></li>
 </ul>
-Before calling the set-method all properties are resolved. So a <tt>&lt;helloworld message="${msg}"/&gt;</tt>
-would not set the message string to "${msg}" if there is a property "msg" with a set value.
+<p>Before calling the set-method all properties are resolved. So a <code>&lt;helloworld message="${msg}"/&gt;</code>
+would not set the message string to <q>${msg}</q> if there is a property <code>msg</code> with a set value.</p>
 
-
-<a name="NestedText"></a>
-<h2>Nested Text</h2>
-<p>Maybe you have used the <code>&lt;echo&gt;</code> task in a way like <tt>&lt;echo&gt;Hello World&lt;/echo&gt;</tt>.
-For that you have to provide a <tt>public void addText(String text)</tt> method.</p>
-<pre class="code">
+<h2 id="NestedText">Nested Text</h2>
+<p>Maybe you have used the <code>&lt;echo&gt;</code> task in a way like <code>&lt;echo&gt;Hello
+World&lt;/echo&gt;</code>.  For that you have to provide a <code class="code">public void addText(String text)</code>
+method.</p>
+<pre>
 ...
 public class HelloWorld extends Task {
     private String message;
@@ -318,46 +290,42 @@
         message = text;
     }
     ...
-}
-</pre>
-<p>But here properties are <b>not</b> resolved! For resolving properties we have to use
-Project's <tt>replaceProperties(String propname) : String</tt> method which takes the
-property name as argument and returns its value (or ${propname} if not set).</p>
-<p>Thus, to replace properties in the nested node text, our method <code>addText()</code> can be written as:</p>
-<pre class="code">
+}</pre>
+<p>But here properties are <strong>not</strong> resolved! For resolving properties we have to use
+Project's <code class="code">replaceProperties(String propname)</code> method which takes the property name as argument
+and returns its value (or <code>${propname}</code> if not set).</p>
+<p>Thus, to replace properties in the nested node text, our method <code class="code">addText()</code> can be written
+as:</p>
+<pre>
     public void addText(String text) {
         message = getProject().replaceProperties(text);
-    }
-</pre>
-
+    }</pre>
 
-<a name="NestedElements"></a>
-<h2>Nested Elements</h2>
+<h2 id="NestedElements">Nested Elements</h2>
 <p>There are several ways for inserting the ability of handling nested elements. See
-the <a href="http://ant.apache.org/manual/develop.html#nested-elements">Manual [4]</a> for other.
-We use the first way of the three described ways. There are several steps for that:</p><ol>
-<li>We create a class for collecting all the info the nested element should contain.
-  This class is created by the same rules for attributes and nested elements
-  as for the task (<code>set&lt;attributename&gt;</code>() methods). </li>
+the <a href="develop.html#nested-elements">Manual [4]</a> for other.  We use the first way of the three described
+ways. There are several steps for that:</p>
+<ol>
+<li>We create a class for collecting all the info the nested element should contain.  This class is created by the same
+rules for attributes and nested elements as for the task (<code class="code">set<i>Attributename</i>()</code>
+methods).</li>
 <li>The task holds multiple instances of this class in a list.</li>
-<li>A factory method instantiates an object, saves the reference in the list
-  and returns it to Ant Core.</li>
-<li>The execute() method iterates over the list and evaluates its values.</li>
+<li>A factory method instantiates an object, saves the reference in the list and returns it to Ant Core.</li>
+<li>The <code class="code">execute()</code> method iterates over the list and evaluates its values.</li>
 </ol>
-<pre class="code">
-import java.util.Vector;
-import java.util.Iterator;
+<pre>
+import java.util.ArrayList;
+import java.util.List;
 ...
     public void execute() {
-        if (message!=null) log(message);
-        for (Iterator it=messages.iterator(); it.hasNext(); ) {      <b>// 4</b>
-            Message msg = (Message)it.next();
+        if (message != null) log(message);
+        for (Message msg : messages) {      <b>// 4</b>
             log(msg.getMsg());
         }
     }
 
 
-    Vector messages = new Vector();                                  <b>// 2</b>
+    List&lt;Message&gt; messages = new ArrayList&lt;&gt;();                      <b>// 2</b>
 
     public Message createMessage() {                                 <b>// 3</b>
         Message msg = new Message();
@@ -372,26 +340,22 @@
         public void setMsg(String msg) { this.msg = msg; }
         public String getMsg() { return msg; }
     }
-...
-</pre>
-<p>Then we can use the new nested element. But where is xml-name for that defined?
-The mapping XML-name : classname is defined in the factory method:
-<tt>public <i>classname</i> create<i>XML-name</i>()</tt>. Therefore we write in
-the buildfile</p>
-<pre class="code">
+...</pre>
+<p>Then we can use the new nested element. But where is XML-name for that defined?  The mapping XML-name &rarr;
+classname is defined in the factory method: <code class="code">public <i>classname</i>
+create<i>XML-name</i>()</code>. Therefore we write in the buildfile</p>
+<pre>
         &lt;helloworld&gt;
             &lt;message msg="Nested Element 1"/&gt;
             &lt;message msg="Nested Element 2"/&gt;
-        &lt;/helloworld&gt;
-</pre>
-<p>Note that if you choose to use methods 2 or 3, the class that represents the nested
-element must be declared as <code>static</code></p>
+        &lt;/helloworld&gt;</pre>
+<p>Note that if you choose to use methods 2 or 3, the class that represents the nested element must be declared
+as <code>static</code></p>
 
-<a name="complex"></a>
-<h2>Our task in a little more complex version</h2>
+<h2 id="complex">Our task in a little more complex version</h2>
 <p>For recapitulation now a little refactored buildfile:</p>
-<pre class="code">
-&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
+<pre>
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;project name="MyTask" basedir="." default="use"&gt;
 
     &lt;property name="src.dir" value="src"/&gt;
@@ -457,18 +421,15 @@
 
     &lt;target name="use"
             description="Try all (w/out use.fail)"
-            depends="use.without,use.message,use.nestedText,use.nestedElement"
-    /&gt;
+            depends="use.without,use.message,use.nestedText,use.nestedElement"/&gt;
 
-&lt;/project&gt;
-</pre>
-
-And the code of the task:
-<pre class="code">
+&lt;/project&gt;</pre>
+<p>And the code of the task:</p>
+<pre>
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.BuildException;
-import java.util.Vector;
-import java.util.Iterator;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * The task of the tutorial.
@@ -502,18 +463,17 @@
         if (fail) throw new BuildException("Fail requested.");
 
         // handle attribute 'message' and nested text
-        if (message!=null) log(message);
+        if (message != null) log(message);
 
         // handle nested elements
-        for (Iterator it=messages.iterator(); it.hasNext(); ) {
-            Message msg = (Message)it.next();
+        for (Message msg : messages) {
             log(msg.getMsg());
         }
     }
 
 
     /** Store nested 'message's. */
-    Vector messages = new Vector();
+    List&lt;Message&gt; messages = new ArrayList&lt;&gt;();
 
     /** Factory method for creating nested 'message's. */
     public Message createMessage() {
@@ -533,10 +493,8 @@
         public String getMsg() { return msg; }
     }
 
-}
-</pre>
-
-And it works:
+}</pre>
+<p>And it works:</p>
 <pre class="output">
 C:\tmp\anttests\MyFirstTask&gt;ant
 Buildfile: build.xml
@@ -585,36 +543,26 @@
 C:\tmp\anttests\MyFirstTask\build.xml:36: Fail requested.
 
 Total time: 1 second
-C:\tmp\anttests\MyFirstTask&gt;
-</pre>
-Next step: test ...
+C:\tmp\anttests\MyFirstTask&gt;</pre>
+<p>Next step: test ...</p>
 
-
-
-<a name="TestingTasks"></a>
-<h2>Test the Task</h2>
-<p>We have written a test already: the use.* tasks in the buildfile. But its
-difficult to test that automatically. Common (and in Ant) used is JUnit for
-that. For testing tasks Ant provides a JUnit Rule <tt>org.apache.tools.ant.BuildFileRule</tt>.
-This class provides some for testing tasks useful methods:
-initialize Ant, load a buildfile, execute targets, capturing debug and run logs ...</p>
-
-<p>In Ant it is usual that the testcase has the same name as the task with a prepending
-<i>Test</i>, therefore we will create a file <i>HelloWorldTest.java</i>. Because we
-have a very small project we can put this file into <i>src</i> directory (Ant's own
-testclasses are in /src/testcases/...). Because we have already written our tests
-for "hand-test" we can use that for automatic tests, too. But there is one little
-problem we have to solve: all test supporting classes are not part of the binary
-distribution of Ant. So you can build the special jar file from source distro with
-target "test-jar" or you can download a nightly build from
-<a href="http://gump.covalent.net/jars/latest/ant/ant-testutil.jar">
-http://gump.covalent.net/jars/latest/ant/ant-testutil.jar [5]</a>.</p>
+<h2 id="TestingTasks">Test the Task</h2>
+<p>We have written a test already: the <q>use.*</q> targets in the buildfile. But it's difficult to test that
+automatically. Commonly (and in Ant) JUnit is used for that. For testing tasks Ant provides a JUnit
+Rule <code class="code">org.apache.tools.ant.BuildFileRule</code>.  This class provides some for testing tasks useful
+methods: initialize Ant, load a buildfile, execute targets, capture debug and run logs ...</p>
+
+<p>In Ant it is usual that the testcase has the same name as the task with a prepended <code>Test</code>, therefore we
+will create a file <samp>HelloWorldTest.java</samp>. Because we have a very small project we can put this file
+into <samp>src</samp> directory (Ant's own testclasses are in <samp>/src/testcases/...</samp>). Because we have already
+written our tests for "hand-test" we can use that for automatic tests, too. All test supporting classes are a part of
+the binary distribution of Ant <em>since Ant 1.7.0</em> in form of <samp>ant-testutil.jar</samp>. You can also build the
+jar file from source distro with target "test-jar".
 
 <p>For executing the test and creating a report we need the optional tasks <code>&lt;junit&gt;</code>
 and <code>&lt;junitreport&gt;</code>. So we add to the buildfile:</p>
-<pre class="code">
-...
-<font color="#9F9F9F">&lt;project name="MyTask" basedir="." </font>default="test"<font color="#9F9F9F">&gt;</font>
+<pre>
+<span style="color:gray">&lt;project name="MyTask" basedir="." </span>default="test"<span style="color:gray">&gt;</span>
 ...
     &lt;property name="ant.test.lib" value="ant-testutil.jar"/&gt;
     &lt;property name="report.dir"   value="report"/&gt;
@@ -639,10 +587,10 @@
         &lt;/delete&gt;
     &lt;/target&gt;
 
-    <font color="#9F9F9F">&lt;target name="compile" description="Compiles the Task"&gt;
+    <span style="color:gray">&lt;target name="compile" description="Compiles Vector the Task"&gt;
         &lt;mkdir dir="${classes.dir}"/&gt;
-        &lt;javac srcdir="${src.dir}" destdir="${classes.dir}" </font>classpath="${ant.test.lib}"<font color="#9F9F9F">/&gt;
-    &lt;/target&gt;</font>
+        &lt;javac srcdir="${src.dir}" destdir="${classes.dir}" </span>classpath="${ant.test.lib}"<span style="color:gray">/&gt;
+    &lt;/target&gt;</span>
 ...
     &lt;target name="junit" description="Runs the unit tests" depends="jar"&gt;
         &lt;delete dir="${junit.out.dir.xml}"/&gt;
@@ -668,17 +616,16 @@
 
     &lt;target name="test"
             depends="junit,junitreport"
-            description="Runs unit tests and creates a report"
-    /&gt;
+            description="Runs unit tests and creates a report"/&gt;
 ...
-</pre>
+<span style="color:gray">&lt;/project&gt;</span></pre>
 
-<p>Back to the <i>src/HelloWorldTest.java</i>. We create a class with a public
-<i>BuildFileRule</i> field annotated with JUnit's <i>@Rule</i> annotation. As per
-conventional JUnit4 tests, this class should have no constructors, or a default no-args
-constructor, setup methods should be annotated with <i>@Before</i>, tear down methods
-annotated with <i>@After</i> and any test method annotated with <i>@Test</i>.
-<pre class="code">
+<p>Back to the <samp>src/HelloWorldTest.java</samp>. We create a class with a
+public <code class="code">BuildFileRule</code> field annotated with JUnit's <code class="code">@Rule</code>
+annotation. As per conventional JUnit4 tests, this class should have no constructors, nor a default no-args constructor,
+setup methods should be annotated with <code class="code">@Before</code>, tear down methods annotated
+with <code class="code">@After</code> and any test method annotated with <code class="code">@Test</code>.
+<pre>
 import org.apache.tools.ant.BuildFileRule;
 import org.junit.Assert;
 import org.junit.Test;
@@ -736,11 +683,9 @@
         AntAssert.assertContains("Nested Element 1", buildRule.getLog());
         AntAssert.assertContains("Nested Element 2", buildRule.getLog());
     }
-}
-</pre>
+}</pre>
 
-<p>When starting <tt>ant</tt> we'll get a short message to STDOUT and
-a nice HTML-report.</p>
+<p>When starting <kbd>ant</kbd> we'll get a short message to STDOUT and a nice HTML report.</p>
 <pre class="output">
 C:\tmp\anttests\MyFirstTask&gt;ant
 Buildfile: build.xml
@@ -768,30 +713,29 @@
 
 BUILD SUCCESSFUL
 Total time: 7 seconds
-C:\tmp\anttests\MyFirstTask&gt;
-</pre>
+C:\tmp\anttests\MyFirstTask&gt;</pre>
 
+<h2 id="Debugging">Debugging</h2>
 
-<a name="Debugging"></a>
-<h2>Debugging</h2>
-
-<p>Try running Ant with the flag <code>-verbose</code>.  For more information, try flag <code>-debug</code>.</p>
-<p>For deeper issues, you may need to run the custom task code in a Java debugger.  First, get the source for Ant and build it with debugging information.</p>
-<p>Since Ant is a large project, it can be a little tricky to set the right breakpoints.  Here are two important breakpoints for version 1.8:</p>
+<p>Try running Ant with the flag <kbd>-verbose</kbd>.  For more information, try flag <kbd>-debug</kbd>.</p>
+<p>For deeper issues, you may need to run the custom task code in a Java debugger.  First, get the source for Ant and
+build it with debugging information.</p>
+<p>Since Ant is a large project, it can be a little tricky to set the right breakpoints.  Here are two important
+breakpoints for version 1.8:</p>
 <ul>
-  <li>Initial <code>main()</code> function: <code>com.apache.tools.ant.launch.Launcher.main()</code></li>
-  <li>Task entry point: <code>com.apache.tools.ant.UnknownElement.execute()</code></li>
+  <li>Initial <code class="code">main()</code>
+  function: <code class="code">com.apache.tools.ant.launch.Launcher.main()</code></li>
+  <li>Task entry point: <code class="code">com.apache.tools.ant.UnknownElement.execute()</code></li>
 </ul>
 
-<p>If you need to debug when a task attribute or the text is set, begin by debugging into method <code>execute()</code> of your custom task.  Then set breakpoints in other methods.  This will ensure the class byte-code has been loaded by the Java VM.</p>
-
-
-
-<a name="resources"></a>
-<h2>Resources</h2>
-<p>This tutorial and its resources are available via
-<a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=22570">BugZilla [6]</a>.
-The ZIP provided there contains</p><ul>
+<p>If you need to debug when a task attribute or the text is set, begin by debugging into
+method <code class="code">execute()</code> of your custom task.  Then set breakpoints in other methods.  This will
+ensure the class bytecode has been loaded by JVM.</p>
+
+<h2 id="resources">Resources</h2>
+<p>This tutorial and its resources are available via <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=22570"
+target="_top">BugZilla [5]</a>.  The ZIP provided there contains</p>
+<ul>
 <li>this initial version of this tutorial</li>
 <li>the buildfile (last version)</li>
 <li>the source of the task (last version)</li>
@@ -801,19 +745,19 @@
 <li>generated jar</li>
 <li>generated reports</li>
 </ul>
-<p>The last sources and the buildfile are also available
-<a href="tutorial-writing-tasks-src.zip">here [7]</a> inside the manual.
-</p>
-
-<p>Used Links:<br />
-&nbsp;&nbsp;[1] <a href="http://ant.apache.org/manual/properties.html#built-in-props">http://ant.apache.org/manual/properties.html#built-in-props</a><br />
-&nbsp;&nbsp;[2] <a href="http://ant.apache.org/manual/Tasks/taskdef.html">http://ant.apache.org/manual/Tasks/taskdef.html</a><br />
-&nbsp;&nbsp;[3] <a href="http://ant.apache.org/manual/develop.html#set-magic">http://ant.apache.org/manual/develop.html#set-magic</a><br />
-&nbsp;&nbsp;[4] <a href="http://ant.apache.org/manual/develop.html#nested-elements">http://ant.apache.org/manual/develop.html#nested-elements</a><br />
-&nbsp;&nbsp;[5] <a href="http://gump.covalent.net/jars/latest/ant/ant-testutil.jar">http://gump.covalent.net/jars/latest/ant/ant-testutil.jar</a><br />
-&nbsp;&nbsp;[6] <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=22570">http://issues.apache.org/bugzilla/show_bug.cgi?id=22570</a><br />
-&nbsp;&nbsp;[7] <a href="tutorial-writing-tasks-src.zip">tutorial-writing-tasks-src.zip</a><br />
-</p>
+<p>The last sources and the buildfile are also available <a href="tutorial-writing-tasks-src.zip">here [6]</a> inside
+the manual.</p>
+
+<p>Used Links:</p>
+<ol class="refs">
+<li><a href="properties.html#built-in-props">https://ant.apache.org/manual/properties.html#built-in-props</a></li>
+<li><a href="Tasks/taskdef.html">https://ant.apache.org/manual/Tasks/taskdef.html</a></li>
+<li><a href="develop.html#set-magic">https://ant.apache.org/manual/develop.html#set-magic</a></li>
+<li><a href="develop.html#nested-elements">https://ant.apache.org/manual/develop.html#nested-elements</a></li>
+<li><a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=22570"
+       target="_top">https://issues.apache.org/bugzilla/show_bug.cgi?id=22570</a></li>
+<li><a href="tutorial-writing-tasks-src.zip">tutorial-writing-tasks-src.zip</a></li>
+</ol>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Types/antlib.html ant-1.10.3/manual/Types/antlib.html
--- ant-1.9.10/manual/Types/antlib.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/antlib.html	2018-03-24 12:37:12.000000000 +0000
@@ -17,250 +17,201 @@
 <html>
 
   <head>
-    <meta http-equiv="Content-Language" content="en-us"></meta>
+    <meta http-equiv="Content-Language" content="en-us">
     <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
     <title>AntLib</title>
   </head>
 
   <body>
-    <h2><a name="antlib">Antlib</a></h2>
-
+    <h2 id="antlib">Antlib</h2>
 
     <h3>Description</h3>
     <p>
-      An antlib file is an xml file with a root element of "antlib".
-      Antlib's elements are Apache Ant definition tasks - like
-      <a href="../Tasks/taskdef.html">Taskdef</a>
-      or any Ant task that extends
-      <code>org.apache.tools.ant.taskdefs.AntlibDefinition</code>.
-    </p>
-    <p>
-        The current set of declarations bundled with Ant that do this are:
-    </p>
-        <ol>
-            <li><a href="../Tasks/typedef.html">Typedef</a>
-            </li>
-            <li><a href="../Tasks/taskdef.html">Taskdef</a>
-            </li>
-            <li><a href="../Tasks/macrodef.html">Macrodef</a>
-            </li>
-            <li><a href="../Tasks/presetdef.html">Presetdef</a>
-            </li>
-            <li><a href="../Tasks/scriptdef.html">Scriptdef</a>
-            </li>
-        </ol>
+      An antlib file is an xml file with a root element of <code>antlib</code>.  Antlib's elements
+      are Apache Ant definition tasks&mdash;like <a href="../Tasks/taskdef.html">Taskdef</a> or any
+      Ant task that
+      extends <code class="code">org.apache.tools.ant.taskdefs.AntlibDefinition</code>.
+    </p>
+    <p>
+      The current set of declarations bundled with Ant that do this are:
+    </p>
+    <ol>
+      <li><a href="../Tasks/typedef.html">Typedef</a></li>
+      <li><a href="../Tasks/taskdef.html">Taskdef</a></li>
+      <li><a href="../Tasks/macrodef.html">Macrodef</a></li>
+      <li><a href="../Tasks/presetdef.html">Presetdef</a></li>
+      <li><a href="../Tasks/scriptdef.html">Scriptdef</a></li>
+    </ol>
     <p>
-      A group of tasks and types may be defined together in an antlib
-      file. For example the file <i>sample.xml</i> contains the following:
+      A group of tasks and types may be defined together in an antlib file. For example the
+      file <samp>sample.xml</samp> contains the following:
     </p>
-    <blockquote>
-      <pre>
+    <pre>
 &lt;?xml version="1.0"?&gt;
 &lt;antlib&gt;
-   &lt;typedef name="if" classname="org.acme.ant.If"/&gt;
-   &lt;typedef name="scriptpathmapper"
-            classname="org.acme.ant.ScriptPathMapper"
-            onerror="ignore"/&gt;
-   &lt;macrodef name="print"&gt;
-      &lt;attribute name="file"/&gt;
-      &lt;sequential&gt;
-         &lt;concat taskname="print"&gt;
-            &lt;fileset dir="." includes="@{file}"/&gt;
-         &lt;/concat&gt;
-      &lt;/sequential&gt;
-   &lt;/macrodef&gt;
-&lt;/antlib&gt;
-      </pre>
-    </blockquote>
-    <p>
-      It defines two types or tasks, <i>if</i> and <i>scriptpathmapper</i>.
-      This antlib file may be used in a build script as follows:
-    </p>
-    <blockquote>
-      <pre>
-&lt;typedef file="sample.xml"/&gt;
-      </pre>
-    </blockquote>
-    <p>
-      The other attributes of <code>&lt;typedef&gt;</code> may be used as well.
-      For example, assuming that the <i>sample.xml</i> is in a jar
-      file <i>sample.jar</i> also containing the classes, the
-      following build fragment will define the <i>if</i> and <i>scriptpathmapper</i>
-      tasks/types and place them in the namespace uri <i>samples:/acme.org</i>.
+    &lt;typedef name="if" classname="org.acme.ant.If"/&gt;
+    &lt;typedef name="scriptpathmapper"
+             classname="org.acme.ant.ScriptPathMapper"
+             onerror="ignore"/&gt;
+    &lt;macrodef name="print"&gt;
+        &lt;attribute name="file"/&gt;
+        &lt;sequential&gt;
+            &lt;concat taskname="print"&gt;
+                &lt;fileset dir="." includes="@{file}"/&gt;
+            &lt;/concat&gt;
+        &lt;/sequential&gt;
+    &lt;/macrodef&gt;
+&lt;/antlib&gt;</pre>
+    <p>
+      It defines two types or tasks, <code>if</code> and <code>scriptpathmapper</code>.  This
+      antlib file may be used in a build script as follows:
+    </p>
+    <pre>&lt;typedef file="sample.xml"/&gt;</pre>
+    <p>
+      The other attributes of <code>&lt;typedef&gt;</code> may be used as well.  For example,
+      assuming that the <samp>sample.xml</samp> is in a jar file <samp>sample.jar</samp> also
+      containing the classes, the following build fragment will define the <code>if</code>
+      and <code>scriptpathmapper</code> tasks/types and place them in the namespace
+      uri <code>samples:/acme.org</code>.
     </p>
-    <blockquote>
-      <pre>
+    <pre>
 &lt;typedef resource="org/acme/ant/sample.xml"
-         uri="samples:/acme.org"/&gt;
-      </pre>
-    </blockquote>
+         uri="samples:/acme.org"/&gt;</pre>
     <p>
       The definitions may then be used as follows:
     </p>
-    <blockquote>
-      <pre>
+    <pre>
 &lt;sample:if valuetrue="${props}" xmlns:sample="samples:/acme.org"&gt;
-   &lt;sample:scriptpathmapper language="beanshell"&gt;
-      some bean shell
-   &lt;/sample:scriptpathmapper&gt;
-&lt;/sample:if&gt;
-      </pre>
-    </blockquote>
-
+    &lt;sample:scriptpathmapper language="beanshell"&gt;
+        some bean shell
+    &lt;/sample:scriptpathmapper&gt;
+&lt;/sample:if&gt;</pre>
 
-    <h3><a name="antlibnamespace">Antlib namespace</a></h3>
+    <h3 id="antlibnamespace">Antlib namespace</h3>
     <p>
-      The name space URIs with the pattern <b>antlib:<i>java package</i></b>
-      are given special treatment.
+      The name space URIs with the pattern <code>antlib:<i>java.package</i></code> are given
+      special treatment.
     </p>
     <p>
-      When Ant encounters a element with a namespace URI with this pattern, it
-      will check to see if there is a resource of the name <i>antlib.xml</i> in
-      the package directory in the default classpath.
+      When Ant encounters a element with a namespace URI with this pattern, it will check to see
+      if there is a resource of the name <samp>antlib.xml</samp> in the package directory in the
+      default classpath.
     </p>
     <p>
-      For example, assuming that the file <i>antcontrib.jar</i> has been placed
-      in the directory <i>${ant.home}/lib</i> and it contains the resource
-      <i>net/sf/antcontrib/antlib.xml</i> which has all antcontrib's definitions
-      defined, the following build file will automatically load the antcontrib
-      definitions at location <i>HERE</i>:
+      For example, assuming that the file <samp>antcontrib.jar</samp> has been placed in the
+      directory <samp>${ant.home}/lib</samp> and it contains the
+      resource <samp>net/sf/antcontrib/antlib.xml</samp> which has all antcontrib's definitions
+      defined, the following build file will automatically load the antcontrib definitions at
+      location <code>HERE</code>:
     </p>
-    <blockquote>
-      <pre>
+    <pre>
 &lt;project default="deletetest" xmlns:antcontrib="antlib:net.sf.antcontrib"&gt;
-   &lt;macrodef name="showdir"&gt;
-      &lt;attribute name="dir"/&gt;
-      &lt;sequential&gt;
-         &lt;antcontrib:shellscript shell="bash"&gt;  &lt;!-- HERE --&gt;
-            ls -Rl @{dir}
-         &lt;/antcontrib:shellscript&gt;
-      &lt;/sequential&gt;
-   &lt;/macrodef&gt;
-
-   &lt;target name="deletetest"&gt;
-      &lt;delete dir="a" quiet="yes"/&gt;
-      &lt;mkdir dir="a/b"/&gt;
-      &lt;touch file="a/a.txt"/&gt;
-      &lt;touch file="a/b/b.txt"/&gt;
-      &lt;delete&gt;
-         &lt;fileset dir="a"/&gt;
-      &lt;/delete&gt;
-      &lt;showdir dir="a"/&gt;
-   &lt;/target&gt;
-&lt;/project&gt;
-      </pre>
-    </blockquote>
-    <p>
-      The requirement that the resource is in the default classpath
-      may be removed in future versions of Ant.</p>
-    </p>
-
-
-	<h3><a name="loadFromInside">Load antlib from inside of the buildfile</a></h3>
-	<p>
-	  If you want to separate the antlib from your local Ant installation, e.g. because you 
-	  want to hold that jar in your projects SCM system, you have to specify a classpath, so 
-	  that Ant could find that jar. The best solution is loading the antlib with <tt>&lt;taskdef&gt;</tt>.
-	</p>
-    <blockquote>
-      <pre>
-&lt;project xmlns:<font color="green">antcontrib</font>="<font color="red">antlib:net.sf.antcontrib</font>"&gt;
-   &lt;taskdef uri="<font color="red">antlib:net.sf.antcontrib</font>"
-            resource="net/sf/antcontrib/antlib.xml"
-            classpath="path/to/ant-contrib.jar"/&gt;
-   
-   &lt;target name="iterate"&gt;
-      &lt;<font color="green">antcontrib</font>:for param="file"&gt;
-         &lt;fileset dir="."/&gt;
-         &lt;sequential&gt;
-            &lt;echo message="- @{file}"/&gt;
-         &lt;/sequential&gt;
-      &lt;/antcontrib:for&gt;
-   &lt;/target&gt;
-&lt;/project&gt;
-      </pre>
-    </blockquote>
-
-	
-	
-
-    <h3><a name="currentnamespace">Current namespace</a></h3>
-    <p>
-      Definitions defined in antlibs may be used in antlibs. However
-      the namespace that definitions are placed in are dependent on
-      the <code>&lt;typedef&gt;</code> that uses the antlib. To deal with this
-      problem, the definitions are placed in the namespace URI <i>ant:current</i>
-      for the duration of the antlib execution.
-      For example the following antlib defines the task <code>&lt;if&gt;</code>, the
-      type <code>&lt;isallowed&gt;</code> and a macro
-      <code>&lt;ifallowed&gt;</code> that makes use of the task and type:
+    &lt;macrodef name="showdir"&gt;
+        &lt;attribute name="dir"/&gt;
+        &lt;sequential&gt;
+            &lt;antcontrib:shellscript shell="bash"&gt;  &lt;!-- HERE --&gt;
+                ls -Rl @{dir}
+            &lt;/antcontrib:shellscript&gt;
+        &lt;/sequential&gt;
+    &lt;/macrodef&gt;
+
+    &lt;target name="deletetest"&gt;
+        &lt;delete dir="a" quiet="yes"/&gt;
+        &lt;mkdir dir="a/b"/&gt;
+        &lt;touch file="a/a.txt"/&gt;
+        &lt;touch file="a/b/b.txt"/&gt;
+        &lt;delete&gt;
+            &lt;fileset dir="a"/&gt;
+        &lt;/delete&gt;
+        &lt;showdir dir="a"/&gt;
+    &lt;/target&gt;
+&lt;/project&gt;</pre>
+    <p>
+      The requirement that the resource is in the default classpath may be removed in future
+      versions of Ant.
+    </p>
+    <h3 id="loadFromInside">Load antlib from inside of the buildfile</h3>
+    <p>
+      If you want to separate the antlib from your local Ant installation, e.g. because you want
+      to hold that jar in your project's SCM system, you have to specify a classpath, so that
+      Ant could find that jar. The best solution is loading the antlib
+      with <code>&lt;taskdef&gt;</code>.
+    </p>
+    <pre>
+&lt;project xmlns:<span style="color:green">antcontrib</span>="<span style="color:red">antlib:net.sf.antcontrib</span>"&gt;
+    &lt;taskdef uri="<span style="color:red">antlib:net.sf.antcontrib</span>"
+             resource="net/sf/antcontrib/antlib.xml"
+             classpath="path/to/ant-contrib.jar"/&gt;
+
+    &lt;target name="iterate"&gt;
+        &lt;<span style="color:green">antcontrib</span>:for param="file"&gt;
+            &lt;fileset dir="."/&gt;
+            &lt;sequential&gt;
+                &lt;echo message="- @{file}"/&gt;
+            &lt;/sequential&gt;
+        &lt;/antcontrib:for&gt;
+    &lt;/target&gt;
+&lt;/project&gt;</pre>
+    <h3 id="currentnamespace">Current namespace</h3>
+    <p>
+      Definitions defined in antlibs may be used in antlibs. However, the namespace that
+      definitions are placed in are dependent on the <code>&lt;typedef&gt;</code> that uses the
+      antlib. To deal with this problem, the definitions are placed in the namespace
+      URI <code>ant:current</code> for the duration of the antlib execution.  For example, the
+      following antlib defines the task <code>&lt;if&gt;</code>, the
+      type <code>&lt;isallowed&gt;</code> and a macro <code>&lt;ifallowed&gt;</code> that makes
+      use of the task and type:
     </p>
-    <blockquote>
-      <pre>
+    <pre>
 &lt;antlib xmlns:current="ant:current"&gt;
-   &lt;taskdef name="if" classname="org.acme.ant.If"/&gt;
-   &lt;typedef name="isallowed" classname="org.acme.ant.Isallowed"/&gt;
-   &lt;macrodef name="ifallowed"&gt;
-      &lt;attribute name="action"/&gt;
-      &lt;element name="do"/&gt;
-      &lt;sequential&gt;
-         &lt;current:if&gt;
-            &lt;current:isallowed test="@{action}"/&gt;
-            &lt;current:then&gt;
-               &lt;do/&gt;
-            &lt;/current:then&gt;
-         &lt;/current:if&gt;
-      &lt;/sequential&gt;
-   &lt;/macrodef&gt;
-&lt;/antlib&gt;
-      </pre>
-    </blockquote>
-
-
+    &lt;taskdef name="if" classname="org.acme.ant.If"/&gt;
+    &lt;typedef name="isallowed" classname="org.acme.ant.Isallowed"/&gt;
+    &lt;macrodef name="ifallowed"&gt;
+        &lt;attribute name="action"/&gt;
+        &lt;element name="do"/&gt;
+        &lt;sequential&gt;
+            &lt;current:if&gt;
+                &lt;current:isallowed test="@{action}"/&gt;
+                &lt;current:then&gt;
+                    &lt;do/&gt;
+                &lt;/current:then&gt;
+            &lt;/current:if&gt;
+        &lt;/sequential&gt;
+    &lt;/macrodef&gt;
+&lt;/antlib&gt;</pre>
     <h3>Other examples and comments</h3>
     <p>
       Antlibs may make use of other antlibs.
     </p>
     <p>
-      As the names defined in the antlib are in the namespace uri as
-      specified by the calling <code>&lt;typedef&gt;</code> or by automatic element
-      resolution, one may reuse names from core ant types and tasks,
-      provided the caller uses a namespace uri. For example, the
-      following antlib may be used to define defaults for various
-      tasks:
+      As the names defined in the antlib are in the namespace URI as specified by the
+      calling <code>&lt;typedef&gt;</code> or by automatic element resolution, one may reuse
+      names from core Ant types and tasks, provided the caller uses a namespace URI. For
+      example, the following antlib may be used to define defaults for various tasks:
     </p>
-    <blockquote>
-      <pre>
+    <pre>
 &lt;antlib xmlns:antcontrib="antlib:net.sf.antcontrib"&gt;
-   &lt;presetdef name="javac"&gt;
-      &lt;javac deprecation="${deprecation}"
-             debug="${debug}"/&gt;
-   &lt;/presetdef&gt;
-   &lt;presetdef name="delete"&gt;
-      &lt;delete quiet="yes"/&gt;
-   &lt;/presetdef&gt;
-   &lt;presetdef name="shellscript"&gt;
-      &lt;antcontrib:shellscript shell="bash"/&gt;
-   &lt;/presetdef&gt;
-&lt;/antlib&gt;
-      </pre>
-    </blockquote>
+    &lt;presetdef name="javac"&gt;
+        &lt;javac deprecation="${deprecation}"
+               debug="${debug}"/&gt;
+    &lt;/presetdef&gt;
+    &lt;presetdef name="delete"&gt;
+        &lt;delete quiet="yes"/&gt;
+    &lt;/presetdef&gt;
+    &lt;presetdef name="shellscript"&gt;
+        &lt;antcontrib:shellscript shell="bash"/&gt;
+    &lt;/presetdef&gt;
+&lt;/antlib&gt;</pre>
     <p>
       This may be used as follows:
     </p>
-    <blockquote>
-      <pre>
+    <pre>
 &lt;project xmlns:local="localpresets"&gt;
-   &lt;typedef file="localpresets.xml" uri="localpresets"/&gt;
-   &lt;local:shellscript&gt;
-      echo "hello world"
-   &lt;/local:shellscript&gt;
-&lt;/project&gt;
-      </pre>
-    </blockquote>
-    
-
+    &lt;typedef file="localpresets.xml" uri="localpresets"/&gt;
+    &lt;local:shellscript&gt;
+        echo "hello world"
+    &lt;/local:shellscript&gt;
+&lt;/project&gt;</pre>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Types/assertions.html ant-1.10.3/manual/Types/assertions.html
--- ant-1.9.10/manual/Types/assertions.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/assertions.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,185 +24,165 @@
 
 <body>
 
-<h2><a name="assertions">Assertions</a></h2>
+<h2 id="assertions">Assertions</h2>
 <p>
-The <tt>assertions</tt> type enables or disables the Java 1.4 assertions feature,
-on a whole Java program, or components of a program. It can be used
-in <a href="../Tasks/java.html"><code>&lt;java&gt;</code></a> and
-<a href="../Tasks/junit.html"><code>&lt;junit&gt;</code></a> to add extra validation to code.  
-
-<p>
-Assertions are covered in the 
-<a href="http://docs.oracle.com/javase/7/docs/technotes/guides/language/assert.html">Java SE documentation</a>,
-and the
-<a href="http://docs.oracle.com/javase/specs/jls/se7/html/jls-14.html#jls-14.10">Java Language Specification</a>.
-
-<p>
-The key points to note are that a <tt>java.lang.AssertionError</tt>
-is thrown when an assertion fails, and that the facility is only available 
-on Java 1.4 and later. To enable assertions one must set <tt>source="1.4"</tt>
-(or later) in <tt>&lt;javac&gt;</tt> when the source is being compiled, and
-that the code must contain <tt>assert</tt> statements to be tested. The
-result of such an action is code that neither compiles or runs on earlier
-versions of Java. For this reason Apache Ant itself currently contains no assertions.
-<p>
-
-When assertions are enabled (or disabled) in a task through nested 
-assertions elements, the class loader or command line is modified with the 
-appropriate options. This means that the JVM executed must be a Java 1.4
-or later JVM, even if there are no assertions in the code. Attempting to
-enable assertions on earlier VMs will result in an "Unrecognized option" 
-error and the JVM will not start.  
+The <code>assertions</code> type enables or disables the Java 1.4 assertions feature, on a whole
+Java program, or components of a program. It can be used
+in <a href="../Tasks/java.html"><code>&lt;java&gt;</code></a>
+and <a href="../Tasks/junit.html"><code>&lt;junit&gt;</code></a> to add extra validation to code.
 
 <p>
-<h4>Attributes</h4>
-<p>
+Assertions are covered in
+the <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/language/assert.html"
+target="_top">Java SE documentation</a>, and
+the <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-14.html#jls-14.10"
+target="_top">Java Language Specification</a>.
 
+<p>
+The key points to note are that a <code>java.lang.AssertionError</code> is thrown when an assertion
+fails, and that the facility is only available on Java 1.4 and later. To enable assertions one must
+set <var>source</var>=<q>1.4</q> (or later) in <code>&lt;javac&gt;</code> when the source is being
+compiled, and that the code must contain <code>assert</code> statements to be tested. The result of
+such an action is code that neither compiles or runs on earlier versions of Java. For this reason
+Apache Ant itself currently contains no assertions.
+<p>
 
+<p>
+When assertions are enabled (or disabled) in a task through nested assertions elements, the class
+loader or command line is modified with the appropriate options. This means that the JVM executed
+must be of version 1.4 or later, even if there are no assertions in the code. Attempting to enable
+assertions on earlier JVMs will result in an "Unrecognized option" error and the JVM will not start.
 </p>
-<table border="1" cellpadding="2" cellspacing="0">
+
+<h4>Attributes</h4>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">enableSystemAssertions</td>
-    <td valign="top">Flag to turn system assertions on or off.</td>
-    <td valign="top" align="center">No; default is "unspecified"</td>
+    <td>enableSystemAssertions</td>
+    <td>Flag to turn system assertions on or off.</td>
+    <td>No; default is <q>unspecified</q></td>
   </tr>
 </table>
 <p>
-When system assertions have been neither enabled nor disabled, then
-the JVM is not given any assertion information - the default action of the
- current JVMs is to disable system assertions. 
+When system assertions have been neither enabled nor disabled, then the JVM is not given any
+assertion information&mdash;the default action of the current JVMs is to disable system assertions.
+</p>
 <p>
-Note also that there is no apparent documentation for what parts of the
-JRE come with useful assertions.
+Note also that there is no apparent documentation for what parts of the JRE come with useful
+assertions.
+</p>
 
 <h3>Nested elements</h3>
 
 <h4>enable</h4>
 <p>
-Enable assertions in portions of code.
-If neither a package nor class is specified, assertions are turned on in <i>all</i> (user) code.
+Enable assertions in portions of code.  If neither a package nor class is specified, assertions are
+turned on in <em>all</em> (user) code.
 </p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">class</td>
-    <td valign="top">The name of a class on which to enable assertions.</td>
-    <td valign="top" align="center">No</td>
+    <td>class</td>
+    <td>The name of a class on which to enable assertions.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">package</td>
-    <td valign="top">
-    The name of a package in which to enable assertions on all classes. (Includes subpackages.)
-    Use "<tt>...</tt>" for the anonymous package.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>package</td>
+    <td>The name of a package in which to enable assertions on all classes. (Includes subpackages.)
+      Use <q>...</q> for the anonymous package.</td>
+    <td>No</td>
   </tr>
 </table>
 
 <h4>disable</h4>
 <p>
 Disable assertions in portions of code.
-
 </p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">class</td>
-    <td valign="top">The name of a class on which to disable assertions.</td>
-    <td valign="top" align="center">No</td>
+    <td>class</td>
+    <td>The name of a class on which to disable assertions.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">package</td>
-    <td valign="top">
-    The name of a package in which to disable assertions on all classes. (Includes subpackages.)
-    Use "<tt>...</tt>" for the anonymous package.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>package</td>
+    <td>The name of a package in which to disable assertions on all classes. (Includes subpackages.)
+      Use <q>...</q> for the anonymous package.</td>
+    <td>No</td>
   </tr>
 </table>
 <p>
-
-Because assertions are disabled by default, it only makes sense to disable
-assertions where they have been enabled in a parent package.
-
-
+Because assertions are disabled by default, it only makes sense to disable assertions where they
+have been enabled in a parent package.
+</p>
 <h4>Examples</h4>
 
 <h5>Example: enable assertions in all user classes</h5>
 
-All classes not in the JRE (i.e. all non-system classes) will have assertions turned on.
+<p>All classes not in the JRE (i.e. all non-system classes) will have assertions turned on.</p>
 <pre>
 &lt;assertions&gt;
   &lt;enable/&gt;
-&lt;/assertions&gt;
-</pre>
+&lt;/assertions&gt;</pre>
 
 <h5>Example: enable a single class</h5>
 
-Enable assertions in a class called Test
+<p>Enable assertions in a class called Test</p>
 <pre>
 &lt;assertions&gt;
   &lt;enable class="Test"/&gt;
-&lt;/assertions&gt;
-</pre>
+&lt;/assertions&gt;</pre>
 
 <h5>Example: enable a package</h5>
 
-Enable assertions in the <tt>org.apache</tt> package
-and all packages starting with the <tt>org.apache.</tt> prefix
+<p>Enable assertions in the <code>org.apache</code> package and all packages starting with
+the <code>org.apache.</code> prefix</p>
 <pre>
 &lt;assertions&gt;
   &lt;enable package="org.apache"/&gt;
-&lt;/assertions&gt;
-</pre>
+&lt;/assertions&gt;</pre>
 
 <h5>Example: System assertions</h5>
 
-Example: enable system assertions and assertions in all <tt>org.apache</tt> packages except
-for Ant (but including <tt>org.apache.tools.ant.Main</tt>)
+<p>Enable system assertions and assertions in all <code>org.apache</code> packages except for Ant
+(but including <code>org.apache.tools.ant.Main</code>)</p>
 <pre>
 &lt;assertions enableSystemAssertions="true"&gt;
   &lt;enable package="org.apache"/&gt;
   &lt;disable package="org.apache.tools.ant"/&gt;
   &lt;enable class="org.apache.tools.ant.Main"/&gt;
-&lt;/assertions&gt;
-</pre>
+&lt;/assertions&gt;</pre>
 
 <h5>Example: disabled and anonymous package assertions</h5>
 
-Disable system assertions; enable those in the anonymous package
+<p>Disable system assertions; enable those in the anonymous package</p>
 <pre>
 &lt;assertions enableSystemAssertions="false"&gt;
   &lt;enable package="..."/&gt;
-&lt;/assertions&gt;
-</pre>
-
+&lt;/assertions&gt;</pre>
 
 <h5>Example: referenced assertions</h5>
 
-This type is a datatype, so you can declare assertions and use them later
-
+<p>This type is a datatype, so you can declare assertions and use them later</p>
 <pre>
 &lt;assertions id="project.assertions"&gt;
   &lt;enable package="org.apache.test"/&gt;
 &lt;/assertions&gt;
 
-&lt;assertions refid="project.assertions"/&gt;
-</pre>
-
+&lt;assertions refid="project.assertions"/&gt;</pre>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Types/classfileset.html ant-1.10.3/manual/Types/classfileset.html
--- ant-1.9.10/manual/Types/classfileset.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/classfileset.html	2018-03-24 12:37:12.000000000 +0000
@@ -22,98 +22,92 @@
 </head>
 
 <body>
-<h2><a name="fileset">ClassFileSet</a></h2>
-<p>A classfileset is a specialized type of fileset which, given a set of 
-&quot;root&quot; classes, will include all of the class files upon which the 
-root classes depend. This is typically used to create a jar with all of the
-required classes for a particular application.
+<h2 id="fileset">ClassFileSet</h2>
+<p>A classfileset is a specialized type of fileset which, given a set of &quot;root&quot;
+classes, will include all of the class files upon which the root classes depend. This is
+typically used to create a jar with all of the required classes for a particular application.
 </p>
 <p>
-classfilesets are typically used by reference. They are declared with an
-&quot;id&quot; value and this is then used as a reference where a normal fileset
-is expected.
+classfilesets are typically used by reference. They are declared with an <var>id</var> value and
+this is then used as a reference where a normal fileset is expected.
 </p>
 <p>
-This type requires the <code>BCEL</code> <a href="../install.html#librarydependencies">library</a>.
+This type requires
+the <code>BCEL</code> <a href="../install.html#librarydependencies">library</a>.
 </p>
 
-
 <h3>Attributes</h3>
-<p>The class fileset support the following attributes in addition
-to those supported by the 
-<a href="../Types/fileset.html">standard fileset</a>:
+<p>
+The class fileset support the following attributes in addition to those supported by
+the <a href="fileset.html">standard fileset</a>:
 </p>
- 
-<table border="1" cellpadding="2" cellspacing="0">
+
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">rootclass</td>
-    <td valign="top">A single root class name</td>
-    <td valign="top" align="center">No</td>
+    <td>rootclass</td>
+    <td>A single root class name</td>
+    <td>No</td>
   </tr>
 </table>
 
-<h3>Nested Elements</h3>
+<h3>Nested elements</h3>
 
 <h4>Root</h4>
 <p>
 When more than one root class is required, multiple nested <code>&lt;root&gt;</code> elements
 may be used
 </p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">classname</td>
-    <td valign="top">The fully qualified name of the root class</td>
-    <td align="center" valign="top">Yes</td>
+    <td>classname</td>
+    <td>The fully qualified name of the root class</td>
+    <td>Yes</td>
   </tr>
 </table>
 
 <h4>RootFileSet</h4>
 <p>
-A root fileset is used to add a set of root classes from a fileset. In this case the entries in 
-the fileset are expected to be Java class files. The name of the Java class is determined by the 
-relative location of the classfile in the fileset. So, the file 
-<code>org/apache/tools/ant/Project.class</code> corresponds to the Java class
-<code>org.apache.tools.ant.Project</code>.</p>
+A root fileset is used to add a set of root classes from a fileset. In this case the entries in the
+fileset are expected to be Java class files. The name of the Java class is determined by the
+relative location of the classfile in the fileset. So, the
+file <code>org/apache/tools/ant/Project.class</code> corresponds to the Java
+class <code class="code">org.apache.tools.ant.Project</code>.</p>
 
 <h4>Examples</h4>
-<blockquote><pre>
+<pre>
 &lt;classfileset id=&quot;reqdClasses" dir=&quot;${classes.dir}&quot;&gt;
   &lt;root classname=&quot;org.apache.tools.ant.Project&quot;/&gt;
-&lt;/classfileset&gt;
-</pre></blockquote>
-
-<p>This example creates a fileset containing all the class files upon which the 
-<code>org.apache.tools.ant.Project</code> class depends. This fileset could 
-then be used to create a jar. 
+&lt;/classfileset&gt;</pre>
+<p>
+This example creates a fileset containing all the class files upon which
+the <code class="code">org.apache.tools.ant.Project</code> class depends. This fileset could then be
+used to create a jar.
 </p>
 
-<blockquote><pre>
+<pre>
 &lt;jar destfile=&quot;minimal.jar&quot;&gt;
   &lt;fileset refid=&quot;reqdClasses&quot;/&gt;
-&lt;/jar&gt;
-</pre></blockquote>
+&lt;/jar&gt;</pre>
 
-<blockquote><pre>
+<pre>
 &lt;classfileset id=&quot;reqdClasses&quot; dir=&quot;${classes.dir}&quot;&gt;
   &lt;rootfileset dir=&quot;${classes.dir}&quot; includes=&quot;org/apache/tools/ant/Project*.class&quot;/&gt;
-&lt;/classfileset&gt;
-</pre></blockquote>
-
-<p>This example constructs the classfileset using all the class with names starting with Project 
-in the org.apache.tools.ant package</p> 
-
-
+&lt;/classfileset&gt;</pre>
+<p>
+This example constructs the classfileset using all the class with names starting
+with <code class="code">Project</code> in the <code class="code">org.apache.tools.ant</code>
+package.
+</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Types/custom-programming.html ant-1.10.3/manual/Types/custom-programming.html
--- ant-1.9.10/manual/Types/custom-programming.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/custom-programming.html	2018-03-24 12:37:12.000000000 +0000
@@ -16,56 +16,51 @@
 -->
 <html>
   <head>
-    <meta http-equiv="Content-Language" content="en-us"></meta>
-<link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
-<title>Custom Components</title>
+    <meta http-equiv="Content-Language" content="en-us">
+    <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
+    <title>Custom Components</title>
   </head>
   <body>
     <h2>Custom Components</h2>
     <h3>Overview</h3>
     <p>
-      Custom components are conditions, selectors, filters and other
-      objects that are defined outside Apache Ant core.
+      Custom components are conditions, selectors, filters and other objects that are defined
+      outside Apache Ant core.
     </p>
     <p>
-      In Ant 1.6 custom conditions, selectors and filters has
-      been overhauled.
+      In Ant 1.6 custom conditions, selectors and filters has been overhauled.
     </p>
     <p>
-      It is now possible to define custom conditions, selectors and filters
-      that behave like Ant Core components.
-      This is achieved by allowing datatypes defined in build scripts
-      to be used as custom components if the class of the datatype
-      is compatible, or has been adapted by an adapter class.
+      It is now possible to define custom conditions, selectors and filters that behave like Ant
+      Core components.  This is achieved by allowing datatypes defined in build scripts to be used
+      as custom components if the class of the datatype is compatible, or has been adapted by an
+      adapter class.
     </p>
     <p>
       The old methods of defining custom components are still supported.
     </p>
-    <h3>Definition and use</h3>
+    <h3>Definition and Use</h3>
     <p>
-      A custom component is a normal Java class that implements a particular
-      interface or extends a  particular class, or has been adapted to the
-      interface or class.
+      A custom component is a normal Java class that implements a particular interface or extends a
+      particular class, or has been adapted to the interface or class.
     </p>
     <p>
-      It is exactly like writing a
-      <a href="../develop.html#writingowntask">custom task</a>.
-      One defines attributes and nested elements by writing <i>setter</i>
-      methods and <i>add</i> methods.
+      It is exactly like writing a <a href="../develop.html#writingowntask">custom task</a>.  One
+      defines attributes and nested elements by writing <em>setter</em> methods and <em>add</em>
+      methods.
     </p>
     <p>
-      After the class has been written, it is added to the ant system
-      by using <code>&lt;typedef&gt;</code>.
+      After the class has been written, it is added to the ant system by
+      using <code>&lt;typedef&gt;</code>.
     </p>
-    <h3><a name="customconditions">Custom Conditions</a></h3>
+    <h3 id="customconditions">Custom Conditions</h3>
     <p>
-      Custom conditions are datatypes that implement
-      <code>org.apache.tools.ant.taskdefs.condition.Condition</code>.
-      For example a custom condition that returns true if a
-      string is all upper case could be written as:
+      Custom conditions are datatypes that
+      implement <code class="code">org.apache.tools.ant.taskdefs.condition.Condition</code>.  For
+      example a custom condition that returns true if a string is all upper case could be written
+      as:
     </p>
-    <blockquote>
-      <pre>
+    <pre>
 package com.mydomain;
 
 import org.apache.tools.ant.BuildException;
@@ -85,120 +80,90 @@
             throw new BuildException("value attribute is not set");
         }
         return value.toUpperCase().equals(value);
-   }
-}
-      </pre>
-    </blockquote>
-
+    }
+}</pre>
     <p>
-        Adding the condition to the system is achieved as follows:
+      Adding the condition to the system is achieved as follows:
     </p>
-    <blockquote>
-      <pre>
+    <pre>
 &lt;typedef
     name="alluppercase"
     classname="com.mydomain.AllUpperCaseCondition"
-    classpath="${mydomain.classes}"/&gt;
-      </pre>
-    </blockquote>
+    classpath="${mydomain.classes}"/&gt;</pre>
     <p>
-      This condition can now be used wherever a Core Ant condition
-      is used.
+      This condition can now be used wherever a Core Ant condition is used.
     </p>
-    <blockquote>
-      <pre>
+    <pre>
 &lt;condition property="allupper"&gt;
-   &lt;alluppercase value="THIS IS ALL UPPER CASE"/&gt;
-&lt;/condition&gt;
-      </pre>
-    </blockquote>
-    <h3><a name="customselectors">Custom Selectors</a></h3>
-    <p>
-      Custom selectors are datatypes that implement
-      <code>org.apache.tools.ant.types.selectors.FileSelector</code>.
-    </p>
-    <p>There is only one method required.
-      <code>public boolean isSelected(File basedir, String filename,
-        File file)</code>.
-      It returns true
-      or false depending on whether the given file should be
-      selected or not.
+    &lt;alluppercase value="THIS IS ALL UPPER CASE"/&gt;
+&lt;/condition&gt;</pre>
+    <h3 id="customselectors">Custom Selectors</h3>
+    <p>
+      Custom selectors are datatypes that
+      implement <code class="code">org.apache.tools.ant.types.selectors.FileSelector</code>.
+    </p>
+    <p>
+      There is only one method required, <code class="code">public boolean isSelected(File basedir,
+      String filename, File file)</code>.  It returns true or false depending on whether the given
+      file should be selected or not.
     </p>
     <p>
       An example of a custom selection that selects filenames ending
-      in ".java" would be:
+      in <samp>.java</samp> would be:
     </p>
-    <blockquote>
-      <pre>
+    <pre>
 package com.mydomain;
 import java.io.File;
 import org.apache.tools.ant.types.selectors.FileSelector;
 public class JavaSelector implements FileSelector {
     public boolean isSelected(File b, String filename, File f) {
-       return filename.toLowerCase().endsWith(".java");
+        return filename.toLowerCase().endsWith(".java");
     }
-}
-      </pre>
-    </blockquote>
+}</pre>
     <p>
       Adding the selector to the system is achieved as follows:
     </p>
-    <blockquote>
-      <pre>
+    <pre>
 &lt;typedef
     name="javaselector"
     classname="com.mydomain.JavaSelector"
-    classpath="${mydomain.classes}"/&gt;
-      </pre>
-    </blockquote>
-        <p>
-      This selector can now be used wherever a Core Ant selector
-      is used, for example:
+    classpath="${mydomain.classes}"/&gt;</pre>
+    <p>
+      This selector can now be used wherever a Core Ant selector is used, for example:
     </p>
-    <blockquote>
-      <pre>
+    <pre>
 &lt;copy todir="to"&gt;
-   &lt;fileset dir="src"&gt;
-      &lt;javaselector/&gt;
-   &lt;/fileset&gt;
-&lt;/copy&gt;
-      </pre>
-    </blockquote>
-
-      <p>
-        One may use
-        <code>org.apache.tools.ant.types.selectors.BaseSelector</code>,
-        a convenience class that provides reasonable default
-        behaviour.
-        It has some predefined behaviours you can take advantage
-        of. Any time you encounter a problem when setting attributes or
-        adding tags, you can call setError(String errmsg) and the class
-        will know that there is a problem. Then, at the top of your
-        <code>isSelected()</code> method call <code>validate()</code> and
-        a BuildException will be thrown with the contents of your error
-        message. The <code>validate()</code> method also gives you a
-        last chance to check your settings for consistency because it
-        calls <code>verifySettings()</code>. Override this method and
-        call <code>setError()</code> within it if you detect any
-        problems in how your selector is set up.
-    </p>
-    <p>
-      To write custom selector containers one should extend
-      <code>org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>.
-      Implement the
-      <code>public boolean isSelected(File baseDir, String filename, File file)</code>
-      method to do the right thing. Chances are you'll want to iterate
-      over the selectors under you, so use
-      <code>selectorElements()</code> to get an iterator that will do
-      that.
-    </p>
-    <p>
-      For example to create a selector container that will select files
-      if a certain number of contained selectors select, one could write
-      a selector as follows:
+    &lt;fileset dir="src"&gt;
+        &lt;javaselector/&gt;
+    &lt;/fileset&gt;
+&lt;/copy&gt;</pre>
+    <p>
+      One may use <code class="code">org.apache.tools.ant.types.selectors.BaseSelector</code>, a
+      convenience class that provides reasonable default behaviour.  It has some predefined
+      behaviours you can take advantage of. Any time you encounter a problem when setting attributes
+      or adding tags, you can call <code class="code">setError(String errmsg)</code> and the class
+      will know that there is a problem. Then, at the top of
+      your <code class="code">isSelected()</code> method call <code class="code">validate()</code>
+      and a <code>BuildException</code> will be thrown with the contents of your error
+      message. The <code class="code">validate()</code> method also gives you a last chance to check
+      your settings for consistency because it
+      calls <code class="code">verifySettings()</code>. Override this method and
+      call <code class="code">setError()</code> within it if you detect any problems in how your
+      selector is set up.
+    </p>
+    <p>
+      To write custom selector containers one should
+      extend <code class="code">org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>.
+      Implement the <code class="code">public boolean isSelected(File baseDir, String filename, File
+      file)</code> method to do the right thing. Chances are you'll want to iterate over the
+      selectors under you, so use <code class="code">selectorElements()</code> to get an iterator
+      that will do that.
+    </p>
+    <p>
+      For example to create a selector container that will select files if a certain number of
+      contained selectors select, one could write a selector as follows:
     </p>
-    <blockquote>
-      <pre>
+    <pre>
 public class MatchNumberSelectors extends BaseSelectorContainer {
     private int number = -1;
     public void setNumber(int number) {
@@ -220,196 +185,167 @@
         }
         return numberSelected == number;
     }
-}
-      </pre>
-    </blockquote>
+}</pre>
     <p>
       To define and use this selector one could do:
     </p>
-    <blockquote>
-      <pre>
+    <pre>
 &lt;typedef name="numberselected"
          classname="com.mydomain.MatchNumberSelectors"/&gt;
 ...
 &lt;fileset dir="${src.path}"&gt;
-   &lt;numberselected number="2"&gt;
-      &lt;contains text="script" casesensitive="no"/&gt;
-      &lt;size value="4" units="Ki" when="more"/&gt;
-      &lt;javaselector/&gt;
-   &lt;/numberselected&gt;
-&lt;/fileset&gt;
-      </pre>
-    </blockquote>
+    &lt;numberselected number="2"&gt;
+        &lt;contains text="script" casesensitive="no"/&gt;
+        &lt;size value="4" units="Ki" when="more"/&gt;
+        &lt;javaselector/&gt;
+    &lt;/numberselected&gt;
+&lt;/fileset&gt;</pre>
     <p>
-      <i>The custom selector</i>
+      <em>The custom selector</em>
     </p>
     <p>
-      The custom selector was the pre ant 1.6 way of defining custom selectors.
-      This method is still supported for backward compatibility.
+      The custom selector was the pre Ant 1.6 way of defining custom selectors.  This method is
+      still supported for backward compatibility.
     </p>
-    <p>You can write your own selectors and use them within the selector
-      containers by specifying them within the <code>&lt;custom&gt;</code> tag.</p>
-
-        <p>To create a new Custom Selector, you have to create a class that
-        implements
-        <code>org.apache.tools.ant.types.selectors.ExtendFileSelector</code>.
-        The easiest way to do that is through the convenience base class
-        <code>org.apache.tools.ant.types.selectors.BaseExtendSelector</code>,
-        which provides all of the methods for supporting
-        <code>&lt;param&gt;</code> tags. First, override the
-        <code>isSelected()</code> method, and optionally the
-        <code>verifySettings()</code> method. If your custom
-        selector requires parameters to be set, you can also override
-        the <code>setParameters()</code> method and interpret the
-        parameters that are passed in any way you like. Several of the
-        core selectors demonstrate how to do that because they can
-        also be used as custom selectors.</p>
-
-
-    <p>Once that is written, you include it in your build file by using
+    <p>
+      You can write your own selectors and use them within the selector containers by specifying
+      them within the <code>&lt;custom&gt;</code> tag.
+    </p>
+    <p>
+      To create a new Custom Selector, you have to create a class that
+      implements <code class="code">org.apache.tools.ant.types.selectors.ExtendFileSelector</code>.
+      The easiest way to do that is through the convenience base
+      class <code class="code">org.apache.tools.ant.types.selectors.BaseExtendSelector</code>, which
+      provides all of the methods for supporting <code>&lt;param&gt;</code> tags. First, override
+      the <code class="code">isSelected()</code> method, and optionally
+      the <code class="code">verifySettings()</code> method. If your custom selector requires
+      parameters to be set, you can also override the <code class="code">setParameters()</code>
+      method and interpret the parameters that are passed in any way you like. Several of the core
+      selectors demonstrate how to do that because they can also be used as custom selectors.
+    </p>
+    <p>
+      Once that is written, you include it in your build file by using
       the <code>&lt;custom&gt;</code> tag.
     </p>
 
-    <table border="1" cellpadding="2" cellspacing="0">
+    <table class="attr">
       <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
       <tr>
-        <td valign="top">classname</td>
-        <td valign="top">The name of your class that implements
-          <code>org.apache.tools.ant.types.selectors.FileSelector</code>.
+        <td>classname</td>
+        <td>
+          The name of your class that
+          implements <code class="code">org.apache.tools.ant.types.selectors.FileSelector</code>.
         </td>
-        <td valign="top" align="center">Yes</td>
+        <td>Yes</td>
       </tr>
       <tr>
-        <td valign="top">classpath</td>
-        <td valign="top">The classpath to use in order to load the
-          custom selector class. If neither this classpath nor the
-          classpathref are specified, the class will be
+        <td>classpath</td>
+        <td>
+          The classpath to use in order to load the custom selector class. If
+          neither <var>classpath</var> nor <var>classpathref</var> are specified, the class will be
           loaded from the classpath that Ant uses.
         </td>
-        <td valign="top" align="center">No</td>
+        <td>No</td>
       </tr>
       <tr>
-        <td valign="top">classpathref</td>
-        <td valign="top">A reference to a classpath previously
-          defined. If neither this reference nor the
-          classpath above are specified, the class will be
-          loaded from the classpath that Ant uses.
+        <td>classpathref</td>
+        <td>
+          A reference to a classpath previously defined. If neither <var>classpathref</var>
+          nor <var>classpath</var> above are specified, the class will be loaded from the classpath
+          that Ant uses.
         </td>
-        <td valign="top" align="center">No</td>
+        <td>No</td>
       </tr>
     </table>
 
-    <p>Here is how you use <code>&lt;custom&gt;</code> to
-      use your class as a selector:
+    <p>
+      Here is how you use <code>&lt;custom&gt;</code> to use your class as a selector:
     </p>
-
-    <blockquote><pre>
+    <pre>
 &lt;fileset dir="${mydir}" includes="**/*"&gt;
     &lt;custom classname="com.mydomain.MySelector"&gt;
         &lt;param name="myattribute" value="myvalue"/&gt;
     &lt;/custom&gt;
-&lt;/fileset&gt;
-      </pre></blockquote>
-
-
-    <p>The core selectors that can also be used as custom selectors
-      are</p>
+&lt;/fileset&gt;</pre>
+    <p>The core selectors that can also be used as custom selectors are</p>
 
     <ul>
       <li><a href="selectors.html#containsselect">Contains Selector</a> with
-        classname <code>org.apache.tools.ant.types.selectors.ContainsSelector</code>
-      </li>
+        classname <code class="code">org.apache.tools.ant.types.selectors.ContainsSelector</code></li>
       <li><a href="selectors.html#dateselect">Date Selector</a> with
-        classname <code>org.apache.tools.ant.types.selectors.DateSelector</code>
-      </li>
+        classname <code class="code">org.apache.tools.ant.types.selectors.DateSelector</code></li>
       <li><a href="selectors.html#depthselect">Depth Selector</a> with
-        classname <code>org.apache.tools.ant.types.selectors.DepthSelector</code>
-      </li>
+        classname <code class="code">org.apache.tools.ant.types.selectors.DepthSelector</code></li>
       <li><a href="selectors.html#filenameselect">Filename Selector</a> with
-        classname <code>org.apache.tools.ant.types.selectors.FilenameSelector</code>
-      </li>
+        classname <code class="code">org.apache.tools.ant.types.selectors.FilenameSelector</code></li>
       <li><a href="selectors.html#sizeselect">Size Selector</a> with
-        classname <code>org.apache.tools.ant.types.selectors.SizeSelector</code>
-      </li>
+        classname <code class="code">org.apache.tools.ant.types.selectors.SizeSelector</code></li>
     </ul>
 
-    <p>Here is the example from the Depth Selector section rewritten
-    to use the selector through <code>&lt;custom&gt;</code>.</p>
-
-    <blockquote><pre>
+    <p>
+      Here is the example from the Depth Selector section rewritten to use the selector
+      through <code>&lt;custom&gt;</code>.
+    </p>
+    <pre>
 &lt;fileset dir="${doc.path}" includes="**/*"&gt;
     &lt;custom classname="org.apache.tools.ant.types.selectors.DepthSelector"&gt;
         &lt;param name="max" value="1"/&gt;
     &lt;/custom&gt;
-&lt;/fileset&gt;
-      </pre></blockquote>
+&lt;/fileset&gt;</pre>
+    <p>Selects all files in the base directory and one directory below that.</p>
 
-    <p>Selects all files in the base directory and one directory below
-      that.</p>
-
-    <h3><a name="filterreaders">Custom Filter Readers</a></h3>
+    <h3 id="filterreaders">Custom Filter Readers</h3>
     <p>
-      Custom filter readers selectors are datatypes that implement
-      <code>org.apache.tools.ant.types.filters.ChainableReader</code>.
+      Custom filter readers selectors are datatypes that
+      implement <code class="code">org.apache.tools.ant.types.filters.ChainableReader</code>.
     </p>
-    <p>There is only one method required.
-      <code>Reader chain(Reader reader)</code>.
-      This returns a reader that filters input from the specified
-      reader.
+    <p>
+      There is only one method required, <code class="code">Reader chain(Reader reader)</code>.
+      This returns a reader that filters input from the specified reader.
     </p>
     <p>
-      For example a filterreader that removes every second character
-      could be:
+      For example a filterreader that removes every second character could be:
     </p>
-    <blockquote>
-      <pre>
+    <pre>
 public class RemoveOddCharacters implements ChainableReader {
-   public Reader chain(Reader reader) {
-      return new BaseFilterReader(reader) {
-          int count = 0;
-          public int read() throws IOException {
-              while (true) {
-                int c = in.read();
-                if (c == -1) {
-                    return c;
+    public Reader chain(Reader reader) {
+        return new BaseFilterReader(reader) {
+            int count = 0;
+            public int read() throws IOException {
+                while (true) {
+                    int c = in.read();
+                    if (c == -1) {
+                        return c;
+                    }
+                    count++;
+                    if ((count % 2) == 1) {
+                        return c;
+                    }
                 }
-                count++;
-                if ((count % 2) == 1) {
-                    return c;
-                }
-              }
-          }
-      }
-   }
-}
-      </pre>
-    </blockquote>
-    <p>
-      For line oriented filters it may be easier to extend
-      <code>ChainableFilterReader</code> an inner class of
-      <code>org.apache.tools.ant.filters.TokenFilter</code>.
+            }
+        }
+    }
+}</pre>
+    <p>
+      For line oriented filters it may be easier to
+      extend <code class="code">ChainableFilterReader</code> an inner class
+      of <code class="code">org.apache.tools.ant.filters.TokenFilter</code>.
     </p>
     <p>
       For example a filter that appends the line number could be
     </p>
-    <blockquote>
-      <pre>
+    <pre>
 public class AddLineNumber extends ChainableReaderFilter {
-   private void lineNumber = 0;
-   public String filter(String string) {
-      lineNumber++;
-      return "" + lineNumber + "\t" + string;
-   }
-}
-      </pre>
-    </blockquote>
-
+    private void lineNumber = 0;
+    public String filter(String string) {
+        lineNumber++;
+        return "" + lineNumber + "\t" + string;
+    }
+}</pre>
 
-    <hr></hr>
   </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Types/description.html ant-1.10.3/manual/Types/description.html
--- ant-1.9.10/manual/Types/description.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/description.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,23 +24,20 @@
 
 <body>
 
-<h2><a name="description">Description</a></h2>
+<h2 id="description">Description</h2>
 <h3>Description</h3>
-<p>Allows for a description of the project to be specified that
-will be included in the output of the <code>ant &#x2011;projecthelp</code>
-command.</p>
+<p>Allows for a description of the project to be specified that will be
+included in the output of the <kbd>ant -projecthelp</kbd> command.</p>
 
 <h3>Parameters</h3>
 <p>(none)</p>
 <h3>Examples</h3>
-<pre>  
+<pre>
 &lt;description&gt;
-This buildfile is used to build the Foo subproject within 
+This buildfile is used to build the Foo subproject within
 the large, complex Bar project.
 &lt;/description&gt;
 </pre>
 
-
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Types/dirset.html ant-1.10.3/manual/Types/dirset.html
--- ant-1.9.10/manual/Types/dirset.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/dirset.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,131 +24,111 @@
 
 <body>
 
-<h2><a name="dirset">DirSet</a></h2>
-<p>A DirSet is a group of directories. These directories can be found in a
-directory tree starting in a base directory and are matched by
-patterns taken from a number of <a href="patternset.html">PatternSets</a>
-and <a href="selectors.html">Selectors</a>.
-</p>
-<p>PatternSets can be specified as nested
-<code>&lt;patternset&gt;</code> elements. In addition, DirSet holds
-an implicit PatternSet and supports the nested
-<code>&lt;include&gt;</code>, <code>&lt;includesfile&gt;</code>,
-<code>&lt;exclude&gt;</code> and <code>&lt;excludesfile&gt;</code>
-elements of <code>&lt;patternset&gt;</code> directly, as well as
-<code>&lt;patternset&gt;</code>'s attributes.</p>
-<p>Selectors are available as nested elements within the DirSet.
-If any of the selectors within the DirSet do not select the directory, it
-is not considered part of the DirSet. This makes a DirSet
-equivalent to an <code>&lt;and&gt;</code> selector container.</p>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">dir</td>
-    <td valign="top">The root of the directory tree of this DirSet.</td>
-    <td valign="top" align="center">Yes</td>
-  </tr>
-  <tr>
-    <td valign="top">includes</td>
-    <td valign="top">A comma- or space-separated list of patterns of directories that
-     must be included; all directories are included when omitted.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top">The name of a file; each line of this file is
-      taken to be an include pattern.
-      <b>Note:</b> if the file is empty and there are no other
-      patterns defined for the fileset, all directories will be included.
-    </td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">excludes</td>
-    <td valign="top">A comma- or space-separated list of patterns of directories that
-     must be excluded; no directories are excluded when omitted.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top">The name of a file; each line of this file is
-      taken to be an exclude pattern.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">casesensitive</td>
-    <td valign="top">Specifies whether case-sensitivity should be applied
-     (<code>true</code>|<code>yes</code>|<code>on</code> or
-     <code>false</code>|<code>no</code>|<code>off</code>).</td>
-    <td valign="top" align="center">No; defaults to true.</td>
-  </tr>
-  <tr>
-    <td valign="top">followsymlinks</td>
-    <td valign="top">Shall symbolic links be followed? Defaults to
-      true. See <a href="fileset.html#symlink">fileset's documentation</a>.</td>
-    <td valign="top" align="center">No</td>
-  </tr>
-  <tr>
-    <td valign="top">erroronmissingdir</td>
-    <td valign="top">
-      Specify what happens if the base directory does not exist.
-      If true a build error will happen, if false, the dirset
-      will be ignored/empty.
-      Defaults to true.
-      <em>Since Apache Ant 1.7.1 (default is true for backward compatibility
-        reasons.)</em>
-    </td>
-    <td valign="top" align="center">No</td>
+<h2 id="dirset">DirSet</h2>
+<p>A DirSet is a group of directories. These directories can be found in a directory tree
+starting in a base directory and are matched by patterns taken from a number
+of <a href="patternset.html">PatternSets</a> and <a href="selectors.html">Selectors</a>.</p>
+<p>PatternSets can be specified as nested <code>&lt;patternset&gt;</code> elements. In
+addition, DirSet holds an implicit PatternSet and supports the
+nested <code>&lt;include&gt;</code>, <code>&lt;includesfile&gt;</code>, <code>&lt;exclude&gt;</code>
+and <code>&lt;excludesfile&gt;</code> elements of <code>&lt;patternset&gt;</code> directly,
+as well as <code>&lt;patternset&gt;</code>'s attributes.</p>
+<p>Selectors are available as nested elements within the DirSet.  If any of the selectors
+within the DirSet do not select the directory, it is not considered part of the DirSet. This
+makes a DirSet equivalent to an <code>&lt;and&gt;</code> selector container.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>dir</td>
+    <td>The root of the directory tree of this DirSet.</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>includes</td>
+    <td>Comma- or space-separated list of patterns of directories that must be included.</td>
+    <td>No; defaults to all directories</td>
+  </tr>
+  <tr>
+    <td>includesfile</td>
+    <td>Name of a file; each line of this file is taken to be an include
+      pattern. <strong>Note:</strong> if the file is empty and there are no other patterns defined
+      for the fileset, all directories will be included.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>excludes</td>
+    <td>Comma- or space-separated list of patterns of directories that must be excluded.</td>
+    <td>No; defaults to none</td>
+  </tr>
+  <tr>
+    <td>excludesfile</td>
+    <td>Name of a file; each line of this file is taken to be an exclude pattern.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>casesensitive</td>
+    <td>Specifies whether case-sensitivity should be applied (<q>true</q>, <q>yes</q>, <q>on</q>
+      or <q>false</q>, <q>no</q>, <q>off</q>).</td>
+    <td>No; defaults to <q>true</q></td>
+  </tr>
+  <tr>
+    <td>followsymlinks</td>
+    <td>Shall symbolic links be followed?  See <a href="fileset.html#symlink">fileset's
+      documentation</a>.</td>
+    <td>No; defaults to <q>true</q></td>
+  </tr>
+  <tr>
+    <td>erroronmissingdir</td>
+    <td>Specify what happens if the base directory does not exist.  If <q>true</q> a build error
+      will happen, if <q>false</q>, the dirset will be ignored/empty.  <em>Since Apache Ant
+      1.7.1</em></td>
+    <td>No; defaults to true (for backward compatibility reasons)</td>
   </tr>
 </table>
 
 <h4>Examples</h4>
 
-<blockquote><pre>
+<pre>
 &lt;dirset dir=&quot;${build.dir}&quot;&gt;
   &lt;include name=&quot;apps/**/classes&quot;/&gt;
   &lt;exclude name=&quot;apps/**/*Test*&quot;/&gt;
 &lt;/dirset&gt;
-</pre></blockquote>
-<p>Groups all directories named <code>classes</code> found under the
-<code>apps</code> subdirectory of <code>${build.dir}</code>, except those
-that have the text <code>Test</code> in their name.</p>
+</pre>
+<p>Groups all directories named <samp>classes</samp> found under the <samp>apps</samp> subdirectory
+of <samp>${build.dir}</samp>, except those that have the text <samp>Test</samp> in their name.</p>
 
-<blockquote><pre>
+<pre>
 &lt;dirset dir=&quot;${build.dir}&quot;&gt;
   &lt;patternset id=&quot;non.test.classes&quot;&gt;
     &lt;include name=&quot;apps/**/classes&quot;/&gt;
     &lt;exclude name=&quot;apps/**/*Test*&quot;/&gt;
   &lt;/patternset&gt;
 &lt;/dirset&gt;
-</pre></blockquote>
-<p>Groups the same directories as the above example, but also establishes
-a PatternSet that can be referenced in other
-<code>&lt;dirset&gt;</code> elements, rooted at a different directory.</p>
+</pre>
+<p>Groups the same directories as the above example, but also establishes a PatternSet that can be
+referenced in other <code>&lt;dirset&gt;</code> elements, rooted at a different directory.</p>
 
-<blockquote><pre>
+<pre>
 &lt;dirset dir=&quot;${debug_build.dir}&quot;&gt;
   &lt;patternset refid=&quot;non.test.classes&quot;/&gt;
 &lt;/dirset&gt;
-</pre></blockquote>
-<p>Groups all directories in directory <code>${debug_build.dir}</code>,
-using the same patterns as the above example.</p>
+</pre>
+<p>Groups all directories in directory <samp>${debug_build.dir}</samp>, using the same patterns as
+the above example.</p>
 
-<blockquote><pre>
+<pre>
 &lt;dirset id=&quot;dirset&quot; dir=&quot;${workingdir}&quot;&gt;
    &lt;present targetdir=&quot;${workingdir}&quot;&gt;
-        &lt;mapper type=&quot;glob&quot; from=&quot;*&quot; to=&quot;*/${markerfile}&quot; /&gt;
+        &lt;mapper type=&quot;glob&quot; from=&quot;*&quot; to=&quot;*/${markerfile}&quot;/&gt;
    &lt;/present&gt;
 &lt;/dirset&gt;
-</pre></blockquote>
-<p>Selects all directories somewhere under <code>${workingdir}</code>
-which contain a <code>${markerfile}</code>.</p>
-
+</pre>
+<p>Selects all directories somewhere under <samp>${workingdir}</samp> which contain
+a <samp>${markerfile}</samp>.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Types/extension.html ant-1.10.3/manual/Types/extension.html
--- ant-1.9.10/manual/Types/extension.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/extension.html	2018-03-24 12:37:12.000000000 +0000
@@ -22,70 +22,67 @@
 </head>
 
 <body>
-<h2><a name="fileset">Extension</a></h2>
-<p>Utility type that represents either an available "Optional Package"
- (formerly known as "Standard Extension") as described in the manifest
- of a JAR file, or the requirement for such an optional package.</p>
-<p>Note that this type
-works with extensions as defined by the "Optional Package" specification.
- For more information about optional packages, see the document
-<em>Optional Package Versioning</em> in the documentation bundle for your
-Java2 Standard Edition package, in file
-<code>guide/extensions/versioning.html</code> or the online
-<a href="http://docs.oracle.com/javase/7/docs/technotes/guides/versioning/spec/versioning2.html#wp90779">
-Package Versioning documentation.</p>
+<h2 id="fileset">Extension</h2>
+<p>Utility type that represents either an available "Optional Package" (formerly known as "Standard
+Extension") as described in the manifest of a JAR file, or the requirement for such an optional
+package.</p>
+<p>Note that this type works with extensions as defined by the "Optional Package" specification.
+For more information about optional packages, see the document <em>Optional Package Versioning</em>
+in the documentation bundle for your Java Standard Edition package, in
+file <samp>guide/extensions/versioning.html</samp> or the
+online <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/versioning/spec/versioning2.html#wp90779"
+target="_top">Package Versioning documentation.</a></p>
 
 <h3>Attributes</h3>
-<p>The extension type supports the following attributes</a>:
-</p>
+<p>The extension type supports the following attributes:</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">extensionName</td>
-    <td valign="top">The name of extension</td>
-    <td valign="top" align="center">yes</td>
+    <td>extensionName</td>
+    <td>The name of extension</td>
+    <td>yes</td>
   </tr>
   <tr>
-    <td valign="top">specificationVersion</td>
-    <td valign="top">The version of extension specification (Must be in
-    dewey decimal aka dotted decimal notation. 3.2.4)</td>
-    <td valign="top" align="center">no</td>
+    <td>specificationVersion</td>
+    <td>The version of extension specification (must be in dewey decimal aka dotted decimal
+      notation, eg <q>3.2.4</q>)</td>
+    <td>no</td>
   </tr>
   <tr>
-    <td valign="top">specificationVendor</td>
-    <td valign="top">The specification vendor</td>
-    <td valign="top" align="center">no</td>
+    <td>specificationVendor</td>
+    <td>The specification vendor</td>
+    <td>no</td>
   </tr>
   <tr>
-    <td valign="top">implementationVersion</td>
-    <td valign="top">The version of extension implementation (Must be in
-    dewey decimal aka dotted decimal notation. 3.2.4)</td>
-    <td valign="top" align="center">no</td>
+    <td>implementationVersion</td>
+    <td>The version of extension implementation (must be in dewey decimal aka dotted decimal
+      notation, eg <q>3.2.4</q>)</td>
+    <td>no</td>
   </tr>
   <tr>
-    <td valign="top">implementationVendor</td>
-    <td valign="top">The implementation vendor</td>
-    <td valign="top" align="center">no</td>
+    <td>implementationVendor</td>
+    <td>The implementation vendor</td>
+    <td>no</td>
   </tr>
   <tr>
-    <td valign="top">implementationVendorId</td>
-    <td valign="top">The implementation vendor ID</td>
-    <td valign="top" align="center">no</td>
+    <td>implementationVendorId</td>
+    <td>The implementation vendor ID</td>
+    <td>no</td>
   </tr>
   <tr>
-    <td valign="top">implementationURL</td>
-    <td valign="top">The url from which to retrieve extension.</td>
-    <td valign="top" align="center">no</td>
+    <td>implementationURL</td>
+    <td>The url from which to retrieve extension.</td>
+    <td>no</td>
   </tr>
 </table>
 
 <h4>Examples</h4>
-<blockquote><pre>
+<pre>
 &lt;extension id=&quot;e1&quot;
     extensionName=&quot;MyExtensions&quot;
     specificationVersion=&quot;1.0&quot;
@@ -94,21 +91,18 @@
     implementationVendor=&quot;Apache&quot;
     implementationVersion=&quot;2.0&quot;
     implementationURL=&quot;http://somewhere.com/myExt.jar&quot;/&gt;
-</pre></blockquote>
+</pre>
 
-<p>Fully specific extension object.</p>
+<p>Fully specified extension object.</p>
 
-<blockquote><pre>
+<pre>
 &lt;extension id=&quot;e1&quot;
     extensionName=&quot;MyExtensions&quot;
     specificationVersion=&quot;1.0&quot;
     specificationVendor=&quot;Peter Donald&quot;/&gt;
-</pre></blockquote>
-
-<p>Extension object that just species the specification details.</p>
-
+</pre>
 
+<p>Extension object that just specifies the specification details.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Types/extensionset.html ant-1.10.3/manual/Types/extensionset.html
--- ant-1.9.10/manual/Types/extensionset.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/extensionset.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,32 +24,28 @@
 <body>
 <h2><a>ExtensionSet</a></h2>
 <p>Utility type that represents a set of Extensions.</p>
-<p>Note that this type
-works with extensions as defined by the "Optional Package" specification.
- For more information about optional packages, see the document
-<em>Optional Package Versioning</em> in the documentation bundle for your
-Java2 Standard Edition package, in file
-<code>guide/extensions/versioning.html</code> or online at
-<a href="http://docs.oracle.com/javase/7/docs/technotes/guides/versioning/spec/versioning2.html#wp90779">
-Package Versioning documentation.</p>
+<p>Note that this type works with extensions as defined by the "Optional Package" specification.
+For more information about optional packages, see the document <em>Optional Package Versioning</em>
+in the documentation bundle for your Java Standard Edition package, in
+file <samp>guide/extensions/versioning.html</samp> or online
+at <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/versioning/spec/versioning2.html#wp90779"
+target="_top">Package Versioning documentation.</a></p>
 
-<h3>Nested Elements</h3>
+<h3>Nested elements</h3>
 
 <h4>extension</h4>
 <p><a href="extension.html">Extension</a> object to add to set.</p>
 
 <h4>fileset</h4>
- <p><a href="../Types/fileset.html">FileSet</a>s all files contained
- contained within set that are jars and implement an extension are added
- to extension set.</p>
-
-<h4>LibFileSet</h4>
- <p>All files contained contained within set that are jars and implement 
- an extension are added to extension set. However the extension information 
- may be modified by attributes of libfileset</p>
+<p><a href="fileset.html">FileSet</a>s all files contained contained within set that are jars and
+implement an extension are added to extension set.</p>
+
+<h4>libfileset</h4>
+<p>All files contained contained within set that are jars and implement an extension are added to
+extension set. However, the extension information may be modified by attributes of libfileset.</p>
 
 <h4>Examples</h4>
-<blockquote><pre>
+<pre>
 &lt;extension id=&quot;e1&quot;
     extensionName=&quot;MyExtensions&quot;
     specificationVersion=&quot;1.0&quot;
@@ -73,11 +69,7 @@
   &lt;libfileset refid="lfs"/&gt;
   &lt;extension refid="e1"/&gt;
 &lt;/extensionSet&gt;
-
-</pre></blockquote>
-
-
+</pre>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Types/filelist.html ant-1.10.3/manual/Types/filelist.html
--- ant-1.9.10/manual/Types/filelist.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/filelist.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,97 +24,80 @@
 
 <body>
 
-<h2><a name="filelist">FileList</a></h2> 
+<h2 id="filelist">FileList</h2>
 
-<p>FileLists are explicitly named lists of files.  Whereas FileSets
-act as filters, returning only those files that exist in the file
-system and match specified patterns, FileLists are useful for
-specifying files that may or may not exist.  Multiple files are
-specified as a list of files, relative to the specified directory,
-with no support for wildcard expansion (filenames with wildcards will be
-included in the list unchanged).
-FileLists can appear inside tasks that support this feature or as stand-alone
-types.
-</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<p>FileLists are explicitly named lists of files.  Whereas FileSets act as filters, returning
+only those files that exist in the file system and match specified patterns, FileLists are
+useful for specifying files that may or may not exist.  Multiple files are specified as a list
+of files, relative to the specified directory, with no support for wildcard expansion (filenames
+with wildcards will be included in the list unchanged).  FileLists can appear inside tasks that
+support this feature or as stand-alone types.</p>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">dir</td>
-    <td valign="top">The base directory of this FileList.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>dir</td>
+    <td>The base directory of this FileList.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">files</td>
-    <td valign="top">The list of file names. This is a list of
-    file name separated by whitespace, or by commas.</td>
-    <td valign="top" align="center">
-      Yes, unless there is a nested file element</td>
+    <td>files</td>
+    <td>The list of file names. This is a list of file name separated by whitespace, or by
+    commas.</td>
+    <td>Yes, unless there is a nested file element</td>
+  </tr>
+</table>
+<h4>Nested element: file</h4>
+<p><em>Since Apache Ant 1.6.2</em></p>
+<p>This represents a file name. The nested element allows filenames containing white space and
+commas.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>name</td>
+    <td>The name of the file.</td>
+    <td>Yes</td>
   </tr>
 </table>
-  <h4>Nested Element: file</h4>
-  <p>
-    This represents a file name. The nested element allows filenames containing
-    white space and commas.
-  </p>
-  <p><em>Since Apache Ant 1.6.2</em></p>
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">name</td>
-      <td valign="top">The name of the file.</td>
-      <td valign="top" align="center">Yes</td>
-    </tr>
-</table>  
 <h4>Examples</h4>
-<blockquote><pre>
-&lt;filelist 
-    id=&quot;docfiles&quot; 
+<pre>
+&lt;filelist
+    id=&quot;docfiles&quot;
     dir=&quot;${doc.src}&quot;
-    files=&quot;foo.xml,bar.xml&quot;/&gt; 
-</pre></blockquote>
+    files=&quot;foo.xml,bar.xml&quot;/&gt;</pre>
 
-<p>The files <code>${doc.src}/foo.xml</code> and
-<code>${doc.src}/bar.xml</code>.  Note that these files may not (yet)
-actually exist.
-</p>
-
-<blockquote><pre>
-&lt;filelist 
-    id=&quot;docfiles&quot; 
+<p>The files <samp>${doc.src}/foo.xml</samp> and <samp>${doc.src}/bar.xml</samp>.  Note that
+these files may not (yet) actually exist.</p>
+
+<pre>
+&lt;filelist
+    id=&quot;docfiles&quot;
     dir=&quot;${doc.src}&quot;
     files=&quot;foo.xml
-           bar.xml&quot;/&gt; 
-</pre></blockquote>
+           bar.xml&quot;/&gt;</pre>
 
 <p>Same files as the example above.</p>
 
-<blockquote><pre>
-&lt;filelist refid=&quot;docfiles&quot;/&gt; 
-</pre></blockquote>
+<pre>&lt;filelist refid=&quot;docfiles&quot;/&gt;</pre>
 
 <p>Same files as the example above.</p>
 
-<blockquote><pre>
-&lt;filelist 
-    id=&quot;docfiles&quot; 
+<pre>
+&lt;filelist
+    id=&quot;docfiles&quot;
     dir=&quot;${doc.src}&quot;&gt;
     &lt;file name="foo.xml"/&gt;
     &lt;file name="bar.xml"/&gt;
-&lt;/filelist&gt;
-</pre></blockquote>
+&lt;/filelist&gt;</pre>
 
 <p>Same files as the example above.</p>
 
-
-
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Types/fileset.html ant-1.10.3/manual/Types/fileset.html
--- ant-1.9.10/manual/Types/fileset.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/fileset.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,163 +24,140 @@
 
 <body>
 
-<h2><a name="fileset">FileSet</a></h2>
-<p>A FileSet is a group of files. These files can be found in a
-directory tree starting in a base directory and are matched by
-patterns taken from a number of <a
-href="patternset.html">PatternSets</a> and
-<a href="selectors.html">Selectors</a>.
-<p>PatternSets can be specified as nested
-<code>&lt;patternset&gt;</code> elements. In addition, FileSet holds
-an implicit PatternSet and supports the nested
-<code>&lt;include&gt;</code>, <code>&lt;includesfile&gt;</code>,
-<code>&lt;exclude&gt;</code> and <code>&lt;excludesfile&gt;</code>
-elements of PatternSet directly, as well as PatternSet's
+<h2 id="fileset">FileSet</h2>
+<p>A FileSet is a group of files. These files can be found in a directory tree starting in a
+base directory and are matched by patterns taken from a number
+of <a href="patternset.html">PatternSets</a> and <a href="selectors.html">Selectors</a>.</p>
+<p>PatternSets can be specified as nested <code>&lt;patternset&gt;</code> elements. In
+addition, FileSet holds an implicit PatternSet and supports the
+nested <code>&lt;include&gt;</code>, <code>&lt;includesfile&gt;</code>, <code>&lt;exclude&gt;</code>
+and <code>&lt;excludesfile&gt;</code> elements of PatternSet directly, as well as PatternSet's
 attributes.</p>
-<p>Selectors are available as nested elements within the FileSet.
-If any of the selectors within the FileSet do not select the file, the
-file is not considered part of the FileSet. This makes a FileSet
-equivalent to an <code>&lt;and&gt;</code> selector container.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<p>Selectors are available as nested elements within the FileSet.  If any of the selectors
+within the FileSet do not select the file, the file is not considered part of the FileSet. This
+makes a FileSet equivalent to an <code>&lt;and&gt;</code> selector container.</p>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">dir</td>
-    <td valign="top">the root of the directory tree of this FileSet.</td>
-    <td valign="middle" align="center" rowspan="2">Exactly one of dir or file must be specified</td>
+    <td>dir</td>
+    <td>the root of the directory tree of this FileSet.</td>
+    <td rowspan="2">Exactly one of dir or file must be specified</td>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">shortcut for specifying a single-file fileset</td>
+    <td>file</td>
+    <td class="left">shortcut for specifying a single-file fileset</td>
   </tr>
   <tr>
-    <td valign="top">defaultexcludes</td>
-    <td valign="top">indicates whether <a href="../dirtasks.html#defaultexcludes">default excludes</a> should be used or not
-      (<code>yes | no</code>); default excludes are used when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>defaultexcludes</td>
+    <td>indicates whether <a href="../dirtasks.html#defaultexcludes">default excludes</a> should
+      be used or not (<code>yes|no</code>).</td>
+    <td>No; defaults to <q>yes</q></td>
   </tr>
   <tr>
-    <td valign="top">includes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      included; all files are included when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>includes</td>
+    <td>comma- or space-separated list of patterns of files that must be included.</td>
+    <td>No; defaults to all files</td>
   </tr>
   <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top">the name of a file; each line of this file is
-      taken to be an include pattern.<br/>
-      <b>Note:</b> if the file is empty and there are no other
-      patterns defined for the fileset, all files will be included.
+    <td>includesfile</td>
+    <td>name of a file; each line of this file is taken to be an include pattern.<br/>
+      <strong>Note</strong>: if the file is empty and there are no other patterns defined for
+      the fileset, all files will be included.
     </td>
-    <td valign="top" align="center">No</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">excludes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      excluded; no files (except default excludes) are excluded when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>excludes</td>
+    <td>comma- or space-separated list of patterns of files that must be excluded.</td>
+    <td>No; defaults to default excludes or none if <var>defaultexcludes</var> is <q>no</q></td>
   </tr>
   <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top">the name of a file; each line of this file is
-      taken to be an exclude pattern.</td>
-    <td valign="top" align="center">No</td>
+    <td>excludesfile</td>
+    <td>name of a file; each line of this file is taken to be an exclude pattern.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">casesensitive</td>
-    <td valign="top">Must the include and exclude patterns be treated in a case sensitive way?
-        Defaults to true.</td>
-    <td valign="top" align="center">No</td>
+    <td>casesensitive</td>
+    <td>Must the include and exclude patterns be treated in a case sensitive way?</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">followsymlinks</td>
-    <td valign="top">Shall symbolic links be followed? Defaults to
-      true. See the note <a href="#symlink">below</a>.</td>
-    <td valign="top" align="center">No</td>
+    <td>followsymlinks</td>
+    <td>Shall symbolic links be followed? See the note <a href="#symlink">below</a>.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">erroronmissingdir</td>
-    <td valign="top">
-      Specify what happens if the base directory does not exist.
-      If true a build error will happen, if false, the fileset
-      will be ignored/empty.
-      Defaults to true.
-      <em>Since Apache Ant 1.7.1 (default is true for backward compatibility
-        reasons.)</em>
+    <td>erroronmissingdir</td>
+    <td>
+      Specify what happens if the base directory does not exist.  If <q>true</q> a build error
+      will happen, if <q>false</q>, the fileset will be ignored/empty.
+      <em>Since Apache Ant 1.7.1</em>
     </td>
-    <td valign="top" align="center">No</td>
+    <td>No; defaults to <q>true</q> (for backward compatibility reasons)</td>
   </tr>
 </table>
 
-<p><a name="symlink"><b>Note</b></a>: All files/directories for which
-the canonical path is different from its path are considered symbolic
-links.  On Unix systems this usually means the file really is a
-symbolic link but it may lead to false results on other
-platforms.</p>
+<p id="symlink"><strong>Note</strong>: All files/directories for which the canonical path is
+different from its path are considered symbolic links.  On Unix systems this usually means the
+file really is a symbolic link but it may lead to false results on other platforms.</p>
 
 <h4>Examples</h4>
-<blockquote><pre>
+<pre>
 &lt;fileset dir=&quot;${server.src}&quot; casesensitive=&quot;yes&quot;&gt;
   &lt;include name=&quot;**/*.java&quot;/&gt;
   &lt;exclude name=&quot;**/*Test*&quot;/&gt;
 &lt;/fileset&gt;
-</pre></blockquote>
-<p>Groups all files in directory <code>${server.src}</code> that are Java
-source files and don't have the text <code>Test</code> in their
-name.</p>
+</pre>
+<p>Groups all files in directory <samp>${server.src}</samp> that are Java source files and don't
+have the text <samp>Test</samp> in their name.</p>
 
-<blockquote><pre>
+<pre>
 &lt;fileset dir=&quot;${server.src}&quot; casesensitive=&quot;yes&quot;&gt;
   &lt;patternset id=&quot;non.test.sources&quot;&gt;
     &lt;include name=&quot;**/*.java&quot;/&gt;
     &lt;exclude name=&quot;**/*Test*&quot;/&gt;
   &lt;/patternset&gt;
 &lt;/fileset&gt;
-</pre></blockquote>
-<p>Groups the same files as the above example, but also establishes
-a PatternSet that can be referenced in other
-<code>&lt;fileset&gt;</code> elements, rooted at a different directory.</p>
+</pre>
+<p>Groups the same files as the above example, but also establishes a PatternSet that can be
+referenced in other <code>&lt;fileset&gt;</code> elements, rooted at a different directory.</p>
 
-<blockquote><pre>
+<pre>
 &lt;fileset dir=&quot;${client.src}&quot; &gt;
   &lt;patternset refid=&quot;non.test.sources&quot;/&gt;
 &lt;/fileset&gt;
-</pre></blockquote>
-<p>Groups all files in directory <code>${client.src}</code>, using the
-same patterns as the above example.</p>
+</pre>
+<p>Groups all files in directory <samp>${client.src}</samp>, using the same patterns as the
+above example.</p>
 
-<blockquote><pre>
+<pre>
 &lt;fileset dir=&quot;${server.src}&quot; casesensitive=&quot;yes&quot;&gt;
   &lt;filename name=&quot;**/*.java&quot;/&gt;
   &lt;filename name=&quot;**/*Test*&quot; negate=&quot;true&quot;/&gt;
 &lt;/fileset&gt;
-</pre></blockquote>
-<p>Groups the same files as the top example, but using the
-<code>&lt;filename&gt;</code> selector.</p>
+</pre>
+<p>Groups the same files as the top example, but using the <code>&lt;filename&gt;</code>
+selector.</p>
 
-<blockquote><pre>
+<pre>
 &lt;fileset dir=&quot;${server.src}&quot; casesensitive=&quot;yes&quot;&gt;
   &lt;filename name=&quot;**/*.java&quot;/&gt;
   &lt;not&gt;
     &lt;filename name=&quot;**/*Test*&quot;/&gt;
   &lt;/not&gt;
 &lt;/fileset&gt;
-</pre></blockquote>
-<p>Groups the same files as the previous example using a combination of the
-<code>&lt;filename&gt;</code> selector and the <code>&lt;not&gt;</code>
-selector container.</p>
-
-<blockquote><pre>
-&lt;fileset dir="src" includes="main/" /&gt;
-</pre></blockquote>
-<p>Selects all files in <i>src/main</i> (e.g. <i>src/main/Foo.java</i> or 
-<i>src/main/application/Bar.java</i>).</p>
-
-
+</pre>
+<p>Groups the same files as the previous example using a combination of
+the <code>&lt;filename&gt;</code> selector and the <code>&lt;not&gt;</code> selector
+container.</p>
+
+<pre>&lt;fileset dir="src" includes="main/"/&gt;</pre>
+<p>Selects all files in <samp>src/main</samp> (e.g. <samp>src/main/Foo.java</samp>
+or <samp>src/main/application/Bar.java</samp>).</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Types/filterchain.html ant-1.10.3/manual/Types/filterchain.html
--- ant-1.9.10/manual/Types/filterchain.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/filterchain.html	2018-03-24 12:37:12.000000000 +0000
@@ -14,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
 <html>
 <head>
   <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
@@ -25,40 +23,30 @@
 <body>
 
 <h2>FilterChains and FilterReaders</h2>
-Consider the flexibility of Unix pipes.  If you wanted,
-for example, to copy just those lines that contained the
-string blee from the first 10 lines of a text file 'foo'
-(<em>you wouldn't want to filter a binary file</em>)
-to a file 'bar', you would do something like:<p>
-<code>
-cat foo|head -n10|grep blee &gt; bar
-</code><p>
-Apache Ant was not flexible enough.  There was no way for the
-<code>&lt;copy&gt;</code> task to do something similar.  If you wanted
-the <code>&lt;copy&gt;</code> task to get the first 10 lines, you would have
-had to create special attributes:<p>
-<code>
-&lt;copy file=&quot;foo&quot; tofile=&quot;bar&quot; head=&quot;10&quot; contains=&quot;blee&quot;/&gt;
-</code><p>
-The obvious problem thus surfaced: Ant tasks would not be able
-to accommodate such data transformation attributes as they would
-be endless.  The task would also not know in which order these
-attributes were to be interpreted.  That is, must the task execute the
-contains attribute first and then the head attribute or vice-versa?
-What Ant tasks needed was a mechanism to allow pluggable filter (data
-transformer) chains.  Ant would provide a few filters for which there
-have been repeated requests.  Users with special filtering needs
-would be able to easily write their own and plug them in.<p>
-
-The solution was to refactor data transformation oriented
-tasks to support FilterChains.  A FilterChain is a group of
-ordered FilterReaders.  Users can define their own FilterReaders
-by just extending the java.io.FilterReader class.  Such custom
-FilterReaders can be easily plugged in as nested elements of
-<code>&lt;filterchain&gt;</code> by using <code>&lt;filterreader&gt;</code> elements.
-<p>
-Example:
-<blockquote><pre>
+<p>Consider the flexibility of Unix pipes.  If you wanted, for example, to copy just those lines
+that contained the string <q>blee</q> from the first 10 lines of a text file <samp>foo</samp>
+(<em>you wouldn't want to filter a binary file</em>) to a file <samp>bar</samp>, you would do
+something like:</p>
+<pre class="input">cat foo|head -n10|grep blee &gt; bar</pre>
+<p>Apache Ant was not flexible enough.  There was no way for the <code>&lt;copy&gt;</code> task to
+do something similar.  If you wanted the <code>&lt;copy&gt;</code> task to get the first 10 lines,
+you would have had to create special attributes:</p>
+<pre>&lt;copy file=&quot;foo&quot; tofile=&quot;bar&quot; head=&quot;10&quot; contains=&quot;blee&quot;/&gt;</pre>
+<p>The obvious problem thus surfaced: Ant tasks would not be able to accommodate such data
+transformation attributes as they would be endless.  The task would also not know in which order
+these attributes were to be interpreted.  That is, must the task execute the contains attribute
+first and then the head attribute or vice-versa?  What Ant tasks needed was a mechanism to allow
+pluggable filter (data transformer) chains.  Ant would provide a few filters for which there have
+been repeated requests.  Users with special filtering needs would be able to easily write their own
+and plug them in.</p>
+
+<p>The solution was to refactor data transformation oriented tasks to support FilterChains.  A
+FilterChain is a group of ordered FilterReaders.  Users can define their own FilterReaders by just
+extending the <code class="code">java.io.FilterReader</code> class.  Such custom FilterReaders can
+be easily plugged in as nested elements of <code>&lt;filterchain&gt;</code> by
+using <code>&lt;filterreader&gt;</code> elements.</p>
+<p>Example:</p>
+<pre>
 &lt;copy file=&quot;${src.file}&quot; tofile=&quot;${dest.file}&quot;&gt;
   &lt;filterchain&gt;
     &lt;filterreader classname=&quot;your.extension.of.java.io.FilterReader&quot;&gt;
@@ -72,535 +60,465 @@
       &lt;param type=&quot;abra&quot; value=&quot;cadabra&quot;/&gt;
     &lt;/filterreader&gt;
   &lt;/filterchain&gt;
-&lt;/copy&gt;
-</pre></blockquote>
+&lt;/copy&gt;</pre>
 
-Ant provides some built-in filter readers.  These filter readers
-can also be declared using a syntax similar to the above syntax.
-However, they can be declared using some simpler syntax also.<p>
-Example:
-<blockquote><pre>
+<p>Ant provides some built-in filter readers.  These filter readers can also be declared using a
+syntax similar to the above syntax.  However, they can be declared using some simpler syntax
+also.</p>
+<p>Example:</p>
+<pre>
 &lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;src.file.head&quot;&gt;
   &lt;filterchain&gt;
     &lt;headfilter lines=&quot;15&quot;/&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
-is equivalent to:
-<blockquote><pre>
+&lt;/loadfile&gt;</pre>
+<p>is equivalent to:</p>
+<pre>
 &lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;src.file.head&quot;&gt;
   &lt;filterchain&gt;
     &lt;filterreader classname=&quot;org.apache.tools.ant.filters.HeadFilter&quot;&gt;
       &lt;param name=&quot;lines&quot; value=&quot;15&quot;/&gt;
     &lt;/filterreader&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-The following built-in tasks support nested <code>&lt;filterchain&gt;</code> elements.<br>
-<a href="../Tasks/concat.html">Concat</a>,<br>
-<a href="../Tasks/copy.html">Copy</a>,<br>
-<a href="../Tasks/loadfile.html">LoadFile</a>,<br>
-<a href="../Tasks/loadproperties.html">LoadProperties</a>,<br>
-<a href="../Tasks/loadresource.html">LoadResource</a>,<br>
-<a href="../Tasks/move.html">Move</a><br><br>
-
-A FilterChain is formed by defining zero or more of the following
-nested elements.<br>
-<a href="#filterreader">FilterReader</a><br>
-<a href="#classconstants">ClassConstants</a><br>
-<a href="#escapeunicode">EscapeUnicode</a><br>
-<a href="#expandproperties">ExpandProperties</a><br>
-<a href="#headfilter">HeadFilter</a><br>
-<a href="#linecontains">LineContains</a><br>
-<a href="#linecontainsregexp">LineContainsRegExp</a><br>
-<a href="#prefixlines">PrefixLines</a><br>
-<a href="#replacetokens">ReplaceTokens</a><br>
-<a href="#stripjavacomments">StripJavaComments</a><br>
-<a href="#striplinebreaks">StripLineBreaks</a><br>
-<a href="#striplinecomments">StripLineComments</a><br>
-<a href="#suffixlines">SuffixLines</a><br>
-<a href="#tabstospaces">TabsToSpaces</a><br>
-<a href="#tailfilter">TailFilter</a><br>
-<a href="#deletecharacters">DeleteCharacters</a><br>
-<a href="#concatfilter">ConcatFilter</a><br>
-<a href="#tokenfilter">TokenFilter</a><br>
-<a href="../Tasks/fixcrlf.html">FixCRLF</a><br>
-<a href="#sortfilter">SortFilter</a><br>
-
-<h3><a name="filterreader">FilterReader</a></h3>
-
-The filterreader element is the generic way to
-define a filter.  User defined filter elements are
-defined in the build file using this.  Please note that
-built in filter readers can also be defined using this
-syntax.
-
-A FilterReader element must be supplied with a class name as
-an attribute value.  The class resolved by this name must
-extend java.io.FilterReader.  If the custom filter reader
-needs to be parameterized, it must implement
-org.apache.tools.type.Parameterizable.
-
-<table cellSpacing=0 cellPadding=2 border=1>
-  <tr>
-    <td vAlign=top><b>Attribute</b></td>
-    <td vAlign=top><b>Description</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td vAlign=top>classname</td>
-    <td vAlign=top>The class name of the filter reader.</td>
-    <td vAlign=top align="center">Yes</td>
-  </tr>
-</table>
-
-<p>
-<h4>Nested Elements:</h4>
-<code>&lt;filterreader&gt;</code> supports <code>&lt;classpath&gt;</code> and <code>&lt;param&gt;</code>
-as nested elements.  Each <code>&lt;param&gt;</code> element may take in the following
-attributes - name, type and value.
-<p>
-The following FilterReaders are supplied with the default
-distribution.
-
-<h3><a name="classconstants">ClassConstants</a></h3>
-<p>
-  This filters basic constants defined in a Java Class,
-  and outputs them in lines composed of the format <i>name</i>=<i>value</i>.
-  This filter uses the <em>bcel</em> library to understand the Java Class file.
-  See <a href="../install.html#librarydependencies">Library Dependencies</a>.
-<p>
-  <p>
-    <em><b>Important:</b></em>
-    This filter is different from most of the other filters.
-    Most of the filters operate on a sequence of characters.
-    This filter operates on the sequence of bytes that makes up
-    a class. However the bytes arrive to the filter as a sequence
-    of characters. This means that one must be careful on the
-    choice of character encoding to use. Most encoding lose information
-    on conversion from an arbitrary sequence of bytes to characters
-    and back again to bytes. In particular the usual default
-    character encodings (CP152 and UTF-8) do.
-    For this reason, <em>since Ant 1.7</em>, the character
-    encoding <b>ISO-8859-1</b> is used to convert from characters back to
-    bytes, so one <b>has</b> to use this encoding for reading the java
-    class file.
-<h4>Example:</h4>
+<p>The following built-in tasks support nested <code>&lt;filterchain&gt;</code> elements.<br/>
+<a href="../Tasks/concat.html">Concat</a>,<br/>
+<a href="../Tasks/copy.html">Copy</a>,<br/>
+<a href="../Tasks/loadfile.html">LoadFile</a>,<br/>
+<a href="../Tasks/loadproperties.html">LoadProperties</a>,<br/>
+<a href="../Tasks/loadresource.html">LoadResource</a>,<br/>
+<a href="../Tasks/move.html">Move</a></p>
+
+<p>A FilterChain is formed by defining zero or more of the following nested elements.<br/>
+<a href="#filterreader">FilterReader</a><br/>
+<a href="#classconstants">ClassConstants</a><br/>
+<a href="#escapeunicode">EscapeUnicode</a><br/>
+<a href="#expandproperties">ExpandProperties</a><br/>
+<a href="#headfilter">HeadFilter</a><br/>
+<a href="#linecontains">LineContains</a><br/>
+<a href="#linecontainsregexp">LineContainsRegExp</a><br/>
+<a href="#prefixlines">PrefixLines</a><br/>
+<a href="#replacetokens">ReplaceTokens</a><br/>
+<a href="#stripjavacomments">StripJavaComments</a><br/>
+<a href="#striplinebreaks">StripLineBreaks</a><br/>
+<a href="#striplinecomments">StripLineComments</a><br/>
+<a href="#suffixlines">SuffixLines</a><br/>
+<a href="#tabstospaces">TabsToSpaces</a><br/>
+<a href="#tailfilter">TailFilter</a><br/>
+<a href="#deletecharacters">DeleteCharacters</a><br/>
+<a href="#concatfilter">ConcatFilter</a><br/>
+<a href="#sortfilter">SortFilter</a><br/>
+<a href="#tokenfilter">TokenFilter</a><br/>
+<a href="../Tasks/fixcrlf.html">FixCRLF</a></p>
+
+<h3 id="filterreader">FilterReader</h3>
+
+<p>The <code>filterreader</code> element is the generic way to define a filter.  User defined filter
+elements are defined in the build file using this.  Please note that built in filter readers can
+also be defined using this syntax.</p>
+
+<p>A FilterReader element must be supplied with a class name as an attribute value.  The class
+resolved by this name must extend <code class="code">java.io.FilterReader</code>.  If the custom
+filter reader needs to be parameterized, it must
+implement <code class="code">org.apache.tools.type.Parameterizable</code>.</p>
+
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>classname</td>
+    <td>The class name of the filter reader.</td>
+    <td>Yes</td>
+  </tr>
+</table>
+
+<h4>Nested elements</h4>
+<p><code>&lt;filterreader&gt;</code> supports <code>&lt;classpath&gt;</code>
+and <code>&lt;param&gt;</code> as nested elements.  Each <code>&lt;param&gt;</code> element may take
+in the following attributes&mdash;<var>name</var>, <var>type</var> and <var>value</var>.</p>
+<p>The following FilterReaders are supplied with the default distribution.</p>
+
+<h3 id="classconstants">ClassConstants</h3>
+<p>This filters basic constants defined in a Java Class, and outputs them in lines composed of the
+format <em>name</em>=<em>value</em>.  This filter uses the BCEL library to understand the Java Class
+file.  See <a href="../install.html#librarydependencies">Library Dependencies</a>.</p>
+<p><strong>Important</strong>: This filter is different from most of the other filters.  Most of the
+filters operate on a sequence of characters.  This filter operates on the sequence of bytes that
+makes up a class. However the bytes arrive to the filter as a sequence of characters. This means
+that one must be careful on the choice of character encoding to use. Most encodings lose information
+on conversion from an arbitrary sequence of bytes to characters and back again to bytes. In
+particular, the usual default character encodings (CP1252 and UTF-8) do.  For this reason, <em>since
+Ant 1.7</em>, the character encoding <strong>ISO-8859-1</strong> is used to convert from characters
+back to bytes, so one <strong>has</strong> to use this encoding for reading the Java class file.</p>
+<h4>Example</h4>
 
-This loads the basic constants defined in a Java class as Ant properties.
+<p>This loads the basic constants defined in a Java class as Ant properties.</p>
 
-<blockquote><pre>
+<pre>
 &lt;loadproperties srcfile="foo.class" encoding="ISO-8859-1"&gt;
   &lt;filterchain&gt;
     &lt;classconstants/&gt;
   &lt;/filterchain&gt;
-&lt;/loadproperties&gt;
-</pre></blockquote>
+&lt;/loadproperties&gt;</pre>
 
-This loads the constants from a Java class file as Ant properties,
-prepending the names with a prefix.
+<p>This loads the constants from a Java class file as Ant properties, prepending the names with
+a prefix.</p>
 
-    <blockquote><pre>
+<pre>
 &lt;loadproperties srcfile="build/classes/org/acme/bar.class"
                 encoding="ISO-8859-1"&gt;
   &lt;filterchain&gt;
     &lt;classconstants/&gt;
     &lt;prefixlines prefix="ini."/&gt;
   &lt;/filterchain&gt;
-&lt;/loadproperties&gt;
-</pre></blockquote>
-<h3><a name="escapeunicode">EscapeUnicode</a></h3>
-<p>
-This filter converts its input by changing all non US-ASCII characters
-into their equivalent unicode escape backslash u plus 4 digits.</p>
+&lt;/loadproperties&gt;</pre>
+<h3 id="escapeunicode">EscapeUnicode</h3>
 
-<p><em>since Ant 1.6</em></p>
+<p>This filter converts its input by changing all non US-ASCII characters into their equivalent
+Unicode escape backslash u plus 4 digits.</p>
 
-<h4>Example:</h4>
+<p><em>Since Ant 1.6</em></p>
 
-This loads the basic constants defined in a Java class as Ant properties.
-<blockquote><pre>
+<h4>Example</h4>
+
+<p>This loads the basic constants defined in a Java class as Ant properties.</p>
+<pre>
 &lt;loadproperties srcfile=&quot;non_ascii_property.properties&quot;&gt;
   &lt;filterchain&gt;
     &lt;filterreader classname=&quot;org.apache.tools.ant.filters.EscapeUnicode&quot;/&gt;
   &lt;/filterchain&gt;
-&lt;/loadproperties&gt;
-</pre></blockquote>
+&lt;/loadproperties&gt;</pre>
 
-Convenience method:
-<blockquote><pre>
+<p>Convenience method:</p>
+<pre>
 &lt;loadproperties srcfile=&quot;non_ascii_property.properties&quot;&gt;
   &lt;filterchain&gt;
     &lt;escapeunicode/&gt;
   &lt;/filterchain&gt;
-&lt;/loadproperties&gt;
-</pre></blockquote>
+&lt;/loadproperties&gt;</pre>
 
-<h3><a name="expandproperties">ExpandProperties</a></h3>
-<p>
-If the data contains data that represents Ant
-properties (of the form ${...}), that is substituted
-with the property's actual value.
-<p>
-<h4>Example:</h4>
-
-This results in the property modifiedmessage holding the value
-&quot;All these moments will be lost in time, like teardrops in the rain&quot;
-<blockquote><pre>
-&lt;echo
-  message=&quot;All these moments will be lost in time, like teardrops in the ${weather}&quot;
-  file=&quot;loadfile1.tmp&quot;
-  /&gt;
+<h3 id="expandproperties">ExpandProperties</h3>
+<p>If the data contains data that represents Ant properties (of the form <code>${...}</code>), that
+is substituted with the property's actual value.</p>
+
+<h4>Example</h4>
+
+<p>This results in the property <code>modifiedmessage</code> holding the value <q>All these moments
+will be lost in time, like teardrops in the rain</q></p>
+<pre>
+&lt;echo message=&quot;All these moments will be lost in time, like teardrops in the ${weather}&quot;
+      file=&quot;loadfile1.tmp&quot;/&gt;
 &lt;property name=&quot;weather&quot; value=&quot;rain&quot;/&gt;
 &lt;loadfile property=&quot;modifiedmessage&quot; srcFile=&quot;loadfile1.tmp&quot;&gt;
   &lt;filterchain&gt;
     &lt;filterreader classname=&quot;org.apache.tools.ant.filters.ExpandProperties&quot;/&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-Convenience method:
-<blockquote><pre>
-&lt;echo
-  message=&quot;All these moments will be lost in time, like teardrops in the ${weather}&quot;
-  file=&quot;loadfile1.tmp&quot;
-  /&gt;
+<p>Convenience method:</p>
+<pre>
+&lt;echo message=&quot;All these moments will be lost in time, like teardrops in the ${weather}&quot;
+      file=&quot;loadfile1.tmp&quot;/&gt;
 &lt;property name=&quot;weather&quot; value=&quot;rain&quot;/&gt;
 &lt;loadfile property=&quot;modifiedmessage&quot; srcFile=&quot;loadfile1.tmp&quot;&gt;
   &lt;filterchain&gt;
     &lt;expandproperties/&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-<p>As of Ant <strong>1.8.3</strong>, a nested
- <a href="propertyset.html">PropertySet</a> can be specified:
+<p><em>Since Ant 1.8.3</em>, a nested <a href="propertyset.html">PropertySet</a> can be specified:</p>
 
-<blockquote><pre>
+<pre>
 &lt;property name=&quot;weather&quot; value=&quot;rain&quot;/&gt;
 &lt;loadfile property=&quot;modifiedmessage&quot; srcFile=&quot;loadfile1.tmp&quot;&gt;
   &lt;filterchain&gt;
     &lt;expandproperties&gt;
       &lt;propertyset&gt;
-        &lt;propertyref name="weather" /&gt;
+        &lt;propertyref name="weather"/&gt;
       &lt;/propertyset&gt;
     &lt;/expandproperties&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-<h3><a name="headfilter">HeadFilter</a></h3>
+<h3 id="headfilter">HeadFilter</h3>
 
-This filter reads the first few lines from the data supplied to it.
+<p>This filter reads the first few lines from the data supplied to it.</p>
 
-<table cellSpacing=0 cellPadding=2 border=1>
+<table class="attr">
   <tr>
-    <td vAlign=top><b>Parameter Name</b></td>
-    <td vAlign=top><b>Parameter Value</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Parameter Name</th>
+    <th>Parameter Value</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>lines</td>
-    <td vAlign=top align="center">Number of lines to be read.
-    Defaults to &quot;10&quot; <br> A negative value means that all lines are
-    passed (useful with <i>skip</i>)</td>
-    <td vAlign=top align="center">No</td>
+    <td>lines</td>
+    <td>Number of lines to be read.<br/>
+      A negative value means that all lines are passed (useful with <var>skip</var>).</td>
+    <td>No; defaults to <q>10</q></td>
   </tr>
   <tr>
-    <td vAlign=top>skip</td>
-    <td vAlign=top align="center">Number of lines to be skipped (from the beginning).
-    Defaults to &quot;0&quot;</td>
-    <td vAlign=top align="center">No</td>
+    <td>skip</td>
+    <td>Number of lines to be skipped (from the beginning).</td>
+    <td>No; defaults to <q>0</q></td>
   </tr>
 </table>
-<p>
-<h4>Example:</h4>
 
-This stores the first 15 lines of the supplied data in the property src.file.head
-<blockquote><pre>
+<h4>Example</h4>
+<p>This stores the first 15 lines of the supplied data in the property <code>src.file.head</code></p>
+<pre>
 &lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;src.file.head&quot;&gt;
   &lt;filterchain&gt;
     &lt;filterreader classname=&quot;org.apache.tools.ant.filters.HeadFilter&quot;&gt;
       &lt;param name=&quot;lines&quot; value=&quot;15&quot;/&gt;
     &lt;/filterreader&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-Convenience method:
-<blockquote><pre>
+<p>Convenience method:</p>
+<pre>
 &lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;src.file.head&quot;&gt;
   &lt;filterchain&gt;
     &lt;headfilter lines=&quot;15&quot;/&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-This stores the first 15 lines, skipping the first 2 lines, of the supplied data
-in the property src.file.head. (Means: lines 3-17)
-<blockquote><pre>
+<p>This stores the first 15 lines, skipping the first 2 lines, of the supplied data in the
+property <code>src.file.head</code> (means: lines 3-17).</p>
+<pre>
 &lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;src.file.head&quot;&gt;
   &lt;filterchain&gt;
     &lt;headfilter lines=&quot;15&quot; skip=&quot;2&quot;/&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-See the testcases for more examples (<i>src\etc\testcases\filters\head-tail.xml</i> in the
-source distribution).
+<p>See the testcases for more examples (<samp>src\etc\testcases\filters\head-tail.xml</samp> in
+the source distribution).</p>
 
-<h3><a name="linecontains">LineContains</a></h3>
+<h3 id="linecontains">LineContains</h3>
 
-This filter includes only those lines that contain all the user-specified
-strings.
+<p>This filter includes only those lines that contain all the user-specified strings.</p>
 
-<table cellSpacing=0 cellPadding=2 border=1>
+<table class="attr">
   <tr>
-    <td vAlign=top><b>Parameter Type</b></td>
-    <td vAlign=top><b>Parameter Value</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Parameter Type</th>
+    <th>Parameter Value</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>contains</td>
-    <td vAlign=top align="center">Substring to be searched for.</td>
-    <td vAlign=top align="center">Yes</td>
+    <td>contains</td>
+    <td>Substring to be searched for.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td vAlign=top>negate</td>
-    <td vAlign=top align="center">Whether to select
-      <i>non-</i>matching lines only. <b>Since Ant 1.7</b></td>
-    <td vAlign=top align="center">No</td>
+    <td>negate</td>
+    <td>Whether to select <em>non-</em>matching lines only. <em>Since Ant 1.7</em></td>
+    <td>No</td>
   </tr>
 </table>
 <p>
-<h4>Example:</h4>
+<h4>Example</h4>
 
-This will include only those lines that contain <code>foo</code> and
-<code>bar</code>.
-<blockquote><pre>
+<p>This will include only those lines that contain <q>foo</q> and <q>bar</q>.</p>
+<pre>
 &lt;filterreader classname=&quot;org.apache.tools.ant.filters.LineContains&quot;&gt;
   &lt;param type=&quot;contains&quot; value=&quot;foo&quot;/&gt;
   &lt;param type=&quot;contains&quot; value=&quot;bar&quot;/&gt;
-&lt;/filterreader&gt;
-</pre></blockquote>
+&lt;/filterreader&gt;</pre>
 
-Convenience method:
-<blockquote><pre>
+<p>Convenience method:</p>
+<pre>
 &lt;linecontains&gt;
   &lt;contains value=&quot;foo&quot;/&gt;
   &lt;contains value=&quot;bar&quot;/&gt;
-&lt;/linecontains&gt;
-</pre></blockquote>
+&lt;/linecontains&gt;</pre>
 
-Negation:
-<blockquote><pre>
+<p>Negation:</p>
+<pre>
 &lt;filterreader classname=&quot;org.apache.tools.ant.filters.LineContains&quot;&gt;
   &lt;param type=&quot;negate&quot; value=&quot;true&quot;/&gt;
   &lt;param type=&quot;contains&quot; value=&quot;foo&quot;/&gt;
   &lt;param type=&quot;contains&quot; value=&quot;bar&quot;/&gt;
-&lt;/filterreader&gt;
-</pre></blockquote>
-<i>or</i>
-<blockquote><pre>
+&lt;/filterreader&gt;</pre>
+<p><em>or</em></p>
+<pre>
 &lt;linecontains negate=&quot;true&quot;&gt;
   &lt;contains value=&quot;foo&quot;/&gt;
   &lt;contains value=&quot;bar&quot;/&gt;
-&lt;/linecontains&gt;
-</pre></blockquote>
+&lt;/linecontains&gt;</pre>
 
-<h3><a name="linecontainsregexp">LineContainsRegExp</a></h3>
+<h3 id="linecontainsregexp">LineContainsRegExp</h3>
 
-Filter which includes only those lines that contain the user-specified
-regular expression matching strings.
+<p>Filter which includes only those lines that contain the user-specified regular expression
+matching strings.</p>
 
-<table cellSpacing=0 cellPadding=2 border=1>
+<table class="attr">
   <tr>
-    <td vAlign=top><b>Parameter Type</b></td>
-    <td vAlign=top><b>Parameter Value</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Parameter Type</th>
+    <th>Parameter Value</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>regexp</td>
-    <td vAlign=top align="center">Regular expression to be searched for.<br>
-      <em>Starting with 1.9.10 this also works as an attribute
-        on <code>linecontainsregexp</code>, in earlier versions of Ant
-        you must use a nested element when using the convenience
-        method.</em>
+    <td>regexp</td>
+    <td>Regular expression to be searched for.<br/><em>Since Ant 1.10.2</em>, this also works as an
+      attribute on <code>linecontainsregexp</code>. In earlier versions of Ant you must use a nested
+      element when using the convenience method.
     </td>
-    <td vAlign=top align="center">Yes</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td vAlign=top>negate</td>
-    <td vAlign=top align="center">Whether to select
-      <i>non-</i>matching lines only. <b>Since Ant 1.7</b></td>
-    <td vAlign=top align="center">No</td>
+    <td>negate</td>
+    <td>Whether to select <em>non-</em>matching lines only. <em>Since Ant 1.7</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td vAlign=top>casesensitive</td>
-    <td vAlign=top align="center">Perform a case sensitive
-      match. Default is true. <b>Since Ant 1.8.2</b></td>
-    <td vAlign=top align="center">No</td>
+    <td>casesensitive</td>
+    <td>Perform a case sensitive match. <em>Since Ant 1.8.2</em></td>
+    <td>No; default is <q>true</q></td>
   </tr>
 </table>
 
-See <a href="regexp.html">Regexp Type</a> for the description of the nested element regexp and of
-the choice of regular expression implementation.
-<h4>Example:</h4>
+<p>See <a href="regexp.html">Regexp Type</a> for the description of the nested element regexp
+and of the choice of regular expression implementation.</p>
+
+<h4>Example</h4>
 
-This will fetch all those lines that contain the pattern <code>foo</code>
-<blockquote><pre>
+<p>This will fetch all those lines that contain the pattern <code>foo</code></p>
+<pre>
 &lt;filterreader classname=&quot;org.apache.tools.ant.filters.LineContainsRegExp&quot;&gt;
   &lt;param type=&quot;regexp&quot; value=&quot;foo*&quot;/&gt;
-&lt;/filterreader&gt;
-</pre></blockquote>
+&lt;/filterreader&gt;</pre>
 
-Convenience method:
-<blockquote><pre>
+<p>Convenience method:</p>
+<pre>
 &lt;linecontainsregexp&gt;
   &lt;regexp pattern=&quot;foo*&quot;/&gt;
-&lt;/linecontainsregexp&gt;
-</pre></blockquote>
+&lt;/linecontainsregexp&gt;</pre>
 
-Negation:
-<blockquote><pre>
+<p>Negation:</p>
+<pre>
 &lt;filterreader classname=&quot;org.apache.tools.ant.filters.LineContainsRegExp&quot;&gt;
   &lt;param type=&quot;negate&quot; value=&quot;true&quot;/&gt;
   &lt;param type=&quot;regexp&quot; value=&quot;foo*&quot;/&gt;
-&lt;/filterreader&gt;
-</pre></blockquote>
-<i>or</i>
-<blockquote><pre>
+&lt;/filterreader&gt;</pre>
+<p><em>or</em></p>
+<pre>
 &lt;linecontainsregexp negate=&quot;true&quot;&gt;
   &lt;regexp pattern=&quot;foo*&quot;/&gt;
-&lt;/linecontainsregexp&gt;
-</pre></blockquote>
+&lt;/linecontainsregexp&gt;</pre>
 
-<h3><a name="prefixlines">PrefixLines</a></h3>
+<h3 id="prefixlines">PrefixLines</h3>
 
-Attaches a prefix to every line.
+<p>Attaches a prefix to every line.</p>
 
-<table cellSpacing=0 cellPadding=2 border=1>
+<table class="attr">
   <tr>
-    <td vAlign=top><b>Parameter Name</b></td>
-    <td vAlign=top><b>Parameter Value</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Parameter Name</th>
+    <th>Parameter Value</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>prefix</td>
-    <td vAlign=top align="center">Prefix to be attached to lines.</td>
-    <td vAlign=top align="center">Yes</td>
+    <td>prefix</td>
+    <td>Prefix to be attached to lines.</td>
+    <td>Yes</td>
   </tr>
 </table>
-<p>
-<h4>Example:</h4>
 
-This will attach the prefix <code>Foo</code> to all lines.
-<blockquote><pre>
+<h4>Example</h4>
+
+<p>This will attach the prefix <code>Foo</code> to all lines.</p>
+<pre>
 &lt;filterreader classname=&quot;org.apache.tools.ant.filters.PrefixLines&quot;&gt;
   &lt;param name=&quot;prefix&quot; value=&quot;Foo&quot;/&gt;
-&lt;/filterreader&gt;
-</pre></blockquote>
+&lt;/filterreader&gt;</pre>
 
-Convenience method:
-<blockquote><pre>
-&lt;prefixlines prefix=&quot;Foo&quot;/&gt;
-</pre></blockquote>
+<p>Convenience method:</p>
+<pre>&lt;prefixlines prefix=&quot;Foo&quot;/&gt;</pre>
 
-<h3><a name="suffixlines">SuffixLines</a></h3>
+<h3 id="suffixlines">SuffixLines</h3>
 
-Attaches a suffix to every line.
+<p><em>Since Ant 1.8.0</em></p>
 
-<p><em>since Ant 1.8.0</em></p>
+<p>Attaches a suffix to every line.</p>
 
-<table cellSpacing=0 cellPadding=2 border=1>
+<table class="attr">
   <tr>
-    <td vAlign=top><b>Parameter Name</b></td>
-    <td vAlign=top><b>Parameter Value</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Parameter Name</th>
+    <th>Parameter Value</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>suffix</td>
-    <td vAlign=top align="center">Suffix to be attached to lines.</td>
-    <td vAlign=top align="center">Yes</td>
+    <td>suffix</td>
+    <td>Suffix to be attached to lines.</td>
+    <td>Yes</td>
   </tr>
 </table>
-<p>
-<h4>Example:</h4>
 
-This will attach the suffix <code>Foo</code> to all lines.
-<blockquote><pre>
+<h4>Example</h4>
+
+<p>This will attach the suffix <code>Foo</code> to all lines.</p>
+<pre>
 &lt;filterreader classname=&quot;org.apache.tools.ant.filters.SuffixLines&quot;&gt;
   &lt;param name=&quot;suffix&quot; value=&quot;Foo&quot;/&gt;
-&lt;/filterreader&gt;
-</pre></blockquote>
+&lt;/filterreader&gt;</pre>
 
-Convenience method:
-<blockquote><pre>
-&lt;suffixlines suffix=&quot;Foo&quot;/&gt;
-</pre></blockquote>
+<p>Convenience method:</p>
+<pre>&lt;suffixlines suffix=&quot;Foo&quot;/&gt;</pre>
 
-<h3><a name="replacetokens">ReplaceTokens</a></h3>
+<h3 id="replacetokens">ReplaceTokens</h3>
 
-This filter reader replaces all strings that are
-sandwiched between begintoken and endtoken with
-user defined values.
+<p>This filter reader replaces all strings that are sandwiched between <var>begintoken</var>
+and <var>endtoken</var> with user defined values.</p>
 
-<table cellSpacing=0 cellPadding=2 border=1>
+<table class="attr">
   <tr>
-    <td vAlign=top><b>Parameter Type</b></td>
-    <td vAlign=top><b>Parameter Name</b></td>
-    <td vAlign=top><b>Parameter Value</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Parameter Type</th>
+    <th>Parameter Name</th>
+    <th>Parameter Value</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>tokenchar</td>
-    <td vAlign=top>begintoken</td>
-    <td vAlign=top>String marking the
-    beginning of a token.  Defaults to @</td>
-    <td vAlign=top align="center">No</td>
+    <td>tokenchar</td>
+    <td>begintoken</td>
+    <td>String marking the beginning of a token.</td>
+    <td>No; defaults to <q>@</q></td>
   </tr>
   <tr>
-    <td vAlign=top>tokenchar</td>
-    <td vAlign=top>endtoken</td>
-    <td vAlign=top>String marking the
-    end of a token.  Defaults to @</td>
-    <td vAlign=top align="center">No</td>
+    <td>tokenchar</td>
+    <td>endtoken</td>
+    <td>String marking the end of a token.</td>
+    <td>No; defaults to <q>@</q></td>
   </tr>
   <tr>
-    <td vAlign=top>User defined String.</td>
-    <td vAlign=top>token</td>
-    <td vAlign=top>User defined search String.</td>
-    <td vAlign=top align="center">Yes</td>
+    <td>token</td>
+    <td>User defined token string</td>
+    <td>Replacement value for the token.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td vAlign=top>Not applicable.</td>
-    <td vAlign=top>propertiesfile</td>
-    <td vAlign=top>Properties file to take tokens from.</td>
-    <td vAlign=top align="center">No</td>
+    <td>propertiesfile</td>
+    <td rowspan="2">Not applicable</td>
+    <td>Properties file to take tokens and replacement values from.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td vAlign=top>Not applicable.</td>
-    <td vAlign=top>propertiesResource</td>
-    <td vAlign=top>Properties resource to take tokens from.
+    <td>propertiesResource</td>
+    <td>Properties resource to take tokens from.
       Note this only works is you use the
       "convenience" <code>&lt;replacetokens&gt;</code> syntax.
       <em>since Ant 1.8.0</em></td>
-    <td vAlign=top align="center">No</td>
+    <td>No</td>
   </tr>
-  <tr>
-    <td vAlign=top>User defined String.</td>
-    <td vAlign=top>value</td>
-    <td vAlign=top>Replace-value for the token</td>
-    <td vAlign=top align="center">No</td>
-  </tr></table>
-<p>
+</table>
 
-<h4>Example:</h4>
+<h4>Example</h4>
 
-This replaces occurrences of the string &#64;DATE&#64; in the data
-with today's date and stores it in the property ${src.file.replaced}.
-<blockquote><pre>
+<p>This replaces occurrences of the string <code>@DATE@</code> in the data with today's date and
+stores it in the property <code>${src.file.replaced}</code>.</p>
+<pre>
 &lt;tstamp/&gt;
 &lt;!-- just for explaining the use of the properties --&gt;
 &lt;property name=&quot;src.file&quot; value=&quot;orders.csv&quot;/&gt;
@@ -616,11 +534,10 @@
 &lt;/loadfile&gt;
 
 &lt;!-- just for explaining the use of the properties --&gt;
-&lt;echo message=&quot;${orders.replaced}&quot;/>
-</pre></blockquote>
+&lt;echo message=&quot;${orders.replaced}&quot;/&gt;</pre>
 
-Convenience method:
-<blockquote><pre>
+<p>Convenience method:</p>
+<pre>
 &lt;tstamp/&gt;
 &lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;${src.file.replaced}&quot;&gt;
   &lt;filterchain&gt;
@@ -628,12 +545,11 @@
       &lt;token key=&quot;DATE&quot; value=&quot;${TODAY}&quot;/&gt;
     &lt;/replacetokens&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-This replaces occurrences of the string {{DATE}} in the data
-with today's date and stores it in the property ${src.file.replaced}.
-<blockquote><pre>
+<p>This replaces occurrences of the string <q>{{DATE}}</q> in the data with today's date and
+stores it in the property <samp>${src.file.replaced}</samp>.</p>
+<pre>
 &lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;${src.file.replaced}&quot;&gt;
   &lt;filterchain&gt;
     &lt;filterreader classname=&quot;org.apache.tools.ant.filters.ReplaceTokens&quot;&gt;
@@ -641,11 +557,10 @@
       &lt;param type=&quot;tokenchar&quot; name=&quot;endtoken&quot; value=&quot;}}&quot;/&gt;
     &lt;/filterreader&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-Convenience method:
-<blockquote><pre>
+<p>Convenience method:</p>
+<pre>
 &lt;tstamp/&gt;
 &lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;${src.file.replaced}&quot;&gt;
   &lt;filterchain&gt;
@@ -653,22 +568,20 @@
       &lt;token key=&quot;DATE&quot; value=&quot;${TODAY}&quot;/&gt;
     &lt;/replacetokens&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-This will treat each properties file entry in sample.properties as a token/key pair :
-<blockquote><pre>
+<p>This will treat each properties file entry in sample.properties as a token/key pair:</p>
+<pre>
 &lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;${src.file.replaced}&quot;&gt;
   &lt;filterchain&gt;
     &lt;filterreader classname=&quot;org.apache.tools.ant.filters.ReplaceTokens&quot;&gt;
       &lt;param type=&quot;propertiesfile&quot; value=&quot;sample.properties&quot;/&gt;
     &lt;/filterreader&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-This reads the properties from an Ant resource referenced by its id:
-<blockquote><pre>
+<p>This reads the properties from an Ant resource referenced by its <var>id</var>:</p>
+<pre>
 &lt;string id=&quot;embedded-properties&quot;&gt;
 foo=bar
 baz=xyzzy
@@ -677,308 +590,270 @@
   &lt;filterchain&gt;
     &lt;replacetokens propertiesResource=&quot;${ant.refid:embedded-properties}&quot;/&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-<h3><a name="stripjavacomments">StripJavaComments</a></h3>
+<h3 id="stripjavacomments">StripJavaComments</h3>
 
-This filter reader strips away comments from the data,
-using Java syntax guidelines.  This filter does not
-take in any parameters.
-<p>
-<h4>Example:</h4>
+<p>This filter reader strips away comments from the data, using Java syntax guidelines.  This
+filter does not take in any parameters.</p>
+
+<h4>Example</h4>
 
-<blockquote><pre>
+<pre>
 &lt;loadfile srcfile=&quot;${java.src.file}&quot; property=&quot;${java.src.file.nocomments}&quot;&gt;
   &lt;filterchain&gt;
     &lt;filterreader classname=&quot;org.apache.tools.ant.filters.StripJavaComments&quot;/&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-Convenience method:
-<blockquote><pre>
+<p>Convenience method:</p>
+<pre>
 &lt;loadfile srcfile=&quot;${java.src.file}&quot; property=&quot;${java.src.file.nocomments}&quot;&gt;
   &lt;filterchain&gt;
     &lt;stripjavacomments/&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-<h3><a name="striplinebreaks">StripLineBreaks</a></h3>
+<h3 id="striplinebreaks">StripLineBreaks</h3>
 
-This filter reader strips away specific characters
-from the data supplied to it.
+<p>This filter reader strips away specific characters from the data supplied to it.</p>
 
-<table cellSpacing=0 cellPadding=2 border=1>
+<table class="attr">
   <tr>
-    <td vAlign=top><b>Parameter Name</b></td>
-    <td vAlign=top><b>Parameter Value</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Parameter Name</th>
+    <th>Parameter Value</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>linebreaks</td>
-    <td vAlign=top align="center">Characters that are to
-    be stripped out.  Defaults to &quot;\r\n&quot;</td>
-    <td vAlign=top align="center">No</td>
+    <td>linebreaks</td>
+    <td>Characters that are to be stripped out.</td>
+    <td>No; defaults to <q>\r\n</q></td>
   </tr>
 </table>
-<p>
-<h4>Examples:</h4>
 
-This strips the '\r' and '\n' characters.
-<blockquote><pre>
+<h4>Examples</h4>
+
+<p>This strips the <q>\r</q> and <q>\n</q> characters.</p>
+<pre>
 &lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;${src.file.contents}&quot;&gt;
   &lt;filterchain&gt;
     &lt;filterreader classname=&quot;org.apache.tools.ant.filters.StripLineBreaks&quot;/&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-Convenience method:
-<blockquote><pre>
+<p>Convenience method:</p>
+<pre>
 &lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;${src.file.contents}&quot;&gt;
   &lt;filterchain&gt;
     &lt;striplinebreaks/&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-This treats the '(' and ')' characters as line break characters and
-strips them.
-<blockquote><pre>
+<p>This treats the <q>(</q> and <q>)</q> characters as line break characters and strips
+them.</p>
+<pre>
 &lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;${src.file.contents}&quot;&gt;
   &lt;filterchain&gt;
     &lt;filterreader classname=&quot;org.apache.tools.ant.filters.StripLineBreaks&quot;&gt;
       &lt;param name=&quot;linebreaks&quot; value=&quot;()&quot;/&gt;
     &lt;/filterreader&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-<h3><a name="striplinecomments">StripLineComments</a></h3>
+<h3 id="striplinecomments">StripLineComments</h3>
 
-This filter removes all those lines that begin with strings
-that represent comments as specified by the user.
+<p>This filter removes all those lines that begin with strings that represent comments as specified
+by the user.</p>
 
-<table cellSpacing=0 cellPadding=2 border=1>
+<table class="attr">
   <tr>
-    <td vAlign=top><b>Parameter Type</b></td>
-    <td vAlign=top><b>Parameter Value</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Parameter Type</th>
+    <th>Parameter Value</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>comment</td>
-    <td vAlign=top align="center">Strings that identify a line as a comment
-    when they appear at the start of the line.</td>
-    <td vAlign=top align="center">Yes</td>
+    <td>comment</td>
+    <td>Strings that identify a line as a comment when they appear at the start of the
+    line.</td>
+    <td>Yes</td>
   </tr>
 </table>
 <p>
-<h4>Examples:</h4>
+<h4>Examples</h4>
 
-This removes all lines that begin with #, --, REM, rem and //
-<blockquote><pre>
+<p>This removes all lines that begin with <q>#</q>, <q>--</q>, <q>REM</q>, <q>rem</q>
+and <q>//</q></p>
+<pre>
 &lt;filterreader classname=&quot;org.apache.tools.ant.filters.StripLineComments&quot;&gt;
   &lt;param type=&quot;comment&quot; value=&quot;#&quot;/&gt;
   &lt;param type=&quot;comment&quot; value=&quot;--&quot;/&gt;
   &lt;param type=&quot;comment&quot; value=&quot;REM &quot;/&gt;
   &lt;param type=&quot;comment&quot; value=&quot;rem &quot;/&gt;
   &lt;param type=&quot;comment&quot; value=&quot;//&quot;/&gt;
-&lt;/filterreader&gt;
-</pre></blockquote>
+&lt;/filterreader&gt;</pre>
 
-Convenience method:
-<blockquote><pre>
+<p>Convenience method:</p>
+<pre>
 &lt;striplinecomments&gt;
   &lt;comment value=&quot;#&quot;/&gt;
   &lt;comment value=&quot;--&quot;/&gt;
   &lt;comment value=&quot;REM &quot;/&gt;
   &lt;comment value=&quot;rem &quot;/&gt;
   &lt;comment value=&quot;//&quot;/&gt;
-&lt;/striplinecomments&gt;
-</pre></blockquote>
+&lt;/striplinecomments&gt;</pre>
 
-<h3><a name="tabstospaces">TabsToSpaces</a></h3>
+<h3 id="tabstospaces">TabsToSpaces</h3>
 
-This filter replaces tabs with spaces
+<p>This filter replaces tabs with spaces</p>
 
-<table cellSpacing=0 cellPadding=2 border=1>
+<table class="attr">
   <tr>
-    <td vAlign=top><b>Parameter Name</b></td>
-    <td vAlign=top><b>Parameter Value</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Parameter Name</th>
+    <th>Parameter Value</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>tablength</td>
-    <td vAlign=top align="center">Defaults to &quot;8&quot;</td>
-    <td vAlign=top align="center">No</td>
+    <td>tablength</td>
+    <td>Defaults to <q>8</q></td>
+    <td>No</td>
   </tr>
 </table>
-<p>
-<h4>Examples:</h4>
 
-This replaces tabs in ${src.file} with spaces.
-<blockquote><pre>
+<h4>Examples</h4>
+
+<p>This replaces tabs in <samp>${src.file}</samp> with spaces.</p>
+<pre>
 &lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;${src.file.notab}&quot;&gt;
   &lt;filterchain&gt;
     &lt;filterreader classname=&quot;org.apache.tools.ant.filters.TabsToSpaces&quot;/&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-Convenience method:
-<blockquote><pre>
+<p>Convenience method:</p>
+<pre>
 &lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;${src.file.notab}&quot;&gt;
   &lt;filterchain&gt;
     &lt;tabstospaces/&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-<h3><a name="tailfilter">TailFilter</a></h3>
+<h3 id="tailfilter">TailFilter</h3>
 
-This filter reads the last few lines from the data supplied to it.
+<p>This filter reads the last few lines from the data supplied to it.</p>
 
-<table cellSpacing=0 cellPadding=2 border=1>
+<table class="attr">
   <tr>
-    <td vAlign=top><b>Parameter Name</b></td>
-    <td vAlign=top><b>Parameter Value</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Parameter Name</th>
+    <th>Parameter Value</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>lines</td>
-    <td vAlign=top align="center">Number of lines to be read.
-    Defaults to &quot;10&quot; <br> A negative value means that all lines are
-    passed (useful with <i>skip</i>)</td>
-    <td vAlign=top align="center">No</td>
+    <td>lines</td>
+    <td>Number of lines to be read.<br/>
+      A negative value means that all lines are passed
+      (useful with <var>skip</var>)</td>
+    <td>No; defaults to <q>10</q></td>
   </tr>
   <tr>
-    <td vAlign=top>skip</td>
-    <td vAlign=top align="center">Number of lines to be skipped (from the end).
-    Defaults to &quot;0&quot; </td>
-    <td vAlign=top align="center">No</td>
+    <td>skip</td>
+    <td>Number of lines to be skipped (from the end).</td>
+    <td>No; defaults to <q>0</q></td>
   </tr>
 </table>
 <p>
 
-<h4>Background:</h4>
-With HeadFilter and TailFilter you can extract each part of a text file you want.
-This graphic shows the dependencies:
+<h4>Background</h4>
+<p>With HeadFilter and TailFilter you can extract each part of a text file you want.  This graphic
+shows the dependencies:</p>
 
-<table cellSpacing=0 cellPadding=2 border=1>
+<table>
 <tr>
- <th> Content </th>
- <th></th>
- <th></th>
- <th></th>
- <th> Filter </th>
+ <th>Content</th>
+ <th colspan="3">Filter</th>
 </tr>
 <tr>
- <td> Line 1 </td>
- <td rowspan="2" bgcolor="#C0C0C0">&nbsp;</td>
- <td rowspan="9" bgcolor="#FF00FF">&nbsp;</td>
- <td rowspan="4">&nbsp;</td>
- <td rowspan="11">
-    <table>
-    <tr>
-     <td bgcolor="#C0C0C0">&nbsp;</td>
-     <td><pre>&lt;filterchain&gt;
+ <td>Line 1</td>
+ <td rowspan="2" style="background:limegreen;">
+   <pre style="background:limegreen;margin: 0 0 0 0;">&lt;filterchain&gt;
     &lt;headfilter lines="2"/&gt;
 &lt;/filterchain&gt;</pre></td>
-    </tr>
-    <tr>
-     <td bgcolor="#FF00FF">&nbsp;</td>
-     <td><pre>&lt;filterchain&gt;
-    &lt;tailfilter lines="-1" skip="2"/&gt;
-&lt;/filterchain&gt;</pre></td>
-    </tr>
-    <tr>
-     <td bgcolor="#008000">&nbsp;</td>
-     <td><pre>&lt;filterchain&gt;
-    &lt;headfilter lines="-1" skip="2"/&gt;
-&lt;/filterchain&gt;</pre></td>
-    </tr>
-    <tr>
-     <td bgcolor="#0000FF">&nbsp;</td>
-     <td><pre>&lt;filterchain&gt;
-    &lt;headfilter lines="-1" skip="2"/&gt;
+ <td rowspan="9" style="background:fuchsia;">
+   <pre style="background:fuchsia;margin: 0 0 0 0;">&lt;filterchain&gt;
     &lt;tailfilter lines="-1" skip="2"/&gt;
-&lt;/filterchain&gt;</pre></td>
-    </tr>
-    <tr>
-     <td bgcolor="#00FF00">&nbsp;</td>
-     <td><pre>&lt;filterchain&gt;
-    &lt;tailfilter lines="2"/&gt;
-&lt;/filterchain&gt;</pre></td>
-    </tr>
-    </table>
+&lt;/filterchain&gt;</pre>
  </td>
+ <td rowspan="2">&nbsp;</td>
 </tr>
 <tr>
- <td> Line 2 </td>
+ <td>Line 2</td>
 </tr>
 <tr>
- <td> Line 3 </td>
- <td rowspan="9" bgcolor="#008000">&nbsp;</td>
+ <td>Line 3</td>
+ <td rowspan="9" style="background:tomato;">
+   <pre style="background:tomato;margin: 0 0 0 0;">&lt;filterchain&gt;
+    &lt;headfilter lines="-1" skip="2"/&gt;
+&lt;/filterchain&gt;</pre></td>
+ <td rowspan="7" style="background:dodgerblue;">
+   <pre style="background:dodgerblue;margin: 0 0 0 0;">&lt;filterchain&gt;
+    &lt;headfilter lines="-1" skip="2"/&gt;
+    &lt;tailfilter lines="-1" skip="2"/&gt;
+&lt;/filterchain&gt;</pre></td>
 </tr>
 <tr>
- <td> Line 4 </td>
+ <td>Line 4</td>
 </tr>
 <tr>
- <td> Line 5 </td>
- <td rowspan="3" bgcolor="#0000FF">&nbsp;</td>
+ <td>Line 5</td>
 </tr>
 <tr>
- <td> Lines ... </td>
+ <td>Lines ...</td>
 </tr>
 <tr>
- <td> Line 95 </td>
+ <td>Line 95</td>
 </tr>
 <tr>
- <td> Line 96 </td>
- <td rowspan="4">&nbsp;</td>
+ <td>Line 96</td>
 </tr>
 <tr>
- <td> Line 97 </td>
+ <td>Line 97</td>
 </tr>
 <tr>
- <td> Line 98 </td>
- <td rowspan="2" bgcolor="#00FF00">&nbsp;</td>
+ <td>Line 98</td>
+ <td rowspan="2" style="background:lime;">
+   <pre  style="background:lime;margin: 0 0 0 0;">&lt;filterchain&gt;
+    &lt;tailfilter lines="2"/&gt;
+&lt;/filterchain&gt;</pre></td>
+ <td rowspan="2">&nbsp;</td>
 </tr>
 <tr>
- <td> Line 99 </td>
+ <td>Line 99</td>
 </tr>
 </table>
 
+<h4>Examples</h4>
 
-
-<h4>Examples:</h4>
-
-This stores the last 15 lines of the supplied data in the property ${src.file.tail}
-<blockquote><pre>
+<p>This stores the last 15 lines of the supplied data in the
+property <samp>${src.file.tail}</samp></p>
+<pre>
 &lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;${src.file.tail}&quot;&gt;
   &lt;filterchain&gt;
     &lt;filterreader classname=&quot;org.apache.tools.ant.filters.TailFilter&quot;&gt;
       &lt;param name=&quot;lines&quot; value=&quot;15&quot;/&gt;
     &lt;/filterreader&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-Convenience method:
-<blockquote><pre>
+<p>Convenience method:</p>
+<pre>
 &lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;${src.file.tail}&quot;&gt;
   &lt;filterchain&gt;
     &lt;tailfilter lines=&quot;15&quot;/&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-
-This stores the last 5 lines of the first 15 lines of the supplied
-data in the property ${src.file.mid}
-<blockquote><pre>
+<p>This stores the last 5 lines of the first 15 lines of the supplied data in the
+property <samp>${src.file.mid}</samp></p>
+<pre>
 &lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;${src.file.mid}&quot;&gt;
   &lt;filterchain&gt;
     &lt;filterreader classname=&quot;org.apache.tools.ant.filters.HeadFilter&quot;&gt;
@@ -988,628 +863,668 @@
       &lt;param name=&quot;lines&quot; value=&quot;5&quot;/&gt;
     &lt;/filterreader&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
 
-Convenience method:
-<blockquote><pre>
+<p>Convenience method:</p>
+<pre>
 &lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;${src.file.mid}&quot;&gt;
   &lt;filterchain&gt;
     &lt;headfilter lines=&quot;15&quot;/&gt;
     &lt;tailfilter lines=&quot;5&quot;/&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
-
+&lt;/loadfile&gt;</pre>
 
-This stores the last 10 lines, skipping the last 2 lines, of the supplied data
-in the property src.file.head. (Means: if supplied data contains 60 lines,
-lines 49-58 are extracted)
-<blockquote><pre>
+<p>This stores the last 10 lines, skipping the last 2 lines, of the supplied data in the
+property <code>src.file.head</code>. (Means: if supplied data contains 60 lines, lines 49-58 are
+extracted)</p>
+<pre>
 &lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;src.file.head&quot;&gt;
   &lt;filterchain&gt;
     &lt;tailfilter lines=&quot;10&quot; skip=&quot;2&quot;/&gt;
   &lt;/filterchain&gt;
-&lt;/loadfile&gt;
-</pre></blockquote>
+&lt;/loadfile&gt;</pre>
+
+<h3 id="deletecharacters">DeleteCharacters</h3>
+
+<p><em>Since Ant 1.6</em></p>
 
-<h3><a name="deletecharacters">DeleteCharacters</a></h3>
+<p>This filter deletes specified characters.</p>
 
-  <p>This filter deletes specified characters.</p>
-  <p><em>since Ant 1.6</em></p>
-  <p>This filter is only available in the convenience form.</p>
+<p>This filter is only available in the convenience form.</p>
 
-<table cellSpacing=0 cellPadding=2 border=1>
+<table class="attr">
   <tr>
-    <td vAlign=top><b>Parameter Name</b></td>
-    <td vAlign=top><b>Parameter Value</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Parameter Name</th>
+    <th>Parameter Value</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>chars</td>
-    <td vAlign=top>
-      The characters to delete. This attribute is
-      <a href="#backslash">backslash enabled</a>.
+    <td>chars</td>
+    <td>
+      The characters to delete. This attribute is <a href="#backslash">backslash enabled</a>.
     </td>
-    <td vAlign=top align="center">Yes</td>
+    <td>Yes</td>
   </tr>
 </table>
 <p>
-<h4>Examples:</h4>
+<h4>Examples</h4>
 
-Delete tabs and returns from the data.
-<blockquote><pre>
-&lt;deletecharacters chars="\t\r"/&gt;
-</pre></blockquote>
+<p>Delete tabs and returns from the data.</p>
+<pre>&lt;deletecharacters chars="\t\r"/&gt;</pre>
 
-<h3><a name="concatfilter">ConcatFilter</a></h3>
-  <p>This filter prepends or appends the content file to the filtered files.</p>
-  <p><em>since Ant 1.6</em></p>
-<table cellSpacing=0 cellPadding=2 border=1>
+<h3 id="concatfilter">ConcatFilter</h3>
+<p><em>Since Ant 1.6</em></p>
+<p>This filter prepends or appends the content file to the filtered files.</p>
+<table class="attr">
   <tr>
-    <td vAlign=top><b>Parameter Name</b></td>
-    <td vAlign=top><b>Parameter Value</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Parameter Name</th>
+    <th>Parameter Value</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>prepend</td>
-    <td vAlign=top>
+    <td>prepend</td>
+    <td>
       The name of the file which content should be prepended to the file.
     </td>
-    <td vAlign=top align="center">No</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td vAlign=top>append</td>
-    <td vAlign=top>
+    <td>append</td>
+    <td>
       The name of the file which content should be appended to the file.
     </td>
-    <td vAlign=top align="center">No</td>
+    <td>No</td>
   </tr>
 </table>
 <p>
 
-<h4>Examples:</h4>
+<h4>Examples</h4>
 
-Do nothing:
-<blockquote><pre>
+<p>Do nothing:</p>
+<pre>
 &lt;filterchain&gt;
     &lt;concatfilter/&gt;
-&lt;/filterchain&gt;
-</pre></blockquote>
+&lt;/filterchain&gt;</pre>
 
-Adds a license text before each java source:
-<blockquote><pre>
+<p>Adds a license text before each Java source file:</p>
+<pre>
 &lt;filterchain&gt;
     &lt;concatfilter prepend="apache-license-java.txt"/&gt;
-&lt;/filterchain&gt;
-</pre></blockquote>
+&lt;/filterchain&gt;</pre>
 
+<h3 id="sortfilter">SortFilter</h3>
+<p><em>Since Ant 1.8.0</em></p>
 
+<p>The sort filter reads all lines and sorts them.  The sort order can be reversed and it is
+possible to specify a custom implementation of the <code class="code">java.util.Comparator</code>
+interface to get even more control.</p>
+
+<table class="attr">
+  <tr>
+    <th>Parameter Name</th>
+    <th>Parameter Value</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>reverse</td>
+    <td>Whether to reverse the sort order.<br/><strong>Note</strong>: this parameter is ignored
+      if the comparator parameter is present as well.</td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+  <tr>
+    <td>comparator</td>
+    <td>Class name of a class that implements <code class="code">java.util.Comparator</code> for
+      Strings.  This class will be used to determine the sort order of lines.</td>
+    <td>No</td>
+  </tr>
+</table>
+
+<p>This filter is also available using the name <code>sortfilter</code>.
+The <code>reverse</code> parameter becomes an attribute, <code>comparator</code> can be
+specified by using a nested element.</p>
+
+<h4>Examples</h4>
+
+<pre>
+&lt;copy todir=&quot;build&quot;&gt;
+    &lt;fileset dir=&quot;input&quot; includes=&quot;*.txt&quot;/&gt;
+    &lt;filterchain&gt;
+        &lt;sortfilter/&gt;
+    &lt;/filterchain&gt;
+&lt;/copy&gt;</pre>
 
-<h3><a name="tokenfilter">TokenFilter</a></h3>
-This filter tokenizes the inputstream into strings and passes these
-strings to filters of strings. Unlike the other filterreaders, this does
-not support params, only convenience methods are implemented.
-The tokenizer and the string filters are defined by nested elements.
-<p><em>since Ant 1.6</em></p>
 <p>
-Only one tokenizer element may be used, the LineTokenizer is the
-default if none are specified.  A tokenizer
-splits the input into token strings and trailing delimiter strings.
+Sort all files <samp>*.txt</samp> from <samp>src</samp> location into <samp>build</samp>
+location. The lines of each file are sorted in ascendant order comparing the lines via the
+<code>String.compareTo(Object o)</code> method.
+</p>
+
+<pre>
+&lt;copy todir=&quot;build&quot;&gt;
+    &lt;fileset dir=&quot;input&quot; includes=&quot;*.txt&quot;/&gt;
+    &lt;filterchain&gt;
+        &lt;sortfilter reverse=&quot;true&quot;/&gt;
+    &lt;/filterchain&gt;
+&lt;/copy&gt;</pre>
+
 <p>
-There may be zero or more string filters. A string filter processes
-a token and either returns a string or a null.
-It the string is not null it is passed to the next filter. This
-proceeds until all the filters are called.
-If a string is returned after all the filters, the string is
-outputs with its associated token delimiter
-(if one is present).
-The trailing delimiter may be overridden by the <i>delimOutput</i>
-attribute.
+Sort all files <samp>*.txt</samp> from <samp>src</samp> location into reverse order and copy
+them into <samp>build</samp> location.
+</p>
+
+<pre>
+&lt;copy todir=&quot;build&quot;&gt;
+    &lt;fileset dir=&quot;input&quot; includes=&quot;*.txt&quot;/&gt;
+    &lt;filterchain&gt;
+        &lt;filterreader classname=&quot;org.apache.tools.ant.filters.SortFilter&quot;&gt;
+            &lt;param name=&quot;comparator&quot; value=&quot;org.apache.tools.ant.filters.EvenFirstCmp&quot;/&gt;
+        &lt;/filterreader&gt;
+    &lt;/filterchain&gt;
+&lt;/copy&gt;</pre>
+
 <p>
-<a name="backslash"><em>backslash interpretation</em></a>
-A number of attributes (including <i>delimOutput</i>) interpret
-backslash escapes. The following are understood: \n, \r, \f, \t
-and \\.
+Sort all files <samp>*.txt</samp> from <samp>src</samp> location using as sorting
+criterium <code class="code">EvenFirstCmp</code> class, that sorts the file lines putting even lines
+first then odd lines for example. The modified files are copied into <samp>build</samp>
+location. The <code class="code">EvenFirstCmp</code> has to an instanciable class
+via <code class="code">Class.newInstance()</code>, therefore in case of inner class has to
+be <em>static</em>. It also has to implement <code class="code">java.util.Comparator</code>
+interface, for example:
+</p>
 
+<pre>
+package org.apache.tools.ant.filters;
+... (omitted)
+public final class EvenFirstCmp implements &lt;b&gt;Comparator&lt;/b&gt; {
+   public int compare(Object o1, Object o2) {
+       ...(omitted)
+   }
+}</pre>
+
+<p>The example above is equivalent to:</p>
+
+<pre>
+&lt;componentdef name=&quot;evenfirst&quot;
+              classname=&quot;org.apache.tools.ant.filters.EvenFirstCmp&quot;/&gt;
+&lt;copy todir=&quot;build&quot;&gt;
+    &lt;fileset dir=&quot;input&quot; includes=&quot;*.txt&quot;/&gt;
+    &lt;filterchain&gt;
+        &lt;sortfilter&gt;
+            &lt;evenfirst/&gt;
+        &lt;/sortfilter&gt;
+    &lt;/filterchain&gt;
+&lt;/copy&gt;</pre>
 
-<table cellSpacing=0 cellPadding=2 border=1>
+<h3 id="tokenfilter">TokenFilter</h3>
+<p>This filter tokenizes the InputStream into strings and passes these strings to filters of
+strings. Unlike the other FilterReaders, this does not support <code>param</code>s, only
+convenience methods are implemented.  The tokenizer and the string filters are defined by nested
+elements.</p>
+<p><em>Since Ant 1.6</em></p>
+<p>
+Only one <code>tokenizer</code> element may be used, the LineTokenizer is the default if none
+are specified.  A tokenizer splits the input into token strings and trailing delimiter strings.
+<p>
+There may be zero or more string filters. A string filter processes a token and either returns a
+string or a null.  It the string is not null it is passed to the next filter. This proceeds
+until all the filters are called.  If a string is returned after all the filters, the string is
+outputs with its associated token delimiter (if one is present).  The trailing delimiter may be
+overridden by the <var>delimOutput</var> attribute.
+<h4 id="backslash">Backslash interpretation</h4>
+<p>
+A number of attributes (including <var>delimOutput</var>) interpret backslash escapes. The
+following are understood: <q>\n</q>, <q>\r</q>, <q>\f</q>, <q>\t</q> and <q>\\</q>.
+</p>
+
+<table class="attr">
   <tr>
-    <td vAlign=top><b>Attribute</b></td>
-    <td vAlign=top><b>Description</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>delimOutput</td>
-    <td vAlign=top>
-     This overrides the tokendelimiter
-        returned by the tokenizer if it is not empty. This
+    <td>delimOutput</td>
+    <td>
+     This overrides the token delimiter returned by the tokenizer if it is not empty. This
      attribute is backslash enabled.
-</td>
-    <td vAlign=top align="center">No</td>
+    </td>
+    <td>No</td>
   </tr>
 </table>
+<p>The following tokenizers are provided by the default distribution.</p>
+<p>
+  <a href="#linetokenizer">LineTokenizer</a><br/>
+  <a href="#filetokenizer">FileTokenizer</a><br/>
+  <a href="#stringtokenizer">StringTokenizer</a>
+</p>
+<p>The following string filters are provided by the default distribution.</p>
+<p>
+  <a href="#replacestring">ReplaceString</a><br/>
+  <a href="#containsstring">ContainsString</a><br/>
+  <a href="#replaceregex">ReplaceRegex</a><br/>
+  <a href="#containsregex">ContainsRegex</a><br/>
+  <a href="#trim">Trim</a><br/>
+  <a href="#ignoreblank">IgnoreBlank</a><br/>
+  <a href="#filterdeletecharacters">DeleteCharacters</a><br/>
+  <a href="#uniqfilter">UniqFilter</a><br/>
+  <a href="#native2asciifilter">Native2AsciiFilter</a>
+</p>
+<p>The following string filters are provided by the optional distribution.</p>
 <p>
+  <a href="#scriptfilter">ScriptFilter</a>
+</p>
+<p>
+  <a href="#custom">Custom</a> tokenizers and string filters can be declared
+  using <a href="../Tasks/typedef.html">typedef</a> task.
+</p>
+<p>
+Some of the filters may be used directly within a <code>filterchain</code>. In this case
+a <code>tokenfilter</code> is created implicitly. An extra attribute <var>byline</var> is added to
+the filter to specify whether to use a <code>linetokenizer</code> (<var>byline</var>=<q>true</q>) or
+a <code>filetokenizer</code> (<var>byline</var>=<q>false</q>). The default is <q>true</q>.
+</p>
 
-    The following tokenizers are provided by the default distribution.
-    <p>
-        <a href="#linetokenizer">LineTokenizer</a><br>
-        <a href="#filetokenizer">FileTokenizer</a><br>
-        <a href="#stringtokenizer">StringTokenizer</a><br>
-    </p>
-
-    The following string filters are provided by the default distribution.
-    <p>
-        <a href="#replacestring">ReplaceString</a><br>
-        <a href="#containsstring">ContainsString</a><br>
-        <a href="#replaceregex">ReplaceRegex</a><br>
-        <a href="#containsregex">ContainsRegex</a><br>
-        <a href="#trim">Trim</a><br>
-        <a href="#ignoreblank">IgnoreBlank</a><br>
-        <a href="#filterdeletecharacters">DeleteCharacters</a><br>
-        <a href="#uniqfilter">UniqFilter</a><br>
-        <a href="#native2asciifilter">Native2AsciiFilter</a><br>
-    </p>
-
-    The following string filters are provided by the optional distribution.
-    <p>
-        <a href="#scriptfilter">ScriptFilter</a><br>
-    </p>
-
-Some of the filters may be used directly within a filter chain. In this
-case a tokenfilter is created implicitly. An extra attribute "byline"
-is added to the filter to specify whether to use a linetokenizer
-(byline="true") or a filetokenizer (byline="false"). The default
-is "true".
-<p>
-
-<p><b><em><a name="linetokenizer">LineTokenizer</a></em></b></p>
-This tokenizer splits the input into lines.
-The tokenizer delimits lines
-by "\r", "\n" or "\r\n".
-This is the default tokenizer.
-<table cellSpacing=0 cellPadding=2 border=1>
-  <tr>
-    <td vAlign=top><b>Attribute</b></td>
-    <td vAlign=top><b>Description</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+<h4 id="linetokenizer">LineTokenizer</h4>
+<p>This tokenizer splits the input into lines.  The tokenizer delimits lines by <q>\r</q>, <q>\n</q>
+or <q>\r\n</q>.  This is the default tokenizer.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>includeDelims</td>
-    <td vAlign=top>
+    <td>includeDelims</td>
+    <td>
       Include the line endings in the token.
-      Default is false.
     </td>
-    <td vAlign=top align="center">No</td>
+    <td>No; default is <q>false</q></td>
   </tr>
 </table>
-<h4>Examples:</h4>
-
-Convert input current line endings to unix style line endings.
-<blockquote><pre>
-&lt;tokenfilter delimoutput=&quot;\n&quot;/&gt;
-</pre></blockquote>
+<h5>Examples</h5>
 
+<p>Convert input current line endings to Unix style line endings.</p>
+<pre>&lt;tokenfilter delimoutput=&quot;\n&quot;/&gt;</pre>
 
-Remove blank lines.
-<blockquote><pre>
+<p>Remove blank lines.</p>
+<pre>
 &lt;tokenfilter&gt;
     &lt;ignoreblank/&gt;
-&lt;/tokenfilter&gt;
-
-</pre></blockquote>
+&lt;/tokenfilter&gt;</pre>
 
-<p><b><em><a name="filetokenizer">FileTokenizer</a></em></b></p>
-This tokenizer treats <b>all</b> the input as a token. So be
-careful not to use this on very large input.
-<h4>Examples:</h4>
+<h4 id="filetokenizer">FileTokenizer</h4>
+<p>This tokenizer treats <strong>all</strong> the input as a token. So be careful not to use
+this on very large input.</p>
+<h5>Examples</h5>
 
-Replace the first occurrence of package with //package.
-<blockquote><pre>
+<p>Replace the first occurrence of <samp>package</samp> with <samp>//package</samp>.</p>
+<pre>
 &lt;tokenfilter&gt;
       &lt;filetokenizer/&gt;
       &lt;replaceregex pattern="([\n\r]+[ \t]*|^[ \t]*)package"
                     flags="s"
                     replace="\1//package"/&gt;
-&lt;/tokenfilter&gt;
-</pre></blockquote>
+&lt;/tokenfilter&gt;</pre>
 
-<p><b><em><a name="stringtokenizer">StringTokenizer</a></em></b></p>
-This tokenizer is based on java.util.StringTokenizer.
-It splits up the input into strings separated by white space, or
-by a specified list of delimiting characters.
-If the stream starts with delimiter characters, the first
-token will be the empty string (unless the <i>delimsaretokens</i>
-attribute is used).
-
-<table cellSpacing=0 cellPadding=2 border=1>
-  <tr>
-    <td vAlign=top><b>Attribute</b></td>
-    <td vAlign=top><b>Description</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td vAlign=top>delims</td>
-    <td vAlign=top>The delimiter characters. White space
-      is used if this is not set. (White space is defined
-      in this case by java.lang.Character.isWhitespace()).
-    </td>
-    <td vAlign=top align="center">No</td>
+<h4 id="stringtokenizer">StringTokenizer</h4>
+<p>This tokenizer is based on <code class="code">java.util.StringTokenizer</code>.  It splits up the
+input into strings separated by white space, or by a specified list of delimiting characters.  If
+the stream starts with delimiter characters, the first token will be the empty string (unless
+the <var>delimsaretokens</var> attribute is used).</p>
+
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">delimsaretokens</td>
-    <td valign="top">If this is true,
-      each delimiter character is returned as a token.
-      Default is false.
+    <td>delims</td>
+    <td>The delimiter characters.
     </td>
-    <td valign="top" align="center">No</td>
+    <td>No; defaults to white space as defined
+      by <code>java.lang.Character.isWhitespace()</code></td>
   </tr>
   <tr>
-    <td valign="top">suppressdelims</td>
-    <td valign="top">
-      If this is true, delimiters are not returned.
-      Default is false.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>delimsaretokens</td>
+    <td>If this is <q>true</q>, each delimiter character is returned as a token.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td vAlign=top>includeDelims</td>
-    <td vAlign=top>
-      Include the delimiters in the token.
-      Default is false.
-    </td>
-    <td vAlign=top align="center">No</td>
+    <td>suppressdelims</td>
+    <td>If this is <q>true</q>, delimiters are not returned.</td>
+    <td>No; default is <q>false</q></td>
+  </tr>
+  <tr>
+    <td>includeDelims</td>
+    <td>Include the delimiters in the token.</td>
+    <td>No; default is <q>false</q></td>
   </tr>
 </table>
 
-<h4>Examples:</h4>
+<h5>Examples</h5>
 
-Surround each non space token with a "[]".
+<p>Surround each non space token with a <q>[]</q>.</p>
 
-<blockquote><pre>
+<pre>
 &lt;tokenfilter&gt;
     &lt;stringtokenizer/&gt;
     &lt;replaceregex pattern="(.+)" replace="[\1]"/&gt;
-&lt;/tokenfilter&gt;
-
-</pre></blockquote>
+&lt;/tokenfilter&gt;</pre>
 
-<p><b><em><a name="replacestring">ReplaceString</a></em></b></p>
-This is a simple filter to replace strings.
-This filter may be used directly within a filterchain.
+<h4 id="replacestring">ReplaceString</h4>
+<p>This is a simple filter to replace strings.  This filter may be used directly within
+a <code>filterchain</code>.</p>
 
-<table cellSpacing=0 cellPadding=2 border=1>
+<table class="attr">
   <tr>
-    <td vAlign=top><b>Attribute</b></td>
-    <td vAlign=top><b>Description</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>from</td>
-    <td vAlign=top>The string that must be replaced.</td>
-    <td vAlign=top align="center">Yes</td>
+    <td>from</td>
+    <td>The string that must be replaced.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">to</td>
-    <td valign="top">The new value for the replaced string. When omitted
-      an empty string is used.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>to</td>
+    <td>The new value for the replaced string.</td>
+    <td>No; defaults to empty string</td>
   </tr>
 </table>
 
-<h4>Examples:</h4>
+<h5>Examples</h5>
 
-Replace "sun" with "moon".
+<p>Replace <q>sun</q> with <q>moon</q>.</p>
 
-<blockquote><pre>
+<pre>
 &lt;tokenfilter&gt;
     &lt;replacestring from="sun" to="moon"/&gt;
-&lt;/tokenfilter&gt;
-</pre></blockquote>
+&lt;/tokenfilter&gt;</pre>
 
-<p><b><em><a name="containsstring">ContainsString</a></em></b></p>
-This is a simple filter to filter tokens that contains
-a specified string.
+<h4 id="containsstring">ContainsString</h4>
+<p>This is a simple filter to filter tokens that contains a specified string.</p>
 
-<table cellSpacing=0 cellPadding=2 border=1>
+<table class="attr">
   <tr>
-    <td vAlign=top><b>Attribute</b></td>
-    <td vAlign=top><b>Description</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>contains</td>
-    <td vAlign=top>The string that the token must contain.</td>
-    <td vAlign=top align="center">Yes</td>
+    <td>contains</td>
+    <td>The string that the token must contain.</td>
+    <td>Yes</td>
   </tr>
 </table>
 
-<h4>Examples:</h4>
+<h5>Examples</h5>
 
-Include only lines that contain "foo";
+<p>Include only lines that contain <q>foo</q></p>
 
-<blockquote><pre>
+<pre>
 &lt;tokenfilter&gt;
     &lt;containsstring contains="foo"/&gt;
-&lt;/tokenfilter&gt;
-
-</pre></blockquote>
+&lt;/tokenfilter&gt;</pre>
 
-<p><b><em><a name="replaceregex">ReplaceRegex</a></em></b></p>
-This string filter replaces regular expressions.
-This filter may be used directly within a filterchain.
+<h4 id="replaceregex">ReplaceRegex</h4>
+<p>
+This string filter replaces regular expressions.  This filter may be used directly within
+a <code>filterchain</code>.
+</p>
 <p>
- See <a href="regexp.html#implementation">Regexp Type</a>
-concerning the choice of the implementation.
+See <a href="regexp.html#implementation">Regexp Type</a> concerning the choice of the
+implementation.
 </p>
 
-<table cellSpacing=0 cellPadding=2 border=1>
+<table class="attr">
   <tr>
-    <td vAlign=top><b>Attribute</b></td>
-    <td vAlign=top><b>Description</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>pattern</td>
-    <td vAlign=top>The regular expression pattern to match in
-      the token.</td>
-    <td vAlign=top align="center">Yes</td>
+    <td>pattern</td>
+    <td>The regular expression pattern to match in the token.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td vAlign=top>replace</td>
-    <td vAlign=top>The substitution pattern to replace the matched
-      regular expression. When omitted an empty string is used.</td>
-    <td vAlign=top align="center">No</td>
+    <td>replace</td>
+    <td>The substitution pattern to replace the matched regular expression.</td>
+    <td>No; defaults to empty string</td>
   </tr>
   <tr>
-    <td vAlign=top>flags</td>
-    <td vAlign=top>See
-<a href="../Tasks/replaceregexp.html">ReplaceRegexp</a>
-for an explanation of regex flags.</td>
-    <td vAlign=top align="center">No</td>
+    <td>flags</td>
+    <td>See <a href="../Tasks/replaceregexp.html">ReplaceRegexp</a> for an explanation of regex
+      flags.</td>
+    <td>No</td>
   </tr>
 </table>
-<h4>Examples:</h4>
+<h5>Examples</h5>
 
-Replace all occurrences of "hello" with "world", ignoring case.
+<p>Replace all occurrences of <q>hello</q> with <q>world</q>, ignoring case.</p>
 
-<blockquote><pre>
+<pre>
 &lt;tokenfilter&gt;
     &lt;replaceregex pattern="hello" replace="world" flags="gi"/&gt;
-&lt;/tokenfilter&gt;
-
-</pre></blockquote>
+&lt;/tokenfilter&gt;</pre>
 
-<p><b><em><a name="containsregex">ContainsRegex</a></em></b></p>
-This filters strings that match regular expressions.
-The filter may optionally replace the matched regular expression.
-This filter may be used directly within a filterchain.
-<p>
-See
-<a href="regexp.html#implementation">Regexp Type</a>
-concerning the choice of regular expression implementation.
+<h4 id="containsregex">ContainsRegex</h4>
+<p>
+This filters strings that match regular expressions.  The filter may optionally replace the
+matched regular expression.  This filter may be used directly within a <code>filterchain</code>.
 </p>
-<table cellSpacing=0 cellPadding=2 border=1>
+<p>
+See <a href="regexp.html#implementation">Regexp Type</a> concerning the choice of regular
+expression implementation.
+</p>
+<table class="attr">
   <tr>
-    <td vAlign=top><b>Attribute</b></td>
-    <td vAlign=top><b>Description</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>pattern</td>
-    <td vAlign=top>The regular expression pattern to match in
-      the token.</td>
-    <td vAlign=top align="center">Yes</td>
+    <td>pattern</td>
+    <td>The regular expression pattern to match in the token.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td vAlign=top>replace</td>
-    <td vAlign=top>The substitution pattern to replace the matched
-      regular expression. When omitted the original token is returned.
-    </td>
-    <td vAlign=top align="center">No</td>
+    <td>replace</td>
+    <td>The substitution pattern to replace the matched regular expression.</td>
+    <td>No; defaults to returning the original token</td>
   </tr>
   <tr>
-    <td vAlign=top>flags</td>
-    <td vAlign=top>See
-<a href="../Tasks/replaceregexp.html">ReplaceRegexp</a>
-for an explanation of regex flags.</td>
-    <td vAlign=top align="center">No</td>
+    <td>flags</td>
+    <td>See <a href="../Tasks/replaceregexp.html">ReplaceRegexp</a> for an explanation of regex
+      flags.</td>
+    <td>No</td>
   </tr>
 </table>
 
-<h4>Examples:</h4>
+<h5>Examples</h5>
 
-Filter lines that contain "hello" or "world", ignoring case.
+<p>Filter lines that contain <q>hello</q> or <q>world</q>, ignoring case.</p>
 
-<blockquote><pre>
+<pre>
 &lt;tokenfilter&gt;
     &lt;containsregex pattern="(hello|world)" flags="i"/&gt;
-&lt;/tokenfilter&gt;
+&lt;/tokenfilter&gt;</pre>
 
-</pre></blockquote>
+<p>This example replaces lines like <code>SUITE(TestSuite, bits);</code> with <code>void
+register_bits();</code> and removes other lines.</p>
 
-This example replaces lines like "SUITE(TestSuite, bits);" with
-"void register_bits();" and removes other lines.
-
-<blockquote><pre>
+<pre>
 &lt;tokenfilter&gt;
     &lt;containsregex
         pattern="^ *SUITE\(.*,\s*(.*)\s*\).*"
         replace="void register_\1();"/&gt;
-&lt;/tokenfilter&gt;
-</pre></blockquote>
+&lt;/tokenfilter&gt;</pre>
+
+<h4 id="trim">Trim</h4>
+<p>This filter trims whitespace from the start and end of tokens.  This filter may be used
+directly within a <code>filterchain</code>.</p>
+
+<h4 id="ignoreblank">IgnoreBlank</h4>
+<p>This filter removes empty tokens.  This filter may be used directly within
+a <code>filterchain</code>.</p>
 
-<p><b><em><a name="trim">Trim</a></em></b></p>
-This filter trims whitespace from the start and end of
-tokens.
-This filter may be used directly within a filterchain.
-<p><b><em><a name="ignoreblank">IgnoreBlank</a></em></b></p>
-This filter removes empty tokens.
-This filter may be used directly within a filterchain.
-<p><b><em><a name="filterdeletecharacters">DeleteCharacters</a></em></b></p>
-This filter deletes specified characters from tokens.
+<h4 id="filterdeletecharacters">DeleteCharacters</h4>
+<p>This filter deletes specified characters from tokens.</p>
 
-<table cellSpacing=0 cellPadding=2 border=1>
+<table class="attr">
   <tr>
-    <td vAlign=top><b>Attribute</b></td>
-    <td vAlign=top><b>Description</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>chars</td>
-    <td vAlign=top>The characters to delete. This attribute
-      is backslash enabled.</td>
-    <td vAlign=top align="center">Yes</td>
+    <td>chars</td>
+    <td>The characters to delete. This attribute is backslash enabled.</td>
+    <td>Yes</td>
   </tr>
 </table>
 
-<h4>Examples:</h4>
+<h5>Examples</h5>
 
-Delete tabs from lines, trim the lines and removes empty lines.
+<p>Delete tabs from lines, trim the lines and removes empty lines.</p>
 
-<blockquote><pre>
+<pre>
 &lt;tokenfilter&gt;
     &lt;deletecharacters chars="\t"/&gt;
     &lt;trim/&gt;
     &lt;ignoreblank/&gt;
-&lt;/tokenfilter&gt;
-
-</pre></blockquote>
+&lt;/tokenfilter&gt;</pre>
 
-<p><b><em><a name="uniqfilter">UniqFilter</a></em></b></p>
+<h4 id="uniqfilter">UniqFilter</h4>
 
-<p>Suppresses all tokens that match their ancestor token.  It is most
-  useful if combined with a sort filter.</p>
+<p>Suppresses all tokens that match their ancestor token.  It is most useful if combined with a
+sort filter.</p>
 
-<p>This filter may be used directly within a filterchain.</p>
+<p>This filter may be used directly within a <code>filterchain</code>.</p>
 
-<h4>Example:</h4>
+<h5>Example</h5>
 
-This suppresses duplicate lines.
-<blockquote><pre>
+<p>This suppresses duplicate lines.</p>
+<pre>
 &lt;tokenfilter&gt;
   &lt;uniqfilter/&gt;
-&lt;/tokenfilter&gt;
-</pre></blockquote>
+&lt;/tokenfilter&gt;</pre>
+
+<h4 id="native2asciifilter">Native2AsciiFilter</h4>
 
-<p><b><em><a name="native2asciifilter">Native2AsciiFilter</a></em></b></p>
+<p><em>Since Ant 1.9.8</em></p>
 
 <p>Uses the "builtin" implementation of
-  the <a href="../Tasks/native2ascii.html">native2ascii</a> task.</p>
+the <a href="../Tasks/native2ascii.html">native2ascii</a> task.</p>
 
-<p>Replaces non-ascii characters by their Unicode-escapes or
-  vice-versa.  <em>Since Ant 1.9.8</em>.</p>
+<p>Replaces non-ASCII characters by their Unicode-escapes or vice-versa.</p>
 
-<p>This filter may be used directly within a filterchain.</p>
+<p>This filter may be used directly within a <code>filterchain</code>.</p>
 
-<table cellSpacing=0 cellPadding=2 border=1>
+<table class="attr">
   <tr>
-    <td vAlign=top><b>Attribute</b></td>
-    <td vAlign=top><b>Description</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>reverse</td>
-    <td vAlign=top>Reverse the sense of the conversion,
-      i.e. convert from ASCII to native.</td>
-    <td vAlign=top align="center">No</td>
+    <td>reverse</td>
+    <td>Reverse the sense of the conversion, i.e. convert from ASCII to native.</td>
+    <td>No</td>
   </tr>
 </table>
 
-<h4>Example:</h4>
+<h5>Example</h5>
 
 <p>This replaces all non-ASCII characters by their Unicode-escapes.</p>
-<blockquote><pre>
+<pre>
 &lt;tokenfilter&gt;
   &lt;native2asciifilter/&gt;
-&lt;/tokenfilter&gt;
-</pre></blockquote>
+&lt;/tokenfilter&gt;</pre>
 
-<p><b><em><a name="scriptfilter">ScriptFilter</a></em></b></p>
-This is an optional filter that executes a script in a
-<a href="http://jakarta.apache.org/bsf" target="_top">Apache BSF</a>
-  or
-  <a href="https://scripting.dev.java.net">JSR 223</a>
-supported language.</p>
-See the <a href="../Tasks/script.html">Script</a> task for
-an explanation of scripts and dependencies.
+<h4 id="scriptfilter">ScriptFilter</h4>
+<p>
+This is an optional filter that executes a script in a <a href="https://jakarta.apache.org/bsf"
+target="_top">Apache BSF</a>
+or <a href="https://jcp.org/aboutJava/communityprocess/maintenance/jsr223/223ChangeLog.html"
+target="_top">JSR 223</a> supported language.
 </p>
 <p>
-The script is provided with an object <i>self</i> that has
-getToken() and setToken(String) methods.
-The getToken() method returns the current token. The setToken(String)
-method replaces the current token.
+See the <a href="../Tasks/script.html">Script</a> task for an explanation of scripts and
+dependencies.
 </p>
-
-This filter may be used directly within a filterchain.<p>
-<table cellSpacing=0 cellPadding=2 border=1>
+<p>
+The script is provided with an object <samp class="code">self</samp> that
+has <code class="code">getToken()</code> and <code class="code">setToken(String)</code> methods.
+The <code class="code">getToken()</code> method returns the current
+token. The <code class="code">setToken(String)</code> method replaces the current token.
+</p>
+<p>
+This filter may be used directly within a <code>filterchain</code>.
+</p>
+<table class="attr">
   <tr>
-    <td vAlign=top><b>Attribute</b></td>
-    <td vAlign=top><b>Description</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>language</td>
-    <td vAlign=top> The programming language the script is written in.
-Must be a supported Apache BSF or JSR 223 language</td>
-    <td vAlign=top align="center">Yes</td>
+    <td>language</td>
+    <td>Programming language the script is written in.  Must be a supported Apache BSF or JSR 223
+      language</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">manager</td>
-    <td valign="top">
-      The script engine manager to use.
-      See the <a href="../Tasks/script.html">script</a> task
-      for using this attribute.
-    </td>
-    <td valign="top" align="center">No - default is "auto"</td>
+    <td>manager</td>
+    <td>Script engine manager to use.  See the <a href="../Tasks/script.html">script</a> task for
+      using this attribute.</td>
+    <td>No; default is <q>auto</q></td>
   </tr>
   <tr>
-    <td vAlign=top>src</td>
-    <td vAlign=top>The location of the script as a file, if not inline
-    </td>
-    <td vAlign=top align="center">No</td>
+    <td>src</td>
+    <td>Location of the script as a file, if not inline.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">setbeans</td>
-    <td valign="top">whether to have all properties, references and targets as
-      global variables in the script.  <em>since Ant 1.8.0</em></td>
-    <td valign="top" align="center">No, default is "true".</td>
+    <td>encoding</td>
+    <td>Encoding of the script as a file. <em>Since Ant 1.10.2</em></td>
+    <td>No; defaults to default JVM character encoding</td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">
-      The classpath to pass into the script.
-    </td>
-    <td align="center" valign="top">No</td>
+    <td>setbeans</td>
+    <td>Whether to have all properties, references and targets as global variables in the
+      script.  <em>Since Ant 1.8.0</em></td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+  <tr>
+    <td>classpath</td>
+    <td>The classpath to pass into the script.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">The classpath to use, given as a
-       <a href="../using.html#references">reference</a> to a path defined elsewhere.
-    <td align="center" valign="top">No</td>
+    <td>classpathref</td>
+    <td>The classpath to use, given as a <a href="../using.html#references">reference</a> to a path
+      defined elsewhere.
+    <td>No</td>
   </tr>
 </table>
-  <p>
-    This filter can take a nested &lt;classpath&gt; element.
-    See the <a href="../Tasks/script.html">script</a> task
-    on how to use this element.
-  </p>
-<h4>Examples:</h4>
-
-Convert to uppercase:
-<blockquote><pre>
+<p>
+This filter can take a nested <code>&lt;classpath&gt;</code> element.  See
+the <a href="../Tasks/script.html">script</a> task on how to use this element.
+</p>
+<h5>Examples</h5>
+<p>Convert to uppercase:</p>
+<pre>
 &lt;tokenfilter&gt;
     &lt;scriptfilter language="javascript"&gt;
         self.setToken(self.getToken().toUpperCase());
     &lt;/scriptfilter&gt;
-&lt;/tokenfilter&gt;
-</pre></blockquote>
+&lt;/tokenfilter&gt;</pre>
 
-Remove lines containing the string "bad" while
-copying text files:
-  <blockquote>
-    <pre>
+<p>Remove lines containing the string <q>bad</q> while copying text files:</p>
+<pre>
 &lt;copy todir="dist"&gt;
   &lt;fileset dir="src" includes="**/*.txt"/&gt;
   &lt;filterchain&gt;
@@ -1619,19 +1534,17 @@
         }
     &lt;/scriptfilter&gt;
   &lt;/filterchain&gt;
-&lt;/copy&gt;
-    </pre>
-  </blockquote>
-
-<h4>Custom tokenizers and string filters</h4>
-
-Custom string filters and tokenizers may be plugged in by
-extending the interfaces org.apache.tools.ant.filters.TokenFilter.Filter
-and org.apache.tools.ant.util.Tokenizer respectly.
-
-They are defined the build file using <code>&lt;typedef/&gt;</code>. For
-example a string filter that capitalizes words may be declared as:
-<blockquote><pre>
+&lt;/copy&gt;</pre>
+
+<h4 id="custom">Custom tokenizers and string filters</h4>
+
+<p>Custom string filters and tokenizers may be plugged in by extending the
+interfaces <code class="code">org.apache.tools.ant.filters.TokenFilter.Filter</code>
+and <code class="code">org.apache.tools.ant.util.Tokenizer</code> respectly.</p>
+
+<p>They are defined in the build file using <code>&lt;typedef/&gt;</code>. For example, a string
+filter that capitalizes words may be declared as:</p>
+<pre>
 package my.customant;
 import org.apache.tools.ant.filters.TokenFilter;
 
@@ -1644,135 +1557,20 @@
         return token.substring(0, 1).toUpperCase() +
                 token.substring(1);
    }
-}
-</pre></blockquote>
-
-This may be used as follows:
-<blockquote><pre>
-  &lt;typedef name="capitalize" classname="my.customant.Capitalize"
-           classpath="my.customant.path"/&gt;
-  &lt;copy file="input" tofile="output"&gt;
-    &lt;filterchain&gt;
-      &lt;tokenfilter&gt;
-        &lt;stringtokenizer/&gt;
-        &lt;capitalize/&gt;
-      &lt;/tokenfilter&gt;
-    &lt;/filterchain&gt;
-  &lt;/copy&gt;
-</pre></blockquote>
-
-
-<h3><a name="sortfilter">SortFilter</a></h3>
-  <p><em>since Ant 1.8.0</em></p>
-
-<p>The sort filter reads all lines and sorts them.  The sort order can
-  be reversed and it is possible to specify a custom implementation of
-  the <code>java.util.Comparator</code> interface to get even more
-  control.</p>
-
-<table cellSpacing=0 cellPadding=2 border=1>
-  <tr>
-    <td vAlign=top><b>Parameter Name</b></td>
-    <td vAlign=top><b>Parameter Value</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td vAlign=top>reverse</td>
-    <td vAlign=top align="center">whether to reverse the sort order,
-      defaults to false.  <b>Note:</b> this parameter is ignored if
-      the comparator parameter is present as well.</td>
-    <td vAlign=top align="center">No</td>
-  </tr>
-  <tr>
-    <td vAlign=top>comparator</td>
-    <td vAlign=top align="center">Class name of a class that
-      implements <code>java.util.Comparator</code> for Strings.  This
-      class will be used to determine the sort order of lines.</td>
-    <td vAlign=top align="center">No</td>
-  </tr>
-</table>
-
-<p>This filter is also available using the
-  name <code>sortfilter</code>.  The <code>reverse</code> parameter
-  becomes an attribute, <code>comparator</code> can be specified by
-  using a nested element.</p>
-
-<h4>Examples:</h4>
-
-<blockquote><pre>
-  &lt;copy todir=&quot;build&quot;&gt;
-      &lt;fileset dir=&quot;input&quot; includes=&quot;*.txt&quot;/&gt;
-      &lt;filterchain&gt;
-          &lt;sortfilter/&gt;
-      &lt;/filterchain&gt;
-  &lt;/copy&gt;
-</pre></blockquote>
-
-<p>
-Sort all files <code>*.txt</code> from <i>src</i> location
-into <i>build</i> location. The lines of each file are sorted in
-ascendant order comparing the lines via the
-<code>String.compareTo(Object o)</code> method.
-</p>
-
-<blockquote><pre>
-  &lt;copy todir=&quot;build&quot;&gt;
-      &lt;fileset dir=&quot;input&quot; includes=&quot;*.txt&quot;/&gt;
-      &lt;filterchain&gt;
-          &lt;sortfilter reverse=&quot;true&quot;/&gt;
-      &lt;/filterchain&gt;
-  &lt;/copy&gt;
-</pre></blockquote>
-
-<p>
-Sort all files <code>*.txt</code> from <i>src</i> location into reverse
-order and copy them into <i>build</i> location.
-</p>
-
-<blockquote><pre>
-  &lt;copy todir=&quot;build&quot;&gt;
-      &lt;fileset dir=&quot;input&quot; includes=&quot;*.txt&quot;/&gt;
-      &lt;filterchain&gt;
-          &lt;filterreader classname=&quot;org.apache.tools.ant.filters.SortFilter&quot;&gt;
-            &lt;param name=&quot;comparator&quot; value=&quot;org.apache.tools.ant.filters.EvenFirstCmp&quot;/&gt;
-          &lt;/filterreader&gt;
-      &lt;/filterchain&gt;
-  &lt;/copy&gt;
-</pre></blockquote>
-
-<p>
-Sort all files <code>*.txt</code> from <i>src</i> location using as
-sorting criterium <code>EvenFirstCmp</code> class, that sorts the file
-lines putting even lines first then odd lines for example. The modified files
-are copied into <i>build</i> location. The <code>EvenFirstCmp</code>,
-has to an instanciable class via <code>Class.newInstance()</code>,
-therefore in case of inner class has to be <em>static</em>. It also has to
-implement <code>java.util.Comparator</code> interface, for example:
-</p>
+}</pre>
 
+<p>This may be used as follows:</p>
 <pre>
-        package org.apache.tools.ant.filters;
-        ...(omitted)
-          public final class EvenFirstCmp implements &lt;b&gt;Comparator&lt;/b&gt; {
-            public int compare(Object o1, Object o2) {
-            ...(omitted)
-            }
-          }
-</pre>
-
-<p>The example above is equivalent to:</p>
-
-<blockquote><pre>
-  &lt;componentdef name="evenfirst"
-                classname="org.apache.tools.ant.filters.EvenFirstCmp&quot;/&gt;
-  &lt;copy todir=&quot;build&quot;&gt;
-      &lt;fileset dir=&quot;input&quot; includes=&quot;*.txt&quot;/&gt;
-      &lt;filterchain&gt;
-          &lt;sortfilter&gt;
-              &lt;evenfirst/&gt;
-          &lt;/sortfilter&gt;
-      &lt;/filterchain&gt;
-  &lt;/copy&gt;
-</pre></blockquote>
+&lt;typedef name="capitalize" classname="my.customant.Capitalize"
+         classpath="my.customant.path"/&gt;
+&lt;copy file="input" tofile="output"&gt;
+  &lt;filterchain&gt;
+    &lt;tokenfilter&gt;
+      &lt;stringtokenizer/&gt;
+      &lt;capitalize/&gt;
+    &lt;/tokenfilter&gt;
+  &lt;/filterchain&gt;
+&lt;/copy&gt;</pre>
 
-</body></html>
+</body>
+</html>
diff -Nru ant-1.9.10/manual/Types/filterset.html ant-1.10.3/manual/Types/filterset.html
--- ant-1.9.10/manual/Types/filterset.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/filterset.html	2018-03-24 12:37:12.000000000 +0000
@@ -14,8 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
 <html>
 <head>
   <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
@@ -23,147 +21,135 @@
 </head>
 
 <body>
-<h2><a name="filterset">FilterSet</a></h2>
+<h2 id="filterset">FilterSet</h2>
+
+<p>FilterSets are groups of filters. Filters can be defined as token-value pairs or be read in
+from a file. FilterSets can appear inside tasks that support this feature or at the same level
+as <code>&lt;target&gt;</code>&mdash;i.e., as children of <code>&lt;project&gt;</code>.</p>
+
+<p>FilterSets support the <var>id</var> and <var>refid</var> attributes.  You can define a
+FilterSet with an <var>id</var> attribute and then refer to that definition from another
+FilterSet with a <var>refid</var> attribute.  It is also possible to nest filtersets into
+filtersets to get a set union of the contained filters.</p>
+
+<p>In addition, FilterSets can specify <var>begintoken</var> and/or <var>endtoken</var>
+attributes to define what to match.</p>
+
+<p>Filtersets are used for doing replacements in tasks such as <code>&lt;copy&gt;</code>,
+etc.</p>
 
-<p>FilterSets are groups of filters. Filters can be defined as token-value
-pairs 
-or be read in from a file. FilterSets can appear inside tasks that support this 
-feature or at the same level as <code>&lt;target&gt;</code> - i.e., as
-children of 
-<code>&lt;project&gt;</code>.</p>
-
-<p>FilterSets support the <code>id</code> and <code>refid</code>
-attributes.  You can define a FilterSet with an <code>id</code>
-attribute and then refer to that definition from another FilterSet
-with a <code>refid</code> attribute.  It is also possible to nest
-filtersets into filtersets to get a set union of the contained
-filters.</p>
-
-<p>In addition, FilterSets can specify
-<code>begintoken</code> and/or 
-<code>endtoken</code> attributes to define what to match.</p>
-<p>Filtersets are used for doing 
-replacements in tasks such as <code>&lt;copy&gt;</code>, etc.</p>
-
-<p>Filters can also by specified by one or more nested propertysets, the
-  contents of which are applied when the filterset is created.</p>
-
-<p>If you specify multiple values for the same token, the last one
-  defined within a filterset will be used.</p>
-
-<p>
-<strong>Note: </strong>When a filterset is used in an operation, the files are 
-processed in text mode and the filters applied line by line. This means that
-the copy operations will typically corrupt binary files. When applying filters
-you should ensure that the set of files being filtered are all text files.
-</p>
-
-<h2>Filterset</h2>
-
-<table cellSpacing=0 cellPadding=2 border=1>
-  <tr>
-    <td vAlign=top><b>Attribute</b></td>
-    <td vAlign=top><b>Description</b></td>
-    <td vAlign=top><b>Default</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td vAlign=top>begintoken</td>
-    <td vAlign=top>The string marking the beginning of a token (eg.,
-      <code>&#64;DATE&#64;</code>).</td>
-    <td vAlign=top>@</td>
-    <td vAlign=top align="center">No</td>
-  </tr>
-  <tr>
-    <td vAlign=top>endtoken</td>
-    <td vAlign=top>The string marking the end of a token (eg.,
-      <code>&#64;DATE&#64;</code>).</td>
-    <td vAlign=top>@</td>
-    <td vAlign=top align="center">No</td>
-  </tr>
-  <tr>
-    <td vAlign=top>filtersfile</td>
-    <td vAlign=top>Specify a single filtersfile.</td>
-    <td vAlign=top><i>none</i></td>
-    <td vAlign=top align="center">No</td>
-  </tr>
-  <tr>
-    <td vAlign=top>recurse</td>
-    <td vAlign=top>Indicates whether the replacement text of tokens
-      should be searched for more tokens. <b>Since Ant 1.6.3</b></td>
-    <td vAlign=top><i>true</i></td>
-    <td vAlign=top align="center">No</td>
-  </tr>
-  <tr>
-    <td vAlign=top>onmissingfiltersfile</td>
-    <td vAlign=top>Indicate behavior when a nonexistent <i>filtersfile</i>
-      is specified.  One of "fail", "warn", "ignore". <b>Since Ant 1.7</b></td>
-    <td vAlign=top>"fail"</td>
-    <td vAlign=top align="center">No</td>
+<p>Filters can also by specified by one or more nested propertysets, the contents of which are
+applied when the filterset is created.</p>
+
+<p>If you specify multiple values for the same token, the last one defined within a filterset
+will be used.</p>
+
+<p><strong>Note</strong>: When a filterset is used in an operation, the files are processed in
+text mode and the filters applied line by line. This means that the copy operations will
+typically corrupt binary files. When applying filters you should ensure that the set of files
+being filtered are all text files.</p>
+
+<h3>Filterset</h3>
+
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Default</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>begintoken</td>
+    <td>The string marking the beginning of a token (eg., <samp>@DATE@</samp>).</td>
+    <td><q>@</q></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>endtoken</td>
+    <td>The string marking the end of a token (eg., <samp>@DATE@</samp>).</td>
+    <td><q>@</q></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>filtersfile</td>
+    <td>Specify a single filtersfile.</td>
+    <td><em>none</em></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>recurse</td>
+    <td>Indicates whether the replacement text of tokens should be searched for more
+      tokens. <em>Since Ant 1.6.3</em></td>
+    <td><q>true</q></td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>onmissingfiltersfile</td>
+    <td>Indicate behavior when a nonexistent <var>filtersfile</var> is specified.  One
+      of <q>fail</q>, <q>warn</q>, <q>ignore</q>. <em>Since Ant 1.7</em></td>
+    <td><q>fail</q></td>
+    <td>No</td>
   </tr>
 </table>
 
-<h2>Filter</h2>
-<table cellSpacing=0 cellPadding=2 border=1>
+<h3>Filter</h3>
+<table>
   <tr>
-    <td vAlign=top><b>Attribute</b></td>
-    <td vAlign=top><b>Description</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>token</td>
-    <td vAlign=top>The token to replace (eg., <code>&#64;DATE&#64;</code>)</td>
-    <td vAlign=top align="center">Yes</td>
+    <td>token</td>
+    <td>The token to replace (eg., <samp>@DATE@</samp>)</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td vAlign=top>value</td>
-    <td vAlign=top>The value to replace it with
-     (eg., <code>Thursday, April 26, 2001</code>).</td>
-    <td vAlign=top align="center">Yes</td>
+    <td>value</td>
+    <td>The value to replace it with (eg., <q>Thursday, April 26, 2001</q>).</td>
+    <td>Yes</td>
   </tr>
 </table>
 
-<h2>Filtersfile</h2>
-<table cellSpacing=0 cellPadding=2 border=1>
+<h3>Filtersfile</h3>
+<table>
   <tr>
-    <td vAlign=top><b>Attribute</b></td>
-    <td vAlign=top><b>Description</b></td>
-    <td vAlign=top align="center"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td vAlign=top>file</td>
-    <td vAlign=top>A properties file of 
-      name-value pairs from which to load the tokens.</td>
-    <td vAlign=top align="center">Yes</td>
+    <td>file</td>
+    <td>A properties file of name-value pairs from which to load the tokens.</td>
+    <td>Yes</td>
   </tr>
 </table>
 
 <h4>Examples</h4>
 
-<p>You are copying the <code>version.txt</code> file to the <code>dist</code>
-directory from the <code>build</code> directory 
-but wish to replace the token <code>&#64;DATE&#64;</code> with today's date.</p>
-<blockquote><pre>
+<p>You are copying the <samp>version.txt</samp> file to the <samp>dist</samp> directory from
+the <samp>build</samp> directory but wish to replace the token <samp>@DATE@</samp> with today's
+date.</p>
+<pre>
 &lt;copy file=&quot;${build.dir}/version.txt&quot; toFile=&quot;${dist.dir}/version.txt&quot;&gt;
   &lt;filterset&gt;
     &lt;filter token=&quot;DATE&quot; value=&quot;${TODAY}&quot;/&gt;
   &lt;/filterset&gt;
 &lt;/copy&gt;
-</pre></blockquote>
+</pre>
 
-<p>You are copying the <code>version.txt</code> file to the <code>dist</code>
-directory from the build directory 
-but wish to replace the token <code>%DATE*</code> with today's date.</p>
-<blockquote><pre>
+<p>You are copying the <samp>version.txt</samp> file to the <samp>dist</samp> directory from the
+build directory but wish to replace the token <samp>%DATE*</samp> with today's date.</p>
+<pre>
 &lt;copy file=&quot;${build.dir}/version.txt&quot; toFile=&quot;${dist.dir}/version.txt&quot;&gt;
   &lt;filterset begintoken=&quot;%&quot; endtoken=&quot;*&quot;&gt;
     &lt;filter token=&quot;DATE&quot; value=&quot;${TODAY}&quot;/&gt;
   &lt;/filterset&gt;
 &lt;/copy&gt;
-</pre></blockquote>
+</pre>
 
 <p>Copy all the docs but change all dates and appropriate notices as stored in a file.</p>
-<blockquote><pre>
+<pre>
 &lt;copy toDir=&quot;${dist.dir}/docs&quot;&gt;
   &lt;fileset dir=&quot;${build.dir}/docs&quot;&gt;
     &lt;include name=&quot;**/*.html&quot;&gt;
@@ -172,10 +158,10 @@
     &lt;filtersfile file=&quot;${user.dir}/dist.properties&quot;/&gt;
   &lt;/filterset&gt;
 &lt;/copy&gt;
-</pre></blockquote>
+</pre>
 
 <p>Define a FilterSet and reference it later.</p>
-<blockquote><pre>
+<pre>
 &lt;filterset id=&quot;myFilterSet&quot; begintoken=&quot;%&quot; endtoken=&quot;*&quot;&gt;
   &lt;filter token=&quot;DATE&quot; value=&quot;${TODAY}&quot;/&gt;
 &lt;/filterset&gt;
@@ -183,12 +169,12 @@
 &lt;copy file=&quot;${build.dir}/version.txt&quot; toFile=&quot;${dist.dir}/version.txt&quot;&gt;
   &lt;filterset refid=&quot;myFilterSet&quot;/&gt;
 &lt;/copy&gt;
-</pre></blockquote>
+</pre>
 
-<p>You are copying the <code>version.txt</code> file to the <code>dist</code>
-directory from the <code>build</code> directory 
-but wish to replace the token <code>&#64;project.date&#64;</code> with the property of the same name.</p>
-<blockquote><pre>
+<p>You are copying the <samp>version.txt</samp> file to the <samp>dist</samp> directory from
+the <samp>build</samp> directory but wish to replace the token <samp>@project.date@</samp> with
+the property of the same name.</p>
+<pre>
 &lt;copy file=&quot;${build.dir}/version.txt&quot; toFile=&quot;${dist.dir}/version.txt&quot;&gt;
   &lt;filterset&gt;
     &lt;propertyset&gt;
@@ -196,5 +182,6 @@
     &lt;/propertyset&gt;
   &lt;/filterset&gt;
 &lt;/copy&gt;
-</pre></blockquote>
-</body></html>
+</pre>
+</body>
+</html>
diff -Nru ant-1.9.10/manual/Types/mapper.html ant-1.10.3/manual/Types/mapper.html
--- ant-1.9.10/manual/Types/mapper.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/mapper.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,124 +24,113 @@
 
 <body>
 
-<h2><a name="mapper">Mapping File Names</a></h2>
-<p>Some tasks take source files and create target files. Depending on
-the task, it may be quite obvious which name a target file will have
-(using <a href="../Tasks/javac.html">javac</a>, you know there will be
-<code>.class</code> files for your <code>.java</code> files) - in
-other cases you may want to specify the target files, either to help
-Apache Ant or to get an extra bit of functionality.</p>
-<p>While source files are usually specified as <a
-href="fileset.html">fileset</a>s, you don't specify target files directly -
-instead, you tell Ant how to find the target file(s) for one source file. An
-instance of <code>org.apache.tools.ant.util.FileNameMapper</code> is
-responsible for this. It constructs target file names based on rules
-that can be parameterized with <code>from</code> and <code>to</code>
-attributes - the exact meaning of which is implementation-dependent.</p>
-<p>These instances are defined in <code>&lt;mapper&gt;</code> elements
-with the following attributes:</p>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">type</td>
-    <td valign="top">specifies one of the built-in implementations.</td>
-    <td rowspan="2" align="center" valign="middle">Exactly one of these</td>
+<h2 id="mapper">Mapping File Names</h2>
+<p>Some tasks take source files and create target files. Depending on the task, it may be quite
+obvious which name a target file will have (using <a href="../Tasks/javac.html">javac</a>, you know
+there will be <samp>.class</samp> files for your <samp>.java</samp> files)&mdash;in other cases you
+may want to specify the target files, either to help Apache Ant or to get an extra bit of
+functionality.</p>
+<p>While source files are usually specified as <a href="fileset.html">fileset</a>s, you don't
+specify target files directly&mdash;instead, you tell Ant how to find the target file(s) for one
+source file. An instance of <code class="code">org.apache.tools.ant.util.FileNameMapper</code> is
+responsible for this. It constructs target file names based on rules that can be parameterized
+with <var>from</var> and <var>to</var> attributes&mdash;the exact meaning of which is
+implementation-dependent.</p>
+<p>These instances are defined in <code>&lt;mapper&gt;</code> elements with the following
+attributes:</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>specifies one of the built-in implementations.</td>
+    <td rowspan="2">Exactly one of these</td>
   </tr>
   <tr>
-    <td valign="top">classname</td>
-    <td valign="top">specifies the implementation by class name.</td>
+    <td>classname</td>
+    <td class="left">specifies the implementation by class name.</td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">the classpath to use when looking up
+    <td>classpath</td>
+    <td>the classpath to use when looking up
       <code>classname</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">the classpath to use, given as <a
-      href="../using.html#references">reference</a> to a path defined elsewhere.</td>
-    <td align="center" valign="top">No</td>
+    <td>classpathref</td>
+    <td>the classpath to use, given as <a href="../using.html#references">reference</a> to a
+      path defined elsewhere.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">from</td>
-    <td valign="top">the <code>from</code> attribute for the given
-      implementation.</td>
-    <td align="center" valign="top">Depends on implementation.</td>
+    <td>from</td>
+    <td>the <code>from</code> attribute for the given implementation.</td>
+    <td>Depends on implementation</td>
   </tr>
   <tr>
-    <td valign="top">to</td>
-    <td valign="top">the <code>to</code> attribute for the given
-      implementation.</td>
-    <td align="center" valign="top">Depends on implementation.</td>
+    <td>to</td>
+    <td>the <code>to</code> attribute for the given implementation.</td>
+    <td>Depends on implementation</td>
   </tr>
 </table>
-<p>Note that Ant will not automatically convert / or \ characters in
-the <code>to</code> and <code>from</code> attributes to the correct
-directory separator of your current platform.  If you need to specify
-this separator, use <code>${file.separator}</code> instead.
-  For the regexpmapper, <code>${file.separator}</code> will not work,
-as on windows it is the '\' character, and this is an escape character
-for regular expressions, one should use the <code>handledirsep</code> attribute
-instead.
+<p>Note that Ant will not automatically convert <q>/</q> or <q>\</q> characters in the <var>to</var>
+and <var>from</var> attributes to the correct directory separator of your current platform.  If you
+need to specify this separator, use <code>${file.separator}</code> instead.  For the regexp
+mapper, <code>${file.separator}</code> will not work, as on Windows it is the <q>\</q> character,
+and this is an escape character for regular expressions, one should use
+the <code>handledirsep</code> attribute instead.
 </p>
 <h3>Parameters specified as nested elements</h3>
-<p>The classpath can be specified via a nested
-<code>&lt;classpath&gt;</code>, as well - that is,
-a <a href="../using.html#path">path</a>-like structure.</p>
-<p><b>Since Ant 1.7.0,</b> nested File Mappers can
-be supplied via either <CODE>&lt;mapper&gt;</CODE> elements or
-<a href="../Tasks/typedef.html"><code>&lt;typedef&gt;</code></a>'d
-implementations of <CODE>org.apache.tools.ant.util.FileNameMapper</CODE>.
-If nested File Mappers are specified by either means, the mapper will be
-implicitly configured as a <a href="#composite-mapper">composite mapper</a>.
-</p>
-<hr>
-<h3>The built-in mapper types are:</h3>
+<p>The classpath can be specified via a nested <code>&lt;classpath&gt;</code>, as well&mdash;that
+is, a <a href="../using.html#path">path</a>-like structure.</p>
+<p><em>Since Ant 1.7.0</em>, nested File Mappers can be supplied via
+either <code>&lt;mapper&gt;</code> elements
+or <a href="../Tasks/typedef.html"><code>&lt;typedef&gt;</code></a>'d implementations
+of <code class="code">org.apache.tools.ant.util.FileNameMapper</code>.  If nested File Mappers are
+specified by either means, the mapper will be implicitly configured as
+a <a href="#composite-mapper">composite mapper</a>.</p>
+<h3>The built-in mapper types</h3>
 <p>All built-in mappers are case-sensitive.</p>
-<p><b>As of Ant 1.7.0,</b> each of the built-in mapper implementation
-  types is directly accessible using a specific tagname. This makes it
-  possible for filename mappers to support attributes in addition to
-  the generally available <i>to</i> and <i>from</i>.<br>
-  The <code>&lt;mapper type|classname=&quot;...&quot;&gt;</code> usage
-  form remains valid for reasons of backward compatibility.</p>
+<p><em>Since Ant 1.7.0</em>, each of the built-in mapper implementation types is directly accessible
+using a specific tagname. This makes it possible for filename mappers to support attributes in
+addition to the generally available <var>to</var> and <var>from</var>.<br/>
+The <code>&lt;mapper <var>type</var>|<var>classname</var>=&quot;...&quot;&gt;</code> usage form
+remains valid for reasons of backward compatibility.</p>
 
     <!--                                        -->
     <!--             Identity Mapper            -->
     <!--                                        -->
 
-<h4><a name="identity-mapper">identity</a></h4>
-<p>The target file name is identical to the source file name. Both
-<code>to</code> and <code>from</code> will be ignored.</p>
-<b>Examples:</b>
-<blockquote><pre>
+<h4 id="identity-mapper">identity</h4>
+<p>The target file name is identical to the source file name. Both <var>to</var> and <var>from</var>
+will be ignored.</p>
+<h5>Examples</h5>
+<pre>
 &lt;mapper type=&quot;identity&quot;/&gt;
-&lt;identitymapper/&gt;
-</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+&lt;identitymapper/&gt;</pre>
+<table>
   <tr>
-    <td valign="top"><b>Source file name</b></td>
-    <td valign="top"><b>Target file name</b></td>
+    <th>Source file name</th>
+    <th>Target file name</th>
   </tr>
   <tr>
-    <td valign="top"><code>A.java</code></td>
-    <td valign="top"><code>A.java</code></td>
+    <td><code>A.java</code></td>
+    <td><code>A.java</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>foo/bar/B.java</code></td>
-    <td valign="top"><code>foo/bar/B.java</code></td>
+    <td><code>foo/bar/B.java</code></td>
+    <td><code>foo/bar/B.java</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>C.properties</code></td>
-    <td valign="top"><code>C.properties</code></td>
+    <td><code>C.properties</code></td>
+    <td><code>C.properties</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>Classes/dir/dir2/A.properties</code></td>
-    <td valign="top"><code>Classes/dir/dir2/A.properties</code></td>
+    <td><code>Classes/dir/dir2/A.properties</code></td>
+    <td><code>Classes/dir/dir2/A.properties</code></td>
   </tr>
 </table>
 
@@ -149,35 +138,33 @@
     <!--             Flatten Mapper             -->
     <!--                                        -->
 
-<h4><a name="flatten-mapper">flatten</a></h4>
-<p>The target file name is identical to the source file name, with all
-leading directory information stripped off. Both <code>to</code> and
-<code>from</code> will be ignored.</p>
-<b>Examples:</b>
-<blockquote><pre>
+<h4 id="flatten-mapper">flatten</h4>
+<p>The target file name is identical to the source file name, with all leading directory information
+stripped off. Both <var>to</var> and <var>from</var> will be ignored.</p>
+<h5>Examples</h5>
+<pre>
 &lt;mapper type=&quot;flatten&quot;/&gt;
-&lt;flattenmapper/&gt;
-</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+&lt;flattenmapper/&gt;</pre>
+<table>
   <tr>
-    <td valign="top"><b>Source file name</b></td>
-    <td valign="top"><b>Target file name</b></td>
+    <th>Source file name</th>
+    <th>Target file name</th>
   </tr>
   <tr>
-    <td valign="top"><code>A.java</code></td>
-    <td valign="top"><code>A.java</code></td>
+    <td><code>A.java</code></td>
+    <td><code>A.java</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>foo/bar/B.java</code></td>
-    <td valign="top"><code>B.java</code></td>
+    <td><code>foo/bar/B.java</code></td>
+    <td><code>B.java</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>C.properties</code></td>
-    <td valign="top"><code>C.properties</code></td>
+    <td><code>C.properties</code></td>
+    <td><code>C.properties</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>Classes/dir/dir2/A.properties</code></td>
-    <td valign="top"><code>A.properties</code></td>
+    <td><code>Classes/dir/dir2/A.properties</code></td>
+    <td><code>A.properties</code></td>
   </tr>
 </table>
 
@@ -185,34 +172,33 @@
     <!--             Merge Mapper               -->
     <!--                                        -->
 
-<h4><a name="merge-mapper">merge</a></h4>
-<p>The target file name will always be the same, as defined by
-<code>to</code> - <code>from</code> will be ignored.</p>
-<h5>Examples:</h5>
-<blockquote><pre>
+<h4 id="merge-mapper">merge</h4>
+<p>The target file name will always be the same, as defined by <var>to</var>&mdash;<var>from</var>
+will be ignored.</p>
+<h5>Examples</h5>
+<pre>
 &lt;mapper type=&quot;merge&quot; to=&quot;archive.tar&quot;/&gt;
-&lt;mergemapper to=&quot;archive.tar&quot;/&gt;
-</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+&lt;mergemapper to=&quot;archive.tar&quot;/&gt;</pre>
+<table>
   <tr>
-    <td valign="top"><b>Source file name</b></td>
-    <td valign="top"><b>Target file name</b></td>
+    <th>Source file name</th>
+    <th>Target file name</th>
   </tr>
   <tr>
-    <td valign="top"><code>A.java</code></td>
-    <td valign="top"><code>archive.tar</code></td>
+    <td><code>A.java</code></td>
+    <td><code>archive.tar</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>foo/bar/B.java</code></td>
-    <td valign="top"><code>archive.tar</code></td>
+    <td><code>foo/bar/B.java</code></td>
+    <td><code>archive.tar</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>C.properties</code></td>
-    <td valign="top"><code>archive.tar</code></td>
+    <td><code>C.properties</code></td>
+    <td><code>archive.tar</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>Classes/dir/dir2/A.properties</code></td>
-    <td valign="top"><code>archive.tar</code></td>
+    <td><code>Classes/dir/dir2/A.properties</code></td>
+    <td><code>archive.tar</code></td>
   </tr>
 </table>
 
@@ -220,384 +206,332 @@
     <!--              Glob Mapper               -->
     <!--                                        -->
 
-<h4><a name="glob-mapper">glob</a></h4>
-<p>Both <code>to</code> and <code>from</code> are required and define patterns that may
-contain at most one <code>*</code>. For each source file that matches
-the <code>from</code> pattern, a target file name will be constructed
-from the <code>to</code> pattern by substituting the <code>*</code> in
-the <code>to</code> pattern with the text that matches the
-<code>*</code> in the <code>from</code> pattern. Source file names
-that don't match the <code>from</code> pattern will be ignored.</p>
-<b>Examples:</b>
-<blockquote><pre>
+<h4 id="glob-mapper">glob</h4>
+<p>Both <var>to</var> and <var>from</var> are required and define patterns that may contain at most
+one <q>*</q>. For each source file that matches the <var>from</var> pattern, a target file name will
+be constructed from the <var>to</var> pattern by substituting the <q>*</q> in the <var>to</var>
+pattern with the text that matches the <q>*</q> in the <var>from</var> pattern. Source file names
+that don't match the <var>from</var> pattern will be ignored.</p>
+<h5>Examples</h5>
+<pre>
 &lt;mapper type=&quot;glob&quot; from=&quot;*.java&quot; to=&quot;*.java.bak&quot;/&gt;
-&lt;globmapper from=&quot;*.java&quot; to=&quot;*.java.bak&quot;/&gt;
-</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+&lt;globmapper from=&quot;*.java&quot; to=&quot;*.java.bak&quot;/&gt;</pre>
+<table>
   <tr>
-    <td valign="top"><b>Source file name</b></td>
-    <td valign="top"><b>Target file name</b></td>
+    <th>Source file name</th>
+    <th>Target file name</th>
   </tr>
   <tr>
-    <td valign="top"><code>A.java</code></td>
-    <td valign="top"><code>A.java.bak</code></td>
+    <td><code>A.java</code></td>
+    <td><code>A.java.bak</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>foo/bar/B.java</code></td>
-    <td valign="top"><code>foo/bar/B.java.bak</code></td>
+    <td><code>foo/bar/B.java</code></td>
+    <td><code>foo/bar/B.java.bak</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>C.properties</code></td>
-    <td valign="top">ignored</td>
+    <td><code>C.properties</code></td>
+    <td>ignored</td>
   </tr>
   <tr>
-    <td valign="top"><code>Classes/dir/dir2/A.properties</code></td>
-    <td valign="top">ignored</td>
+    <td><code>Classes/dir/dir2/A.properties</code></td>
+    <td>ignored</td>
   </tr>
 </table>
-<blockquote><pre>
+<pre>
 &lt;mapper type=&quot;glob&quot; from=&quot;C*ies&quot; to=&quot;Q*y&quot;/&gt;
-&lt;globmapper from=&quot;C*ies&quot; to=&quot;Q*y&quot;/&gt;
-</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Source file name</b></td>
-    <td valign="top"><b>Target file name</b></td>
-  </tr>
-  <tr>
-    <td valign="top"><code>A.java</code></td>
-    <td valign="top">ignored</td>
-  </tr>
-  <tr>
-    <td valign="top"><code>foo/bar/B.java</code></td>
-    <td valign="top">ignored</td>
-  </tr>
-  <tr>
-    <td valign="top"><code>C.properties</code></td>
-    <td valign="top"><code>Q.property</code></td>
-  </tr>
-  <tr>
-    <td valign="top"><code>Classes/dir/dir2/A.properties</code></td>
-    <td valign="top"><code>Qlasses/dir/dir2/A.property</code></td>
-  </tr>
-</table>
-  <p>
-    The globmapper mapper can take the following extra attributes.
-  </p>
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">casesensitive</td>
-      <td valign="top">
-        If this is false, the mapper will ignore case when matching the glob pattern.
-        This attribute can be true or false, the default is true.
-      <em>Since Ant 1.6.3.</em>
-      </td>
-      <td align="center" valign="top">No</td>
-    </tr>
-    <tr>
-      <td valign="top">handledirsep</td>
-      <td valign="top">
-        If this is specified, the mapper will ignore the difference between the normal
-        directory separator characters - \ and /.
-        This attribute can be true or false, the default is false.
-        This attribute is useful for cross-platform build files.
-        <em>Since Ant 1.6.3.</em>
-        <td align="center" valign="top">No</td>
-      </tr>
-    </table>
-    <p>
-      An example:
-    </p>
-    <pre>
-      &lt;pathconvert property="x" targetos="unix"&gt;
-        &lt;path path="Aj.Java"/&gt;
-        &lt;mapper&gt;
-        &lt;chainedmapper&gt;
-          &lt;flattenmapper/&gt;
-          &lt;globmapper from="a*.java" to="*.java.bak" casesensitive="no"/&gt;
-        &lt;/chainedmapper&gt;
-        &lt;/mapper&gt;
-      &lt;/pathconvert&gt;
-      &lt;echo&gt;x is ${x}&lt;/echo&gt;
-    </pre>
-    <p>
-      will output "x is j.java.bak".
-    </p>
-    <p>
-      and
-    </p>
-    <pre>
-      &lt;pathconvert property="x" targetos="unix"&gt;
-        &lt;path path="d/e/f/j.java"/&gt;
-        &lt;mapper&gt;
-          &lt;globmapper from="${basedir}\d/e\*" to="*" handledirsep="yes"/&gt;
-        &lt;/mapper&gt;
-      &lt;/pathconvert&gt;
-      &lt;echo&gt;x is ${x}&lt;/echo&gt;
-    </pre>
-    <p>
-      will output "x is f/j.java".
-    </p>
-
+&lt;globmapper from=&quot;C*ies&quot; to=&quot;Q*y&quot;/&gt;</pre>
+<table>
+  <tr>
+    <th>Source file name</th>
+    <th>Target file name</th>
+  </tr>
+  <tr>
+    <td><code>A.java</code></td>
+    <td>ignored</td>
+  </tr>
+  <tr>
+    <td><code>foo/bar/B.java</code></td>
+    <td>ignored</td>
+  </tr>
+  <tr>
+    <td><code>C.properties</code></td>
+    <td><code>Q.property</code></td>
+  </tr>
+  <tr>
+    <td><code>Classes/dir/dir2/A.properties</code></td>
+    <td><code>Qlasses/dir/dir2/A.property</code></td>
+  </tr>
+</table>
+<p>The <code>globmapper</code> mapper can take the following extra attributes.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>casesensitive</td>
+    <td>
+      This attribute can be <q>true</q> or <q>false</q>.  If this is <q>false</q>, the mapper will
+      ignore case when matching the glob pattern.  <em>Since Ant 1.6.3</em>
+    </td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+  <tr>
+    <td>handledirsep</td>
+    <td>
+      This attribute can be <q>true</q> or <q>false</q>.  If this is specified, the mapper will
+      ignore the difference between the normal directory separator characters&mdash;<q>\</q>
+      and <q>/</q>.  This attribute is useful for cross-platform build files.  <em>Since Ant
+      1.6.3</em>
+    <td>No; default is <q>false</q></td>
+  </tr>
+</table>
+<p>An example:</p>
+<pre>
+&lt;pathconvert property="x" targetos="unix"&gt;
+  &lt;path path="Aj.Java"/&gt;
+  &lt;mapper&gt;
+  &lt;chainedmapper&gt;
+    &lt;flattenmapper/&gt;
+    &lt;globmapper from="a*.java" to="*.java.bak" casesensitive="no"/&gt;
+  &lt;/chainedmapper&gt;
+  &lt;/mapper&gt;
+&lt;/pathconvert&gt;
+&lt;echo&gt;x is ${x}&lt;/echo&gt;</pre>
+<p>will output <code>x is j.java.bak</code>, and</p>
+<pre>
+&lt;pathconvert property="x" targetos="unix"&gt;
+  &lt;path path="d/e/f/j.java"/&gt;
+  &lt;mapper&gt;
+    &lt;globmapper from="${basedir}\d/e\*" to="*" handledirsep="yes"/&gt;
+  &lt;/mapper&gt;
+&lt;/pathconvert&gt;
+&lt;echo&gt;x is ${x}&lt;/echo&gt;</pre>
+<p>will output <code>x is f/j.java</code>.</p>
 
     <!--                                        -->
     <!--             RegExp Mapper              -->
     <!--                                        -->
 
-<h4><a name="regexp-mapper">regexp</a></h4>
+<h4 id="regexp-mapper">regexp</h4>
 
-<p>Both <code>to</code> and <code>from</code> are required and define
-regular expressions. If the source file name (as a whole or in part)
-matches the <code>from</code> pattern, the target file name will be
-constructed from the
-<code>to</code> pattern, using <code>\0</code> to <code>\9</code> as
-back-references for the full match (<code>\0</code>) or the matches of
-the subexpressions in parentheses.  The <code>to</code> pattern
-determines the <strong>whole</strong> file name, so if you wanted to
-replace the extension of a file you should not use <code>from="\.old$"
-to=".new"</code> but rather <code>from="(.*)\.old$" to="\1.new"</code>
-(or rather use a glob mapper in this case).</p>
+<p>Both <var>to</var> and <var>from</var> are required and define regular expressions. If the source
+file name (as a whole or in part) matches the <var>from</var> pattern, the target file name will be
+constructed from the <var>to</var> pattern, using <code>\0</code> to <code>\9</code> as
+back-references for the full match (<code>\0</code>) or the matches of the subexpressions in
+parentheses.  The <var>to</var> pattern determines the <strong>whole</strong> file name, so if you
+wanted to replace the extension of a file you should not use <code>from="\.old$" to=".new"</code>
+but rather <code>from="(.*)\.old$" to="\1.new"</code> (or rather use a glob mapper in this
+case).</p>
 
-<p>Source files not matching the <code>from</code> pattern will be
-ignored.</p>
+<p>Source files not matching the <var>from</var> pattern will be ignored.</p>
 
-<p>Note that you need to escape a dollar-sign (<code>$</code>) with
-another dollar-sign in Ant.</p>
+<p>Note that you need to escape a dollar-sign (<q>$</q>) with another dollar-sign in Ant.</p>
 
 <p>The regexp mapper needs a supporting library and an implementation
-of <code>org.apache.tools.ant.util.regexp.RegexpMatcher</code> that
-  hides the specifics of the library.  <em>Since Ant 1.8.0</em> Ant
-  requires Java 1.4 to run, so the implementation based on
-  the <code>java.util.regex</code> package will always be available.
-  You can still use the now retired Jakarta ORO or Jakarta Regex instead if your
-  provide the corresponding jar in your CLASSPATH.</p>
-
-<p>For information about using <a
-href="http://www.cacas.org/~wes/java/" target="_top">gnu.regexp</a> or <a
-href="http://www.crocodile.org/~sts/Rex/" target="_top">gnu.rex</a> with Ant, see <a
-href="http://marc.theaimsgroup.com/?l=ant-dev&m=97550753813481&w=2" target="_top">this</a>
-article.</p>
+of <code class="code">org.apache.tools.ant.util.regexp.RegexpMatcher</code> that hides the specifics
+of the library. <em>Since Ant 1.8.0</em>, Java 1.4 or later is required, so the implementation based
+on the <code class="code">java.util.regex</code> package is always be available.  You can still use
+the now retired Jakarta ORO or Jakarta Regex instead if your provide the corresponding jar in
+your <code>CLASSPATH</code>.</p>
+
+<p>For information about using <a href="https://savannah.gnu.org/projects/gnu-regexp/"
+target="_top">gnu.regexp</a> or <a href="https://github.com/kzn/regex4j/" target="_top">gnu.rex</a>
+with Ant, see <a href="https://marc.info/?l=ant-dev&m=97550753813481&w=2" target="_top">this</a>
+article. Please keep in mind that <a href="http://tusker.org/regex/regex_benchmark.html"
+target="_top">your mileage may vary</a> with different regexp engines.</p>
 
 <p>If you want to use one of the <a href="../install.html#librarydependencies">regular expression
-  libraries</a> other than <code>java.util.regex</code> you need to also use
-  the corresponding <code>ant-[apache-oro, apache-regexp].jar</code>
-from the Ant release you are using.
-Make sure, both will be loaded from the same
-classpath, that is either put them into your <code>CLASSPATH</code>,
-<code>ANT_HOME/lib</code> directory or a nested
-<code>&lt;classpath&gt;</code> element of the mapper - you cannot have
-<code>ant-[apache-oro, apache-regexp].jar</code> in <code>ANT_HOME/lib</code>
- and the library
+libraries</a> other than <code>java.util.regex</code> you need to also use the
+corresponding <samp>ant-[apache-oro, apache-regexp].jar</samp> from the Ant release you are using.
+Make sure that both will be loaded from the same classpath, that is either put them into
+your <code>CLASSPATH</code>, <samp>ANT_HOME/lib</samp> directory or a
+nested <code>&lt;classpath&gt;</code> element of the mapper&mdash;you cannot
+have <samp>ant-[apache-oro, apache-regexp].jar</samp> in <samp>ANT_HOME/lib</samp> and the library
 in a nested <code>&lt;classpath&gt;</code>.</p>
-<p>Ant will choose the regular-expression library based on the
-following algorithm:</p>
+<p>Ant will choose the regular expression library based on the following algorithm:</p>
 <ul>
-<li>If the system property
-<code>ant.regexp.matcherimpl</code> has been set, it is taken as the
-name of the class implementing
-<code>org.apache.tools.ant.util.regexp.RegexpMatcher</code> that
-should be used.</li>
+<li>If the system property <code>ant.regexp.matcherimpl</code> has been set, it is taken as the name
+of the class implementing <code class="code">org.apache.tools.ant.util.regexp.RegexpMatcher</code>
+that should be used.</li>
 <li>If it has not been set, uses the JDK 1.4 classes.</li>
 </ul>
 
-<b>Examples:</b>
-<blockquote><pre>
+<h5>Examples</h5>
+<pre>
 &lt;mapper type=&quot;regexp&quot; from=&quot;^(.*)\.java$$&quot; to=&quot;\1.java.bak&quot;/&gt;
-&lt;regexpmapper from=&quot;^(.*)\.java$$&quot; to=&quot;\1.java.bak&quot;/&gt;
-</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+&lt;regexpmapper from=&quot;^(.*)\.java$$&quot; to=&quot;\1.java.bak&quot;/&gt;</pre>
+<table>
   <tr>
-    <td valign="top"><b>Source file name</b></td>
-    <td valign="top"><b>Target file name</b></td>
+    <th>Source file name</th>
+    <th>Target file name</th>
   </tr>
   <tr>
-    <td valign="top"><code>A.java</code></td>
-    <td valign="top"><code>A.java.bak</code></td>
+    <td><code>A.java</code></td>
+    <td><code>A.java.bak</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>foo/bar/B.java</code></td>
-    <td valign="top"><code>foo/bar/B.java.bak</code></td>
+    <td><code>foo/bar/B.java</code></td>
+    <td><code>foo/bar/B.java.bak</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>C.properties</code></td>
-    <td valign="top">ignored</td>
+    <td><code>C.properties</code></td>
+    <td>ignored</td>
   </tr>
   <tr>
-    <td valign="top"><code>Classes/dir/dir2/A.properties</code></td>
-    <td valign="top">ignored</td>
+    <td><code>Classes/dir/dir2/A.properties</code></td>
+    <td>ignored</td>
   </tr>
 </table>
-<blockquote><pre>
+<pre>
 &lt;mapper type=&quot;regexp&quot; from=&quot;^(.*)/([^/]+)/([^/]*)$$&quot; to=&quot;\1/\2/\2-\3&quot;/&gt;
-&lt;regexpmapper from=&quot;^(.*)/([^/]+)/([^/]*)$$&quot; to=&quot;\1/\2/\2-\3&quot;/&gt;
-</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+&lt;regexpmapper from=&quot;^(.*)/([^/]+)/([^/]*)$$&quot; to=&quot;\1/\2/\2-\3&quot;/&gt;</pre>
+<table>
   <tr>
-    <td valign="top"><b>Source file name</b></td>
-    <td valign="top"><b>Target file name</b></td>
+    <th>Source file name</th>
+    <th>Target file name</th>
   </tr>
   <tr>
-    <td valign="top"><code>A.java</code></td>
-    <td valign="top">ignored</td>
+    <td><code>A.java</code></td>
+    <td>ignored</td>
   </tr>
   <tr>
-    <td valign="top"><code>foo/bar/B.java</code></td>
-    <td valign="top"><code>foo/bar/bar-B.java</code></td>
+    <td><code>foo/bar/B.java</code></td>
+    <td><code>foo/bar/bar-B.java</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>C.properties</code></td>
-    <td valign="top">ignored</td>
+    <td><code>C.properties</code></td>
+    <td>ignored</td>
   </tr>
   <tr>
-    <td valign="top"><code>Classes/dir/dir2/A.properties</code></td>
-    <td valign="top"><code>Classes/dir/dir2/dir2-A.properties</code></td>
+    <td><code>Classes/dir/dir2/A.properties</code></td>
+    <td><code>Classes/dir/dir2/dir2-A.properties</code></td>
   </tr>
 </table>
-<blockquote><pre>
+<pre>
 &lt;mapper type="regexp" from="^(.*)\.(.*)$$" to="\2.\1"/&gt;
-&lt;regexpmapper from="^(.*)\.(.*)$$" to="\2.\1"/&gt;
-</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+&lt;regexpmapper from="^(.*)\.(.*)$$" to="\2.\1"/&gt;</pre>
+<table>
   <tr>
-    <td valign="top"><b>Source file name</b></td>
-    <td valign="top"><b>Target file name</b></td>
+    <th>Source file name</th>
+    <th>Target file name</th>
   </tr>
   <tr>
-    <td valign="top"><code>A.java</code></td>
-    <td valign="top"><code>java.A</code></td>
+    <td><code>A.java</code></td>
+    <td><code>java.A</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>foo/bar/B.java</code></td>
-    <td valign="top"><code>java.foo/bar/B</code></td>
+    <td><code>foo/bar/B.java</code></td>
+    <td><code>java.foo/bar/B</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>C.properties</code></td>
-    <td valign="top"><code>properties.C</code></td>
+    <td><code>C.properties</code></td>
+    <td><code>properties.C</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>Classes/dir/dir2/A.properties</code></td>
-    <td valign="top"><code>properties.Classes/dir/dir2/A</code></td>
+    <td><code>Classes/dir/dir2/A.properties</code></td>
+    <td><code>properties.Classes/dir/dir2/A</code></td>
   </tr>
 </table>
-<blockquote><pre>
+<pre>
 &lt;mapper type="regexp" from="^(.*?)(\$$[^/\\\.]*)?\.class$$" to="\1.java"/&gt;
-&lt;regexpmapper from="^(.*?)(\$$[^/\\\.]*)?\.class$$" to="\1.java"/&gt;
-</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Source file name</b></td>
-    <td valign="top"><b>Target file name</b></td>
-  </tr>
-  <tr>
-    <td valign="top"><code>ClassLoader.class</code></td>
-    <td valign="top"><code>ClassLoader.java</code></td>
-  </tr>
-  <tr>
-    <td valign="top"><code>java/lang/ClassLoader.class</code></td>
-    <td valign="top"><code>java/lang/ClassLoader.java</code></td>
-  </tr>
-  <tr>
-    <td valign="top"><code>java\lang\ClassLoader$1.class</code></td>
-    <td valign="top"><code>java\lang\ClassLoader.java</code></td>
-  </tr>
-  <tr>
-    <td valign="top"><code>java/lang/ClassLoader$foo$1.class</code></td>
-    <td valign="top"><code>java/lang/ClassLoader.java</code></td>
-  </tr>
-</table>
-  <p>
-    The regexpmapper mapper can take the following extra attributes.
-  </p>
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">casesensitive</td>
-      <td valign="top">
-        If this is false, the mapper will ignore case when matching the pattern.
-        This attribute can be true or false, the default is true.
-      <em>Since Ant 1.6.3.</em>
-      </td>
-      <td align="center" valign="top">No</td>
-    </tr>
-    <tr>
-      <td valign="top">handledirsep</td>
-      <td valign="top">
-        If this is specified, the mapper will treat a \ character in a filename
-        as a / for the purposes of matching.
-        This attribute can be true or false, the default is false.
-        This attribute is useful for cross-platform build files.
-        <em>Since Ant 1.6.3.</em>
-        <td align="center" valign="top">No</td>
-      </tr>
-    </table>
-    <p>
-      An example:
-    </p>
-    <pre>
-      &lt;pathconvert property="x" targetos="unix"&gt;
-        &lt;path path="Aj.Java"/&gt;
-        &lt;chainedmapper&gt;
-          &lt;flattenmapper/&gt;
-          &lt;regexpmapper from="a(.*)\.java" to="\1.java.bak" casesensitive="no"/&gt;
-        &lt;/chainedmapper&gt;
-      &lt;/pathconvert&gt;
-      &lt;echo&gt;x is ${x}&lt;/echo&gt;
-    </pre>
-    <p>
-      will output "x is j.java.bak".
-    </p>
-    <p>
-      and
-    </p>
-    <pre>
-    &lt;pathconvert property="hd.prop" targetos="windows"&gt;
-      &lt;path path="d\e/f\j.java"/&gt;
-      &lt;chainedmapper&gt;
-        &lt;regexpmapper from="${basedir}/d/e/(.*)" to="\1" handledirsep="yes"/&gt;
-      &lt;/chainedmapper&gt;
-    &lt;/pathconvert&gt;
-    </pre>
-    <p>
-      will set <code>hd.prop</code> to "f\j.java".
-    </p>
+&lt;regexpmapper from="^(.*?)(\$$[^/\\\.]*)?\.class$$" to="\1.java"/&gt;</pre>
+<table>
+  <tr>
+    <th>Source file name</th>
+    <th>Target file name</th>
+  </tr>
+  <tr>
+    <td><code>ClassLoader.class</code></td>
+    <td><code>ClassLoader.java</code></td>
+  </tr>
+  <tr>
+    <td><code>java/lang/ClassLoader.class</code></td>
+    <td><code>java/lang/ClassLoader.java</code></td>
+  </tr>
+  <tr>
+    <td><code>java\lang\ClassLoader$1.class</code></td>
+    <td><code>java\lang\ClassLoader.java</code></td>
+  </tr>
+  <tr>
+    <td><code>java/lang/ClassLoader$foo$1.class</code></td>
+    <td><code>java/lang/ClassLoader.java</code></td>
+  </tr>
+</table>
+<p>The regexp mapper can take the following extra attributes.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>casesensitive</td>
+    <td>
+      This attribute can be <q>true</q> or <q>false</q>.  If this is <q>false</q>, the mapper will
+      ignore case when matching the pattern.
+      <em>Since Ant 1.6.3</em>
+    </td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+  <tr>
+    <td>handledirsep</td>
+    <td>
+      This attribute can be <q>true</q> or <q>false</q>.  If this is specified, the mapper will
+      treat a <q>\</q> character in a filename as a <q>/</q> for the purposes of matching.  This
+      attribute is useful for cross-platform build files.
+      <em>Since Ant 1.6.3</em>
+    <td>No; default is <q>false</q></td>
+  </tr>
+</table>
+<p>An example:</p>
+<pre>
+&lt;pathconvert property="x" targetos="unix"&gt;
+  &lt;path path="Aj.Java"/&gt;
+  &lt;chainedmapper&gt;
+    &lt;flattenmapper/&gt;
+    &lt;regexpmapper from="a(.*)\.java" to="\1.java.bak" casesensitive="no"/&gt;
+  &lt;/chainedmapper&gt;
+&lt;/pathconvert&gt;
+&lt;echo&gt;x is ${x}&lt;/echo&gt;</pre>
+<p>will output <code>x is j.java.bak</code>, and</p>
+<pre>
+&lt;pathconvert property="hd.prop" targetos="windows"&gt;
+  &lt;path path="d\e/f\j.java"/&gt;
+  &lt;chainedmapper&gt;
+    &lt;regexpmapper from="${basedir}/d/e/(.*)" to="\1" handledirsep="yes"/&gt;
+  &lt;/chainedmapper&gt;
+&lt;/pathconvert&gt;</pre>
+<p>will set <code>hd.prop</code> to <code>f\j.java</code>.</p>
 
     <!--                                        -->
     <!--             Package Mapper             -->
     <!--                                        -->
 
-<h4><a name="package-mapper">package</a></h4>
-<p>Sharing the same syntax as the <a href="#glob-mapper">glob mapper</a>,
-the package mapper replaces
-directory separators found in the matched source pattern with dots in the target
-pattern placeholder. This mapper is particularly useful in combination
-with <code>&lt;uptodate&gt;</code> and <code>&lt;junit&gt;</code> output.</p>
-<p>The to and from attributes are both required.</p>
-<b>Example:</b>
-<blockquote><pre>
+<h4 id="package-mapper">package</h4>
+<p>Sharing the same syntax as the <a href="#glob-mapper">glob mapper</a>, the package mapper
+replaces directory separators found in the matched source pattern with dots in the target pattern
+placeholder. This mapper is particularly useful in combination with <code>&lt;uptodate&gt;</code>
+and <code>&lt;junit&gt;</code> output.</p>
+<p>The <var>to</var> and <var>from</var> attributes are both required.</p>
+<h5>Example</h5>
+<pre>
 &lt;mapper type="package" from="*Test.java" to="TEST-*Test.xml"/&gt;
-&lt;packagemapper from="*Test.java" to="TEST-*Test.xml"/&gt;
-</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+&lt;packagemapper from="*Test.java" to="TEST-*Test.xml"/&gt;</pre>
+<table>
   <tr>
-    <td valign="top"><b>Source file name</b></td>
-    <td valign="top"><b>Target file name</b></td>
+    <th>Source file name</th>
+    <th>Target file name</th>
   </tr>
   <tr>
-    <td valign="top"><code>org/apache/tools/ant/util/PackageMapperTest.java</code></td>
-    <td valign="top"><code>TEST-org.apache.tools.ant.util.PackageMapperTest.xml</code></td>
+    <td><code>org/apache/tools/ant/util/PackageMapperTest.java</code></td>
+    <td><code>TEST-org.apache.tools.ant.util.PackageMapperTest.xml</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>org/apache/tools/ant/util/Helper.java</code></td>
-    <td valign="top">ignored</td>
+    <td><code>org/apache/tools/ant/util/Helper.java</code></td>
+    <td>ignored</td>
   </tr>
 </table>
 
@@ -605,27 +539,25 @@
     <!--           Unpackage Mapper             -->
     <!--                                        -->
 
-<h4><a name="unpackage-mapper">unpackage (since Ant 1.6.0)</a></h4>
-  <p>This mapper is the inverse of the <a href="#package-mapper">package</a> mapper.
-    It replaces the dots in a package name with directory separators. This
-    is useful for matching XML formatter results against their JUnit test
-    test cases. The mapper shares the sample syntax
-    as the <a href="#glob-mapper">glob mapper</a>.
-  </p>
-<p>The to and from attributes are both required.</p>
-<b>Example:</b>
-<blockquote><pre>
+<h4 id="unpackage-mapper">unpackage</h4>
+<p><em>Since Ant 1.6.0</em></p>
+<p>This mapper is the inverse of the <a href="#package-mapper">package</a> mapper.  It replaces the
+dots in a package name with directory separators. This is useful for matching XML formatter results
+against their JUnit test test cases. The mapper shares the sample syntax as
+the <a href="#glob-mapper">glob mapper</a>.</p>
+<p>The <var>to</var> and <var>from</var> attributes are both required.</p>
+<h5>Example</h5>
+<pre>
 &lt;mapper type="unpackage" from="TEST-*Test.xml" to="${test.src.dir}/*Test.java"&gt;
-&lt;unpackagemapper from="TEST-*Test.xml" to="${test.src.dir}/*Test.java"&gt;
-</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+&lt;unpackagemapper from="TEST-*Test.xml" to="${test.src.dir}/*Test.java"&gt;</pre>
+<table>
   <tr>
-    <td valign="top"><b>Source file name</b></td>
-    <td valign="top"><b>Target file name</b></td>
+    <th>Source file name</th>
+    <th>Target file name</th>
   </tr>
   <tr>
-    <td valign="top"><code>TEST-org.acme.AcmeTest.xml</code></td>
-    <td valign="top"><code>${test.src.dir}/org/acme/AcmeTest.java</code></td>
+    <td><code>TEST-org.acme.AcmeTest.xml</code></td>
+    <td><code>${test.src.dir}/org/acme/AcmeTest.java</code></td>
   </tr>
 </table>
 
@@ -633,50 +565,47 @@
     <!--           Composite Mapper             -->
     <!--                                        -->
 
-<h4><a name="composite-mapper">composite (since Ant 1.7.0)</a></h4>
-  <p>This mapper implementation can contain multiple nested mappers.
-    File mapping is performed by passing the source filename to each nested
-    <code>&lt;mapper&gt;</code> in turn, returning all results.
-    The <i>to</i> and <i>from</i> attributes are ignored.</p>
-  <p>Starting with Ant 1.8.0 the order of the mapped results is the
-    same as the order of the nested mappers; prior to Ant 1.8.0 the
-    order has been undefined.</p>
-<b>Examples:</b>
-<blockquote><pre>
+<h4 id="composite-mapper">composite</h4>
+<p><em>Since Ant 1.7.0</em></p>
+<p>This mapper implementation can contain multiple nested mappers.  File mapping is performed by
+passing the source filename to each nested <code>&lt;mapper&gt;</code> in turn, returning all
+results.  The <var>to</var> and <var>from</var> attributes are ignored.</p>
+<p><em>Since Ant 1.8.0</em>, the order of the mapped results is the same as the order of the nested
+mappers; prior to Ant 1.8.0 the order has been undefined.</p>
+<h5>Examples</h5>
+<pre>
 &lt;compositemapper&gt;
   &lt;identitymapper/&gt;
   &lt;packagemapper from="*.java" to="*"/&gt;
-&lt;/compositemapper&gt;
-</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+&lt;/compositemapper&gt;</pre>
+<table>
   <tr>
-    <td valign="top"><b>Source file name</b></td>
-    <td valign="top"><b>Target file names</b></td>
+    <th>Source file name</th>
+    <th>Target file names</th>
   </tr>
   <tr>
-    <td valign="center" rowspan="2"><code>foo/bar/A.java</code></td>
-    <td valign="top"><code>foo/bar/A.java</code></td>
+    <td rowspan="2"><code>foo/bar/A.java</code></td>
+    <td><code>foo/bar/A.java</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>foo.bar.A</code></td>
+    <td><code>foo.bar.A</code></td>
   </tr>
 </table>
-  <p>The composite mapper has no corresponding
-    <code>&lt;mapper <b>type</b>&gt;</code> attribute.
-  </p>
+<p>The composite mapper has no corresponding <code>&lt;mapper&gt;</code> <var>type</var>
+attribute.</p>
 
     <!--                                        -->
     <!--            Chained Mapper              -->
     <!--                                        -->
 
-<h4><a name="chained-mapper">chained (since Ant 1.7.0)</a></h4>
-  <p>This mapper implementation can contain multiple nested mappers.
-    File mapping is performed by passing the source filename to the first
-    nested mapper, its results to the second, and so on.  The target filenames
-    generated by the last nested mapper comprise the ultimate results of the
-    mapping operation.  The <i>to</i> and <i>from</i> attributes are ignored.</p>
-<b>Examples:</b>
-<blockquote><pre>
+<h4 id="chained-mapper">chained</h4>
+<p><em>Since Ant 1.7.0</em></p>
+<p>This mapper implementation can contain multiple nested mappers.  File mapping is performed by
+passing the source filename to the first nested mapper, its results to the second, and so on.  The
+target filenames generated by the last nested mapper comprise the ultimate results of the mapping
+operation.  The <var>to</var> and <var>from</var> attributes are ignored.</p>
+<h5>Examples</h5>
+<pre>
 &lt;chainedmapper&gt;
   &lt;flattenmapper/&gt;
   &lt;globmapper from="*" to="new/path/*"/&gt;
@@ -684,289 +613,248 @@
     &lt;globmapper from="*" to="*1"/&gt;
     &lt;globmapper from="*" to="*2"/&gt;
   &lt;/mapper&gt;
-&lt;/chainedmapper&gt;
-</pre></blockquote>
-<table border="1" cellpadding="2" cellspacing="0">
+&lt;/chainedmapper&gt;</pre>
+<table>
   <tr>
-    <td valign="top"><b>Source file name</b></td>
-    <td valign="top"><b>Target file names</b></td>
+    <th>Source file name</th>
+    <th>Target file names</th>
   </tr>
   <tr>
-    <td valign="center" rowspan="2"><code>foo/bar/A.java</code></td>
-    <td valign="top"><code>new/path/A.java1</code></td>
+    <td rowspan="2"><code>foo/bar/A.java</code></td>
+    <td><code>new/path/A.java1</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>new/path/A.java2</code></td>
+    <td><code>new/path/A.java2</code></td>
   </tr>
   <tr>
-    <td valign="center" rowspan="2"><code>boo/far/B.java</code></td>
-    <td valign="top"><code>new/path/B.java1</code></td>
+    <td rowspan="2"><code>boo/far/B.java</code></td>
+    <td><code>new/path/B.java1</code></td>
   </tr>
   <tr>
-    <td valign="top"><code>new/path/B.java2</code></td>
+    <td><code>new/path/B.java2</code></td>
   </tr>
 </table>
-  <p>The chained mapper has no corresponding
-    <code>&lt;mapper <b>type</b>&gt;</code> attribute.
-  </p>
+<p>The chained mapper has no corresponding <code>&lt;mapper&gt;</code> <var>type</var>
+attribute.</p>
 
     <!--                                        -->
     <!--             Filter Mapper              -->
     <!--                                        -->
 
-<h4><a name="filter-mapper">filtermapper (since Ant 1.6.3)</a></h4>
-    <p>
-      This mapper implementation applies a <a href="filterchain.html">filterchain</a>
-      to the source file name.
-    </p>
-<b>Examples:</b>
-<blockquote><pre>
+<h4 id="filter-mapper">filtermapper</h4>
+<p><em>Since Ant 1.6.3</em></p>
+<p>This mapper implementation applies a <a href="filterchain.html">filterchain</a> to the source
+file name.</p>
+<h5>Examples</h5>
+<pre>
 &lt;filtermapper&gt;
   &lt;replacestring from="\" to="/"/&gt;
-&lt;/filtermapper&gt;
-</pre></blockquote>
+&lt;/filtermapper&gt;</pre>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
-    <td valign="top"><b>Source file name</b></td>
-    <td valign="top"><b>Target file names</b></td>
+    <th>Source file name</th>
+    <th>Target file names</th>
   </tr>
   <tr>
-    <td valign="center"><code>foo\bar\A.java</code></td>
-    <td valign="top"><code>foo/bar/A.java</code></td>
+    <td><code>foo\bar\A.java</code></td>
+    <td><code>foo/bar/A.java</code></td>
   </tr>
 </table>
-<blockquote><pre>
+<pre>
 &lt;filtermapper&gt;
   &lt;scriptfilter language="beanshell"&gt;
     self.setToken(self.getToken().toUpperCase());
   &lt;/scriptfilter&gt;
-&lt;/filtermapper&gt;
-</pre></blockquote>
+&lt;/filtermapper&gt;</pre>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
-    <td valign="top"><b>Source file name</b></td>
-    <td valign="top"><b>Target file names</b></td>
+    <th>Source file name</th>
+    <th>Target file names</th>
   </tr>
   <tr>
-    <td valign="center"><code>foo\bar\A.java</code></td>
-    <td valign="top"><code>FOO\BAR\A.JAVA</code></td>
+    <td><code>foo\bar\A.java</code></td>
+    <td><code>FOO\BAR\A.JAVA</code></td>
   </tr>
 </table>
 
-  <p>The filtermapper has no corresponding
-    <code>&lt;mapper <b>type</b>&gt;</code> attribute.
-  </p>
+<p>The filtermapper has no corresponding <code>&lt;mapper&gt;</code> <var>type</var> attribute.</p>
 
     <!--                                        -->
     <!--             Script Mapper              -->
     <!--                                        -->
 
-<h4><a name="script-mapper">scriptmapper (since Ant 1.7)</a></h4>
-<p>
-This mapper executes a script written in <a href="http://jakarta.apache.org/bsf" target="_top">Apache BSF</a>
-or
-  <a href="https://scripting.dev.java.net">JSR 223</a>
-supported language, once per file to map.</p>
-The script can be declared inline or in a specified file.
-</p>
-<p>
-See the <a href="../Tasks/script.html">Script</a> task for
-an explanation of scripts and dependencies.
-</p>
+<h4 id="script-mapper">scriptmapper</h4>
+<p><em>Since Ant 1.7</em></p>
+<p>This mapper executes a script written in <a href="https://jakarta.apache.org/bsf"
+target="_top">Apache BSF</a>
+or <a href="https://jcp.org/aboutJava/communityprocess/maintenance/jsr223/223ChangeLog.html"
+target="_top">JSR 223</a> supported language, once per file to map.</p>
+<p>The script can be declared inline or in a specified file.</p>
+<p>See the <a href="../Tasks/script.html">Script</a> task for an explanation of scripts and
+dependencies.</p>
 
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">language</td>
-      <td valign="top">
-        Scripting language
-      </td>
-      <td align="center" valign="top">Yes</td>
-    </tr>
-    <tr>
-      <td valign="top">manager</td>
-      <td valign="top">
-        The script engine manager to use.
-        See the <a href="../Tasks/script.html">script</a> task
-        for using this attribute.
-      </td>
-      <td valign="top" align="center">No - default is "auto"</td>
-    </tr>
-    <tr>
-      <td valign="top">src</td>
-      <td valign="top">
-        File containing the script
-      </td>
-      <td align="center" valign="top">No</td>
-    </tr>
-    <tr>
-      <td valign="top">setbeans</td>
-      <td valign="top">whether to have all properties, references and targets as
-        global variables in the script.  <em>since Ant 1.8.0</em></td>
-      <td valign="top" align="center">No, default is "true".</td>
-    </tr>
-    <tr>
-      <td valign="top">classpath</td>
-      <td valign="top">
-        The classpath to pass into the script.
-      </td>
-      <td align="center" valign="top">No</td>
-    </tr>
-    <tr>
-      <td valign="top">classpathref</td>
-      <td valign="top">The classpath to use, given as a
-        <a href="../using.html#references">reference</a> to a path defined elsewhere.
-        <td align="center" valign="top">No</td>
-      </tr>
-    </table>
-  <p>
-    This filename mapper can take a nested &lt;classpath&gt; element.
-    See the <a href="../Tasks/script.html">script</a> task
-    on how to use this element.
-  </p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>language</td>
+    <td>Scripting language</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>manager</td>
+    <td>The script engine manager to use. See the <a href="../Tasks/script.html">script</a> task
+      for using this attribute.</td>
+    <td>No; default is <q>auto</q></td>
+  </tr>
+  <tr>
+    <td>src</td>
+    <td>File containing the script</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>encoding</td>
+    <td>The encoding of the script as a file. <em>Since Ant 1.10.2</em></td>
+    <td>No; defaults to default JVM character encoding</td>
+  </tr>
+  <tr>
+    <td>setbeans</td>
+    <td>whether to have all properties, references and targets as global variables in the
+      script.  <em>Since Ant 1.8.0</em></td>
+    <td>No; default is <q>true</q></td>
+  </tr>
+  <tr>
+    <td>classpath</td>
+    <td>The classpath to pass into the script.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>classpathref</td>
+    <td>The classpath to use, given as a <a href="../using.html#references">reference</a> to a
+      path defined elsewhere.
+    <td>No</td>
+  </tr>
+</table>
+<p>This filename mapper can take a nested <code>&lt;classpath&gt;</code> element.  See
+the <a href="../Tasks/script.html">script</a> task on how to use this element.</p>
 
-<p>
-  <b>Example:</b>
-</p>
-<blockquote><pre>
+<h5>Example</h5>
+<pre>
 &lt;scriptmapper language="javascript"&gt;
   self.addMappedName(source.toUpperCase());
   self.addMappedName(source.toLowerCase());
-&lt;/scriptmapper&gt;
-</pre></blockquote>
+&lt;/scriptmapper&gt;</pre>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
+  <tr>
+    <th>Source file name</th>
+    <th>Target file names</th>
+  </tr>
   <tr>
-    <td valign="top"><b>Source file name</b></td>
-    <td valign="top"><b>Target file names</b></td>
+    <td rowspan="2"><code>foo\bar\A.java</code></td>
+    <td><code>FOO\BAR\A.JAVA</code></td>
   </tr>
   <tr>
-    <td valign="center" rowspan="2"><code>foo\bar\A.java</code></td>
-    <td valign="top"><code>FOO\BAR\A.JAVA</code></td>
-  </tr>
-  <tr>
-    <td valign="top"><code>foo\bar\a.java</code></td>
-  </tr>
-</table>
-
-<p>
-To use this mapper, the scripts need access to the source file,
-and the ability to return multiple mappings. Here are the relevant beans and
-their methods. The script is called once for every source file, with the
-list of mapped names reset after every invocation.
-
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Script bean</b></td>
-      <td valign="top"><b>Description</b></td>
-    </tr>
-    <tr>
-      <td valign="top"><code>source: String</code></td>
-      <td valign="top">
-        The file/path to map
-      </td>
-    </tr>
-    <tr>
-      <td valign="top"><code>self</code></td>
-      <td valign="top">
-        the scriptmapper itself
-      </td>
-    </tr>
-    <tr>
-      <td valign="top"><code>self.addMappedName(String name)</code></td>
-      <td valign="top">
-        Add a new mapping
-      </td>
-    </tr>
-    <tr>
-      <td valign="top"><code>self.clear()</code></td>
-      <td valign="top">
-        Reset the list of files.
-      </td>
-    </tr>
-    </table>
-
-  <p>The scriptmapper has no corresponding
-    <code>&lt;mapper <b>type</b>&gt;</code> attribute.
-  </p>
-
-<h4><a name="firstmatch-mapper">firstmatchmapper (since Ant 1.8.0)</a></h4>
-    <p>
-      This mapper supports an arbitrary number of nested mappers and
-      returns the results of the first mapper that matches.  This is
-      different from <a href="#composite-mapper">composite mapper</a>
-      which collects the results of all matching children.</p>
-<b>Examples:</b>
-<blockquote><pre>
+    <td><code>foo\bar\a.java</code></td>
+  </tr>
+</table>
+
+<p>To use this mapper, the scripts need access to the source file, and the ability to return
+multiple mappings. Here are the relevant beans and their methods. The script is called once for
+every source file, with the list of mapped names reset after every invocation.</p>
+
+<table>
+  <tr>
+    <th>Script bean</th>
+    <th>Description</th>
+  </tr>
+  <tr>
+    <td><code>source: String</code></td>
+    <td>The file/path to map</td>
+  </tr>
+  <tr>
+    <td><code>self</code></td>
+    <td>The scriptmapper itself</td>
+  </tr>
+  <tr>
+    <td><code>self.addMappedName(String name)</code></td>
+    <td>Add a new mapping</td>
+  </tr>
+  <tr>
+    <td><code>self.clear()</code></td>
+    <td>Reset the list of files</td>
+  </tr>
+</table>
+
+<p>The scriptmapper has no corresponding <code>&lt;mapper&gt;</code> <var>type</var> attribute.</p>
+
+<h4 id="firstmatch-mapper">firstmatchmapper</h4>
+<p><em>Since Ant 1.8.0</em></p>
+<p>This mapper supports an arbitrary number of nested mappers and returns the results of the first
+mapper that matches.  This is different from <a href="#composite-mapper">composite mapper</a> which
+collects the results of all matching children.</p>
+<h5>Examples</h5>
+<pre>
 &lt;firstmatchmapper&gt;
   &lt;globmapper from="*.txt" to="*.bak"/&gt;
   &lt;globmapper from="*A.*" to="*B.*"/&gt;
-&lt;/firstmatchmapper&gt;
-</pre></blockquote>
+&lt;/firstmatchmapper&gt;</pre>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
-    <td valign="top"><b>Source file name</b></td>
-    <td valign="top"><b>Target file names</b></td>
+    <th>Source file name</th>
+    <th>Target file names</th>
   </tr>
   <tr>
-    <td valign="center"><code>foo/bar/A.txt</code></td>
-    <td valign="top"><code>foo/bar/A.bak</code></td>
+    <td><code>foo/bar/A.txt</code></td>
+    <td><code>foo/bar/A.bak</code></td>
   </tr>
   <tr>
-    <td valign="center"><code>foo/bar/A.java</code></td>
-    <td valign="top"><code>foo/bar/B.java</code></td>
+    <td><code>foo/bar/A.java</code></td>
+    <td><code>foo/bar/B.java</code></td>
   </tr>
 </table>
 
-  <p>The firstmatchmapper has no corresponding
-    <code>&lt;mapper <b>type</b>&gt;</code> attribute.
-  </p>
-
-<h4><a name="cutdirs-mapper">cutdirsmapper (since Ant 1.8.2)</a></h4>
+<p>The firstmatchmapper has no corresponding <code>&lt;mapper&gt;</code> <var>type</var>
+attribute.</p>
 
-<p>This mapper strips a configured number of leading directories from
-  the source file name.</p>
+<h4 id="cutdirs-mapper">cutdirsmapper</h4>
+<p><em>Since Ant 1.8.2</em></p>
+<p>This mapper strips a configured number of leading directories from the source file name.</p>
 
-<b>Examples:</b>
-<blockquote><pre>
-&lt;cutdirsmapper dirs="1"/&gt;
-</pre></blockquote>
+<h5>Examples</h5>
+<pre>&lt;cutdirsmapper dirs="1"/&gt;</pre>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table>
   <tr>
-    <td valign="top"><b>Source file name</b></td>
-    <td valign="top"><b>Target file names</b></td>
+    <th>Source file name</th>
+    <th>Target file names</th>
   </tr>
   <tr>
-    <td valign="center"><code>foo/bar/A.txt</code></td>
-    <td valign="top"><code>bar/A.txt</code></td>
+    <td><code>foo/bar/A.txt</code></td>
+    <td><code>bar/A.txt</code></td>
   </tr>
 </table>
 
-<p>The cutdirsmapper has no
-corresponding <code>&lt;mapper <b>type</b>&gt;</code> attribute.</p>
+<p>The cutdirsmapper has no corresponding <code>&lt;mapper&gt;</code> <var>type</var> attribute.</p>
 
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">dirs</td>
-      <td valign="top">
-        Number of directories to strip (must be a positive number).
-      </td>
-      <td align="center" valign="top">Yes</td>
-    </tr>
-  </table>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>dirs</td>
+    <td>Number of directories to strip (must be a positive number).</td>
+    <td>Yes</td>
+  </tr>
+</table>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Types/multirootfileset.html ant-1.10.3/manual/Types/multirootfileset.html
--- ant-1.9.10/manual/Types/multirootfileset.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/multirootfileset.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,150 +24,128 @@
 
 <body>
 
-<h2><a name="multirootfileset">MultiRootFileSet</a></h2>
+<h2 id="multirootfileset">MultiRootFileSet</h2>
 
 <p><em>Since Ant 1.9.4</em></p>
 
-<p>A MultiRootFileSet is a group of files or directories. These files
-or directories can be found in a directory forrest starting with a set
-of base directories and are matched by patterns taken from a number of
-<a href="patternset.html">PatternSets</a> and <a
-href="selectors.html">Selectors</a>.</p>
+<p>A MultiRootFileSet is a group of files or directories. These files or directories can be
+found in a directory forrest starting with a set of base directories and are matched by patterns
+taken from a number of <a href="patternset.html">PatternSets</a>
+and <a href="selectors.html">Selectors</a>.</p>
 
-<p>MultiRootFileSet acts as a union of <a
-href="fileset.html">FileSets</a> and <a href="dirset.html">DirSets</a>
-that share the same patterns and selectors.</p>
+<p>MultiRootFileSet acts as a union of <a href="fileset.html">FileSets</a>
+and <a href="dirset.html">DirSets</a> that share the same patterns and selectors.</p>
 
-<p>MultiRootFileSet supports all attributes and nested elements of
-FileSet and DirSet except for the "dir" attribute.</p>
+<p>MultiRootFileSet supports all attributes and nested elements of FileSet and DirSet except for
+the <var>dir</var> attribute.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">basedirs</td>
-    <td valign="top">Comma separated list of directories that build
-    the roots of the MultiRootFileSet.</td>
-    <td valign="top" align="center">No</td>
+    <td>basedirs</td>
+    <td>Comma separated list of directories that build the roots of the MultiRootFileSet.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">cache</td>
-    <td valign="top">Whether to cache results; disabling
-    may seriously impact performance</td>
-    <td valign="top" align="center">No, default <i>true</i></td>
+    <td>cache</td>
+    <td>Whether to cache results; disabling may seriously impact performance</td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">type</td>
-    <td valign="top">The type of file system entities which will be
-    included in this set.
-    Acceptable values are:
+    <td>type</td>
+    <td>The type of file system entities which will be included in this set.  Acceptable values
+    are:
     <ul>
-      <li>file - regular files</li>
-      <li>dir - directories</li>
-      <li>both - regular files and directories</li>
+      <li><q>file</q>&mdash;regular files</li>
+      <li><q>dir</q>&mdash;directories</li>
+      <li><q>both</q>&mdash;regular files and directories</li>
     </ul>
     </td>
-    <td valign="top" align="center">No, defaults to <i>file</i></td>
+    <td>No; defaults to <q>file</q></td>
   </tr>
   <tr>
-    <td valign="top">includes</td>
-    <td valign="top">A comma- or space-separated list of patterns of directories that
-     must be included; all directories are included when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>includes</td>
+    <td>A comma- or space-separated list of patterns of directories that must be included.</td>
+    <td>No; defaults to all directories</td>
   </tr>
   <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top">The name of a file; each line of this file is
-      taken to be an include pattern.</td>
-    <td valign="top" align="center">No</td>
+    <td>includesfile</td>
+    <td>Name of a file; each line of this file is taken to be an include pattern.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">excludes</td>
-    <td valign="top">A comma- or space-separated list of patterns of directories that
-     must be excluded; no directories are excluded when omitted.</td>
-    <td valign="top" align="center">No</td>
+    <td>excludes</td>
+    <td>A comma- or space-separated list of patterns of directories that must be excluded.</td>
+    <td>No; defaults to none</td>
   </tr>
   <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top">The name of a file; each line of this file is
-      taken to be an exclude pattern.</td>
-    <td valign="top" align="center">No</td>
+    <td>excludesfile</td>
+    <td>Name of a file; each line of this file is taken to be an exclude pattern.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">casesensitive</td>
-    <td valign="top">Specifies whether case-sensitivity should be applied
-     (<code>true</code>|<code>yes</code>|<code>on</code> or
-     <code>false</code>|<code>no</code>|<code>off</code>).</td>
-    <td valign="top" align="center">No; defaults to true.</td>
+    <td>casesensitive</td>
+    <td>Specifies whether case-sensitivity should be applied (<q>true</q>, <q>yes</q>, <q>on</q>
+     or <q>false</q>, <q>no</q>, <q>off</q>).</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">followsymlinks</td>
-    <td valign="top">Shall symbolic links be followed? Defaults to
-      true. See <a href="fileset.html#symlink">fileset's documentation</a>.</td>
-    <td valign="top" align="center">No</td>
+    <td>followsymlinks</td>
+    <td>Shall symbolic links be followed? See <a href="fileset.html#symlink">fileset's
+      documentation</a>.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">erroronmissingdir</td>
-    <td valign="top">
-      Specify what happens if one of the base directories does not exist.
-      If true a build error will happen, if false, the subtree
-      will be ignored/empty.
-      Defaults to true.
-    </td>
-    <td valign="top" align="center">No</td>
+    <td>erroronmissingdir</td>
+    <td>Specify what happens if one of the base directories does not exist.  If <q>true</q> a
+      build error will happen, if <q>false</q>, the subtree will be ignored/empty.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
 
-<p>PatternSets can be specified as nested
-<code>&lt;patternset&gt;</code> elements. In addition, MultiRootFileSet holds
-an implicit PatternSet and supports the nested
-<code>&lt;include&gt;</code>, <code>&lt;includesfile&gt;</code>,
-<code>&lt;exclude&gt;</code> and <code>&lt;excludesfile&gt;</code>
-elements of <code>&lt;patternset&gt;</code> directly, as well as
-<code>&lt;patternset&gt;</code>'s attributes.</p>
-
-<p>Selectors are available as nested elements within the
-MultiRootFileSet.  If any of the selectors within the MultiRootFileSet
-do not select the file or directory, it is not considered part of the
-MultiRootFileSet. This makes a MultiRootFileSet equivalent to
+<p>PatternSets can be specified as nested <code>&lt;patternset&gt;</code> elements. In addition,
+MultiRootFileSet holds an implicit PatternSet and supports the
+nested <code>&lt;include&gt;</code>, <code>&lt;includesfile&gt;</code>, <code>&lt;exclude&gt;</code>
+and <code>&lt;excludesfile&gt;</code> elements of <code>&lt;patternset&gt;</code> directly, as
+well as <code>&lt;patternset&gt;</code>'s attributes.</p>
+
+<p>Selectors are available as nested elements within the MultiRootFileSet.  If any of the
+selectors within the MultiRootFileSet do not select the file or directory, it is not considered
+part of the MultiRootFileSet. This makes a MultiRootFileSet equivalent to
 an <code>&lt;and&gt;</code> selector container.</p>
 
-<p>In addition basedirs for the MultiRootFileSet can be specified as
-  nested <code>basedir</code> elements that have a
-  single <code>file</code> attribute.</p>
-
+<p>In addition basedirs for the MultiRootFileSet can be specified as nested <code>basedir</code>
+elements that have a single <var>file</var> attribute.</p>
 
-<h4>Examples</h4>
+<h3>Examples</h3>
 
-<blockquote><pre>
+<pre>
 &lt;multirootfileset basedirs=&quot;${build.dir},${other.project.dir}&quot;&gt;
   &lt;include name=&quot;apps/**/classes&quot;/&gt;
   &lt;exclude name=&quot;apps/**/*Test*&quot;/&gt;
 &lt;/multirootfileset&gt;
-</pre></blockquote>
-<p>Groups all files inside <code>classes</code> found under the
-<code>apps</code> subdirectory of <code>${build.dir}</code> or
-<code>${other.project.dir}</code>, except those that have the text
-<code>Test</code> in their name.</p>
+</pre>
+<p>Groups all files inside <samp>classes</samp> found under the <samp>apps</samp> subdirectory
+of <samp>${build.dir}</samp> or <samp>${other.project.dir}</samp>, except those that have the
+text <samp>Test</samp> in their name.</p>
 
-<blockquote><pre>
+<pre>
 &lt;multirootfileset&gt;
   &lt;basedir file=&quot;${build.dir}&quot;/&gt;
   &lt;basedir file=&quot;${other.project.dir}&quot;
   &lt;include name=&quot;apps/**/classes&quot;/&gt;
   &lt;exclude name=&quot;apps/**/*Test*&quot;/&gt;
 &lt;/multirootfileset&gt;
-</pre></blockquote>
-<p>Is equivalent to the first example but used
-  nested <code>basedir</code> elements.  The nested elements and
-  the <code>basedirs</code> attribute can be used at the same time and
-  the will be merged.</p>
+</pre>
+<p>Is equivalent to the first example but used nested <code>basedir</code> elements.  The nested
+elements and the <var>basedirs</var> attribute can be used at the same time and the will be
+merged.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Types/namespace.html ant-1.10.3/manual/Types/namespace.html
--- ant-1.9.10/manual/Types/namespace.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/namespace.html	2018-03-24 12:37:12.000000000 +0000
@@ -14,146 +14,142 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html><head><link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
-<title>XmlNamespaceSupport</title></head>
+<html>
+<head>
+  <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
+  <title>XmlNamespaceSupport</title>
+</head>
   <body>
-    <h2><a name="namespace">XML Namespace Support</a></h2>
-    Apache Ant 1.6 introduces support for XML namespaces. 
+    <h2 id="namespace">XML Namespace Support</h2>
+    Apache Ant 1.6 introduces support for XML namespaces.
     <h3>History</h3>
-    
+
     <p>
-      All releases of Ant prior to Ant 1.6 do not support XML namespaces.
-      No support basically implies two things here:
+      All releases of Ant prior to Ant 1.6 do not support XML namespaces.  No support basically
+      implies two things here:
     </p>
     <ul>
-      <li> Element names correspond to the "qname" of the tags, which is
-        usually the same as the local name. But if the build file writer uses
-        colons in names of defined tasks/types, those become part of the
-        element name. Turning on namespace support gives colon-separated
-        prefixes in tag names a special meaning, and thus build files using
+      <li>Element names correspond to the "qname" of the tags, which is usually the same as the
+        local name. But if the build file writer uses colons in names of defined tasks/types,
+        those become part of the element name. Turning on namespace support gives
+        colon-separated prefixes in tag names a special meaning, and thus build files using
         colons in user-defined tasks and types will break.
       </li>
-      <li> Attributes with the names 'xmlns' and 'xmlns:<code>&lt;prefix&gt;</code>'
-        are not treated specially, which means that custom tasks and types have
-        actually been able to use such attributes as parameter names. Again,
-        such tasks/types are going to break when namespace support is enabled
-        on the parser.
+      <li>Attributes with the names <q>xmlns</q> and <q>xmlns:<em>prefix</em></q> are not
+        treated specially, which means that custom tasks and types have actually been able to
+        use such attributes as parameter names. Again, such tasks/types are going to break when
+        namespace support is enabled on the parser.
       </li>
     </ul>
-    <p>Use of colons in element names has been discouraged in the past,
-      and using any attribute starting with "xml" is actually strongly
-      discouraged by the XML spec to reserve such names for future use.
+    <p>Use of colons in element names has been discouraged in the past, and using any attribute
+      starting with <q>xml</q> is actually strongly discouraged by the XML spec to reserve such
+      names for future use.
     </p>
+
     <h3>Motivation</h3>
+    <p>In build files using a lot of custom and third-party tasks, it is easy to get into name
+      conflicts. When individual types are defined, the build file writer can do some
+      namespacing manually (for example, using <q>tomcat-deploy</q> instead of
+      just <q>deploy</q>). But when defining whole libraries of types using
+      the <code>&lt;typedef&gt;</code> <var>resource</var> attribute, the build file writer has
+      no chance to override or even prefix the names supplied by the library.</p>
 
-    <p>In build files using a lot of custom and third-party tasks, it is
-      easy to get into name conflicts. When individual types are defined, the
-      build file writer can do some namespacing manually (for example, using
-      "tomcat-deploy" instead of just "deploy"). But when defining whole
-      libraries of types using the <code>&lt;typedef&gt;</code> 'resource' attribute, the
-      build file writer has no chance to override or even prefix the names
-      supplied by the library. </p>
     <h3>Assigning Namespaces</h3>
-
     <p>
-      Adding a 'prefix' attribute to <code>&lt;typedef&gt;</code> might have been enough,
-      but XML already has a well-known method for namespacing. Thus, instead
-      of adding a 'prefix' attribute, the <code>&lt;typedef&gt;</code> and <code>&lt;taskdef&gt;</code>
-      tasks get a 'uri' attribute, which stores the URI of the XML namespace
-      with which the type should be associated:
-    </p><pre> &lt;typedef resource="org/example/tasks.properties" uri="<a href="http://example.org/tasks">http://example.org/tasks</a>"/&gt;
- &lt;my:task xmlns:my="<a href="http://example.org/tasks">http://example.org/tasks</a>"&gt;
-    ...
- &lt;/my:task&gt;
-</pre>
-    <p>As the above example demonstrates, the namespace URI needs to be
-      specified at least twice: one time as the value of the 'uri' attribute,
-      and another time to actually map the namespace to occurrences of
-      elements from that namespace, by using the 'xmlns' attribute. This
-      mapping can happen at any level in the build file:
-    </p><pre> &lt;project name="test" xmlns:my="<a href="http://example.org/tasks">http://example.org/tasks</a>"&gt; 
-   &lt;typedef resource="org/example/tasks.properties" uri="<a href="http://example.org/tasks">http://example.org/tasks</a>"/&gt;
-   &lt;my:task&gt;
-     ...
-   &lt;/my:task&gt;
- &lt;/project&gt;
-</pre>
-    <p>
-      Use of a namespace prefix is of course optional. Therefore
-      the example could also look like this:
-    </p><pre> &lt;project name="test"&gt; 
-   &lt;typedef resource="org/example/tasks.properties" uri="<a href="http://example.org/tasks">http://example.org/tasks</a>"/&gt;
-   &lt;task xmlns="<a href="http://example.org/tasks">http://example.org/tasks</a>"&gt;
-     ...
-   &lt;/task&gt;
- &lt;/project&gt;
-</pre>
+      Adding a <var>prefix</var> attribute to <code>&lt;typedef&gt;</code> might have been
+      enough, but XML already has a well-known method for namespacing. Thus, instead of adding
+      a <var>prefix</var> attribute, the <code>&lt;typedef&gt;</code>
+      and <code>&lt;taskdef&gt;</code> tasks get a <var>uri</var> attribute, which stores the
+      URI of the XML namespace with which the type should be associated:
+    </p>
+    <pre>
+&lt;typedef resource="org/example/tasks.properties" uri="<a href="http://example.org/tasks">http://example.org/tasks</a>"/&gt;
+&lt;my:task xmlns:my="<a href="http://example.org/tasks">http://example.org/tasks</a>"&gt;
+    ...
+&lt;/my:task&gt;</pre>
+    <p>As the above example demonstrates, the namespace URI needs to be specified at least
+      twice: one time as the value of the <var>uri</var> attribute, and another time to actually
+      map the namespace to occurrences of elements from that namespace, by using
+      the <var>xmlns</var> attribute. This mapping can happen at any level in the build file:
+    </p>
+    <pre>
+&lt;project name="test" xmlns:my="<a href="http://example.org/tasks">http://example.org/tasks</a>"&gt;
+    &lt;typedef resource="org/example/tasks.properties" uri="<a href="http://example.org/tasks">http://example.org/tasks</a>"/&gt;
+    &lt;my:task&gt;
+        ...
+    &lt;/my:task&gt;
+&lt;/project&gt;</pre>
+    <p>
+      Use of a namespace prefix is of course optional. Therefore the example could also look
+      like this:
+    </p>
+    <pre>
+&lt;project name="test"&gt;
+    &lt;typedef resource="org/example/tasks.properties" uri="<a href="http://example.org/tasks">http://example.org/tasks</a>"/&gt;
+    &lt;task xmlns="<a href="http://example.org/tasks">http://example.org/tasks</a>"&gt;
+        ...
+    &lt;/task&gt;
+&lt;/project&gt;</pre>
     <p>
       Here, the namespace is set as the default namespace for the <code>&lt;task&gt;</code>
       element and all its descendants.
     </p>
-    <h3>Default namespace</h3>
+
+    <h3>Default Namespace</h3>
     <p>
-      The default namespace used by Ant is "antlib:org.apache.tools.ant".
+      The default namespace used by Ant is <code>antlib:org.apache.tools.ant</code>.
     </p>
     <pre>
 &lt;typedef resource="org/example/tasks.properties" uri="antlib:org.apache.tools.ant"/&gt;
 &lt;task&gt;
-      ....
-&lt;/task&gt;
-    </pre>
-
-     
+    ...
+&lt;/task&gt;</pre>
 
     <h3>Namespaces and Nested Elements</h3>
-
     <p>
-      Almost always in Ant 1.6, elements nested inside a namespaced
-      element have the same namespace as their parent. So if 'task' in the
-      example above allowed a nested 'config' element, the build file snippet
-      would look like this:
-    </p><pre> &lt;typedef resource="org/example/tasks.properties" uri="<a href="http://example.org/tasks">http://example.org/tasks</a>"/&gt;
- &lt;my:task xmlns:my="<a href="http://example.org/tasks">http://example.org/tasks</a>"&gt;
-   &lt;my:config a="foo" b="bar"/&gt;
-   ...
- &lt;/my:task&gt;
-</pre>
-    <p>If the element allows or requires a lot of nested elements, the
-      prefix needs to be used for every nested element. Making the namespace
-      the default can reduce the verbosity of the script:
-    </p><pre> &lt;typedef resource="org/example/tasks.properties" uri="<a href="http://example.org/tasks">http://example.org/tasks</a>"/&gt;
-          &lt;task xmlns="<a href="http://example.org/tasks">http://example.org/tasks</a>"&gt;
-          &lt;config a="foo" b="bar"/&gt;
-   ...
-          &lt;/task&gt;
-        </pre>
-    <p>
-      From Ant 1.6.2, elements nested inside a namespaced element may also be
-      in Ant's default namespace. This means that the following is now allowed:
-    </p>
-    </p><pre> &lt;typedef resource="org/example/tasks.properties"
-   uri="<a href="http://example.org/tasks">http://example.org/tasks</a>"/&gt;
- &lt;my:task xmlns:my="<a href="http://example.org/tasks">http://example.org/tasks</a>"&gt;
-   &lt;config a="foo" b="bar"/&gt;
-   ...
- &lt;/my:task&gt;
-</pre>
-      
-    <h3>Namespaces and Attributes</h3>
+      Almost always in Ant 1.6, elements nested inside a namespaced element have the same
+      namespace as their parent. So if <code>task</code> in the example above allowed a
+      nested <code>config</code> element, the build file snippet would look like this:
+    </p>
+    <pre>
+&lt;typedef resource="org/example/tasks.properties" uri="<a href="http://example.org/tasks">http://example.org/tasks</a>"/&gt;
+&lt;my:task xmlns:my="<a href="http://example.org/tasks">http://example.org/tasks</a>"&gt;
+    &lt;my:config a="foo" b="bar"/&gt;
+    ...
+&lt;/my:task&gt;</pre>
+    <p>If the element allows or requires a lot of nested elements, the prefix needs to be used
+      for every nested element. Making the namespace the default can reduce the verbosity of the
+      script:
+    </p>
+    <pre>
+&lt;typedef resource="org/example/tasks.properties" uri="<a href="http://example.org/tasks">http://example.org/tasks</a>"/&gt;
+&lt;task xmlns="<a href="http://example.org/tasks">http://example.org/tasks</a>"&gt;
+    &lt;config a="foo" b="bar"/&gt;
+    ...
+&lt;/task&gt;</pre>
+    <p>
+      <em>Since Ant 1.6.2</em>, elements nested inside a namespaced element may also be in Ant's
+      default namespace. This means that the following is now allowed:
+    </p>
+    <pre>
+&lt;typedef resource="org/example/tasks.properties"
+    uri="<a href="http://example.org/tasks">http://example.org/tasks</a>"/&gt;
+&lt;my:task xmlns:my="<a href="http://example.org/tasks">http://example.org/tasks</a>"&gt;
+    &lt;config a="foo" b="bar"/&gt;
+    ...
+&lt;/my:task&gt;</pre>
 
+    <h3>Namespaces and Attributes</h3>
     <p>
       Attributes are only used to configure the element they belong to if:
     </p>
     <ul>
-      <li> they have no namespace (note that the default namespace does *not* apply to attributes)
-      </li>
-      <li> they are in the same namespace as the element they belong to
-      </li>
+      <li>they have no namespace (note that the default namespace does <strong>not</strong> apply to attributes)</li>
+      <li>they are in the same namespace as the element they belong to</li>
     </ul>
     <p>
-      In Ant 1.9.1 two attribute namespaces <code>ant:if</code> and <code>ant:unless</code> were added
-      to allow you to insert elements conditionally.
+      <em>Since Ant 1.9.1</em> two attribute namespaces <code>ant:if</code>
+      and <code>ant:unless</code> are available to allow you to insert elements conditionally.
     </p>
     <p>
       Other attributes are simply ignored.
@@ -162,62 +158,65 @@
       This means that both:
     </p>
     <p>
-    </p><pre> &lt;my:task xmlns:my="<a href="http://example.org/tasks">http://example.org/tasks</a>"&gt;
-   &lt;my:config a="foo" b="bar"/&gt;
-   ...
- &lt;/my:task&gt;
-</pre>
+    </p>
+    <pre>
+&lt;my:task xmlns:my="<a href="http://example.org/tasks">http://example.org/tasks</a>"&gt;
+    &lt;my:config a="foo" b="bar"/&gt;
+    ...
+&lt;/my:task&gt;</pre>
     <p>
       and
     </p>
-    <pre> &lt;my:task xmlns:my="<a href="http://example.org/tasks">http://example.org/tasks</a>"&gt;
-   &lt;my:config my:a="foo" my:b="bar"/&gt;
-   ...
- &lt;/my:task&gt;
-</pre>
-    <p>
-      result in the parameters "a" and "b" being used as parameters to configure the nested "config" element.
-    </p>
-    <p>It also means that you can use attributes from other namespaces
-      to markup the build file with extra metadata, such as RDF and
-      XML-Schema (whether that's a good thing or not). The same is not true
-      for elements from unknown namespaces, which result in a error.
+    <pre>
+&lt;my:task xmlns:my="<a href="http://example.org/tasks">http://example.org/tasks</a>"&gt;
+    &lt;my:config my:a="foo" my:b="bar"/&gt;
+    ...
+&lt;/my:task&gt;</pre>
+    <p>
+      result in the parameters <var>a</var> and <var>b</var> being used as parameters to
+      configure the nested <code>config</code> element.
+    </p>
+    <p>
+      It also means that you can use attributes from other namespaces to markup the build file
+      with extra metadata, such as RDF and XML-Schema (whether that's a good thing or not). The
+      same is not true for elements from unknown namespaces, which result in a error.
     </p>
     <h3>Mixing Elements from Different Namespaces</h3>
 
-    <p>Now comes the difficult part: elements from different namespaces can
-      be woven together under certain circumstances. This has a lot to do
-      with the Ant 1.6
-      <a href="../develop.html#nestedtype">add type introspection rules</a>:
-      Ant types and tasks are now free to accept arbitrary named types as
-      nested elements, as long as the concrete type implements the interface
-      expected by the task/type. The most obvious example for this is the
-      <code>&lt;condition&gt;</code> task, which supports various nested conditions, all
-      of which extend the interface <tt>Condition</tt>. To integrate a
-      custom condition in Ant, you can now simply <code>&lt;typedef&gt;</code> the
-      condition, and then use it anywhere nested conditions are allowed
-      (assuming the containing element has a generic <tt>add(Condition)</tt> or <tt>addConfigured(Condition)</tt> method):
-</p><pre> &lt;typedef resource="org/example/conditions.properties" uri="<a href="http://example.org/conditions">http://example.org/conditions</a>"/&gt;
- &lt;condition property="prop" xmlns="<a href="http://example.org/conditions">http://example.org/conditions</a>"&gt;
-   &lt;and&gt;
-     &lt;available file="bla.txt"/&gt;
-     &lt;my:condition a="foo"/&gt;
-   &lt;/and&gt;
- &lt;/condition&gt;
-</pre>
-    <p>
-      In Ant 1.6, this feature cannot be used as much as we'd all like to: a
-      lot of code has not yet been adapted to the new introspection rules,
-      and elements like Ant's built-in conditions and selectors are not
-      really types in 1.6. This is expected to change in Ant 1.7.
+    <p>
+      Now comes the difficult part: elements from different namespaces can be woven together under
+      certain circumstances. This has a lot to do with the Ant
+      1.6 <a href="../develop.html#nestedtype">add type introspection rules</a>: Ant types and tasks
+      are now free to accept arbitrary named types as nested elements, as long as the concrete type
+      implements the interface expected by the task/type. The most obvious example for this is
+      the <code>&lt;condition&gt;</code> task, which supports various nested conditions, all of
+      which extend the interface <code class="code">Condition</code>. To integrate a custom
+      condition in Ant, you can now simply <code>&lt;typedef&gt;</code> the condition, and then use
+      it anywhere nested conditions are allowed (assuming the containing element has a
+      generic <code class="code">add(Condition)</code>
+      or <code class="code">addConfigured(Condition)</code> method):
+    </p>
+    <pre>
+&lt;typedef resource="org/example/conditions.properties" uri="<a href="http://example.org/conditions">http://example.org/conditions</a>"/&gt;
+&lt;condition property="prop" xmlns="<a href="http://example.org/conditions">http://example.org/conditions</a>"&gt;
+    &lt;and&gt;
+        &lt;available file="bla.txt"/&gt;
+        &lt;my:condition a="foo"/&gt;
+    &lt;/and&gt;
+&lt;/condition&gt;</pre>
+    <p>
+      In Ant 1.6, this feature cannot be used as much as we'd all like to: a lot of code has not
+      yet been adapted to the new introspection rules, and elements like Ant's built-in
+      conditions and selectors are not really types in 1.6. This is expected to change in Ant
+      1.7.
     </p>
     <h3>Namespaces and Antlib</h3>
 
     <p>
-      The new <a href="antlib.html">AntLib</a>
-      feature is also very much integrated with the namespace support in Ant
-      1.6. Basically, you can "import" Antlibs simply by using a special
-      scheme for the namespace URI: the <tt>antlib</tt> scheme, which expects the package name in which a special <tt>antlib.xml</tt> file is located.
+      The new <a href="antlib.html">AntLib</a> feature is also very much integrated with the
+      namespace support in Ant 1.6. Basically, you can "import" Antlibs simply by using a
+      special scheme for the namespace URI: the <code>antlib</code> scheme, which expects the
+      package name in which a special <samp>antlib.xml</samp> file is located.
     </p>
 
 </body>
diff -Nru ant-1.9.10/manual/Types/patternset.html ant-1.10.3/manual/Types/patternset.html
--- ant-1.9.10/manual/Types/patternset.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/patternset.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,169 +24,161 @@
 
 <body>
 
-<h2><a name="patternset">PatternSet</a></h2>
-<p><a href="../dirtasks.html#patterns">Patterns</a> can be grouped to
-sets and later be referenced by their <code>id</code> attribute. They
-are defined via a <code>patternset</code> element, which can appear
-nested into a <a href="fileset.html">FileSet</a> or a directory-based
-task that constitutes an implicit FileSet. In addition,
-<code>patternset</code>s can be defined as a stand alone element at
-the same level as <code>target</code> &#151; i.e., as children of
-<code>project</code> as well as as children of
-<code>target</code>.</p> <p>Patterns can be specified by nested
-<code>&lt;include&gt;</code>, or <code>&lt;exclude&gt;</code> elements
-or the following attributes.</p>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-  </tr>
-  <tr>
-    <td valign="top">includes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      included. All files are included when omitted.</td>
-  </tr>
-  <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top">the name of a file; each line of this file is
-      taken to be an include pattern. You can specify more than one
-      include file by using a nested includesfile elements.
-      <b>Note:</b> if the file is empty and there are no other
+<h2 id="patternset">PatternSet</h2>
+<p><a href="../dirtasks.html#patterns">Patterns</a> can be grouped to sets and later be
+referenced by their <var>id</var> attribute. They are defined via a <code>patternset</code>
+element, which can appear nested into a <a href="fileset.html">FileSet</a> or a directory-based
+task that constitutes an implicit FileSet. In addition, <code>patternset</code>s can be defined
+as a stand alone element at the same level as <code>target</code>&mdash;i.e., as children of
+<code>project</code> as well as as children of <code>target</code>.</p>
+<p>Patterns can be specified by nested <code>&lt;include&gt;</code>,
+or <code>&lt;exclude&gt;</code> elements or the following attributes.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Default</th>
+  </tr>
+  <tr>
+    <td>includes</td>
+    <td>comma- or space-separated list of patterns of files that must be included.</td>
+    <td>All files are included.</td>
+  </tr>
+  <tr>
+    <td>includesfile</td>
+    <td>name of a file; each line of this file is taken to be an include pattern. You can
+      specify more than one include file by using a nested <code>includesfile</code> elements.
+      <strong>Note:</strong> if the file is empty and there are no other
       patterns defined for the fileset, all files will be included.
     </td>
+    <td>See <var>includes</var></td>
   </tr>
   <tr>
-    <td valign="top">excludes</td>
-    <td valign="top">comma- or space-separated list of patterns of files that must be
-      excluded; no files (except default excludes) are excluded when omitted.</td>
+    <td>excludes</td>
+    <td>comma- or space-separated list of patterns of files that must be excluded.</td>
+    <td>No files except default excludes are excluded.</td>
   </tr>
   <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top">the name of a file; each line of this file is
-      taken to be an exclude pattern. You can specify more than one
-      exclude file by using a nested excludesfile elements.</td>
+    <td>excludesfile</td>
+    <td>name of a file; each line of this file is taken to be an exclude pattern. You can
+      specify more than one exclude file by using a nested <code>excludesfile</code>
+      elements.</td>
+    <td>See <var>excludes</var></td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 <h4><code>include</code> and <code>exclude</code></h4>
-<p>Each such element defines a single pattern for files to include or
-exclude.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<p>Each such element defines a single pattern for files to include or exclude.</p>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">the <a href="../dirtasks.html#patterns">pattern</a>
-      to in/exclude.</td>
-    <td align="center" valign="top">Yes</td>
+    <td>name</td>
+    <td>the <a href="../dirtasks.html#patterns">pattern</a> to in/exclude.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">if</td>
-    <td valign="top">Only use this pattern <a href="../properties.html#if+unless">if the named property is set</a>.</td>
-    <td align="center" valign="top">No</td>
+    <td>if</td>
+    <td>Only use this pattern <a href="../properties.html#if+unless">if the named property is
+    set</a>.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">unless</td>
-    <td valign="top">Only use this pattern <a href="../properties.html#if+unless">if the named property is
-       <b>not</b> set</a>.</td>
-    <td align="center" valign="top">No</td>
+    <td>unless</td>
+    <td>Only use this pattern <a href="../properties.html#if+unless">if the named property
+    is <strong>not</strong> set</a>.</td>
+    <td>No</td>
   </tr>
 </table>
 <h4><code>includesfile</code> and <code>excludesfile</code></h4>
-<p>If you want to list the files to include or exclude external to
-your build file, you should use the includesfile/excludesfile
-attributes or elements.  Using the attribute, you can only specify a
-single file of each type, while the nested elements can be specified
-more than once - the nested elements also support if/unless attributes
-you can use to test the existence of a property.</p>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">name</td>
-    <td valign="top">the name of the file holding the patterns to
-      in/exclude.</td>
-    <td align="center" valign="top">Yes</td>
-  </tr>
-  <tr>
-    <td valign="top">if</td>
-    <td valign="top">Only read this file <a href="../properties.html#if+unless">if the named property is set</a>.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">unless</td>
-    <td valign="top">Only read this file <a href="../properties.html#if+unless">if the named property is
-      <b>not</b> set</a>.</td>
-    <td align="center" valign="top">No</td>
+<p>If you want to list the files to include or exclude external to your build file, you should
+use the <var>includesfile</var>/<var>excludesfile</var> attributes or elements.  Using the
+attribute, you can only specify a single file of each type, while the nested elements can be
+specified more than once&mdash;the nested elements also support <var>if</var>/<var>unless</var>
+attributes you can use to test the existence of a property.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>name</td>
+    <td>the name of the file holding the patterns to in/exclude.</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>if</td>
+    <td>Only read this file <a href="../properties.html#if+unless">if the named property is
+    set</a>.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>unless</td>
+    <td>Only read this file <a href="../properties.html#if+unless">if the named property
+    is <strong>not</strong> set</a>.</td>
+    <td>No</td>
   </tr>
 </table>
 <h4><code>patternset</code></h4>
-<p>Patternsets may be nested within one another, adding the nested
-patterns to the parent patternset.</p>
+<p>Patternsets may be nested within one another, adding the nested patterns to the parent
+patternset.</p>
 <h4><code>invert</code></h4>
-<p>A nested patternset can be inverted using the <code>&lt;invert&gt;</code>
-element. <em>Since Apache Ant 1.7.1</em></p>
+<p><em>Since Apache Ant 1.7.1</em></p>
+<p>A nested patternset can be inverted using the <code>&lt;invert&gt;</code> element.</p>
 <h3>Examples</h3>
-<blockquote><pre>
+<pre>
 &lt;patternset id=&quot;non.test.sources&quot;&gt;
   &lt;include name=&quot;**/*.java&quot;/&gt;
   &lt;exclude name=&quot;**/*Test*&quot;/&gt;
 &lt;/patternset&gt;
-</pre></blockquote>
-<p>Builds a set of patterns that matches all <code>.java</code> files
-that do not contain the text <code>Test</code> in their name. This set
-can be <a href="../using.html#references">referred</a> to via
-<code>&lt;patternset refid=&quot;non.test.sources&quot;/&gt;</code>,
-by tasks that support this feature, or by FileSets.</p>
-<p>Note that while the <code>includes</code> and
-<code>excludes</code> attributes accept
-multiple elements separated by commas or spaces, the nested
-<code>&lt;include&gt;</code> and <code>&lt;exclude&gt;</code> elements expect their name
-attribute to hold a single pattern.</p>
-<p>The nested elements allow you to use if and unless arguments to
-specify that the element should only be used if a property is set, or
-that it should be used only if a property is not set.</p>
+</pre>
+<p>Builds a set of patterns that matches all <samp>.java</samp> files that do not contain the
+text <samp>Test</samp> in their name. This set can
+be <a href="../using.html#references">referred</a> to via <code>&lt;patternset
+refid=&quot;non.test.sources&quot;/&gt;</code>, by tasks that support this feature, or by
+FileSets.</p>
+<p>Note that while the <var>includes</var> and <var>excludes</var> attributes accept multiple
+elements separated by commas or spaces, the nested <code>&lt;include&gt;</code>
+and <code>&lt;exclude&gt;</code> elements expect their name attribute to hold a single
+pattern.</p>
+<p>The nested elements allow you to use <var>if</var> and <var>unless</var> attributes to
+specify that the element should only be used if a property is set, or that it should be used
+only if a property is not set.</p>
 <p>For example</p>
-<blockquote><pre>
+<pre>
 &lt;patternset id=&quot;sources&quot;&gt;
   &lt;include name=&quot;std/**/*.java&quot;/&gt;
   &lt;include name=&quot;prof/**/*.java&quot; if=&quot;professional&quot;/&gt;
   &lt;exclude name=&quot;**/*Test*&quot;/&gt;
 &lt;/patternset&gt;
-</pre></blockquote>
-<p>will only include the files in the sub-directory <em>prof</em> if the property
-<em>professional</em> is set to some value.</p>
+</pre>
+<p>will only include the files in the sub-directory <samp>prof</samp> if the
+property <code>professional</code> is set to some value.</p>
 <p>The two sets</p>
-<blockquote><pre>
+<pre>
 &lt;patternset includesfile=&quot;some-file&quot;/&gt;
-</pre></blockquote>
+</pre>
 <p>and</p>
-<blockquote><pre>
+<pre>
 &lt;patternset&gt;
-  &lt;includesfile name=&quot;some-file&quot;/&gt; 
+  &lt;includesfile name=&quot;some-file&quot;/&gt;
 &lt;patternset/&gt;
-</pre></blockquote>
-<p>are identical.  The include patterns will be read from the file
-<code>some-file</code>, one pattern per line.</p>
-<blockquote><pre>
+</pre>
+<p>are identical.  The include patterns will be read from the file <samp>some-file</samp>, one
+pattern per line.</p>
+<pre>
 &lt;patternset&gt;
-  &lt;includesfile name=&quot;some-file&quot;/&gt; 
-  &lt;includesfile name=&quot;${some-other-file}&quot; 
-                if=&quot;some-other-file&quot;
-  /&gt; 
+  &lt;includesfile name=&quot;some-file&quot;/&gt;
+  &lt;includesfile name=&quot;${some-other-file}&quot;
+                if=&quot;some-other-file&quot;/&gt;
 &lt;patternset/&gt;
-</pre></blockquote>
-<p>will also read include patterns from the file the property
-<code>some-other-file</code> points to, if a property of that name has
-been defined.</p>
-
+</pre>
+<p>will also read include patterns from the file the property <code>some-other-file</code>
+points to, if a property of that name has been defined.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Types/permissions.html ant-1.10.3/manual/Types/permissions.html
--- ant-1.9.10/manual/Types/permissions.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/permissions.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,97 +24,78 @@
 
 <body>
 
-<h2><a name="permissions">Permissions</a></h2>
-<p>
-Permissions represents a set of security permissions granted or revoked to
-a specific part code executed in the JVM where Apache Ant is running in.
-The actual Permissions are specified via a set of nested permission items either
-<code>&lt;grant&gt;</code>ed or <code>&lt;revoke&gt;</code>d.</p>
-<p>
-In the base situation a <a href="#baseset">base set</a> of permissions granted. 
-Extra permissions can be
-granted. A granted permission can be overruled by revoking a permission.
-The security manager installed by the permissions will throw an 
-<code>SecurityException</code> if
-the code subject to these permissions try to use an permission that has not been 
-granted or that has been revoked.</p>
+<h2 id="permissions">Permissions</h2>
+<p>Permissions represents a set of security permissions granted or revoked to a specific part
+code executed in the JVM where Apache Ant is running in.  The actual Permissions are specified
+via a set of nested permission items either <code>&lt;grant&gt;</code>ed
+or <code>&lt;revoke&gt;</code>d.</p>
+<p>In the base situation a <a href="#baseset">base set</a> of permissions granted.  Extra
+permissions can be granted. A granted permission can be overruled by revoking a permission.  The
+security manager installed by the permissions will throw an <code>SecurityException</code> if
+the code subject to these permissions try to use an permission that has not been granted or that
+has been revoked.</p>
 <h3>Nested elements</h3>
 <h4>grant</h4>
-<p>
-Indicates a specific permission is always granted. Its attributes indicate which 
-permissions are granted.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<p>Indicates a specific permission is always granted. Its attributes indicate which permissions
+are granted.</p>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">class</td>
-    <td valign="top">The fully qualified name of the Permission class.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>class</td>
+    <td>The fully qualified name of the Permission class.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The name of the Permission. The actual contents depends on the
-    Permission class.</td>
-    <td valign="top" align="center">No</td>
+    <td>name</td>
+    <td>The name of the Permission. The actual contents depends on the Permission class.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">actions</td>
-    <td valign="top">The actions allowed. The actual contents depend on the 
-    Permission class and name.</td>
-    <td valign="top" align="center">No</td>
+    <td>actions</td>
+    <td>The actions allowed. The actual contents depend on the Permission class and name.</td>
+    <td>No</td>
   </tr>
 </table>
-<p>
-Implied permissions are granted.
-</p>
-<p>
-Please note that some Permission classes may actually need a name and / or actions in order to function properly. The name and actions are parsed by the actual
-Permission class.
-</p>
+<p>Implied permissions are granted.</p>
+<p>Please note that some Permission classes may actually need a name and/or actions in order to
+function properly. The name and actions are parsed by the actual Permission class.</p>
 <h4>revoke</h4>
-<p>
-Indicates a specific permission is revoked.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<p>Indicates a specific permission is revoked.</p>
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">class</td>
-    <td valign="top">The fully qualified name of the Permission class.</td>
-    <td valign="top" align="center">Yes</td>
+    <td>class</td>
+    <td>The fully qualified name of the Permission class.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The name of the Permission. The actual contents depends on the
-    Permission class.</td>
-    <td valign="top" align="center">No</td>
+    <td>name</td>
+    <td>The name of the Permission. The actual contents depends on the Permission class.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">actions</td>
-    <td valign="top">The actions allowed. The actual contents depend on the 
-    Permission class and name.</td>
-    <td valign="top" align="center">No</td>
+    <td>actions</td>
+    <td>The actions allowed. The actual contents depend on the Permission class and name.</td>
+    <td>No</td>
   </tr>
 </table>
-<p>
-Implied permissions are not resolved and therefore also not revoked.
-</p>
-<p>
-The name can handle the * wildcard at the end of the name, in which case all 
-permissions of the specified class of which the name starts with the specified name
-(excluding the *) are revoked. Note that the - wildcard often supported by the
-granted properties is not supported.
-If the name is left empty all names match, and are revoked.
-If the actions are left empty all actions match, and are revoked.
-</p>
-<h3><a name="baseset">Base set</a></h3>
-A permissions set implicitly contains the following permissions:
-<blockquote><pre>
+<p>Implied permissions are not resolved and therefore also not revoked.</p>
+<p>The <var>name</var> can handle the <q>*</q> wildcard at the end of the name, in which case
+all permissions of the specified class of which the name starts with the specified name
+(excluding the <q>*</q>) are revoked. Note that the <q>-</q> wildcard often supported by the
+granted properties is not supported.  If the <var>name</var> is left empty all names match, and
+are revoked.  If the <var>actions</var> are left empty all actions match, and are revoked.</p>
+<h3 id="baseset">Base set</h3>
+<p>A permissions set implicitly contains the following permissions:</p>
+<pre>
 &lt;grant class=&quot;java.net.SocketPermission&quot; name=&quot;localhost:1024-&quot; actions=&quot;listen&quot;&gt;
 &lt;grant class=&quot;java.util.PropertyPermission&quot; name=&quot;java.version&quot; actions=&quot;read&quot;&gt;
 &lt;grant class=&quot;java.util.PropertyPermission&quot; name=&quot;java.vendor&quot; actions=&quot;read&quot;&gt;
@@ -136,29 +117,26 @@
 &lt;grant class=&quot;java.util.PropertyPermission&quot; name=&quot;java.vm.version&quot; actions=&quot;read&quot;&gt;
 &lt;grant class=&quot;java.util.PropertyPermission&quot; name=&quot;java.vm.vendor&quot; actions=&quot;read&quot;&gt;
 &lt;grant class=&quot;java.util.PropertyPermission&quot; name=&quot;java.vm.name&quot; actions=&quot;read&quot;&gt;
-</blockquote></pre>
-These permissions can be revoked via <code>&lt;revoke&gt;</code> elements if necessary.
+</pre>
+<p>These permissions can be revoked via <code>&lt;revoke&gt;</code> elements if necessary.</p>
 
 <h3>Examples</h3>
-<blockquote><pre>
+<pre>
 &lt;permissions&gt;
   &lt;grant class=&quot;java.security.AllPermission&quot;/&gt;
   &lt;revoke class=&quot;java.util.PropertyPermission&quot;/&gt;
 &lt;/permissions&gt;
-</pre></blockquote>
-<p>
-Grants all permissions to the code except for those handling Properties.
-</p>
-<blockquote><pre>
+</pre>
+<p>Grants all permissions to the code except for those handling Properties.</p>
+<pre>
 &lt;permissions&gt;
   &lt;grant class=&quot;java.net.SocketPermission&quot; name=&quot;foo.bar.com&quot; action=&quot;connect&quot;/&gt;
   &lt;grant class=&quot;java.util.PropertyPermission&quot; name=&quot;user.home&quot; action=&quot;read,write&quot;/&gt;
 &lt;/permissions&gt;
-</pre></blockquote>
-<p>
-Grants the base set of permissions with the addition of a SocketPermission to connect
-to foo.bar.com and the permission to read and write the user.home system property.
-</p>
+</pre>
+<p>Grants the base set of permissions with the addition of
+a <code class="code">SocketPermission</code> to connect to <samp>foo.bar.com</samp> and the
+permission to read and write the <code>user.home</code> system property.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Types/propertyset.html ant-1.10.3/manual/Types/propertyset.html
--- ant-1.9.10/manual/Types/propertyset.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/propertyset.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,70 +24,62 @@
 
 <body>
 
-<h2><a name="propertyset">PropertySet</a></h2>
+<h2 id="propertyset">PropertySet</h2>
 <p><em>Since Apache Ant 1.6</em></p>
 
-<p>Groups a set of properties to be used by reference in a task that
-supports this.</p>
+<p>Groups a set of properties to be used by reference in a task that supports this.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">dynamic</td>
-    <td valign="top">Whether to reevaluate the set every time the set
-      is used.  Default is &quot;<code>true</code>&quot;.</td>
-    <td valign="top" align="center">No</td>
+    <td>dynamic</td>
+    <td>Whether to reevaluate the set every time the set is used.</td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">negate</td>
-    <td valign="top">Whether to negate results. If
-      &quot;<code>true</code>&quot;, all properties <i>not</i>
-      selected by nested elements will be returned. Default is
-      &quot;<code>false</code>&quot;. <em>Since Ant 1.6.2</em>
+    <td>negate</td>
+    <td>Whether to negate results. If <q>true</q>, all properties <em>not</em> selected by
+      nested elements will be returned. <em>Since Ant 1.6.2</em>
     </td>
-    <td valign="top" align="center">No</td>
+    <td>No; default is <q>false</q></td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 
 <h4>propertyref</h4>
 
-<p>Selects properties from the current project to be included in the
-set.</p>
+<p>Selects properties from the current project to be included in the set.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">Select the property with the given name.</td>
-    <td align="center" valign="top" rowspan="4">Exactly one of these.</td>
+    <td>name</td>
+    <td>Select the property with the given name.</td>
+    <td rowspan="4">Exactly one of these</td>
   </tr>
   <tr>
-    <td valign="top">prefix</td>
-    <td valign="top">Select the properties whose name starts with the
-      given string.</td>
+    <td>prefix</td>
+    <td class="left">Select the properties whose name starts with the given string.</td>
   </tr>
   <tr>
-    <td valign="top">regex</td>
-    <td valign="top">Select the properties that match the given
-      regular expression.  Similar to <a
-      href="mapper.html#regexp-mapper">regexp type mappers</a>, this
-      requires a supported regular expression library.</td>
+    <td>regex</td>
+    <td class="left">Select the properties that match the given regular expression.  Similar
+      to <a href="mapper.html#regexp-mapper">regexp type mappers</a>, this requires a supported
+      regular expression library.</td>
   </tr>
   <tr>
-    <td valign="top">builtin</td>
-    <td valign="top">Selects a builtin set of properties.  Valid
-      values for this attribute are <code>all</code> for all Ant
-      properties, <code>system</code> for the system properties and
-      <code>commandline</code> for all properties specified on the
+    <td>builtin</td>
+    <td class="left">Selects a builtin set of properties.  Valid values for this attribute
+      are <q>all</q> for all Ant properties, <q>system</q> for the system properties and
+      <q>commandline</q> for all properties specified on the
       command line when invoking Ant (plus a number of special
       internal Ant properties).</td>
   </tr>
@@ -95,12 +87,12 @@
 
 <h4>propertyset</h4>
 
-<p>A <code>propertyset</code> can be used as the set union of more
-<code>propertyset</code>s.</p>
+<p>A <code>propertyset</code> can be used as the set union of
+more <code>propertyset</code>s.</p>
 
 <p>For example:</p>
 
-<blockquote><pre>
+<pre>
 &lt;propertyset id=&quot;properties-starting-with-foo&quot;&gt;
   &lt;propertyref prefix=&quot;foo&quot;/&gt;
 &lt;/propertyset&gt;
@@ -111,33 +103,28 @@
   &lt;propertyset refid=&quot;properties-starting-with-foo&quot;/&gt;
   &lt;propertyset refid=&quot;properties-starting-with-bar&quot;/&gt;
 &lt;/propertyset&gt;
-</pre></blockquote>
+</pre>
 
-<p>collects all properties whose name starts with either
-&quot;foo&quot; or &quot;bar&quot; in the set named
-&quot;my-set&quot;.</p>
+<p>collects all properties whose name starts with either <q>foo</q> or <q>bar</q> in the set
+named <q>my-set</q>.</p>
 
 <h4>mapper</h4>
 
-<p>A <a href="mapper.html">mapper</a> - at maximum one mapper can be
-specified.  The mapper is used to change the names of the property
-keys, for example:
+<p>A <a href="mapper.html">mapper</a>&mdash;at maximum one mapper can be specified.  The mapper
+is used to change the names of the property keys, for example:
 
-<blockquote><pre>
+<pre>
 &lt;propertyset id=&quot;properties-starting-with-foo&quot;&gt;
   &lt;propertyref prefix=&quot;foo&quot;/&gt;
   &lt;mapper type=&quot;glob&quot; from=&quot;foo*&quot; to=&quot;bar*&quot;/&gt;
 &lt;/propertyset&gt;
-</pre></blockquote>
-
-<p>collects all properties whose name starts with &quot;foo&quot;, but
-changes the names to start with &quot;bar&quot; instead.</p>
-
-<p>If supplied, the nested mapper will be applied
-subsequent to any negation of matched properties.</p>
+</pre>
 
+<p>collects all properties whose name starts with <q>foo</q>, but changes the names to start
+with <q>bar</q> instead.</p>
 
+<p>If supplied, the nested mapper will be applied subsequent to any negation of matched
+properties.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Types/redirector.html ant-1.10.3/manual/Types/redirector.html
--- ant-1.9.10/manual/Types/redirector.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/redirector.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,170 +24,144 @@
 
 <body>
 
-<h2><a name="redirector">I/O redirection</a></h2>
-<p>For many tasks, input and output can be defined in a fairly
-straightforward fashion.  The <a href="../Tasks/exec.html">exec</a>
-task, used to execute an external process, stands as a very
-basic example.  The executed process may accept input, produce
-output, or do either or both depending upon various circumstances.
-Output may be classified as &quot;output&quot; or as &quot;error
-output.&quot;  The <code>&lt;redirector&gt;</code> type provides a concrete means
-of redirecting input and output featuring the use of
-<a href="./mapper.html">File Mapper</a>s to specify
-source (input) and destination (output/error) files.  <em>Since Apache Ant 1.6.2</em>
+<h2 id="redirector">I/O redirection</h2>
+<p><em>Since Apache Ant 1.6.2</em></p>
+<p>For many tasks, input and output can be defined in a fairly straightforward fashion.
+The <a href="../Tasks/exec.html">exec</a> task, used to execute an external process, stands as a
+very basic example.  The executed process may accept input, produce output, or do either or both
+depending upon various circumstances.  Output may be classified as <em>output</em> or
+as <em>error output</em>.  The <code>&lt;redirector&gt;</code> type provides a concrete means of
+redirecting input and output featuring the use of <a href="./mapper.html">File Mapper</a>s to
+specify source (input) and destination (output/error) files.</p>
 <p>The <code>&lt;redirector&gt;</code> element accepts the following attributes:</p>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">output</td>
-    <td valign="top">Name of a file to which output should be written.
-      If the error stream is not also redirected to a file or property,
-      it will appear in this output.</td>
-    <td align="center" valign="top">No</td>
+    <td>output</td>
+    <td>Name of a file to which output should be written.  If the error stream is not also
+      redirected to a file or property, it will appear in this output.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">error</td>
-    <td valign="top">The file to which the standard error of the
-      command should be redirected.</td>
-    <td align="center" valign="top">No</td>
+    <td>error</td>
+    <td>The file to which the standard error of the command should be redirected.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">logError</td>
-    <td valign="top">This attribute is used when you wish to see
-      error output in Ant's log and you are redirecting output to
-      a file/property. The error output will not be included in
-      the output file/property. If you redirect error with the
-      <i>error</i> or <i>errorProperty</i> attributes, this will
-      have no effect.</td>
-    <td align="center" valign="top">No</td>
+    <td>logError</td>
+    <td>This attribute is used when you wish to see error output in Ant's log and you are
+      redirecting output to a file/property. The error output will not be included in the output
+      file/property.</td>
+    <td>No; ignored if <var>error</var> or <var>errorProperty</var>
+    is set</td>
   </tr>
   <tr>
-    <td valign="top">append</td>
-    <td valign="top">Whether output and error files should be
-      appended to rather than overwritten. Defaults to
-      <code>false</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>append</td>
+    <td>Whether output and error files should be appended to rather than overwritten.</td>
+    <td>No; defaults to <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">createemptyfiles</td>
-    <td valign="top">Whether output and error files should be
-      created even when empty.  Defaults to <code>true</code>.</td>
-    <td align="center" valign="top">No</td>
+    <td>createemptyfiles</td>
+    <td>Whether output and error files should be created even when empty.</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">outputproperty</td>
-    <td valign="top">The name of a property in which the output of the
-      command should be stored. Unless the error stream is redirected
-      to a separate file or stream, this property will include the
+    <td>outputproperty</td>
+    <td>The name of a property in which the output of the command should be stored. Unless the
+      error stream is redirected to a separate file or stream, this property will include the
       error output.</td>
-    <td align="center" valign="top">No</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">errorproperty</td>
-    <td valign="top">The name of a property in which the standard error
-      of the command should be stored.</td>
-    <td align="center" valign="top">No</td>
+    <td>errorproperty</td>
+    <td>The name of a property in which the standard error of the command should be stored.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">input</td>
-    <td valign="top">A file from which the executed command's standard input
-      is taken. This attribute is mutually exclusive with the
-      <i>inputstring</i> attribute.</td>
-    <td align="center" valign="top">No</td>
+    <td>input</td>
+    <td>A file from which the executed command's standard input is taken. This attribute is
+      mutually exclusive with the <var>inputstring</var> attribute.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">inputstring</td>
-    <td valign="top">A string which serves as the input stream for the
-      executed command. This attribute is mutually exclusive with the
-      <i>input</i> attribute.</td>
-    <td align="center" valign="top">No</td>
+    <td>inputstring</td>
+    <td>A string which serves as the input stream for the executed command. This attribute is
+      mutually exclusive with the <var>input</var> attribute.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">inputencoding</td>
-    <td valign="top">The input encoding.</td>
-    <td align="center" valign="top">No</td>
+    <td>inputencoding</td>
+    <td>The input encoding.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">outputencoding</td>
-    <td valign="top">The output encoding.</td>
-    <td align="center" valign="top">No</td>
+    <td>outputencoding</td>
+    <td>The output encoding.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">errorencoding</td>
-    <td valign="top">The error encoding.</td>
-    <td align="center" valign="top">No</td>
+    <td>errorencoding</td>
+    <td>The error encoding.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">alwayslog</td>
-    <td valign="top">Always send to the log in addition to
-        any other destination. <i>Since Ant 1.6.3</i>.
-    </td>
-    <td align="center" valign="top">No, default is <code>false</code></td>
+    <td>alwayslog</td>
+    <td>Always send to the log in addition to any other destination. <em>Since Ant 1.6.3</em></td>
+    <td>No; default is <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">loginputstring</td>
-    <td valign="top">Controls the display of <i>inputstring</i>'s value in
-        log messages. Set to <code>false</code> when sending sensitive data
-        (e.g. passwords) to external processes. <i>Since Ant 1.6.3</i>.
-    </td>
-    <td align="center" valign="top">No, default is <code>true</code></td>
+    <td>loginputstring</td>
+    <td>Controls the display of <var>inputstring</var>'s value in log messages. Set
+      to <q>false</q> when sending sensitive data (e.g. passwords) to external
+      processes. <em>Since Ant 1.6.3</em></td>
+    <td>No; default is <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">binaryOutput</td>
-    <td valign="top">When set to true Ant will not try to split the
-      output into lines - which it will usually do in order to separate
-      error from normal output.  This setting will not prevent binary
-      output from getting corrupted if you also specify filter chains.
-      <i>Since Ant 1.9.4</i>.
+    <td>binaryOutput</td>
+    <td>When set to <q>true</q> Ant will not try to split the output into lines&mdash;which it
+      will usually do in order to separate error from normal output.  This setting will not
+      prevent binary output from getting corrupted if you also specify filter chains.
+      <em>Since Ant 1.9.4</em>
     </td>
-    <td align="center" valign="top">No, default is <code>false</code></td>
+    <td>No; default is <q>false</q></td>
   </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 <h4>inputmapper</h4>
-<p>A single <a href="./mapper.html">File Mapper</a> used to redirect process
-input.  Multiple mapping results should concatenate all mapped files as input.
-Mapping will ordinarily be performed on a task-specified sourcefile;
-consult the documentation of the individual task for more details.
-A nested <code>&lt;inputmapper&gt;</code> is not compatible with either of the
-<i>input</i> or <i>inputstring</i> attributes.</p>
+<p>A single <a href="./mapper.html">File Mapper</a> used to redirect process input.  Multiple
+mapping results should concatenate all mapped files as input.  Mapping will ordinarily be
+performed on a task-specified sourcefile; consult the documentation of the individual task for
+more details.  A nested <code>&lt;inputmapper&gt;</code> is not compatible with either of the
+<var>input</var> or <var>inputstring</var> attributes.</p>
 <h4>outputmapper</h4>
-<p>A single <a href="./mapper.html">File Mapper</a> used to redirect process
-output.  Mapping will ordinarily be performed on a task-specified sourcefile;
-consult the documentation of the individual task for more details.
-A nested <code>&lt;outputmapper&gt;</code> is not compatible with the
-<i>output</i> attribute.</p>
+<p>A single <a href="./mapper.html">File Mapper</a> used to redirect process output.  Mapping
+will ordinarily be performed on a task-specified sourcefile; consult the documentation of the
+individual task for more details.  A nested <code>&lt;outputmapper&gt;</code> is not compatible
+with the <var>output</var> attribute.</p>
 <h4>errormapper</h4>
-<p>A single <a href="./mapper.html">File Mapper</a> used to redirect error
-output.  Mapping will ordinarily be performed on a task-specified sourcefile;
-consult the documentation of the individual task for more details.
-A nested <code>&lt;errormapper&gt;</code> is not compatible with the
-<i>error</i> attribute.</p>
+<p>A single <a href="./mapper.html">File Mapper</a> used to redirect error output.  Mapping will
+ordinarily be performed on a task-specified sourcefile; consult the documentation of the
+individual task for more details.  A nested <code>&lt;errormapper&gt;</code> is not compatible
+with the <var>error</var> attribute.</p>
 <h4>inputfilterchain</h4>
-<p>A <a href="./filterchain.html">FilterChain</a> can be
-applied to the process input.</p>
+<p>A <a href="./filterchain.html">FilterChain</a> can be applied to the process input.</p>
 <h4>outputfilterchain</h4>
-<p>A <a href="./filterchain.html">FilterChain</a> can be
-applied to the process output.</p>
+<p>A <a href="./filterchain.html">FilterChain</a> can be applied to the process output.</p>
 <h4>errorfilterchain</h4>
-<p>A <a href="./filterchain.html">FilterChain</a> can be
-applied to the error output.</p>
+<p>A <a href="./filterchain.html">FilterChain</a> can be applied to the error output.</p>
 <h3>Usage</h3>
-Tasks known to support I/O redirection:
+<p>Tasks known to support I/O redirection:</p>
 <ul>
 <li><a href="../Tasks/exec.html">Exec</a></li>
 <li><a href="../Tasks/apply.html">Apply</a></li>
 <li><a href="../Tasks/java.html">Java</a></li>
 </ul>
-<p>The expected behavior of a <code>&lt;redirector&gt;</code> is to a great degree
-dependent on the supporting task.  Any possible points of confusion
-should be noted at the task level.</p>
-
+<p>The expected behavior of a <code>&lt;redirector&gt;</code> is to a great degree dependent on
+the supporting task.  Any possible points of confusion should be noted at the task level.</p>
 
 </body>
 </html>
-
diff -Nru ant-1.9.10/manual/Types/regexp.html ant-1.10.3/manual/Types/regexp.html
--- ant-1.9.10/manual/Types/regexp.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/regexp.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,86 +24,68 @@
 
 <body>
 
-<h2><a name="regexp">Regexp</a></h2>
+<h2 id="regexp">Regexp</h2>
 <p>
 Regexp represents a regular expression.
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">pattern</td>
-    <td valign="top">regular expression pattern</td>
-    <td valign="top" align="center">Yes</td>
+    <td>pattern</td>
+    <td>regular expression pattern</td>
+    <td>Yes</td>
   </tr>
 </table>
 
 <h3>Examples</h3>
-<blockquote><pre>
-     &lt;regexp id="myregexp" pattern="alpha(.+)beta"/&gt;<br>
-</pre></blockquote>
-<p>
-Defines a regular expression for later use with id myregexp.
-</p>
-<blockquote><pre>
-     &lt;regexp refid="myregexp"/&gt;<br>
-</pre></blockquote>
-<p>
-Use the regular expression with id myregexp.
-</p>
-<h3><a name="implementation">Choice of regular expression implementation</a></h3>
-<p>
-Apache Ant comes with
-wrappers for
-<a href="http://docs.oracle.com/javase/7/docs/api/java/util/regex/package-summary.html" target="_top">the java.util.regex package</a>,
-<a href="http://attic.apache.org/projects/jakarta-regexp.html" target="_top">jakarta-regexp</a>
-and <a href="http://attic.apache.org/projects/jakarta-oro.html" target="_top">jakarta-ORO</a>,
-See <a href="../install.html#librarydependencies">installation dependencies</a>
- concerning the supporting libraries.</p>
-<p>
-The property <code>ant.regexp.regexpimpl</code> governs which regular expression implementation will be chosen.
-Possible values for this property are :
+<pre>&lt;regexp id="myregexp" pattern="alpha(.+)beta"/&gt;</pre>
+<p>Defines a regular expression for later use with <var>id</var> <q>myregexp</q>.</p>
+<pre>&lt;regexp refid="myregexp"/&gt;</pre>
+<p>Use the regular expression with <var>id</var> <q>myregexp</q>.</p>
+<h3 id="implementation">Choice of regular expression implementation</h3>
+<p>Apache Ant comes with wrappers for
+the <a href="https://docs.oracle.com/javase/8/docs/api/java/util/regex/package-summary.html"
+target="_top">java.util.regex
+package</a>, <a href="https://attic.apache.org/projects/jakarta-regexp.html"
+target="_top">jakarta-regexp</a> and <a href="https://attic.apache.org/projects/jakarta-oro.html"
+target="_top">jakarta-ORO</a>, see <a href="../install.html#librarydependencies">installation
+dependencies</a> concerning the supporting libraries.</p>
+<p>The property <code>ant.regexp.regexpimpl</code> governs which regular expression implementation
+will be chosen.  Possible values for this property are:</p>
 <ul>
-<li>
-org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp
-</li>
-<li>
-org.apache.tools.ant.util.regexp.JakartaOroRegexp
-</li>
-<li>
-org.apache.tools.ant.util.regexp.JakartaRegexpRegexp
-</li>
+<li><code class="code">org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp</code></li>
+<li><code class="code">org.apache.tools.ant.util.regexp.JakartaOroRegexp</code></li>
+<li><code class="code">org.apache.tools.ant.util.regexp.JakartaRegexpRegexp</code></li>
 </ul>
-It can also be another implementation of the interface <code>org.apache.tools.ant.util.regexp.Regexp</code>.
-If <code>ant.regexp.regexpimpl</code> is not defined, Ant uses Jdk14Regexp as this is always available.</p>
-<p>
-There are cross-platform issues for matches related to line terminator.
-For example if you use $ to anchor your regular expression on the end of a line
-the results might be very different depending on both your platform and the regular
-expression library you use. It is 'highly recommended' that you test your pattern on
-both Unix and Windows platforms before you rely on it.
+<p>It can also be another implementation of the
+interface <code class="code">org.apache.tools.ant.util.regexp.Regexp</code>.
+If <code>ant.regexp.regexpimpl</code> is not defined, Ant uses Jdk14Regexp as this is always
+available.</p>
+<p>
+There are cross-platform issues for matches related to line terminator.  For example if you
+use <q>$</q> to anchor your regular expression on the end of a line the results might be very
+different depending on both your platform and the regular expression library you use. It
+is <em>highly recommended</em> that you test your pattern on both Unix and Windows platforms before
+you rely on it.</p>
 <ul>
-    <li>Jakarta Oro defines a line terminator as '\n' and is consistent with Perl.</li>
-    <li>Jakarta RegExp uses a system-dependent line terminator.</li>
-    <li>JDK 1.4 uses '\n', '\r\n', '\u0085', '\u2028', '\u2029' as a default
-    but is configured in the wrapper to use only '\n' (UNIX_LINE)</li>
+  <li>Jakarta Oro defines a line terminator as <q>\n</q> and is consistent with Perl.</li>
+  <li>Jakarta RegExp uses a system-dependent line terminator.</li>
+  <li>JDK 1.4 uses <q>\n</q>, <q>\r\n</q>, <q>\u0085</q>, <q>\u2028</q>, <q>\u2029</q> as a
+    default but is configured in the wrapper to use only <q>\n</q> (UNIX_LINE)</li>
 </ul>
-<em>We used to recommend that you use Jakarta ORO but since its
-  development has been retired Java's built-in regex package is likely
-  the best choice going forward.</em>
-</p>
-<h3>Usage</h3>
-The following tasks and types use the Regexp type :
+<p><em>We used to recommend that you use Jakarta ORO but since its development has been retired
+Java's built-in regex package is likely the best choice going forward.</em></p>
+<h3>Usage</h3> The following tasks and types use the Regexp type:
 <ul>
 <li><a href="../Tasks/replaceregexp.html">ReplaceRegExp task</a></li>
 <li><a href="filterchain.html#linecontainsregexp">LineContainsRegexp filter</a></li>
 </ul>
-<p>
-These string filters also use the mechanism of regexp to choose a regular expression implementation :
-</p>
+<p>These string filters also use the mechanism of regexp to choose a regular expression
+implementation:</p>
 <ul>
 <li><a href="filterchain.html#containsregex">ContainsRegex string filter</a></li>
 <li><a href="filterchain.html#replaceregex">ReplaceRegex string filter</a></li>
diff -Nru ant-1.9.10/manual/Types/resources.html ant-1.10.3/manual/Types/resources.html
--- ant-1.9.10/manual/Types/resources.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/resources.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,341 +24,346 @@
 
 <body>
 
-<h2><a name="resource">Resources</a></h2>
+<h2 id="resource">Resources</h2>
 <p>
-A file-like entity can be abstracted to the concept of a <i>resource</i>.
-In addition to providing access to file-like attributes, a resource
-implementation should, when possible, provide the means to read content
-from and/or write content to the underlying entity. Although the resource
-concept was introduced in <i>Apache Ant 1.5.2</i>, resources are available for
-explicit use beginning in <b>Ant 1.7</b>.
+A file-like entity can be abstracted to the concept of a <em>resource</em>.  In addition to
+providing access to file-like attributes, a resource implementation should, when possible,
+provide the means to read content from and/or write content to the underlying entity. Although
+the resource concept was introduced in Apache Ant 1.5.2, resources are available for explicit
+use <em>since Ant 1.7</em>.
 </p>
 
-<h3>The built-in resource types are:</h3>
-
+<h3>Built-in resource types</h3>
+The built-in resource types are:
 <ul>
-  <li><a href="#basic">resource</a> - a basic resource.</li>
-  <li><a href="#bzip2resource">bzip2resource</a> - a BZip2 compressed resource.</li>
-  <li><a href="#file">file</a> - a file.</li>
-  <li><a href="#gzipresource">gzipresource</a> - a GZip compressed resource.</li>
-  <li><a href="#javaresource">javaresource</a> - a resource loadable
-        via a Java classloader.</li>
-  <li><a href="#javaconstant">javaconstant</a> - a constant in a class loadable
-        via a Java classloader.</li>
-  <li><a href="#propertyresource">propertyresource</a> - an Ant property.</li>
-  <li><a href="#string">string</a> - a text string.</li>
-  <li><a href="#tarentry">tarentry</a> - an entry in a tar file.</li>
-  <li><a href="#url">url</a> - a URL.</li>
-  <li><a href="#zipentry">zipentry</a> - an entry in a zip file.</li>
+  <li><a href="#basic">resource</a>&mdash;a basic resource.</li>
+  <li><a href="#bzip2resource">bzip2resource</a>&mdash;a BZip2 compressed resource.</li>
+  <li><a href="#file">file</a>&mdash;a file.</li>
+  <li><a href="#gzipresource">gzipresource</a>&mdash;a GZip compressed resource.</li>
+  <li><a href="#javaresource">javaresource</a>&mdash;a resource loadable via a Java
+        classloader.</li>
+  <li><a href="#javaconstant">javaconstant</a>&mdash;a constant in a class loadable via a Java
+        classloader.</li>
+  <li><a href="#propertyresource">propertyresource</a>&mdash;an Ant property.</li>
+  <li><a href="#string">string</a>&mdash;a text string.</li>
+  <li><a href="#tarentry">tarentry</a>&mdash;an entry in a tar file.</li>
+  <li><a href="#url">url</a>&mdash;a URL.</li>
+  <li><a href="#xzresource">xzresource</a>&mdash;an XZ compressed resource.</li>
+  <li><a href="#zipentry">zipentry</a>&mdash;an entry in a zip file.</li>
 </ul>
 
-<h4><a name="basic">resource</a></h4>
+<h4 id="basic">resource</h4>
 
-<p>A basic resource. Other resource types derive from this basic
-type; as such all its attributes are available, though in most cases
-irrelevant attributes will be ignored. This and all resource
-implementations are also usable as single-element
-<a href="#collection">Resource Collections</a>.
+<p>
+A basic resource. Other resource types derive from this basic type; as such all its attributes
+are available, though in most cases irrelevant attributes will be ignored. This and all resource
+implementations are also usable as single-element <a href="#collection">resource
+collections</a>.
 </p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The name of this resource</td>
-    <td align="center" valign="top">No</td>
+    <td>name</td>
+    <td>The name of this resource</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">exists</td>
-    <td valign="top">Whether this resource exists</td>
-    <td align="center" valign="top">No, default <i>true</i></td>
+    <td>exists</td>
+    <td>Whether this resource exists</td>
+    <td>No; default <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">lastmodified</td>
-    <td valign="top">The last modification time of this resource</td>
-    <td align="center" valign="top">No</td>
+    <td>lastmodified</td>
+    <td>The last modification time of this resource</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">directory</td>
-    <td valign="top">Whether this resource is directory-like</td>
-    <td align="center" valign="top">No, default <i>false</i></td>
+    <td>directory</td>
+    <td>Whether this resource is directory-like</td>
+    <td>No; default <q>false</q></td>
   </tr>
   <tr>
-    <td valign="top">size</td>
-    <td valign="top">The size of this resource</td>
-    <td align="center" valign="top">No</td>
+    <td>size</td>
+    <td>The size of this resource</td>
+    <td>No</td>
   </tr>
 </table>
 
-<h4><a name="file">file</a></h4>
+<h4 id="file">file</h4>
 
 <p>Represents a file accessible via local filesystem conventions.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">The file represented by this resource</td>
-    <td align="center" valign="top">Yes</td>
+    <td>file</td>
+    <td>The file represented by this resource</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">basedir</td>
-    <td valign="top">The base directory of this resource.  When this
-      attribute is set, attempts to access the name of the resource
-      will yield a path relative to this location.</td>
-    <td align="center" valign="top">No</td>
+    <td>basedir</td>
+    <td>The base directory of this resource.  When this attribute is set, attempts to access the
+      name of the resource will yield a path relative to this location.</td>
+    <td>No</td>
   </tr>
 </table>
 
-<h4><a name="javaresource">javaresource</a></h4>
+<h4 id="javaresource">javaresource</h4>
 
 <p>Represents a resource loadable via a Java classloader.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The name of the resource.</td>
-    <td align="center" valign="top">Yes</td>
+    <td>name</td>
+    <td>The name of the resource.</td>
+    <td>Yes</td>
   </tr>
   <tr>
-    <td valign="top">classpath</td>
-    <td valign="top">the classpath to use when looking up a resource.</td>
-    <td align="center" valign="top">No</td>
+    <td>classpath</td>
+    <td>the classpath to use when looking up a resource.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">classpathref</td>
-    <td valign="top">the classpath to use when looking up a resource,
-      given as <a href="../using.html#references">reference</a>
-      to a <code>&lt;path&gt;</code> defined elsewhere..</td>
-    <td align="center" valign="top">No</td>
+    <td>classpathref</td>
+    <td>the classpath to use when looking up a resource, given
+      as <a href="../using.html#references">reference</a> to a <code>&lt;path&gt;</code> defined
+      elsewhere.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">loaderRef</td>
-    <td valign="top">the name of the loader that is
-      used to load the resource, constructed from the specified classpath.</td>
-    <td align="center" valign="top">No</td>
+    <td>loaderRef</td>
+    <td>the name of the loader that is used to load the resource, constructed from the specified
+      classpath.</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">parentFirst</td>
-    <td valign="top">Whether to consult the parent classloader first -
-      the parent classloader most likely is the system classloader -
-      when using a nested classpath.  Defaults
-      to <code>true</code>.<br/>
+    <td>parentFirst</td>
+    <td>Whether to consult the parent classloader first&mdash;the parent classloader most likely
+      is the system classloader&mdash;when using a nested classpath.<br/>
       <em>Since Ant 1.8.0</em></td>
-    <td align="center" valign="top">No</td>
+    <td>No; defaults to <q>true</q></td>
   </tr>
 </table>
 
 <p>The classpath can also be specified as nested classpath element,
-where <b>&lt;classpath&gt;</b> is a <a
-href="../using.html#path">path-like structure</a>.</p>
-
+where <code>&lt;classpath&gt;</code> is a <a href="../using.html#path">path-like
+structure</a>.</p>
 
-<h4><a name="javaconstant">javaconstant</a></h4>
-<p>Loads the value of a java constant. As a specialisation of 
-<a href="#javaresource">javaresource</a> all of its attributes and nested elements are
-supported. A constant must be specified as <tt>public static</tt> otherwise it could not be loaded.</p>
-
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">name</td>
-    <td valign="top">The name of the resource. Must be specified as full qualified
-      field name.
-    </td>
-    <td align="center" valign="top">Yes</td>
+<h4 id="javaconstant">javaconstant</h4>
+<p>Loads the value of a Java constant. As a specialisation
+of <a href="#javaresource">javaresource</a> all of its attributes and nested elements are
+supported. A constant must be specified as <code>public static</code> otherwise it could not be
+loaded.</p>
+
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>name</td>
+    <td>The name of the resource. Must be specified as full qualified
+      field name.</td>
+    <td>Yes</td>
   </tr>
 </table>
 <h5>Examples</h5>
-This loads the value of the constant <tt>VERSION</tt> of the <tt>org.acme.Main</tt> class
-into the <tt>version</tt>-property. The classpath for finding that class is provided via
-nested classpath element.
-<pre><code>&lt;loadresource property=&quot;version&quot;&gt;
-   &lt;javaconstant name=&quot;org.acme.Main.VERSION&quot;&gt;
-     &lt;classpath&gt;
-       &lt;pathelement location=&quot;${acme.lib.dir}&quot;/&gt;
-     &lt;/classpath&gt;
-   &lt;/javaconstant&gt;
- &lt;/loadresource&gt;
-</code></pre>
-
-Create a new file <tt>c:/temp/org.apache.tools.ant.Main.DEFAULT_BUILD_FILENAME</tt> with the content
-of that constant (<tt>build.xml</tt>).
-<pre><code>&lt;copy todir=&quot;c:/temp&quot;&gt;
-  &lt;javaconstant name=&quot;org.apache.tools.ant.Main.DEFAULT_BUILD_FILENAME&quot;/&gt;
-&lt;/copy&gt;</code></pre>
+<p>This loads the value of the constant <code>VERSION</code> of the <code>org.acme.Main</code>
+class into the <var>version</var>-property. The classpath for finding that class is provided via
+nested <code>classpath</code> element.</p>
+<pre>
+&lt;loadresource property=&quot;version&quot;&gt;
+  &lt;javaconstant name=&quot;org.acme.Main.VERSION&quot;&gt;
+    &lt;classpath&gt;
+      &lt;pathelement location=&quot;${acme.lib.dir}&quot;/&gt;
+    &lt;/classpath&gt;
+  &lt;/javaconstant&gt;
+&lt;/loadresource&gt;</pre>
 
+<p>Create a new file <samp>c:/temp/org.apache.tools.ant.Main.DEFAULT_BUILD_FILENAME</samp> with
+the content of that constant (<q>build.xml</q>).</p>
+<pre>
+&lt;copy todir=&quot;c:/temp&quot;&gt;
+  &lt;javaconstant name=&quot;org.apache.tools.ant.Main.DEFAULT_BUILD_FILENAME&quot;/&gt;
+&lt;/copy&gt;</pre>
 
-<h4><a name="zipentry">zipentry</a></h4>
+<h4 id="zipentry">zipentry</h4>
 
-<p>Represents an entry in a ZIP archive. The archive can be specified
-using the archive attribute or a nested single-element resource
-collection.  <code>zipentry</code> only supports file system resources
-as nested elements.</p>
+<p>Represents an entry in a ZIP archive. The archive can be specified using the archive
+attribute or a nested single-element resource collection.  <code>zipentry</code> only supports
+file system resources as nested elements.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">zipfile or its alias name archive</td>
-    <td valign="top">The zip file containing this resource</td>
-    <td align="center" valign="top">Yes, unless a nested resource
-    collection has been specified.</td>
+    <td>zipfile</td>
+    <td>The zip file containing this resource</td>
+    <td rowspan="2">Yes, unless a nested resource collection has been
+    specified</td>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The name of the archived resource</td>
-    <td align="center" valign="top">Yes</td>
+    <td>archive</td>
+    <td class="left">alias of <var>zipfile</var></td>
   </tr>
   <tr>
-    <td valign="top">encoding</td>
-    <td valign="top">The encoding of the zipfile</td>
-    <td align="center" valign="top">No;
-      platform default used if unspecified</td>
+    <td>name</td>
+    <td>The name of the archived resource</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>encoding</td>
+    <td>The encoding of the zipfile</td>
+    <td>No; defaults to default JVM character encoding</td>
   </tr>
 </table>
 
-<h4><a name="tarentry">tarentry</a></h4>
+<h4 id="tarentry">tarentry</h4>
 
-<p>Represents an entry in a TAR archive.  The archive can be specified
-using the archive attribute or a nested single-element resource
-collection.</p>
+<p>Represents an entry in a TAR archive.  The archive can be specified using the archive
+attribute or a nested single-element resource collection.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">archive</td>
-    <td valign="top">The tar archive containing this resource</td>
-    <td align="center" valign="top">Yes, unless a nested resource
-    collection has been specified.</td>
+    <td>archive</td>
+    <td>The tar archive containing this resource</td>
+    <td>Yes, unless a nested resource
+    collection has been specified</td>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The name of the archived resource</td>
-    <td align="center" valign="top">Yes</td>
+    <td>name</td>
+    <td>The name of the archived resource</td>
+    <td>Yes</td>
   </tr>
 </table>
 
-<h4><a name="gzipresource">gzipresource</a></h4>
+<h4 id="gzipresource">gzipresource</h4>
+
+<p>This is not a stand-alone resource, but a wrapper around another resource providing
+compression of the resource's contents on the fly.  A single element resource collection must be
+specified as a nested element.</p>
+
+<h4 id="bzip2resource">bzip2resource</h4>
 
-<p>This is not a stand-alone resource, but a wrapper around another
-resource providing compression of the resource's contents on the fly.
-A single element resource collection must be specified as a nested
-element.</p>
+<p>This is not a stand-alone resource, but a wrapper around another resource providing
+compression of the resource's contents on the fly.  A single element resource collection must be
+specified as a nested element.</p>
 
-<h4><a name="bzip2resource">bzip2resource</a></h4>
+<h4 id="xzresource">xzresource</h4>
 
-<p>This is not a stand-alone resource, but a wrapper around another
-resource providing compression of the resource's contents on the fly.
-A single element resource collection must be specified as a nested
-element.</p>
+<p>This is not a stand-alone resource, but a wrapper around another resource providing
+compression of the resource's contents on the fly.  A single element resource collection must be
+specified as a nested element.</p>
 
-<h4><a name="url">url</a></h4>
+<p>XZ compression support has been added <em>since Apache Ant 1.10.1</em> and depends on
+external libraries not included in the Ant
+distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a> for
+more information.</p>
+
+<h4 id="url">url</h4>
 
 <p>Represents a URL.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">url</td>
-    <td valign="top">The url to expose</td>
-    <td rowspan="3" align="center" valign="middle">Exactly one of these</td>
+    <td>url</td>
+    <td>The URL to expose</td>
+    <td rowspan="3">Exactly one of these</td>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">The file to expose as a file: url</td>
+    <td>file</td>
+    <td class="left">The file to expose as a <code>file:</code> URL</td>
   </tr>
   <tr>
-    <td valign="top">baseUrl</td>
-    <td valign="top">The base URL which must be combined with relativePath</td>
+    <td>baseUrl</td>
+    <td class="left">The base URL which must be combined
+    with <var>relativePath</var></td>
  </tr>
   <tr>
-    <td valign="top">relativePath</td>
-    <td valign="top">Relative path that defines the url combined with
-      baseUrl</td>
-    <td align="center" valign="top">If using baseUrl</td>
+    <td>relativePath</td>
+    <td>Relative path that defines the URL when combined with
+      <var>baseUrl</var></td>
+    <td>If using <var>baseUrl</var></td>
   </tr>
 </table>
 
-<h4><a name="string">string</a></h4>
+<h4 id="string">string</h4>
 
-<p>Represents a Java String. It can be written to, but only once, after which
-it will be an error to write to again.</p>
+<p>Represents a Java String. It can be written to, but only once, after which it will be an
+error to write to again.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">The value of this resource</td>
-    <td align="center" valign="top">No</td>
+    <td>value</td>
+    <td>The value of this resource</td>
+    <td>No</td>
   </tr>
 </table>
 
-<p>The resource also supports nested text, which can only be supplied if the <code>value</code> attribute is unset:
-  </p>
+<p>The resource also supports nested text, which can only be supplied if the <var>value</var>
+attribute is unset:</p>
 <pre>
-  &lt;string>
-        self.log("Ant version =${ant.version}");
-  &lt;/string>
-</pre>
-    
-</p>
+&lt;string&gt;
+    self.log("Ant version =${ant.version}");
+&lt;/string&gt;</pre>
 
-<h4><a name="propertyresource">propertyresource</a></h4>
+<h4 id="propertyresource">propertyresource</h4>
 
 <p>Represents an Ant property.</p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">name</td>
-    <td valign="top">The property name</td>
-    <td align="center" valign="top">Yes</td>
+    <td>name</td>
+    <td>The property name</td>
+    <td>Yes</td>
   </tr>
 </table>
 
-<hr>
-<h2><a name="collection">Resource Collections</a></h2>
+<hr/>
+<h2 id="collection">Resource Collections</h2>
 <p>
-A Resource Collection is an abstraction of an entity that groups
-together a number of <a href="#resource">resources</a>. Several of
-Ant's "legacy" datatypes have been modified to behave as Resource Collections:
+A resource collection is an abstraction of an entity that groups together a number
+of <a href="#resource">resources</a>. Several of Ant's "legacy" datatypes have been modified to
+behave as resource collections:
+</p>
 <ul>
   <li><a href="fileset.html">fileset</a>,
     <a href="dirset.html">dirset</a>,
@@ -379,1003 +384,906 @@
     exposes <a href="#propertyresource">property</a> resources
   </li>
 </ul>
-</p>
-<p>Strangely, some tasks can even legitimately behave as resource collections:
+<p>Strangely, some tasks can even legitimately behave as resource
+collections:</p>
 <ul>
-  <li><a href="../Tasks/concat.html">concat</a>
-    exposes a concatenated resource, and adds e.g.
-    <a href="filterchain.html">filtering</a>
+  <li><a href="../Tasks/concat.html">concat</a> exposes a concatenated
+    resource, and adds e.g.  <a href="filterchain.html">filtering</a>
     to Ant's resource-related capabilities.
   </li>
 </ul>
-</p>
-<h3>The additional built-in resource collections are:</h3>
+<h3>Additional built-in resource collections</h3>
+The additional built-in resource collections are:
 <ul>
-  <li><a href="#resources">resources</a> - generic resource collection</li>
-  <li><a href="#files">files</a> - collection of files similar to
-    <a href="fileset.html">fileset</a></li>
-  <li><a href="#restrict">restrict</a> - restrict a resource collection
-    to include only resources meeting specified criteria</li>
-  <li><a href="#sort">sort</a> - sorted resource collection</li>
-  <li><a href="#first">first</a> - first <i>n</i> resources from a
+  <li><a href="#resources">resources</a>&mdash;generic resource collection</li>
+  <li><a href="#files">files</a>&mdash;collection of files similar
+  to <a href="fileset.html">fileset</a></li>
+  <li><a href="#restrict">restrict</a>&mdash;restrict a resource collection to include only
+  resources meeting specified criteria</li>
+  <li><a href="#sort">sort</a>&mdash;sorted resource collection</li>
+  <li><a href="#first">first</a>&mdash;first <em>n</em> resources from a nested collection</li>
+  <li><a href="#last">last</a>&mdash;last <em>n</em> resources from a nested collection</li>
+  <li><a href="#allbutfirst">allbutfirst</a>&mdash;all except the first <em>n</em> resources
+    from a nested collection</li>
+  <li><a href="#allbutlast">allbutlast</a>&mdash;all except the last <em>n</em> resources from a
     nested collection</li>
-  <li><a href="#last">last</a> - last <i>n</i> resources from a
+  <li><a href="#tokens">tokens</a>&mdash;<a href="#string">string</a> tokens gathered from a
     nested collection</li>
-  <li><a href="#allbutfirst">allbutfirst</a> - all except the
-    first <i>n</i> resources from a nested collection</li>
-  <li><a href="#allbutlast">allbutlast</a> - all except the last <i>n</i>
-    resources from a nested collection</li>
-  <li><a href="#tokens">tokens</a> - <a href="#string">string</a> tokens
-    gathered from a nested collection</li>
-  <li><a href="#union">union</a> - set union of nested resource collections</li>
-  <li><a href="#intersect">intersect</a> - set intersection
-    of nested resource collections</li>
-  <li><a href="#difference">difference</a> - set difference
-    of nested resource collections</li>
-  <li><a href="#mappedresources">mappedresources</a> - generic
-    resource collection wrapper that maps the names of the nested
-    resources using a <a href="mapper.html">mapper</a>.</li>
-  <li><a href="#archives">archives</a> - wraps around different
-    resource collections and treats the nested resources as ZIP or TAR
-    archives that will be extracted on the fly.</li>
-  <li><a href="#resourcelist">resourcelist</a> - a collection of
-    resources whose names have been read from another resource.</li>
+  <li><a href="#union">union</a>&mdash;set union of nested resource collections</li>
+  <li><a href="#intersect">intersect</a>&mdash;set intersection of nested resource
+    collections</li>
+  <li><a href="#difference">difference</a>&mdash;set difference of nested resource
+    collections</li>
+  <li><a href="#mappedresources">mappedresources</a>&mdash;generic resource collection wrapper
+    that maps the names of the nested resources using a <a href="mapper.html">mapper</a>.</li>
+  <li><a href="#archives">archives</a>&mdash;wraps around different resource collections and
+    treats the nested resources as ZIP or TAR archives that will be extracted on the fly.</li>
+  <li><a href="#resourcelist">resourcelist</a>&mdash;a collection of resources whose names have
+    been read from another resource.</li>
 </ul>
-<h4><a name="resources">resources</a></h4>
-<p>A generic resource collection, designed for use with
-  <a href="../using.html#references">references</a>.
-  For example, if a third-party Ant task generates a Resource Collection
-  of an unknown type, it can still be accessed via a
-  <code>&lt;resources&gt;</code> collection. The secondary use of this
-  collection type is as a container of other resource collections,
-  preserving the order of nested collections as well as
-  duplicate resources (contrast with <a href="#union">union</a>).
+
+<h4 id="resources">resources</h4>
+<p>
+A generic resource collection, designed for use
+with <a href="../using.html#references">references</a>.  For example, if a third-party Ant task
+generates a resource collection of an unknown type, it can still be accessed via
+a <code>&lt;resources&gt;</code> collection. The secondary use of this collection type is as a
+container of other resource collections, preserving the order of nested collections as well as
+duplicate resources (contrast with <a href="#union">union</a>).
 </p>
-<blockquote>
-  <table border="1" cellpadding="2" cellspacing="0">
+  <table class="attr">
     <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
+      <th>Attribute</th>
+      <th>Description</th>
+      <th>Required</th>
     </tr>
     <tr>
-      <td valign="top">cache</td>
-      <td valign="top">Whether to cache results.  <em>since Ant 1.8.0</em></td>
-      <td valign="top" align="center">No, default <i>false</i></td>
+      <td>cache</td>
+      <td>Whether to cache results.  <em>since Ant 1.8.0</em></td>
+      <td>No; default <q>false</q></td>
     </tr>
   </table>
-</blockquote>
 
-<h4><a name="files">files</a></h4>
-<p>A group of files. These files are matched by <b>absolute</b> patterns
-  taken from a number of <a href="patternset.html">PatternSets</a>.
-  These can be specified as nested <code>&lt;patternset&gt;</code>
-  elements. In addition, <code>&lt;files&gt;</code> holds an implicit
-  PatternSet and supports the nested <code>&lt;include&gt;</code>,
-  <code>&lt;includesfile&gt;</code>, <code>&lt;exclude&gt;</code>
-  and <code>&lt;excludesfile&gt;</code> elements of PatternSet directly,
-  as well as PatternSet's attributes.
+<h4 id="files">files</h4>
+<p>A group of files. These files are matched by <strong>absolute</strong> patterns taken from a
+number of <a href="patternset.html">PatternSets</a>.  These can be specified as
+nested <code>&lt;patternset&gt;</code> elements. In addition, <code>&lt;files&gt;</code> holds
+an implicit PatternSet and supports the
+nested <code>&lt;include&gt;</code>, <code>&lt;includesfile&gt;</code>, <code>&lt;exclude&gt;</code>
+and <code>&lt;excludesfile&gt;</code> elements of PatternSet directly, as well as PatternSet's
+attributes.
 </p>
-<p><a href="selectors.html">File Selectors</a> are available as nested
-  elements. A file must be selected by all selectors in order to be included;
-  <code>&lt;files&gt;</code> is thus equivalent to an
-  <code>&lt;and&gt;</code> file selector container.
+<p><a href="selectors.html">File Selectors</a> are available as nested elements. A file must be
+selected by all selectors in order to be included; <code>&lt;files&gt;</code> is thus equivalent
+to an <code>&lt;and&gt;</code> file selector container.
 </p>
-<p><b>More simply put</b>, this type is equivalent to a
-  <a href="fileset.html">fileset</a> with no base directory.
-  <b>Please note</b> that without a base directory,
-  filesystem scanning is based entirely on include and exclude patterns.
-  A <a href="selectors.html#filenameselect">filename</a> (or any)
-  selector can <i>only</i> influence the scanning process <i>after</i>
-  the file has been included based on pattern-based selection.
+<p><strong>More simply put</strong>, this type is equivalent
+to <a href="fileset.html">fileset</a> with no base directory.  <strong>Please note</strong> that
+without a base directory, filesystem scanning is based entirely on include and exclude patterns.
+A <a href="selectors.html#filenameselect">filename</a> (or any) selector can <em>only</em>
+influence the scanning process <em>after</em> the file has been included based on pattern-based
+selection.
 </p>
 
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>includes</td>
+    <td>Comma- or space-separated list of patterns of files that must be included</td>
+    <td rowspan="2">At least one of these</td>
+  </tr>
+  <tr>
+    <td>includesfile</td>
+    <td class="left">Name of a file; each line of this file is taken to be an include
+    pattern.</td>
+  </tr>
+  <tr>
+    <td>excludes</td>
+    <td>Comma- or space-separated list of patterns of files that must be excluded</td>
+    <td rowspan="2">No; defaults to default excludes or none if <var>defaultexcludes</var>
+    is <q>no</q></td>
+  </tr>
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <td>excludesfile</td>
+    <td class="left">Name of a file; each line of this file is taken to be an exclude
+    pattern.</td>
   </tr>
   <tr>
-    <td valign="top">includes</td>
-    <td valign="top">comma- or space-separated list of patterns
-      of files that must be included</td>
-    <td rowspan="2" valign="middle" align="center">At least one of these</td>
+    <td>defaultexcludes</td>
+    <td>Whether <a href="../dirtasks.html#defaultexcludes">default excludes</a> should be
+      used</td>
+    <td>No; default <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">includesfile</td>
-    <td valign="top">the name of a file; each line of this file is
-      taken to be an include pattern.</td>
+    <td>casesensitive</td>
+    <td>Whether patterns are case-sensitive</td>
+    <td>No; default <q>true</q></td>
   </tr>
+  <tr id="followsymlinks">
+    <td>followsymlinks</td>
+    <td>Whether to follow symbolic links (see note <a href="#symlink">below</a>)</td>
+    <td>No; default <q>true</q></td>
+  </tr>
+</table>
+
+<p id="symlink"><a href="#followsymlinks"><strong>Note</strong></a>: All files/directories for which
+the canonical path is different from its path are considered symbolic links.  On Unix systems this
+usually means the file really is a symbolic link but it may lead to false results on other
+platforms.</p>
+
+<h4 id="restrict">restrict</h4>
+<p>Restricts a nested resource collection using resource selectors:</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>cache</td>
+    <td>Whether to cache results; disabling
+      may seriously impact performance</td>
+    <td>No; default <q>true</q></td>
+  </tr>
+</table>
+<h5>Parameters specified as nested elements</h5>
+<p>A single resource collection is required.</p>
+<p>Nested resource selectors are used to "narrow down" the included resources, combined via a
+logical <em>AND</em>. These are patterned after <a href="selectors.html">file selectors</a> but
+are, unsurprisingly, targeted to resources.  Several built-in resource selectors are available
+in the
+internal <a href="antlib.html">antlib</a> <code>org.apache.tools.ant.types.resources.selectors</code>:</p>
+
+<ul>
+  <li><a href="#rsel.name">name</a>&mdash;select resources by name.</li>
+  <li><a href="#rsel.exists">exists</a>&mdash;select existing resources.</li>
+  <li><a href="#rsel.date">date</a>&mdash;select resources by date.</li>
+  <li><a href="#rsel.type">type</a>&mdash;select resources by type.</li>
+  <li><a href="#rsel.size">size</a>&mdash;select resources by size.</li>
+  <li><a href="#rsel.instanceof">instanceof</a>&mdash;select resources by class or Ant
+    datatype.</li>
+  <li><a href="#rsel.and">and</a>&mdash;<q>and</q> nested resource selectors.</li>
+  <li><a href="#rsel.or">or</a>&mdash;<q>or</q> nested resource selectors.</li>
+  <li><a href="#rsel.not">not</a>&mdash;<q>not</q> a nested resource selector.</li>
+  <li><a href="#rsel.none">none</a>&mdash;select resources selected by no nested resource
+    selectors.</li>
+  <li><a href="#rsel.majority">majority</a>&mdash;select resources selected by a majority of
+    nested resource selectors.</li>
+  <li><a href="selectors.html#modified">modified</a>&mdash;select resources which content has
+    changed.</li>
+  <li><a href="selectors.html#containsselect">contains</a>&mdash;select resources containing a
+    particular text string.</li>
+  <li><a href="selectors.html#regexpselect">containsregexp</a>&mdash;select resources whose
+    contents match a particular regular expression.</li>
+  <li><a href="#rsel.compare">compare</a>&mdash;select resources based on comparison to other
+    resources.</li>
+  <li><a href="selectors.html#readable">readable</a>&mdash;select files (resources must be
+    files) if they are readable.</li>
+  <li><a href="selectors.html#writable">writable</a>&mdash;select files (resources must be
+    files) if they are writable.</li>
+</ul>
+
+<h5 id="rsel.name">name</h5>
+<p>Selects resources by name.</p>
+<table class="attr">
   <tr>
-    <td valign="top">excludes</td>
-    <td valign="top">comma- or space-separated list of patterns
-      of files that must be excluded</td>
-    <td rowspan="2" valign="top" align="center">No, default none
-      (except default excludes when true)</td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">excludesfile</td>
-    <td valign="top">the name of a file; each line of this file is
-      taken to be an exclude pattern.</td>
+    <td>name</td>
+    <td>The name pattern to test using standard Ant patterns.</td>
+    <td rowspan="2">Exactly one of the two</td>
   </tr>
   <tr>
-    <td valign="top">defaultexcludes</td>
-    <td valign="top">Whether
-      <a href="../dirtasks.html#defaultexcludes">default excludes</a>
-      should be used</td>
-    <td valign="top" align="center">No, default <i>true</i></td>
+    <td>regex</td>
+    <td class="left">The regular expression matching files to select.</td>
   </tr>
   <tr>
-    <td valign="top">casesensitive</td>
-    <td valign="top">Whether patterns are case-sensitive</td>
-    <td valign="top" align="center">No, default <i>true</i></td>
+    <td>casesensitive</td>
+    <td>Whether name comparisons are case-sensitive</td>
+    <td>No; default <q>true</q></td>
   </tr>
   <tr>
-    <td valign="top">followsymlinks</td>
-    <td valign="top">Whether to follow symbolic links
-      (see note <a href="#symlink">below</a>)</td>
-    <td valign="top" align="center">No, default <i>true</i></td>
+    <td>handledirsep</td>
+    <td>
+      If this is specified, the mapper will treat a \ character in a resource name or name
+      attribute as a / for the purposes of matching.  This attribute can be <q>true</q>
+      or <q>false</q>.
+      <em>Since Ant 1.8.0</em>
+    <td>No; default <q>false</q></td>
   </tr>
 </table>
 
-<p><a name="symlink"><b>Note</b></a>: All files/directories for which
-the canonical path is different from its path are considered symbolic
-links.  On Unix systems this usually means the file really is a
-symbolic link but it may lead to false results on other
-platforms.
-</p>
+<h5 id="rsel.exists">exists</h5>
+<p>Selects existing resources.</p>
 
-<h4><a name="restrict">restrict</a></h4>
-<p>Restricts a nested resource collection using resource selectors:
-<blockquote>
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">cache</td>
-      <td valign="top">Whether to cache results; disabling
-        may seriously impact performance</td>
-      <td valign="top" align="center">No, default <i>true</i></td>
-    </tr>
-  </table>
-  <h4>Parameters specified as nested elements</h4>
-  <p>A single resource collection is required.</p>
-  <p>Nested resource selectors are used to "narrow down" the included
-    resources, combined via a logical <i>AND</i>. These are patterned 
-    after <a href="selectors.html">file selectors</a> but are, 
-    unsurprisingly, targeted to resources.
-    Several built-in resource selectors are available in the internal
-    <a href="antlib.html">antlib</a>
-    <code>org.apache.tools.ant.types.resources.selectors</code>:
-  </p>
-
-  <ul>
-    <li><a href="#rsel.name">name</a> - select resources by name.</li>
-    <li><a href="#rsel.exists">exists</a> - select existing resources.</li>
-    <li><a href="#rsel.date">date</a> - select resources by date.</li>
-    <li><a href="#rsel.type">type</a> - select resources by type.</li>
-    <li><a href="#rsel.size">size</a> - select resources by size.</li>
-    <li><a href="#rsel.instanceof">instanceof</a>
-      - select resources by class or Ant datatype.</li>
-    <li><a href="#rsel.and">and</a> - "and" nested resource selectors.</li>
-    <li><a href="#rsel.or">or</a> - "or" nested resource selectors.</li>
-    <li><a href="#rsel.not">not</a> - "not" a nested resource selector.</li>
-    <li><a href="#rsel.none">none</a>
-      - select resources selected by no nested resource selectors.</li>
-    <li><a href="#rsel.majority">majority</a> - select resources selected
-      by a majority of nested resource selectors.</li>
-    <li><a href="selectors.html#modified">modified</a> - select resources which
-      content has changed.</li>
-    <li><a href="selectors.html#containsselect">contains</a> - select resources 
-      containing a particular text string.</li>
-    <li><a href="selectors.html#regexpselect">containsregexp</a> - select
-      resources whose contents match a particular regular expression.</li>
-    <li><a href="#rsel.compare">compare</a> - select resources
-      based on comparison to other resources.</li>
-    <li><a href="selectors.html#readable">readable</a> -
-      Select files (resources must be files) if they are readable.</li>
-    <li><a href="selectors.html#writable">writable</a> -
-      Select files (resources must be files) if they are writable.</li>
-  </ul>
-
-  <h4><a name="rsel.name">name</a></h4>
-  <p>Selects resources by name.</p>
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">name</td>
-      <td valign="top">The name pattern to test using standard Ant
-        patterns.</td>
-      <td valign="top" align="center" rowspan="2">Exactly one of
-        the two</td>
-    </tr>
-    <tr>
-      <td valign="top">regex</td>
-      <td valign="top">The regular expression matching files to select.</td>
-    </tr>
-    <tr>
-      <td valign="top">casesensitive</td>
-      <td valign="top">Whether name comparisons are case-sensitive</td>
-      <td align="center" valign="top">No, default <i>true</i></td>
-    </tr>
-    <tr>
-      <td valign="top">handledirsep</td>
-      <td valign="top">
-        If this is specified, the mapper will treat a \ character in a
-        resource name or name attribute as a / for the purposes of
-        matching.  This attribute can be true or false, the default is
-        false.
-        <em>Since Ant 1.8.0.</em>
-        <td align="center" valign="top">No</td>
-      </tr>
-  </table>
+<h5 id="rsel.date">date</h5>
+<p>Selects resources by date.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>millis</td>
+    <td>The comparison date/time in ms since January 1, 1970</td>
+    <td rowspan="2">One of these</td>
+  </tr>
+  <tr>
+    <td>datetime</td>
+    <td class="left">The formatted comparison date/time</td>
+  </tr>
+  <tr>
+    <td>pattern</td>
+    <td>SimpleDateFormat-compatible pattern for use with the <code>datetime</code> attribute
+    using the current locale</td>
+    <td>No; default is <q>MM/dd/yyyy hh:mm a</q> using the US locale</td>
+  </tr>
+  <tr>
+    <td>granularity</td>
+    <td>The number of milliseconds leeway to use when comparing file modification times. This is
+    needed because not every file system supports tracking the last modified time to the
+    millisecond level.</td>
+    <td>No; default varies by platform: FAT filesystems = 2 sec; Unix = 1 sec; NTFS = 1 ms.</td>
+  </tr>
+  <tr>
+    <td>when</td>
+    <td>One of <q>before</q>, <q>after</q>, <q>equal</q></td>
+    <td>No; default <q>equal</q></td>
+  </tr>
+</table>
 
-  <h4><a name="rsel.exists">exists</a></h4>
-  <p>Selects existing resources.</p>
+<h5 id="rsel.type">type</h5>
+<p>Selects resources by type (file or directory).</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>One of <q>file</q>, <q>dir</q>, <q>any</q> (<em>since Ant 1.8</em>)</td>
+    <td>Yes</td>
+  </tr>
+</table>
 
-  <h4><a name="rsel.date">date</a></h4>
-  <p>Selects resources by date.</p>
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">millis</td>
-      <td valign="top">The comparison date/time in ms since January 1, 1970</td>
-      <td rowspan="2" align="center" valign="middle">One of these</td>
-    </tr>
-    <tr>
-      <td valign="top">datetime</td>
-      <td valign="top">The formatted comparison date/time</td>
-    </tr>
-    <tr>
-      <td valign="top">pattern</td>
-      <td valign="top">SimpleDateFormat-compatible pattern
-        for use with the <code>datetime</code> attribute using the
-        current locale</td>
-      <td align="center" valign="top">
-        No, default is "MM/dd/yyyy hh:mm a" using the US locale</td>
-    </tr>
-    <tr>
-      <td valign="top">granularity</td>
-      <td valign="top">The number of milliseconds leeway to use when
-        comparing file modification times. This is needed because not
-        every file system supports tracking the last modified time to
-        the millisecond level.</td>
-      <td align="center" valign="top">No; default varies by platform:
-        FAT filesystems = 2 sec; Unix = 1 sec; NTFS = 1 ms.</td>
-    </tr>
-    <tr>
-      <td valign="top">when</td>
-      <td valign="top">One of "before", "after", "equal"</td>
-      <td align="center" valign="top">No, default "equal"</td>
-    </tr>
-  </table>
+<h5 id="rsel.size">size</h5>
+<p>Selects resources by size.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>size</td>
+    <td>The size to compare</td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>when</td>
+    <td>One
+    of <q>equal</q>, <q>eq</q>, <q>greater</q>, <q>gt</q>, <q>less</q>, <q>lt</q>, <q>ge</q>
+    (greater or equal), <q>ne</q> (not equal), <q>le</q> (less or equal)</td>
+    <td>No; default <q>equal</q></td>
+  </tr>
+</table>
 
-  <h4><a name="rsel.type">type</a></h4>
-  <p>Selects resources by type (file or directory).</p>
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">type</td>
-      <td valign="top">One of "file", "dir", "any" (since Ant 1.8)</td>
-      <td align="center" valign="top">Yes</td>
-    </tr>
-  </table>
+<h5 id="rsel.instanceof">instanceof</h5>
+<p>Selects resources by type.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>class</td>
+    <td>The class of which the resource must be an instance</td>
+    <td rowspan="2">One of these</td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td class="left">The Ant type that must be assignable from the resource</td>
+  </tr>
+  <tr>
+    <td>uri</td>
+    <td>The URI in which <var>type</var> must be defined</td>
+    <td>No</td>
+  </tr>
+</table>
 
-  <h4><a name="rsel.size">size</a></h4>
-  <p>Selects resources by size.</p>
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">size</td>
-      <td valign="top">The size to compare</td>
-      <td align="center" valign="top">Yes</td>
-    </tr>
-    <tr>
-      <td valign="top">when</td>
-      <td valign="top">One of "equal", "eq", "greater", "gt", "less", "lt",
-        "ge" (greater or equal), "ne" (not equal), "le" (less or equal)</td>
-      <td align="center" valign="top">No, default "equal"</td>
-    </tr>
-  </table>
+<h5 id="rsel.and">and</h5>
+<p>Selects a resource if it is selected by all nested resource selectors.</p>
 
-  <h4><a name="rsel.instanceof">instanceof</a></h4>
-  <p>Selects resources by type.</p>
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">class</td>
-      <td valign="top">The class of which the resource must be an instance</td>
-      <td rowspan="2" align="center" valign="middle">One of these</td>
-    </tr>
-    <tr>
-      <td valign="top">type</td>
-      <td valign="top">The Ant type that must
-        be assignable from the resource</td>
-    </tr>
-    <tr>
-      <td valign="top">uri</td>
-      <td valign="top">The uri in which <i>type</i> must be defined</td>
-      <td valign="top">No</td>
-    </tr>
-  </table>
+<h5 id="rsel.or">or</h5>
+<p>Selects a resource if it is selected by at least one nested resource selector.</p>
 
-  <h4><a name="rsel.and">and</a></h4>
-  <p>Selects a resource if it is selected by all nested resource selectors.</p>
+<h5 id="rsel.not">not</h5>
+<p>Negates the selection result of the single nested resource selector allowed.</p>
 
-  <h4><a name="rsel.or">or</a></h4>
-  <p>Selects a resource if it is selected
-    by at least one nested resource selector.</p>
-
-  <h4><a name="rsel.not">not</a></h4>
-  <p>Negates the selection result of the single
-    nested resource selector allowed.</p>
-
-  <h4><a name="rsel.none">none</a></h4>
-  <p>Selects a resource if it is selected
-    by no nested resource selectors.</p>
-
-  <h4><a name="rsel.majority">majority</a></h4>
-  <p>Selects a resource if it is selected
-    by the majority of nested resource selectors.</p>
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">allowtie</td>
-      <td valign="top">Whether a tie (when there is an even number
-        of nested resource selectors) is considered a majority</td>
-      <td valign="top">No, default <i>true</i></td>
-    </tr>
-  </table>
+<h5 id="rsel.none">none</h5>
+<p>Selects a resource if it is selected by no nested resource selectors.</p>
 
-  <h4><a name="rsel.compare">compare</a></h4>
-  <p>Selects a resource based on its comparison to one or more "control"
-     resources using nested <a href="#rcmp">resource comparators</a>.</p>
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">when</td>
-      <td valign="top">Comparison ("equal"/"eq", "greater"/"gt", "less"/"lt",
-        "le" (less or equal), "ge" (greater or equal), "ne" (not equal).</td>
-      <td valign="top">No, default "equal"</td>
-    </tr>
-    <tr>
-      <td valign="top">against</td>
-      <td valign="top">Quantifier ("all"/"each"/"every", "any"/"some",
-        (exactly) "one", "most"/"majority", "none".</td>
-      <td valign="top">No, default "all"</td>
-    </tr>
-  </table>
-  <h4>Parameters specified as nested elements</h4>
-  <p>The resources against which comparisons will be made must be specified
-    using the nested &lt;control&gt; element, which denotes a
-    <a href="#resources">resources</a> collection.</p>
-  <h4>Examples</h4>
-  <p>Assuming the namespace settings
-<pre><code>  rsel="antlib:org.apache.tools.ant.types.resources.selectors"
-  rcmp="antlib:org.apache.tools.ant.types.resources.comparators"
-</code></pre></p>
+<h5 id="rsel.majority">majority</h5>
+<p>Selects a resource if it is selected by the majority of nested resource selectors.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>allowtie</td>
+    <td>Whether a tie (when there is an even number of nested resource selectors) is considered
+      a majority</td>
+    <td>No; default <q>true</q></td>
+  </tr>
+</table>
+
+<h5 id="rsel.compare">compare</h5>
+<p>Selects a resource based on its comparison to one or more "control" resources using
+nested <a href="#rcmp">resource comparators</a>.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>when</td>
+    <td>Comparison
+    (<q>equal</q>/<q>eq</q>, <q>greater</q>/<q>gt</q>, <q>less</q>/<q>lt</q>, <q>le</q> (less or
+    equal), <q>ge</q> (greater or equal), <q>ne</q> (not equal).</td>
+    <td>No; default <q>equal</q></td>
+  </tr>
+  <tr>
+    <td>against</td>
+    <td>Quantifier (<q>all</q>/<q>each</q>/<q>every</q>, <q>any</q>/<q>some</q>,
+    (exactly) <q>one</q>, <q>most</q>/<q>majority</q>, <q>none</q>.</td>
+    <td>No; default <q>all</q></td>
+  </tr>
+</table>
+<h6>Parameters specified as nested elements</h6>
+<p>The resources against which comparisons will be made must be specified using the nested
+&lt;control&gt; element, which denotes a <a href="#resources">resources</a> collection.</p>
+<h6>Examples</h6>
+<p>Assuming the namespace settings</p>
+<pre>
+rsel="antlib:org.apache.tools.ant.types.resources.selectors"
+rcmp="antlib:org.apache.tools.ant.types.resources.comparators"</pre>
   <pre>
 &lt;restrict&gt;
-  &lt;fileset dir="src" includes="a,b,c,d,e,f,g" /&gt;
+  &lt;fileset dir="src" includes="a,b,c,d,e,f,g"/&gt;
   &lt;rsel:compare when="le" against="all"&gt;
     &lt;control&gt;
-      &lt;resource name="d" /&gt;
+      &lt;resource name="d"/&gt;
     &lt;/control&gt;
-    &lt;rcmp:name /&gt;
+    &lt;rcmp:name/&gt;
   &lt;/rsel:compare&gt;
-&lt;/restrict&gt;
-  </pre>
-  <p>Selects files a, b, c, and d.</p>
-  <pre>
-    &lt;project rsel=&quot;antlib:org.apache.tools.ant.types.resources.selectors&quot;&gt;
-        &lt;macrodef name=&quot;copyFromPath&quot;&gt;
-            &lt;attribute name=&quot;todir&quot;/&gt;
-            &lt;attribute name=&quot;refid&quot;/&gt;
-            &lt;element name=&quot;nested-resource-selectors&quot; optional=&quot;yes&quot; implicit=&quot;true&quot;/&gt;
-            &lt;sequential&gt;
-                &lt;mkdir dir=&quot;@{todir}&quot; taskname=&quot;copyFromPath&quot;/&gt;
-                &lt;copy todir=&quot;@{todir}&quot; taskname=&quot;copyFromPath&quot;&gt;
-                    &lt;restrict&gt;
-                        &lt;path refid=&quot;@{refid}&quot;/&gt;
-                        &lt;rsel:or&gt;
-                            &lt;nested-resource-selectors/&gt;
-                        &lt;/rsel:or&gt;
-                    &lt;/restrict&gt;
-                    &lt;flattenmapper/&gt;
-                &lt;/copy&gt;
-            &lt;/sequential&gt;
-        &lt;/macrodef&gt;
-        &lt;copyFromPath refid=&quot;classpath&quot; todir=&quot;todir&quot;&gt;
-            &lt;rsel:name name=&quot;log4j.properties&quot;/&gt;
-            &lt;rsel:name name=&quot;default.properties&quot;/&gt;
-        &lt;/copyFromPath&gt;
-     &lt;/project&gt;
-  </pre>
-  <p>Creates the <tt>todir</tt> directory and copies (if present) the
-     files <tt>log4j.properties</tt> and <tt>default.properties</tt>
-     from the Classpath (already used while compiling).
-  </p>
+&lt;/restrict&gt;</pre>
+<p>Selects files <samp>a</samp>, <samp>b</samp>, <samp>c</samp>, and <samp>d</samp>.</p>
+<pre>
+&lt;project rsel=&quot;antlib:org.apache.tools.ant.types.resources.selectors&quot;&gt;
+    &lt;macrodef name=&quot;copyFromPath&quot;&gt;
+        &lt;attribute name=&quot;todir&quot;/&gt;
+        &lt;attribute name=&quot;refid&quot;/&gt;
+        &lt;element name=&quot;nested-resource-selectors&quot; optional=&quot;yes&quot; implicit=&quot;true&quot;/&gt;
+        &lt;sequential&gt;
+            &lt;mkdir dir=&quot;@{todir}&quot; taskname=&quot;copyFromPath&quot;/&gt;
+            &lt;copy todir=&quot;@{todir}&quot; taskname=&quot;copyFromPath&quot;&gt;
+                &lt;restrict&gt;
+                    &lt;path refid=&quot;@{refid}&quot;/&gt;
+                    &lt;rsel:or&gt;
+                        &lt;nested-resource-selectors/&gt;
+                    &lt;/rsel:or&gt;
+                &lt;/restrict&gt;
+                &lt;flattenmapper/&gt;
+            &lt;/copy&gt;
+        &lt;/sequential&gt;
+    &lt;/macrodef&gt;
+    &lt;copyFromPath refid=&quot;classpath&quot; todir=&quot;todir&quot;&gt;
+        &lt;rsel:name name=&quot;log4j.properties&quot;/&gt;
+        &lt;rsel:name name=&quot;default.properties&quot;/&gt;
+    &lt;/copyFromPath&gt;
+&lt;/project&gt;</pre>
+<p>Creates the <samp>todir</samp> directory and copies (if present) the
+files <samp>log4j.properties</samp> and <samp>default.properties</samp> from the classpath
+(already used while compiling).</p>
 
-  <pre>
-  &lt;project&gt;
-      &lt;filelist id=&quot;allfiles&quot; dir=&quot;${ant.home}/bin&quot; files=&quot;ant.cmd,foo.txt,ant.bat,bar.txt,ant&quot;/&gt;
-      &lt;restrict id=&quot;missingfiles&quot;&gt;
-          &lt;filelist refid=&quot;allfiles&quot;/&gt;
-          &lt;rsel:not xmlns:rsel=&quot;antlib:org.apache.tools.ant.types.resources.selectors&quot;&gt;
-              &lt;rsel:exists/&gt;
-          &lt;/rsel:not&gt;
-      &lt;/restrict&gt;
-      &lt;echo&gt;These files are missed: ${toString:missingfiles}&lt;/echo&gt;
-  &lt;/project&gt;
-  </pre>
-  <p>The resource collection <i>allfiles</i> defines a list of files which are expected. The restrict
-  <i>missingfiles</i> uses the <tt>&lt;not&gt;&lt;exists&gt;</tt> selector for getting all files
-  which are not present. Finally we use the <i>toString:</i> <a href="../using.html#pathshortcut">pathshortcut</a> for
-  getting them in a readable form: <tt>[echo] These files are missed: ....foo.txt;....bar.txt</tt></p>
-
-</blockquote>
-
-<h4><a name="sort">sort</a></h4>
-
-<p>Sorts a nested resource collection according to the resources'
-   natural order, or by one or more nested <a href="#rcmp">resource
-   comparators</a>:</p>
-<blockquote>
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">cache</td>
-      <td valign="top">Whether to cache results; disabling
-        may seriously impact performance</td>
-      <td valign="top" align="center">No, default <i>true</i></td>
-    </tr>
-  </table>
-  <h4>Parameters specified as nested elements</h4>
-  <p>A single resource collection is required.</p>
-  <p>The sort can be controlled and customized by specifying one or more
-    resource comparators. Resources can be sorted according to multiple
-    criteria; the first specified is the "outermost", while the last
-    specified is the "innermost". Several built-in resource comparators
-    are available in the internal <a href="antlib.html">antlib</a>
-    <code>org.apache.tools.ant.types.resources.comparators</code>:
-  </p>
-  <h4><a name="rcmp">Resource Comparators:</a></h4>
-  <ul>
-    <li><a href="#rcmp.name">name</a> - sort resources by name</li>
-    <li><a href="#rcmp.exists">exists</a> - sort resources by existence</li>
-    <li><a href="#rcmp.date">date</a> - sort resources by date</li>
-    <li><a href="#rcmp.type">type</a> - sort resources by type</li>
-    <li><a href="#rcmp.size">size</a> - sort resources by size</li>
-    <li><a href="#rcmp.content">content</a> - sort resources by content</li>
-    <li><a href="#rcmp.reverse">reverse</a> - reverse the natural sort order,
-      or that of a single nested resource comparator</li>
-  </ul>
-
-  <h4><a name="rcmp.name">name</a></h4>
-  <p>Sort resources by name.</p>
-
-  <h4><a name="rcmp.exists">exists</a></h4>
-  <p>Sort resources by existence.
-    Not existing is considered "less than" existing.</p>
-
-  <h4><a name="rcmp.date">date</a></h4>
-  <p>Sort resources by date.</p>
-
-  <h4><a name="rcmp.type">type</a></h4>
-  <p>Sort resources by type (file or directory).
-    Because directories contain files, they are considered "greater".</p>
-
-  <h4><a name="rcmp.size">size</a></h4>
-  <p>Sort resources by size.</p>
-
-  <h4><a name="rcmp.content">content</a></h4>
-  <p>Sort resources by content.</p>
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">binary</td>
-      <td valign="top">Whether content should be compared in binary mode.
-        If <i>false<i>, content will be compared without regard to
-        platform-specific line-ending conventions.</td>
-      <td valign="top">No, default <i>true</i></td>
-    </tr>
-  </table>
+<pre>
+&lt;project&gt;
+    &lt;filelist id=&quot;allfiles&quot; dir=&quot;${ant.home}/bin&quot; files=&quot;ant.cmd,foo.txt,ant.bat,bar.txt,ant&quot;/&gt;
+    &lt;restrict id=&quot;missingfiles&quot;&gt;
+        &lt;filelist refid=&quot;allfiles&quot;/&gt;
+        &lt;rsel:not xmlns:rsel=&quot;antlib:org.apache.tools.ant.types.resources.selectors&quot;&gt;
+            &lt;rsel:exists/&gt;
+        &lt;/rsel:not&gt;
+    &lt;/restrict&gt;
+    &lt;echo&gt;These files are missed: ${toString:missingfiles}&lt;/echo&gt;
+&lt;/project&gt;</pre>
+<p>The resource collection <q>allfiles</q> defines a list of files which are expected. The
+restrict <q>missingfiles</q> uses the <code>&lt;not&gt;&lt;exists&gt;</code> selector for
+getting all files which are not present. Finally we use
+the <code>toString:</code> <a href="../using.html#pathshortcut">pathshortcut</a> for getting
+them in a readable form: <code>[echo] These files are missed: ....foo.txt;....bar.txt</code></p>
+
+<h4 id="sort">sort</h4>
+
+<p>Sorts a nested resource collection according to the resources' natural order, or by one or
+more nested <a href="#rcmp">resource comparators</a>:</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>cache</td>
+    <td>Whether to cache results; disabling may seriously impact performance</td>
+    <td>No; default <q>true</q></td>
+  </tr>
+</table>
+<h5>Parameters specified as nested elements</h5>
+<p>A single resource collection is required.</p>
+<p>The sort can be controlled and customized by specifying one or more resource
+comparators. Resources can be sorted according to multiple criteria; the first specified is the
+"outermost", while the last specified is the "innermost". Several built-in resource comparators
+are available in the
+internal <a href="antlib.html">antlib</a> <code>org.apache.tools.ant.types.resources.comparators</code>:</p>
+<h5 id="rcmp">Resource Comparators</h5>
+<ul>
+  <li><a href="#rcmp.name">name</a>&mdash;sort resources by name</li>
+  <li><a href="#rcmp.exists">exists</a>&mdash;sort resources by existence</li>
+  <li><a href="#rcmp.date">date</a>&mdash;sort resources by date</li>
+  <li><a href="#rcmp.type">type</a>&mdash;sort resources by type</li>
+  <li><a href="#rcmp.size">size</a>&mdash;sort resources by size</li>
+  <li><a href="#rcmp.content">content</a>&mdash;sort resources by content</li>
+  <li><a href="#rcmp.reverse">reverse</a>&mdash;reverse the natural sort order, or that of a
+    single nested resource comparator</li>
+</ul>
 
-  <h4><a name="rcmp.reverse">reverse</a></h4>
-  <p>Reverse the natural sort order, or that of a single nested comparator.</p>
+<h6 id="rcmp.name">name</h6>
+<p>Sort resources by name.</p>
 
-  <h4>Examples</h4>
-  <pre>
-    &lt;property name=&quot;eol&quot; value=&quot;${line.separator}&quot; /&gt;
-    &lt;pathconvert property=&quot;sorted&quot; pathsep=&quot;${eol}&quot;&gt;
-      &lt;sort&gt;
-        &lt;tokens&gt;
-          &lt;string value=&quot;foo bar etc baz&quot; /&gt;
-          &lt;stringtokenizer /&gt;
-        &lt;/tokens&gt;
-      &lt;/sort&gt;
-    &lt;/pathconvert&gt;</pre>
-  <p>The resource of type string &quot;foo bar etc baz&quot; is split into four tokens by 
-  the stringtokenizer. These tokens are sorted and there <i>sorted</i> gets the value
-  of &quot;bar baz etc foo&quot;.</p>
-  
-  <pre>
-    &lt;sort&gt;
-      &lt;fileset dir=&quot;foo&quot; /&gt;
-      &lt;reverse xmlns=&quot;antlib:org.apache.tools.ant.types.resources.comparators&quot;&gt;
-        &lt;date /&gt;
-      &lt;/reverse&gt;
-    &lt;/sort&gt;</pre>
-  <p>This takes all files from <i>foo</i>
-     and sorts them by modification date in reverse order.
-     Because the resource comparators used (<code>&lt;reverse&gt;</code>
-     and <code>&lt;date&gt;</code>) are in an internal antlib
-     their namespace must be set explicitly.
-  </p>
-
-</blockquote>
-
-<h4><a name="first">first</a></h4>
-<p>Includes the first <i>count</i> resources from a nested resource collection.
-This can be used in conjunction with the <a href="#sort">sort</a> collection,
-for example, to select the first few oldest, largest, etc. resources from a
-larger collection.</p>
-<blockquote>
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">count</td>
-      <td valign="top">The number of resources to include</td>
-      <td valign="top" align="center">No, default 1</td>
-    </tr>
-    <tr>
-      <td valign="top">cache</td>
-      <td valign="top">Whether to cache results; disabling
-        may seriously impact performance</td>
-      <td valign="top" align="center">No, default <i>true</i></td>
-    </tr>
-  </table>
-  <h4>Parameters specified as nested elements</h4>
-  <p>A single resource collection is required.</p>
-</blockquote>
-
-<h4><a name="last">last</a></h4>
-<p>Includes the last <i>count</i> resources from a nested resource collection.
-This can be used in conjunction with the <a href="#sort">sort</a> collection,
-for example, to select the last few oldest, largest, etc. resources from a
-larger collection. <strong>Since Ant 1.7.1</strong>.</p>
-<blockquote>
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">count</td>
-      <td valign="top">The number of resources to include</td>
-      <td valign="top" align="center">No, default 1</td>
-    </tr>
-    <tr>
-      <td valign="top">cache</td>
-      <td valign="top">Whether to cache results; disabling
-        may seriously impact performance</td>
-      <td valign="top" align="center">No, default <i>true</i></td>
-    </tr>
-  </table>
-  <h4>Parameters specified as nested elements</h4>
-  <p>A single resource collection is required.</p>
-</blockquote>
-
-<h4><a name="allbutfirst">allbutfirst</a></h4>
-<p>Includes all elements except for the first <i>count</i> resources
-from a nested resource collection.  This can be used in conjunction
-with the <a href="#sort">sort</a> collection, for example, to select
-all but the first few oldest, largest, etc. resources from a larger
-collection. <strong>Since Ant 1.9.5</strong>.</p>
-<blockquote>
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">count</td>
-      <td valign="top">The number of resources to exclude</td>
-      <td valign="top" align="center">No, default 1</td>
-    </tr>
-    <tr>
-      <td valign="top">cache</td>
-      <td valign="top">Whether to cache results; disabling
-        may seriously impact performance</td>
-      <td valign="top" align="center">No, default <i>true</i></td>
-    </tr>
-  </table>
-  <h4>Parameters specified as nested elements</h4>
-  <p>A single resource collection is required.</p>
-</blockquote>
-
-<h4><a name="allbutlast">allbutlast</a></h4>
-<p>Includes all elements except for the last <i>count</i> resources
-from a nested resource collection.  This can be used in conjunction
-with the <a href="#sort">sort</a> collection, for example, to select
-all but the last few oldest, largest, etc. resources from a larger
-collection. <strong>Since Ant 1.9.5</strong>.</p>
-<blockquote>
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">count</td>
-      <td valign="top">The number of resources to exclude</td>
-      <td valign="top" align="center">No, default 1</td>
-    </tr>
-    <tr>
-      <td valign="top">cache</td>
-      <td valign="top">Whether to cache results; disabling
-        may seriously impact performance</td>
-      <td valign="top" align="center">No, default <i>true</i></td>
-    </tr>
-  </table>
-  <h4>Parameters specified as nested elements</h4>
-  <p>A single resource collection is required.</p>
-</blockquote>
-
-<h4><a name="tokens">tokens</a></h4>
-<p>Includes the <a href="#string">string</a> tokens gathered from a nested
- resource collection. Uses the same tokenizers supported by the
-<a href="filterchain.html#tokenfilter">TokenFilter</a>. Imaginative
-  use of this resource collection can implement equivalents for such Unix
-  functions as <code>sort</code>, <code>grep -c</code>, <code>wc</code> and
-  <code>wc -l</code>.</p>
-<blockquote>
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">encoding</td>
-      <td valign="top">The encoding of the nested resources</td>
-      <td valign="top" align="center">No, default is platform default</td>
-    </tr>
-    <tr>
-      <td valign="top">cache</td>
-      <td valign="top">Whether to cache results; disabling
-        may seriously impact performance</td>
-      <td valign="top" align="center">No, default <i>true</i></td>
-    </tr>
-  </table>
-  <h4>Parameters specified as nested elements</h4>
-  <ul>
-    <li>A single resource collection is required.</li>
-    <li>One nested tokenizer may be specified.  If omitted, a
-        <a href="filterchain.html#linetokenizer">LineTokenizer</a> will be used.
-    </li>
-  </ul>
-  <h4>Examples</h4>
-  <pre>&lt;concat&gt;
+<h6 id="rcmp.exists">exists</h6>
+<p>Sort resources by existence.  Not existing is considered "less than" existing.</p>
+
+<h6 id="rcmp.date">date</h6>
+<p>Sort resources by date.</p>
+
+<h6 id="rcmp.type">type</h6>
+<p>Sort resources by type (file or directory).  Because directories contain files, they are
+considered "greater".</p>
+
+<h6 id="rcmp.size">size</h6>
+<p>Sort resources by size.</p>
+
+<h6 id="rcmp.content">content</h6>
+<p>Sort resources by content.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>binary</td>
+    <td>Whether content should be compared in binary mode.  If <q>false</q>, content will be
+    compared without regard to platform-specific line-ending conventions.</td>
+    <td>No; default <q>true</q></td>
+  </tr>
+</table>
+
+<h6 id="rcmp.reverse">reverse</h6>
+<p>Reverse the natural sort order, or that of a single nested comparator.</p>
+
+<h5>Examples</h5>
+<pre>
+&lt;property name=&quot;eol&quot; value=&quot;${line.separator}&quot;/&gt;
+&lt;pathconvert property=&quot;sorted&quot; pathsep=&quot;${eol}&quot;&gt;
+  &lt;sort&gt;
+    &lt;tokens&gt;
+      &lt;string value=&quot;foo bar etc baz&quot;/&gt;
+      &lt;stringtokenizer/&gt;
+    &lt;/tokens&gt;
+  &lt;/sort&gt;
+&lt;/pathconvert&gt;</pre>
+<p>The resource of type string <q>foo bar etc baz</q> is split into four tokens by
+the <code>stringtokenizer</code>. These tokens are sorted and there <code>sorted</code> gets the
+value of <q>bar baz etc foo</q>.</p>
+
+<pre>
+&lt;sort&gt;
+  &lt;fileset dir=&quot;foo&quot;/&gt;
+  &lt;reverse xmlns=&quot;antlib:org.apache.tools.ant.types.resources.comparators&quot;&gt;
+    &lt;date/&gt;
+  &lt;/reverse&gt;
+&lt;/sort&gt;</pre>
+<p>This takes all files from <samp>foo</samp> and sorts them by modification date in reverse
+order.  Because the resource comparators used (<code>&lt;reverse&gt;</code>
+and <code>&lt;date&gt;</code>) are in an internal antlib their namespace must be set explicitly.
+</p>
+
+<h4 id="first">first</h4>
+<p>Includes the first <var>count</var> resources from a nested resource collection.  This can be
+used in conjunction with the <a href="#sort">sort</a> collection, for example, to select the
+first few oldest, largest, etc. resources from a larger collection.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>count</td>
+    <td>The number of resources to include</td>
+    <td>No; default <q>1</q></td>
+  </tr>
+  <tr>
+    <td>cache</td>
+    <td>Whether to cache results; disabling may seriously impact performance</td>
+    <td>No; default <q>true</q></td>
+  </tr>
+</table>
+<h5>Parameters specified as nested elements</h5>
+<p>A single resource collection is required.</p>
+
+<h4 id="last">last</h4>
+<p><em>Since Ant 1.7.1</em></p>
+<p>Includes the last <var>count</var> resources from a nested resource collection.  This can be
+used in conjunction with the <a href="#sort">sort</a> collection, for example, to select the
+last few oldest, largest, etc. resources from a larger collection.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>count</td>
+    <td>The number of resources to include</td>
+    <td>No; default <q>1</q></td>
+  </tr>
+  <tr>
+    <td>cache</td>
+    <td>Whether to cache results; disabling may seriously impact performance</td>
+    <td>No; default <q>true</q></td>
+  </tr>
+</table>
+<h5>Parameters specified as nested elements</h5>
+<p>A single resource collection is required.</p>
+
+<h4 id="allbutfirst">allbutfirst</h4>
+<p><em>Since Ant 1.9.5</em></p>
+<p>Includes all elements except for the first <var>count</var> resources from a nested resource
+collection.  This can be used in conjunction with the <a href="#sort">sort</a> collection, for
+example, to select all but the first few oldest, largest, etc. resources from a larger
+collection.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>count</td>
+    <td>The number of resources to exclude</td>
+    <td>No; default <q>1</q></td>
+  </tr>
+  <tr>
+    <td>cache</td>
+    <td>Whether to cache results; disabling may seriously impact performance</td>
+    <td>No; default <q>true</q></td>
+  </tr>
+</table>
+<h5>Parameters specified as nested elements</h5>
+<p>A single resource collection is required.</p>
+
+<h4 id="allbutlast">allbutlast</h4>
+<p><em>Since Ant 1.9.5</em></p>
+<p>Includes all elements except for the last <var>count</var> resources from a nested resource
+collection.  This can be used in conjunction with the <a href="#sort">sort</a> collection, for
+example, to select all but the last few oldest, largest, etc. resources from a larger
+collection.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>count</td>
+    <td>The number of resources to exclude</td>
+    <td>No; default <q>1</q></td>
+  </tr>
+  <tr>
+    <td>cache</td>
+    <td>Whether to cache results; disabling may seriously impact performance</td>
+    <td>No; default <q>true</q></td>
+  </tr>
+</table>
+<h5>Parameters specified as nested elements</h5>
+<p>A single resource collection is required.</p>
+
+<h4 id="tokens">tokens</h4>
+<p>Includes the <a href="#string">string</a> tokens gathered from a nested resource collection. Uses
+the same tokenizers supported by
+the <a href="filterchain.html#tokenfilter">TokenFilter</a>. Imaginative use of this resource
+collection can implement equivalents for such Unix functions as <kbd>sort</kbd>, <kbd>grep
+-c</kbd>, <kbd>wc</kbd> and <kbd>wc -l</kbd>.</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>encoding</td>
+    <td>The encoding of the nested resources</td>
+    <td>No; default is default JVM character encoding</td>
+  </tr>
+  <tr>
+    <td>cache</td>
+    <td>Whether to cache results; disabling may seriously impact performance</td>
+    <td>No; default <q>true</q></td>
+  </tr>
+</table>
+<h5>Parameters specified as nested elements</h5>
+<ul>
+  <li>A single resource collection is required.</li>
+  <li>One nested tokenizer may be specified.  If omitted,
+    a <a href="filterchain.html#linetokenizer">LineTokenizer</a> will be used.
+  </li>
+</ul>
+<h5>Examples</h5>
+<pre>
+&lt;concat&gt;
   &lt;union&gt;
     &lt;sort&gt;
       &lt;tokens&gt;
-        &lt;resources refid="input" /&gt;
-        &lt;linetokenizer includedelims="true" /&gt;
+        &lt;resources refid="input"/&gt;
+        &lt;linetokenizer includedelims="true"/&gt;
       &lt;/tokens&gt;
     &lt;/sort&gt;
   &lt;/union&gt;
-&lt;/concat&gt;
-  </pre>
-  <p>Implements Unix <i>sort -u</i> against resource collection <i>input</i>.</p>
-</blockquote>
-
-<h4><a name="setlogic">Set operations</a></h4>
-<blockquote>
-  <p>The following resource collections implement set operations:</p>
-  <ul>
-    <li><a href="#union">union</a></li>
-    <li><a href="#intersect">intersect</a></li>
-    <li><a href="#difference">difference</a></li>
-  </ul>
-
-  <h4><a name="union">union</a></h4>
-  <p>Union of nested resource collections.</p>
-
-  <h4><a name="intersect">intersect</a></h4>
-  <p>Intersection of nested resource collections.</p>
-
-  <h4><a name="difference">difference</a></h4>
-  <p>Difference of nested resource collections.</p>
-
-  <p>The following attributes apply to all set-operation resource collections:
-  </p>
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">cache</td>
-      <td valign="top">Whether to cache results; disabling
-        may seriously impact performance</td>
-      <td valign="top" align="center">No, default <i>true</i></td>
-    </tr>
-  </table>
-  
-  <h4>Examples</h4>
-  <pre>
-    &lt;resources id=&quot;A&quot;&gt;
-        &lt;string value=&quot;a&quot;/&gt;
-        &lt;string value=&quot;b&quot;/&gt;
-    &lt;/resources&gt;
-    &lt;resources id=&quot;B&quot;&gt;
-        &lt;string value=&quot;b&quot;/&gt;
-        &lt;string value=&quot;c&quot;/&gt;
-    &lt;/resources&gt;
-    &lt;union id=&quot;union&quot;&gt;&lt;resources refid=&quot;A&quot;/&gt;&lt;resources refid=&quot;B&quot;/&gt;&lt;/union&gt;
-    &lt;intersect id=&quot;intersect&quot;&gt;&lt;resources refid=&quot;A&quot;/&gt;&lt;resources refid=&quot;B&quot;/&gt;&lt;/intersect&gt;
-    &lt;difference id=&quot;difference&quot;&gt;&lt;resources refid=&quot;A&quot;/&gt;&lt;resources refid=&quot;B&quot;/&gt;&lt;/difference&gt;
-    &lt;echo&gt;
-      A: ${toString:A}                    = a;b
-      B: ${toString:B}                    = b;c
-
-      union     : ${toString:union}       = a;b;c
-      intersect : ${toString:intersect}   = b
-      difference: ${toString:difference}  = a;c
-    &lt;/echo&gt;
-  </pre>
-</blockquote>
+&lt;/concat&gt;</pre>
+<p>Implements Unix <kbd>sort -u</kbd> against resource collection <q>input</q>.</p>
+
+<h4 id="setlogic">Set operations</h4>
+<p>The following resource collections implement set operations:</p>
+<ul>
+  <li><a href="#union">union</a></li>
+  <li><a href="#intersect">intersect</a></li>
+  <li><a href="#difference">difference</a></li>
+</ul>
+
+<h4 id="union">union</h4>
+<p>Union of nested resource collections.</p>
+
+<h4 id="intersect">intersect</h4>
+<p>Intersection of nested resource collections.</p>
+
+<h4 id="difference">difference</h4>
+<p>Difference of nested resource collections.</p>
+
+<p>The following attributes apply to all set-operation resource collections:</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>cache</td>
+    <td>Whether to cache results; disabling may seriously impact performance</td>
+    <td>No; default <q>true</q></td>
+  </tr>
+</table>
+
+<h5>Examples</h5>
+<pre>
+&lt;resources id=&quot;A&quot;&gt;
+    &lt;string value=&quot;a&quot;/&gt;
+    &lt;string value=&quot;b&quot;/&gt;
+&lt;/resources&gt;
+&lt;resources id=&quot;B&quot;&gt;
+    &lt;string value=&quot;b&quot;/&gt;
+    &lt;string value=&quot;c&quot;/&gt;
+&lt;/resources&gt;
+&lt;union id=&quot;union&quot;&gt;&lt;resources refid=&quot;A&quot;/&gt;&lt;resources refid=&quot;B&quot;/&gt;&lt;/union&gt;
+&lt;intersect id=&quot;intersect&quot;&gt;&lt;resources refid=&quot;A&quot;/&gt;&lt;resources refid=&quot;B&quot;/&gt;&lt;/intersect&gt;
+&lt;difference id=&quot;difference&quot;&gt;&lt;resources refid=&quot;A&quot;/&gt;&lt;resources refid=&quot;B&quot;/&gt;&lt;/difference&gt;
+&lt;echo&gt;
+  A: ${toString:A}                    = a;b
+  B: ${toString:B}                    = b;c
+
+  union     : ${toString:union}       = a;b;c
+  intersect : ${toString:intersect}   = b
+  difference: ${toString:difference}  = a;c
+&lt;/echo&gt;</pre>
 
-<h4><a name="mappedresources">mappedresources</a></h4>
+<h4 id="mappedresources">mappedresources</h4>
 
 <p><em>Since Ant 1.8.0</em></p>
 
-<p>Wraps another resource collection and maps the names of the nested
-  resources using a <a href="mapper.html">mapper</a>.</p>
+<p>Wraps another resource collection and maps the names of the nested resources using
+a <a href="mapper.html">mapper</a>.</p>
 
-<p>Even if <em>mappedresources</em> wraps a resource collection that
-  consists of file-system based resources, <em>mappedresources</em>
-  will not appear to be file-system based.  This means you can't
-  use <em>mappedresources</em> with tasks that only allow file-system
-  based resources.</p>
+<p>Even if <var>mappedresources</var> wraps a resource collection that consists of file-system
+based resources, <var>mappedresources</var> will not appear to be file-system based.  This means
+you can't use <var>mappedresources</var> with tasks that only allow file-system based
+resources.</p>
 
-<blockquote>
-  <h4>Parameters specified as attributes</h4>
+<h5>Parameters specified as attributes</h5>
 
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">cache</td>
-      <td valign="top">Whether to cache results; enabling
-        may improve performance.  <em>Since Ant 1.8.1</em></td>
-      <td valign="top" align="center">No, default <i>false</i></td>
-    </tr>
-    <tr>
-      <td valign="top">enablemultiplemappings</td>
-      <td valign="top">
-        If true the the collection will use all the mappings for a
-        given source path. If false the it will only process the first
-        resource.
-        <em>since Ant 1.8.1</em>.</td>
-      <td align="center">No - defaults to false.</td>
-    </tr>
-  </table>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>cache</td>
+    <td>Whether to cache results; enabling may improve performance.  <em>Since Ant
+      1.8.1</em></td>
+    <td>No; default <q>false</q></td>
+  </tr>
+  <tr>
+    <td>enablemultiplemappings</td>
+    <td>If <q>true</q> the collection will use all the mappings for a given source
+      path. If <q>false</q> it will only process the first resource.
+      <em>since Ant 1.8.1</em></td>
+    <td>No; defaults to <q>false</q></td>
+  </tr>
+</table>
 
-  <h4>Parameters specified as nested elements</h4>
-  <p>A single resource collection is required.</p>
-  <p>A single <a href="mapper.html">mapper</a> can be used to map
-    names.  If no mapper has been given (which doesn't make any sense,
-    honestly), an identity mapper will be used.</p>
-
-  <h4>Examples</h4>
-
-  <p>Copies all files from a given directory to a target directory
-    adding ".bak" as an extension.  Note this could be done with a
-    <em>mapper</em> nested into <em>copy</em> directly as well.</p>
+<h5>Parameters specified as nested elements</h5>
+<p>A single resource collection is required.</p>
+<p>A single <a href="mapper.html">mapper</a> can be used to map names.  If no mapper has been
+given (which doesn't make any sense, honestly), an identity mapper will be used.</p>
 
-  <pre>
-    &lt;copy todir="${target}"&gt;
-      &lt;mappedresources&gt;
-        &lt;fileset dir="${src}"/&gt;
-        &lt;globmapper from="*" to="*.bak"/&gt;
-      &lt;/mappedresources&gt;
-    &lt;/copy&gt;
-  </pre>
-
-  <p>Creates a WAR archive adding all CLASSPATH entries that are files
-    to the <code>WEB-INF/lib</code> directory without keeping their
-    files-system structure.</p>
+<h5>Examples</h5>
 
-  <pre>
-    &lt;war destfile="${output}"&gt;
-      &lt;mappedresources&gt;
-        &lt;restrict&gt;
-          &lt;path path="${java.class.path}"/&gt;
-          &lt;type type="file"/&gt;
-        &lt;/restrict&gt;
-        &lt;chainedmapper&gt;
-          &lt;flattenmapper/&gt;
-          &lt;globmapper from="*" to="WEB-INF/lib/*"/&gt;
-        &lt;/chainedmapper&gt;
-      &lt;/mappedresources&gt;
-    &lt;/war&gt;
-  </pre>    
-</blockquote>
+<p>Copies all files from a given directory to a target directory adding <samp>.bak</samp> as an
+extension.  Note this could be done with a <code>mapper</code> nested into <code>copy</code>
+directly as well.</p>
+
+<pre>
+&lt;copy todir="${target}"&gt;
+  &lt;mappedresources&gt;
+    &lt;fileset dir="${src}"/&gt;
+    &lt;globmapper from="*" to="*.bak"/&gt;
+  &lt;/mappedresources&gt;
+&lt;/copy&gt;</pre>
 
-<h4><a name="archives">archives</a></h4>
+<p>Creates a WAR archive adding all <code>CLASSPATH</code> entries that are files to
+the <samp>WEB-INF/lib</samp> directory without keeping their files-system structure.</p>
+
+<pre>
+&lt;war destfile="${output}"&gt;
+  &lt;mappedresources&gt;
+    &lt;restrict&gt;
+      &lt;path path="${java.class.path}"/&gt;
+      &lt;type type="file"/&gt;
+    &lt;/restrict&gt;
+    &lt;chainedmapper&gt;
+      &lt;flattenmapper/&gt;
+      &lt;globmapper from="*" to="WEB-INF/lib/*"/&gt;
+    &lt;/chainedmapper&gt;
+  &lt;/mappedresources&gt;
+&lt;/war&gt;</pre>
+
+<h4 id="archives">archives</h4>
 
 <p><em>Since Ant 1.8.0</em></p>
 
-<p>This resource collection accepts an arbitrary number of nested
-  resources and assumes that all those resources must be either ZIP or
-  TAR archives.  The resources returned
-  by <code>&lt;archives&gt;</code> are the contents of the nested
-  archives.</p>
+<p>This resource collection accepts an arbitrary number of nested resources and assumes that all
+those resources must be either ZIP or TAR archives.  The resources returned
+by <code>&lt;archives&gt;</code> are the contents of the nested archives.</p>
 
 <p>This resource collection is a generalization
-  of <a href="../Tasks/zip.html#zipgroupfileset">zipgroupfileset</a>
-  which is only supported by the zip family of tasks.</p>
+of <a href="../Tasks/zip.html#zipgroupfileset">zipgroupfileset</a> which is only supported by
+the zip family of tasks.</p>
 
-<p><em>archives</em> doesn't support any attributes.</p>
+<p><code>archives</code> doesn't support any attributes.</p>
 
-<blockquote>
-  <h4>Parameters specified as nested elements</h4>
+<h5>Parameters specified as nested elements</h5>
 
-  <p><code>&lt;archives&gt;</code> has two nested
-    elements <code>&lt;zips&gt;</code> and
-    <code>&lt;tars&gt;</code> that are <a href="#union">unions</a>
-    themselves, i.e. they accept arbitrary many resource(collection)s
-    as nested elements.</p>
+<p><code>&lt;archives&gt;</code> has two nested elements <code>&lt;zips&gt;</code>
+and <code>&lt;tars&gt;</code> that are <a href="#union">unions</a> themselves, i.e. they accept
+arbitrary many resource(collection)s as nested elements.</p>
 
-  <p>The nested resources of &lt;zips&gt; are treated as ZIP archives,
-    the nested resources of &lt;tars&gt; as TAR archives.</p>
+<p>The nested resources of <code>&lt;zips&gt;</code> are treated as ZIP archives, the nested
+resources of <code>&lt;tars&gt;</code> as TAR archives.</p>
 
-  <h4>Examples</h4>
+<h5>Examples</h5>
 
-  <p>Copies all files from all jars that are on the classpath
-    to <code>${target}</code>.</p>
+<p>Copies all files from all jars that are on the classpath to <samp>${target}</samp>.</p>
 
-  <pre>
-    &lt;copy todir="${target}"&gt;
-      &lt;archives&gt;
-        &lt;zips&gt;
-          &lt;restrict&gt;
-            &lt;path path="${java.class.path}"/&gt;
-            &lt;name name="*.jar"/&gt;
-          &lt;/restrict&gt;
-        &lt;/zips&gt;
-      &lt;/archives&gt;
-    &lt;/copy&gt;
-  </pre>
-</blockquote>
+<pre>
+&lt;copy todir="${target}"&gt;
+  &lt;archives&gt;
+    &lt;zips&gt;
+      &lt;restrict&gt;
+        &lt;path path="${java.class.path}"/&gt;
+        &lt;name name="*.jar"/&gt;
+      &lt;/restrict&gt;
+    &lt;/zips&gt;
+  &lt;/archives&gt;
+&lt;/copy&gt;</pre>
 
-<h4><a name="resourcelist">resourcelist</a></h4>
+<h4 id="resourcelist">resourcelist</h4>
 
 <p><em>Since Ant 1.8.0</em></p>
 
-<p>This resource collection accepts an arbitrary number of nested
-  resources, reads those resources and returns a resource for each
-  line read.</p>
-
-<p>If the line contains a colon, Ant will try to use it as an URL and
-  if that fails (or the line doesn't contain a colon) will return a
-  file resource with the line's content as its name.</p>
-
-<p>Properties will be expanded for each line.  If the property
-  expansion yields a resource object rather than a string (for example
-  because of custom property helpers), the resources will be returned
-  directly.</p>
+<p>This resource collection accepts an arbitrary number of nested resources, reads those
+resources and returns a resource for each line read.</p>
+
+<p>If the line contains a colon, Ant will try to use it as an URL and if that fails (or the line
+doesn't contain a colon) will return a file resource with the line's content as its name.</p>
+
+<p>Properties will be expanded for each line.  If the property expansion yields a resource
+object rather than a string (for example because of custom property helpers), the resources will
+be returned directly.</p>
 
 <p><code>&lt;resourcelist&gt;</code> is a generalization
-  of <a href="filelist.html"><code>&lt;filelist&gt;</code></a>.</p>
+of <a href="filelist.html"><code>&lt;filelist&gt;</code></a>.</p>
 
-<blockquote>
-  <table border="1" cellpadding="2" cellspacing="0">
-    <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td align="center" valign="top"><b>Required</b></td>
-    </tr>
-    <tr>
-      <td valign="top">encoding</td>
-      <td valign="top">The encoding of the nested resources</td>
-      <td valign="top" align="center">No, default is platform default</td>
-    </tr>
-  </table>
-</blockquote>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>encoding</td>
+    <td>The encoding of the nested resources</td>
+    <td>No; default is default JVM character encoding</td>
+  </tr>
+</table>
 
-<blockquote>
-  <h4>Parameters specified as nested elements</h4>
+<h5>Parameters specified as nested elements</h5>
 
-  <p><code>&lt;resourcelist&gt;</code> accepts arbitrary many
-    resource(collection)s as nested elements.</p>
+<p><code>&lt;resourcelist&gt;</code> accepts arbitrary many resource(collection)s as nested
+elements.</p>
 
-  <p>In addition <code>&lt;resourcelist&gt;</code> supports
-    nested <code>&lt;filterchain&gt;</code> elements that can be used
-    to filter/modify the read resources before their lines get
-    expanded.  Such a nested element corresponds to
-    a <a href="filterchain.html">filterchain</a>.</p>
+<p>In addition <code>&lt;resourcelist&gt;</code> supports
+nested <code>&lt;filterchain&gt;</code> elements that can be used to filter/modify the read
+resources before their lines get expanded.  Such a nested element corresponds to
+a <a href="filterchain.html">filterchain</a>.</p>
 
-  <h4>Examples</h4>
+<h5>Examples</h5>
 
-  <p>The following example copies a file from the first URL of
-    several alternatives that can actually be reached.  It assumes
-    that the file mirrors.txt looks like</p>
+<p>The following example copies a file from the first URL of several alternatives that can
+actually be reached.  It assumes that the file <samp>mirrors.txt</samp> looks like</p>
 
-  <pre>
+<pre>
     mirrors.txt:
 http://best.mirror.example.org/
 http://second.best.mirror.example.org/mirror/of/best/
 https://yet.another.mirror/
-http://the.original.site/
-  </pre>
-    
-  <pre>
-    &lt;copy todir="${target}"&gt;
-      &lt;first&gt;
-        &lt;restrict&gt;
-          &lt;resourcelist&gt;
-            &lt;file file="mirrors.txt"/&gt;
-          &lt;/resourcelist&gt;
-          &lt;exists/&gt;
-        &lt;/restrict&gt;
-      &lt;/first&gt;
-    &lt;/copy&gt;
-  </pre>
-</blockquote>
+http://the.original.site/</pre>
+
+<pre>
+&lt;copy todir="${target}"&gt;
+  &lt;first&gt;
+    &lt;restrict&gt;
+      &lt;resourcelist&gt;
+        &lt;file file="mirrors.txt"/&gt;
+      &lt;/resourcelist&gt;
+      &lt;exists/&gt;
+    &lt;/restrict&gt;
+  &lt;/first&gt;
+&lt;/copy&gt;</pre>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Types/selectors.html ant-1.10.3/manual/Types/selectors.html
--- ant-1.9.10/manual/Types/selectors.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/selectors.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,1193 +24,1070 @@
   <body>
     <h2>Selectors</h2>
 
-    <p>Selectors are a mechanism whereby the files that make up a
-    <code>&lt;fileset&gt;</code> can be selected based on criteria
-    other than filename as provided by the <code>&lt;include&gt;</code>
-    and <code>&lt;exclude&gt;</code> tags.</p>
+    <p>Selectors are a mechanism whereby the files that make up a <code>&lt;fileset&gt;</code> can
+    be selected based on criteria other than filename as provided by
+    the <code>&lt;include&gt;</code> and <code>&lt;exclude&gt;</code> tags.</p>
 
     <h3>How to use a Selector</h3>
 
-    <p>A selector is an element of FileSet, and appears within it. It can
-    also be defined outside of any target by using the <code>&lt;selector&gt;</code> tag
-    and then using it as a reference.
-    </p>
-
-    <p>Different selectors have different attributes. Some selectors can
-    contain other selectors, and these are called
-    <a href="#selectcontainers"><code>Selector Containers</code></a>.
-    There is also a category of selectors that allow
-    user-defined extensions, called
-    <a href="#customselect"><code>Custom Selectors</code></a>.
-    The ones built in to Apache Ant are called
-    <a href="#coreselect"><code>Core Selectors</code></a>.
-    </p>
-
-    <h3><a name="coreselect">Core Selectors</a></h3>
-
-    <p>Core selectors are the ones that come standard
-    with Ant. They can be used within a fileset and can be contained
-    within Selector Containers.</p>
+    <p>A selector is an element of FileSet, and appears within it. It can also be defined outside of
+    any target by using the <code>&lt;selector&gt;</code> tag and then using it as a reference.</p>
+
+    <p>Different selectors have different attributes. Some selectors can contain other selectors,
+    and these are called <a href="#selectcontainers"><q>Selector Containers</q></a>.  There is also
+    a category of selectors that allow user-defined extensions,
+    called <a href="#customselect"><q>Custom Selectors</q></a>.  The ones built in to Apache Ant are
+    called <a href="#coreselect"><q>Core Selectors</q></a>.</p>
+
+    <h3 id="coreselect">Core Selectors</h3>
+
+    <p>Core selectors are the ones that come standard with Ant. They can be used within a
+    fileset and can be contained within Selector Containers.</p>
 
     <p>The core selectors are:</p>
 
     <ul>
-      <li><a href="#containsselect"><code>&lt;contains&gt;</code></a> - Select
-        files that contain a particular text string</li>
-      <li><a href="#dateselect"><code>&lt;date&gt;</code></a> - Select files
-        that have been modified either before or after a particular date
-        and time</li>
-      <li><a href="#dependselect"><code>&lt;depend&gt;</code></a> - Select files
-        that have been modified more recently than equivalent files
-        elsewhere</li>
-      <li><a href="#depthselect"><code>&lt;depth&gt;</code></a> - Select files
-        that appear so many directories down in a directory tree</li>
-      <li><a href="#differentselect"><code>&lt;different&gt;</code></a> - Select files
-        that are different from those elsewhere</li>
-      <li><a href="#filenameselect"><code>&lt;filename&gt;</code></a> - Select
-        files whose name matches a particular pattern. Equivalent to
-        the include and exclude elements of a patternset.</li>
-      <li><a href="#presentselect"><code>&lt;present&gt;</code></a> - Select
-        files that either do or do not exist in some other location</li>
-      <li><a href="#regexpselect"><code>&lt;containsregexp&gt;</code></a> - Select
-        files that match a regular expression</li>
-      <li><a href="#sizeselect"><code>&lt;size&gt;</code></a> - Select files
-        that are larger or smaller than a particular number of bytes.</li>
-      <li><a href="#typeselect"><code>&lt;type&gt;</code></a> - Select files
-        that are either regular files or directories.</li>
-      <li><a href="#modified"><code>&lt;modified&gt;</code></a> - Select files if
-        the return value of the configured algorithm is different from that
-        stored in a cache.</li>
-      <li><a href="#signedselector"><code>&lt;signedselector&gt;</code></a> - Select files if
-        they are signed, and optionally if they have a signature of a certain name.
-      </li>
-      <li><a href="#scriptselector"><code>&lt;scriptselector&gt;</code></a> - 
-        Use a BSF or JSR 223 scripting language to create
-        your own selector
-      </li>
-      <li><a href="#readable"><code>&lt;readable&gt;</code></a> -
-        Select files if they are readable.</li>
-      <li><a href="#writable"><code>&lt;writable&gt;</code></a> -
-        Select files if they are writable.</li>
+      <li><a href="#containsselect"><code>&lt;contains&gt;</code></a>&mdash;Select files that
+        contain a particular text string</li>
+      <li><a href="#dateselect"><code>&lt;date&gt;</code></a>&mdash;Select files that have been
+        modified either before or after a particular date and time</li>
+      <li><a href="#dependselect"><code>&lt;depend&gt;</code></a>&mdash;Select files that have been
+        modified more recently than equivalent files elsewhere</li>
+      <li><a href="#depthselect"><code>&lt;depth&gt;</code></a>&mdash;Select files that appear so
+        many directories down in a directory tree</li>
+      <li><a href="#differentselect"><code>&lt;different&gt;</code></a>&mdash;Select files that are
+        different from those elsewhere</li>
+      <li><a href="#filenameselect"><code>&lt;filename&gt;</code></a>&mdash;Select files whose name
+        matches a particular pattern. Equivalent to the include and exclude elements of a
+        patternset.</li>
+      <li><a href="#presentselect"><code>&lt;present&gt;</code></a>&mdash;Select files that either
+        do or do not exist in some other location</li>
+      <li><a href="#regexpselect"><code>&lt;containsregexp&gt;</code></a>&mdash;Select files that
+        match a regular expression</li>
+      <li><a href="#sizeselect"><code>&lt;size&gt;</code></a>&mdash;Select files that are larger or
+        smaller than a particular number of bytes.</li>
+      <li><a href="#typeselect"><code>&lt;type&gt;</code></a>&mdash;Select files that are either
+        regular files or directories.</li>
+      <li><a href="#modified"><code>&lt;modified&gt;</code></a>&mdash;Select files if the return
+        value of the configured algorithm is different from that stored in a cache.</li>
+      <li><a href="#signedselector"><code>&lt;signedselector&gt;</code></a>&mdash;Select files if
+        they are signed, and optionally if they have a signature of a certain name.</li>
+      <li><a href="#scriptselector"><code>&lt;scriptselector&gt;</code></a>&mdash;Use a BSF or JSR
+        223 scripting language to create your own selector</li>
+      <li><a href="#readable"><code>&lt;readable&gt;</code></a>&mdash;Select files if they are
+        readable.</li>
+      <li><a href="#writable"><code>&lt;writable&gt;</code></a>&mdash;Select files if they are
+        writable.</li>
+      <li><a href="#executable"><code>&lt;executable&gt;</code></a>&mdash;Select files if they
+        are executable.</li>
+      <li><a href="#symlink"><code>&lt;symlink&gt;</code></a>&mdash;Select files if they are
+        symlinks.</li>
+      <li><a href="#ownedBy"><code>&lt;ownedBy&gt;</code></a>&mdash;Select files if they are owned
+        by a given user.</li>
     </ul>
 
-    <h4><a name="containsselect">Contains Selector</a></h4>
+    <h4 id="containsselect">Contains Selector</h4>
 
-    <p>The <code>&lt;contains&gt;</code> tag in a FileSet limits
-    the files defined by that fileset to only those which contain the
-    string specified by the <code>text</code> attribute.
-    .</p>
-    <p>The <code>&lt;contains&gt;</code> selector can be used as a
-      ResourceSelector (see the
-      <a href="resources.html#restrict">&lt;restrict&gt;</a>
-      ResourceCollection).</p>
-
-    <table border="1" cellpadding="2" cellspacing="0">
-      <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
+    <p>The <code>&lt;contains&gt;</code> tag in a FileSet limits the files defined by that fileset
+    to only those which contain the string specified by the <code>text</code> attribute.</p>
+    <p>The <code>&lt;contains&gt;</code> selector can be used as a ResourceSelector (see
+    the <a href="resources.html#restrict">&lt;restrict&gt;</a> ResourceCollection).</p>
+
+    <table class="attr">
+      <tr>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
       <tr>
-        <td valign="top">text</td>
-        <td valign="top">Specifies the text that every file must contain
+        <td>text</td>
+        <td>Specifies the text that every file must contain
         </td>
-        <td valign="top" align="center">Yes</td>
+        <td>Yes</td>
       </tr>
       <tr>
-        <td valign="top">casesensitive</td>
-        <td valign="top">Whether to pay attention to case when looking
-          for the string in the <code>text</code> attribute. Default is
-          true.
-        </td>
-        <td valign="top" align="center">No</td>
+        <td>casesensitive</td>
+        <td>Whether to pay attention to case when looking for the string in the <var>text</var>
+          attribute.</td>
+        <td>No; default is <q>true</q></td>
+      </tr>
+      <tr>
+        <td>ignorewhitespace</td>
+        <td>Whether to eliminate whitespace before checking for the string in the <var>text</var>
+          attribute.</td>
+        <td>No; default is <q>false</q></td>
       </tr>
       <tr>
-        <td valign="top">ignorewhitespace</td>
-        <td valign="top">Whether to eliminate whitespace before checking
-          for the string in the <code>text</code> attribute. Default is
-          false.
+        <td>encoding</td>
+        <td>Encoding of the resources being selected.
+          <em>Since Ant 1.9.0</em>
         </td>
-        <td valign="top" align="center">No</td>
+        <td>No; defaults to default JVM character encoding</td>
       </tr>
-        <tr>
-            <td valign="top">encoding</td>
-            <td valign="top">Encoding of the resources being selected.
-                Required in practice if the encoding of the files being
-                selected is different from the default encoding of the JVM
-                where Ant is running.
-                Since Ant 1.9.0
-            </td>
-            <td valign="top" align="center">No</td>
-        </tr>
     </table>
 
     <p>Here is an example of how to use the Contains Selector:</p>
 
-    <blockquote><pre>
+    <pre>
 &lt;fileset dir=&quot;${doc.path}&quot; includes=&quot;**/*.html&quot;&gt;
     &lt;contains text=&quot;script&quot; casesensitive=&quot;no&quot;/&gt;
-&lt;/fileset&gt;
-</pre></blockquote>
+&lt;/fileset&gt;</pre>
 
-    <p>Selects all the HTML files that contain the string
-    <code>script</code>.</p>
+    <p>Selects all the HTML files that contain the string <code>script</code>.</p>
 
+    <h4 id="dateselect">Date Selector</h4>
 
-    <h4><a name="dateselect">Date Selector</a></h4>
+    <p>The <code>&lt;date&gt;</code> tag in a FileSet will put a limit on the files specified by the
+    include tag, so that tags whose last modified date does not meet the date limits specified by
+    the selector will not end up being selected.</p>
 
-    <p>The <code>&lt;date&gt;</code> tag in a FileSet will put
-    a limit on the files specified by the include tag, so that tags
-    whose last modified date does not meet the date limits specified
-    by the selector will not end up being selected.</p>
-
-    <table border="1" cellpadding="2" cellspacing="0">
+    <table class="attr">
       <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
       <tr>
-        <td valign="top">datetime</td>
-        <td valign="top">Specifies the date and time to test for.
-          Should be in the format "MM/dd/yyyy hh:mm a" using the US
-          locale, or an alternative pattern specified via
-          the <i>pattern</i> attribute.
-        </td>
-        <td valign="top" align="center" rowspan="2">At least one of the two.</td>
-      </tr>
-      <tr>
-        <td valign="top">millis</td>
-        <td valign="top">The number of milliseconds since 1970 that should
-          be tested for. It is usually much easier to use the datetime
+        <td>datetime</td>
+        <td>Specifies the date and time to test for.  Should be in the format <q>MM/dd/yyyy hh:mm
+          a</q> using the US locale, or an alternative pattern specified via the <var>pattern</var>
           attribute.
         </td>
+        <td rowspan="2">At least one of the two</td>
       </tr>
       <tr>
-        <td valign="top">when</td>
-        <td valign="top">Indicates how to interpret the date, whether
-          the files to be selected are those whose last modified times should
-          be before, after, or equal to the specified value. Acceptable
-          values for this attribute are:
-          <ul>
-            <li>before - select files whose last modified date is before the indicated date
-            <li>after - select files whose last modified date is after the indicated date
-            <li>equal - select files  whose last modified date is this exact date
-          </ul>
-          The default is equal.
-        <td valign="top" align="center">No</td>
-      </tr>
-      <tr>
-        <td valign="top">granularity</td>
-        <td valign="top">The number of milliseconds leeway to use when
-          comparing file modification times. This is needed because not every
-          file system supports tracking the last modified time to the
-          millisecond level. Default is 0 milliseconds, or 2 seconds on DOS systems.
-        </td>
-        <td valign="top" align="center">No</td>
-      </tr>
-      <tr>
-        <td valign="top">pattern</td>
-        <td valign="top">The <CODE>SimpleDateFormat</CODE>-compatible pattern
-          to use when interpreting the <i>datetime</i> attribute using
-          the current locale.
-          <i>Since Ant 1.6.2</i>
+        <td>millis</td>
+        <td class="left">The number of milliseconds since 1970 that should be tested for. It is
+          usually much easier to use the <var>datetime</var> attribute.
         </td>
-        <td valign="top" align="center">No</td>
       </tr>
       <tr>
-        <td valign="top">checkdirs</td>
-        <td valign="top">
-          Indicates whether or not to check dates on directories.
-        </td>
-        <td valign="top" align="center">No, defaults to <i>false</i></td>
+        <td>when</td>
+        <td>Indicates how to interpret the date, whether the files to be selected are those
+          whose last modified times should be before, after, or equal to the specified
+          value. Acceptable values for this attribute are:
+          <ul>
+            <li><q>before</q>&mdash;select files whose last modified date is before the indicated
+              date</li>
+            <li><q>after</q>&mdash;select files whose last modified date is after the indicated
+              date</li>
+            <li><q>equal</q>&mdash;select files whose last modified date is this exact date</li>
+          </ul></td>
+        <td>No; default is <q>equal</q></td>
+      </tr>
+      <tr>
+        <td>granularity</td>
+        <td>The number of milliseconds leeway to use when comparing file modification times. This is
+          needed because not every file system supports tracking the last modified time to the
+          millisecond level.</td>
+        <td>No; default is 0 milliseconds, or 2 seconds on DOS systems</td>
+      </tr>
+      <tr>
+        <td>pattern</td>
+        <td>The <code>SimpleDateFormat</code>-compatible pattern to use when interpreting
+          the <var>datetime</var> attribute using the current locale.
+          <em>Since Ant 1.6.2</em></td>
+        <td>No</td>
+      </tr>
+      <tr>
+        <td>checkdirs</td>
+        <td>Indicates whether or not to check dates on directories.</td>
+        <td>No; defaults to <q>false</q></td>
       </tr>
     </table>
 
     <p>Here is an example of how to use the Date Selector:</p>
 
-    <blockquote><pre>
+    <pre>
 &lt;fileset dir=&quot;${jar.path}&quot; includes=&quot;**/*.jar&quot;&gt;
     &lt;date datetime=&quot;01/01/2001 12:00 AM&quot; when=&quot;before&quot;/&gt;
-&lt;/fileset&gt;
-</pre></blockquote>
-
-    <p>Selects all JAR files which were last modified before midnight
-    January 1, 2001.</p>
+&lt;/fileset&gt;</pre>
 
+    <p>Selects all JAR files which were last modified before midnight January 1, 2001.</p>
 
-    <h4><a name="dependselect">Depend Selector</a></h4>
+    <h4 id="dependselect">Depend Selector</h4>
 
-    <p>The <code>&lt;depend&gt;</code> tag selects files
-    whose last modified date is later than another, equivalent file in
-    another location.</p>
+    <p>The <code>&lt;depend&gt;</code> tag selects files whose last modified date is later than
+    another, equivalent file in another location.</p>
 
     <p>The <code>&lt;depend&gt;</code> tag supports the use of a
-    contained <a href="mapper.html"><code>&lt;mapper&gt;</code></a> element
-    to define the location of the file to be compared against. If no
-    <code>&lt;mapper&gt;</code> element is specified, the
-    <code>identity</code> type mapper is used.</p>
+    contained <a href="mapper.html"><code>&lt;mapper&gt;</code></a> element to define the location
+    of the file to be compared against. If no <code>&lt;mapper&gt;</code> element is specified,
+    the <code>identity</code> type mapper is used.</p>
 
     <p>The <code>&lt;depend&gt;</code> selector is case-sensitive.</p>
 
-    <table border="1" cellpadding="2" cellspacing="0">
+    <table class="attr">
       <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
       <tr>
-        <td valign="top">targetdir</td>
-        <td valign="top">The base directory to look for the files to compare
-          against. The precise location depends on a combination of this
-          attribute and the <code>&lt;mapper&gt;</code> element, if any.
-        </td>
-        <td valign="top" align="center">Yes</td>
+        <td>targetdir</td>
+        <td>The base directory to look for the files to compare against. The precise location
+          depends on a combination of this attribute and the <code>&lt;mapper&gt;</code> element, if
+          any.</td>
+        <td>Yes</td>
       </tr>
       <tr>
-        <td valign="top">granularity</td>
-        <td valign="top">The number of milliseconds leeway to give before
-          deciding a file is out of date. This is needed because not every
-          file system supports tracking the last modified time to the
-          millisecond level. Default is 0 milliseconds, or 2 seconds on DOS systems.
-        </td>
-        <td valign="top" align="center">No</td>
+        <td>granularity</td>
+        <td>The number of milliseconds leeway to give before deciding a file is out of date. This is
+          needed because not every file system supports tracking the last modified time to the
+          millisecond level.</td>
+        <td>No; default is 0 milliseconds, or 2 seconds on DOS systems</td>
       </tr>
     </table>
 
     <p>Here is an example of how to use the Depend Selector:</p>
 
-    <blockquote><pre>
+    <pre>
 &lt;fileset dir=&quot;${ant.1.5}/src/main&quot; includes=&quot;**/*.java&quot;&gt;
     &lt;depend targetdir=&quot;${ant.1.4.1}/src/main&quot;/&gt;
-&lt;/fileset&gt;
-</pre></blockquote>
+&lt;/fileset&gt;</pre>
 
-    <p>Selects all the Java source files which were modified in the
-      1.5 release.
-    </p>
+    <p>Selects all the Java source files which were modified in the 1.5 release.</p>
 
+    <h4 id="depthselect">Depth Selector</h4>
 
-    <h4><a name="depthselect">Depth Selector</a></h4>
+    <p>The <code>&lt;depth&gt;</code> tag selects files based on how many directory levels deep they
+    are in relation to the base directory of the fileset.</p>
 
-    <p>The <code>&lt;depth&gt;</code> tag selects files based on
-    how many directory levels deep they are in relation to the base
-    directory of the fileset.
-    </p>
-
-    <table border="1" cellpadding="2" cellspacing="0">
+    <table class="attr">
       <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
       <tr>
-        <td valign="top">min</td>
-        <td valign="top">The minimum number of directory levels below
-          the base directory that a file must be in order to be selected.
-          Default is no limit.
-        </td>
-        <td valign="top" align="center" rowspan="2">At least one of the two.</td>
+        <td>min</td>
+        <td>The minimum number of directory levels below the base directory that a file must be in
+          order to be selected.</td>
+        <td rowspan="2">At least one of the two; default is no limit</td>
       </tr>
       <tr>
-        <td valign="top">max</td>
-        <td valign="top">The maximum number of directory levels below
-          the base directory that a file can be and still be selected.
-          Default is no limit.
-        </td>
+        <td>max</td>
+        <td class="left">The maximum number of directory levels below the base directory that a file
+          can be and still be selected.</td>
       </tr>
     </table>
 
     <p>Here is an example of how to use the Depth Selector:</p>
 
-    <blockquote><pre>
+    <pre>
 &lt;fileset dir=&quot;${doc.path}&quot; includes=&quot;**/*&quot;&gt;
     &lt;depth max=&quot;1&quot;/&gt;
-&lt;/fileset&gt;
-</pre></blockquote>
+&lt;/fileset&gt;</pre>
 
-    <p>Selects all files in the base directory and one directory below
-    that.</p>
+    <p>Selects all files in the base directory and one directory below that.</p>
 
-    
-    <h4><a name="differentselect">Different Selector</a></h4>
+    <h4 id="differentselect">Different Selector</h4>
 
-    <p>The <code>&lt;different&gt;</code> selector will select a file
-    if it is deemed to be 'different' from an equivalent file in
-    another location. The rules for determining difference between
-    the two files are as follows:
+    <p>The <code>&lt;different&gt;</code> selector will select a file if it is deemed to be
+    'different' from an equivalent file in another location. The rules for determining difference
+    between the two files are as follows:<p>
     <ol>
-    <li>If a file is only present in the resource collection you apply
-      the selector to but not in targetdir (or after applying the
-      mapper) the file is selected.
-    <li>If a file is only present in targetdir (or after applying the
-      mapper) it is ignored.
-    <li> Files with different lengths are different.
-    <li> If <tt>ignoreFileTimes</tt> is turned off, then differing file
-    timestamps will cause files to be regarded as different.
-    <li> Unless <tt>ignoreContents</tt> is set to true,
-         a byte-for-byte check is run against the two files.
+    <li>If a file is only present in the resource collection you apply the selector to but not
+      in <var>targetdir</var> (or after applying the mapper) the file is selected.</li>
+    <li>If a file is only present in <var>targetdir</var> (or after applying the mapper) it is
+      ignored.</li>
+    <li>Files with different lengths are different.</li>
+    <li>If <var>ignoreFileTimes</var> is turned <q>off</q>, then differing file timestamps will
+      cause files to be regarded as different.</li>
+    <li>Unless <var>ignoreContents</var> is set to <q>true</q>, a byte-for-byte check is run against
+      the two files.</li>
     </ol>
+    <p>This is a useful selector to work with programs and tasks that don't handle dependency
+    checking properly; even if a predecessor task always creates its output files, followup tasks
+    can be driven off copies made with a different selector, so their dependencies are driven on the
+    absolute state of the files, not just a timestamp. For example: anything fetched from a web
+    site, or the output of some program. To reduce the amount of checking, when using this task
+    inside a <code>&lt;copy&gt;</code> task, set <var>preservelastmodified</var> to <q>true</q> to
+    propagate the timestamp from the source file to the destination file.</p>
 
-    This is a useful selector to work with programs and tasks that don't handle
-    dependency checking properly; even if a predecessor task always creates its
-    output files, followup tasks can be driven off copies made with a different
-    selector, so their dependencies are driven on the absolute state of the
-    files, not just a timestamp. For example: anything fetched from a web site,
-    or the output of some program. To reduce the amount of checking, when using
-    this task inside a <code>&lt;copy&gt;</code> task, set
-    <tt>preservelastmodified</tt> to <i>true</i> to propagate the timestamp
-    from the source file to the destination file.<p>
-
-    The <code>&lt;different&gt;</code> selector supports the use of a
-    contained <a href="mapper.html"><code>&lt;mapper&gt;</code></a> element
-    to define the location of the file to be compared against. If no
-    <code>&lt;mapper&gt;</code> element is specified, the
-    <code>identity</code> type mapper is used.</p>
-
-    <table border="1" cellpadding="2" cellspacing="0">
-      <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
-      </tr>
-      <tr>
-        <td valign="top">targetdir</td>
-        <td valign="top">The base directory to look for the files to compare
-          against. The precise location depends on a combination of this
-          attribute and the <code>&lt;mapper&gt;</code> element, if any.
-        </td>
-        <td valign="top" align="center">Yes</td>
+    <p>The <code>&lt;different&gt;</code> selector supports the use of a
+    contained <a href="mapper.html"><code>&lt;mapper&gt;</code></a> element to define the location
+    of the file to be compared against. If no <code>&lt;mapper&gt;</code> element is specified,
+    the <code>identity</code> type mapper is used.</p>
+
+    <table class="attr">
+      <tr>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
       <tr>
-        <td valign="top">ignoreFileTimes</td>
-        <td valign="top">Whether to use file times in the comparison or not.
-          Default is true (time differences are ignored).
-        </td>
-        <td valign="top" align="center">No</td>
+        <td>targetdir</td>
+        <td>The base directory to look for the files to compare against. The precise location
+          depends on a combination of this attribute and the <code>&lt;mapper&gt;</code> element, if
+          any.</td>
+        <td>Yes</td>
       </tr>
       <tr>
-        <td valign="top">ignoreContents</td>
-        <td valign="top">Whether to do a byte per byte compare.
-          Default is false (contents are compared).
-          Since Ant 1.6.3
-        </td>
-        <td valign="top" align="center">No</td>
+        <td>ignoreFileTimes</td>
+        <td>Whether to use file times in the comparison or not.</td>
+        <td>No; default is <q>true</q> (time differences are ignored)</td>
       </tr>
       <tr>
-        <td valign="top">granularity</td>
-        <td valign="top">The number of milliseconds leeway to give before
-          deciding a file is out of date. This is needed because not every
-          file system supports tracking the last modified time to the
-          millisecond level. Default is 0 milliseconds, or 2 seconds on DOS systems.
-        </td>
-        <td valign="top" align="center">No</td>
+        <td>ignoreContents</td>
+        <td>Whether to do a byte per byte compare.
+          <em>Since Ant 1.6.3</em></td>
+        <td>No; default is <q>false</q> (contents are compared)</td>
+      </tr>
+      <tr>
+        <td>granularity</td>
+        <td>The number of milliseconds leeway to give before deciding a file is out of date. This is
+          needed because not every file system supports tracking the last modified time to the
+          millisecond level.</td>
+        <td>No; default is 0 milliseconds, or 2 seconds on DOS systems</td>
       </tr>
     </table>
 
     <p>Here is an example of how to use the Different Selector:</p>
 
-    <blockquote><pre>
+    <pre>
 &lt;fileset dir=&quot;${ant.1.5}/src/main&quot; includes=&quot;**/*.java&quot;&gt;
     &lt;different targetdir=&quot;${ant.1.4.1}/src/main&quot;
         ignoreFileTimes="true"/&gt;
-&lt;/fileset&gt;
-</pre></blockquote>
+&lt;/fileset&gt;</pre>
 
-    <p>Compares all the Java source files between the 1.4.1 and the 1.5 release
-    and selects those who are different, disregarding file times.
-    </p>
+    <p>Compares all the Java source files between the 1.4.1 and the 1.5 release and selects those
+    who are different, disregarding file times.</p>
 
-    <h4><a name="filenameselect">Filename Selector</a></h4>
+    <h4 id="filenameselect">Filename Selector</h4>
 
-    <p>The <code>&lt;filename&gt;</code> tag acts like the
-    <code>&lt;include&gt;</code> and <code>&lt;exclude&gt;</code>
-    tags within a fileset. By using a selector instead, however,
-    one can combine it with all the other selectors using whatever
-    <a href="#selectcontainers">selector container</a> is desired.
-    </p>
+    <p>The <code>&lt;filename&gt;</code> tag acts like the <code>&lt;include&gt;</code>
+    and <code>&lt;exclude&gt;</code> tags within a fileset. By using a selector instead, however,
+    one can combine it with all the other selectors using
+    whatever <a href="#selectcontainers">selector container</a> is desired.</p>
 
-    <p>The <code>&lt;filename&gt;</code> selector is
-    case-sensitive.</p>
+    <p>The <code>&lt;filename&gt;</code> selector is case-sensitive.</p>
 
-    <table border="1" cellpadding="2" cellspacing="0">
+    <table class="attr">
       <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
       <tr>
-        <td valign="top">name</td>
-        <td valign="top">The name of files to select. The name parameter
-          can contain the standard Ant wildcard characters.
-        </td>
-        <td valign="top" align="center" rowspan="2">Exactly one of
-          the two</td>
+        <td>name</td>
+        <td>The name of files to select. The name parameter can contain the standard Ant wildcard
+          characters.</td>
+        <td rowspan="2">Exactly one of the two</td>
       </tr>
       <tr>
-        <td valign="top">regex</td>
-        <td valign="top">The regular expression matching files to select.</td>
+        <td>regex</td>
+        <td class="left">The regular expression matching files to select.</td>
       </tr>
       <tr>
-        <td valign="top">casesensitive</td>
-        <td valign="top">Whether to pay attention to case when looking
-          at file names. Default is "true".
-        </td>
-        <td valign="top" align="center">No</td>
+        <td>casesensitive</td>
+        <td>Whether to pay attention to case when looking at file names.</td>
+        <td>No; default is <q>true</q></td>
       </tr>
       <tr>
-        <td valign="top">negate</td>
-        <td valign="top">Whether to reverse the effects of this filename
-          selection, therefore emulating an exclude rather than include
-          tag. Default is "false".
-        </td>
-        <td valign="top" align="center">No</td>
+        <td>negate</td>
+        <td>Whether to reverse the effects of this filename selection, therefore emulating
+          an <code>exclude</code> rather than <code>include</code> tag.</td>
+        <td>No; default is <q>false</q></td>
       </tr>
     </table>
 
     <p>Here is an example of how to use the Filename Selector:</p>
 
-    <blockquote><pre>
+    <pre>
 &lt;fileset dir=&quot;${doc.path}&quot; includes=&quot;**/*&quot;&gt;
     &lt;filename name=&quot;**/*.css&quot;/&gt;
-&lt;/fileset&gt;
-</pre></blockquote>
+&lt;/fileset&gt;</pre>
 
     <p>Selects all the cascading style sheet files.</p>
 
+    <h4 id="presentselect">Present Selector</h4>
 
-    <h4><a name="presentselect">Present Selector</a></h4>
-
-    <p>The <code>&lt;present&gt;</code> tag selects files
-    that have an equivalent file in another directory tree.</p>
+    <p>The <code>&lt;present&gt;</code> tag selects files that have an equivalent file in
+    another directory tree.</p>
 
     <p>The <code>&lt;present&gt;</code> tag supports the use of a
-    contained <a href="mapper.html"><code>&lt;mapper&gt;</code></a> element
-    to define the location of the file to be tested against. If no
-    <code>&lt;mapper&gt;</code> element is specified, the
-    <code>identity</code> type mapper is used.</p>
+    contained <a href="mapper.html"><code>&lt;mapper&gt;</code></a> element to define the location
+    of the file to be tested against. If no <code>&lt;mapper&gt;</code> element is specified,
+    the <code>identity</code> type mapper is used.</p>
 
     <p>The <code>&lt;present&gt;</code> selector is case-sensitive.</p>
 
-    <table border="1" cellpadding="2" cellspacing="0">
+    <table class="attr">
       <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
       <tr>
-        <td valign="top">targetdir</td>
-        <td valign="top">The base directory to look for the files to compare
-          against. The precise location depends on a combination of this
-          attribute and the <code>&lt;mapper&gt;</code> element, if any.
-        </td>
-        <td valign="top" align="center">Yes</td>
+        <td>targetdir</td>
+        <td>The base directory to look for the files to compare against. The precise location
+          depends on a combination of this attribute and the <code>&lt;mapper&gt;</code> element, if
+          any.</td>
+        <td>Yes</td>
       </tr>
       <tr>
-        <td valign="top">present</td>
-        <td valign="top">Whether we are requiring that a file is present in
-          the src directory tree only, or in both the src and the target
-          directory tree. Valid values are:
+        <td>present</td>
+        <td>Whether we are requiring that a file is present in the source directory tree only, or in
+          both the source and the target directory tree. Valid values are:
           <ul>
-            <li>srconly - select files only if they are in the src
-              directory tree but not in the target directory tree
-            <li>both - select files only if they are present both in the
-              src and target directory trees
+            <li><q>srconly</q>&mdash;select files only if they are in the source directory tree but
+              not in the target directory tree</li>
+            <li><q>both</q >-- select files only if they are present both in the source and target
+              directory trees</li>
           </ul>
-          Default is both. Setting this attribute to &quot;srconly&quot;
-          is equivalent to wrapping the selector in the <code>&lt;not&gt;</code>
-          selector container.
-        </td>
-        <td valign="top" align="center">No</td>
+          Setting this attribute to <q>srconly</q> is equivalent to wrapping the selector in
+          the <code>&lt;not&gt;</code> selector container.</td>
+        <td>No; default is <q>both</q></td>
       </tr>
     </table>
 
     <p>Here is an example of how to use the Present Selector:</p>
 
-    <blockquote><pre>
+    <pre>
 &lt;fileset dir=&quot;${ant.1.5}/src/main&quot; includes=&quot;**/*.java&quot;&gt;
     &lt;present present=&quot;srconly&quot; targetdir=&quot;${ant.1.4.1}/src/main&quot;/&gt;
-&lt;/fileset&gt;
-</pre></blockquote>
+&lt;/fileset&gt;</pre>
 
-    <p>Selects all the Java source files which are new in the
-      1.5 release.
-    </p>
+    <p>Selects all the Java source files which are new in the 1.5 release.</p>
 
-    <h4><a name="regexpselect">Regular Expression Selector</a></h4>
+    <h4 id="regexpselect">Regular Expression Selector</h4>
 
-    <p>The <code>&lt;containsregexp&gt;</code> tag in a FileSet limits
-    the files defined by that fileset to only those which contents contain a
-    match to the regular expression specified by the <code>expression</code> attribute.
-    </p>
-    <p>The <code>&lt;containsregexp&gt;</code> selector can be used as a
-      ResourceSelector (see the
-      <a href="resources.html#restrict">&lt;restrict&gt;</a>
-      ResourceCollection).</p>
+    <p>The <code>&lt;containsregexp&gt;</code> tag in a FileSet limits the files defined by that
+    fileset to only those which contents contain a match to the regular expression specified by
+    the <code>expression</code> attribute.</p>
 
-    <table border="1" cellpadding="2" cellspacing="0">
+    <p>The <code>&lt;containsregexp&gt;</code> selector can be used as a ResourceSelector (see
+    the <a href="resources.html#restrict">&lt;restrict&gt;</a> ResourceCollection).</p>
+
+    <table class="attr">
       <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
       <tr>
-        <td valign="top">expression</td>
-        <td valign="top">Specifies the regular expression that must
-        match true in every file</td>
-        <td valign="top" align="center">Yes</td>
+        <td>expression</td>
+        <td>Specifies the regular expression that must match true in every file</td>
+        <td>Yes</td>
       </tr>
       <tr>
-        <td valign="top">casesensitive</td>
-        <td valign="top">Perform a case sensitive match.  Default is
-          true. <em>since Ant 1.8.2</em></td>
-        <td valign="top" align="center">No</td>
+        <td>casesensitive</td>
+        <td>Perform a case sensitive match. <em>Since Ant 1.8.2</em></td>
+        <td>No; default is <q>true</q></td>
       </tr>
       <tr>
-        <td valign="top">multiline</td>
-        <td valign="top">
-          Perform a multi line match.
-          Default is false. <em>since Ant 1.8.2</em></td>
-        <td valign="top" align="center">No</td>
+        <td>multiline</td>
+        <td>Perform a multi line match. <em>Since Ant 1.8.2</em></td>
+        <td>No; default is <q>false</q></td>
       </tr>
       <tr>
-        <td valign="top">singleline</td>
-        <td valign="top">
-          This allows '.' to match new lines.
-          SingleLine is not to be confused with multiline, SingleLine is a perl
-          regex term, it corresponds to dotall in java regex.
-          Default is false. <em>since Ant 1.8.2</em></td>
-        <td valign="top" align="center">No</td>
+        <td>singleline</td>
+        <td>This allows <q>.</q> to match new lines.  SingleLine is not to be confused with
+          multiline, SingleLine is a perl regex term, it corresponds to dotall in Java regex.
+          <em>Since Ant 1.8.2</em></td>
+        <td>No; default is <q>false</q></td>
       </tr>
     </table>
 
     <p>Here is an example of how to use the regular expression Selector:</p>
 
-    <blockquote><pre>
+    <pre>
 &lt;fileset dir=&quot;${doc.path}&quot; includes=&quot;*.txt&quot;&gt;
     &lt;containsregexp expression=&quot;[4-6]\.[0-9]&quot;/&gt;
-&lt;/fileset&gt;
-</pre></blockquote>
-
-    <p>Selects all the text files that match the regular expression
-    (have a 4,5 or 6 followed by a period and a number from 0 to 9).
+&lt;/fileset&gt;</pre>
 
+    <p>Selects all the text files that match the regular expression (have a 4, 5 or 6 followed by a
+    period and a number from 0 to 9).
 
-    <h4><a name="sizeselect">Size Selector</a></h4>
+    <h4 id="sizeselect">Size Selector</h4>
 
-    <p>The <code>&lt;size&gt;</code> tag in a FileSet will put
-    a limit on the files specified by the include tag, so that tags
-    which do not meet the size limits specified by the selector will not
+    <p>The <code>&lt;size&gt;</code> tag in a FileSet will put a limit on the files specified by the
+    include tag, so that tags which do not meet the size limits specified by the selector will not
     end up being selected.</p>
 
-    <table border="1" cellpadding="2" cellspacing="0">
+    <table class="attr">
       <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
       <tr>
-        <td valign="top">value</td>
-        <td valign="top">The size of the file which should be tested for.
+        <td>value</td>
+        <td>The size of the file which should be tested for.
         </td>
-        <td valign="top" align="center">Yes</td>
+        <td>Yes</td>
       </tr>
       <tr>
-        <td valign="top">units</td>
-        <td valign="top">The units that the <code>value</code> attribute
-          is expressed in. When using the standard single letter SI
-          designations, such as &quot;k&quot;,&quot;M&quot;, or
-          &quot;G&quot;, multiples of 1000 are used. If you want to use
-          power of 2 units, use the IEC standard: &quot;Ki&quot; for 1024,
-          &quot;Mi&quot; for 1048576, and so on. The default is no units,
-          which means the <code>value</code> attribute expresses the exact
-          number of bytes.
-        </td>
-        <td valign="top" align="center">No</td>
+        <td>units</td>
+        <td>The units that the <code>value</code> attribute is expressed in. When using the standard
+        single letter SI designations, such as <q>k</q>, <q>M</q>, or <q>G</q>, multiples of 1000
+        are used. If you want to use power of 2 units, use the IEC standard: <q>Ki</q> for
+        1024, <q>Mi</q> for 1048576, and so on. The default is no units, which means
+        the <var>value</var> attribute expresses the exact number of bytes.</td>
+        <td>No</td>
       </tr>
       <tr>
-        <td valign="top">when</td>
-        <td valign="top">Indicates how to interpret the size, whether
-          the files to be selected should be larger, smaller, or equal to
-          that value. Acceptable values for this attribute are:
+        <td>when</td>
+        <td>Indicates how to interpret the size, whether the files to be selected should be larger,
+          smaller, or equal to that value. Acceptable values for this attribute are:
           <ul>
-            <li>less - select files less than the indicated size
-            <li>more - select files greater than the indicated size
-            <li>equal - select files this exact size
-          </ul>
-          The default is equal.
-        <td valign="top" align="center">No</td>
+            <li><q>less</q>&mdash;select files less than the indicated size</li>
+            <li><q>more</q>&mdash;select files greater than the indicated size</li>
+            <li><q>equal</q>&mdash;select files this exact size</li>
+          </ul></td>
+        <td>No; default is <q>equal</q></td>
       </tr>
     </table>
 
     <p>Here is an example of how to use the Size Selector:</p>
 
-    <blockquote><pre>
+    <pre>
 &lt;fileset dir=&quot;${jar.path}&quot;&gt;
   &lt;patternset&gt;
     &lt;include name=&quot;**/*.jar&quot;/&gt;
   &lt;/patternset&gt;
   &lt;size value=&quot;4&quot; units=&quot;Ki&quot; when=&quot;more&quot;/&gt;
-&lt;/fileset&gt;
-</pre></blockquote>
+&lt;/fileset&gt;</pre>
 
     <p>Selects all JAR files that are larger than 4096 bytes.</p>
 
-    <h4><a name="typeselect">Type Selector</a></h4>
+    <h4 id="typeselect">Type Selector</h4>
 
-    <p>The <code>&lt;type&gt;</code> tag selects files of a certain type:
-    directory or regular.</p>
+    <p>The <code>&lt;type&gt;</code> tag selects files of a certain type: directory or
+    regular.</p>
 
-    <table border="1" cellpadding="2" cellspacing="0">
+    <table class="attr">
       <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
       <tr>
-        <td valign="top">type</td>
-        <td valign="top">The type of file which should be tested for.
-            Acceptable values are:
-            <ul>
-                <li>file - regular files</li>
-                <li>dir - directories</li>
-            </ul>
-        </td>
-        <td valign="top" align="center">Yes</td>
+        <td>type</td>
+        <td>The type of file which should be tested for.  Acceptable values are:
+          <ul>
+            <li><q>file</q>&mdash;regular files</li>
+            <li><q>dir</q>&mdash;directories</li>
+          </ul></td>
+        <td>Yes</td>
       </tr>
     </table>
 
-    <p>Here is an example of how to use the Type Selector to select only
-    directories in <code>${src}</code></p>
+    <p>Here is an example of how to use the Type Selector to select only directories
+    in <code>${src}</code></p>
 
-    <blockquote><pre>
+    <pre>
 &lt;fileset dir=&quot;${src}&quot;&gt;
   &lt;type type="dir"/&gt;
-&lt;/fileset&gt;
-</pre></blockquote>
+&lt;/fileset&gt;</pre>
 
-    <p>The Type Selector is often used in conjunction with other selectors.
-    For example, to select files that also exist in a <code>template</code>
-    directory, but avoid selecting empty directories, use:
+    <p>The Type Selector is often used in conjunction with other selectors.  For example, to select
+    files that also exist in a <samp>template</samp> directory, but avoid selecting empty
+    directories, use:</p>
 
-<blockquote><pre>
+    <pre>
 &lt;fileset dir="${src}"&gt;
     &lt;and&gt;
         &lt;present targetdir="template"/&gt;
         &lt;type type="file"/&gt;
     &lt;/and&gt;
-&lt;/fileset&gt;
-</pre></blockquote>
+&lt;/fileset&gt;</pre>
 
+    <h4 id="modified">Modified Selector</h4>
+    <p>The <code>&lt;modified&gt;</code> selector computes a value for a file, compares that to the
+    value stored in a cache and select the file, if these two values differ.</p>
+    <p>Because this selector is highly configurable the order in which the selection is done is:</p>
+    <ol>
+      <li>get the absolute path for the file</li>
+      <li>get the cached value from the configured cache (absolute path as key)</li>
+      <li>get the new value from the configured algorithm</li>
+      <li>compare these two values with the configured comparator</li>
+      <li>update the cache if needed and requested</li>
+      <li>do the selection according to the comparison result</li>
+    </ol>
+    <p>The comparison, computing of the hashvalue and the store is done by implementation of special
+    interfaces. Therefore they may provide additional parameters.</p>
+
+    <p>The <code>&lt;modified&gt;</code> selector can be used as a ResourceSelector (see
+    the <a href="resources.html#restrict">&lt;restrict&gt;</a> ResourceCollection).  In that case it
+    maps simple file resources to files and does its job. If the resource is from another type,
+    the <code>&lt;modified&gt;</code> selector tries to (<strong>attention!</strong>) copy the
+    content into a local file for computing the hashvalue.</p>
 
-    <h4><a name="modified">Modified Selector</a></h4>
-    <p>The <code>&lt;modified&gt;</code> selector computes a value for a file, compares that
-    to the value stored in a cache and select the file, if these two values
-    differ.</p>
-    <p>Because this selector is highly configurable the order in which the selection is done
-    is: <ol>
-        <li> get the absolute path for the file </li>
-        <li> get the cached value from the configured cache (absolute path as key) </li>
-        <li> get the new value from the configured algorithm </li>
-        <li> compare these two values with the configured comparator </li>
-        <li> update the cache if needed and requested </li>
-        <li> do the selection according to the comparison result </li>
-        </ol>
-    <p>The comparison, computing of the hashvalue and the store is done by implementation
-    of special interfaces. Therefore they may provide additional parameters.</p>
-
-    <p>The <code>&lt;modified&gt;</code> selector can be used as a
-      ResourceSelector (see the
-      <a href="resources.html#restrict">&lt;restrict&gt;</a>
-      ResourceCollection).
-    In that case it maps simple file resources to files and does its job. If the
-    resource is from another type, the <code>&lt;modified&gt;</code> selector tries
-    to (<b>attention!</b>) copy the content into a local file for computing the
-    hashvalue.</p>
-
-    <table border="1" cellpadding="2" cellspacing="0">
-      <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
-      </tr>
-      <tr>
-        <td valign="top"> algorithm </td>
-        <td valign="top"> The type of algorithm should be used.
-            Acceptable values are (further information see later):
-            <ul>
-                <li> hashvalue - HashvalueAlgorithm </li>
-                <li> digest - DigestAlgorithm </li>
-                <li> checksum - ChecksumAlgorithm </li>
-            </ul>
+    <table class="attr">
+      <tr>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
+      </tr>
+      <tr>
+        <td>algorithm</td>
+        <td>The type of algorithm should be used.  Acceptable values are (further information
+          see later):
+          <ul>
+            <li><q>hashvalue</q>&mdash;HashvalueAlgorithm</li>
+            <li><q>digest</q>&mdash;DigestAlgorithm</li>
+            <li><q>checksum</q>&mdash;ChecksumAlgorithm</li>
+          </ul>
         </td>
-        <td valign="top" align="center"> No, defaults to <i>digest</i> </td>
+        <td>No; defaults to <q>digest</q></td>
       </tr>
       <tr>
-        <td valign="top"> cache </td>
-        <td valign="top"> The type of cache should be used.
-            Acceptable values are (further information see later):
-            <ul>
-                <li> propertyfile - PropertyfileCache </li>
-            </ul>
+        <td>cache</td>
+        <td>The type of cache should be used.  Acceptable values are (further information see
+          later):
+          <ul>
+            <li><q>propertyfile</q>&mdash;PropertyfileCache</li>
+          </ul>
         </td>
-        <td valign="top" align="center"> No, defaults to <i>propertyfile</i> </td>
+        <td>No; defaults to <q>propertyfile</q></td>
       </tr>
       <tr>
-        <td valign="top"> comparator </td>
-        <td valign="top"> The type of comparator should be used.
-            Acceptable values are (further information see later):
-            <ul>
-                <li> equal - EqualComparator </li>
-                <li> rule - java.text.RuleBasedCollator
-                  <!-- NOTE -->
-                  <i>(see <a href="#ModSelNote">note</a> for restrictions)</i>
-                </li>
-            </ul>
+        <td>comparator</td>
+        <td>The type of comparator should be used.  Acceptable values are:
+          <ul>
+            <li><q>equal</q>&mdash;EqualComparator</li>
+            <li><q>rule</q>&mdash;java.text.RuleBasedCollator
+              <!-- NOTE -->
+              <em>(see <a href="#ModSelNote">note</a> for restrictions)</em></li>
+          </ul>
         </td>
-        <td valign="top" align="center"> No, defaults to <i>equal</i> </td>
+        <td>No; defaults to <q>equal</q></td>
       </tr>
       <tr>
-        <td valign="top"> algorithmclass </td>
-        <td valign="top"> Classname of custom algorithm implementation. Lower
-          priority than <i>algorithm</i>. </td>
-        <td valign="top" align="center"> No </td>
+        <td>algorithmclass</td>
+        <td>Classname of custom algorithm implementation. Lower priority
+          than <var>algorithm</var>.</td>
+        <td>No</td>
       </tr>
       <tr>
-        <td valign="top"> cacheclass </td>
-        <td valign="top"> Classname of custom cache implementation. Lower
-          priority than <i>cache</i>. </td>
-        <td valign="top" align="center"> No </td>
+        <td>cacheclass</td>
+        <td>Classname of custom cache implementation. Lower priority than <var>cache</var>.</td>
+        <td>No</td>
       </tr>
       <tr>
-        <td valign="top"> comparatorclass </td>
-        <td valign="top"> Classname of custom comparator implementation. Lower
-          priority than <i>comparator</i>. </td>
-        <td valign="top" align="center"> No </td>
+        <td>comparatorclass</td>
+        <td>Classname of custom comparator implementation. Lower priority
+          than <var>comparator</var>.</td>
+        <td>No</td>
       </tr>
       <tr>
-        <td valign="top"> update </td>
-        <td valign="top"> Should the cache be updated when values differ? (boolean) </td>
-        <td valign="top" align="center"> No, defaults to <i>true</i> </td>
+        <td>update</td>
+        <td>Should the cache be updated when values differ? (boolean)</td>
+        <td>No; defaults to <q>true</q></td>
       </tr>
       <tr>
-        <td valign="top"> seldirs </td>
-        <td valign="top"> Should directories be selected? (boolean) </td>
-        <td valign="top" align="center"> No, defaults to <i>true</i> </td>
+        <td>seldirs</td>
+        <td>Should directories be selected? (boolean)</td>
+        <td>No; defaults to <q>true</q></td>
       </tr>
       <tr>
-        <td valign="top"> selres </td>
-        <td valign="top"> Should Resources without an InputStream, and
-           therefore without checking, be selected?  (boolean) </td>
-        <td valign="top" align="center"> No, defaults to <i>true</i>. Only relevant
-           when used as ResourceSelector. </td>
+        <td>selres</td>
+        <td>Should Resources without an InputStream, and therefore without checking, be selected?
+          (boolean)</td>
+        <td>No; defaults to <q>true</q>. Only relevant when used as ResourceSelector.</td>
       </tr>
       <tr>
-        <td valign="top"> delayupdate </td>
-        <td valign="top"> If set to <i>true</i>, the storage of the cache will be delayed until the
-             next finished BuildEvent; task finished, target finished or build finished,
-             whichever comes first.  This is provided for increased performance.  If set
-             to <i>false</i>, the storage of the cache will happen with each change.  This
-             attribute depends upon the <i>update</i> attribute. (boolean)</td>
-        <td valign="top" align="center"> No, defaults to <i>true</i> </td>
+        <td>delayupdate</td>
+        <td>If set to <q>true</q>, the storage of the cache will be delayed until the next finished
+          BuildEvent; task finished, target finished or build finished, whichever comes first.  This
+          is provided for increased performance.  If set to <q>false</q>, the storage of the cache
+          will happen with each change.  This attribute depends upon the <var>update</var>
+          attribute. (boolean)</td>
+        <td>No; defaults to <q>true</q></td>
       </tr>
     </table>
 
-    <p>These attributes can be set with nested <code>&lt;param/&gt;</code> tags. With <code>&lt;param/&gt;</code>
-    tags you can set other values too - as long as they are named according to
-    the following rules: <ul>
-        <li> <b> algorithm </b>: same as attribute algorithm </li>
-        <li> <b> cache </b>: same as attribute cache </li>
-        <li> <b> comparator </b>: same as attribute comparator </li>
-        <li> <b> algorithmclass </b>: same as attribute algorithmclass </li>
-        <li> <b> cacheclass </b>: same as attribute cacheclass </li>
-        <li> <b> comparatorclass </b>: same as attribute comparatorclass </li>
-        <li> <b> update </b>: same as attribute update </li>
-        <li> <b> seldirs </b>: same as attribute seldirs </li>
-        <li> <b> algorithm.* </b>: Value is transferred to the algorithm via its
-                                   <i>set</i>XX-methods </li>
-        <li> <b> cache.* </b>: Value is transferred to the cache via its
-                                   <i>set</i>XX-methods </li>
-        <li> <b> comparator.* </b>: Value is transferred to the comparator via its
-                                   <i>set</i>XX-methods </li>
-    </ul>
+    <h5>Parameters specified as nested elements</h5>
 
-    <table border="1" cellpadding="2" cellspacing="0">
-      <tr><td colspan="2"><font size="+1"><b> Algorithm options</b></font></td></tr>
-      <tr>
-        <td valign="top"><b>Name</b></td>
-        <td valign="top"><b>Description</b></td>
+    <p>The <code>&lt;modified&gt;</code> selector supports a nested <code>&lt;classpath&gt;</code>
+    element that represents a <a href="../using.html#path">path-like structure</a> for finding
+    custom interface implementations.</p>
+
+    <p>All attributes of a <code>&lt;modified&gt;</code> selector an be set with
+    nested <code>&lt;param/&gt;</code> tags. Additional values can be set
+    with <code>&lt;param/&gt;</code> tags according to the rules below.</p>
+
+    <h6>algorithm</h6>
+    <p>Same as <var>algorithm</var> attribute, with the following additional values:</p>
+    <table>
+     <tr>
+        <th>Name</th>
+        <th>Description</th>
       </tr>
       <tr>
-        <td valign="top"> hashvalue </td>
-        <td valign="top"> Reads the content of a file into a java.lang.String
-          and use thats hashValue(). No additional configuration required.
-        </td>
+        <td>hashvalue</td>
+        <td>Reads the content of a file into a <code>java.lang.String</code> and uses
+          that <code>hashValue()</code>. No additional configuration required.</td>
       </tr>
       <tr>
-        <td valign="top"> digest </td>
-        <td valign="top"> Uses java.security.MessageDigest. This Algorithm supports
-          the following attributes:
+        <td>digest</td>
+        <td>Uses <code>java.security.MessageDigest</code>. This Algorithm supports the following
+          attributes:
           <ul>
-            <li><i>algorithm.algorithm</i> (optional): Name of the Digest algorithm
-                (e.g. 'MD5' or 'SHA', default = <i>MD5</i>) </li>
-            <li><i>algorithm.provider</i> (optional): Name of the Digest provider
-                (default = <i>null</i>) </li>
+            <li><var>algorithm.algorithm</var> (optional): Name of the Digest algorithm
+              (e.g. <q>MD5</q> or <q>SHA</q>); default is <q>MD5</q></li>
+            <li><var>algorithm.provider</var> (optional): Name of the Digest provider; default
+              is <q>null</q></li>
           </ul>
         </td>
       </tr>
+     <tr>
+       <td>checksum</td>
+       <td>Uses <code>java.util.zip.Checksum</code>. This Algorithm supports the following
+         attributes:
+         <ul>
+           <li><var>algorithm.algorithm</var> (optional): Name of the algorithm (e.g. <q>CRC</q>
+             or <q>ADLER</q>); default is <q>CRC</q>)</li>
+         </ul>
+       </td>
+     </tr>
+    </table>
+    <h6>cache</h6>
+    <p>Same as <var>cache</var> attribute, with the following additional values:</p>
+    <table>
+     <tr>
+       <th>Name</th>
+       <th>Description</th>
+     </tr>
+     <tr>
+       <td>propertyfile</td>
+       <td>Use the <code>java.util.Properties</code> class and its possibility to load and store to
+         file.  This Cache implementation supports the following attributes:
+         <ul>
+           <li><var>cache.cachefile</var> (optional): Name of the properties file; default
+             is <q>cache.properties</q></li>
+         </ul>
+       </td>
+     </tr>
+    </table>
+    <h6>comparator</h6>
+    <p>Same as <var>comparator</var> attribute.</p>
+    <h6>algorithmclass</h6>
+    <p>Same as <var>algorithmclass</var> attribute.</p>
+    <h6>comparatorclass</h6>
+    <p>Same as <var>comparatorclass</var> attribute.</p>
+    <h6>cacheclass</h6>
+    <p>Same as <var>cacheclass</var> attribute.</p>
+    <h6>update</h6>
+    <p>Same as <var>update</var> attribute.</p>
+    <h6>seldirs</h6>
+    <p>Same as <var>comparatorclass</var> attribute.</p>
+
+    <h5>Examples</h5>
+    <p>Here are some examples of how to use the Modified Selector:</p>
+
+    <pre>
+&lt;copy todir="dest"&gt;
+    &lt;fileset dir="src"&gt;
+        &lt;modified/&gt;
+    &lt;/fileset&gt;
+&lt;/copy&gt;</pre>
+
+    <p>This will copy all files from <samp>src</samp> to <samp>dest</samp> which content has
+    changed.  Using an updating PropertyfileCache with <samp>cache.properties</samp> and
+    MD5-DigestAlgorithm.</p>
+
+    <pre>
+&lt;copy todir="dest"&gt;
+    &lt;fileset dir="src"&gt;
+        &lt;modified update="true"
+                  seldirs="true"
+                  cache="propertyfile"
+                  algorithm="digest"
+                  comparator="equal"&gt;
+            &lt;param name="cache.cachefile"     value="cache.properties"/&gt;
+            &lt;param name="algorithm.algorithm" value="MD5"/&gt;
+        &lt;/modified&gt;
+    &lt;/fileset&gt;
+&lt;/copy&gt;</pre>
+
+    <p>This is the same example rewritten as CoreSelector with setting the all the values (same as
+    defaults are).</p>
+
+    <pre>
+&lt;copy todir="dest"&gt;
+    &lt;fileset dir="src"&gt;
+        &lt;custom class="org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector"&gt;
+            &lt;param name="update"     value="true"/&gt;
+            &lt;param name="seldirs"    value="true"/&gt;
+            &lt;param name="cache"      value="propertyfile"/&gt;
+            &lt;param name="algorithm"  value="digest"/&gt;
+            &lt;param name="comparator" value="equal"/&gt;
+            &lt;param name="cache.cachefile"     value="cache.properties"/&gt;
+            &lt;param name="algorithm.algorithm" value="MD5"/&gt;
+        &lt;/custom&gt;
+    &lt;/fileset&gt;
+&lt;/copy&gt;</pre>
+
+    <p>And this is the same rewritten as CustomSelector.</p>
+
+    <pre>
+&lt;target name="generate-and-upload-site"&gt;
+    &lt;echo&gt; generate the site using forrest &lt;/echo&gt;
+    &lt;antcall target="site"/&gt;
+
+    &lt;echo&gt; upload the changed file &lt;/echo&gt;
+    &lt;ftp server="${ftp.server}" userid="${ftp.user}" password="${ftp.pwd}"&gt;
+        &lt;fileset dir="htdocs/manual"&gt;
+            &lt;modified/&gt;
+        &lt;/fileset&gt;
+    &lt;/ftp&gt;
+&lt;/target&gt;</pre>
+
+    <p>A useful scenario for this selector inside a build environment for homepage generation
+    (e.g. with <a href="https://forrest.apache.org/" target="_top">Apache Forrest</a>). Here
+    all <strong>changed</strong> files are uploaded to the server. The CacheSelector saves therefore
+    much upload time.</p>
+
+    <pre>
+&lt;modified cacheclassname="com.mycompany.MyCache"&gt;
+    &lt;classpath&gt;
+        &lt;pathelement location="lib/mycompany-antutil.jar"/&gt;
+    &lt;/classpath&gt;
+&lt;/modified&gt;</pre>
+
+    <p>Uses <code>com.mycompany.MyCache</code> from a jar outside of Ant's own classpath as
+    cache implementation</p>
+
+    <h4 id="ModSelNote">Note on RuleBasedCollator</h4>
+    <p>The RuleBasedCollator needs a format for its work, but its needed while instantiating. There
+    is a problem in the initialization algorithm for this case. Therefore you should not use this
+    (or tell me the workaround :-).</p>
+
+    <h4 id="signedselector">Signed Selector</h4>
+
+    <p>The <code>&lt;signedselector&gt;</code> tag selects signed files and optionally signed with a
+    certain name.</p>
+    <p><em>Since Apache Ant 1.7</em></p>
+    <table class="attr">
+      <tr>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
+      </tr>
+      <tr>
+        <td>name</td>
+        <td>The signature name to check for.</td>
+        <td>No</td>
+      </tr>
+    </table>
+
+    <h4 id="readable">Readable Selector</h4>
+
+    <p>The <code>&lt;readable&gt;</code> selector selects only files that are readable.  Ant only
+    invokes <code class="code">java.io.File#canRead</code> so if a file is unreadable but JVM cannot
+    detect this state, this selector will still select the file.</p>
+
+    <h4 id="writable">Writable Selector</h4>
+
+    <p>The <code>&lt;writable&gt;</code> selector selects only files that are writable.  Ant only
+    invokes <code class="code">java.io.File#canWrite</code> so if a file is nonwritable but JVM
+    cannot detect this state, this selector will still select the file.</p>
+
+    <h4 id="executable">Executable Selector</h4>
+
+    <p>The <code>&lt;executable&gt;</code> selector selects only files that are executable.  Ant
+    only invokes <code class="code">java.nio.file.Files#isExecutable</code> so if a file is not
+    executable but JVM cannot detect this state, this selector will still select the file.</p>
+
+    <p><em>Since Ant 1.10.0</em></p>
+
+    <h4 id="symlink">Symlink Selector</h4>
+
+    <p>The <code>&lt;symlink&gt;</code> selector selects only files that are symbolic links.  Ant
+    only invokes <code class="code">java.nio.file.Files#isSymbolicLink</code> so if a file is a
+    symbolic link but JVM cannot detect this state, this selector will not select the file.</p>
+
+    <p><em>Since Ant 1.10.0</em></p>
+
+    <h4 id="ownedBy">OwnedBy Selector</h4>
+
+    <p>The <code>&lt;ownedBy&gt;</code> selector selects only files that are owned by the given
+    user.  Ant only invokes <code class="code">java.nio.file.Files#getOwner</code> so if a file
+    system doesn't support the operation this selector will not select the file.</p>
+
+    <p><em>Since Ant 1.10.0</em></p>
+
+    <table class="attr">
       <tr>
-        <td valign="top"> checksum </td>
-        <td valign="top"> Uses java.util.zip.Checksum. This Algorithm supports
-          the following attributes:
-          <ul>
-            <li><i>algorithm.algorithm</i> (optional): Name of the algorithm
-                (e.g. 'CRC' or 'ADLER', default = <i>CRC</i>) </li>
-          </ul>
-        </td>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
-      <tr><td colspan="2"><font size="+1"><b> Cache options </b></font></td></tr>
       <tr>
-        <td valign="top"> propertyfile </td>
-        <td valign="top"> Use the java.util.Properties class and its possibility
-          to load and store to file.
-          This Cache implementation supports the following attributes:
-          <ul>
-            <li><i>cache.cachefile</i> (optional): Name of the properties-file
-                (default = <i>cache.properties</i>) </li>
-          </ul>
-        </td>
+        <td>owner</td>
+        <td>Username of the expected owner</td>
+        <td>Yes</td>
+      </tr>
+    </table>
+
+    <h4 id="scriptselector">Script Selector</h4>
+
+    <p>The <code>&lt;scriptselector&gt;</code> element enables you to write a complex selection
+    algorithm in any <a href="https://jakarta.apache.org/bsf" target="_top">Apache BSF</a>
+    or <a href="https://jcp.org/aboutJava/communityprocess/maintenance/jsr223/223ChangeLog.html"
+    target="_top">JSR 223</a> supported language.  See the <a href="../Tasks/script.html">Script</a>
+    task for an explanation of scripts and dependencies.</p>
+    <p><em>Since Apache Ant 1.7</em></p>
+    <table class="attr">
+      <tr>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
-      <tr><td colspan="2"><font size="+1"><b> Comparator options</b></font></td></tr>
       <tr>
-        <td valign="top"> equal </td>
-        <td valign="top"> Very simple object comparison. </td>
+        <td>language</td>
+        <td>language of the script.</td>
+        <td>Yes</td>
       </tr>
       <tr>
-        <td valign="top"> rule </td>
-        <td valign="top"> Uses <i>java.text.RuleBasedCollator</i> for Object
-          comparison.
-          <!-- NOTE -->
-          <i>(see <a href="#ModSelNote">note</a> for restrictions)</i>
-        </td>
+        <td>manager</td>
+        <td>The script engine manager to use.  See the <a href="../Tasks/script.html">script</a>
+        task for using this attribute.</td>
+        <td>No; default is <q>auto</q></td>
+      </tr>
+      <tr>
+        <td>src</td>
+        <td>filename of the script</td>
+        <td>No</td>
+      </tr>
+      <tr>
+        <td>encoding</td>
+        <td>The encoding of the script as a file. <em>since Ant 1.10.2</em></td>
+        <td>No; defaults to default JVM character encoding</td>
+      </tr>
+      <tr>
+        <td>setbeans</td>
+        <td>Whether to have all properties, references and targets as global variables in the
+        script.</td>
+        <td>No; default is <q>true</q></td>
+      </tr>
+      <tr>
+        <td>classpath</td>
+        <td>The classpath to pass into the script.</td>
+        <td>No</td>
+      </tr>
+      <tr>
+        <td>classpathref</td>
+        <td>The classpath to use, given as a <a href="../using.html#references">reference</a> to
+        a path defined elsewhere.
+        <td>No</td>
       </tr>
     </table>
+    <p>This selector can take a nested <code>&lt;classpath&gt;</code> element.  See
+    the <a href="../Tasks/script.html">script</a> task on how to use this element.</p>
+    <p>If no <var>src</var> attribute is supplied, the script must be nested inside the selector
+    declaration.</p>
+    <p>The embedded script is invoked for every test, with the bean <code class="code">self</code>
+    is bound to the selector. It has an attribute <var>selected</var> which can be set
+    using <code class="code">setSelected(boolean)</code> to select a file.</p>
 
-    <p>The <code>&lt;modified&gt;</code> selector supports a nested
-    <code>&lt;classpath&gt;</code> element that represents a <a href="../using.html#path">
-    PATH like structure</a> for finding custom interface implementations. </p>
+    <p>The following beans are configured for every script, alongside the classic set of project,
+    properties, and targets.</p>
 
-    <p>Here are some examples of how to use the Modified Selector:</p>
+    <table>
+      <tr>
+        <th>Bean</th>
+        <th>Description</th>
+        <th>Type</th>
+      </tr>
+      <tr>
+        <td>self</td>
+        <td>selector instance</td>
+        <td>org.apache.tools.ant.types.optional</td>
+      </tr>
+      <tr>
+        <td>filename</td>
+        <td>filename of the selection</td>
+        <td>String</td>
+      </tr>
+      <tr>
+        <td>file</td>
+        <td>file of the selection</td>
+        <td>java.io.File</td>
+      </tr>
+      <tr>
+        <td>basedir</td>
+        <td>Fileset base directory</td>
+        <td>java.io.File</td>
+      </tr>
+    </table>
 
-    <blockquote><pre>
-    &lt;copy todir="dest"&gt;
-        &lt;fileset dir="src"&gt;
-            &lt;modified/&gt;
-        &lt;/fileset&gt;
-    &lt;/copy&gt;
-    </pre></blockquote>
-    <p>This will copy all files from <i>src</i> to <i>dest</i> which content has changed.
-    Using an updating PropertyfileCache with cache.properties and
-    MD5-DigestAlgorithm.</p>
+    <p>The <code>self</code> bean maps to the selector, which has the following attributes. Only
+    the <var>selected</var> flag is writable, the rest are read only via their getter methods.</p>
+    <table class="attr">
+      <tr>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Type</th>
+      </tr>
+      <tr>
+        <td>selected</td>
+        <td>writeable flag to select this file</td>
+        <td>boolean</td>
+      </tr>
+      <tr>
+        <td>filename</td>
+        <td>filename of the selection</td>
+        <td>String</td>
+      </tr>
+      <tr>
+        <td>file</td>
+        <td>file of the selection</td>
+        <td>java.io.File</td>
+      </tr>
+      <tr>
+        <td>basedir</td>
+        <td>Fileset base directory</td>
+        <td>java.io.File</td>
+      </tr>
+    </table>
 
-    <blockquote><pre>
-    &lt;copy todir="dest"&gt;
-        &lt;fileset dir="src"&gt;
-            &lt;modified update="true"
-                      seldirs="true"
-                      cache="propertyfile"
-                      algorithm="digest"
-                      comparator="equal"&gt;
-                &lt;param name="cache.cachefile"     value="cache.properties"/&gt;
-                &lt;param name="algorithm.algorithm" value="MD5"/&gt;
-            &lt;/modified&gt;
-        &lt;/fileset&gt;
-    &lt;/copy&gt;
-    </pre></blockquote>
-  <p>This is the same example rewritten as CoreSelector with setting the all the values
-  (same as defaults are).</p>
-
-    <blockquote><pre>
-    &lt;copy todir="dest"&gt;
-        &lt;fileset dir="src"&gt;
-            &lt;custom class="org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector"&gt;
-                &lt;param name="update"     value="true"/&gt;
-                &lt;param name="seldirs"    value="true"/&gt;
-                &lt;param name="cache"      value="propertyfile"/&gt;
-                &lt;param name="algorithm"  value="digest"/&gt;
-                &lt;param name="comparator" value="equal"/&gt;
-                &lt;param name="cache.cachefile"     value="cache.properties"/&gt;
-                &lt;param name="algorithm.algorithm" value="MD5"/&gt;
-            &lt;/custom&gt;
-        &lt;/fileset&gt;
-    &lt;/copy&gt;
-    </pre></blockquote>
-  <p>And this is the same rewritten as CustomSelector.</p>
-
-    <blockquote><pre>
-  &lt;target name="generate-and-upload-site"&gt;
-      &lt;echo&gt; generate the site using forrest &lt;/echo&gt;
-      &lt;antcall target="site"/&gt;
-
-      &lt;echo&gt; upload the changed file &lt;/echo&gt;
-      &lt;ftp server="${ftp.server}" userid="${ftp.user}" password="${ftp.pwd}"&gt;
-          &lt;fileset dir="htdocs/manual"&gt;
-              &lt;modified/&gt;
-          &lt;/fileset&gt;
-      &lt;/ftp&gt;
-  &lt;/target&gt;
-    </pre></blockquote>
-  <p>A useful scenario for this selector inside a build environment
-  for homepage generation (e.g. with <a href="http://xml.apache.org/forrest/">
-  Apache Forrest</a>). Here all <b>changed</b> files are uploaded to the server. The
-  CacheSelector saves therefore much upload time.</p>
-
-    <blockquote><pre>
-  &lt;modified cacheclassname="com.mycompany.MyCache"&gt;
-      &lt;classpath&gt;
-          &lt;pathelement location="lib/mycompany-antutil.jar"/&gt;
-      &lt;/classpath&gt;
-  &lt;/modified&gt;
-    </pre></blockquote>
-    <p>Uses <tt>com.mycompany.MyCache</tt> from a jar outside of Ants own classpath
-    as cache implementation</p>
-
-  <h4><a name="ModSelNote">Note on RuleBasedCollator</a></h4>
-  <p>The RuleBasedCollator needs a format for its work, but its needed while
-  instantiation. There is a problem in the initialization algorithm for this
-  case. Therefore you should not use this (or tell me the workaround :-).</p>
-
-      <h4><a name="signedselector">Signed Selector</a></h4>
-
-      <p>
-        The <code>&lt;signedselector&gt;</code> tag selects signed files and optionally
-        signed with a certain name.
-      </p>
-      <p>
-        This selector has been added in Apache Ant 1.7.
-      </p>
-      <table border="1" cellpadding="2" cellspacing="0">
-        <tr>
-          <td valign="top"><b>Attribute</b></td>
-          <td valign="top"><b>Description</b></td>
-          <td align="center" valign="top"><b>Required</b></td>
-        </tr>
-        <tr>
-          <td valign="top">name</td>
-          <td valign="top"> The signature name to check for.</td>
-          <td valign="top" align="center">no</td>
-        </tr>
-      </table>
-
-      <h4><a name="readable">Readable Selector</a></h4>
-
-      <p>The <code>&lt;readable&gt;</code> selector selects only files
-        that are readable.  Ant only invokes
-        <code>java.io.File#canRead</code> so if a file is unreadable
-        but the Java VM cannot detect this state, this selector will
-        still select the file.</p>
-
-      <h4><a name="writable">Writable Selector</a></h4>
-
-      <p>The <code>&lt;writable&gt;</code> selector selects only files
-        that are writable.  Ant only invokes
-        <code>java.io.File#canWrite</code> so if a file is unwritable
-        but the Java VM cannot detect this state, this selector will
-        still select the file.</p>
-
-      <h4><a name="scriptselector">Script Selector</a></h4>
-
-      <p>
-        The <code>&lt;scriptselector&gt;</code> element enables you
-        to write a complex selection algorithm in any
-        <a href="http://jakarta.apache.org/bsf" target="_top">Apache BSF</a>
-        or
-        <a href="https://scripting.dev.java.net">JSR 223</a>
-        supported language.
-        See the <a href="../Tasks/script.html">Script</a> task for
-        an explanation of scripts and dependencies.
-      </p>
-      <p>
-        This selector was added in Apache Ant 1.7.
-      </p>
-      <table border="1" cellpadding="2" cellspacing="0">
-        <tr>
-          <td valign="top"><b>Attribute</b></td>
-          <td valign="top"><b>Description</b></td>
-          <td align="center" valign="top"><b>Required</b></td>
-        </tr>
-        <tr>
-          <td valign="top">language</td>
-          <td valign="top">language of the script.</td>
-          <td valign="top" align="center">yes</td>
-        </tr>
-        <tr>
-          <td valign="top">manager</td>
-          <td valign="top">
-            The script engine manager to use.
-            See the <a href="../Tasks/script.html">script</a> task
-            for using this attribute.
-          </td>
-          <td valign="top" align="center">No - default is "auto"</td>
-        </tr>
-        <tr>
-          <td valign="top">src</td>
-          <td valign="top">filename of the script</td>
-          <td valign="top" align="center">no</td>
-        </tr>
-        <tr>
-          <td valign="top">setbeans</td>
-          <td valign="top">whether to have all properties, references and targets as
-            global variables in the script.</td>
-          <td valign="top" align="center">No, default is "true".</td>
-        </tr>
-        <tr>
-          <td valign="top">classpath</td>
-          <td valign="top">
-            The classpath to pass into the script.
-          </td>
-          <td align="center" valign="top">No</td>
-        </tr>
-        <tr>
-          <td valign="top">classpathref</td>
-          <td valign="top">The classpath to use, given as a
-            <a href="../using.html#references">reference</a> to a path defined elsewhere.
-            <td align="center" valign="top">No</td>
-          </tr>
-      </table>
-  <p>
-    This selector can take a nested &lt;classpath&gt; element.
-    See the <a href="../Tasks/script.html">script</a> task
-    on how to use this element.
-  </p>
-      <p>
-      If no <code>src</code> attribute is supplied, the script must be nested
-      inside the selector declaration.
-      </p>
-      <p>The embedded script is invoked for every test, with
-         the bean <code>self</code>
-        is bound to the selector. It has an attribute <code>selected</code>
-        must can be set using <code>setSelected(boolean)</code> to select that
-        file.
-
-      <p>
-
-      The following beans are configured for every script, alongside
-      the classic set of project, properties, and targets.
-
-      <table border="1" cellpadding="2" cellspacing="0">
-        <tr>
-          <td valign="top"><b>Bean</b></td>
-          <td valign="top"><b>Description</b></td>
-          <td valign="top"><b>Type</b></td>
-        </tr>
-        <tr>
-          <td valign="top">self</td>
-          <td valign="top">selector instance</td>
-          <td valign="top">org.apache.tools.ant.types.optional</td>
-        </tr>
-        <tr>
-          <td valign="top">filename</td>
-          <td valign="top">filename of the selection</td>
-          <td valign="top" >String</td>
-        </tr>
-        <tr>
-          <td valign="top">file</td>
-          <td valign="top">file of the selection</td>
-          <td valign="top" >java.io.File</td>
-        </tr>
-        <tr>
-          <td valign="top">basedir</td>
-          <td valign="top">Fileset base directory</td>
-          <td valign="top" >java.io.File</td>
-        </tr>
-
-      </table>
-      <p>
-      The <code>self</code> bean maps to the selector, which has the following
-      attributes. Only the <code>selected</code> flag is writable, the rest
-      are read only via their getter methods.
-
-            <table border="1" cellpadding="2" cellspacing="0">
-        <tr>
-          <td valign="top"><b>Attribute</b></td>
-          <td valign="top"><b>Description</b></td>
-          <td align="center" valign="top"><b>Type</b></td>
-        </tr>
-        <tr>
-          <td valign="top">selected</td>
-          <td valign="top">writeable flag to select this file</td>
-          <td valign="top" align="center">boolean</td>
-        </tr>
-        <tr>
-          <td valign="top">filename</td>
-          <td valign="top">filename of the selection</td>
-          <td valign="top" >String</td>
-        </tr>
-        <tr>
-          <td valign="top">file</td>
-          <td valign="top">file of the selection</td>
-          <td valign="top" >java.io.File</td>
-        </tr>
-        <tr>
-          <td valign="top">basedir</td>
-          <td valign="top">Fileset base directory</td>
-          <td valign="top" >java.io.File</td>
-        </tr>
-      </table>
-
-      <p>
-      Example
-      </p>
-<pre>
-    &lt;scriptselector language=&quot;javascript&quot;&gt;
-      self.setSelected(true);
-    &lt;/scriptselector&gt;
-</pre>
-    <p>
-    Selects every file.
-    </p>
-
-<pre>
-    &lt;scriptselector language=&quot;javascript&quot;&gt;
-      self.setSelected((filename.length%2)==0);
-    &lt;/scriptselector&gt;
-</pre>
-Select files whose filename length is even.
-
-    <h3><a name="selectcontainers">Selector Containers</a></h3>
-
-    <p>To create more complex selections, a variety of selectors that
-    contain other selectors are available for your use. They combine the
-    selections of their child selectors in various ways.</p>
+    <p>Example</p>
+    <pre>
+&lt;scriptselector language=&quot;javascript&quot;&gt;
+  self.setSelected(true);
+&lt;/scriptselector&gt;</pre>
+    <p>Selects every file.</p>
+
+    <pre>
+&lt;scriptselector language=&quot;javascript&quot;&gt;
+  self.setSelected((filename.length%2)==0);
+&lt;/scriptselector&gt;</pre>
+    <p>Select files whose filename length is even.</p>
+
+    <h3 id="selectcontainers">Selector Containers</h3>
+
+    <p>To create more complex selections, a variety of selectors that contain other selectors are
+    available for your use. They combine the selections of their child selectors in various
+    ways.</p>
 
     <p>The selector containers are:</p>
 
     <ul>
-      <li><a href="#andselect"><code>&lt;and&gt;</code></a> - select a file only if all
-        the contained selectors select it.
-      <li><a href="#majorityselect"><code>&lt;majority&gt;</code></a> - select a file
-        if a majority of its selectors select it.
-      <li><a href="#noneselect"><code>&lt;none&gt;</code></a> - select a file only if
-        none of the contained selectors select it.
-      <li><a href="#notselect"><code>&lt;not&gt;</code></a> - can contain only one
-        selector, and reverses what it selects and doesn't select.
-      <li><a href="#orselect"><code>&lt;or&gt;</code></a> - selects a file if any one
-        of the contained selectors selects it.
-      <li><a href="#selectorselect"><code>&lt;selector&gt;</code></a> - contains only one
-        selector and forwards all requests to it without alteration, provided
-        that any <code>&quot;if&quot;</code> or
-        <code>&quot;unless&quot;</code> conditions are met. This
-        is the selector to use if you want to define a reference. It is
-        usable as an element of <code>&lt;project&gt;</code>. It is also
-        the one to use if you want selection of files to be dependent on
-        Ant property settings.
+      <li><a href="#andselect"><code>&lt;and&gt;</code></a>&mdash;select a file only if all the
+        contained selectors select it.</li>
+      <li><a href="#majorityselect"><code>&lt;majority&gt;</code></a>&mdash;select a file if a
+        majority of its selectors select it.</li>
+      <li><a href="#noneselect"><code>&lt;none&gt;</code></a>&mdash;select a file only if none
+        of the contained selectors select it.</li>
+      <li><a href="#notselect"><code>&lt;not&gt;</code></a>&mdash;can contain only one selector, and
+        reverses what it selects and doesn't select.</li>
+      <li><a href="#orselect"><code>&lt;or&gt;</code></a>&mdash;selects a file if any one of the
+        contained selectors selects it.</li>
+      <li><a href="#selectorselect"><code>&lt;selector&gt;</code></a>&mdash;contains only one
+        selector and forwards all requests to it without alteration, provided that
+        any <code>&quot;if&quot;</code> or <code>&quot;unless&quot;</code> conditions are met. This
+        is the selector to use if you want to define a reference. It is usable as an element
+        of <code>&lt;project&gt;</code>. It is also the one to use if you want selection of files to
+        be dependent on Ant property settings.</li>
     </ul>
 
-    <p>All selector containers can contain any other selector, including
-    other containers, as an element. Using containers, the selector tags
-    can be arbitrarily deep. Here is a complete list of allowable
-    selector elements within a container:</p>
+    <p>All selector containers can contain any other selector, including other containers, as an
+    element. Using containers, the selector tags can be arbitrarily deep. Here is a complete list of
+    allowable selector elements within a container:</p>
 
     <ul>
       <li><code>&lt;and&gt;</code></li>
@@ -1229,83 +1106,69 @@
       <li><code>&lt;size&gt;</code></li>
     </ul>
 
-    <h4><a name="andselect">And Selector</a></h4>
+    <h4 id="andselect">And Selector</h4>
 
-    <p>The <code>&lt;and&gt;</code> tag selects files that are
-    selected by all of the elements it contains. It returns as
-    soon as it finds a selector that does not select the file,
-    so it is not guaranteed to check every selector.
-    </p>
+    <p>The <code>&lt;and&gt;</code> tag selects files that are selected by all of the elements it
+    contains. It returns as soon as it finds a selector that does not select the file, so it is not
+    guaranteed to check every selector.</p>
 
     <p>Here is an example of how to use the And Selector:</p>
 
-    <blockquote><pre>
+    <pre>
 &lt;fileset dir=&quot;${dist}&quot; includes=&quot;**/*.jar&quot;&gt;
     &lt;and&gt;
         &lt;size value=&quot;4&quot; units=&quot;Ki&quot; when=&quot;more&quot;/&gt;
         &lt;date datetime=&quot;01/01/2001 12:00 AM&quot; when=&quot;before&quot;/&gt;
     &lt;/and&gt;
-&lt;/fileset&gt;
-</pre></blockquote>
+&lt;/fileset&gt;</pre>
 
-    <p>Selects all the JAR file larger than 4096 bytes which haven't been update
-      since the last millennium.
-    </p>
+    <p>Selects all the JAR file larger than 4096 bytes which haven't been update since the last
+    millennium.</p>
 
+    <h4 id="majorityselect">Majority Selector</h4>
 
-    <h4><a name="majorityselect">Majority Selector</a></h4>
+    <p>The <code>&lt;majority&gt;</code> tag selects files provided that a majority of the contained
+    elements also select it. Ties are dealt with as specified by the <var>allowtie</var>
+    attribute.</p>
 
-    <p>The <code>&lt;majority&gt;</code> tag selects files provided
-    that a majority of the contained elements also select it. Ties are
-    dealt with as specified by the <code>allowtie</code> attribute.
-    </p>
-
-    <table border="1" cellpadding="2" cellspacing="0">
+    <table class="attr">
       <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
       <tr>
-        <td valign="top">allowtie</td>
-        <td valign="top">Whether files should be selected if there
-          are an even number of selectors selecting them as are
-          not selecting them. Default is true.
-        </td>
-        <td valign="top" align="center">No</td>
+        <td>allowtie</td>
+        <td>Whether files should be selected if there are an even number of selectors selecting them
+          as are not selecting them.</td>
+        <td>No; default is <q>true</q></td>
       </tr>
     </table>
 
-
     <p>Here is an example of how to use the Majority Selector:</p>
 
-    <blockquote><pre>
+    <pre>
 &lt;fileset dir=&quot;${docs}&quot; includes=&quot;**/*.html&quot;&gt;
     &lt;majority&gt;
         &lt;contains text=&quot;project&quot; casesensitive="false"/&gt;
         &lt;contains text=&quot;taskdef&quot; casesensitive="false"/&gt;
         &lt;contains text=&quot;IntrospectionHelper&quot; casesensitive="true"/&gt;
     &lt;/majority&gt;
-&lt;/fileset&gt;
-</pre></blockquote>
+&lt;/fileset&gt;</pre>
 
     <p>Selects all the HTML files which contain at least two of the three
-    phrases "project", "taskdef", and "IntrospectionHelper" (this last phrase must
-    match case exactly).
-    </p>
+    phrases <q>project</q>, <q>taskdef</q>, and <q>IntrospectionHelper</q> (this last phrase must
+    match case exactly).</p>
 
+    <h4 id="noneselect">None Selector</h4>
 
-    <h4><a name="noneselect">None Selector</a></h4>
-
-    <p>The <code>&lt;none&gt;</code> tag selects files that are
-    not selected by any of the elements it contains. It returns as
-    soon as it finds a selector that selects the file,
-    so it is not guaranteed to check every selector.
-    </p>
+    <p>The <code>&lt;none&gt;</code> tag selects files that are not selected by any of the elements
+    it contains. It returns as soon as it finds a selector that selects the file, so it is not
+    guaranteed to check every selector.</p>
 
     <p>Here is an example of how to use the None Selector:</p>
 
-    <blockquote><pre>
+    <pre>
 &lt;fileset dir=&quot;${src}&quot; includes=&quot;**/*.java&quot;&gt;
     &lt;none&gt;
         &lt;present targetdir=&quot;${dest}&quot;/&gt;
@@ -1313,46 +1176,36 @@
             &lt;mapper type=&quot;glob&quot; from=&quot;*.java&quot; to=&quot;*.class&quot;/&gt;
         &lt;/present&gt;
     &lt;/none&gt;
-&lt;/fileset&gt;
-</pre></blockquote>
-
-    <p>Selects only Java files which do not have equivalent java or
-    class files in the dest directory.
-    </p>
+&lt;/fileset&gt;</pre>
 
+    <p>Selects only <samp>.java</samp> files which do not have equivalent <samp>.java</samp>
+    or <samp>.class</samp> files in the <samp>dest</samp> directory.</p>
 
-    <h4><a name="notselect">Not Selector</a></h4>
+    <h4 id="notselect">Not Selector</h4>
 
-    <p>The <code>&lt;not&gt;</code> tag reverses the meaning of the
-    single selector it contains.
-    </p>
+    <p>The <code>&lt;not&gt;</code> tag reverses the meaning of the single selector it contains.</p>
 
     <p>Here is an example of how to use the Not Selector:</p>
 
-    <blockquote><pre>
+    <pre>
 &lt;fileset dir=&quot;${src}&quot; includes=&quot;**/*.java&quot;&gt;
     &lt;not&gt;
         &lt;contains text=&quot;test&quot;/&gt;
     &lt;/not&gt;
-&lt;/fileset&gt;
-</pre></blockquote>
-
-    <p>Selects all the files in the src directory that do not contain the
-    string "test".
-    </p>
+&lt;/fileset&gt;</pre>
 
+    <p>Selects all the files in the <samp>src</samp> directory that do not contain the
+    string <q>test</q>.</p>
 
-    <h4><a name="orselect">Or Selector</a></h4>
+    <h4 id="orselect">Or Selector</h4>
 
-    <p>The <code>&lt;or&gt;</code> tag selects files that are
-    selected by any one of the elements it contains. It returns as
-    soon as it finds a selector that selects the file,
-    so it is not guaranteed to check every selector.
-    </p>
+    <p>The <code>&lt;or&gt;</code> tag selects files that are selected by any one of the elements it
+    contains. It returns as soon as it finds a selector that selects the file, so it is not
+    guaranteed to check every selector.</p>
 
     <p>Here is an example of how to use the Or Selector:</p>
 
-    <blockquote><pre>
+    <pre>
 &lt;fileset dir=&quot;${basedir}&quot;&gt;
     &lt;or&gt;
         &lt;depth max=&quot;0&quot;/&gt;
@@ -1360,57 +1213,48 @@
         &lt;filename name="*.gif"/&gt;
         &lt;filename name="*.jpg"/&gt;
     &lt;/or&gt;
-&lt;/fileset&gt;
-</pre></blockquote>
+&lt;/fileset&gt;</pre>
 
-    <p>Selects all the files in the top directory along with all the
-    image files below it.
-    </p>
+    <p>Selects all the files in the top directory along with all the image files below it.</p>
 
+    <h4 id="selectorselect">Selector Reference</h4>
 
-    <h4><a name="selectorselect">Selector Reference</a></h4>
+    <p>The <code>&lt;selector&gt;</code> tag is used to create selectors that can be reused through
+    references. It is the only selector which can be used outside of any target, as an element of
+    the <code>&lt;project&gt;</code> tag. It can contain only one other selector, but of course that
+    selector can be a container.</p>
 
-    <p>The <code>&lt;selector&gt;</code> tag is used to create selectors
-    that can be reused through references. It is the only selector which can
-    be used outside of
-    any target, as an element of the <code>&lt;project&gt;</code> tag. It
-    can contain only one other selector, but of course that selector can
-    be a container.
-    </p>
+    <p>The <code>&lt;selector&gt;</code> tag can also be used to select files conditionally based on
+    whether an Ant property exists or not.  This functionality is realized using the <var>if</var>
+    and <var>unless</var> attributes in exactly the same way they are used on targets or on
+    the <code>&lt;include&gt;</code> and <code>&lt;exclude&gt;</code> tags within
+    a <code>&lt;patternset&gt;</code>.</p>
 
-    <p>The <code>&lt;selector&gt;</code> tag can also be used to select
-    files conditionally based on whether an Ant property exists or not.
-    This functionality is realized using the <code>&quot;if&quot;</code> and
-    <code>&quot;unless&quot;</code> attributes in exactly the same way they
-    are used on targets or on the <code>&lt;include&gt;</code> and
-    <code>&lt;exclude&gt;</code> tags within a
-    <code>&lt;patternset&gt;</code>.</p>
-
-    <table border="1" cellpadding="2" cellspacing="0">
+    <table class="attr">
       <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
       <tr>
-        <td valign="top">if</td>
-        <td valign="top">Allow files to be selected only <a href="../properties.html#if+unless">if the named
+        <td>if</td>
+        <td>Allow files to be selected only <a href="../properties.html#if+unless">if the named
           property is set</a>.
         </td>
-        <td valign="top" align="center">No</td>
+        <td>No</td>
       </tr>
       <tr>
-        <td valign="top">unless</td>
-        <td valign="top">Allow files to be selected only <a href="../properties.html#if+unless">if the named
-          property is <b>not</b> set</a>.
+        <td>unless</td>
+        <td>Allow files to be selected only <a href="../properties.html#if+unless">if the named
+          property is <strong>not</strong> set</a>.
         </td>
-        <td valign="top" align="center">No</td>
+        <td>No</td>
       </tr>
     </table>
 
     <p>Here is an example of how to use the Selector Reference:</p>
 
-    <blockquote><pre>
+    <pre>
 &lt;project default=&quot;all&quot; basedir=&quot;./ant&quot;&gt;
 
     &lt;selector id=&quot;completed&quot;&gt;
@@ -1432,17 +1276,14 @@
         &lt;/zip&gt;
     &lt;/target&gt;
 
-&lt;/project&gt;
-</pre></blockquote>
+&lt;/project&gt;</pre>
 
-    <p>Zips up all the Java files which have an up-to-date equivalent
-    class file and javadoc file associated with them.
-    </p>
+    <p>Zips up all the java files which have an up-to-date equivalent class file and javadoc file
+    associated with them.</p>
 
-    <p>And an example of selecting files conditionally, based on whether
-    properties are set:</p>
+    <p>And an example of selecting files conditionally, based on whether properties are set:</p>
 
-    <blockquote><pre>
+    <pre>
 &lt;fileset dir=&quot;${working.copy}&quot;&gt;
     &lt;or&gt;
         &lt;selector if=&quot;include.tests&quot;&gt;
@@ -1459,109 +1300,93 @@
             &lt;/and&gt;
         &lt;/selector&gt;
     &lt;/or&gt;
-&lt;/fileset&gt;
-</pre></blockquote>
+&lt;/fileset&gt;</pre>
+
+    <p>A fileset that conditionally contains Java source files and Test source and class
+    files.</p>
 
-    <p>A fileset that conditionally contains Java source files and Test
-    source and class files.</p>
+    <h3 id="customselect">Custom Selectors</h3>
 
-    <h3><a name="customselect">Custom Selectors</a></h3>
+    <p>You can write your own selectors and use them within the selector containers by specifying
+    them within the <code>&lt;custom&gt;</code> tag.</p>
 
-    <p>You can write your own selectors and use them within the selector
-    containers by specifying them within the <code>&lt;custom&gt;</code> tag.</p>
-
-    <p>First, you have to write your selector class in Java. The only
-    requirement it must meet in order to be a selector is that it implements
-    the <code>org.apache.tools.ant.types.selectors.FileSelector</code>
-    interface, which contains a single method. See
-    <a href="selectors-program.html">Programming Selectors in Ant</a> for
-    more information.</p>
+    <p>First, you have to write your selector class in Java. The only requirement it must meet in
+    order to be a selector is that it implements
+    the <code class="code">org.apache.tools.ant.types.selectors.FileSelector</code> interface, which
+    contains a single method. See <a href="selectors-program.html">Programming Selectors in Ant</a>
+    for more information.</p>
 
     <p>Once that is written, you include it in your build file by using
-    the <code>&lt;custom&gt;</code> tag.
-    </p>
+    the <code>&lt;custom&gt;</code> tag.</p>
 
-    <table border="1" cellpadding="2" cellspacing="0">
+    <table class="attr">
       <tr>
-        <td valign="top"><b>Attribute</b></td>
-        <td valign="top"><b>Description</b></td>
-        <td align="center" valign="top"><b>Required</b></td>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required</th>
       </tr>
       <tr>
-        <td valign="top">classname</td>
-        <td valign="top">The name of your class that implements
-          <code>org.apache.tools.ant.types.selectors.FileSelector</code>.
+        <td>classname</td>
+        <td>The name of your class that
+        implements <code class="code">org.apache.tools.ant.types.selectors.FileSelector</code>.
         </td>
-        <td valign="top" align="center">Yes</td>
+        <td>Yes</td>
       </tr>
       <tr>
-        <td valign="top">classpath</td>
-        <td valign="top">The classpath to use in order to load the
-          custom selector class. If neither this classpath nor the
-          classpathref are specified, the class will be
-          loaded from the classpath that Ant uses.
-        </td>
-        <td valign="top" align="center">No</td>
+        <td>classpath</td>
+        <td>The classpath to use in order to load the custom selector class. If
+        neither <var>classpath</var> nor <var>classpathref</var> are specified, the class will be
+        loaded from the classpath that Ant uses.</td>
+        <td>No</td>
       </tr>
       <tr>
-        <td valign="top">classpathref</td>
-        <td valign="top">A reference to a classpath previously
-          defined. If neither this reference nor the
-          classpath above are specified, the class will be
-          loaded from the classpath that Ant uses.
-        </td>
-        <td valign="top" align="center">No</td>
+        <td>classpathref</td>
+        <td>A reference to a classpath previously defined. If neither <var>classpathref</var>
+        nor <var>classpath</var> are specified, the class will be loaded from the classpath that Ant
+        uses.</td>
+        <td>No</td>
       </tr>
     </table>
 
-    <p>Here is how you use <code>&lt;custom&gt;</code> to
-    use your class as a selector:
-    </p>
+    <p>Here is how you use <code>&lt;custom&gt;</code> to use your class as a selector:</p>
 
-    <blockquote><pre>
+    <pre>
 &lt;fileset dir=&quot;${mydir}&quot; includes=&quot;**/*&quot;&gt;
     &lt;custom classname=&quot;com.mydomain.MySelector&quot;&gt;
         &lt;param name=&quot;myattribute&quot; value=&quot;myvalue&quot;/&gt;
     &lt;/custom&gt;
-&lt;/fileset&gt;
-</pre></blockquote>
+&lt;/fileset&gt;</pre>
 
-    <p>A number of core selectors can also be used as custom selectors
-    by specifying their attributes using <code>&lt;param&gt;</code> elements. These
-    are</p>
+    <p>A number of core selectors can also be used as custom selectors by specifying their
+    attributes using <code>&lt;param&gt;</code> elements. These are</p>
 
     <ul>
       <li><a href="#containsselect">Contains Selector</a> with
-        classname <code>org.apache.tools.ant.types.selectors.ContainsSelector</code>
+        classname <code class="code">org.apache.tools.ant.types.selectors.ContainsSelector</code>
       <li><a href="#dateselect">Date Selector</a> with
-        classname <code>org.apache.tools.ant.types.selectors.DateSelector</code>
+        classname <code class="code">org.apache.tools.ant.types.selectors.DateSelector</code>
       <li><a href="#depthselect">Depth Selector</a> with
-        classname <code>org.apache.tools.ant.types.selectors.DepthSelector</code>
+        classname <code class="code">org.apache.tools.ant.types.selectors.DepthSelector</code>
       <li><a href="#filenameselect">Filename Selector</a> with
-        classname <code>org.apache.tools.ant.types.selectors.FilenameSelector</code>
+        classname <code class="code">org.apache.tools.ant.types.selectors.FilenameSelector</code>
       <li><a href="#sizeselect">Size Selector</a> with
-        classname <code>org.apache.tools.ant.types.selectors.SizeSelector</code>
+        classname <code class="code">org.apache.tools.ant.types.selectors.SizeSelector</code>
     </ul>
 
-    <p>Here is the example from the Depth Selector section rewritten
-    to use the selector through <code>&lt;custom&gt;</code>.</p>
+    <p>Here is the example from the Depth Selector section rewritten to use the selector
+    through <code>&lt;custom&gt;</code>.</p>
 
-    <blockquote><pre>
+    <pre>
 &lt;fileset dir=&quot;${doc.path}&quot; includes=&quot;**/*&quot;&gt;
     &lt;custom classname=&quot;org.apache.tools.ant.types.selectors.DepthSelector&quot;&gt;
         &lt;param name=&quot;max&quot; value=&quot;1&quot;/&gt;
     &lt;/custom&gt;
-&lt;/fileset&gt;
-</pre></blockquote>
+&lt;/fileset&gt;</pre>
 
-    <p>Selects all files in the base directory and one directory below
-    that.</p>
+    <p>Selects all files in the base directory and one directory below that.</p>
 
-    <p>For more details concerning writing your own selectors, consult
-    <a href="selectors-program.html">Programming Selectors in Ant</a>.</p>
-
-    
+    <p>For more details concerning writing your own selectors,
+    consult <a href="selectors-program.html">Programming Selectors in Ant</a>.</p>
 
   </body>
-
 </html>
diff -Nru ant-1.9.10/manual/Types/selectors-program.html ant-1.10.3/manual/Types/selectors-program.html
--- ant-1.9.10/manual/Types/selectors-program.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/selectors-program.html	2018-03-24 12:37:12.000000000 +0000
@@ -28,138 +28,119 @@
 
     <p>Want to define your own selectors? It's easy!</p>
 
-    <p>First, pick the type of selector that you want to define. There
-    are three types, and a recipe for each one follows. Chances are
-    you'll want to work with the first one, Custom Selectors.</p>
+    <p>First, pick the type of selector that you want to define. There are three types, and a
+    recipe for each one follows. Chances are you'll want to work with the first one, Custom
+    Selectors.</p>
 
     <ol>
       <li>Custom Selectors
 
-        <p>This is the category that Apache Ant provides specifically for you to
-        define your own Selectors. Anywhere you want to use your selector
-        you use the <code>&lt;custom&gt;</code> element and specify
-        the class name of your selector within it. See the
-        <a href="selectors.html#customselect">Custom Selectors</a>
-        section of the Selector page for details. The
-        <code>&lt;custom&gt;</code> element can be used anywhere
-        the core selectors can be used. It can be contained within
-        <a href="selectors.html#selectcontainers">Selector Containers</a>,
-        for example.</p>
+        <p>This is the category that Apache Ant provides specifically for you to define your own
+        Selectors. Anywhere you want to use your selector you use
+        the <code>&lt;custom&gt;</code> element and specify the class name of your selector
+        within it. See the <a href="selectors.html#customselect">Custom Selectors</a> section of
+        the Selector page for details. The <code>&lt;custom&gt;</code> element can be used
+        anywhere the core selectors can be used. It can be contained
+        within <a href="selectors.html#selectcontainers">Selector Containers</a>, for
+        example.</p>
 
         <p>To create a new Custom Selector, you have to create a class that
-        implements
-        <code>org.apache.tools.ant.types.selectors.ExtendFileSelector</code>.
-        The easiest way to do that is through the convenience base class
-        <code>org.apache.tools.ant.types.selectors.BaseExtendSelector</code>,
-        which provides all of the methods for supporting
-        <code>&lt;param&gt;</code> tags. First, override the
-        <code>isSelected()</code> method, and optionally the
-        <code>verifySettings()</code> method. If your custom
-        selector requires parameters to be set, you can also override
-        the <code>setParameters()</code> method and interpret the
-        parameters that are passed in any way you like. Several of the
-        core selectors demonstrate how to do that because they can
-        also be used as custom selectors.</p>
+        implements <code class="code">org.apache.tools.ant.types.selectors.ExtendFileSelector</code>.
+        The easiest way to do that is through the convenience base
+        class <code class="code">org.apache.tools.ant.types.selectors.BaseExtendSelector</code>,
+        which provides all of the methods for supporting <code>&lt;param&gt;</code> tags. First,
+        override the <code class="code">isSelected()</code> method, and optionally
+        the <code class="code">verifySettings()</code> method. If your custom selector requires
+        parameters to be set, you can also override the <code class="code">setParameters()</code>
+        method and interpret the parameters that are passed in any way you like. Several of the core
+        selectors demonstrate how to do that because they can also be used as custom selectors.</p>
 
       <li>Core Selectors
 
-        <p>These are the selectors used by Ant itself. To implement one of
-        these, you will have to alter some of the classes contained within
-        Ant.</p>
+        <p>These are the selectors used by Ant itself. To implement one of these, you will have
+        to alter some of the classes contained within Ant.</p>
 
         <ul>
-          <li><p>First, create a class that implements
-            <code>org.apache.tools.ant.types.selectors.FileSelector</code>.
-            You can either choose to implement all methods yourself from
-            scratch, or you can extend
-            <code>org.apache.tools.ant.types.selectors.BaseSelector</code>
-            instead, a convenience class that provides reasonable default
-            behaviour for many methods.</p>
-
-            <p>There is only one method required.
-            <code>public boolean isSelected(File basedir, String filename,
-              File file)</code>
-              is the real purpose of the whole exercise. It returns true
-              or false depending on whether the given file should be
-              selected from the list or not.</p>
-
-            <p>If you are using
-            <code>org.apache.tools.ant.types.selectors.BaseSelector</code>
-            there are also some predefined behaviours you can take advantage
-            of. Any time you encounter a problem when setting attributes or
-            adding tags, you can call setError(String errmsg) and the class
-            will know that there is a problem. Then, at the top of your
-            <code>isSelected()</code> method call <code>validate()</code> and
-            a BuildException will be thrown with the contents of your error
-            message. The <code>validate()</code> method also gives you a
-            last chance to check your settings for consistency because it
-            calls <code>verifySettings()</code>. Override this method and
-            call <code>setError()</code> within it if you detect any
-            problems in how your selector is set up.</p>
-
-            <p>You may also want to override <code>toString()</code>.</p>
-
-          <li><p>Put an <code>add</code> method for your selector in
-            <code>org.apache.tools.ant.types.selectors.SelectorContainer</code>.
-            This is an interface, so you will also have to add an implementation
-            for the method in the classes which implement it, namely
-            <code>org.apache.tools.ant.types.AbstractFileSet</code>,
-            <code>org.apache.tools.ant.taskdefs.MatchingTask</code> and
-            <code>org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>.
-            Once it is in there, it will be available everywhere that core
-            selectors are appropriate.</p>
+          <li><p>First, create a class that
+            implements <code class="code">org.apache.tools.ant.types.selectors.FileSelector</code>.
+            You can either choose to implement all methods yourself from scratch, or you can
+            extend <code class="code">org.apache.tools.ant.types.selectors.BaseSelector</code>
+            instead, a convenience class that provides reasonable default behaviour for many
+            methods.</p>
+
+            <p>There is only one method required.  <code class="code">public boolean isSelected(File
+            basedir, String filename, File file)</code> is the real purpose of the whole
+            exercise. It returns <q>true</q> or <q>false</q> depending on whether the given file
+            should be selected from the list or not.</p>
+
+            <p>If you are
+            using <code class="code">org.apache.tools.ant.types.selectors.BaseSelector</code> there
+            are also some predefined behaviours you can take advantage of. Any time you encounter a
+            problem when setting attributes or adding tags, you can
+            call <code class="code">setError(String errmsg)</code> and the class will know that
+            there is a problem. Then, at the top of your <code class="code">isSelected()</code>
+            method call <code class="code">validate()</code> and a <code>BuildException</code> will
+            be thrown with the contents of your error
+            message. The <code class="code">validate()</code> method also gives you a last chance to
+            check your settings for consistency because it
+            calls <code class="code">verifySettings()</code>. Override this method and
+            call <code class="code">setError()</code> within it if you detect any problems in how
+            your selector is set up.</p>
+
+            <p>You may also want to override <code class="code">toString()</code>.</p></li>
+
+          <li>Put an <code class="code">add()</code> method for your selector
+            in <code class="code">org.apache.tools.ant.types.selectors.SelectorContainer</code>.
+            This is an interface, so you will also have to add an implementation for the method in
+            the classes which implement it,
+            namely <code class="code">org.apache.tools.ant.types.AbstractFileSet</code>, <code class="code">org.apache.tools.ant.taskdefs.MatchingTask</code>
+            and <code class="code">org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>.
+            Once it is in there, it will be available everywhere that core selectors are
+            appropriate.</li>
         </ul>
 
       <li>Selector Containers
-        <p>Got an idea for a new Selector Container? Creating a new one is
-        no problem:</p>
+        <p>Got an idea for a new Selector Container? Creating a new one is no problem:</p>
         <ul>
-          <li><p>Create a new class that implements
-            <code>org.apache.tools.ant.types.selectors.SelectorContainer</code>.
-            This will ensure that your new
-            Container can access any new selectors that come along. Again, there
-            is a convenience class available for you called
-            <code>org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>.
-            </p>
-          <li><p>Implement the
-            <code>public boolean isSelected(String filename, File file)</code>
-            method to do the right thing. Chances are you'll want to iterate
-            over the selectors under you, so use
-            <code>selectorElements()</code> to get an iterator that will do
-            that.</p>
-          <li><p>Again, put an <code>add</code> method for your container in
-            <code>org.apache.tools.ant.types.selectors.SelectorContainer</code>
-            and its implementations
-            <code>org.apache.tools.ant.types.AbstractFileSet</code> and
-            <code>org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>.
-            </p>
+          <li>Create a new class that
+            implements <code class="code">org.apache.tools.ant.types.selectors.SelectorContainer</code>.
+            This will ensure that your new Container can access any new selectors that come
+            along. Again, there is a convenience class available for you
+            called <code class="code">org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>.</li>
+          <li>Implement the <code class="code">public boolean isSelected(String filename, File
+            file)</code> method to do the right thing. Chances are you'll want to iterate over the
+            selectors under you, so use <code class="code">selectorElements()</code> to get an
+            iterator that will do that.</li>
+          <li>Again, put an <code class="code">add()</code> method for your container
+            in <code class="code">org.apache.tools.ant.types.selectors.SelectorContainer</code> and
+            its implementations <code class="code">org.apache.tools.ant.types.AbstractFileSet</code>
+            and <code class="code">org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>.</li>
         </ul>
     </ol>
 
     <h3>Testing Selectors</h3>
 
-    <p>For a robust component (and selectors are (Project)Components) tests are
-    necessary. For testing Tasks we use JUnit TestCases - more specific
-    <tt>org.apache.tools.ant.BuildFileRule extends org.junit.rules.ExternalResource</tt>.
-    Some of its features like configure the (test) project by reading its buildfile and
-    execute targets we need for selector tests also. Therefore we use that BuildFileRule.
-    But testing selectors requires some more work: having a set of files, instantiate
-    and configure the selector, check the selection work and more. Because we usually
-    extend <tt>BaseExtendSelector</tt> its features have to be tested also (e.g. setError()).
-    </p>
-
-    <p>That's why we have a test rule for doing our selector tests:
-    <tt>org.apache.tools.ant.types.selectors.BaseSelectorRule</tt>.</p>
-
-    <p>This class extends ExternalResource and therefore can included in the set of Ant's
-    unit tests. It holds an instance of preconfigured BuildFileRule. Configuration
-    is done by parsing the src/etc/testcases/types/selectors.xml. BaseSelectorRule
-    then gives us helper methods for handling multiple selections. </p>
-
-    <p>Because the term "testcase" or "testenvironment" are so often used, this
-    special testenvironment got a new name: <i>bed</i>. The setup and cleanup of
-    the bed is all handled by the BaseSelectorRule so any test only has to handle
-    the actual test scenarios</p>
+    <p>For a robust component (and selectors are (Project)Components) tests are necessary. For
+    testing Tasks we use JUnit Tests and Rules&mdash;more
+    specific <code class="code">org.apache.tools.ant.BuildFileRule extends
+    org.junit.rules.ExternalResource</code>.  Some of its features like configure the (test) project
+    by reading its buildfile and execute targets we need for selector tests also. Therefore we use
+    that BuildFileRule.  But testing selectors requires some more work: having a set of files,
+    instantiate and configure the selector, check the selection work and more. Because we usually
+    extend <code class="code">BaseExtendSelector</code> its features have to be tested also
+    (e.g. <code class="code">setError()</code>).</p>
+
+    <p>That's why we have a test rule for doing our selector
+    tests: <code class="code">org.apache.tools.ant.types.selectors.BaseSelectorRule</code>.</p>
+
+    <p>This class extends ExternalResource and therefore can included in the set of Ant's unit
+    tests. It holds an instance of preconfigured BuildFileRule. Configuration is done by parsing
+    the <samp>src/etc/testcases/types/selectors.xml</samp>. BaseSelectorRule then gives us
+    helper methods for handling multiple selections.</p>
+
+    <p>Because the term "testcase" or "testenvironment" are so often used, this special
+    testenvironment got a new name: <em>bed</em>. The setup and cleanup of the bed is all
+    handled by the BaseSelectorRule so any test only has to handle the actual test scenarios</p>
 
     <p>A usual test scenario is:</p>
     <ol>
@@ -169,9 +150,8 @@
        <li>verify the work</li>
     </ol>
 
-
-
-    <p>An example test would be:<pre>
+    <p>An example test would be:</p>
+    <pre>
 package org.apache.tools.ant.types.selectors;
 
 public class MySelectorTest {
@@ -182,7 +162,6 @@
     @Test
     public void testCase1() {
 
-
         // Configure the selector
         MySelector s = new MySelector();
         s.addParam("key1", "value1");
@@ -193,52 +172,44 @@
         // do the tests
         assertEquals("FTTTTTTTT", selectorRule.selectionString(s));
     }
-}
-    </pre>
-    As an example of an error JUnit could log<pre>
-    [junit]     FAILED
-    [junit] Error for files: <font color=blue>.;copy.filterset.filtered;tar/gz/asf-logo.gif.tar.gz</font>
-    [junit] expected:&lt;<font color=blue>FTTTFTTTF...</font>&gt; but was:&lt;TTTTTTTTT...&gt;
-    [junit] junit.framework.ComparisonFailure: Error for files: .;copy.filterset.filtered;tar/gz/asf-logo.gif.tar.gz
-    [junit] expected:&lt;FTTTFTTTF...&gt; but was:&lt;TTTTTTTTT...&gt;
-    [junit]     at junit.framework.Assert.assertEquals(Assert.java:81)
-    [junit]     at org.apache.tools.ant.types.selectors.BaseSelectorTest.performTest(BaseSelectorTest.java:194)
-    </pre></p>
-
-    <p>Described above the test class should provide a <tt>getInstance()</tt>
-    method. But that isn't used here. The used <tt>getSelector()</tt> method is
-    implemented in the base class and gives an instance of an Ant Project to
-    the selector. This is usually done inside normal build file runs, but not
-    inside this special environment, so this method gives the selector the
-    ability to use its own Project object (<tt>getProject()</tt>), for example
-    for logging.</p>
-
+}</pre>
+    <p>As an example of an error JUnit could log</p>
+    <pre>
+[junit]     FAILED
+[junit] Error for files: <span style="color:blue">.;copy.filterset.filtered;tar/gz/asf-logo.gif.tar.gz</span>
+[junit] expected:&lt;<span style="color:blue">FTTTFTTTF...</span>&gt; but was:&lt;TTTTTTTTT...&gt;
+[junit] junit.framework.ComparisonFailure: Error for files: .;copy.filterset.filtered;tar/gz/asf-logo.gif.tar.gz
+[junit] expected:&lt;FTTTFTTTF...&gt; but was:&lt;TTTTTTTTT...&gt;
+[junit]     at junit.framework.Assert.assertEquals(Assert.java:81)
+[junit]     at org.apache.tools.ant.types.selectors.BaseSelectorTest.performTest(BaseSelectorTest.java:194)</pre>
+
+    <p>Described above the test class should provide a <code class="code">getInstance()</code>
+    method. But that isn't used here. The used <code class="code">getSelector()</code> method is
+    implemented in the base class and gives an instance of an Ant Project to the selector. This is
+    usually done inside normal build file runs, but not inside this special environment, so this
+    method gives the selector the ability to use its own Project object
+    (<code class="code">getProject()</code>), for example for logging.</p>
 
     <h3>Logging</h3>
 
-    <p>During development and maybe later you sometimes need the output of information.
-    Therefore Logging is needed. Because the selector extends BaseExtendSelector or directly
-    BaseSelector it is an Ant <tt>DataType</tt> and therefore a <tt>ProjectComponent</tt>. <br>
-    That means that you have access to the project object and its logging capability.
-    <tt>ProjectComponent</tt> itself provides <i>log</i> methods which will do the
-    access to the project instance. Logging is therefore done simply with:
-    <pre>
-        log( "message" );
-    </pre>
-    or
-    <pre>
-        log( "message" , loglevel );
-    </pre>
-    where the <tt>loglevel</tt> is one of the values <ul>
-    <li> org.apache.tools.ant.Project.MSG_ERR </li>
-    <li> org.apache.tools.ant.Project.MSG_WARN </li>
-    <li> org.apache.tools.ant.Project.MSG_INFO  (= default) </li>
-    <li> org.apache.tools.ant.Project.MSG_VERBOSE </li>
-    <li> org.apache.tools.ant.Project.MSG_DEBUG </li>
+    <p>During development and maybe later you sometimes need the output of information.  Therefore
+    Logging is needed. Because the selector extends BaseExtendSelector or directly BaseSelector it
+    is an Ant <code class="code">DataType</code> and therefore
+    a <code class="code">ProjectComponent</code>.<br/>  That means that you have access to the
+    project object and its logging capability.  <code class="code">ProjectComponent</code> itself
+    provides <code class="code">log()</code> methods which will do the access to the project
+    instance. Logging is therefore done simply with:</p>
+    <pre>log("message");</pre>
+    <p>or</p>
+    <pre>log("message", loglevel);</pre>
+    <p>where the <code>loglevel</code> is one of the values</p>
+    <ul>
+      <li><code class="code">org.apache.tools.ant.Project.MSG_ERR</code></li>
+      <li><code class="code">org.apache.tools.ant.Project.MSG_WARN</code></li>
+      <li><code class="code">org.apache.tools.ant.Project.MSG_INFO</code> (default)</li>
+      <li><code class="code">org.apache.tools.ant.Project.MSG_VERBOSE</code></li>
+      <li><code class="code">org.apache.tools.ant.Project.MSG_DEBUG</code></li>
     </ul>
-    </p>
 
-    
   </body>
-
 </html>
diff -Nru ant-1.9.10/manual/Types/tarfileset.html ant-1.10.3/manual/Types/tarfileset.html
--- ant-1.9.10/manual/Types/tarfileset.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/tarfileset.html	2018-03-24 12:37:12.000000000 +0000
@@ -14,7 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
   <meta http-equiv="Content-Language" content="en-us">
@@ -22,161 +21,128 @@
 <title>TarFileSet Type</title>
 </head>
 <body>
-<h2><a name="fileset">TarFileSet</a></h2>
+<h2 id="fileset">TarFileSet</h2>
 
-<p><em>TarFileSet</em> has been added as a stand-alone type in Apache Ant
-1.7.</p>
+<p><code>TarFileSet</code> has been a stand-alone type <em>since Apache Ant 1.7</em>.</p>
 
-<p>A <code>&lt;tarfileset&gt;</code> is a special form of a <code>&lt;<a
- href="fileset.html">fileset</a>&gt;</code> which can behave in 2
-different ways : <br>
-</p>
+<p>A <code>&lt;tarfileset&gt;</code> is a special form of
+a <code>&lt;<a href="fileset.html">fileset</a>&gt;</code> which can behave in 2 different ways:</p>
 <ul>
-  <li>When the <span style="font-style: italic;">src</span> attribute
-  is used - or a nested resource collection has been specified, the
-  tarfileset is populated with tar entries found in the file <span
-  style="font-style: italic;">src</span>.<br>
-  </li>
-  <li>When the <span style="font-style: italic;">dir</span> attribute
-is used, the tarfileset is populated with filesystem files found under <span
- style="font-style: italic;">dir</span>.<br>
-  </li>
+  <li>When the <var>src</var> attribute is used&mdash;or a nested resource collection has been
+  specified, the tarfileset is populated with tar entries found in the file <var>src</var>.</li>
+  <li>When the <var>dir</var> attribute is used, the tarfileset is populated with filesystem files
+  found under <var>dir</var>.</li>
 </ul>
-<p><code>&lt;tarfileset&gt;</code> supports all attributes of <code>&lt;<a
- href="fileset.html">fileset</a>&gt;</code>
- in addition to those listed below.  Note that tar archives in general
- don't contain entries with leading slashes so you shouldn't use
- include/exclude patterns that start with slashes either.
-</p>
-<p>A tarfileset can be defined with the <span style="font-style:
-italic;">id </span>attribute and referred to with the <span
-style="font-style: italic;">refid</span> attribute.  This is also true
-for tarfileset which has been added in Ant 1.7.<br>
-</p>
+<p><code>&lt;tarfileset&gt;</code> supports all attributes
+of <code>&lt;<a href="fileset.html">fileset</a>&gt;</code> in addition to those listed below.  Note
+that tar archives in general don't contain entries with leading slashes so you shouldn't use
+include/exclude patterns that start with slashes either.</p>
+<p><em>Since Ant 1.7</em>, a tarfileset can be defined with the <var>id</var> attribute and referred
+to with the <var>refid</var> attribute.</p>
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tbody>
     <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td valign="top" align="center"><b>Required</b></td>
+      <th>Attribute</th>
+      <th>Description</th>
+      <th>Required</th>
     </tr>
     <tr>
-      <td valign="top">prefix</td>
-      <td valign="top">all files in the fileset are prefixed with that 
-path in the archive.</td>
-      <td align="center" valign="top">No</td>
+      <td>prefix</td>
+      <td>all files in the fileset are prefixed with that path in the archive.</td>
+      <td>No</td>
     </tr>
     <tr>
-      <td valign="top">fullpath</td>
-      <td valign="top">the file described by the fileset is placed at  
-that exact location in the archive.</td>
-      <td align="center" valign="top">No</td>
+      <td>fullpath</td>
+      <td>the file described by the fileset is placed at that exact location in the archive.</td>
+      <td>No</td>
     </tr>
     <tr>
-      <td valign="top">src</td>
-      <td valign="top">may be used in place of the <i>dir</i> attribute
- to specify a tar file whose contents will be extracted and     included
-in the archive.</td>
-      <td align="center" valign="top">No</td>
+      <td>src</td>
+      <td>may be used in place of the <var>dir</var> attribute to specify a tar file whose contents
+        will be extracted and included in the archive.</td>
+      <td>No</td>
     </tr>
     <tr>
-      <td valign="top">filemode</td>
-      <td valign="top">A 3 digit octal string, specify the user, group 
-and other modes in the standard Unix fashion.  Only applies to    
-plain files.  Default is 644.</td>
-      <td align="center" valign="top">No</td>
+      <td>filemode</td>
+      <td>A 3 digit octal string, specify the user, group and other modes in the standard Unix
+        fashion.  Only applies to plain files.</td>
+      <td>No; default is <q>644</q></td>
     </tr>
     <tr>
-      <td valign="top">dirmode</td>
-      <td valign="top">A 3 digit octal string, specify the user, group 
-and other modes in the standard Unix fashion.  Only applies to    
-directories.  Default is 755.</td>
-      <td align="center" valign="top">No</td>
+      <td>dirmode</td>
+      <td>A 3 digit octal string, specify the user, group and other modes in the standard Unix
+        fashion.  Only applies to directories.</td>
+      <td>No; default is <q>755</q></td>
     </tr>
     <tr>
-      <td valign="top">username</td>
-      <td valign="top">The username for the tar entry. This is not the same as the UID.
-       </td>
-      <td align="center" valign="top">No</td>
+      <td>username</td>
+      <td>The username for the tar entry. This is not the same as the UID.</td>
+      <td>No</td>
     </tr>
     <tr>
-      <td valign="top">group</td>
-      <td valign="top">The groupname for the tar entry. This is not the same as the GID.
-      </td>
-      <td align="center" valign="top">No</td>
+      <td>group</td>
+      <td>The groupname for the tar entry. This is not the same as the GID.</td>
+      <td>No</td>
     </tr>
     <tr>
-      <td valign="top">uid</td>
-      <td valign="top">The user identifier (UID) for the tar entry. This is an integer value
-        and is not the same as the username.
-      </td>
-      <td align="center" valign="top">No</td>
+      <td>uid</td>
+      <td>The user identifier (UID) for the tar entry. This is an integer value and is not the
+        same as the username.</td>
+      <td>No</td>
     </tr>
     <tr>
-      <td valign="top">gid</td>
-      <td valign="top">The group identifier (GID) for the tar entry.
-      </td>
-      <td align="center" valign="top">No</td>
+      <td>gid</td>
+      <td>The group identifier (GID) for the tar entry.</td>
+      <td>No</td>
     </tr>
     <tr>
-      <td valign="top">erroronmissingarchive</td>
-      <td valign="top">
-        Specify what happens if the archive does not exist.
-        If true, a build error will happen; if false, the fileset
-        will be ignored/empty.
-        Defaults to true.
-        <em>Since Ant 1.8.0</em>
-      </td>
-      <td valign="top" align="center">No</td>
+      <td>erroronmissingarchive</td>
+      <td>Specify what happens if the archive does not exist.  If <q>true</q>, a build error will
+        happen; if <q>false</q>, the fileset will be ignored/empty.  <em>Since Ant 1.8.0</em></td>
+      <td>No; defaults to <q>true</q></td>
     </tr>
     <tr>
-      <td valign="top">encoding</td>
-      <td valign="top">The character encoding to use for filenames
-      inside the zip file.  For a list of possible values see the <a
-      href="http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html">Supported Encodings</a>.
-      Defaults to the platform's default character encoding.
-        <em>Since Ant 1.9.5</em>
-      <td align="center" valign="top">No</td>
+      <td>encoding</td>
+      <td>The character encoding to use for filenames inside the zip file.  For a list of possible
+      values see
+      the <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html"
+      target="_top">Supported Encodings</a>.  <em>Since Ant 1.9.5</em></td>
+      <td>No; defaults to default JVM character encoding</td>
     </tr>
   </tbody>
 </table>
-<p>The <i>fullpath</i> attribute can only be set for filesets that
-represent a single file. The <i>prefix</i> and <i>fullpath</i>
-attributes cannot both be set on the same fileset.</p>
-<p>When using the <i>src</i> attribute, include and exclude patterns
-may be used to specify a subset of the archive for inclusion in the
-archive as with the <i>dir</i> attribute.</p>
-
-<p>Please note that currently only the <a
-href="../Tasks/tar.html">tar</a> task uses the permission and
-ownership attributes.</p>
+<p>The <var>fullpath</var> attribute can only be set for filesets that represent a single
+file. The <var>prefix</var> and <var>fullpath</var> attributes cannot both be set on the same
+fileset.</p>
+<p>When using the <var>src</var> attribute, <var>include</var> and <var>exclude</var> patterns may
+be used to specify a subset of the archive for inclusion in the archive as with the <var>dir</var>
+attribute.</p>
+
+<p>Please note that currently only the <a href="../Tasks/tar.html">tar</a> task uses the permission
+and ownership attributes.</p>
 
 <h3>Parameters specified as nested elements</h3>
 
-<h4>any <a href="resources.html">resource</a> or single element
-resource collection</h4>
+<h4>any <a href="resources.html">resource</a> or single element resource collection</h4>
 
 <p>The specified resource will be used as src.</p>
 
 <h4>Examples</h4>
-<blockquote>
-<pre>
-  &lt;copy todir="some-dir"&gt;
-    &lt;tarfileset includes="lib/**"&gt;
-      &lt;bzip2resource&gt;
-        &lt;url url="http://example.org/dist/some-archive.tar.bz2"/&gt;
-      &lt;/bzip2resource&gt;
-    &lt;/tarfileset&gt;
-  &lt;/copy&gt;
-      </pre></blockquote>
-
-<p>downloads the archive some-archive.tar.bz2, uncompresses and
-extracts it on the fly, copies the contents of the lib directory into
-some-dir and discards the rest of the archive.  File timestamps will
-be compared between the archive's entries and files inside the target
-directory, no files get overwritten unless they are out-of-date.</p>
 
+<pre>
+&lt;copy todir="some-dir"&gt;
+ &lt;tarfileset includes="lib/**"&gt;
+   &lt;bzip2resource&gt;
+     &lt;url url="http://example.org/dist/some-archive.tar.bz2"/&gt;
+   &lt;/bzip2resource&gt;
+ &lt;/tarfileset&gt;
+&lt;/copy&gt;</pre>
+
+<p>downloads the archive <samp>some-archive.tar.bz2</samp>, uncompresses and extracts it on the fly,
+copies the contents of the <samp>lib</samp> directory into <samp>some-dir</samp> and discards the
+rest of the archive.  File timestamps will be compared between the archive's entries and files
+inside the target directory, no files get overwritten unless they are out-of-date.</p>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Types/xmlcatalog.html ant-1.10.3/manual/Types/xmlcatalog.html
--- ant-1.9.10/manual/Types/xmlcatalog.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/xmlcatalog.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,283 +24,219 @@
 
 <body>
 
-<h2><a name="XMLCatalog">XMLCatalog</a></h2>
+<h2 id="XMLCatalog">XMLCatalog</h2>
 
-<p>An XMLCatalog is a catalog of public resources such as DTDs or
-entities that are referenced in an XML document.  Catalogs are
-typically used to make web references to resources point to a locally
+<p>An XMLCatalog is a catalog of public resources such as DTDs or entities that are referenced in an
+XML document.  Catalogs are typically used to make web references to resources point to a locally
 cached copy of the resource.</p>
 
-<p>This allows the XML Parser, XSLT Processor or other consumer of XML 
-documents
-to efficiently allow a local substitution for a resource available on the 
-web.
-</p>
-<p><b>Note:</b> This task <em>uses, but does not depend on</em> external
-libraries not included in the Apache Ant distribution.  See <a
-  href="../install.html#librarydependencies">Library Dependencies</a> for more
-information.</p>
-<p>This data type provides a catalog of resource locations based
-on the <a
-href="http://oasis-open.org/committees/entity/spec-2001-08-06.html">
-OASIS "Open Catalog" standard</a>.  The catalog entries are used
-both for Entity resolution and URI resolution, in accordance with
-the <code>org.xml.sax.EntityResolver</code> and <code>
-javax.xml.transform.URIResolver</code> interfaces as defined
-in the <a href="https://jaxp.dev.java.net/">Java API for XML
-Processing (JAXP) Specification</a>.</p>
-<p>For example, in a <code>web.xml</code> file, the DTD is referenced as:
+<p>This allows the XML Parser, XSLT Processor or other consumer of XML documents to efficiently
+allow a local substitution for a resource available on the web.</p>
+<p><strong>Note:</strong> This task <em>uses, but does not depend on</em> external libraries not
+included in the Apache Ant distribution.  See <a href="../install.html#librarydependencies">Library
+Dependencies</a> for more information.</p>
+<p>This data type provides a catalog of resource locations based on
+the <a href="https://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html"
+target="_top">OASIS XML Catalog standard</a>.  The catalog entries are used both for Entity
+resolution and URI resolution, in accordance with
+the <code class="code">org.xml.sax.EntityResolver</code>
+and <code class="code">javax.xml.transform.URIResolver</code> interfaces as defined in
+the <a href="https://download.oracle.com/otn-pub/jcp/jaxp-1_6-mrel3-spec/JAXP1_6-FinalSpec.pdf"
+target="_top">Java API for XML Processing (JAXP) Specification</a>.</p>
+<p>For example, in a <code>web.xml</code> file, the DTD is referenced as:</p>
 <pre>
 &lt;!DOCTYPE web-app PUBLIC &quot;-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN&quot;
-  &quot;http://java.sun.com/j2ee/dtds/web-app_2_2.dtd&quot;&gt;
-</pre>
-The XML processor, without XMLCatalog support, would need to retrieve the 
-DTD from
-the URL specified whenever validation of the document was required.
-</p>
-<p>This can be very time consuming during the build process,
-especially where network throughput is limited.  Alternatively, you
-can do the following:
+  &quot;http://java.sun.com/j2ee/dtds/web-app_2_2.dtd&quot;&gt;</pre>
+<p>The XML processor, without XMLCatalog support, would need to retrieve the DTD from the URL
+specified whenever validation of the document was required.</p>
+<p>This can be very time consuming during the build process, especially where network throughput
+is limited.  Alternatively, you can do the following:</p>
 <ol>
-<li>Copy <code>web-app_2_2.dtd</code> onto your local disk somewhere (either in the
-filesystem or even embedded inside a jar or zip file on the classpath).</li>
-<li>Create an <code>&lt;xmlcatalog&gt;</code> with a <code>&lt;dtd&gt;</code> 
-element whose <code>location</code> attribute points to the file.</li>
-<li>Success! The XML processor will now use the local copy instead of calling out
-to the internet.</li>
+<li>Copy <samp>web-app_2_2.dtd</samp> onto your local disk somewhere (either in the filesystem
+or even embedded inside a jar or zip file on the classpath).</li>
+<li>Create an <code>&lt;xmlcatalog&gt;</code> with a <code>&lt;dtd&gt;</code> element
+whose <var>location</var> attribute points to the file.</li>
+<li>Success! The XML processor will now use the local copy instead of calling out to the
+internet.</li>
 </ol>
-</p>
-<p>XMLCatalogs can appear inside tasks
-that support this feature or at the same level as <code>target</code>
-- i.e., as children of <code>project</code> for reuse across different 
-tasks,
-e.g. XML Validation and XSLT Transformation.  The XML Validate task
-uses XMLCatalogs for entity resolution.  The XSLT Transformation
-task uses XMLCatalogs for both entity and URI resolution.</p>
-<p>XMLCatalogs are specified as either a reference to another
-XMLCatalog, defined previously in a build file, or as a list of
-<code>dtd</code> or <code>entity</code> locations.  In addition,
-external catalog files may be specified in a nested <code>catalogpath</code> ,
-but they will be ignored unless the resolver library from
-xml-commons is available in the system classpath.  <b>Due to backwards
-incompatible changes in the resolver code after the release of
-resolver 1.0, Ant will not support resolver.jar in version 1.0 - we
-expect a resolver release 1.1 to happen before Ant 1.6 gets
-released.</b>  A separate classpath for entity resolution may be
-specified inline via nested <code>classpath</code> elements; otherwise
+<p>XMLCatalogs can appear inside tasks that support this feature or at the same level
+as <code>target</code>&mdash;i.e., as children of <code>project</code> for reuse across
+different tasks, e.g. XML Validation and XSLT Transformation.  The XML Validate task uses
+XMLCatalogs for entity resolution.  The XSLT Transformation task uses XMLCatalogs for both
+entity and URI resolution.</p>
+<p>XMLCatalogs are specified as either a reference to another XMLCatalog, defined previously in
+a build file, or as a list of <code>dtd</code> or <code>entity</code> locations.  In addition,
+external catalog files may be specified in a nested <code>catalogpath</code>, but they will be
+ignored unless the resolver library from xml-commons is available in the system
+classpath.  <strong>Due to backwards incompatible changes in the resolver code after the release
+of resolver 1.0, Ant supports only resolver 1.1 or later.</strong>  A separate classpath for
+entity resolution may be specified inline via nested <code>classpath</code> elements; otherwise
 the system classpath is used for this as well.</p>
-<p>XMLCatalogs can also be nested inside other XMLCatalogs.  For
-example, a "superset" XMLCatalog could be made by including several
-nested XMLCatalogs that referred to other, previously defined
-XMLCatalogs.</p>
-<p>Resource locations can be specified either in-line or in
-external catalog file(s), or both.  In order to use an external
-catalog file, the xml-commons resolver library ("resolver.jar")
-must be in your path.  External catalog files may be either <a
-href="http://oasis-open.org/committees/entity/background/9401.html">
-plain text format</a> or <a
-href="http://www.oasis-open.org/committees/entity/spec-2001-08-06.html">
-XML format</a>.  If the xml-commons resolver library is not found in the
-classpath, external catalog files, specified in <code>catalogpath</code>, 
-will be ignored and a warning
-will be logged.  In this case, however, processing of inline entries will
-proceed normally.</p>
-<p>Currently, only <code>&lt;dtd&gt;</code> and
-<code>&lt;entity&gt;</code> elements may be specified inline; these
-roughly correspond to OASIS catalog entry types <code>PUBLIC</code> and
-<code>URI</code> respectively.  By contrast, external catalog files
-may use any of the entry types defined in the 
-<a href="http://oasis-open.org/committees/entity/spec-2001-08-06.html">
-+OASIS specification</a>.</p>
-<h3><a name="ResolverAlgorithm">Entity/DTD/URI Resolution Algorithm</a></h3>
-
-When an entity, DTD, or URI is looked up by the XML processor, the
-XMLCatalog searches its list of entries to see if any match.  That is,
-it attempts to match the <code>publicId</code> attribute of each entry
-with the PublicID or URI of the entity to be resolved.  Assuming a
-matching entry is found, XMLCatalog then executes the following steps:
+<p>XMLCatalogs can also be nested inside other XMLCatalogs.  For example, a "superset"
+XMLCatalog could be made by including several nested XMLCatalogs that referred to other,
+previously defined XMLCatalogs.</p>
+<p>Resource locations can be specified either in-line or in external catalog file(s), or both.  In
+order to use an external catalog file, the xml-commons resolver library (<samp>resolver.jar</samp>)
+must be in your path.  External catalog files may be
+either <a href="https://oasis-open.org/committees/entity/background/9401.html" target="_top">plain
+text format</a> or <a href="https://www.oasis-open.org/committees/entity/spec-2001-08-06.html"
+target="_top">XML format</a>.  If the xml-commons resolver library is not found in the classpath,
+external catalog files, specified in <code>catalogpath</code>, will be ignored and a warning will be
+logged.  In this case, however, processing of inline entries will proceed normally.</p>
+<p>Currently, only <code>&lt;dtd&gt;</code> and <code>&lt;entity&gt;</code> elements may be
+specified inline; these roughly correspond to OASIS catalog entry types <code>PUBLIC</code>
+and <code>URI</code> respectively.  By contrast, external catalog files may use any of the entry
+types defined in
+the <a href="https://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html"
+target="_top">OASIS specification</a>.</p>
+<h3 id="ResolverAlgorithm">Entity/DTD/URI resolution algorithm</h3>
+<p>When an entity, DTD, or URI is looked up by the XML processor, the XMLCatalog searches its list
+of entries to see if any match.  That is, it attempts to match the <var>publicId</var> attribute of
+each entry with the PublicID or URI of the entity to be resolved.  Assuming a matching entry is
+found, XMLCatalog then executes the following steps:</p>
 
 <h4>1. Filesystem lookup</h4>
 
-<p>The <code>location</code> is first looked up in the filesystem.  If
-the <code>location</code> is a relative path, the ant project basedir
-attribute is used as the base directory.  If the <code>location</code>
-specifies an absolute path, it is used as is.  Once we have an
-absolute path in hand, we check to see if a valid and readable file
-exists at that path.  If so, we are done.  If not, we proceed to the
-next step.</p>
+<p>The <var>location</var> is first looked up in the filesystem.  If the <var>location</var> is a
+relative path, the Ant project <var>basedir</var> attribute is used as the base directory.  If
+the <var>location</var> specifies an absolute path, it is used as is.  Once we have an absolute path
+in hand, we check to see if a valid and readable file exists at that path.  If so, we are done.  If
+not, we proceed to the next step.</p>
 
 <h4>2. Classpath lookup</h4>
 
-<p>The <code>location</code> is next looked up in the classpath.
-Recall that jar files are merely fancy zip files.  For classpath
-lookup, the <code>location</code> is used as is (no base is
-prepended).  We use a Classloader to attempt to load the resource from
-the classpath.  For example, if hello.jar is in the classpath and it
-contains <code>foo/bar/blat.dtd</code> it will resolve an entity whose
-<code>location</code> is <code>foo/bar/blat.dtd</code>.  Of course, it
-will <em>not</em> resolve an entity whose <code>location</code> is
-<code>blat.dtd</code>.
-
+<p>The <var>location</var> is next looked up in the classpath.  Recall that jar files are merely
+fancy zip files.  For classpath lookup, the <var>location</var> is used as is (no base is
+prepended).  We use a Classloader to attempt to load the resource from the classpath.  For example,
+if <samp>hello.jar</samp> is in the classpath and it contains <samp>foo/bar/blat.dtd</samp> it will
+resolve an entity whose <var>location</var> is <samp>foo/bar/blat.dtd</samp>.  Of course, it
+will <em>not</em> resolve an entity whose <var>location</var> is <code>blat.dtd</code>.</p>
 
 <h4>3a. Apache xml-commons resolver lookup</h4>
 
-<p>What happens next depends on whether the resolver library from
-xml-commons is available on the classpath.  If so, we defer all
-further attempts at resolving to it.  The resolver library supports
-extremely sophisticated functionality like URL rewriting and so on,
-which can be accessed by making the appropriate entries in external
-catalog files (XMLCatalog does not yet provide inline support for all
-of the entries defined in the <a
-href="http://oasis-open.org/committees/entity/spec-2001-08-06.html">OASIS
-standard</a>).</p>
+<p>What happens next depends on whether the resolver library from xml-commons is available on the
+classpath.  If so, we defer all further attempts at resolving to it.  The resolver library supports
+extremely sophisticated functionality like URL rewriting and so on, which can be accessed by making
+the appropriate entries in external catalog files (XMLCatalog does not yet provide inline support
+for all of the entries defined in
+the <a href="https://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html"
+target="_top">OASIS standard</a>).</p>
 
 <h4>3. URL-space lookup</h4>
 
-<p>Finally, we attempt to make a URL out of the <code>location</code>.
-At first this may seem like this would defeat the purpose of
-XMLCatalogs -- why go back out to the internet?  But in fact, this can
-be used to (in a sense) implement HTTP redirects, substituting one URL
-for another.  The mapped-to URL might also be served by a local web
-server.  If the URL resolves to a valid and readable resource, we are
-done.  Otherwise, we give up.  In this case, the XML processor will
-perform its normal resolution algorithm.  Depending on the processor
-configuration, further resolution failures may or may not result in
-fatal (i.e. build-ending) errors.</p>
+<p>Finally, we attempt to make a URL out of the <var>location</var>.  At first this may seem like
+this would defeat the purpose of XMLCatalogs&mdash;why go back out to the internet?  But in fact,
+this can be used to (in a sense) implement HTTP redirects, substituting one URL for another.  The
+mapped-to URL might also be served by a local web server.  If the URL resolves to a valid and
+readable resource, we are done.  Otherwise, we give up.  In this case, the XML processor will
+perform its normal resolution algorithm.  Depending on the processor configuration, further
+resolution failures may or may not result in fatal (i.e. build-ending) errors.</p>
 
 <h3>XMLCatalog attributes</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
   </tr>
   <tr>
-    <td valign="top">id</td>
-    <td valign="top">a unique name for an XMLCatalog, used for referencing 
-the
-    XMLCatalog's contents from another XMLCatalog</td>
-    <td valign="top" align="center">No</td>
+    <td>id</td>
+    <td>a unique name for an XMLCatalog, used for referencing the XMLCatalog's contents from
+    another XMLCatalog</td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">refid</td>
-    <td valign="top">the <code>id</code> of another XMLCatalog whose 
-contents
-    you would like to be used for this XMLCatalog</td>
-    <td valign="top" align="center">No</td>
+    <td>refid</td>
+    <td>the <var>id</var> of another XMLCatalog whose contents you would like to be used for
+    this XMLCatalog</td>
+    <td>No</td>
   </tr>
 </table>
 
 <h3>XMLCatalog nested elements</h3>
 <h4>dtd/entity</h4>
-<p>The <code>dtd</code> and <code>entity</code> elements used to specify
-XMLCatalogs are identical in their structure</p>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">publicId</td>
-    <td valign="top">The public identifier used when defining a dtd or 
-entity,
-    e.g. <code>&quot;-//Sun Microsystems, Inc.//DTD Web Application 
-2.2//EN&quot;</code>
-    </td>
-    <td valign="top" align="center">Yes</td>
-  </tr>
-  <tr>
-    <td valign="top">location</td>
-    <td valign="top">The location of the local replacement to be used for 
-the public identifier specified. This may be specified as a file name, 
-resource name found on the classpath, or a URL.  Relative paths will
-be resolved according to the base, which by default is the Ant project
-basedir.
-    </td>
-    <td valign="top" align="center">Yes</td>
+<p>The <code>dtd</code> and <code>entity</code> elements used to specify XMLCatalogs are
+identical in their structure</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>publicId</td>
+    <td>The public identifier used when defining a dtd or entity, e.g.
+    <code>&quot;-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN&quot;</code></td>
+    <td>Yes</td>
+  </tr>
+  <tr>
+    <td>location</td>
+    <td>The location of the local replacement to be used for the public identifier specified. This
+    may be specified as a file name, resource name found on the classpath, or a URL.  Relative paths
+    will be resolved according to the base, which by default is the Ant
+    project <var>basedir</var>.</td>
+    <td>Yes</td>
   </tr>
 </table>
 <h4>classpath</h4>
-<p>The classpath to use for <a href="#ResolverAlgorithm">entity
-resolution</a>.  The nested <code>&lt;classpath&gt;</code> is a
-<a href="../using.html#path">path</a>-like structure.</p>
+<p>The classpath to use for <a href="#ResolverAlgorithm">entity resolution</a>.  The
+nested <code>&lt;classpath&gt;</code> is a <a href="../using.html#path">path</a>-like structure.</p>
 <h4>catalogpath</h4>
-<p>
-The nested <code>catalogpath</code> element is a <a
-href="../using.html#path">path</a>-like structure listing catalog files to
-search.  All files in this path are assumed to be OASIS catalog files, in
-either
-<a href="http://oasis-open.org/committees/entity/background/9401.html">
-plain text format</a> or <a
-href="http://www.oasis-open.org/committees/entity/spec-2001-08-06.html">
-XML format</a>. Entries specifying nonexistent files will be ignored. If the
-resolver library from xml-commons is not available in the classpath, all
-<code>catalogpaths</code> will be ignored and a warning will be logged.
-</p>
+<p>The nested <code>catalogpath</code> element is a <a href="../using.html#path">path</a>-like
+structure listing catalog files to search.  All files in this path are assumed to be OASIS catalog
+files, in either <a href="https://oasis-open.org/committees/entity/background/9401.html"
+target="_top">plain text format</a>
+or <a href="https://www.oasis-open.org/committees/entity/spec-2001-08-06.html" target="_top">XML
+format</a>. Entries specifying nonexistent files will be ignored. If the resolver library from
+xml-commons is not available in the classpath, all <code>catalogpath</code>s will be ignored and a
+warning will be logged.</p>
 <h3>Examples</h3>
-<p>Set up an XMLCatalog with a single dtd referenced locally in a user's 
-home 
-directory:</p>
-<blockquote><pre>
-    &lt;xmlcatalog&gt;
-        &lt;dtd 
-            publicId=&quot;-//OASIS//DTD DocBook XML V4.1.2//EN&quot;
-            location=&quot;/home/dion/downloads/docbook/docbookx.dtd&quot;/&gt;
-    &lt;/xmlcatalog&gt;
-</pre></blockquote>
-<p>Set up an XMLCatalog with a multiple dtds to be found either in the
-filesystem (relative to the Ant project basedir) or in the classpath:
+<p>Set up an XMLCatalog with a single DTD referenced locally in a user's home directory:</p>
+<pre>
+&lt;xmlcatalog&gt;
+    &lt;dtd publicId=&quot;-//OASIS//DTD DocBook XML V4.1.2//EN&quot;
+         location=&quot;/home/dion/downloads/docbook/docbookx.dtd&quot;/&gt;
+&lt;/xmlcatalog&gt;</pre>
+<p>Set up an XMLCatalog with a multiple DTDs to be found either in the filesystem (relative to
+the Ant project <var>basedir</var>) or in the classpath:
 </p>
-<blockquote><pre>
-    &lt;xmlcatalog id=&quot;commonDTDs&quot;&gt;
-        &lt;dtd 
-            publicId=&quot;-//OASIS//DTD DocBook XML V4.1.2//EN&quot;
-            location=&quot;docbook/docbookx.dtd&quot;/&gt;
-        &lt;dtd 
-            publicId=&quot;-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN&quot;
-            location=&quot;web-app_2_2.dtd&quot;/&gt;
-    &lt;/xmlcatalog&gt;
-</pre></blockquote>
+<pre>
+&lt;xmlcatalog id=&quot;commonDTDs&quot;&gt;
+    &lt;dtd publicId=&quot;-//OASIS//DTD DocBook XML V4.1.2//EN&quot;
+         location=&quot;docbook/docbookx.dtd&quot;/&gt;
+    &lt;dtd publicId=&quot;-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN&quot;
+         location=&quot;web-app_2_2.dtd&quot;/&gt;
+&lt;/xmlcatalog&gt;</pre>
+
+<p>Set up an XMLCatalog with a combination of DTDs and entities as well as a nested XMLCatalog
+and external catalog files in both formats:</p>
 
-<p>Set up an XMLCatalog with a combination of DTDs and entities as
-well as a nested XMLCatalog and external catalog files in both
-formats:</p>
-
-<blockquote><pre>
-    &lt;xmlcatalog id=&quot;allcatalogs&quot;&gt;
-        &lt;dtd 
-            publicId=&quot;-//ArielPartners//DTD XML Article V1.0//EN&quot;
-            location=&quot;com/arielpartners/knowledgebase/dtd/article.dtd&quot;/&gt;
-        &lt;entity 
-            publicId=&quot;LargeLogo&quot;
+<pre>
+&lt;xmlcatalog id=&quot;allcatalogs&quot;&gt;
+    &lt;dtd publicId=&quot;-//ArielPartners//DTD XML Article V1.0//EN&quot;
+         location=&quot;com/arielpartners/knowledgebase/dtd/article.dtd&quot;/&gt;
+    &lt;entity publicId=&quot;LargeLogo&quot;
             location=&quot;com/arielpartners/images/ariel-logo-large.gif&quot;/&gt;
-        &lt;xmlcatalog refid="commonDTDs"/&gt;
-            &lt;catalogpath&gt;
-                &lt;pathelement location="/etc/sgml/catalog"/&gt;
-                &lt;fileset 
-                    dir=&quot;/anetwork/drive&quot;
-                    includes=&quot;**/catalog&quot;/&gt;
-                &lt;fileset 
-                    dir=&quot;/my/catalogs&quot;
-                    includes=&quot;**/catalog.xml&quot;/&gt;
-            &lt;/catalogpath&gt;
-        &lt;/xmlcatalog&gt;
+    &lt;xmlcatalog refid="commonDTDs"/&gt;
+        &lt;catalogpath&gt;
+            &lt;pathelement location="/etc/sgml/catalog"/&gt;
+            &lt;fileset dir=&quot;/anetwork/drive&quot;
+                     includes=&quot;**/catalog&quot;/&gt;
+            &lt;fileset dir=&quot;/my/catalogs&quot;
+                     includes=&quot;**/catalog.xml&quot;/&gt;
+        &lt;/catalogpath&gt;
     &lt;/xmlcatalog&gt;
-</pre></blockquote>
+&lt;/xmlcatalog&gt;</pre>
 <p>To reference the above XMLCatalog in an <code>xslt</code> task:<p>
-<blockquote><pre>
-    &lt;xslt basedir="${source.doc}"
-           destdir="${dest.xdocs}"
-           extension=".xml"
-           style="${source.xsl.converter.docbook}"
-           includes="**/*.xml"
-           force="true"&gt;
-        &lt;xmlcatalog refid=&quot;allcatalogs&quot;/&gt;
-    &lt;/xslt&gt;
-</pre></blockquote>
-
-
+<pre>
+&lt;xslt basedir="${source.doc}"
+      destdir="${dest.xdocs}"
+      extension=".xml"
+      style="${source.xsl.converter.docbook}"
+      includes="**/*.xml"
+      force="true"&gt;
+    &lt;xmlcatalog refid=&quot;allcatalogs&quot;/&gt;
+&lt;/xslt&gt;</pre>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/Types/zipfileset.html ant-1.10.3/manual/Types/zipfileset.html
--- ant-1.9.10/manual/Types/zipfileset.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/Types/zipfileset.html	2018-03-24 12:37:12.000000000 +0000
@@ -14,7 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
   <meta http-equiv="Content-Language" content="en-us">
@@ -22,127 +21,109 @@
 <title>ZipFileSet Type</title>
 </head>
 <body>
-<h2><a name="fileset">ZipFileSet</a></h2>
+<h2 id="fileset">ZipFileSet</h2>
 
-<p>A <code>&lt;zipfileset&gt;</code> is a special form of a <code>&lt;<a
- href="fileset.html">fileset</a>&gt;</code> which can behave in 2
-different ways : <br>
-</p>
+<p>A <code>&lt;zipfileset&gt;</code> is a special form of
+a <code>&lt;<a href="fileset.html">fileset</a>&gt;</code> which can behave in 2 different ways:</p>
 <ul>
-  <li>When the <span style="font-style: italic;">src</span> attribute
-  is used - or a nested resource collection has been specified
-  (<em>since Apache Ant 1.7</em>), the zipfileset is populated with 
-  zip entries found in the file <span style="font-style:
-  italic;">src</span>.<br>
-  </li>
-  <li>When the <span style="font-style: italic;">dir</span> attribute
-is used, the zipfileset is populated with filesystem files found under <span
- style="font-style: italic;">dir</span>.<br>
-  </li>
+  <li>When the <var>src</var> attribute is used&mdash;or a nested resource collection has been
+    specified (<em>since Apache Ant 1.7</em>), the zipfileset is populated with zip entries found in
+    the file <var>src</var>.</li>
+  <li>When the <var>dir</var> attribute is used, the zipfileset is populated with filesystem files
+    found under <var>dir</var>.</li>
 </ul>
-<p><code>&lt;zipfileset&gt;</code> supports all attributes of <code>&lt;<a
- href="fileset.html">fileset</a>&gt;</code>
- in addition to those listed below.  Note that zip archives in general
- don't contain entries with leading slashes so you shouldn't use
- include/exclude patterns that start with slashes either.</p>
-
-<p>Since Ant 1.6, a zipfileset can be defined with the <span
- style="font-style: italic;">id </span>attribute and referred to with
-the <span style="font-style: italic;">refid</span> attribute.<br>
-</p>
+<p><code>&lt;zipfileset&gt;</code> supports all attributes
+of <code>&lt;<a href="fileset.html">fileset</a>&gt;</code> in addition to those listed below.  Note
+that zip archives in general don't contain entries with leading slashes so you shouldn't
+use <var>includes</var>/<var>excludes</var> patterns that start with slashes either.</p>
+
+<p><em>Since Ant 1.6</em>, a zipfileset can be defined with the <var>id</var> attribute and referred
+to with the <var>refid</var> attribute.</p>
+
 <h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
   <tbody>
     <tr>
-      <td valign="top"><b>Attribute</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td valign="top" align="center"><b>Required</b></td>
+      <th>Attribute</th>
+      <th>Description</th>
+      <th>Required</th>
     </tr>
     <tr>
-      <td valign="top">prefix</td>
-      <td valign="top">all files in the fileset are prefixed with that 
-path in the archive.</td>
-      <td align="center" valign="top">No</td>
+      <td>prefix</td>
+      <td>all files in the fileset are prefixed with that path in the archive.</td>
+      <td>No</td>
     </tr>
     <tr>
-      <td valign="top">fullpath</td>
-      <td valign="top">the file described by the fileset is placed at  
-that exact location in the archive.</td>
-      <td align="center" valign="top">No</td>
+      <td>fullpath</td>
+      <td>the file described by the fileset is placed at that exact location in the archive.</td>
+      <td>No</td>
     </tr>
     <tr>
-      <td valign="top">src</td>
-      <td valign="top">may be used in place of the <i>dir</i> attribute
- to specify a zip file whose contents will be extracted and     included
-in the archive.</td>
-      <td align="center" valign="top">No</td>
+      <td>src</td>
+      <td>may be used in place of the <var>dir</var> attribute to specify a zip file whose contents
+        will be extracted and included in the archive.</td>
+      <td>No</td>
     </tr>
     <tr>
-      <td valign="top">filemode</td>
-      <td valign="top">A 3 digit octal string, specify the user, group 
-and other modes in the standard Unix fashion.  Only applies to    
-plain files.  Default is 644. <em>since Ant 1.5.2</em>.</td>
-      <td align="center" valign="top">No</td>
+      <td>filemode</td>
+      <td>A 3 digit octal string, specify the user, group and other modes in the standard Unix
+        fashion. Only applies to plain files. <em>Since Ant 1.5.2</em></td>
+      <td>No; default is <q>644</q></td>
     </tr>
     <tr>
-      <td valign="top">dirmode</td>
-      <td valign="top">A 3 digit octal string, specify the user, group 
-and other modes in the standard Unix fashion.  Only applies to    
-directories.  Default is 755. <em>since Ant 1.5.2</em>.</td>
-      <td align="center" valign="top">No</td>
+      <td>dirmode</td>
+      <td>A 3 digit octal string, specify the user, group and other modes in the standard Unix
+        fashion. Only applies to directories. <em>Since Ant 1.5.2</em></td>
+      <td>No; default is <q>755</q></td>
     </tr>
     <tr>
-      <td valign="top">encoding</td>
-      <td valign="top">The character encoding to use for filenames
-      inside the zip file.  For a list of possible values see the <a
-      href="http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html">Supported Encodings</a>.
-      Defaults to the platform's default character encoding.
-      <td align="center" valign="top">No</td>
+      <td>encoding</td>
+      <td>The character encoding to use for filenames inside the zip file.  For a list of possible
+        values see
+        the <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html"
+        target="_top">Supported Encodings</a>.
+      <td>No; defaults to default JVM character encoding</td>
     </tr>
     <tr>
-      <td valign="top">erroronmissingarchive</td>
-      <td valign="top">
-        Specify what happens if the archive does not exist.
-        If true, a build error will happen; if false, the fileset
-        will be ignored/empty.
-        Defaults to true.
-        <em>Since Ant 1.8.0</em>
-      </td>
-      <td valign="top" align="center">No</td>
+      <td>erroronmissingarchive</td>
+      <td>Specify what happens if the archive does not exist.  If <q>true</q>, a build error will
+        happen; if <q>false</q>, the fileset will be ignored/empty.  <em>Since Ant 1.8.0</em></td>
+      <td>No; defaults to <q>true</q></td>
     </tr>
   </tbody>
 </table>
-<p>The <i>fullpath</i> attribute can only be set for filesets that
-represent a single file. The <i>prefix</i> and <i>fullpath</i>
-attributes cannot both be set on the same fileset.</p>
-<p>When using the <i>src</i> attribute, include and exclude patterns
-may be used to specify a subset of the archive for inclusion in the
-archive as with the <i>dir</i> attribute.</p>
-
-<p>Please note that currently only the <a
-href="../Tasks/tar.html">tar</a> and <a
-href="../Tasks/zip.html">zip</a> tasks use the permission.</p>
+<p>The <var>fullpath</var> attribute can only be set for filesets that represent a single
+file. The <var>prefix</var> and <var>fullpath</var> attributes cannot both be set on the same
+fileset.</p>
+<p>When using the <var>src</var> attribute, <var>includes</var> and <var>excludes</var> patterns
+may be used to specify a subset of the archive for inclusion in the archive as with
+the <var>dir</var> attribute.</p>
+
+<p>Please note that currently only the <a href="../Tasks/tar.html">tar</a>
+and <a href="../Tasks/zip.html">zip</a> tasks use the permission.</p>
 
 <h3>Parameters specified as nested elements</h3>
 
-<h4>any file system based <a href="resources.html">resource</a> or
-single element resource collection</h4>
+<h4>any file system based <a href="resources.html">resource</a> or single element resource
+collection</h4>
 
-<p>The specified resource will be used as src.</p>
+<p>The specified resource will be used as <var>src</var>.</p>
 
 <h4>Examples</h4>
-<blockquote>
-  <pre>  &lt;zip destfile="${dist}/manual.zip"&gt;<br>    &lt;zipfileset dir="htdocs/manual" prefix="docs/user-guide"/&gt;<br>    &lt;zipfileset dir="." includes="ChangeLog27.txt" fullpath="docs/ChangeLog.txt"/&gt;<br>    &lt;zipfileset src="examples.zip" includes="**/*.html" prefix="docs/examples"/&gt;<br>  &lt;/zip&gt;<br></pre>
-  <p>zips all files in the <code>htdocs/manual</code> directory into
-the <code>docs/user-guide</code> directory in the archive, adds the
-file <code>ChangeLog27.txt</code> in the current directory as <code>docs/ChangeLog.txt</code>,
-and includes all the html files in <code>examples.zip</code> under <code>docs/examples</code>.
+<pre>
+&lt;zip destfile="${dist}/manual.zip"&gt;
+  &lt;zipfileset dir="htdocs/manual" prefix="docs/user-guide"/&gt;
+  &lt;zipfileset dir="." includes="ChangeLog27.txt" fullpath="docs/ChangeLog.txt"/&gt;
+  &lt;zipfileset src="examples.zip" includes="**/*.html" prefix="docs/examples"/&gt;
+&lt;/zip&gt;</pre>
+<p>zips all files in the <samp>htdocs/manual</samp> directory into
+the <samp>docs/user-guide</samp> directory in the archive, adds the
+file <samp>ChangeLog27.txt</samp> in the current directory as <samp>docs/ChangeLog.txt</samp>,
+and includes all the html files in <samp>examples.zip</samp> under <samp>docs/examples</samp>.
 The archive might end up containing the files:</p>
-  <code> docs/user-guide/html/index.html<br>
-docs/ChangeLog.txt<br>
-docs/examples/index.html<br>
-  </code></blockquote>
-
+<pre>docs/user-guide/html/index.html
+docs/ChangeLog.txt
+docs/examples/index.html</pre>
 
 </body>
 </html>
diff -Nru ant-1.9.10/manual/using.html ant-1.10.3/manual/using.html
--- ant-1.9.10/manual/using.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/using.html	2018-03-24 12:37:12.000000000 +0000
@@ -24,146 +24,116 @@
 
 <body>
 <h1>Using Apache Ant</h1>
-<h2><a name="buildfile">Writing a Simple Buildfile</a></h2>
-<p>Apache Ant's buildfiles are written in XML. Each buildfile contains one project
-and at least one (default) target. Targets contain task elements.
-Each task element of the buildfile can have an <code>id</code> attribute and
-can later be referred to by the value supplied to this. The value has
-to be unique. (For additional information, see the
-<a href="#tasks"> Tasks</a> section below.)</p>
-<h3><a name="projects">Projects</a></h3>
-<p>A <i>project</i> has three attributes:</p>
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top"><b>Attribute</b></td>
-    <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Required</b></td>
-  </tr>
-  <tr>
-    <td valign="top">name</td>
-    <td valign="top">the name of the project.</td>
-    <td align="center" valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">default</td>
-    <td valign="top">the default target to use when no target is supplied.</td>
-    <td align="center" valign="top">No; however, <b>since Ant 1.6.0</b>,
-        every project includes an implicit target that contains any and
-        all top-level tasks and/or types. This target will always be
-        executed as part of the project's initialization, even when Ant is
-        run with the <a href="running.html#options">-projecthelp</a> option.
+<h2 id="buildfile">Writing a Simple Buildfile</h2>
+<p>Apache Ant's buildfiles are written in XML. Each buildfile contains one project and at least one (default)
+target. Targets contain task elements.  Each task element of the buildfile can have an <var>id</var> attribute and can
+later be referred to by the value supplied to this. The value has to be unique. (For additional information, see
+the <a href="#tasks">Tasks</a> section below.)</p>
+
+<h3 id="projects">Projects</h3>
+<p>A <em>project</em> has three attributes:</p>
+<table class="attr">
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Required</th>
+  </tr>
+  <tr>
+    <td>name</td>
+    <td>the name of the project.</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>default</td>
+    <td>the default target to use when no target is supplied.</td>
+    <td>No; however, <em>since Ant 1.6.0</em>, every project includes an implicit target that contains any and all
+      top-level tasks and/or types. This target will always be executed as part of the project's initialization, even
+      when Ant is run with the <a href="running.html#options"><kbd>-projecthelp</kbd></a> option.
     </td>
   </tr>
   <tr>
-    <td valign="top">basedir</td>
-    <td valign="top">the base directory from which all path calculations are
-      done. This attribute might be overridden by setting
-      the &quot;basedir&quot;
-      property beforehand. When this is done, it must be omitted in the
-      project tag. If neither the attribute nor the property have
-      been set, the parent directory of the buildfile will be used.<br/>
-      A relative path is resolved relative to the directory containing
-      the build file.
+    <td>basedir</td>
+    <td>the base directory from which all path calculations are done. A relative path is resolved relative to the
+      directory containing the buildfile.
     </td>
-    <td align="center" valign="top">No</td>
+    <td>No; defaults to the parent directory of the buildfile, unless overridden by the project's <var>basedir</var> or
+      the <code>basedir</code> property</td>
   </tr>
 </table>
-<p>Optionally, a description for the project can be provided as a
-top-level <code>&lt;description&gt;</code> element (see the <a
-href="Types/description.html">description</a> type).</p>
-
-<p>Each project defines one or more <i>targets</i>.
-A target is a set of <i>tasks</i> you want
-to be executed. When starting Ant, you can select which target(s) you
-want to have executed. When no target is given,
-the project's default is used.</p>
-
-<h3><a name="targets">Targets</a></h3>
-<p>A target can depend on other targets. You might have a target for compiling,
-for example, and a target for creating a distributable. You can only build a
-distributable when you have compiled first, so the distribute target
-<i>depends on</i> the compile target. Ant resolves these dependencies.</p>
-<p>It should be noted, however, that Ant's <code>depends</code> attribute
-only specifies the <i>order</i> in which targets should be executed - it
-does not affect whether the target that specifies the dependency(s) gets
-executed if the dependent target(s) did not (need to) run.
-</p>
+<p>Optionally, a description for the project can be provided as a top-level <code>&lt;description&gt;</code> element
+(see the <a href="Types/description.html">description</a> type).</p>
 
-<p>More information can be found in the
-  dedicated <a href="targets.html">manual page</a>.</p>
+<p>Each project defines one or more <em>targets</em>.  A target is a set of <em>tasks</em> you want to be executed. When
+starting Ant, you can select which target(s) you want to have executed. When no target is given, the
+project's <var>default</var> is used.</p>
+
+<h3 id="targets">Targets</h3>
+<p>A target can depend on other targets. You might have a target for compiling, for example, and a target for creating a
+distributable. You can only build a distributable when you have compiled first, so the <q>distribute</q>
+target <em>depends on</em> the <q>compile</q> target. Ant resolves these dependencies.</p>
+<p>It should be noted, however, that Ant's <var>depends</var> attribute only specifies the <em>order</em> in which
+targets should be executed&mdash;it does not affect whether the target that specifies the dependency(s) gets executed if
+the dependent target(s) did not (need to) run.</p>
 
-<h3><a name="tasks">Tasks</a></h3>
+<p>More information can be found in the dedicated <a href="targets.html">manual page</a>.</p>
+
+<h3 id="tasks">Tasks</h3>
 <p>A task is a piece of code that can be executed.</p>
-<p>A task can have multiple attributes (or arguments, if you prefer). The value
-of an attribute might contain references to a property. These references will be
-resolved before the task is executed.</p>
+<p>A task can have multiple attributes (or arguments, if you prefer). The value of an attribute might contain references
+to a property. These references will be resolved before the task is executed.</p>
 <p>Tasks have a common structure:</p>
-<blockquote>
-  <pre>&lt;<i>name</i> <i>attribute1</i>=&quot;<i>value1</i>&quot; <i>attribute2</i>=&quot;<i>value2</i>&quot; ... /&gt;</pre>
-</blockquote>
-<p>where <i>name</i> is the name of the task,
-<i>attributeN</i> is the attribute name, and
-<i>valueN</i> is the value for this attribute.</p>
-<p>There is a set of <a href="tasklist.html" target="navFrame">built-in tasks</a>, but it is also very
-easy to <a href="develop.html#writingowntask">write your own</a>.</p>
-<p>All tasks share a task name attribute. The value of
-this attribute will be used in the logging messages generated by
-Ant.</p>
-Tasks can be assigned an <code>id</code> attribute:
-<blockquote>
-<pre>&lt;<i>taskname</i> id="<i>taskID</i>" ... /&gt;</pre>
-</blockquote>
-where <i>taskname</i> is the name of the task, and <i>taskID</i> is
-a unique identifier for this task.
-You can refer to the
-corresponding task object in scripts or other tasks via this name.
-For example, in scripts you could do:
-<blockquote>
+
+<pre>&lt;<i>name</i> <var>attribute1</var>=&quot;<i>value1</i>&quot; <var>attribute2</var>=&quot;<i>value2</i>&quot; ... /&gt;</pre>
+
+<p>where <code><i>name</i></code> is the name of the task, <var>attributeN</var> is the attribute name,
+and <code><i>valueN</i></code> is the value for this attribute.</p>
+<p>There is a set of <a href="tasklist.html" target="navFrame">built-in tasks</a>, but it is also very easy
+to <a href="develop.html#writingowntask">write your own</a>.</p>
+<p>All tasks can have a <var>name</var> attribute. The value of this attribute will be used in the logging messages
+generated by Ant.</p>
+<p>Tasks can be assigned an <var>id</var> attribute:</p>
+
+<pre>&lt;<i>taskname</i> <var>id</var>="<i>taskID</i>" ... /&gt;</pre>
+
+<p>where <code><i>taskname</i></code> is the name of the task, and <code><i>taskID</i></code> is a unique identifier for
+this task.  You can refer to the corresponding task object in scripts or other tasks via this name.  For example, in
+scripts you could do:</p>
+
 <pre>
 &lt;script ... &gt;
   task1.setFoo("bar");
-&lt;/script&gt;
-</pre>
-</blockquote>
-to set the <code>foo</code> attribute of this particular task instance.
-In another task (written in Java), you can access the instance via
-<code>project.getReference("task1")</code>.
-<p>
-Note<sup>1</sup>: If &quot;task1&quot; has not been run yet, then
-it has not been configured (ie., no attributes have been set), and if it is
-going to be configured later, anything you've done to the instance may
-be overwritten.
-</p>
-<p>
-Note<sup>2</sup>: Future versions of Ant will most likely <i>not</i>
-be backward-compatible with this behaviour, since there will likely be no
-task instances at all, only proxies.
-</p>
+&lt;/script&gt;</pre>
+<p>to set the <code>foo</code> attribute of this particular task instance.  In another task (written in Java), you can
+access the instance via <code class="code">project.getReference("task1")</code>.</p>
+<p>Note 1: If <q>task1</q> has not been run yet, then it has not been configured (ie., no attributes have been set), and
+if it is going to be configured later, anything you've done to the instance may be overwritten.</p>
+<p>Note 2: Future versions of Ant will most likely <em>not</em> be backward-compatible with this behaviour, since there
+will likely be no task instances at all, only proxies.</p>
 
-<h3><a name="properties">Properties</a></h3>
+<h3 id="properties">Properties</h3>
 
 <p>Properties are an important way to customize a build process or
   to just provide shortcuts for strings that are used repeatedly
-  inside a build file.</p>
+  inside a buildfile.</p>
 
-<p>In its most simple form properties are defined in the build file
+<p>In its most simple form properties are defined in the buildfile
   (for example by the <a href="Tasks/property.html">property</a>
   task) or might be set outside Ant.  A property has a name and a
   value; the name is case-sensitive. Properties may be used in the
   value of task attributes or in the nested text of tasks that support
   them.  This is done by placing the property name between
-  &quot;<code>${</code>&quot; and &quot;<code>}</code>&quot; in the
-  attribute value. For example, if there is a &quot;builddir&quot;
-  property with the value &quot;build&quot;, then this could be used
-  in an attribute like this: <code>${builddir}/classes</code>.  This
-  is resolved at run-time as <code>build/classes</code>.</p>
+  <q>${</q> and <q>}</q> in the
+  attribute value. For example, if there is a <code>builddir</code>
+  property with the value <q>build</q>, then this could be used
+  in an attribute like this: <samp>${builddir}/classes</samp>.  This
+  is resolved at run-time as <samp>build/classes</samp>.</p>
 
-<p>With Ant 1.8.0 property expansion has become much more powerful
+<p><em>Since Ant 1.8.0</em>, property expansion has become much more powerful
   than simple key value pairs, more details can be
   found <a href="properties.html">in the concepts section</a> of this
   manual.</p>
 
-<h3><a name="example">Example Buildfile</a></h3>
+<h3 id="example">Example Buildfile</h3>
 <pre>
 &lt;project name=&quot;MyProject&quot; default=&quot;dist&quot; basedir=&quot;.&quot;&gt;
   &lt;description&gt;
@@ -183,7 +153,7 @@
 
   &lt;target name=&quot;compile&quot; depends=&quot;init&quot;
         description=&quot;compile the source&quot;&gt;
-    &lt;!-- Compile the java code from ${src} into ${build} --&gt;
+    &lt;!-- Compile the Java code from ${src} into ${build} --&gt;
     &lt;javac srcdir=&quot;${src}&quot; destdir=&quot;${build}&quot;/&gt;
   &lt;/target&gt;
 
@@ -202,268 +172,199 @@
     &lt;delete dir=&quot;${build}&quot;/&gt;
     &lt;delete dir=&quot;${dist}&quot;/&gt;
   &lt;/target&gt;
-&lt;/project&gt;
-</pre>
+&lt;/project&gt;</pre>
 
-<p>Notice that we are declaring properties outside any target.  As of
-Ant 1.6 all tasks can be declared outside targets (earlier version
-only allowed <tt>&lt;property&gt;</tt>,<tt>&lt;typedef&gt;</tt> and
-<tt>&lt;taskdef&gt;</tt>).  When you do this they are evaluated before
-any targets are executed.  Some tasks will generate build failures if
-they are used outside of targets as they may cause infinite loops
-otherwise (<code>&lt;antcall&gt;</code> for example).</p>
-
-<p>
-We have given some targets descriptions; this causes the <tt>projecthelp</tt>
-invocation option to list them as public targets with the descriptions; the
-other target is internal and not listed.
-<p>
-Finally, for this target to work the source in the <tt>src</tt> subdirectory
-should be stored in a directory tree which matches the package names. Check the
-<tt>&lt;javac&gt;</tt> task for details.
-
-<h3><a name="filters">Token Filters</a></h3>
-<p>A project can have a set of tokens that might be automatically expanded if
-found when a file is copied, when the filtering-copy behavior is selected in the
-tasks that support this. These might be set in the buildfile
-by the <a href="Tasks/filter.html">filter</a> task.</p>
-<p>Since this can potentially be a very harmful behavior,
-the tokens in the files <b>must</b>
-be of the form <code>@</code><i>token</i><code>@</code>, where
-<i>token</i> is the token name that is set
-in the <code>&lt;filter&gt;</code> task. This token syntax matches the syntax of other build systems
-that perform such filtering and remains sufficiently orthogonal to most
-programming and scripting languages, as well as with documentation systems.</p>
-<p>Note: If a token with the format <code>@</code><i>token</i><code>@</code>
-is found in a file, but no
-filter is associated with that token, no changes take place;
-therefore, no escaping
-method is available - but as long as you choose appropriate names for your
-tokens, this should not cause problems.</p>
-<p><b>Warning:</b> If you copy binary files with filtering turned on, you can corrupt the
-files. This feature should be used with text files <em>only</em>.</p>
-
-<h3><a name="path">Path-like Structures</a></h3>
-<p>You can specify <code>PATH</code>- and <code>CLASSPATH</code>-type
-references using both
-&quot;<code>:</code>&quot; and &quot;<code>;</code>&quot; as separator
-characters. Ant will
-convert the separator to the correct character of the current operating
-system.</p>
-<p>Wherever path-like values need to be specified, a nested element can
-be used. This takes the general form of:</p>
+<p>Notice that we are declaring properties outside any target. <em>Since Ant 1.6</em>, all tasks can be declared outside
+targets (earlier version only allowed <code>&lt;property&gt;</code>, <code>&lt;typedef&gt;</code>
+and <code>&lt;taskdef&gt;</code>).  When you do this they are evaluated before any targets are executed.  Some tasks
+will generate build failures if they are used outside of targets as they may cause infinite loops otherwise
+(<code>&lt;antcall&gt;</code> for example).</p>
+
+<p>We have given some targets descriptions; this causes the <kbd>-projecthelp</kbd> invocation option to list them as
+public targets with the descriptions; the other target is internal and not listed.</p>
+<p>Finally, for this target to work the source in the <samp>src</samp> subdirectory should be stored in a directory tree
+which matches the package names. Check the <code>&lt;javac&gt;</code> task for details.</p>
+
+<h3 id="filters">Token Filters</h3>
+<p>A project can have a set of tokens that might be automatically expanded if found when a file is copied, when the
+filtering-copy behavior is selected in the tasks that support this. These might be set in the buildfile by
+the <a href="Tasks/filter.html">filter</a> task.</p>
+<p>Since this can potentially be a very harmful behavior, the tokens in the files <strong>must</strong> be of the
+form <code>@<var>token</var>@</code>, where <var>token</var> is the token name that is set in
+the <code>&lt;filter&gt;</code> task. This token syntax matches the syntax of other build systems that perform such
+filtering and remains sufficiently orthogonal to most programming and scripting languages, as well as with documentation
+systems.</p>
+<p><strong>Note</strong>: If a token with the format <code>@<var>token</var>@</code> is found in a file, but no filter
+is associated with that token, no changes take place; therefore, no escaping method is available&mdash;but as long as
+you choose appropriate names for your tokens, this should not cause problems.</p>
+<p><strong>Warning</strong>: If you copy binary files with filtering turned on, you can corrupt the files. This feature
+should be used with text files <em>only</em>.</p>
+
+<h3 id="path">Path-like Structures</h3>
+<p>You can specify <code>PATH</code>- and <code>CLASSPATH</code>-type references using both <q>:</q> and <q>;</q> as
+separator characters. Ant will convert the separator to the correct character of the current operating system.</p>
+<p>Wherever path-like values need to be specified, a nested element can be used. This takes the general form of:</p>
 <pre>
-    &lt;classpath&gt;
-      &lt;pathelement path=&quot;${classpath}&quot;/&gt;
-      &lt;pathelement location=&quot;lib/helper.jar&quot;/&gt;
-    &lt;/classpath&gt;
-</pre>
-<p>The <code>location</code> attribute specifies a single file or
-directory relative to the project's base directory (or an absolute
-filename), while the <code>path</code> attribute accepts colon-
-or semicolon-separated lists of locations. The <code>path</code>
-attribute is intended to be used with predefined paths - in any other
-case, multiple elements with <code>location</code> attributes should be
-preferred.</p>
-<p><em>Since Ant 1.8.2</em> the location attribute can also contain a
-  wildcard in its last path component (i.e. it can end in a
-  &quot;*&quot;) in order to support wildcard CLASSPATHs introduced
-  with Java6.  Ant will not expand or evaluate the wildcards and the
-  resulting path may not work as anything else but a CLASSPATH - or
-  even as a CLASSPATH for a Java VM prior to Java6.</p>
+&lt;classpath&gt;
+  &lt;pathelement path=&quot;${classpath}&quot;/&gt;
+  &lt;pathelement location=&quot;lib/helper.jar&quot;/&gt;
+&lt;/classpath&gt;</pre>
+<p>The <var>location</var> attribute specifies a single file or directory relative to the project's base directory (or
+an absolute filename), while the <var>path</var> attribute accepts colon- or semicolon-separated lists of
+locations. The <var>path</var> attribute is intended to be used with predefined paths&mdash;in any other case, multiple
+elements with <var>location</var> attributes should be preferred.</p>
+<p><em>Since Ant 1.8.2</em> the <var>location</var> attribute can also contain a wildcard in its last path component
+(i.e. it can end in a <q>*</q>) in order to support wildcard <code>CLASSPATH</code>s introduced with Java 6.  Ant will
+not expand or evaluate the wildcards and the resulting path may not work as anything else but
+a <code>CLASSPATH</code>&mdash;or even as a <code>CLASSPATH</code> for JVM prior to Java 6.</p>
 <p>As a shortcut, the <code>&lt;classpath&gt;</code> tag
-supports <code>path</code> and
-<code>location</code> attributes of its own, so:</p>
+supports <var>path</var> and
+<var>location</var> attributes of its own, so:</p>
 <pre>
-    &lt;classpath&gt;
-      &lt;pathelement path=&quot;${classpath}&quot;/&gt;
-    &lt;/classpath&gt;
+&lt;classpath&gt;
+  &lt;pathelement path=&quot;${classpath}&quot;/&gt;
+&lt;/classpath&gt;
 </pre>
 <p>can be abbreviated to:</p>
+<pre>&lt;classpath path=&quot;${classpath}&quot;/&gt;</pre>
+<p>In addition, one or more <a href="Types/resources.html#collection">resource collections</a> can be specified as
+nested elements (these must consist of <a href="Types/resources.html#file">file</a>-type resources only).  Additionally,
+it should be noted that although resource collections are processed in the order encountered, certain resource
+collection types such as <a href="Types/fileset.html">fileset</a>, <a href="Types/dirset.html">dirset</a>
+and <a href="Types/resources.html#files">files</a> are undefined in terms of order.</p>
 <pre>
-    &lt;classpath path=&quot;${classpath}&quot;/&gt;
-</pre>
-<p>In addition, one or more
-<a href="Types/resources.html#collection">Resource Collection</a>s
-can be specified as nested elements (these must consist of
-<a href="Types/resources.html#file">file</a>-type resources only).
-Additionally, it should be noted that although resource collections are
-processed in the order encountered, certain resource collection types
-such as <a href="Types/fileset.html">fileset</a>,
-<a href="Types/dirset.html">dirset</a> and
-<a href="Types/resources.html#files">files</a>
-are undefined in terms of order.</p>
-<pre>
-    &lt;classpath&gt;
-      &lt;pathelement path=&quot;${classpath}&quot;/&gt;
-      &lt;fileset dir=&quot;lib&quot;&gt;
-        &lt;include name=&quot;**/*.jar&quot;/&gt;
-      &lt;/fileset&gt;
-      &lt;pathelement location=&quot;classes&quot;/&gt;
-      &lt;dirset dir=&quot;${build.dir}&quot;&gt;
-        &lt;include name=&quot;apps/**/classes&quot;/&gt;
-        &lt;exclude name=&quot;apps/**/*Test*&quot;/&gt;
-      &lt;/dirset&gt;
-      &lt;filelist refid=&quot;third-party_jars&quot;/&gt;
-    &lt;/classpath&gt;
-</pre>
-<p>This builds a path that holds the value of <code>${classpath}</code>,
-followed by all jar files in the <code>lib</code> directory,
-the <code>classes</code> directory, all directories named
-<code>classes</code> under the <code>apps</code> subdirectory of
-<code>${build.dir}</code>, except those
-that have the text <code>Test</code> in their name, and
-the files specified in the referenced FileList.</p>
-<p>If you want to use the same path-like structure for several tasks,
-you can define them with a <code>&lt;path&gt;</code> element at the
-same level as <i>target</i>s, and reference them via their
-<i>id</i> attribute--see <a href="#references">References</a> for an
+&lt;classpath&gt;
+  &lt;pathelement path=&quot;${classpath}&quot;/&gt;
+  &lt;fileset dir=&quot;lib&quot;&gt;
+    &lt;include name=&quot;**/*.jar&quot;/&gt;
+  &lt;/fileset&gt;
+  &lt;pathelement location=&quot;classes&quot;/&gt;
+  &lt;dirset dir=&quot;${build.dir}&quot;&gt;
+    &lt;include name=&quot;apps/**/classes&quot;/&gt;
+    &lt;exclude name=&quot;apps/**/*Test*&quot;/&gt;
+  &lt;/dirset&gt;
+  &lt;filelist refid=&quot;third-party_jars&quot;/&gt;
+&lt;/classpath&gt;</pre>
+<p>This builds a path that holds the value of <samp>${classpath}</samp>, followed by all jar files in
+the <samp>lib</samp> directory, the <samp>classes</samp> directory, all directories named <samp>classes</samp> under
+the <samp>apps</samp> subdirectory of <samp>${build.dir}</samp>, except those that have the text <code>Test</code> in
+their name, and the files specified in the referenced FileList.</p>
+<p>If you want to use the same path-like structure for several tasks, you can define them with
+a <code>&lt;path&gt;</code> element at the same level as <code>&lt;target&gt;</code>s, and reference them via their
+<var>id</var> attribute&mdash;see <a href="#references">References</a> for an
 example.</p>
 
-<p>By default a path like structure will re-evaluate all nested
-  resource collections whenever it is used, which may lead to
-  unnecessary re-scanning of the filesystem.  Since Ant 1.8.0 path has
-  an optional <i>cache</i> attribute, if it is set to true, the path
-  instance will only scan its nested resource collections once and
-  assume it doesn't change during the build anymore (the default
-  for <i>cache</i> still is <i>false</i>).  Even if you are using the
-  path only in a single task it may improve overall performance to set
-  <i>cache</i> to <i>true</i> if you are using complex nested
-  constructs.</p>
-
-<p>A path-like structure can include a reference to another path-like
-structure (a path being itself a resource collection)
-via nested <code>&lt;path&gt;</code> elements:</p>
-<pre>
-    &lt;path id=&quot;base.path&quot;&gt;
-      &lt;pathelement path=&quot;${classpath}&quot;/&gt;
-      &lt;fileset dir=&quot;lib&quot;&gt;
-        &lt;include name=&quot;**/*.jar&quot;/&gt;
-      &lt;/fileset&gt;
-      &lt;pathelement location=&quot;classes&quot;/&gt;
-    &lt;/path&gt;
-
-    &lt;path id=&quot;tests.path&quot; cache=&quot;true&quot;&gt;
-      &lt;path refid=&quot;base.path&quot;/&gt;
-      &lt;pathelement location=&quot;testclasses&quot;/&gt;
-    &lt;/path&gt;
-</pre>
- The shortcuts previously mentioned for <code>&lt;classpath&gt;</code> are also valid for <code>&lt;path&gt;</code>.For example:
+<p>By default a path-like structure will re-evaluate all nested resource collections whenever it is used, which may lead
+to unnecessary re-scanning of the filesystem.  <em>Since Ant 1.8.0</em>, path has an optional <var>cache</var>
+attribute, if it is set to <q>true</q>, the path instance will only scan its nested resource collections once and assume
+it doesn't change during the build anymore (the default for <var>cache</var> still is <q>false</q>).  Even if you are
+using the path only in a single task it may improve overall performance to set <var>cache</var> to <q>true</q> if you
+are using complex nested constructs.</p>
+
+<p>A path-like structure can include a reference to another path-like structure (a path being itself a resource
+collection) via nested <code>&lt;path&gt;</code> elements:</p>
 <pre>
-    &lt;path id=&quot;base.path&quot;&gt;
-      &lt;pathelement path=&quot;${classpath}&quot;/&gt;
-    &lt;/path&gt;
-</pre>
-can be written as:
+&lt;path id=&quot;base.path&quot;&gt;
+  &lt;pathelement path=&quot;${classpath}&quot;/&gt;
+  &lt;fileset dir=&quot;lib&quot;&gt;
+    &lt;include name=&quot;**/*.jar&quot;/&gt;
+  &lt;/fileset&gt;
+  &lt;pathelement location=&quot;classes&quot;/&gt;
+&lt;/path&gt;
+
+&lt;path id=&quot;tests.path&quot; cache=&quot;true&quot;&gt;
+  &lt;path refid=&quot;base.path&quot;/&gt;
+  &lt;pathelement location=&quot;testclasses&quot;/&gt;
+&lt;/path&gt;</pre>
+<p>The shortcuts previously mentioned for <code>&lt;classpath&gt;</code> are also valid
+for <code>&lt;path&gt;</code>. For example:</p>
 <pre>
-    &lt;path id=&quot;base.path&quot; path=&quot;${classpath}&quot;/&gt;
-</pre>
-
-  <h4><a name="pathshortcut">Path Shortcut</a></h4>
-  <p>
-    In Ant 1.6 a shortcut for converting paths to OS specific strings
-    in properties has been added. One can use the expression 
-    ${toString:<em>pathreference</em>} to convert a path element
-    reference to a string that can be used for a path argument.
-    For example:
-  </p>
+&lt;path id=&quot;base.path&quot;&gt;
+  &lt;pathelement path=&quot;${classpath}&quot;/&gt;
+&lt;/path&gt;</pre>
+<p>can be written as:</p>
+<pre>&lt;path id=&quot;base.path&quot; path=&quot;${classpath}&quot;/&gt;</pre>
+<h4 id="pathshortcut">Path Shortcut</h4>
+<p><em>Since Ant 1.6</em>, there is a shortcut for converting paths to OS specific strings in properties. One can use
+the expression <samp>${toString:<em>pathreference</em>}</samp> to convert a path element reference to a string that can
+be used for a path argument. For example:</p>
 <pre>
-  &lt;path id="lib.path.ref"&gt;
-    &lt;fileset dir="lib" includes="*.jar"/&gt;
-  &lt;/path&gt;
-  &lt;javac srcdir="src" destdir="classes"&gt;
-    &lt;compilerarg arg="-Xbootclasspath/p:${toString:lib.path.ref}"/&gt;
-  &lt;/javac&gt;
-</pre>
-
-
-<h3><a name="arg">Command-line Arguments</a></h3>
-<p>Several tasks take arguments that will be passed to another
-process on the command line. To make it easier to specify arguments
-that contain space characters, nested <code>arg</code> elements can be used.</p>
-<table border="1" cellpadding="2" cellspacing="0">
+&lt;path id="lib.path.ref"&gt;
+  &lt;fileset dir="lib" includes="*.jar"/&gt;
+&lt;/path&gt;
+&lt;javac srcdir="src" destdir="classes"&gt;
+  &lt;compilerarg arg="-Xbootclasspath/p:${toString:lib.path.ref}"/&gt;
+&lt;/javac&gt;</pre>
+
+<h3 id="arg">Command-line Arguments</h3>
+<p>Several tasks take arguments that will be passed to another process on the command line. To make it easier to specify
+arguments that contain space characters, nested <code>arg</code> elements can be used.</p>
+<table class="attr">
 <tr>
-  <td width="12%" valign="top"><b>Attribute</b></td>
-  <td width="78%" valign="top"><b>Description</b></td>
-  <td width="10%" valign="top"><b>Required</b></td>
+  <th>Attribute</th>
+  <th>Description</th>
+  <th>Required</th>
 </tr>
   <tr>
-    <td valign="top">value</td>
-    <td valign="top">a single command-line argument; can contain space
-      characters.</td>
-    <td align="center" rowspan="5">Exactly one of these.</td>
+    <td>value</td>
+    <td>a single command-line argument; can contain space characters.</td>
+    <td rowspan="5">Exactly one of these.</td>
   </tr>
   <tr>
-    <td valign="top">file</td>
-    <td valign="top">The name of a file as a single command-line
-      argument; will be replaced with the absolute filename of the file.</td>
+    <td>file</td>
+    <td class="left">The name of a file as a single command-line argument; will be replaced with the absolute filename
+      of the file.</td>
   </tr>
   <tr>
-    <td valign="top">path</td>
-    <td valign="top">A string that will be treated as a path-like
-      string as a single command-line argument; you can use <code>;</code>
-      or <code>:</code> as
-      path separators and Ant will convert it to the platform's local
-      conventions.</td>
+    <td>path</td>
+    <td class="left">A string that will be treated as a path-like string as a single command-line argument; you can
+      use <q>;</q> or <q>:</q> as path separators and Ant will convert it to the platform's local conventions.</td>
   </tr>
   <tr>
-    <td valign="top">pathref</td>
-    <td valign="top"><a href="#references">Reference</a> to a path
-      defined elsewhere.  Ant will convert it to the platform's local
-      conventions.</td>
+    <td>pathref</td>
+    <td class="left"><a href="#references">Reference</a> to a path defined elsewhere.  Ant will convert it to the
+      platform's local conventions.</td>
   </tr>
   <tr>
-    <td valign="top">line</td>
-    <td valign="top">a space-delimited list of command-line arguments.</td>
+    <td>line</td>
+    <td class="left">a space-delimited list of command-line arguments.</td>
   </tr>
   <tr>
-    <td valign="top">prefix</td>
-    <td valign="top">A fixed string to be placed in front of the
-      argument. In the case of a line broken into parts, it will be
-      placed in front of every part. <em>Since Ant 1.8.</em></td>
-    <td valign="top" align="center">No</td>
+    <td>prefix</td>
+    <td>A fixed string to be placed in front of the argument. In the case of a line broken into parts, it will be placed
+      in front of every part. <em>Since Ant 1.8.</em></td>
+    <td>No</td>
   </tr>
   <tr>
-    <td valign="top">suffix</td>
-    <td valign="top">A fixed string to be placed immediately after the
-      argument. In the case of a line broken into parts, it will be
+    <td>suffix</td>
+    <td>A fixed string to be placed immediately after the argument. In the case of a line broken into parts, it will be
       placed after every part. <em>Since Ant 1.8.</em></td>
-    <td valign="top" align="center">No</td>
+    <td>No</td>
   </tr>
 </table>
 
-<p>It is highly recommended to avoid the <code>line</code> version
-when possible.  Ant will try to split the command line in a way
-similar to what a (Unix) shell would do, but may create something that
-is very different from what you expect under some circumstances.</p>
+<p>It is highly recommended to avoid the <var>line</var> version when possible.  Ant will try to split the command line
+in a way similar to what a (Unix) shell would do, but may create something that is very different from what you expect
+under some circumstances.</p>
 
 <h4>Examples</h4>
-<blockquote><pre>
-  &lt;arg value=&quot;-l -a&quot;/&gt;
-</pre></blockquote>
-<p>is a single command-line argument containing a space character,
-<i>not</i> separate commands "-l" and "-a".</p>
-<blockquote><pre>
-  &lt;arg line=&quot;-l -a&quot;/&gt;
-</pre></blockquote>
-<p>This is a command line with two separate arguments, "-l" and "-a".</p>
-<blockquote><pre>
-  &lt;arg path=&quot;/dir;/dir2:\dir3&quot;/&gt;
-</pre></blockquote>
-<p>is a single command-line argument with the value
-<code>\dir;\dir2;\dir3</code> on DOS-based systems and
-<code>/dir:/dir2:/dir3</code> on Unix-like systems.</p>
-
-<h3><a name="references">References</a></h3>
-
-<p>Any project element can be assigned an identifier using its
-<code>id</code> attribute. In most cases the element can subsequently
-be referenced by specifying the <code>refid</code> attribute on an
-element of the same type.  This can be useful if you are going to
-replicate the same snippet of XML over and over again--using a
-<code>&lt;classpath&gt;</code> structure more than once, for example.</p>
+<pre>&lt;arg value=&quot;-l -a&quot;/&gt;</pre>
+<p>is a single command-line argument containing a space character, <em>not</em> separate options <q>-l</q>
+and <q>-a</q>.</p>
+<pre>&lt;arg line=&quot;-l -a&quot;/&gt;</pre>
+<p>This is a command line with two separate options, <q>-l</q> and <q>-a</q>.</p>
+<pre>&lt;arg path=&quot;/dir;/dir2:\dir3&quot;/&gt;</pre>
+<p>is a single command-line argument with the value <code>\dir;\dir2;\dir3</code> on DOS-based systems
+and <code>/dir:/dir2:/dir3</code> on Unix(-like) systems.</p>
+
+<h3 id="references">References</h3>
+
+<p>Any project element can be assigned an identifier using its <var>id</var> attribute. In most cases the element can
+subsequently be referenced by specifying the <var>refid</var> attribute on an element of the same type.  This can be
+useful if you are going to replicate the same snippet of XML over and over again&mdash;using
+a <code>&lt;classpath&gt;</code> structure more than once, for example.</p>
 <p>The following example:</p>
-<blockquote><pre>
+<pre>
 &lt;project ... &gt;
   &lt;target ... &gt;
     &lt;rmic ...&gt;
@@ -484,10 +385,9 @@
       &lt;/classpath&gt;
     &lt;/javac&gt;
   &lt;/target&gt;
-&lt;/project&gt;
-</pre></blockquote>
+&lt;/project&gt;</pre>
 <p>could be rewritten as:</p>
-<blockquote><pre>
+<pre>
 &lt;project ... &gt;
   &lt;path id=&quot;project.class.path&quot;&gt;
     &lt;pathelement location=&quot;lib/&quot;/&gt;
@@ -506,73 +406,59 @@
       &lt;classpath refid=&quot;project.class.path&quot;/&gt;
     &lt;/javac&gt;
   &lt;/target&gt;
-&lt;/project&gt;
-</pre></blockquote>
-<p>All tasks that use nested elements for 
-<a href="Types/patternset.html">PatternSet</a>s, 
-<a href="Types/fileset.html">FileSet</a>s, 
-<a href="Types/zipfileset.html">ZipFileSet</a>s or 
-<a href="#path">path-like structures</a> accept references to these structures 
-as shown in the examples. Using <code>refid</code> on a task will ordinarily 
-have the same effect (referencing a task already declared), but the user 
-should be aware that the interpretation of this attribute is dependent on the 
-implementation of the element upon which it is specified. Some tasks (the 
-<a href="Tasks/property.html">property</a> task is a handy example) 
-deliberately assign a different meaning to <code>refid</code>.</p>
-
-
-<h3><a name="external-tasks">Use of external tasks</a></h3> 
-Ant supports a plugin mechanism for using third party tasks. For using them you 
-have to do two steps: 
+&lt;/project&gt;</pre>
+<p>All tasks that use nested elements
+for <a href="Types/patternset.html">PatternSet</a>s, <a href="Types/fileset.html">FileSet</a>s, <a href="Types/zipfileset.html">ZipFileSet</a>s
+or <a href="#path">path-like structures</a> accept references to these structures as shown in the
+examples. Using <var>refid</var> on a task will ordinarily have the same effect (referencing a task already declared),
+but the user should be aware that the interpretation of this attribute is dependent on the implementation of the element
+upon which it is specified. Some tasks (the <a href="Tasks/property.html">property</a> task is a handy example)
+deliberately assign a different meaning to <var>refid</var>.</p>
+
+<h3 id="external-tasks">Use of external tasks</h3>
+<p>Ant supports a plugin mechanism for using third party tasks. For using them you have to do two steps:</p>
 <ol>
-  <li>place their implementation somewhere where Ant can find them</li>
+  <li>place their implementation somewhere where Ant can find them.</li>
   <li>declare them.</li>
-</ol> 
-Don't add anything to the CLASSPATH environment variable - this is often the  
-reason for very obscure errors. Use Ant's own <a href="install.html#optionalTasks">mechanisms</a> 
-for adding libraries: 
+</ol>
+<p>Don't add anything to the <code>CLASSPATH</code> environment variable&mdash;this is often the reason for very obscure
+errors. Use Ant's own <a href="install.html#optionalTasks">mechanisms</a> for adding libraries:</p>
 <ul>
-  <li>via command line argument <code>-lib</code></li>
+  <li>via command line argument <kbd>-lib</kbd></li>
   <li>adding to <code>${user.home}/.ant/lib</code></li>
   <li>adding to <code>${ant.home}/lib</code></li>
 </ul>
-For the declaration there are several ways:
+<p>For the declaration there are several ways:</p>
 <ul>
-  <li>declare a single task per using instruction using  
-      <code>&lt;<a href="Tasks/taskdef.html">taskdef</a> name=&quot;taskname&quot; 
-      classname=&quot;ImplementationClass&quot;/&gt;</code>
-      <br>
-      <code>&lt;taskdef name=&quot;for&quot; classname=&quot;net.sf.antcontrib.logic.For&quot; /&gt; 
-      &lt;for ... /&gt;</code>
+  <li>declare a single task per using instruction using
+    <code>&lt;<a href="Tasks/taskdef.html">taskdef</a> name=&quot;taskname&quot;
+      classname=&quot;ImplementationClass&quot;/&gt;</code><br/>
+    <code class="code">&lt;taskdef name=&quot;for&quot; classname=&quot;net.sf.antcontrib.logic.For&quot;/&gt; &lt;for
+      ... /&gt;</code>
   </li>
-  <li>declare a bundle of tasks using a properties-file holding these 
-      taskname-ImplementationClass-pairs and <code>&lt;taskdef&gt;</code>
-      <br>
-      <code>&lt;taskdef resource=&quot;net/sf/antcontrib/antcontrib.properties&quot; /&gt; 
-      &lt;for ... /&gt;</code>
+  <li>declare a bundle of tasks using a <samp>properties</samp> file holding these taskname&ndash;ImplementationClass
+    pairs and <code>&lt;taskdef&gt;</code><br/>
+    <code class="code">&lt;taskdef resource=&quot;net/sf/antcontrib/antcontrib.properties&quot;/&gt; &lt;for
+    ... /&gt;</code>
   </li>
-  <li>declare a bundle of tasks using a <a href="Types/antlib.html">xml-file</a> holding these  
-      taskname-ImplementationClass-pairs and <code>&lt;taskdef&gt;</code>
-      <br>
-      <code>&lt;taskdef resource=&quot;net/sf/antcontrib/antlib.xml&quot; /&gt; 
-      &lt;for ... /&gt;</code>
+  <li>declare a bundle of tasks using an <a href="Types/antlib.html">xml file</a> holding these
+    taskname-ImplementationClass-pairs and <code>&lt;taskdef&gt;</code><br/>
+    <code class="code">&lt;taskdef resource=&quot;net/sf/antcontrib/antlib.xml&quot;/&gt; &lt;for ... /&gt;</code>
   </li>
-  <li>declare a bundle of tasks using a xml-file named antlib.xml, XML-namespace and 
-      <a href="Types/antlib.html#antlibnamespace"><code>antlib:</code> protocol handler</a> 
-      <br>
-      <code>&lt;project xmlns:ac=&quot;antlib:net.sf.antcontrib&quot;/&gt; 
-      &lt;ac:for ... /&gt;</code>
+  <li>declare a bundle of tasks using an xml file named <samp>antlib.xml</samp>, XML namespace
+    and <a href="Types/antlib.html#antlibnamespace"><code>antlib:</code> protocol handler</a><br/>
+    <code class="code">&lt;project xmlns:ac=&quot;antlib:net.sf.antcontrib&quot;/&gt; &lt;ac:for ... /&gt;</code>
   </li>
 </ul>
 
 If you need a special function, you should
 <ol>
   <li>have a look at this manual, because Ant provides lot of tasks</li>
-  <li>have a look at the external task page <a href="http://ant.apache.org/external.html">online</a></li>
-  <li>have a look at the external task <a href="http://wiki.apache.org/ant/AntExternalTaskdefs">wiki 
-      page</a></li>
-  <li>ask on the <a href="http://ant.apache.org/mail.html#User%20List">Ant user</a> list</li>
-  <li><a href="tutorial-writing-tasks.html">implement </a>(and share) your own</li>
+  <li>have a look at the external task page <a href="https://ant.apache.org/external.html" target="_top">online</a></li>
+  <li>have a look at the external task <a href="https://wiki.apache.org/ant/AntExternalTaskdefs" target="_top">wiki
+    page</a></li>
+  <li>ask on the <a href="https://ant.apache.org/mail.html#User%20List" target="_top">Ant user</a> list</li>
+  <li><a href="tutorial-writing-tasks.html">implement</a> (and share) your own</li>
 </ol>
 
 </body>
diff -Nru ant-1.9.10/manual/usinglist.html ant-1.10.3/manual/usinglist.html
--- ant-1.9.10/manual/usinglist.html	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/manual/usinglist.html	2018-03-24 12:37:12.000000000 +0000
@@ -29,22 +29,19 @@
 
 <h3>Using Apache Ant</h3>
 <ul class="inlinelist">
-<li><a href="using.html#buildfile">Writing a Simple Buildfile</a></li>
-<div style="padding-left:1em">
-  <li><a href="using.html#projects">Projects</a></li>
-  <li><a href="targets.html#targets">Targets</a></li>
-  <li><a href="using.html#tasks">Tasks</a></li>
-  <li><a href="using.html#properties">Properties</a></li>
-  <li><a href="properties.html#built-in-props">Built-in Properties</a></li>
-  <li><a href="properties.html#propertyHelper">Property Helpers</a></li>
-  <li><a href="using.html#example">Example Buildfile</a></li>
-  <li><a href="using.html#filters">Token Filters</a></li>
-  <li><a href="using.html#path">Path-like Structures</a></li>
-  <li><a href="using.html#arg">Command-line Arguments</a></li>
-  <li><a href="using.html#references">References</a></li>
-  <li><a href="using.html#external-tasks">Use of external tasks</a></li>
-</div>
+  <li><a href="using.html#buildfile">Writing a Simple Buildfile</a></li>
+  <li class="indent"><a href="using.html#projects">Projects</a></li>
+  <li class="indent"><a href="targets.html#targets">Targets</a></li>
+  <li class="indent"><a href="using.html#tasks">Tasks</a></li>
+  <li class="indent"><a href="using.html#properties">Properties</a></li>
+  <li class="indent"><a href="properties.html#built-in-props">Built-in Properties</a></li>
+  <li class="indent"><a href="properties.html#propertyHelper">Property Helpers</a></li>
+  <li class="indent"><a href="using.html#example">Example Buildfile</a></li>
+  <li class="indent"><a href="using.html#filters">Token Filters</a></li>
+  <li class="indent"><a href="using.html#path">Path-like Structures</a></li>
+  <li class="indent"><a href="using.html#arg">Command-line Arguments</a></li>
+  <li class="indent"><a href="using.html#references">References</a></li>
+  <li class="indent"><a href="using.html#external-tasks">Use of external tasks</a></li>
 </ul>
 </body>
 </html>
-
diff -Nru ant-1.9.10/README ant-1.10.3/README
--- ant-1.9.10/README	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/README	2018-03-24 12:37:12.000000000 +0000
@@ -1,5 +1,5 @@
 
-                                 A     N     T
+                                 Apache Ant
  
 
   What is it? 
@@ -52,10 +52,13 @@
   Documentation
   -------------
 
-  Documentation is available in HTML format, in the docs/ directory.
+  Documentation is available in HTML format, in the manual/ directory.
   For information about building and installing Ant, see
-  docs/manual/index.html
-
+  manual/install.html
+  The manual for the latest release of Ant is available online at
+  <https://ant.apache.org/manual/index.html>.
+  The latest version of the manual is available online at
+  <https://rawgit.com/apache/ant/master/manual/index.html>.
 
   Licensing
   ---------
diff -Nru ant-1.9.10/src/etc/ant-bin.wxs ant-1.10.3/src/etc/ant-bin.wxs
--- ant-1.9.10/src/etc/ant-bin.wxs	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/ant-bin.wxs	2018-03-24 12:37:12.000000000 +0000
@@ -436,16 +436,18 @@
           <File DiskId="1" Id="file594" Name="JUNIT-_3.XSL" LongName="junit-frames-xalan1.xsl" Vital="yes" src="$(var.dist.dir)/etc\junit-frames-xalan1.xsl" />
           <File DiskId="1" Id="file595" Name="JUNIT-_1.XSL" LongName="junit-frames.xsl" Vital="yes" src="$(var.dist.dir)/etc\junit-frames.xsl" />
           <File DiskId="1" Id="file596" Name="JUNIT-_2.XSL" LongName="junit-noframes.xsl" Vital="yes" src="$(var.dist.dir)/etc\junit-noframes.xsl" />
-          <File DiskId="1" Id="file597" Name="log.xsl" Vital="yes" src="$(var.dist.dir)/etc\log.xsl" />
-          <File DiskId="1" Id="file598" Name="MAUDIT_1.XSL" LongName="maudit-frames.xsl" Vital="yes" src="$(var.dist.dir)/etc\maudit-frames.xsl" />
-          <File DiskId="1" Id="file599" Name="MMETRI_1.XSL" LongName="mmetrics-frames.xsl" Vital="yes" src="$(var.dist.dir)/etc\mmetrics-frames.xsl" />
-          <File DiskId="1" Id="file600" Name="tagdiff.xsl" Vital="yes" src="$(var.dist.dir)/etc\tagdiff.xsl" />
+          <File DiskId="1" Id="file597" Name="JUNIT-_4.XSL" LongName="junit-frames-saxon.xsl" Vital="yes" src="$(var.dist.dir)/etc\junit-frames-saxon.xsl" />
+          <File DiskId="1" Id="file598" Name="JUNIT-_5.XSL" LongName="junit-noframes-saxon.xsl" Vital="yes" src="$(var.dist.dir)/etc\junit-noframes-saxon.xsl" />
+          <File DiskId="1" Id="file599" Name="log.xsl" Vital="yes" src="$(var.dist.dir)/etc\log.xsl" />
+          <File DiskId="1" Id="file600" Name="MAUDIT_1.XSL" LongName="maudit-frames.xsl" Vital="yes" src="$(var.dist.dir)/etc\maudit-frames.xsl" />
+          <File DiskId="1" Id="file601" Name="MMETRI_1.XSL" LongName="mmetrics-frames.xsl" Vital="yes" src="$(var.dist.dir)/etc\mmetrics-frames.xsl" />
+          <File DiskId="1" Id="file602" Name="tagdiff.xsl" Vital="yes" src="$(var.dist.dir)/etc\tagdiff.xsl" />
         </Component>
         <Directory Id="directory98" Name="CHECKS_1" LongName="checkstyle">
           <Component Id="component95" DiskId="1" Guid="2AEB59C7-5CEF-401c-9AB9-911B995F00FC">
-            <File DiskId="1" Id="file601" Name="CHECKS_1.XSL" LongName="checkstyle-frames.xsl" Vital="yes" src="$(var.dist.dir)/etc\checkstyle\checkstyle-frames.xsl" />
-            <File DiskId="1" Id="file602" Name="CHECKS_3.XSL" LongName="checkstyle-text.xsl" Vital="yes" src="$(var.dist.dir)/etc\checkstyle\checkstyle-text.xsl" />
-            <File DiskId="1" Id="file603" Name="CHECKS_2.XSL" LongName="checkstyle-xdoc.xsl" Vital="yes" src="$(var.dist.dir)/etc\checkstyle\checkstyle-xdoc.xsl" />
+            <File DiskId="1" Id="file603" Name="CHECKS_1.XSL" LongName="checkstyle-frames.xsl" Vital="yes" src="$(var.dist.dir)/etc\checkstyle\checkstyle-frames.xsl" />
+            <File DiskId="1" Id="file604" Name="CHECKS_3.XSL" LongName="checkstyle-text.xsl" Vital="yes" src="$(var.dist.dir)/etc\checkstyle\checkstyle-text.xsl" />
+            <File DiskId="1" Id="file605" Name="CHECKS_2.XSL" LongName="checkstyle-xdoc.xsl" Vital="yes" src="$(var.dist.dir)/etc\checkstyle\checkstyle-xdoc.xsl" />
           </Component>
         </Directory>
       </Directory>
diff -Nru ant-1.9.10/src/etc/junit-frames-saxon.xsl ant-1.10.3/src/etc/junit-frames-saxon.xsl
--- ant-1.9.10/src/etc/junit-frames-saxon.xsl	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/etc/junit-frames-saxon.xsl	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,971 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    exclude-result-prefixes="xs"
+    version="2.0">
+    <xsl:output method="html" indent="yes" encoding="UTF-8"/>
+    <xsl:decimal-format decimal-separator="." grouping-separator=","/>
+    <!--
+       Licensed to the Apache Software Foundation (ASF) under one or more
+       contributor license agreements.  See the NOTICE file distributed with
+       this work for additional information regarding copyright ownership.
+       The ASF licenses this file to You under the Apache License, Version 2.0
+       (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
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+       See the License for the specific language governing permissions and
+       limitations under the License.
+     -->
+
+    <!--
+
+     Sample stylesheet to be used with Ant JUnitReport output.
+
+     It creates a set of HTML files a la javadoc where you can browse easily
+     through all packages and classes.
+
+    -->
+    <xsl:param name="output.dir" select="'.'"/>
+    <xsl:param name="TITLE">Unit Test Results.</xsl:param>
+
+
+    <xsl:template match="testsuites">
+        <!-- create the index.html -->
+        <xsl:result-document href="{$output.dir}/index.html">
+            <xsl:call-template name="index.html"/>
+        </xsl:result-document>
+
+        <!-- create the stylesheet.css -->
+        <xsl:result-document href="{$output.dir}/stylesheet.css">
+            <xsl:call-template name="stylesheet.css"/>
+        </xsl:result-document>
+
+        <!-- create the overview-packages.html at the root -->
+        <xsl:result-document href="{$output.dir}/overview-summary.html">
+            <xsl:apply-templates select="." mode="overview.packages"/>
+        </xsl:result-document>
+
+        <!-- create the all-packages.html at the root -->
+        <xsl:result-document href="{$output.dir}/overview-frame.html">
+            <xsl:apply-templates select="." mode="all.packages"/>
+        </xsl:result-document>
+
+        <!-- create the all-classes.html at the root -->
+        <xsl:result-document href="{$output.dir}/allclasses-frame.html">
+            <xsl:apply-templates select="." mode="all.classes"/>
+        </xsl:result-document>
+
+        <!-- create the all-tests.html at the root -->
+        <xsl:result-document href="{$output.dir}/all-tests.html">
+            <xsl:apply-templates select="." mode="all.tests"/>
+        </xsl:result-document>
+
+        <!-- create the alltests-fails.html at the root -->
+        <xsl:result-document href="{$output.dir}/alltests-fails.html">
+            <xsl:apply-templates select="." mode="all.tests">
+                <xsl:with-param name="type" select="'fails'"/>
+            </xsl:apply-templates>
+        </xsl:result-document>
+
+        <!-- create the alltests-errors.html at the root -->
+        <xsl:result-document href="{$output.dir}/alltests-errors.html">
+            <xsl:apply-templates select="." mode="all.tests">
+                <xsl:with-param name="type" select="'errors'"/>
+            </xsl:apply-templates>
+        </xsl:result-document>
+
+        <!-- create the alltests-skipped.html at the root -->
+        <xsl:result-document href="{$output.dir}/alltests-skipped.html">
+            <xsl:apply-templates select="." mode="all.tests">
+                <xsl:with-param name="type" select="'skipped'"/>
+            </xsl:apply-templates>
+        </xsl:result-document>
+
+        <!-- process all packages -->
+        <xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
+            <xsl:call-template name="package">
+                <xsl:with-param name="name" select="@package"/>
+            </xsl:call-template>
+        </xsl:for-each>
+    </xsl:template>
+
+
+    <xsl:template name="package">
+        <xsl:param name="name"/>
+        <xsl:variable name="package.dir">
+            <xsl:if test="not($name = '')"><xsl:value-of select="translate($name,'.','/')"/></xsl:if>
+            <xsl:if test="$name = ''">.</xsl:if>
+        </xsl:variable>
+        <!--Processing package <xsl:value-of select="@name"/> in <xsl:value-of select="$output.dir"/> -->
+        <!-- create a classes-list.html in the package directory -->
+        <xsl:result-document href="{$output.dir}/{$package.dir}/package-frame.html">
+            <xsl:call-template name="classes.list">
+                <xsl:with-param name="name" select="$name"/>
+            </xsl:call-template>
+        </xsl:result-document>
+
+        <!-- create a package-summary.html in the package directory -->
+        <xsl:result-document href="{$output.dir}/{$package.dir}/package-summary.html">
+            <xsl:call-template name="package.summary">
+                <xsl:with-param name="name" select="$name"/>
+            </xsl:call-template>
+        </xsl:result-document>
+
+        <!-- for each class, creates a @name.html -->
+        <!-- @bug there will be a problem with inner classes having the same name, it will be overwritten -->
+        <xsl:for-each select="/testsuites/testsuite[@package = $name]">
+            <xsl:result-document href="{$output.dir}/{$package.dir}/{@id}_{@name}.html">
+                <xsl:apply-templates select="." mode="class.details"/>
+            </xsl:result-document>
+            <xsl:if test="string-length(./system-out)!=0">
+                <xsl:result-document href="{$output.dir}/{$package.dir}/{@id}_{@name}-out.html">
+                    <html>
+                        <head>
+                            <title>Standard Output from <xsl:value-of select="@name"/></title>
+                        </head>
+                        <body>
+                            <pre><xsl:value-of select="./system-out"/></pre>
+                        </body>
+                    </html>
+                </xsl:result-document>
+            </xsl:if>
+            <xsl:if test="string-length(./system-err)!=0">
+                <xsl:result-document href="{$output.dir}/{$package.dir}/{@id}_{@name}-err.html">
+                    <html>
+                        <head>
+                            <title>Standard Error from <xsl:value-of select="@name"/></title>
+                        </head>
+                        <body>
+                            <pre><xsl:value-of select="./system-err"/></pre>
+                        </body>
+                    </html>
+                </xsl:result-document>
+            </xsl:if>
+            <xsl:if test="@failures != 0">
+                <xsl:result-document href="{$output.dir}/{$package.dir}/{@id}_{@name}-fails.html">
+                    <xsl:apply-templates select="." mode="class.details">
+                        <xsl:with-param name="type" select="'fails'"/>
+                    </xsl:apply-templates>
+                </xsl:result-document>
+            </xsl:if>
+            <xsl:if test="@errors != 0">
+                <xsl:result-document href="{$output.dir}/{$package.dir}/{@id}_{@name}-errors.html">
+                    <xsl:apply-templates select="." mode="class.details">
+                        <xsl:with-param name="type" select="'errors'"/>
+                    </xsl:apply-templates>
+                </xsl:result-document>
+            </xsl:if>
+            <xsl:if test="@skipped != 0">
+                <xsl:result-document href="{$output.dir}/{$package.dir}/{@id}_{@name}-skipped.html">
+                    <xsl:apply-templates select="." mode="class.details">
+                        <xsl:with-param name="type" select="'skipped'"/>
+                    </xsl:apply-templates>
+                </xsl:result-document>
+            </xsl:if>
+        </xsl:for-each>
+    </xsl:template>
+
+    <xsl:template name="index.html">
+        <html>
+            <head>
+                <title><xsl:value-of select="$TITLE"/></title>
+            </head>
+            <frameset cols="20%,80%">
+                <frameset rows="30%,70%">
+                    <frame src="overview-frame.html" name="packageListFrame"/>
+                    <frame src="allclasses-frame.html" name="classListFrame"/>
+                </frameset>
+                <frame src="overview-summary.html" name="classFrame"/>
+                <noframes>
+                    <h2>Frame Alert</h2>
+                    <p>
+                        This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
+                    </p>
+                </noframes>
+            </frameset>
+        </html>
+    </xsl:template>
+
+    <!-- this is the stylesheet css to use for nearly everything -->
+    <xsl:template name="stylesheet.css">
+        body {
+        font:normal 68% verdana,arial,helvetica;
+        color:#000000;
+        }
+        table tr td, table tr th {
+        font-size: 68%;
+        }
+        table.details tr th{
+        font-weight: bold;
+        text-align:left;
+        background:#a6caf0;
+        }
+        table.details tr td{
+        background:#eeeee0;
+        }
+
+        p {
+        line-height:1.5em;
+        margin-top:0.5em; margin-bottom:1.0em;
+        }
+        h1 {
+        margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
+        }
+        h2 {
+        margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
+        }
+        h3 {
+        margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
+        }
+        h4 {
+        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+        }
+        h5 {
+        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+        }
+        h6 {
+        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+        }
+        .Error {
+        font-weight:bold; color:red;
+        }
+        .Failure {
+        font-weight:bold; color:purple;
+        }
+        .Properties {
+        text-align:right;
+        }
+    </xsl:template>
+
+    <!-- Create list of all/failed/errored/skipped tests -->
+    <xsl:template match="testsuites" mode="all.tests">
+        <xsl:param name="type" select="'all'"/>
+        <html>
+            <xsl:variable name="title">
+                <xsl:choose>
+                    <xsl:when test="$type = 'fails'">
+                        <xsl:text>All Failures</xsl:text>
+                    </xsl:when>
+                    <xsl:when test="$type = 'errors'">
+                        <xsl:text>All Errors</xsl:text>
+                    </xsl:when>
+                    <xsl:when test="$type = 'skipped'">
+                        <xsl:text>All Skipped</xsl:text>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:text>All Tests</xsl:text>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:variable>
+            <head>
+                <title>Unit Test Results: <xsl:value-of select="$title"/></title>
+                <xsl:call-template name="create.stylesheet.link">
+                    <xsl:with-param name="package.name"/>
+                </xsl:call-template>
+            </head>
+            <body>
+                <xsl:attribute name="onload">open('allclasses-frame.html','classListFrame')</xsl:attribute>
+                <xsl:call-template name="pageHeader"/>
+                <h2><xsl:value-of select="$title"/></h2>
+
+                <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+                    <xsl:call-template name="testcase.test.header">
+                        <xsl:with-param name="show.class" select="'yes'"/>
+                    </xsl:call-template>
+                    <!--
+                            test can even not be started at all (failure to load the class)
+                    so report the error directly
+                    -->
+                    <xsl:if test="./error">
+                        <tr class="Error">
+                            <td colspan="4">
+                                <xsl:apply-templates select="./error"/>
+                            </td>
+                        </tr>
+                    </xsl:if>
+                    <xsl:choose>
+                        <xsl:when test="$type = 'fails'">
+                            <xsl:apply-templates select=".//testcase[failure]" mode="print.test">
+                                <xsl:with-param name="show.class" select="'yes'"/>
+                            </xsl:apply-templates>
+                        </xsl:when>
+                        <xsl:when test="$type = 'errors'">
+                            <xsl:apply-templates select=".//testcase[error]" mode="print.test">
+                                <xsl:with-param name="show.class" select="'yes'"/>
+                            </xsl:apply-templates>
+                        </xsl:when>
+                        <xsl:when test="$type = 'skipped'">
+                            <xsl:apply-templates select=".//testcase[skipped]" mode="print.test">
+                                <xsl:with-param name="show.class" select="'yes'"/>
+                            </xsl:apply-templates>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:apply-templates select=".//testcase" mode="print.test">
+                                <xsl:with-param name="show.class" select="'yes'"/>
+                            </xsl:apply-templates>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </table>
+            </body>
+        </html>
+    </xsl:template>
+
+
+    <!-- ======================================================================
+        This page is created for every testsuite class.
+        It prints a summary of the testsuite and detailed information about
+        testcase methods.
+         ====================================================================== -->
+    <xsl:template match="testsuite" mode="class.details">
+        <xsl:param name="type" select="'all'"/>
+        <xsl:variable name="package.name" select="@package"/>
+        <xsl:variable name="class.name"><xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></xsl:variable>
+        <html>
+            <head>
+                <title>Unit Test Results: <xsl:value-of select="$class.name"/></title>
+                <xsl:call-template name="create.stylesheet.link">
+                    <xsl:with-param name="package.name" select="$package.name"/>
+                </xsl:call-template>
+                <script type="text/javascript" language="JavaScript">
+                    var TestCases = new Array();
+                    var cur;
+                    <xsl:apply-templates select="properties"/>
+                </script>
+                <script type="text/javascript" language="JavaScript"><![CDATA[
+        function displayProperties (name) {
+          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
+          var doc = win.document;
+          doc.open();
+          doc.write("<html><head><title>Properties of " + name + "</title>");
+          doc.write("<style type=\"text/css\">");
+          doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }");
+          doc.write("table tr td, table tr th { font-size: 68%; }");
+          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
+          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
+          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
+          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
+          doc.write("</style>");
+          doc.write("</head><body>");
+          doc.write("<h3>Properties of " + name + "</h3>");
+          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
+          doc.write("<table class='properties'>");
+          doc.write("<tr><th>Name</th><th>Value</th></tr>");
+          for (prop in TestCases[name]) {
+            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
+          }
+          doc.write("</table>");
+          doc.write("</body></html>");
+          doc.close();
+          win.focus();
+        }
+      ]]>
+                </script>
+            </head>
+            <body>
+                <xsl:call-template name="pageHeader"/>
+                <h3>Class <xsl:value-of select="$class.name"/></h3>
+
+
+                <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+                    <xsl:call-template name="testsuite.test.header"/>
+                    <xsl:apply-templates select="." mode="print.test"/>
+                </table>
+
+                <xsl:choose>
+                    <xsl:when test="$type = 'fails'">
+                        <h2>Failures</h2>
+                    </xsl:when>
+                    <xsl:when test="$type = 'errors'">
+                        <h2>Errors</h2>
+                    </xsl:when>
+                    <xsl:when test="$type = 'skipped'">
+                        <h2>Skipped</h2>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <h2>Tests</h2>
+                    </xsl:otherwise>
+                </xsl:choose>
+                <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+                    <xsl:call-template name="testcase.test.header"/>
+                    <!--
+                            test can even not be started at all (failure to load the class)
+                    so report the error directly
+                    -->
+                    <xsl:if test="./error">
+                        <tr class="Error">
+                            <td colspan="4"><xsl:apply-templates select="./error"/></td>
+                        </tr>
+                    </xsl:if>
+                    <xsl:choose>
+                        <xsl:when test="$type = 'fails'">
+                            <xsl:apply-templates select="./testcase[failure]" mode="print.test"/>
+                        </xsl:when>
+                        <xsl:when test="$type = 'errors'">
+                            <xsl:apply-templates select="./testcase[error]" mode="print.test"/>
+                        </xsl:when>
+                        <xsl:when test="$type = 'skipped'">
+                            <xsl:apply-templates select="./testcase[skipped]" mode="print.test"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:apply-templates select="./testcase" mode="print.test"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </table>
+                <div class="Properties">
+                    <a>
+                        <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute>
+                        Properties &#187;
+                    </a>
+                </div>
+                <xsl:if test="string-length(./system-out)!=0">
+                    <div class="Properties">
+                        <a>
+                            <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-out.html</xsl:attribute>
+                            System.out &#187;
+                        </a>
+                    </div>
+                </xsl:if>
+                <xsl:if test="string-length(./system-err)!=0">
+                    <div class="Properties">
+                        <a>
+                            <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-err.html</xsl:attribute>
+                            System.err &#187;
+                        </a>
+                    </div>
+                </xsl:if>
+            </body>
+        </html>
+    </xsl:template>
+
+    <!--
+     Write properties into a JavaScript data structure.
+     This is based on the original idea by Erik Hatcher (ehatcher@apache.org)
+     -->
+    <xsl:template match="properties">
+        cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array();
+        <xsl:for-each select="property">
+            <xsl:sort select="@name"/>
+            cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>';
+        </xsl:for-each>
+    </xsl:template>
+
+
+    <!-- ======================================================================
+        This page is created for every package.
+        It prints the name of all classes that belongs to this package.
+        @param name the package name to print classes.
+         ====================================================================== -->
+    <!-- list of classes in a package -->
+    <xsl:template name="classes.list">
+        <xsl:param name="name"/>
+        <html>
+            <head>
+                <title>Unit Test Classes: <xsl:value-of select="$name"/></title>
+                <xsl:call-template name="create.stylesheet.link">
+                    <xsl:with-param name="package.name" select="$name"/>
+                </xsl:call-template>
+            </head>
+            <body>
+                <table width="100%">
+                    <tr>
+                        <td nowrap="nowrap">
+                            <h2><a href="package-summary.html" target="classFrame">
+                                <xsl:value-of select="$name"/>
+                                <xsl:if test="$name = ''">&lt;none&gt;</xsl:if>
+                            </a></h2>
+                        </td>
+                    </tr>
+                </table>
+
+                <h2>Classes</h2>
+                <table width="100%">
+                    <xsl:for-each select="/testsuites/testsuite[./@package = $name]">
+                        <xsl:sort select="@name"/>
+                        <tr>
+                            <td nowrap="nowrap">
+                                <a href="{@id}_{@name}.html" target="classFrame"><xsl:value-of select="@name"/></a>
+                            </td>
+                        </tr>
+                    </xsl:for-each>
+                </table>
+            </body>
+        </html>
+    </xsl:template>
+
+
+    <!--
+        Creates an all-classes.html file that contains a link to all package-summary.html
+        on each class.
+    -->
+    <xsl:template match="testsuites" mode="all.classes">
+        <html>
+            <head>
+                <title>All Unit Test Classes</title>
+                <xsl:call-template name="create.stylesheet.link">
+                    <xsl:with-param name="package.name"/>
+                </xsl:call-template>
+            </head>
+            <body>
+                <h2>Classes</h2>
+                <table width="100%">
+                    <xsl:apply-templates select="testsuite" mode="all.classes">
+                        <xsl:sort select="@name"/>
+                    </xsl:apply-templates>
+                </table>
+            </body>
+        </html>
+    </xsl:template>
+
+    <xsl:template match="testsuite" mode="all.classes">
+        <xsl:variable name="package.name" select="@package"/>
+        <tr>
+            <td nowrap="nowrap">
+                <a target="classFrame">
+                    <xsl:attribute name="href">
+                        <xsl:if test="not($package.name='')">
+                            <xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text>
+                        </xsl:if><xsl:value-of select="@id"/>_<xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
+                    </xsl:attribute>
+                    <xsl:value-of select="@name"/>
+                </a>
+            </td>
+        </tr>
+    </xsl:template>
+
+
+    <!--
+        Creates an html file that contains a link to all package-summary.html files on
+        each package existing on testsuites.
+        @bug there will be a problem here, I don't know yet how to handle unnamed package :(
+    -->
+    <xsl:template match="testsuites" mode="all.packages">
+        <html>
+            <head>
+                <title>All Unit Test Packages</title>
+                <xsl:call-template name="create.stylesheet.link">
+                    <xsl:with-param name="package.name"/>
+                </xsl:call-template>
+            </head>
+            <body>
+                <h2><a href="overview-summary.html" target="classFrame">Home</a></h2>
+                <h2>Packages</h2>
+                <table width="100%">
+                    <xsl:apply-templates select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]" mode="all.packages">
+                        <xsl:sort select="@package"/>
+                    </xsl:apply-templates>
+                </table>
+            </body>
+        </html>
+    </xsl:template>
+
+    <xsl:template match="testsuite" mode="all.packages">
+        <tr>
+            <td nowrap="nowrap">
+                <a href="./{translate(@package,'.','/')}/package-summary.html" target="classFrame">
+                    <xsl:value-of select="@package"/>
+                    <xsl:if test="@package = ''">&lt;none&gt;</xsl:if>
+                </a>
+            </td>
+        </tr>
+    </xsl:template>
+
+
+    <xsl:template match="testsuites" mode="overview.packages">
+        <html>
+            <head>
+                <title>Unit Test Results: Summary</title>
+                <xsl:call-template name="create.stylesheet.link">
+                    <xsl:with-param name="package.name"/>
+                </xsl:call-template>
+            </head>
+            <body>
+                <xsl:attribute name="onload">open('allclasses-frame.html','classListFrame')</xsl:attribute>
+                <xsl:call-template name="pageHeader"/>
+                <h2>Summary</h2>
+                <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
+                <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
+                <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>
+                <xsl:variable name="skippedCount" select="sum(testsuite/@skipped)" />
+                <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
+                <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/>
+                <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+                    <tr valign="top">
+                        <th>Tests</th>
+                        <th>Failures</th>
+                        <th>Errors</th>
+                        <th>Skipped</th>
+                        <th>Success rate</th>
+                        <th>Time</th>
+                    </tr>
+                    <tr valign="top">
+                        <xsl:attribute name="class">
+                            <xsl:choose>
+                                <xsl:when test="$errorCount &gt; 0">Error</xsl:when>
+                                <xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
+                                <xsl:otherwise>Pass</xsl:otherwise>
+                            </xsl:choose>
+                        </xsl:attribute>
+                        <td><a title="Display all tests" href="all-tests.html"><xsl:value-of select="$testCount"/></a></td>
+                        <td><a title="Display all failures" href="alltests-fails.html"><xsl:value-of select="$failureCount"/></a></td>
+                        <td><a title="Display all errors" href="alltests-errors.html"><xsl:value-of select="$errorCount"/></a></td>
+                        <td><a title="Display all skipped test" href="alltests-skipped.html"><xsl:value-of select="$skippedCount" /></a></td>
+                        <td>
+                            <xsl:call-template name="display-percent">
+                                <xsl:with-param name="value" select="$successRate"/>
+                            </xsl:call-template>
+                        </td>
+                        <td>
+                            <xsl:call-template name="display-time">
+                                <xsl:with-param name="value" select="$timeCount"/>
+                            </xsl:call-template>
+                        </td>
+                    </tr>
+                </table>
+                <table border="0" width="95%">
+                    <tr>
+                        <td style="text-align: justify;">
+                            Note: <em>failures</em> are anticipated and checked for with assertions while <em>errors</em> are unanticipated.
+                        </td>
+                    </tr>
+                </table>
+
+                <h2>Packages</h2>
+                <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+                    <xsl:call-template name="testsuite.test.header"/>
+                    <xsl:for-each select="testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
+                        <xsl:sort select="@package" order="ascending"/>
+                        <!-- get the node set containing all testsuites that have the same package -->
+                        <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = current()/@package]"/>
+                        <tr valign="top">
+                            <!-- display a failure if there is any failure/error in the package -->
+                            <xsl:attribute name="class">
+                                <xsl:choose>
+                                    <xsl:when test="sum($insamepackage/@errors) &gt; 0">Error</xsl:when>
+                                    <xsl:when test="sum($insamepackage/@failures) &gt; 0">Failure</xsl:when>
+                                    <xsl:otherwise>Pass</xsl:otherwise>
+                                </xsl:choose>
+                            </xsl:attribute>
+                            <td><a href="./{translate(@package,'.','/')}/package-summary.html">
+                                <xsl:value-of select="@package"/>
+                                <xsl:if test="@package = ''">&lt;none&gt;</xsl:if>
+                            </a></td>
+                            <td><xsl:value-of select="sum($insamepackage/@tests)"/></td>
+                            <td><xsl:value-of select="sum($insamepackage/@errors)"/></td>
+                            <td><xsl:value-of select="sum($insamepackage/@failures)"/></td>
+                            <td><xsl:value-of select="sum($insamepackage/@skipped)" /></td>
+                            <td>
+                                <xsl:call-template name="display-time">
+                                    <xsl:with-param name="value" select="sum($insamepackage/@time)"/>
+                                </xsl:call-template>
+                            </td>
+                            <td><xsl:value-of select="$insamepackage/@timestamp"/></td>
+                            <td><xsl:value-of select="$insamepackage/@hostname"/></td>
+                        </tr>
+                    </xsl:for-each>
+                </table>
+            </body>
+        </html>
+    </xsl:template>
+
+
+    <xsl:template name="package.summary">
+        <xsl:param name="name"/>
+        <html>
+            <head>
+                <xsl:call-template name="create.stylesheet.link">
+                    <xsl:with-param name="package.name" select="$name"/>
+                </xsl:call-template>
+            </head>
+            <body>
+                <xsl:attribute name="onload">open('package-frame.html','classListFrame')</xsl:attribute>
+                <xsl:call-template name="pageHeader"/>
+                <h3>Package <xsl:value-of select="$name"/></h3>
+
+                <!--table border="0" cellpadding="5" cellspacing="2" width="95%">
+                    <xsl:call-template name="class.metrics.header"/>
+                    <xsl:apply-templates select="." mode="print.metrics"/>
+                </table-->
+
+                <xsl:variable name="insamepackage" select="/testsuites/testsuite[./@package = $name]"/>
+                <xsl:if test="count($insamepackage) &gt; 0">
+                    <h2>Classes</h2>
+                    <p>
+                        <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+                            <xsl:call-template name="testsuite.test.header"/>
+                            <xsl:apply-templates select="$insamepackage" mode="print.test">
+                                <xsl:sort select="@name"/>
+                            </xsl:apply-templates>
+                        </table>
+                    </p>
+                </xsl:if>
+            </body>
+        </html>
+    </xsl:template>
+
+
+    <!--
+        transform string like a.b.c to ../../../
+        @param path the path to transform into a descending directory path
+    -->
+    <xsl:template name="path">
+        <xsl:param name="path"/>
+        <xsl:if test="contains($path,'.')">
+            <xsl:text>../</xsl:text>
+            <xsl:call-template name="path">
+                <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'.')"/></xsl:with-param>
+            </xsl:call-template>
+        </xsl:if>
+        <xsl:if test="not(contains($path,'.')) and not($path = '')">
+            <xsl:text>../</xsl:text>
+        </xsl:if>
+    </xsl:template>
+
+
+    <!-- create the link to the stylesheet based on the package name -->
+    <xsl:template name="create.stylesheet.link">
+        <xsl:param name="package.name"/>
+        <link rel="stylesheet" type="text/css" title="Style"><xsl:attribute name="href"><xsl:if test="not($package.name = 'unnamed package')"><xsl:call-template name="path"><xsl:with-param name="path" select="$package.name"/></xsl:call-template></xsl:if>stylesheet.css</xsl:attribute></link>
+    </xsl:template>
+
+
+    <!-- Page HEADER -->
+    <xsl:template name="pageHeader">
+        <h1><xsl:value-of select="$TITLE"/></h1>
+        <table width="100%">
+            <tr>
+                <td align="left"></td>
+                <td align="right">Designed for use with <a href="http://www.junit.org/">JUnit</a> and <a href="http://ant.apache.org/">Ant</a>.</td>
+            </tr>
+        </table>
+        <hr size="1"/>
+    </xsl:template>
+
+    <!-- class header -->
+    <xsl:template name="testsuite.test.header">
+        <tr valign="top">
+            <th width="80%">Name</th>
+            <th>Tests</th>
+            <th>Errors</th>
+            <th>Failures</th>
+            <th>Skipped</th>
+            <th nowrap="nowrap">Time(s)</th>
+            <th nowrap="nowrap">Time Stamp</th>
+            <th>Host</th>
+        </tr>
+    </xsl:template>
+
+    <!-- method header -->
+    <xsl:template name="testcase.test.header">
+        <xsl:param name="show.class" select="''"/>
+        <tr valign="top">
+            <xsl:if test="boolean($show.class)">
+                <th>Class</th>
+            </xsl:if>
+            <th>Name</th>
+            <th>Status</th>
+            <th width="80%">Type</th>
+            <th nowrap="nowrap">Time(s)</th>
+        </tr>
+    </xsl:template>
+
+
+    <!-- class information -->
+    <xsl:template match="testsuite" mode="print.test">
+        <tr valign="top">
+            <xsl:attribute name="class">
+                <xsl:choose>
+                    <xsl:when test="@errors[.&gt; 0]">Error</xsl:when>
+                    <xsl:when test="@failures[.&gt; 0]">Failure</xsl:when>
+                    <xsl:otherwise>Pass</xsl:otherwise>
+                </xsl:choose>
+            </xsl:attribute>
+            <td><a title="Display all tests" href="{@id}_{@name}.html"><xsl:value-of select="@name"/></a></td>
+            <td><a title="Display all tests" href="{@id}_{@name}.html"><xsl:apply-templates select="@tests"/></a></td>
+            <td>
+                <xsl:choose>
+                    <xsl:when test="@errors != 0">
+                        <a title="Display only errors" href="{@id}_{@name}-errors.html"><xsl:apply-templates select="@errors"/></a>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:apply-templates select="@errors"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </td>
+            <td>
+                <xsl:choose>
+                    <xsl:when test="@failures != 0">
+                        <a title="Display only failures" href="{@id}_{@name}-fails.html"><xsl:apply-templates select="@failures"/></a>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:apply-templates select="@failures"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </td>
+            <td>
+                <xsl:choose>
+                    <xsl:when test="@skipped != 0">
+                        <a title="Display only skipped tests" href="{@id}_{@name}-skipped.html"><xsl:apply-templates select="@skipped"/></a>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:apply-templates select="@skipped"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </td>
+            <td><xsl:call-template name="display-time">
+                <xsl:with-param name="value" select="@time"/>
+            </xsl:call-template>
+            </td>
+            <td><xsl:apply-templates select="@timestamp"/></td>
+            <td><xsl:apply-templates select="@hostname"/></td>
+        </tr>
+    </xsl:template>
+
+    <xsl:template match="testcase" mode="print.test">
+        <xsl:param name="show.class" select="''"/>
+        <tr valign="top">
+            <xsl:attribute name="class">
+                <xsl:choose>
+                    <xsl:when test="error">Error</xsl:when>
+                    <xsl:when test="failure">Failure</xsl:when>
+                    <xsl:otherwise>TableRowColor</xsl:otherwise>
+                </xsl:choose>
+            </xsl:attribute>
+            <xsl:variable name="class.href">
+                <xsl:value-of select="concat(translate(../@package,'.','/'), '/', ../@id, '_', ../@name, '.html')"/>
+            </xsl:variable>
+            <xsl:if test="boolean($show.class)">
+                <td><a href="{$class.href}"><xsl:value-of select="../@name"/></a></td>
+            </xsl:if>
+            <td>
+                <a name="{@name}"/>
+                <xsl:choose>
+                    <xsl:when test="boolean($show.class)">
+                        <a href="{concat($class.href, '#', @name)}"><xsl:value-of select="@name"/></a>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="@name"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </td>
+            <xsl:choose>
+                <xsl:when test="failure">
+                    <td>Failure</td>
+                    <td><xsl:apply-templates select="failure"/></td>
+                </xsl:when>
+                <xsl:when test="error">
+                    <td>Error</td>
+                    <td><xsl:apply-templates select="error"/></td>
+                </xsl:when>
+                <xsl:when test="skipped">
+                    <td>Skipped</td>
+                    <td><xsl:apply-templates select="skipped"/></td>
+                </xsl:when>
+                <xsl:otherwise>
+                    <td>Success</td>
+                    <td></td>
+                </xsl:otherwise>
+            </xsl:choose>
+            <td>
+                <xsl:call-template name="display-time">
+                    <xsl:with-param name="value" select="@time"/>
+                </xsl:call-template>
+            </td>
+        </tr>
+    </xsl:template>
+
+
+    <!-- Note : the below template skipped, error and failure are the same style
+                so just call the same style store in the toolkit template -->
+    <xsl:template match="failure">
+        <xsl:call-template name="display-failures"/>
+    </xsl:template>
+
+    <xsl:template match="error">
+        <xsl:call-template name="display-failures"/>
+    </xsl:template>
+
+    <xsl:template match="skipped">
+        <xsl:call-template name="display-failures"/>
+    </xsl:template>
+
+    <!-- Style for the error and failure in the testcase template -->
+    <xsl:template name="display-failures">
+        <xsl:choose>
+            <xsl:when test="not(@message)">N/A</xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="@message"/>
+            </xsl:otherwise>
+        </xsl:choose>
+        <!-- display the stacktrace -->
+        <br/><br/>
+        <code>
+            <xsl:call-template name="br-replace">
+                <xsl:with-param name="word" select="."/>
+            </xsl:call-template>
+        </code>
+        <!-- the latter is better but might be problematic for non-21" monitors... -->
+        <!--pre><xsl:value-of select="."/></pre-->
+    </xsl:template>
+
+    <xsl:template name="JS-escape">
+        <xsl:param name="string"/>
+        <xsl:variable name="tmp1" select="replace($string,'\\','\\\\')"/>
+        <xsl:variable name="tmp2" select="replace($tmp1,&quot;'&quot;,&quot;\\&apos;&quot;)"/>
+        <xsl:variable name="tmp3" select="replace($tmp2,&quot;&#10;&quot;,'\\n')"/>
+        <xsl:variable name="tmp4" select="replace($tmp3,&quot;&#13;&quot;,'\\r')"/>
+        <xsl:value-of select="$tmp4"/>
+    </xsl:template>
+
+
+    <!--
+        template that will convert a carriage return into a br tag
+        @param word the text from which to convert CR to BR tag
+    -->
+    <xsl:template name="br-replace">
+        <xsl:param name="word"/>
+        <xsl:param name="splitlimit">32</xsl:param>
+        <xsl:variable name="secondhalfstartindex" select="(string-length($word)+(string-length($word) mod 2)) div 2"/>
+        <xsl:variable name="secondhalfword" select="substring($word, $secondhalfstartindex)"/>
+        <!-- When word is very big, a recursive replace is very heap/stack expensive, so subdivide on line break after middle of string -->
+        <xsl:choose>
+            <xsl:when test="(string-length($word) > $splitlimit) and (contains($secondhalfword, '&#xa;'))">
+                <xsl:variable name="secondhalfend" select="substring-after($secondhalfword, '&#xa;')"/>
+                <xsl:variable name="firsthalflen" select="string-length($word) - string-length($secondhalfword)"/>
+                <xsl:variable name="firsthalfword" select="substring($word, 1, $firsthalflen)"/>
+                <xsl:variable name="firsthalfend" select="substring-before($secondhalfword, '&#xa;')"/>
+                <xsl:call-template name="br-replace">
+                    <xsl:with-param name="word" select="concat($firsthalfword,$firsthalfend)"/>
+                </xsl:call-template>
+                <br/>
+                <xsl:call-template name="br-replace">
+                    <xsl:with-param name="word" select="$secondhalfend"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:when test="contains($word, '&#xa;')">
+                <xsl:value-of select="substring-before($word, '&#xa;')"/>
+                <br/>
+                <xsl:call-template name="br-replace">
+                    <xsl:with-param name="word" select="substring-after($word, '&#xa;')"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="$word"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template name="display-time">
+        <xsl:param name="value"/>
+        <xsl:value-of select="format-number($value,'0.000')"/>
+    </xsl:template>
+
+    <xsl:template name="display-percent">
+        <xsl:param name="value"/>
+        <xsl:value-of select="format-number($value,'0.00%')"/>
+    </xsl:template>
+</xsl:stylesheet>
diff -Nru ant-1.9.10/src/etc/junit-noframes-saxon.xsl ant-1.10.3/src/etc/junit-noframes-saxon.xsl
--- ant-1.9.10/src/etc/junit-noframes-saxon.xsl	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/etc/junit-noframes-saxon.xsl	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,514 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    exclude-result-prefixes="xs"
+    version="2.0">
+<xsl:output method="html" indent="yes" encoding="UTF-8"
+  doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
+<xsl:decimal-format decimal-separator="." grouping-separator="," />
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+
+<xsl:param name="TITLE">Unit Test Results.</xsl:param>
+
+<!--
+
+ Sample stylesheet to be used with Ant JUnitReport output.
+
+ It creates a non-framed report that can be useful to send via
+ e-mail or such.
+
+-->
+<xsl:template match="testsuites">
+    <html>
+        <head>
+            <title><xsl:value-of select="$TITLE"/></title>
+    <style type="text/css">
+      body {
+        font:normal 68% verdana,arial,helvetica;
+        color:#000000;
+      }
+      table tr td, table tr th {
+          font-size: 68%;
+      }
+      table.details tr th{
+        font-weight: bold;
+        text-align:left;
+        background:#a6caf0;
+      }
+      table.details tr td{
+        background:#eeeee0;
+      }
+
+      p {
+        line-height:1.5em;
+        margin-top:0.5em; margin-bottom:1.0em;
+      }
+      h1 {
+        margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
+      }
+      h2 {
+        margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
+      }
+      h3 {
+        margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
+      }
+      h4 {
+        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+      }
+      h5 {
+        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+      }
+      h6 {
+        margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+      }
+      .Error {
+        font-weight:bold; color:red;
+      }
+      .Failure {
+        font-weight:bold; color:purple;
+      }
+      .Properties {
+        text-align:right;
+      }
+      </style>
+      <script type="text/javascript" language="JavaScript">
+        var TestCases = new Array();
+        var cur;
+        <xsl:for-each select="./testsuite">
+            <xsl:apply-templates select="properties"/>
+        </xsl:for-each>
+
+       </script>
+       <script type="text/javascript" language="JavaScript"><![CDATA[
+        function displayProperties (name) {
+          var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
+          var doc = win.document;
+          doc.open();
+          doc.write("<html><head><title>Properties of " + name + "</title>");
+          doc.write("<style>")
+          doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }");
+          doc.write("table tr td, table tr th { font-size: 68%; }");
+          doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
+          doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
+          doc.write("table.properties td { font:normal; text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#fffffff; }");
+          doc.write("h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica }");
+          doc.write("</style>");
+          doc.write("</head><body>");
+          doc.write("<h3>Properties of " + name + "</h3>");
+          doc.write("<div align=\"right\"><a href=\"javascript:window.close();\">Close</a></div>");
+          doc.write("<table class='properties'>");
+          doc.write("<tr><th>Name</th><th>Value</th></tr>");
+          for (prop in TestCases[name]) {
+            doc.write("<tr><th>" + prop + "</th><td>" + TestCases[name][prop] + "</td></tr>");
+          }
+          doc.write("</table>");
+          doc.write("</body></html>");
+          doc.close();
+          win.focus();
+        }
+      ]]>
+      </script>
+        </head>
+        <body>
+            <a name="top"></a>
+            <xsl:call-template name="pageHeader"/>
+
+            <!-- Summary part -->
+            <xsl:call-template name="summary"/>
+            <hr size="1" width="95%" align="left"/>
+
+            <!-- Package List part -->
+            <xsl:call-template name="packagelist"/>
+            <hr size="1" width="95%" align="left"/>
+
+            <!-- For each package create its part -->
+            <xsl:call-template name="packages"/>
+            <hr size="1" width="95%" align="left"/>
+
+            <!-- For each class create the  part -->
+            <xsl:call-template name="classes"/>
+
+        </body>
+    </html>
+</xsl:template>
+
+
+
+    <!-- ================================================================== -->
+    <!-- Write a list of all packages with an hyperlink to the anchor of    -->
+    <!-- of the package name.                                               -->
+    <!-- ================================================================== -->
+    <xsl:template name="packagelist">
+        <h2>Packages</h2>
+        Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers.
+        <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+            <xsl:call-template name="testsuite.test.header"/>
+            <!-- list all packages recursively -->
+            <xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
+                <xsl:sort select="@package"/>
+                <xsl:variable name="testsuites-in-package" select="/testsuites/testsuite[./@package = current()/@package]"/>
+                <xsl:variable name="testCount" select="sum($testsuites-in-package/@tests)"/>
+                <xsl:variable name="errorCount" select="sum($testsuites-in-package/@errors)"/>
+                <xsl:variable name="failureCount" select="sum($testsuites-in-package/@failures)"/>
+                <xsl:variable name="skippedCount" select="sum($testsuites-in-package/@skipped)" />
+                <xsl:variable name="timeCount" select="sum($testsuites-in-package/@time)"/>
+
+                <!-- write a summary for the package -->
+                <tr valign="top">
+                    <!-- set a nice color depending if there is an error/failure -->
+                    <xsl:attribute name="class">
+                        <xsl:choose>
+                            <xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
+                            <xsl:when test="$errorCount &gt; 0">Error</xsl:when>
+                        </xsl:choose>
+                    </xsl:attribute>
+                    <td><a href="#{@package}"><xsl:value-of select="@package"/></a></td>
+                    <td><xsl:value-of select="$testCount"/></td>
+                    <td><xsl:value-of select="$errorCount"/></td>
+                    <td><xsl:value-of select="$failureCount"/></td>
+                    <td><xsl:value-of select="$skippedCount" /></td>
+                    <td>
+                    <xsl:call-template name="display-time">
+                        <xsl:with-param name="value" select="$timeCount"/>
+                    </xsl:call-template>
+                    </td>
+                    <td><xsl:value-of select="$testsuites-in-package/@timestamp"/></td>
+                    <td><xsl:value-of select="$testsuites-in-package/@hostname"/></td>
+                </tr>
+            </xsl:for-each>
+        </table>
+    </xsl:template>
+
+
+    <!-- ================================================================== -->
+    <!-- Write a package level report                                       -->
+    <!-- It creates a table with values from the document:                  -->
+    <!-- Name | Tests | Errors | Failures | Time                            -->
+    <!-- ================================================================== -->
+    <xsl:template name="packages">
+        <!-- create an anchor to this package name -->
+        <xsl:for-each select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
+            <xsl:sort select="@package"/>
+                <a name="{@package}"></a>
+                <h3>Package <xsl:value-of select="@package"/></h3>
+
+                <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+                    <xsl:call-template name="testsuite.test.header"/>
+
+                    <!-- match the testsuites of this package -->
+                    <xsl:apply-templates select="/testsuites/testsuite[./@package = current()/@package]" mode="print.test"/>
+                </table>
+                <a href="#top">Back to top</a>
+                <p/>
+                <p/>
+        </xsl:for-each>
+    </xsl:template>
+
+    <xsl:template name="classes">
+        <xsl:for-each select="testsuite">
+            <xsl:sort select="@name"/>
+            <!-- create an anchor to this class name -->
+            <a name="{@name}"></a>
+            <h3>TestCase <xsl:value-of select="@name"/></h3>
+
+            <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+              <xsl:call-template name="testcase.test.header"/>
+              <!--
+              test can even not be started at all (failure to load the class)
+              so report the error directly
+              -->
+                <xsl:if test="./error">
+                    <tr class="Error">
+                        <td colspan="4"><xsl:apply-templates select="./error"/></td>
+                    </tr>
+                </xsl:if>
+                <xsl:apply-templates select="./testcase" mode="print.test"/>
+            </table>
+            <div class="Properties">
+                <a>
+                    <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute>
+                    Properties &#187;
+                </a>
+            </div>
+            <p/>
+
+            <a href="#top">Back to top</a>
+        </xsl:for-each>
+    </xsl:template>
+
+    <xsl:template name="summary">
+        <h2>Summary</h2>
+        <xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
+        <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
+        <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>
+        <xsl:variable name="skippedCount" select="sum(testsuite/@skipped)" />
+        <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
+        <xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/>
+        <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+        <tr valign="top">
+            <th>Tests</th>
+            <th>Failures</th>
+            <th>Errors</th>
+            <th>Skipped</th>
+            <th>Success rate</th>
+            <th>Time</th>
+        </tr>
+        <tr valign="top">
+            <xsl:attribute name="class">
+                <xsl:choose>
+                    <xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
+                    <xsl:when test="$errorCount &gt; 0">Error</xsl:when>
+                </xsl:choose>
+            </xsl:attribute>
+            <td><xsl:value-of select="$testCount"/></td>
+            <td><xsl:value-of select="$failureCount"/></td>
+            <td><xsl:value-of select="$errorCount"/></td>
+            <td><xsl:value-of select="$skippedCount" /></td>
+            <td>
+                <xsl:call-template name="display-percent">
+                    <xsl:with-param name="value" select="$successRate"/>
+                </xsl:call-template>
+            </td>
+            <td>
+                <xsl:call-template name="display-time">
+                    <xsl:with-param name="value" select="$timeCount"/>
+                </xsl:call-template>
+            </td>
+
+        </tr>
+        </table>
+        <table border="0" width="95%">
+        <tr>
+        <td style="text-align: justify;">
+        Note: <i>failures</i> are anticipated and checked for with assertions while <i>errors</i> are unanticipated.
+        </td>
+        </tr>
+        </table>
+    </xsl:template>
+
+  <!--
+   Write properties into a JavaScript data structure.
+   This is based on the original idea by Erik Hatcher (ehatcher@apache.org)
+   -->
+  <xsl:template match="properties">
+    cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of select="../@name"/>'] = new Array();
+    <xsl:for-each select="property">
+    <xsl:sort select="@name"/>
+        cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>';
+    </xsl:for-each>
+  </xsl:template>
+
+<!-- Page HEADER -->
+<xsl:template name="pageHeader">
+    <h1><xsl:value-of select="$TITLE"/></h1>
+    <table width="100%">
+    <tr>
+        <td align="left"></td>
+        <td align="right">Designed for use with <a href='http://www.junit.org'>JUnit</a> and <a href='http://ant.apache.org/ant'>Ant</a>.</td>
+    </tr>
+    </table>
+    <hr size="1"/>
+</xsl:template>
+
+<xsl:template match="testsuite" mode="header">
+    <tr valign="top">
+        <th width="80%">Name</th>
+        <th>Tests</th>
+        <th>Errors</th>
+        <th>Failures</th>
+        <th>Skipped</th>
+        <th nowrap="nowrap">Time(s)</th>
+    </tr>
+</xsl:template>
+
+<!-- class header -->
+<xsl:template name="testsuite.test.header">
+    <tr valign="top">
+        <th width="80%">Name</th>
+        <th>Tests</th>
+        <th>Errors</th>
+        <th>Failures</th>
+        <th>Skipped</th>
+        <th nowrap="nowrap">Time(s)</th>
+        <th nowrap="nowrap">Time Stamp</th>
+        <th>Host</th>
+    </tr>
+</xsl:template>
+
+<!-- method header -->
+<xsl:template name="testcase.test.header">
+    <tr valign="top">
+        <th>Name</th>
+        <th>Status</th>
+        <th width="80%">Type</th>
+        <th nowrap="nowrap">Time(s)</th>
+    </tr>
+</xsl:template>
+
+
+<!-- class information -->
+<xsl:template match="testsuite" mode="print.test">
+    <tr valign="top">
+        <!-- set a nice color depending if there is an error/failure -->
+        <xsl:attribute name="class">
+            <xsl:choose>
+                <xsl:when test="@failures[.&gt; 0]">Failure</xsl:when>
+                <xsl:when test="@errors[.&gt; 0]">Error</xsl:when>
+            </xsl:choose>
+        </xsl:attribute>
+
+        <!-- print testsuite information -->
+        <td><a href="#{@name}"><xsl:value-of select="@name"/></a></td>
+        <td><xsl:value-of select="@tests"/></td>
+        <td><xsl:value-of select="@errors"/></td>
+        <td><xsl:value-of select="@failures"/></td>
+        <td><xsl:value-of select="@skipped" /></td>
+        <td>
+            <xsl:call-template name="display-time">
+                <xsl:with-param name="value" select="@time"/>
+            </xsl:call-template>
+        </td>
+        <td><xsl:apply-templates select="@timestamp"/></td>
+        <td><xsl:apply-templates select="@hostname"/></td>
+    </tr>
+</xsl:template>
+
+<xsl:template match="testcase" mode="print.test">
+    <tr valign="top">
+        <xsl:attribute name="class">
+            <xsl:choose>
+                <xsl:when test="failure | error">Error</xsl:when>
+            </xsl:choose>
+        </xsl:attribute>
+        <td><xsl:value-of select="@name"/></td>
+        <xsl:choose>
+            <xsl:when test="failure">
+                <td>Failure</td>
+                <td><xsl:apply-templates select="failure"/></td>
+            </xsl:when>
+            <xsl:when test="error">
+                <td>Error</td>
+                <td><xsl:apply-templates select="error"/></td>
+            </xsl:when>
+            <xsl:when test="skipped">
+            	<td>Skipped</td>
+            	<td><xsl:apply-templates select="skipped"/></td>
+            </xsl:when>
+            <xsl:otherwise>
+                <td>Success</td>
+                <td></td>
+            </xsl:otherwise>
+        </xsl:choose>
+        <td>
+            <xsl:call-template name="display-time">
+                <xsl:with-param name="value" select="@time"/>
+            </xsl:call-template>
+        </td>
+    </tr>
+</xsl:template>
+
+
+<xsl:template match="failure">
+    <xsl:call-template name="display-failures"/>
+</xsl:template>
+
+<xsl:template match="error">
+    <xsl:call-template name="display-failures"/>
+</xsl:template>
+
+<xsl:template match="skipped">
+    <xsl:call-template name="display-failures"/>
+</xsl:template>
+
+<!-- Style for the error, failure and skipped in the testcase template -->
+<xsl:template name="display-failures">
+    <xsl:choose>
+        <xsl:when test="not(@message)">N/A</xsl:when>
+        <xsl:otherwise>
+            <xsl:value-of select="@message"/>
+        </xsl:otherwise>
+    </xsl:choose>
+    <!-- display the stacktrace -->
+    <code>
+        <br/><br/>
+        <xsl:call-template name="br-replace">
+            <xsl:with-param name="word" select="."/>
+        </xsl:call-template>
+    </code>
+    <!-- the later is better but might be problematic for non-21" monitors... -->
+    <!--pre><xsl:value-of select="."/></pre-->
+</xsl:template>
+
+<xsl:template name="JS-escape">
+    <xsl:param name="string"/>
+    <xsl:variable name="tmp1" select="replace($string,'\\','\\\\')"/>
+    <xsl:variable name="tmp2" select="replace($tmp1,&quot;'&quot;,&quot;\\&apos;&quot;)"/>
+    <xsl:variable name="tmp3" select="replace($tmp2,&quot;&#10;&quot;,'\\n')"/>
+    <xsl:variable name="tmp4" select="replace($tmp3,&quot;&#13;&quot;,'\\r')"/>
+    <xsl:value-of select="$tmp4"/>
+</xsl:template>
+
+
+<!--
+    template that will convert a carriage return into a br tag
+    @param word the text from which to convert CR to BR tag
+-->
+<xsl:template name="br-replace">
+    <xsl:param name="word"/>
+    <xsl:param name="splitlimit">32</xsl:param>
+    <xsl:variable name="secondhalfstartindex" select="(string-length($word)+(string-length($word) mod 2)) div 2"/>
+    <xsl:variable name="secondhalfword" select="substring($word, $secondhalfstartindex)"/>
+    <!-- When word is very big, a recursive replace is very heap/stack expensive, so subdivide on line break after middle of string -->
+    <xsl:choose>
+      <xsl:when test="(string-length($word) > $splitlimit) and (contains($secondhalfword, '&#xa;'))">
+        <xsl:variable name="secondhalfend" select="substring-after($secondhalfword, '&#xa;')"/>
+        <xsl:variable name="firsthalflen" select="string-length($word) - string-length($secondhalfword)"/>
+        <xsl:variable name="firsthalfword" select="substring($word, 1, $firsthalflen)"/>
+        <xsl:variable name="firsthalfend" select="substring-before($secondhalfword, '&#xa;')"/>
+        <xsl:call-template name="br-replace">
+          <xsl:with-param name="word" select="concat($firsthalfword,$firsthalfend)"/>
+        </xsl:call-template>
+        <br/>
+        <xsl:call-template name="br-replace">
+          <xsl:with-param name="word" select="$secondhalfend"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:when test="contains($word, '&#xa;')">
+        <xsl:value-of select="substring-before($word, '&#xa;')"/>
+        <br/>
+        <xsl:call-template name="br-replace">
+          <xsl:with-param name="word" select="substring-after($word, '&#xa;')"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$word"/>
+      </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template name="display-time">
+    <xsl:param name="value"/>
+    <xsl:value-of select="format-number($value,'0.000')"/>
+</xsl:template>
+
+<xsl:template name="display-percent">
+    <xsl:param name="value"/>
+    <xsl:value-of select="format-number($value,'0.00%')"/>
+</xsl:template>
+
+</xsl:stylesheet>
diff -Nru ant-1.9.10/src/etc/manifest ant-1.10.3/src/etc/manifest
--- ant-1.9.10/src/etc/manifest	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/manifest	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: org.apache.tools.ant.Main
-
-
diff -Nru ant-1.9.10/src/etc/poms/ant/pom.xml ant-1.10.3/src/etc/poms/ant/pom.xml
--- ant-1.9.10/src/etc/poms/ant/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -27,19 +27,19 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant Core</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant-launcher</artifactId>
-      <version>1.9.10</version>
+      <version>1.10.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -114,46 +114,50 @@
         <configuration>
           <excludes>
             <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
-            <exclude>org/apache/tools/ant/types/resolver/**</exclude>
-            <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
+            <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
+            <exclude>org/apache/tools/ant/launch/**</exclude>
             <exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
-            <exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
-            <exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
+            <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
-            <exclude>org/apache/tools/ant/launch/**</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/NetRexxC*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/Script*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/image/*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/jdepend/*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/junit/*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/junitlauncher/*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/net/FTP*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/net/RExec*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/net/TelnetTask*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/junit/*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/ssh/*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/image/*</exclude>
-            <exclude>org/apache/tools/ant/types/optional/image/*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/Script*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/script/**</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/ssh/*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/xz/*</exclude>
             <exclude>org/apache/tools/ant/types/optional/*Script*</exclude>
+            <exclude>org/apache/tools/ant/types/optional/image/*</exclude>
+            <exclude>org/apache/tools/ant/types/optional/xz/*</exclude>
+            <exclude>org/apache/tools/ant/types/resolver/**</exclude>
             <exclude>org/apache/tools/ant/util/ScriptRunner.java</exclude>
-            <exclude>org/apache/tools/ant/util/optional/ScriptRunner.java</exclude>
-            <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
             <exclude>org/apache/tools/ant/util/depend/bcel/*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/NetRexxC*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/jdepend/*</exclude>
+            <exclude>org/apache/tools/ant/util/optional/ScriptRunner.java</exclude>
+            <exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
+            <exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
           </excludes>
           <testExcludes>
             <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
-            <exclude>org/apache/tools/ant/types/resolver/**</exclude>
-            <exclude>org/apache/tools/ant/util/Script*</exclude>
-            <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
-            <exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
-            <exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
-            <exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
-            <exclude>org/apache/tools/ant/util/regexp/Jdk14Regexp*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
             <exclude>org/apache/tools/ant/launch/**</exclude>
+            <exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
+            <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/StyleTest*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/junit/</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/junitlauncher/</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/net/FTP*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/optional/ssh/*</exclude>
+            <exclude>org/apache/tools/ant/types/resolver/**</exclude>
+            <exclude>org/apache/tools/ant/util/Script*</exclude>
+            <exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
+            <exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
+            <exclude>org/apache/tools/ant/util/regexp/Jdk14Regexp*</exclude>
           </testExcludes>
         </configuration>
       </plugin>
diff -Nru ant-1.9.10/src/etc/poms/ant-antlr/pom.xml ant-1.10.3/src/etc/poms/ant-antlr/pom.xml
--- ant-1.9.10/src/etc/poms/ant-antlr/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-antlr/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -27,13 +27,13 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-antlr</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant + ANTLR</name>
   <description>antlr specific task.
     The implementation forks a java process, therefore the antlr jar file is only needed at runtime</description>
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.10</version>
+      <version>1.10.3</version>
       <optional>true</optional>
       <scope>compile</scope>
     </dependency>
diff -Nru ant-1.9.10/src/etc/poms/ant-apache-bcel/pom.xml ant-1.10.3/src/etc/poms/ant-apache-bcel/pom.xml
--- ant-1.9.10/src/etc/poms/ant-apache-bcel/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-apache-bcel/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -27,25 +27,25 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-bcel</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant + BCEL</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.10</version>
+      <version>1.10.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>bcel</groupId>
+      <groupId>org.apache.bcel</groupId>
       <artifactId>bcel</artifactId>
-      <version>5.1</version>
+      <version>6.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff -Nru ant-1.9.10/src/etc/poms/ant-apache-bsf/pom.xml ant-1.10.3/src/etc/poms/ant-apache-bsf/pom.xml
--- ant-1.9.10/src/etc/poms/ant-apache-bsf/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-apache-bsf/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -27,19 +27,19 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-bsf</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant + BSF</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.10</version>
+      <version>1.10.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff -Nru ant-1.9.10/src/etc/poms/ant-apache-log4j/pom.xml ant-1.10.3/src/etc/poms/ant-apache-log4j/pom.xml
--- ant-1.9.10/src/etc/poms/ant-apache-log4j/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-apache-log4j/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -26,19 +26,19 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-log4j</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant + Log4J</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.10</version>
+      <version>1.10.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff -Nru ant-1.9.10/src/etc/poms/ant-apache-oro/pom.xml ant-1.10.3/src/etc/poms/ant-apache-oro/pom.xml
--- ant-1.9.10/src/etc/poms/ant-apache-oro/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-apache-oro/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -27,19 +27,19 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-oro</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant + Apache Oro</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.10</version>
+      <version>1.10.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff -Nru ant-1.9.10/src/etc/poms/ant-apache-regexp/pom.xml ant-1.10.3/src/etc/poms/ant-apache-regexp/pom.xml
--- ant-1.9.10/src/etc/poms/ant-apache-regexp/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-apache-regexp/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -26,19 +26,19 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-regexp</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant + Apache Regexp</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.10</version>
+      <version>1.10.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff -Nru ant-1.9.10/src/etc/poms/ant-apache-resolver/pom.xml ant-1.10.3/src/etc/poms/ant-apache-resolver/pom.xml
--- ant-1.9.10/src/etc/poms/ant-apache-resolver/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-apache-resolver/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -26,19 +26,19 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-resolver</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant + Apache Resolver</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.10</version>
+      <version>1.10.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -55,7 +55,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <includes>
-            <include>org/apache/tools/ant/types/resolver/**</include>
+            <include>org/apache/tools/ant/types/resolver/*.java</include>
           </includes>
         </configuration>
       </plugin>
diff -Nru ant-1.9.10/src/etc/poms/ant-apache-xalan2/pom.xml ant-1.10.3/src/etc/poms/ant-apache-xalan2/pom.xml
--- ant-1.9.10/src/etc/poms/ant-apache-xalan2/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-apache-xalan2/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -26,20 +26,20 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-xalan2</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant + Xalan 2</name>
   <description>contains Xalan2-specific features</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.10</version>
+      <version>1.10.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff -Nru ant-1.9.10/src/etc/poms/ant-commons-logging/pom.xml ant-1.10.3/src/etc/poms/ant-commons-logging/pom.xml
--- ant-1.9.10/src/etc/poms/ant-commons-logging/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-commons-logging/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -26,20 +26,20 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-commons-logging</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant + Commons Logging</name>
   <description>Ant Listener based on commons-logging</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.10</version>
+      <version>1.10.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff -Nru ant-1.9.10/src/etc/poms/ant-commons-net/pom.xml ant-1.10.3/src/etc/poms/ant-commons-net/pom.xml
--- ant-1.9.10/src/etc/poms/ant-commons-net/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-commons-net/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -26,26 +26,26 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-commons-net</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant + Commons Net</name>
   <description>ftp, rexec and telnet tasks</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.10</version>
+      <version>1.10.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
-      <version>2.2</version>
+      <version>3.6</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff -Nru ant-1.9.10/src/etc/poms/ant-jai/pom.xml ant-1.10.3/src/etc/poms/ant-jai/pom.xml
--- ant-1.9.10/src/etc/poms/ant-jai/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-jai/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -27,13 +27,13 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jai</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant + JAI</name>
   <description>image task and corresponding types.
   </description>
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.10</version>
+      <version>1.10.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff -Nru ant-1.9.10/src/etc/poms/ant-javamail/pom.xml ant-1.10.3/src/etc/poms/ant-javamail/pom.xml
--- ant-1.9.10/src/etc/poms/ant-javamail/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-javamail/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -26,13 +26,13 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-javamail</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant + JavaMail</name>
   <description>implementation of the mail task based on javamail.
     Required to send emails to SMTP servers using user/password combinations
@@ -41,19 +41,13 @@
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.10</version>
+      <version>1.10.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>javax.mail-api</artifactId>
-      <version>1.5.6</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.activation</groupId>
-      <artifactId>activation</artifactId>
-      <version>1.1.1</version>
+      <version>1.6.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies> 
diff -Nru ant-1.9.10/src/etc/poms/ant-jdepend/pom.xml ant-1.10.3/src/etc/poms/ant-jdepend/pom.xml
--- ant-1.9.10/src/etc/poms/ant-jdepend/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-jdepend/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -27,13 +27,13 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jdepend</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant + JDepend</name>
   <description>task jdepend invoking the jdepend parser. There is also a version 2.9.1 of the
     jdepend parser available on the maven repository</description>
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.10</version>
+      <version>1.10.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff -Nru ant-1.9.10/src/etc/poms/ant-jmf/pom.xml ant-1.10.3/src/etc/poms/ant-jmf/pom.xml
--- ant-1.9.10/src/etc/poms/ant-jmf/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-jmf/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -26,13 +26,13 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jmf</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant + JMF</name>
   <description>contains the sound task and a soundplayer listener
     download the dependency from http://java.sun.com/products/java-media/jmf/</description>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.10</version>
+      <version>1.10.3</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff -Nru ant-1.9.10/src/etc/poms/ant-jsch/pom.xml ant-1.10.3/src/etc/poms/ant-jsch/pom.xml
--- ant-1.9.10/src/etc/poms/ant-jsch/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-jsch/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -26,13 +26,13 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jsch</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant + JSch</name>
   <description>contains the sshexec and scp tasks
   </description>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.10</version>
+      <version>1.10.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff -Nru ant-1.9.10/src/etc/poms/ant-junit/pom.xml ant-1.10.3/src/etc/poms/ant-junit/pom.xml
--- ant-1.9.10/src/etc/poms/ant-junit/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-junit/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -26,20 +26,20 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-junit</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant + JUnit</name>
   <description>contains the junit and junirreport tasks</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.10</version>
+      <version>1.10.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -67,6 +67,8 @@
                   <fileset dir="${project.build.sourceDirectory}/../etc">
                     <include name="junit-frames.xsl"/>
                     <include name="junit-noframes.xsl"/>
+                    <include name="junit-frames-saxon.xsl"/>
+                    <include name="junit-noframes-saxon.xsl"/>
                   </fileset>
                 </copy>              
               </tasks>
diff -Nru ant-1.9.10/src/etc/poms/ant-junit4/pom.xml ant-1.10.3/src/etc/poms/ant-junit4/pom.xml
--- ant-1.9.10/src/etc/poms/ant-junit4/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-junit4/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -26,20 +26,20 @@
         <groupId>org.apache.ant</groupId>
         <artifactId>ant-parent</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.9.10</version>
+        <version>1.10.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <url>http://ant.apache.org/</url>
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-junit4</artifactId>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
     <name>Apache Ant + JUnit 4</name>
     <description>contains JUnit 4.x support</description>
     <dependencies>
         <dependency>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
-            <version>1.9.10</version>
+            <version>1.10.3</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff -Nru ant-1.9.10/src/etc/poms/ant-junitlauncher/pom.xml ant-1.10.3/src/etc/poms/ant-junitlauncher/pom.xml
--- ant-1.9.10/src/etc/poms/ant-junitlauncher/pom.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-junitlauncher/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<!--
+  This POM has been created manually by the Ant Development Team.
+  Please contact us if you are not satisfied with the data contained in this POM.
+  URL : http://ant.apache.org
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.apache.ant</groupId>
+        <artifactId>ant-parent</artifactId>
+        <relativePath>../pom.xml</relativePath>
+        <version>1.10.3</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <url>http://ant.apache.org/</url>
+    <groupId>org.apache.ant</groupId>
+    <artifactId>ant-junitlauncher</artifactId>
+    <version>1.10.3</version>
+    <name>Apache Ant + JUnit 5</name>
+    <description>contains JUnit 5.x support</description>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>1.10.3</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <version>1.1.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.1.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>5.1.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>org/apache/tools/ant/taskdefs/optional/junitlauncher/*</include>
+                    </includes>
+                    <testIncludes>
+                        <include>org/apache/tools/ant/taskdefs/optional/junitlauncher/*</include>
+                    </testIncludes>
+                </configuration>
+            </plugin>
+        </plugins>
+        <sourceDirectory>../../../../src/main</sourceDirectory>
+        <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory>
+        <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
+        <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
+        <directory>../../../../target/${project.artifactId}</directory>
+    </build>
+</project>
diff -Nru ant-1.9.10/src/etc/poms/ant-launcher/pom.xml ant-1.10.3/src/etc/poms/ant-launcher/pom.xml
--- ant-1.9.10/src/etc/poms/ant-launcher/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-launcher/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -27,13 +27,13 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-launcher</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant Launcher</name>
   <build>
     <plugins>
@@ -44,7 +44,6 @@
           <includes>
             <include>org/apache/tools/ant/launch/*.java</include>
           </includes>
-
         </configuration>
       </plugin>
     </plugins>
diff -Nru ant-1.9.10/src/etc/poms/ant-netrexx/pom.xml ant-1.10.3/src/etc/poms/ant-netrexx/pom.xml
--- ant-1.9.10/src/etc/poms/ant-netrexx/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-netrexx/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -26,13 +26,13 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-netrexx</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant + NetRexx</name>
   <description>NetRexxC task
     dependency can be downloaded from http://www.ibm.com/software/awdtools/netrexx/download.html</description>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.10</version>
+      <version>1.10.3</version>
       <scope>compile</scope>
     </dependency>
     <!-- Processed too early, before maven-antrun-plugin gets a chance to work:
diff -Nru ant-1.9.10/src/etc/poms/ant-swing/pom.xml ant-1.10.3/src/etc/poms/ant-swing/pom.xml
--- ant-1.9.10/src/etc/poms/ant-swing/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-swing/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -27,20 +27,20 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-swing</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant + Swing</name>
   <description>a listener and a splash task based on Swing</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.10</version>
+      <version>1.10.3</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff -Nru ant-1.9.10/src/etc/poms/ant-testutil/pom.xml ant-1.10.3/src/etc/poms/ant-testutil/pom.xml
--- ant-1.9.10/src/etc/poms/ant-testutil/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-testutil/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -27,20 +27,20 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.9.10</version>
+    <version>1.10.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>http://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-testutil</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <name>Apache Ant Test Utilities</name>
   <description>test utility classes</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.9.10</version>
+      <version>1.10.3</version>
       <scope>compile</scope>
     </dependency>
      <dependency>
diff -Nru ant-1.9.10/src/etc/poms/ant-xz/pom.xml ant-1.10.3/src/etc/poms/ant-xz/pom.xml
--- ant-1.9.10/src/etc/poms/ant-xz/pom.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/etc/poms/ant-xz/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<!--
+  This POM has been created manually by the Ant Development Team.
+  Please contact us if you are not satisfied with the data contained in this POM.
+  URL : http://ant.apache.org
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.ant</groupId>
+    <artifactId>ant-parent</artifactId>
+    <relativePath>../pom.xml</relativePath>
+    <version>1.10.3</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <url>http://ant.apache.org/</url>
+  <groupId>org.apache.ant</groupId>
+  <artifactId>ant-xz</artifactId>
+  <version>1.10.3</version>
+  <name>Apache Ant + XZ for Java</name>
+  <description>contains the xz compression support</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.10.3</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.tukaani</groupId>
+      <artifactId>xz</artifactId>
+      <version>1.6</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>org/apache/tools/ant/taskdefs/optional/xz/*</include>
+            <include>org/apache/tools/ant/types/optional/xz/*</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+    <sourceDirectory>../../../../src/main</sourceDirectory>
+    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
+    <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory>
+    <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory>
+    <directory>../../../../target/${project.artifactId}</directory>
+  </build>
+</project>
diff -Nru ant-1.9.10/src/etc/poms/pom.xml ant-1.10.3/src/etc/poms/pom.xml
--- ant-1.9.10/src/etc/poms/pom.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/poms/pom.xml	2018-03-24 12:37:12.000000000 +0000
@@ -26,7 +26,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-parent</artifactId>
-  <version>1.9.10</version>
+  <version>1.10.3</version>
   <packaging>pom</packaging>
   <description>master POM</description>
   <licenses>
@@ -99,16 +99,18 @@
     <module>ant-jsch</module>
     <module>ant-junit</module>
     <module>ant-junit4</module>
+    <module>ant-junitlauncher</module>
     <module>ant-launcher</module>
     <module>ant-netrexx</module>
     <module>ant-swing</module>
     <module>ant-testutil</module>
+    <module>ant-xz</module>
   </modules>
   <dependencies>
      <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.2</version>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -122,26 +124,26 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.3.2</version>
+          <version>3.7.0</version>
           <configuration>
-            <source>1.5</source>
-            <target>1.5</target>
+            <source>1.8</source>
+            <target>1.8</target>
           </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>2.4</version>
+          <version>3.0.2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.12</version>
+          <version>2.20.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-report-plugin</artifactId>
-          <version>2.12</version>
+          <version>2.20.1</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff -Nru ant-1.9.10/src/etc/testcases/core/antclassloader.xml ant-1.10.3/src/etc/testcases/core/antclassloader.xml
--- ant-1.9.10/src/etc/testcases/core/antclassloader.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/testcases/core/antclassloader.xml	2018-03-24 12:37:12.000000000 +0000
@@ -56,11 +56,7 @@
 package org.example;
 public class Foo {}
 ]]></echo>
-      <available property="jdk1.6+" classname="java.net.CookieStore"/>
-      <condition property="source" value="6">
-        <isset property="jdk1.6+"/>
-      </condition>
-      <property name="source" value="1.4"/>
+      <property name="source" value="8"/>
       <javac srcdir="${tmp.dir.nonascii}"
              destdir="${tmp.dir.nonascii}" source="${source}"/>
       <tempfile property="test.jar" destdir="${tmp.dir}" suffix="test" prefix=".jar" deleteonexit="true"/>
diff -Nru ant-1.9.10/src/etc/testcases/taskdefs/conditions/antversion.xml ant-1.10.3/src/etc/testcases/taskdefs/conditions/antversion.xml
--- ant-1.9.10/src/etc/testcases/taskdefs/conditions/antversion.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/testcases/taskdefs/conditions/antversion.xml	2018-03-24 12:37:12.000000000 +0000
@@ -32,11 +32,10 @@
                 <fail>
                         <condition>
                                 <not>
-                                        <antversion exactly="1.9.10" />
+                                        <antversion exactly="1.10.3" />
                                 </not>
                         </condition>
-                        Should be exactly 1.9.10
-
+                        Should be exactly 1.10.3
                 </fail>
         </target>
 
@@ -45,10 +44,10 @@
                 <fail>
                         <condition>
                                 <not>
-                                        <antversion atleast="1.9.10" />
+                                        <antversion atleast="1.9.8" />
                                 </not>
                         </condition>
-                Should be at least 1.9.10
+                Should be at least 1.9.8
                 </fail>
         </target>
 
@@ -57,10 +56,10 @@
                 <fail>
                         <condition>
                                 <not>
-                                        <antversion exactly="1.9.10" />
+                                        <antversion exactly="1.9.8" />
                                 </not>
                         </condition>
-                  Should be exactly 1.9.10
+                  Should be exactly 1.9.8
                 </fail>
         </target>
 </project>
Binary files /tmp/tmpDllyiZ/t0wfU1fK58/ant-1.9.10/src/etc/testcases/taskdefs/expected/asf-logo.gif.xz and /tmp/tmpDllyiZ/0Qq0x7CRmM/ant-1.10.3/src/etc/testcases/taskdefs/expected/asf-logo.gif.xz differ
diff -Nru ant-1.9.10/src/etc/testcases/taskdefs/get.xml ant-1.10.3/src/etc/testcases/taskdefs/get.xml
--- ant-1.9.10/src/etc/testcases/taskdefs/get.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/testcases/taskdefs/get.xml	2018-03-24 12:37:12.000000000 +0000
@@ -98,6 +98,34 @@
     </fail>
   </target>
 
+  <target name="testTwoHeadersAreAddedOK">
+    <get src="http://www.apache.org/" dest="get.tmp">
+      <header name="header1" value="header1Value"/>
+      <header name="header2" value="header2Value"/>
+    </get>
+  </target>
+
+  <target name="testEmptyHeadersAreNeverAdded">
+    <get src="http://www.apache.org/" dest="get.tmp">
+      <header name="" value="headerValue"/>
+      <header name="header2" value=""/>
+    </get>
+  </target>
+
+  <target name="testThatWhenMoreThanOneHeaderHaveSameNameOnlyLastOneIsAdded">
+    <get src="http://www.apache.org/" dest="get.tmp">
+      <header name="header1" value="headerValue1"/>
+      <header name="header1" value="headerValue2"/>
+      <header name="header1" value="headerValue3"/>
+    </get>
+  </target>
+
+  <target name="testHeaderSpaceTrimmed">
+    <get src="http://www.apache.org/" dest="get.tmp">
+      <header name="  header1     " value="  headerValue1  "/>
+    </get>
+  </target>
+
   <target name="cleanup">
     <delete>
       <fileset dir="${basedir}" includes="get.tmp" />
diff -Nru ant-1.9.10/src/etc/testcases/taskdefs/optional/junitlauncher.xml ant-1.10.3/src/etc/testcases/taskdefs/optional/junitlauncher.xml
--- ant-1.9.10/src/etc/testcases/taskdefs/optional/junitlauncher.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/etc/testcases/taskdefs/optional/junitlauncher.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (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
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<project name="junitlauncher-test" basedir=".">
+
+    <property name="output.dir" location="${java.io.tmpdir}"/>
+    <property name="build.classes.dir" value="../../../../../build/testcases"/>
+    <target name="init">
+        <mkdir dir="${output.dir}"/>
+    </target>
+
+    <path id="junit.platform.classpath">
+        <fileset dir="../../../../../lib/optional" includes="junit-platform*.jar"/>
+    </path>
+
+    <path id="junit.engine.vintage.classpath">
+        <fileset dir="../../../../../lib/optional" includes="junit-vintage-engine*.jar"/>
+    </path>
+
+    <path id="junit.engine.jupiter.classpath">
+        <fileset dir="../../../../../lib/optional">
+            <include name="junit-jupiter*.jar"/>
+            <include name="opentest4j*.jar"/>
+        </fileset>
+    </path>
+
+    <path id="test.classpath">
+        <pathelement location="${build.classes.dir}"/>
+        <path refid="junit.platform.classpath"/>
+        <path refid="junit.engine.vintage.classpath"/>
+        <path refid="junit.engine.jupiter.classpath"/>
+    </path>
+
+    <target name="test-failure-stops-build" depends="init">
+        <junitlauncher>
+            <!-- A specific test meant to fail -->
+            <test name="org.example.junitlauncher.vintage.AlwaysFailingJUnit4Test" haltOnFailure="true"/>
+            <!-- classpath to be used for the tests -->
+            <classpath refid="test.classpath"/>
+        </junitlauncher>
+    </target>
+
+    <target name="test-failure-continues-build" depends="init">
+        <junitlauncher>
+            <!-- A specific test meant to fail -->
+            <test name="org.example.junitlauncher.vintage.AlwaysFailingJUnit4Test"/>
+            <classpath refid="test.classpath"/>
+        </junitlauncher>
+    </target>
+
+    <target name="test-success" depends="init">
+        <junitlauncher>
+            <!-- A specific test meant to pass -->
+            <test name="org.example.junitlauncher.vintage.JUnit4SampleTest"/>
+            <classpath refid="test.classpath"/>
+        </junitlauncher>
+    </target>
+
+    <target name="test-one-specific-method" depends="init">
+        <junitlauncher>
+            <test name="org.example.junitlauncher.vintage.JUnit4SampleTest" methods="testBar" haltonfailure="true"/>
+            <classpath refid="test.classpath"/>
+        </junitlauncher>
+    </target>
+
+    <target name="test-multiple-specific-methods" depends="init">
+        <junitlauncher>
+            <test name="org.example.junitlauncher.vintage.JUnit4SampleTest" methods=" testFoo, testFooBar "
+                  haltonfailure="true"/>
+            <classpath refid="test.classpath"/>
+        </junitlauncher>
+    </target>
+
+    <target name="test-multiple-individual" depends="init">
+        <junitlauncher>
+            <test name="org.example.junitlauncher.vintage.AlwaysFailingJUnit4Test"/>
+            <test name="org.example.junitlauncher.vintage.JUnit4SampleTest"/>
+            <classpath refid="test.classpath"/>
+        </junitlauncher>
+    </target>
+
+    <target name="test-batch" depends="init">
+        <junitlauncher>
+            <classpath refid="test.classpath"/>
+            <testclasses outputdir="${output.dir}">
+                <fileset dir="${build.classes.dir}">
+                    <include name="org/example/**/junitlauncher/**/"/>
+                </fileset>
+                <fileset dir="${build.classes.dir}">
+                    <include name="org/apache/tools/ant/taskdefs/optional/junitlauncher/example/**/"/>
+                </fileset>
+                <listener type="legacy-brief" sendSysOut="true"/>
+                <listener type="legacy-xml" sendSysErr="true" sendSysOut="true"/>
+            </testclasses>
+        </junitlauncher>
+    </target>
+</project>
+
diff -Nru ant-1.9.10/src/etc/testcases/taskdefs/optional/junit.xml ant-1.10.3/src/etc/testcases/taskdefs/optional/junit.xml
--- ant-1.9.10/src/etc/testcases/taskdefs/optional/junit.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/testcases/taskdefs/optional/junit.xml	2018-03-24 12:37:12.000000000 +0000
@@ -339,11 +339,7 @@
       public void bad() {
       throw new RuntimeException("failed");}
       }</echo>
-    <available property="jdk1.6+" classname="java.net.CookieStore"/>
-    <condition property="source" value="6">
-      <isset property="jdk1.6+"/>
-    </condition>
-    <property name="source" value="5"/>
+    <property name="source" value="8"/>
     <javac srcdir="${tmp.dir}" destdir="${tmp.dir}" includes="T1.java,T2.java"
            source="${source}">
 
diff -Nru ant-1.9.10/src/etc/testcases/taskdefs/optional/script/heavy-script.js ant-1.10.3/src/etc/testcases/taskdefs/optional/script/heavy-script.js
--- ant-1.9.10/src/etc/testcases/taskdefs/optional/script/heavy-script.js	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/etc/testcases/taskdefs/optional/script/heavy-script.js	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,85 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+var functions = [
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },function (value) { return value; },
+];
+
+var v = 'a';
+for (var i in functions) {
+  v = functions[i](v);
+}
+
+var echo = project.createTask("echo");
+echo.setMessage("heavy-script done");
+echo.perform();
diff -Nru ant-1.9.10/src/etc/testcases/taskdefs/optional/script/scriptdef.xml ant-1.10.3/src/etc/testcases/taskdefs/optional/script/scriptdef.xml
--- ant-1.9.10/src/etc/testcases/taskdefs/optional/script/scriptdef.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/testcases/taskdefs/optional/script/scriptdef.xml	2018-03-24 12:37:12.000000000 +0000
@@ -17,6 +17,10 @@
 -->
 <project name="testproject" default="def" basedir=".">
 
+  <import file="../../../buildfiletest-base.xml"/>
+
+  <property name="root" location="../../../../../.."/>
+
   <target name="def">
     <fail>This build-file is intended to be run from the test cases</fail>
   </target>
@@ -141,5 +145,85 @@
     </scripttest>
   </target>
 
+  <target name="useBeanshell">
+    <script language="beanshell"><![CDATA[
+       self.log("I'm here", org.apache.tools.ant.Project.MSG_INFO);
+    ]]></script>
+  </target>
+
+  <target name="useSrcAndEncoding">
+    <mkdir dir="${output}" />
+    <property name="useSrcAndEncoding.encoding" value="UTF-8"/>
+    <property name="useSrcAndEncoding.reader.encoding" value="${useSrcAndEncoding.encoding}"
+      description="Set a different encoding to raise a failure (ex. ISO-8859-1)" />
+    <property name="useSrcAndEncoding.file" location="${output}/script.useSrcAndEncoding.js"/>
+    <property name="useSrcAndEncoding.expectedProp" value="eacute [&#233;]" />
+
+    <echo file="${useSrcAndEncoding.file}" encoding="${useSrcAndEncoding.encoding}"
+      message="project.setNewProperty('useSrcAndEncoding.prop', '${useSrcAndEncoding.expectedProp}');"/>
+
+    <scriptdef name="useSrcAndEncoding" language="javascript" src="${useSrcAndEncoding.file}" encoding="${useSrcAndEncoding.reader.encoding}"/>
+    <useSrcAndEncoding/>
+
+    <condition property="useSrcAndEncoding.testOK" >
+      <equals arg1="${useSrcAndEncoding.expectedProp}" arg2="${useSrcAndEncoding.prop}" />
+    </condition>
+    <fail message="expected &lt;${useSrcAndEncoding.expectedProp}&gt; but was &lt;${useSrcAndEncoding.prop}&gt;" unless="useSrcAndEncoding.testOK" />
+  </target>
+
+  <target name="useCompiled">
+
+    <!-- Test with 'javax' manager, 'bsf' manager already compiles the script. -->
+    <scriptdef manager="javax" name="heavyscript" language="javascript" src="heavy-script.js" encoding="UTF-8" compiled="true" />
+
+    <heavyscript />
+    <heavyscript />
+    <heavyscript />
+    <heavyscript />
+    <heavyscript />
+    <heavyscript />
+    <heavyscript />
+    <heavyscript />
+    <heavyscript />
+    <heavyscript />
+    <heavyscript />
+    <heavyscript />
+    <heavyscript />
+    <heavyscript />
+    <heavyscript />
+    <heavyscript />
+    <heavyscript />
+    <heavyscript />
+    <heavyscript />
+    <heavyscript />
+
+  </target>
+
+  <target name="useNotCompiled">
+
+    <scriptdef manager="javax" name="heavyscriptNotCompiled" language="javascript" src="heavy-script.js" encoding="UTF-8" compiled="false" />
+
+    <heavyscriptNotCompiled />
+    <heavyscriptNotCompiled />
+    <heavyscriptNotCompiled />
+    <heavyscriptNotCompiled />
+    <heavyscriptNotCompiled />
+    <heavyscriptNotCompiled />
+    <heavyscriptNotCompiled />
+    <heavyscriptNotCompiled />
+    <heavyscriptNotCompiled />
+    <heavyscriptNotCompiled />
+    <heavyscriptNotCompiled />
+    <heavyscriptNotCompiled />
+    <heavyscriptNotCompiled />
+    <heavyscriptNotCompiled />
+    <heavyscriptNotCompiled />
+    <heavyscriptNotCompiled />
+    <heavyscriptNotCompiled />
+    <heavyscriptNotCompiled />
+    <heavyscriptNotCompiled />
+    <heavyscriptNotCompiled />
+
+  </target>
 
 </project>
diff -Nru ant-1.9.10/src/etc/testcases/taskdefs/optional/script.xml ant-1.10.3/src/etc/testcases/taskdefs/optional/script.xml
--- ant-1.9.10/src/etc/testcases/taskdefs/optional/script.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/testcases/taskdefs/optional/script.xml	2018-03-24 12:37:12.000000000 +0000
@@ -17,6 +17,10 @@
 -->
 <project name="testproject" default="def" basedir=".">
 
+  <import file="../../buildfiletest-base.xml"/>
+
+  <property name="root" location="../../../../.."/>
+
   <target name="def">
     <fail>This build-file is intended to be run from the test cases</fail>
   </target>
@@ -43,4 +47,22 @@
     ]]></script>
   </target>
 
+  <target name="useSrcAndEncoding">
+    <mkdir dir="${output}" />
+    <property name="useSrcAndEncoding.encoding" value="UTF-8"/>
+    <property name="useSrcAndEncoding.reader.encoding" value="${useSrcAndEncoding.encoding}"
+      description="Set a different encoding to raise a failure (ex. ISO-8859-1)" />
+    <property name="useSrcAndEncoding.file" location="${output}/script.useSrcAndEncoding.js"/>
+    <property name="useSrcAndEncoding.expectedProp" value="eacute [&#233;]" />
+
+    <echo file="${useSrcAndEncoding.file}" encoding="${useSrcAndEncoding.encoding}"
+      message="project.setNewProperty('useSrcAndEncoding.prop', '${useSrcAndEncoding.expectedProp}');"/>
+
+    <script language="javascript" src="${useSrcAndEncoding.file}" encoding="${useSrcAndEncoding.reader.encoding}"/>
+    <condition property="useSrcAndEncoding.testOK" >
+      <equals arg1="${useSrcAndEncoding.expectedProp}" arg2="${useSrcAndEncoding.prop}" />
+    </condition>
+    <fail message="expected &lt;${useSrcAndEncoding.expectedProp}&gt; but was &lt;${useSrcAndEncoding.prop}&gt;" unless="useSrcAndEncoding.testOK" />
+  </target>
+
 </project>
\ No newline at end of file
diff -Nru ant-1.9.10/src/etc/testcases/taskdefs/optional/unix/symlink.xml ant-1.10.3/src/etc/testcases/taskdefs/optional/unix/symlink.xml
--- ant-1.9.10/src/etc/testcases/taskdefs/optional/unix/symlink.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/testcases/taskdefs/optional/unix/symlink.xml	2018-03-24 12:37:12.000000000 +0000
@@ -302,7 +302,7 @@
 
     <sleep seconds="${delay}"/>  <!-- make sure OS has time to do the execs -->
 
-    <symlink action="recreate">
+    <symlink action="recreate" overwrite="true">
       <fileset dir="${output}/symtest1" includes="**/recorded.links"/>
     </symlink>
 
@@ -350,5 +350,17 @@
       <delete file="${output}/file2"/>
   </target>
 
+  <target name="test-overwrite-link" depends="setUp">
+    <mkdir dir="${output}/test-overwrite"/>
+    <mkdir dir="${output}/test-overwrite/dir1"/>
+    <property name="test.overwrite.link.target.dir" location="${output}/test-overwrite/dir1"/>
+    <!-- Create a symlink to the dir, this should work fine -->
+    <symlink link="${output}/test-overwrite/symlinked1" resource="${test.overwrite.link.target.dir}"/>
+    <!-- Create a symlink at the previously created symlink path with overwrite = false.
+      This *shouldn't* create a new link (within the target resource). See https://bz.apache.org/bugzilla/show_bug.cgi?id=58683 -->
+    <symlink link="${output}/test-overwrite/symlinked1" resource="${test.overwrite.link.target.dir}"/>
+
+
+  </target>
 
 </project>
diff -Nru ant-1.9.10/src/etc/testcases/taskdefs/pathconvert.xml ant-1.10.3/src/etc/testcases/taskdefs/pathconvert.xml
--- ant-1.9.10/src/etc/testcases/taskdefs/pathconvert.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/testcases/taskdefs/pathconvert.xml	2018-03-24 12:37:12.000000000 +0000
@@ -17,6 +17,8 @@
 -->
 <project name="pathconvert">
 
+    <import file="../buildfiletest-base.xml"/>
+
     <path id="testpath">
         <pathelement path="${ant.file}" />
     </path>
@@ -39,4 +41,20 @@
         <pathconvert property="result" refid="testpath" />
     </target>
 
+    <target name="test-nonmatching-mapper" description="test for bug fix bz-62076">
+        <mkdir dir="${output}/mapper-source-dir"/>
+        <!-- create 2 files, one of which will be matched/included by the globmapper
+        later in this target -->
+        <touch file="${output}/mapper-source-dir/file1.txt"/>
+        <touch file="${output}/mapper-source-dir/file2.log"/>
+
+        <pathconvert property="pc">
+            <mappedresources>
+                <fileset dir="${output}/mapper-source-dir"/>
+                <!-- we intentionally exclude one of the files -->
+                <globmapper from="*.log" to="*.txt"/>
+            </mappedresources>
+        </pathconvert>
+    </target>
+
 </project>
diff -Nru ant-1.9.10/src/etc/testcases/taskdefs/rmic/rmic.xml ant-1.10.3/src/etc/testcases/taskdefs/rmic/rmic.xml
--- ant-1.9.10/src/etc/testcases/taskdefs/rmic/rmic.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/testcases/taskdefs/rmic/rmic.xml	2018-03-24 12:37:12.000000000 +0000
@@ -212,12 +212,6 @@
     </condition>
     <property name="rmic.compiler" value="sun"/>
     <available property="wlrmic.present" classname="weblogic.rmic"/>
-    <condition property="rmic6.present">
-      <and>
-        <isset property="rmic.present"/>
-        <available classname="java.util.ServiceLoader"/>
-      </and>
-    </condition>
   </target>
 
   <target name="testDefault" depends="init">
@@ -435,23 +429,6 @@
     <assertBaseCompiled/>
   </target>
 
-  <!--
-  This test stamps on the XML parser settings on java6, so it is disabled.
-  -->
-  <target name="testXnew" if="rmic.present" unless="rmic6.present" depends="init">
-    <base-rmic compiler="${rmic.compiler}">
-      <compilerarg value="-Xnew"/>
-    </base-rmic>
-    <assertBaseCompiled/>
-  </target>
-
-  <target name="testXnewDest" if="rmic.present" unless="rmic6.present" depends="init">
-    <dest-rmic compiler="${rmic.compiler}">
-      <compilerarg value="-Xnew"/>
-    </dest-rmic>
-    <assertBaseCompiledInDest/>
-  </target>
-
   <target name="testXnewForked" if="rmic.present" depends="init">
     <base-rmic compiler="forking">
       <compilerarg value="-Xnew"/>
Binary files /tmp/tmpDllyiZ/t0wfU1fK58/ant-1.9.10/src/etc/testcases/testkeystore.pkcs12.gz and /tmp/tmpDllyiZ/0Qq0x7CRmM/ant-1.10.3/src/etc/testcases/testkeystore.pkcs12.gz differ
diff -Nru ant-1.9.10/src/etc/testcases/types/assertions.xml ant-1.10.3/src/etc/testcases/types/assertions.xml
--- ant-1.9.10/src/etc/testcases/types/assertions.xml	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/etc/testcases/types/assertions.xml	2018-03-24 12:37:12.000000000 +0000
@@ -21,11 +21,7 @@
   <import file="../buildfiletest-base.xml"/>
 
   <target name="setUp">
-    <available property="jdk1.6+" classname="java.net.CookieStore"/>
-    <condition property="source" value="6">
-      <isset property="jdk1.6+"/>
-    </condition>
-    <property name="source" value="1.4"/>
+    <property name="source" value="8"/>
     <mkdir dir="${output}"/>
     <javac srcdir="${src.dir}"
            includes="*.java"
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/AntClassLoader.java ant-1.10.3/src/main/org/apache/tools/ant/AntClassLoader.java
--- ant-1.9.10/src/main/org/apache/tools/ant/AntClassLoader.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/AntClassLoader.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,12 +20,12 @@
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Constructor;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.file.Files;
 import java.security.CodeSource;
 import java.security.ProtectionDomain;
 import java.security.cert.Certificate;
@@ -74,6 +74,10 @@
 
     private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
 
+    static {
+        registerAsParallelCapable();
+    }
+
     /**
      * An enumeration of all resources of a given name found within the
      * classpath of this class loader. This enumeration is used by the
@@ -174,7 +178,7 @@
      * The components of the classpath that the classloader searches
      * for classes.
      */
-    private final Vector<File> pathComponents  = new VectorSet<File>();
+    private final Vector<File> pathComponents  = new VectorSet<>();
 
     /**
      * The project to which this class loader belongs.
@@ -192,14 +196,14 @@
      * loader regardless of whether the parent class loader is being searched
      * first or not.
      */
-    private final Vector<String> systemPackages = new Vector<String>();
+    private final Vector<String> systemPackages = new Vector<>();
 
     /**
      * These are the package roots that are to be loaded by this class loader
      * regardless of whether the parent class loader is being searched first
      * or not.
      */
-    private final Vector<String> loaderPackages = new Vector<String>();
+    private final Vector<String> loaderPackages = new Vector<>();
 
     /**
      * Whether or not this classloader will ignore the base
@@ -217,7 +221,7 @@
     /**
      * A hashtable of zip files opened by the classloader (File to JarFile).
      */
-    private Hashtable<File, JarFile> jarFiles = new Hashtable<File, JarFile>();
+    private Hashtable<File, JarFile> jarFiles = new Hashtable<>();
 
     /** Static map of jar file/time to manifest class-path entries */
     private static Map<String, String> pathMap =
@@ -289,8 +293,8 @@
      *                    classloader should be consulted  before trying to
      *                    load the a class through this loader.
      */
-    public AntClassLoader(
-                          final ClassLoader parent, final Project project, final Path classpath, final boolean parentFirst) {
+    public AntClassLoader(final ClassLoader parent, final Project project,
+        final Path classpath, final boolean parentFirst) {
         this(project, classpath);
         if (parent != null) {
             setParent(parent);
@@ -311,7 +315,8 @@
      *                    classloader should be consulted before trying to
      *                    load the a class through this loader.
      */
-    public AntClassLoader(final Project project, final Path classpath, final boolean parentFirst) {
+    public AntClassLoader(final Project project, final Path classpath,
+        final boolean parentFirst) {
         this(null, project, classpath, parentFirst);
     }
 
@@ -493,19 +498,13 @@
                 + pathComponent.lastModified() + "-" + pathComponent.length();
         String classpath = pathMap.get(absPathPlusTimeAndLength);
         if (classpath == null) {
-            JarFile jarFile = null;
-            try {
-                jarFile = new JarFile(pathComponent);
+            try (JarFile jarFile = new JarFile(pathComponent)) {
                 final Manifest manifest = jarFile.getManifest();
                 if (manifest == null) {
                     return;
                 }
                 classpath = manifest.getMainAttributes()
                     .getValue(Attributes.Name.CLASS_PATH);
-            } finally {
-                if (jarFile != null) {
-                    jarFile.close();
-                }
             }
             if (classpath == null) {
                 classpath = "";
@@ -789,7 +788,7 @@
             if (jarFile == null && file.isDirectory()) {
                 final File resource = new File(file, resourceName);
                 if (resource.exists()) {
-                    return new FileInputStream(resource);
+                    return Files.newInputStream(resource.toPath());
                 }
             } else {
                 if (jarFile == null) {
@@ -1411,12 +1410,7 @@
      */
     public synchronized void cleanup() {
         for (final Enumeration<JarFile> e = jarFiles.elements(); e.hasMoreElements();) {
-            final JarFile jarFile = e.nextElement();
-            try {
-                jarFile.close();
-            } catch (final IOException ioe) {
-                // ignore
-            }
+            FileUtils.close(e.nextElement());
         }
         jarFiles = new Hashtable<File, JarFile>();
         if (project != null) {
@@ -1592,8 +1586,7 @@
     }
 
     private static boolean readFully(final File f, final byte[] b) throws IOException {
-        final FileInputStream fis = new FileInputStream(f);
-        try {
+        try (InputStream fis = Files.newInputStream(f.toPath())) {
             final int len = b.length;
             int count = 0, x = 0;
             while (count != len) {
@@ -1604,8 +1597,6 @@
                 count += x;
             }
             return count == len;
-        } finally {
-            fis.close();
         }
     }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java ant-1.10.3/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java
--- ant-1.9.10/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/ArgumentProcessorRegistry.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
@@ -151,7 +152,7 @@
         try {
             try {
                 isr = new InputStreamReader(is, "UTF-8");
-            } catch (java.io.UnsupportedEncodingException e) {
+            } catch (UnsupportedEncodingException e) {
                 isr = new InputStreamReader(is);
             }
             BufferedReader rd = new BufferedReader(isr);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java ant-1.10.3/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java
--- ant-1.9.10/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/attribute/BaseIfAttribute.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,6 +19,7 @@
 package org.apache.tools.ant.attribute;
 
 import java.util.HashMap;
+import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -67,18 +68,19 @@
      * @param el the element this attribute is in.
      * @return a map of attributes.
      */
-    protected Map getParams(UnknownElement el) {
-        Map ret = new HashMap();
+    protected Map<String, String> getParams(UnknownElement el) {
+        Map<String, String> ret = new HashMap<>();
         RuntimeConfigurable rc = el.getWrapper();
-        Map attributes = rc.getAttributeMap(); // This does a copy!
-        for (Iterator i = attributes.entrySet().iterator(); i.hasNext();) {
-            Map.Entry entry = (Map.Entry) i.next();
-            String key = (String) entry.getKey();
+        Hashtable<String, Object> attributes = rc.getAttributeMap(); // This does a copy!
+        for (Iterator<Map.Entry<String, Object>> i =
+            attributes.entrySet().iterator(); i.hasNext();) {
+            Map.Entry<String, Object> entry = i.next();
+            String key = entry.getKey();
             String value = (String) entry.getValue();
             if (key.startsWith("ant-attribute:param")) {
                 int pos = key.lastIndexOf(':');
                 ret.put(key.substring(pos + 1),
-                        el.getProject().replaceProperties(value));
+                    el.getProject().replaceProperties(value));
             }
         }
         return ret;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/BuildException.java ant-1.10.3/src/main/org/apache/tools/ant/BuildException.java
--- ant-1.9.10/src/main/org/apache/tools/ant/BuildException.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/BuildException.java	2018-03-24 12:37:12.000000000 +0000
@@ -38,13 +38,26 @@
      * Constructs an exception with the given descriptive message.
      *
      * @param message A description of or information about the exception.
-     *            Should not be <code>null</code>.
+     *            Should not be {@code null}.
      */
     public BuildException(String message) {
         super(message);
     }
 
     /**
+     * Constructs an exception with the given format pattern and arguments.
+     *
+     * @param pattern A description of or information about the exception.
+     *            Should not be {@code null}.
+     * @param formatArguments ditto
+     * @see String#format(String, Object...)
+     * @since Ant 1.10.2
+     */
+    public BuildException(String pattern, Object... formatArguments) {
+        super(String.format(pattern, formatArguments));
+    }
+
+    /**
      * Constructs an exception with the given message and exception as
      * a root cause.
      *
@@ -118,6 +131,7 @@
      *         exception is associated with this one
      * @deprecated Use {@link #getCause} instead.
      */
+    @Deprecated
     public Throwable getException() {
         return getCause();
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/ComponentHelper.java ant-1.10.3/src/main/org/apache/tools/ant/ComponentHelper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/ComponentHelper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/ComponentHelper.java	2018-03-24 12:37:12.000000000 +0000
@@ -59,31 +59,31 @@
  */
 public class ComponentHelper  {
     /** Map of component name to lists of restricted definitions */
-    private Map<String, List<AntTypeDefinition>> restrictedDefinitions = new HashMap<String, List<AntTypeDefinition>>();
+    private Map<String, List<AntTypeDefinition>> restrictedDefinitions = new HashMap<>();
 
     /** Map from component name to anttypedefinition */
-    private final Hashtable<String, AntTypeDefinition> antTypeTable = new Hashtable<String, AntTypeDefinition>();
+    private final Hashtable<String, AntTypeDefinition> antTypeTable = new Hashtable<>();
 
     /** Map of tasks generated from antTypeTable */
-    private final Hashtable<String, Class<?>> taskClassDefinitions = new Hashtable<String, Class<?>>();
+    private final Hashtable<String, Class<?>> taskClassDefinitions = new Hashtable<>();
 
     /** flag to rebuild taskClassDefinitions */
     private boolean rebuildTaskClassDefinitions = true;
 
     /** Map of types generated from antTypeTable */
-    private final Hashtable<String, Class<?>> typeClassDefinitions = new Hashtable<String, Class<?>>();
+    private final Hashtable<String, Class<?>> typeClassDefinitions = new Hashtable<>();
 
     /** flag to rebuild typeClassDefinitions */
     private boolean rebuildTypeClassDefinitions = true;
 
     /** Set of namespaces that have been checked for antlibs */
-    private final HashSet<String> checkedNamespaces = new HashSet<String>();
+    private final HashSet<String> checkedNamespaces = new HashSet<>();
 
     /**
      * Stack of antlib contexts used to resolve definitions while
      *   processing antlib
      */
-    private Stack<String> antLibStack = new Stack<String>();
+    private Stack<String> antLibStack = new Stack<>();
 
     /** current antlib uri */
     private String antLibCurrentUri = null;
@@ -189,7 +189,6 @@
      */
     public void setProject(Project project) {
         this.project = project;
-//        antTypeTable = new Hashtable<String, AntTypeDefinition>(project);
     }
 
     /**
@@ -205,13 +204,13 @@
      * @return A deep copy of the restrictedDefinition
      */
     private Map<String, List<AntTypeDefinition>> getRestrictedDefinition() {
-        final Map<String, List<AntTypeDefinition>> result = new HashMap<String, List<AntTypeDefinition>>();
+        final Map<String, List<AntTypeDefinition>> result = new HashMap<>();
         synchronized (restrictedDefinitions) {
             for (Map.Entry<String, List<AntTypeDefinition>> entry : restrictedDefinitions.entrySet()) {
                 List<AntTypeDefinition> entryVal = entry.getValue();
                 synchronized (entryVal) {
                     //copy the entryVal
-                    entryVal = new ArrayList<AntTypeDefinition> (entryVal);
+                    entryVal = new ArrayList<>(entryVal);
                 }
                 result.put(entry.getKey(), entryVal);
             }
@@ -750,7 +749,7 @@
      */
     public void exitAntLib() {
         antLibStack.pop();
-        antLibCurrentUri = (antLibStack.size() == 0) ? null : (String) antLibStack.peek();
+        antLibCurrentUri = (antLibStack.isEmpty()) ? null : (String) antLibStack.peek();
     }
 
     /**
@@ -759,9 +758,7 @@
     private void initTasks() {
         ClassLoader classLoader = getClassLoader(null);
         Properties props = getDefaultDefinitions(false);
-        Enumeration<?> e = props.propertyNames();
-        while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
+        for (String name : props.stringPropertyNames()) {
             String className = props.getProperty(name);
             AntTypeDefinition def = new AntTypeDefinition();
             def.setName(name);
@@ -853,7 +850,7 @@
         }
         checkedNamespaces.add(uri);
 
-        if (antTypeTable.size() == 0) {
+        if (antTypeTable.isEmpty()) {
             // Project instance doesn't know the tasks and types
             // defined in defaults.properties, likely created by the
             // user - without those definitions it cannot parse antlib
@@ -902,7 +899,7 @@
             probablyIDE = true;
             antHomeLib = "ANT_HOME" + File.separatorChar + "lib";
         }
-        StringBuffer dirListingText = new StringBuffer();
+        StringBuilder dirListingText = new StringBuilder();
         final String tab = "        -";
         dirListingText.append(tab);
         dirListingText.append(antHomeLib);
@@ -1026,14 +1023,7 @@
                 + " declarations have taken place.");
         if (uri.length() > 0) {
             final List<AntTypeDefinition> matches = findTypeMatches(uri);
-            if (matches.size() > 0) {
-                out.println();
-                out.println("The definitions in the namespace " + uri + " are:");
-                for (AntTypeDefinition def : matches) {
-                    String local = ProjectHelper.extractNameFromComponentName(def.getName());
-                    out.println("    " + local);
-                }
-            } else {
+            if (matches.isEmpty()) {
                 out.println("No types or tasks have been defined in this namespace yet");
                 if (isAntlib) {
                     out.println();
@@ -1041,6 +1031,13 @@
                     out.println("Action: Check that the implementing library exists in one of:");
                     out.println(dirListing);
                 }
+            } else {
+                out.println();
+                out.println("The definitions in the namespace " + uri + " are:");
+                for (AntTypeDefinition def : matches) {
+                    String local = ProjectHelper.extractNameFromComponentName(def.getName());
+                    out.println("    " + local);
+                }
             }
         }
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/DefaultDefinitions.java ant-1.10.3/src/main/org/apache/tools/ant/DefaultDefinitions.java
--- ant-1.9.10/src/main/org/apache/tools/ant/DefaultDefinitions.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/DefaultDefinitions.java	2018-03-24 12:37:12.000000000 +0000
@@ -66,7 +66,6 @@
 
     private void componentDef(String ns, String name, String classname) {
         AntTypeDefinition def = new AntTypeDefinition();
-        String n = ProjectHelper.genComponentName(ns, name);
         def.setName(ProjectHelper.genComponentName(ns, name));
         def.setClassName(classname);
         def.setClassLoader(getClass().getClassLoader());
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/DefaultLogger.java ant-1.10.3/src/main/org/apache/tools/ant/DefaultLogger.java
--- ant-1.9.10/src/main/org/apache/tools/ant/DefaultLogger.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/DefaultLogger.java	2018-03-24 12:37:12.000000000 +0000
@@ -24,9 +24,10 @@
 import java.io.StringReader;
 import java.text.DateFormat;
 import java.util.Date;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.util.DateUtils;
-import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.StringUtils;
 
 /**
@@ -257,48 +258,30 @@
         // Filter out messages based on priority
         if (priority <= msgOutputLevel) {
 
-            StringBuffer message = new StringBuffer();
-            if (event.getTask() != null && !emacsMode) {
+            StringBuilder message = new StringBuilder();
+            if (event.getTask() == null || emacsMode) {
+                //emacs mode or there is no task
+                message.append(event.getMessage());
+            } else {
                 // Print out the name of the task if we're in one
                 String name = event.getTask().getTaskName();
                 String label = "[" + name + "] ";
                 int size = LEFT_COLUMN_SIZE - label.length();
-                StringBuffer tmp = new StringBuffer();
-                for (int i = 0; i < size; i++) {
-                    tmp.append(" ");
-                }
-                tmp.append(label);
-                label = tmp.toString();
+                final String prefix = size > 0 ? Stream.generate(() -> " ")
+                    .limit(size).collect(Collectors.joining()) + label : label;
+
+                try (BufferedReader r =
+                    new BufferedReader(new StringReader(event.getMessage()))) {
 
-                BufferedReader r = null;
-                try {
-                    r = new BufferedReader(
-                            new StringReader(event.getMessage()));
-                    String line = r.readLine();
-                    boolean first = true;
-                    do {
-                        if (first) {
-                            if (line == null) {
-                                message.append(label);
-                                break;
-                            }
-                        } else {
-                            message.append(StringUtils.LINE_SEP);
-                        }
-                        first = false;
-                        message.append(label).append(line);
-                        line = r.readLine();
-                    } while (line != null);
+                    message.append(r.lines().map(line -> prefix + line)
+                        .collect(Collectors.joining(StringUtils.LINE_SEP)));
+                    if (message.length() == 0) {
+                        message.append(prefix);
+                    }
                 } catch (IOException e) {
                     // shouldn't be possible
                     message.append(label).append(event.getMessage());
-                } finally {
-                    FileUtils.close(r);
                 }
-
-            } else {
-                //emacs mode or there is no task
-                message.append(event.getMessage());
             }
             Throwable ex = event.getException();
             if (Project.MSG_DEBUG <= msgOutputLevel && ex != null) {
@@ -361,8 +344,7 @@
     protected String getTimestamp() {
         Date date = new Date(System.currentTimeMillis());
         DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
-        String finishTime = formatter.format(date);
-        return finishTime;
+        return formatter.format(date);
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/DemuxInputStream.java ant-1.10.3/src/main/org/apache/tools/ant/DemuxInputStream.java
--- ant-1.9.10/src/main/org/apache/tools/ant/DemuxInputStream.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/DemuxInputStream.java	2018-03-24 12:37:12.000000000 +0000
@@ -50,6 +50,7 @@
      * @return the next byte
      * @throws IOException on error
      */
+    @Override
     public int read() throws IOException {
         byte[] buffer = new byte[1];
         if (project.demuxInput(buffer, 0, 1) == -1) {
@@ -67,6 +68,7 @@
      * @return the number of bytes read
      * @throws IOException on error
      */
+    @Override
     public int read(byte[] buffer, int offset, int length) throws IOException {
         return project.demuxInput(buffer, offset, length);
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/DemuxOutputStream.java ant-1.10.3/src/main/org/apache/tools/ant/DemuxOutputStream.java
--- ant-1.9.10/src/main/org/apache/tools/ant/DemuxOutputStream.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/DemuxOutputStream.java	2018-03-24 12:37:12.000000000 +0000
@@ -64,7 +64,7 @@
     private static final int LF = 0x0a;
 
     /** Mapping from thread to buffer (Thread to BufferInfo). */
-    private WeakHashMap<Thread, BufferInfo> buffers = new WeakHashMap<Thread, BufferInfo>();
+    private WeakHashMap<Thread, BufferInfo> buffers = new WeakHashMap<>();
 
     /**
      * The project to send output to.
@@ -98,14 +98,12 @@
      */
     private BufferInfo getBufferInfo() {
         Thread current = Thread.currentThread();
-        BufferInfo bufferInfo = (BufferInfo) buffers.get(current);
-        if (bufferInfo == null) {
-            bufferInfo = new BufferInfo();
+        return buffers.computeIfAbsent(current, x -> {
+            BufferInfo bufferInfo = new BufferInfo();
             bufferInfo.buffer = new ByteArrayOutputStream(INITIAL_SIZE);
             bufferInfo.crSeen = false;
-            buffers.put(current, bufferInfo);
-        }
-        return bufferInfo;
+            return bufferInfo;
+        });
     }
 
     /**
@@ -113,7 +111,7 @@
      */
     private void resetBufferInfo() {
         Thread current = Thread.currentThread();
-        BufferInfo bufferInfo = (BufferInfo) buffers.get(current);
+        BufferInfo bufferInfo = buffers.get(current);
         FileUtils.close(bufferInfo.buffer);
         bufferInfo.buffer = new ByteArrayOutputStream();
         bufferInfo.crSeen = false;
@@ -134,6 +132,7 @@
      * @param cc data to log (byte).
      * @exception IOException if the data cannot be written to the stream
      */
+    @Override
     public void write(int cc) throws IOException {
         final byte c = (byte) cc;
 
@@ -192,6 +191,7 @@
      *
      * @see #flush
      */
+    @Override
     public void close() throws IOException {
         flush();
         removeBuffer();
@@ -203,6 +203,7 @@
      *
      * @exception IOException if there is a problem flushing the stream.
      */
+    @Override
     public void flush() throws IOException {
         BufferInfo bufferInfo = getBufferInfo();
         if (bufferInfo.buffer.size() > 0) {
@@ -219,6 +220,7 @@
      *
      * @throws IOException if the data cannot be written into the stream.
      */
+    @Override
     public void write(byte[] b, int off, int len) throws IOException {
         // find the line breaks and pass other chars through in blocks
         int offset = off;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/Diagnostics.java ant-1.10.3/src/main/org/apache/tools/ant/Diagnostics.java
--- ant-1.9.10/src/main/org/apache/tools/ant/Diagnostics.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/Diagnostics.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,15 +18,15 @@
 package org.apache.tools.ant;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.PrintStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URL;
+import java.nio.file.Files;
 import java.util.Calendar;
 import java.util.Enumeration;
 import java.util.Properties;
@@ -42,6 +42,7 @@
 import org.apache.tools.ant.util.JAXPUtils;
 import org.apache.tools.ant.util.JavaEnvUtils;
 import org.apache.tools.ant.util.ProxySetup;
+import org.apache.tools.ant.util.java15.ProxyDiagnostics;
 import org.xml.sax.XMLReader;
 
 /**
@@ -53,9 +54,6 @@
  */
 public final class Diagnostics {
 
-    /** the version number for java 1.5 returned from JavaEnvUtils */
-    private static final int JAVA_1_5_NUMBER = 15;
-
     /**
      * value for which a difference between clock and temp file time triggers
      * a warning.
@@ -90,6 +88,7 @@
      * @deprecated Obsolete since Ant 1.8.2
      * @return <tt>true</tt>
      */
+    @Deprecated
     public static boolean isOptionalAvailable() {
         return true;
     }
@@ -98,6 +97,7 @@
      * Doesn't do anything.
      * @deprecated Obsolete since Ant 1.8.2
      */
+    @Deprecated
     public static void validateVersion() throws BuildException {
     }
 
@@ -112,8 +112,7 @@
         if (home == null) {
             return null;
         }
-        File libDir = new File(home, "lib");
-        return listJarFiles(libDir);
+        return listJarFiles(new File(home, "lib"));
 
     }
 
@@ -123,13 +122,8 @@
      * @return array of files (or null for no such directory)
      */
     private static File[] listJarFiles(File libDir) {
-        FilenameFilter filter = new FilenameFilter() {
-            public boolean accept(File dir, String name) {
-                return name.endsWith(".jar");
-            }
-        };
-        File[] files  = libDir.listFiles(filter);
-        return files;
+        return libDir
+            .listFiles((FilenameFilter) (dir, name) -> name.endsWith(".jar"));
     }
 
     /**
@@ -172,8 +166,7 @@
             return "Could not create an XML Parser";
         }
         // check to what is in the classname
-        String saxParserName = saxParser.getClass().getName();
-        return saxParserName;
+        return saxParser.getClass().getName();
     }
 
     /**
@@ -186,8 +179,7 @@
             return "Could not create an XSLT Processor";
         }
         // check to what is in the classname
-        String processorName = transformer.getClass().getName();
-        return processorName;
+        return transformer.getClass().getName();
     }
 
     /**
@@ -219,17 +211,15 @@
      */
     private static Transformer getXSLTProcessor() {
         TransformerFactory transformerFactory = TransformerFactory.newInstance();
-        if (transformerFactory == null) {
-            return null;
-        }
-        Transformer transformer = null;
-        try {
-            transformer = transformerFactory.newTransformer();
-        } catch (Exception e) {
-            // ignore
-            ignoreThrowable(e);
+        if (transformerFactory != null) {
+            try {
+                return transformerFactory.newTransformer();
+            } catch (Exception e) {
+                // ignore
+                ignoreThrowable(e);
+            }
         }
-        return transformer;
+        return null;
     }
 
     /**
@@ -579,12 +569,12 @@
         //create the file
         long now = System.currentTimeMillis();
         File tempFile = null;
-        FileOutputStream fileout = null;
-        FileInputStream filein = null;
+        OutputStream fileout = null;
+        InputStream filein = null;
         try {
             tempFile = File.createTempFile("diag", "txt", tempDirectory);
             //do some writing to it
-            fileout = new FileOutputStream(tempFile);
+            fileout = Files.newOutputStream(tempFile.toPath());
             byte[] buffer = new byte[KILOBYTE];
             for (int i = 0; i < TEST_FILE_SIZE; i++) {
                 fileout.write(buffer);
@@ -594,7 +584,7 @@
 
             // read to make sure the file has been written completely
             Thread.sleep(1000);
-            filein = new FileInputStream(tempFile);
+            filein = Files.newInputStream(tempFile.toPath());
             int total = 0;
             int read = 0;
             while ((read = filein.read(buffer, 0, KILOBYTE)) > 0) {
@@ -695,25 +685,10 @@
         printProperty(out, ProxySetup.SOCKS_PROXY_USERNAME);
         printProperty(out, ProxySetup.SOCKS_PROXY_PASSWORD);
 
-        if (JavaEnvUtils.getJavaVersionNumber() < JAVA_1_5_NUMBER) {
-            return;
-        }
         printProperty(out, ProxySetup.USE_SYSTEM_PROXIES);
-        final String proxyDiagClassname = "org.apache.tools.ant.util.java15.ProxyDiagnostics";
-        try {
-            Class<?> proxyDiagClass = Class.forName(proxyDiagClassname);
-            Object instance = proxyDiagClass.newInstance();
-            out.println("Java1.5+ proxy settings:");
-            out.println(instance.toString());
-        } catch (ClassNotFoundException e) {
-            //not included, do nothing
-        } catch (IllegalAccessException e) {
-            //not included, do nothing
-        } catch (InstantiationException e) {
-            //not included, do nothing
-        } catch (NoClassDefFoundError e) {
-            // not included, to nothing
-        }
+        ProxyDiagnostics proxyDiag = new ProxyDiagnostics();
+        out.println("Java1.5+ proxy settings:");
+        out.println(proxyDiag.toString());
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/DirectoryScanner.java ant-1.10.3/src/main/org/apache/tools/ant/DirectoryScanner.java
--- ant-1.9.10/src/main/org/apache/tools/ant/DirectoryScanner.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/DirectoryScanner.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,15 +20,22 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.Deque;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.Vector;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.taskdefs.condition.Os;
 import org.apache.tools.ant.types.Resource;
@@ -39,9 +46,7 @@
 import org.apache.tools.ant.types.selectors.SelectorUtils;
 import org.apache.tools.ant.types.selectors.TokenizedPath;
 import org.apache.tools.ant.types.selectors.TokenizedPattern;
-import org.apache.tools.ant.util.CollectionUtils;
 import org.apache.tools.ant.util.FileUtils;
-import org.apache.tools.ant.util.SymbolicLinkUtils;
 import org.apache.tools.ant.util.VectorSet;
 
 /**
@@ -224,16 +229,12 @@
     /** Helper. */
     private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
 
-    /** Helper. */
-    private static final SymbolicLinkUtils SYMLINK_UTILS =
-        SymbolicLinkUtils.getSymbolicLinkUtils();
-
     /**
      * Patterns which should be excluded by default.
      *
      * @see #addDefaultExcludes()
      */
-    private static final Set<String> defaultExcludes = new HashSet<String>();
+    private static final Set<String> defaultExcludes = new HashSet<>();
     static {
         resetDefaultExcludes();
     }
@@ -326,7 +327,7 @@
      *
      * @since Ant 1.6
      */
-    private final Set<String> scannedDirs = new HashSet<String>();
+    private final Set<String> scannedDirs = new HashSet<>();
 
     /**
      * Map of all include patterns that are full file names and don't
@@ -343,7 +344,7 @@
      *
      * @since Ant 1.8.0
      */
-    private final Map<String, TokenizedPath> includeNonPatterns = new HashMap<String, TokenizedPath>();
+    private final Map<String, TokenizedPath> includeNonPatterns = new HashMap<>();
 
     /**
      * Map of all exclude patterns that are full file names and don't
@@ -360,7 +361,7 @@
      *
      * @since Ant 1.8.0
      */
-    private final Map<String, TokenizedPath> excludeNonPatterns = new HashMap<String, TokenizedPath>();
+    private final Map<String, TokenizedPath> excludeNonPatterns = new HashMap<>();
 
     /**
      * Array of all include patterns that contain wildcards.
@@ -439,13 +440,7 @@
      *
      * @since Ant 1.8.0
      */
-    private final Set<String> notFollowedSymlinks = new HashSet<String>();
-
-    /**
-     * Sole constructor.
-     */
-    public DirectoryScanner() {
-    }
+    private final Set<String> notFollowedSymlinks = new HashSet<>();
 
     /**
      * Test whether or not a given path matches the start of a given
@@ -621,8 +616,8 @@
     public static void resetDefaultExcludes() {
         synchronized (defaultExcludes) {
             defaultExcludes.clear();
-            for (int i = 0; i < DEFAULTEXCLUDES.length; i++) {
-                defaultExcludes.add(DEFAULTEXCLUDES[i]);
+            for (String element : DEFAULTEXCLUDES) {
+                defaultExcludes.add(element);
             }
         }
     }
@@ -635,8 +630,9 @@
      *
      * @param basedir The base directory to scan.
      */
+    @Override
     public void setBasedir(final String basedir) {
-        setBasedir(basedir == null ? (File) null
+        setBasedir(basedir == null ? null
             : new File(basedir.replace('/', File.separatorChar).replace(
             '\\', File.separatorChar)));
     }
@@ -647,6 +643,7 @@
      *
      * @param basedir The base directory for scanning.
      */
+    @Override
     public synchronized void setBasedir(final File basedir) {
         this.basedir = basedir;
     }
@@ -657,6 +654,7 @@
      *
      * @return the base directory to be scanned.
      */
+    @Override
     public synchronized File getBasedir() {
         return basedir;
     }
@@ -678,6 +676,7 @@
      * @param isCaseSensitive whether or not the file system should be
      *                        regarded as a case sensitive one.
      */
+    @Override
     public synchronized void setCaseSensitive(final boolean isCaseSensitive) {
         this.isCaseSensitive = isCaseSensitive;
     }
@@ -737,14 +736,13 @@
      *                 list is given, all elements must be
      *                 non-<code>null</code>.
      */
+    @Override
     public synchronized void setIncludes(final String[] includes) {
         if (includes == null) {
             this.includes = null;
         } else {
-            this.includes = new String[includes.length];
-            for (int i = 0; i < includes.length; i++) {
-                this.includes[i] = normalizePattern(includes[i]);
-            }
+            this.includes = Stream.of(includes)
+                .map(DirectoryScanner::normalizePattern).toArray(String[]::new);
         }
     }
 
@@ -760,14 +758,13 @@
      *                 should be excluded. If a non-<code>null</code> list is
      *                 given, all elements must be non-<code>null</code>.
      */
+    @Override
     public synchronized void setExcludes(final String[] excludes) {
         if (excludes == null) {
             this.excludes = null;
         } else {
-            this.excludes = new String[excludes.length];
-            for (int i = 0; i < excludes.length; i++) {
-                this.excludes[i] = normalizePattern(excludes[i]);
-            }
+            this.excludes = Stream.of(excludes).map(DirectoryScanner::normalizePattern)
+                    .toArray(String[]::new);
         }
     }
 
@@ -786,17 +783,12 @@
      */
     public synchronized void addExcludes(final String[] excludes) {
         if (excludes != null && excludes.length > 0) {
-            if (this.excludes != null && this.excludes.length > 0) {
-                final String[] tmp = new String[excludes.length
-                                          + this.excludes.length];
-                System.arraycopy(this.excludes, 0, tmp, 0,
-                                 this.excludes.length);
-                for (int i = 0; i < excludes.length; i++) {
-                    tmp[this.excludes.length + i] = normalizePattern(excludes[i]);
-                }
-                this.excludes = tmp;
-            } else {
+            if (this.excludes == null || this.excludes.length == 0) {
                 setExcludes(excludes);
+            } else {
+                this.excludes = Stream.concat(Stream.of(this.excludes),
+                        Stream.of(excludes).map(DirectoryScanner::normalizePattern))
+                        .toArray(String[]::new);
             }
         }
     }
@@ -824,6 +816,7 @@
      *
      * @param selectors specifies the selectors to be invoked on a scan.
      */
+    @Override
     public synchronized void setSelectors(final FileSelector[] selectors) {
         this.selectors = selectors;
     }
@@ -849,6 +842,7 @@
      * @exception IllegalStateException if the base directory was set
      *            incorrectly (i.e. if it doesn't exist or isn't a directory).
      */
+    @Override
     public void scan() throws IllegalStateException {
         synchronized (scanLock) {
             if (scanning) {
@@ -872,13 +866,13 @@
                 clearResults();
 
                 // set in/excludes to reasonable defaults if needed:
-                final boolean nullIncludes = (includes == null);
+                final boolean nullIncludes = includes == null;
                 includes = nullIncludes ? new String[] {SelectorUtils.DEEP_TREE_MATCH} : includes;
-                final boolean nullExcludes = (excludes == null);
+                final boolean nullExcludes = excludes == null;
                 excludes = nullExcludes ? new String[0] : excludes;
 
                 if (basedir != null && !followSymlinks
-                    && SYMLINK_UTILS.isSymbolicLink(basedir)) {
+                    && Files.isSymbolicLink(basedir.toPath())) {
                     notFollowedSymlinks.add(basedir.getAbsolutePath());
                     basedir = null;
                 }
@@ -901,22 +895,19 @@
                     } else if (!basedir.isDirectory()) {
                         illegal = new IllegalStateException("basedir "
                                                             + basedir
-                                                            + " is not a"
-                                                            + " directory.");
+                                                            + " is not a directory.");
                     }
                     if (illegal != null) {
                         throw illegal;
                     }
                 }
                 if (isIncluded(TokenizedPath.EMPTY_PATH)) {
-                    if (!isExcluded(TokenizedPath.EMPTY_PATH)) {
-                        if (isSelected("", basedir)) {
-                            dirsIncluded.addElement("");
-                        } else {
-                            dirsDeselected.addElement("");
-                        }
-                    } else {
+                    if (isExcluded(TokenizedPath.EMPTY_PATH)) {
                         dirsExcluded.addElement("");
+                    } else if (isSelected("", basedir)) {
+                        dirsIncluded.addElement("");
+                    } else {
+                        dirsDeselected.addElement("");
                     }
                 } else {
                     dirsNotIncluded.addElement("");
@@ -926,8 +917,6 @@
                 includes = nullIncludes ? null : includes;
                 excludes = nullExcludes ? null : excludes;
             }
-        } catch (final IOException ex) {
-            throw new BuildException(ex);
         } finally {
             basedir = savedBase;
             synchronized (scanLock) {
@@ -944,17 +933,18 @@
      */
     private void checkIncludePatterns() {
         ensureNonPatternSetsReady();
-        final Map<TokenizedPath, String> newroots = new HashMap<TokenizedPath, String>();
+        final Map<TokenizedPath, String> newroots = new HashMap<>();
 
         // put in the newroots map the include patterns without
         // wildcard tokens
-        for (int i = 0; i < includePatterns.length; i++) {
-            final String pattern = includePatterns[i].toString();
+        for (TokenizedPattern includePattern : includePatterns) {
+            final String pattern = includePattern.toString();
             if (!shouldSkipPattern(pattern)) {
-                newroots.put(includePatterns[i].rtrimWildcardTokens(), pattern);
+                newroots.put(includePattern.rtrimWildcardTokens(), pattern);
             }
         }
-        for (final Map.Entry<String, TokenizedPath> entry : includeNonPatterns.entrySet()) {
+        for (final Map.Entry<String, TokenizedPath> entry : includeNonPatterns
+            .entrySet()) {
             final String pattern = entry.getKey();
             if (!shouldSkipPattern(pattern)) {
                 newroots.put(entry.getValue(), pattern);
@@ -1056,10 +1046,9 @@
     private boolean shouldSkipPattern(final String pattern) {
         if (FileUtils.isAbsolutePath(pattern)) {
             //skip abs. paths not under basedir, if set:
-            if (basedir != null
-                && !SelectorUtils.matchPatternStart(pattern,
-                                                    basedir.getAbsolutePath(),
-                                                    isCaseSensitive())) {
+            if (!(basedir == null || SelectorUtils.matchPatternStart(pattern,
+                                                basedir.getAbsolutePath(),
+                                                isCaseSensitive()))) {
                 return true;
             }
         } else if (basedir == null) {
@@ -1073,14 +1062,14 @@
      * Clear the result caches for a scan.
      */
     protected synchronized void clearResults() {
-        filesIncluded    = new VectorSet<String>();
-        filesNotIncluded = new VectorSet<String>();
-        filesExcluded    = new VectorSet<String>();
-        filesDeselected  = new VectorSet<String>();
-        dirsIncluded     = new VectorSet<String>();
-        dirsNotIncluded  = new VectorSet<String>();
-        dirsExcluded     = new VectorSet<String>();
-        dirsDeselected   = new VectorSet<String>();
+        filesIncluded    = new VectorSet<>();
+        filesNotIncluded = new VectorSet<>();
+        filesExcluded    = new VectorSet<>();
+        filesDeselected  = new VectorSet<>();
+        dirsIncluded     = new VectorSet<>();
+        dirsNotIncluded  = new VectorSet<>();
+        dirsExcluded     = new VectorSet<>();
+        dirsDeselected   = new VectorSet<>();
         everythingIncluded = (basedir != null);
         scannedDirs.clear();
         notFollowedSymlinks.clear();
@@ -1144,10 +1133,10 @@
     }
 
     private void processSlowScan(final String[] arr) {
-        for (int i = 0; i < arr.length; i++) {
-            final TokenizedPath path  = new TokenizedPath(arr[i]);
+        for (String element : arr) {
+            final TokenizedPath path  = new TokenizedPath(element);
             if (!couldHoldIncluded(path) || contentsExcluded(path)) {
-                scandir(new File(basedir, arr[i]), path, false);
+                scandir(new File(basedir, element), path, false);
             }
         }
     }
@@ -1205,17 +1194,17 @@
             if (!dir.exists()) {
                 throw new BuildException(dir + DOES_NOT_EXIST_POSTFIX);
             } else if (!dir.isDirectory()) {
-                throw new BuildException(dir + " is not a directory.");
+                throw new BuildException("%s is not a directory.", dir);
             } else {
-                throw new BuildException("IO error scanning directory '"
-                                         + dir.getAbsolutePath() + "'");
+                throw new BuildException("IO error scanning directory '%s'",
+                    dir.getAbsolutePath());
             }
         }
         scandir(dir, path, fast, newfiles, new LinkedList<String>());
     }
 
     private void scandir(final File dir, final TokenizedPath path, final boolean fast,
-                         String[] newfiles, final LinkedList<String> directoryNamesFollowed) {
+                         String[] newfiles, final Deque<String> directoryNamesFollowed) {
         String vpath = path.toString();
         if (vpath.length() > 0 && !vpath.endsWith(File.separator)) {
             vpath += File.separator;
@@ -1226,30 +1215,28 @@
             return;
         }
         if (!followSymlinks) {
-            final ArrayList<String> noLinks = new ArrayList<String>();
-            for (int i = 0; i < newfiles.length; i++) {
-                try {
-                    if (SYMLINK_UTILS.isSymbolicLink(dir, newfiles[i])) {
-                        final String name = vpath + newfiles[i];
-                        final File file = new File(dir, newfiles[i]);
-                        if (file.isDirectory()) {
-                            dirsExcluded.addElement(name);
-                        } else if (file.isFile()) {
-                            filesExcluded.addElement(name);
-                        }
-                        accountForNotFollowedSymlink(name, file);
-                    } else {
-                        noLinks.add(newfiles[i]);
+            final ArrayList<String> noLinks = new ArrayList<>();
+            for (final String newfile : newfiles) {
+                final Path filePath;
+                if (dir == null) {
+                    filePath = Paths.get(newfile);
+                } else {
+                    filePath = Paths.get(dir.toPath().toString(), newfile);
+                }
+                if (Files.isSymbolicLink(filePath)) {
+                    final String name = vpath + newfile;
+                    final File file = new File(dir, newfile);
+                    if (file.isDirectory()) {
+                        dirsExcluded.addElement(name);
+                    } else if (file.isFile()) {
+                        filesExcluded.addElement(name);
                     }
-                } catch (final IOException ioe) {
-                    final String msg = "IOException caught while checking "
-                        + "for links, couldn't get canonical path!";
-                    // will be caught and redirected to Ant's logging system
-                    System.err.println(msg);
-                    noLinks.add(newfiles[i]);
+                    accountForNotFollowedSymlink(name, file);
+                } else {
+                    noLinks.add(newfile);
                 }
             }
-            newfiles = (noLinks.toArray(new String[noLinks.size()]));
+            newfiles = noLinks.toArray(new String[noLinks.size()]);
         } else {
             directoryNamesFollowed.addFirst(dir.getName());
         }
@@ -1329,7 +1316,7 @@
     private void accountForIncludedDir(final TokenizedPath name,
                                        final File file, final boolean fast,
                                        final String[] children,
-                                       final LinkedList<String> directoryNamesFollowed) {
+                                       final Deque<String> directoryNamesFollowed) {
         processIncluded(name, file, dirsIncluded, dirsExcluded, dirsDeselected);
         if (fast && couldHoldIncluded(name) && !contentsExcluded(name)) {
             scandir(file, name, fast, children, directoryNamesFollowed);
@@ -1348,13 +1335,12 @@
     }
 
     private void processIncluded(final TokenizedPath path,
-                                 final File file, final Vector<String> inc, final Vector<String> exc,
-                                 final Vector<String> des) {
+                                 final File file, final List<String> inc, final List<String> exc,
+                                 final List<String> des) {
         final String name = path.toString();
         if (inc.contains(name) || exc.contains(name) || des.contains(name)) {
             return;
         }
-
         boolean included = false;
         if (isExcluded(path)) {
             exc.add(name);
@@ -1390,17 +1376,12 @@
     private boolean isIncluded(final TokenizedPath path) {
         ensureNonPatternSetsReady();
 
-        if (isCaseSensitive()
-            ? includeNonPatterns.containsKey(path.toString())
-            : includeNonPatterns.containsKey(path.toString().toUpperCase())) {
-            return true;
-        }
-        for (int i = 0; i < includePatterns.length; i++) {
-            if (includePatterns[i].matchPath(path, isCaseSensitive())) {
-                return true;
-            }
+        String toMatch = path.toString();
+        if (!isCaseSensitive()) {
+            toMatch = toMatch.toUpperCase();
         }
-        return false;
+        return includeNonPatterns.containsKey(toMatch)
+            || Stream.of(includePatterns).anyMatch(p -> p.matchPath(path, isCaseSensitive()));
     }
 
     /**
@@ -1424,19 +1405,9 @@
      *         least one include pattern, or <code>false</code> otherwise.
      */
     private boolean couldHoldIncluded(final TokenizedPath tokenizedName) {
-        for (int i = 0; i < includePatterns.length; i++) {
-            if (couldHoldIncluded(tokenizedName, includePatterns[i])) {
-                return true;
-            }
-        }
-        for (final Iterator<TokenizedPath> iter = includeNonPatterns.values().iterator();
-             iter.hasNext();) {
-            if (couldHoldIncluded(tokenizedName,
-                                  iter.next().toPattern())) {
-                return true;
-            }
-        }
-        return false;
+        return Stream.concat(Stream.of(includePatterns),
+                includeNonPatterns.values().stream().map(TokenizedPath::toPattern))
+                .anyMatch(pat -> couldHoldIncluded(tokenizedName, pat));
     }
 
     /**
@@ -1485,12 +1456,8 @@
      */
     private boolean isMorePowerfulThanExcludes(final String name) {
         final String soughtexclude = name + File.separatorChar + SelectorUtils.DEEP_TREE_MATCH;
-        for (int counter = 0; counter < excludePatterns.length; counter++) {
-            if (excludePatterns[counter].toString().equals(soughtexclude))  {
-                return false;
-            }
-        }
-        return true;
+        return Stream.of(excludePatterns).map(Object::toString)
+            .noneMatch(Predicate.isEqual(soughtexclude));
     }
 
     /**
@@ -1499,14 +1466,10 @@
      * @return whether all the specified directory's contents are excluded.
      */
     /* package */ boolean contentsExcluded(final TokenizedPath path) {
-        for (int i = 0; i < excludePatterns.length; i++) {
-            if (excludePatterns[i].endsWith(SelectorUtils.DEEP_TREE_MATCH)
-                && excludePatterns[i].withoutLastToken()
-                   .matchPath(path, isCaseSensitive())) {
-                return true;
-            }
-        }
-        return false;
+        return Stream.of(excludePatterns)
+            .filter(p -> p.endsWith(SelectorUtils.DEEP_TREE_MATCH))
+            .map(TokenizedPattern::withoutLastToken)
+            .anyMatch(wlt -> wlt.matchPath(path, isCaseSensitive()));
     }
 
     /**
@@ -1532,17 +1495,12 @@
     private boolean isExcluded(final TokenizedPath name) {
         ensureNonPatternSetsReady();
 
-        if (isCaseSensitive()
-            ? excludeNonPatterns.containsKey(name.toString())
-            : excludeNonPatterns.containsKey(name.toString().toUpperCase())) {
-            return true;
-        }
-        for (int i = 0; i < excludePatterns.length; i++) {
-            if (excludePatterns[i].matchPath(name, isCaseSensitive())) {
-                return true;
-            }
+        String toMatch = name.toString();
+        if (!isCaseSensitive()) {
+            toMatch = toMatch.toUpperCase();
         }
-        return false;
+        return excludeNonPatterns.containsKey(toMatch)
+            || Stream.of(excludePatterns).anyMatch(p -> p.matchPath(name, isCaseSensitive()));
     }
 
     /**
@@ -1554,14 +1512,8 @@
      *         should not be selected, <code>true</code> otherwise.
      */
     protected boolean isSelected(final String name, final File file) {
-        if (selectors != null) {
-            for (int i = 0; i < selectors.length; i++) {
-                if (!selectors[i].isSelected(basedir, name, file)) {
-                    return false;
-                }
-            }
-        }
-        return true;
+        return selectors == null
+                || Stream.of(selectors).allMatch(sel -> sel.isSelected(basedir, name, file));
     }
 
     /**
@@ -1572,14 +1524,14 @@
      * @return the names of the files which matched at least one of the
      *         include patterns and none of the exclude patterns.
      */
+    @Override
     public String[] getIncludedFiles() {
         String[] files;
         synchronized (this) {
             if (filesIncluded == null) {
                 throw new IllegalStateException("Must call scan() first");
             }
-            files = new String[filesIncluded.size()];
-            filesIncluded.copyInto(files);
+            files = filesIncluded.toArray(new String[filesIncluded.size()]);
         }
         Arrays.sort(files);
         return files;
@@ -1607,11 +1559,10 @@
      *
      * @see #slowScan
      */
+    @Override
     public synchronized String[] getNotIncludedFiles() {
         slowScan();
-        final String[] files = new String[filesNotIncluded.size()];
-        filesNotIncluded.copyInto(files);
-        return files;
+        return filesNotIncluded.toArray(new String[filesNotIncluded.size()]);
     }
 
     /**
@@ -1625,11 +1576,10 @@
      *
      * @see #slowScan
      */
+    @Override
     public synchronized String[] getExcludedFiles() {
         slowScan();
-        final String[] files = new String[filesExcluded.size()];
-        filesExcluded.copyInto(files);
-        return files;
+        return filesExcluded.toArray(new String[filesExcluded.size()]);
     }
 
     /**
@@ -1643,11 +1593,10 @@
      *
      * @see #slowScan
      */
+    @Override
     public synchronized String[] getDeselectedFiles() {
         slowScan();
-        final String[] files = new String[filesDeselected.size()];
-        filesDeselected.copyInto(files);
-        return files;
+        return filesDeselected.toArray(new String[filesDeselected.size()]);
     }
 
     /**
@@ -1658,14 +1607,14 @@
      * @return the names of the directories which matched at least one of the
      * include patterns and none of the exclude patterns.
      */
+    @Override
     public String[] getIncludedDirectories() {
         String[] directories;
         synchronized (this) {
             if (dirsIncluded == null) {
                 throw new IllegalStateException("Must call scan() first");
             }
-            directories = new String[dirsIncluded.size()];
-            dirsIncluded.copyInto(directories);
+            directories = dirsIncluded.toArray(new String[dirsIncluded.size()]);
         }
         Arrays.sort(directories);
         return directories;
@@ -1693,11 +1642,10 @@
      *
      * @see #slowScan
      */
+    @Override
     public synchronized String[] getNotIncludedDirectories() {
         slowScan();
-        final String[] directories = new String[dirsNotIncluded.size()];
-        dirsNotIncluded.copyInto(directories);
-        return directories;
+        return dirsNotIncluded.toArray(new String[dirsNotIncluded.size()]);
     }
 
     /**
@@ -1711,11 +1659,10 @@
      *
      * @see #slowScan
      */
+    @Override
     public synchronized String[] getExcludedDirectories() {
         slowScan();
-        final String[] directories = new String[dirsExcluded.size()];
-        dirsExcluded.copyInto(directories);
-        return directories;
+        return dirsExcluded.toArray(new String[dirsExcluded.size()]);
     }
 
     /**
@@ -1729,11 +1676,10 @@
      *
      * @see #slowScan
      */
+    @Override
     public synchronized String[] getDeselectedDirectories() {
         slowScan();
-        final String[] directories = new String[dirsDeselected.size()];
-        dirsDeselected.copyInto(directories);
-        return directories;
+        return dirsDeselected.toArray(new String[dirsDeselected.size()]);
     }
 
     /**
@@ -1757,20 +1703,14 @@
     /**
      * Add default exclusions to the current exclusions set.
      */
+    @Override
     public synchronized void addDefaultExcludes() {
-        final int excludesLength = excludes == null ? 0 : excludes.length;
-        String[] newExcludes;
-        final String[] defaultExcludesTemp = getDefaultExcludes();
-        newExcludes = new String[excludesLength + defaultExcludesTemp.length];
-        if (excludesLength > 0) {
-            System.arraycopy(excludes, 0, newExcludes, 0, excludesLength);
-        }
-        for (int i = 0; i < defaultExcludesTemp.length; i++) {
-            newExcludes[i + excludesLength] =
-                defaultExcludesTemp[i].replace('/', File.separatorChar)
-                .replace('\\', File.separatorChar);
+        Stream<String> s = Stream.of(getDefaultExcludes()).map(p -> p.replace('/',
+                File.separatorChar).replace('\\', File.separatorChar));
+        if (excludes != null) {
+            s = Stream.concat(Stream.of(excludes), s);
         }
-        excludes = newExcludes;
+        excludes = s.toArray(String[]::new);
     }
 
     /**
@@ -1780,6 +1720,7 @@
      * @return the resource with the given name.
      * @since Ant 1.5.2
      */
+    @Override
     public synchronized Resource getResource(final String name) {
         return new FileResource(basedir, name);
     }
@@ -1842,13 +1783,13 @@
      */
     private TokenizedPattern[] fillNonPatternSet(final Map<String, TokenizedPath> map,
                                                  final String[] patterns) {
-        final ArrayList<TokenizedPattern> al = new ArrayList<TokenizedPattern>(patterns.length);
-        for (int i = 0; i < patterns.length; i++) {
-            if (!SelectorUtils.hasWildcards(patterns[i])) {
-                final String s = isCaseSensitive() ? patterns[i] : patterns[i].toUpperCase();
-                map.put(s, new TokenizedPath(s));
+        final List<TokenizedPattern> al = new ArrayList<>(patterns.length);
+        for (String pattern : patterns) {
+            if (SelectorUtils.hasWildcards(pattern)) {
+                al.add(new TokenizedPattern(pattern));
             } else {
-                al.add(new TokenizedPattern(patterns[i]));
+                final String s = isCaseSensitive() ? pattern : pattern.toUpperCase();
+                map.put(s, new TokenizedPath(s));
             }
         }
         return al.toArray(new TokenizedPattern[al.size()]);
@@ -1866,13 +1807,19 @@
      * @since Ant 1.8.0
      */
     private boolean causesIllegalSymlinkLoop(final String dirName, final File parent,
-                                             final LinkedList<String> directoryNamesFollowed) {
+                                             final Deque<String> directoryNamesFollowed) {
         try {
+            final Path dirPath;
+            if (parent == null) {
+                dirPath = Paths.get(dirName);
+            } else {
+                dirPath = Paths.get(parent.toPath().toString(), dirName);
+            }
             if (directoryNamesFollowed.size() >= maxLevelsOfSymlinks
-                && CollectionUtils.frequency(directoryNamesFollowed, dirName) >= maxLevelsOfSymlinks
-                && SYMLINK_UTILS.isSymbolicLink(parent, dirName)) {
+                && Collections.frequency(directoryNamesFollowed, dirName) >= maxLevelsOfSymlinks
+                && Files.isSymbolicLink(dirPath)) {
 
-                final ArrayList<String> files = new ArrayList<String>();
+                final List<String> files = new ArrayList<>();
                 File f = FILE_UTILS.resolveFile(parent, dirName);
                 final String target = f.getCanonicalPath();
                 files.add(target);
@@ -1884,17 +1831,16 @@
                         f = FILE_UTILS.resolveFile(parent, relPath + dir);
                         files.add(f.getCanonicalPath());
                         if (files.size() > maxLevelsOfSymlinks
-                            && CollectionUtils.frequency(files, target) > maxLevelsOfSymlinks) {
+                            && Collections.frequency(files, target) > maxLevelsOfSymlinks) {
                             return true;
                         }
                     }
                 }
-
             }
             return false;
         } catch (final IOException ex) {
-            throw new BuildException("Caught error while checking for"
-                                     + " symbolic links", ex);
+            throw new BuildException(
+                "Caught error while checking for symbolic links", ex);
         }
     }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/dispatch/DispatchTask.java ant-1.10.3/src/main/org/apache/tools/ant/dispatch/DispatchTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/dispatch/DispatchTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/dispatch/DispatchTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -36,6 +36,7 @@
      * Get the action parameter name.
      * @return the <code>String</code> "action" by default (can be overridden).
      */
+    @Override
     public String getActionParameterName() {
         return "action";
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java ant-1.10.3/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java
--- ant-1.9.10/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java	2018-03-24 12:37:12.000000000 +0000
@@ -98,12 +98,12 @@
                 }
             } else {
                 Method executeM = null;
-                executeM = task.getClass().getMethod(methodName, new Class[0]);
+                executeM = task.getClass().getMethod(methodName);
                 if (executeM == null) {
                     throw new BuildException("No public " + methodName + "() in "
                         + task.getClass());
                 }
-                executeM.invoke(task, (Object[]) null);
+                executeM.invoke(task);
                 if (task instanceof UnknownElement) {
                     ((UnknownElement) task).setRealThing(null);
                 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/DynamicConfigurator.java ant-1.10.3/src/main/org/apache/tools/ant/DynamicConfigurator.java
--- ant-1.9.10/src/main/org/apache/tools/ant/DynamicConfigurator.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/DynamicConfigurator.java	2018-03-24 12:37:12.000000000 +0000
@@ -26,4 +26,3 @@
 public interface DynamicConfigurator
     extends DynamicAttribute, DynamicElement {
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/Evaluable.java ant-1.10.3/src/main/org/apache/tools/ant/Evaluable.java
--- ant-1.9.10/src/main/org/apache/tools/ant/Evaluable.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/Evaluable.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,13 +17,19 @@
  */
 package org.apache.tools.ant;
 
+import java.util.function.Supplier;
+
 /**
  * Kind of task attribute that can be evaluated before being assigned
+ * @param <T> as {@link Supplier}
  *
  * @see RuntimeConfigurable
  */
-public interface Evaluable {
+public interface Evaluable<T> extends Supplier<T> {
 
-    Object eval();
+    T eval();
 
+    default T get() {
+        return eval();
+    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java ant-1.10.3/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java
--- ant-1.9.10/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java	2018-03-24 12:37:12.000000000 +0000
@@ -223,7 +223,7 @@
     /**
      * Set the regular expression as an attribute.
      * @param pattern String
-     * @since Ant 1.9.10
+     * @since Ant 1.10.2
      */
     public void setRegexp(String pattern) {
         RegularExpression regexp = new RegularExpression();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/filters/Native2AsciiFilter.java ant-1.10.3/src/main/org/apache/tools/ant/filters/Native2AsciiFilter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/filters/Native2AsciiFilter.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/filters/Native2AsciiFilter.java	2018-03-24 12:37:12.000000000 +0000
@@ -39,6 +39,7 @@
         this.reverse = reverse;
     }
 
+    @Override
     public String filter(String line) {
         return reverse
             ? Native2AsciiUtils.ascii2native(line)
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java ant-1.10.3/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java	2018-03-24 12:37:12.000000000 +0000
@@ -23,9 +23,13 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.Collection;
 import java.util.List;
+import java.util.Optional;
 import java.util.Vector;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
@@ -34,7 +38,6 @@
 import org.apache.tools.ant.filters.ChainableReader;
 import org.apache.tools.ant.types.AntFilterReader;
 import org.apache.tools.ant.types.FilterChain;
-import org.apache.tools.ant.types.Parameter;
 import org.apache.tools.ant.types.Parameterizable;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.util.FileUtils;
@@ -44,6 +47,37 @@
  *
  */
 public final class ChainReaderHelper {
+    /**
+     * Created type.
+     */
+    public class ChainReader extends FilterReader {
+
+        private List<AntClassLoader> cleanupLoaders;
+
+        private ChainReader(Reader in, List<AntClassLoader> cleanupLoaders) {
+            super(in);
+            this.cleanupLoaders = cleanupLoaders;
+        }
+
+        public String readFully() throws IOException {
+            return ChainReaderHelper.this.readFully(this);
+        }
+
+        @Override
+        public void close() throws IOException {
+            cleanUpClassLoaders(cleanupLoaders);
+            super.close();
+        }
+
+        @Override
+        protected void finalize() throws Throwable {
+            try {
+                close();
+            } finally {
+                super.finalize();
+            }
+        }
+    }
 
     // default buffer size
     private static final int DEFAULT_BUFFER_SIZE = 8192;
@@ -61,7 +95,7 @@
     /**
      * Chain of filters
      */
-    public Vector<FilterChain> filterChains = new Vector<FilterChain>();
+    public Vector<FilterChain> filterChains = new Vector<>();
 
     /** The Ant project */
     private Project project = null;
@@ -69,7 +103,25 @@
     // CheckStyle:VisibilityModifier ON
 
     /**
-     * Sets the primary reader
+     * Default constructor.
+     */
+    public ChainReaderHelper() {
+    }
+
+    /**
+     * Convenience constructor.
+     * @param project ditto
+     * @param primaryReader ditto
+     * @param filterChains ditto
+     */
+    public ChainReaderHelper(Project project, Reader primaryReader,
+        Iterable<FilterChain> filterChains) {
+        withProject(project).withPrimaryReader(primaryReader)
+            .withFilterChains(filterChains);
+    }
+
+    /**
+     * Sets the primary {@link Reader}
      * @param rdr the reader object
      */
     public void setPrimaryReader(Reader rdr) {
@@ -77,6 +129,16 @@
     }
 
     /**
+     * Fluent primary {@link Reader} mutator.
+     * @param rdr Reader
+     * @return {@code this}
+     */
+    public ChainReaderHelper withPrimaryReader(Reader rdr) {
+        setPrimaryReader(rdr);
+        return this;
+    }
+
+    /**
      * Set the project to work with
      * @param project the current project
      */
@@ -85,6 +147,16 @@
     }
 
     /**
+     * Fluent {@link Project} mutator.
+     * @param project ditto
+     * @return {@code this}
+     */
+    public ChainReaderHelper withProject(Project project) {
+        setProject(project);
+        return this;
+    }
+
+    /**
      * Get the project
      *
      * @return the current project
@@ -103,6 +175,16 @@
     }
 
     /**
+     * Fluent buffer size mutator.
+     * @param size ditto
+     * @return {@code this}
+     */
+    public ChainReaderHelper withBufferSize(int size) {
+        setBufferSize(size);
+        return this;
+    }
+
+    /**
      * Sets the collection of filter reader sets
      *
      * @param fchain the filter chains collection
@@ -112,42 +194,56 @@
     }
 
     /**
+     * Fluent {@code filterChains} mutator.
+     * @param filterChains ditto
+     * @return {@code this}
+     */
+    public ChainReaderHelper withFilterChains(Iterable<FilterChain> filterChains) {
+        final Vector<FilterChain> fcs;
+        if (filterChains instanceof Vector<?>) {
+            fcs = (Vector<FilterChain>) filterChains;
+        } else {
+            fcs = new Vector<>();
+            filterChains.forEach(fcs::add);
+        }
+        setFilterChains(fcs);
+        return this;
+    }
+
+    /**
+     * Fluent mechanism to apply some {@link Consumer}.
+     * @param consumer ditto
+     * @return {@code this}
+     */
+    public ChainReaderHelper with(Consumer<ChainReaderHelper> consumer) {
+        consumer.accept(this);
+        return this;
+    }
+
+    /**
      * Assemble the reader
      * @return the assembled reader
      * @exception BuildException if an error occurs
      */
-    public Reader getAssembledReader() throws BuildException {
+    public ChainReader getAssembledReader() throws BuildException {
         if (primaryReader == null) {
             throw new BuildException("primaryReader must not be null.");
         }
 
         Reader instream = primaryReader;
-        final int filterReadersCount = filterChains.size();
-        final Vector<Object> finalFilters = new Vector<Object>();
-        final ArrayList<AntClassLoader> classLoadersToCleanUp =
-            new ArrayList<AntClassLoader>();
-
-        for (int i = 0; i < filterReadersCount; i++) {
-            final FilterChain filterchain =
-                filterChains.elementAt(i);
-            final Vector<Object> filterReaders = filterchain.getFilterReaders();
-            final int readerCount = filterReaders.size();
-            for (int j = 0; j < readerCount; j++) {
-                finalFilters.addElement(filterReaders.elementAt(j));
-            }
-        }
+        final List<AntClassLoader> classLoadersToCleanUp = new ArrayList<>();
 
-        final int filtersCount = finalFilters.size();
+        final List<Object> finalFilters =
+            filterChains.stream().map(FilterChain::getFilterReaders)
+                .flatMap(Collection::stream).collect(Collectors.toList());
 
-        if (filtersCount > 0) {
+        if (!finalFilters.isEmpty()) {
             boolean success = false;
             try {
-                for (int i = 0; i < filtersCount; i++) {
-                    Object o = finalFilters.elementAt(i);
-
+                for (Object o : finalFilters) {
                     if (o instanceof AntFilterReader) {
                         instream =
-                            expandReader((AntFilterReader) finalFilters.elementAt(i),
+                            expandReader((AntFilterReader) o,
                                          instream, classLoadersToCleanUp);
                     } else if (o instanceof ChainableReader) {
                         setProjectOnObject(o);
@@ -157,26 +253,12 @@
                 }
                 success = true;
             } finally {
-                if (!success && classLoadersToCleanUp.size() > 0) {
+                if (!(success || classLoadersToCleanUp.isEmpty())) {
                     cleanUpClassLoaders(classLoadersToCleanUp);
                 }
             }
         }
-        final Reader finalReader = instream;
-        return classLoadersToCleanUp.size() == 0 ? finalReader
-            : new FilterReader(finalReader) {
-                    public void close() throws IOException {
-                        FileUtils.close(in);
-                        cleanUpClassLoaders(classLoadersToCleanUp);
-                    }
-                    protected void finalize() throws Throwable {
-                        try {
-                            close();
-                        } finally {
-                            super.finalize();
-                        }
-                    }
-                };
+        return new ChainReader(instream, classLoadersToCleanUp);
     }
 
     /**
@@ -199,9 +281,7 @@
      * Deregisters Classloaders from the project so GC can remove them later.
      */
     private static void cleanUpClassLoaders(List<AntClassLoader> loaders) {
-        for (Iterator<AntClassLoader> it = loaders.iterator(); it.hasNext();) {
-            it.next().cleanup();
-        }
+        loaders.forEach(AntClassLoader::cleanup);
     }
 
     /**
@@ -211,8 +291,7 @@
      * @return the contents of the file as a string
      * @exception IOException if an error occurs
      */
-    public String readFully(Reader rdr)
-        throws IOException {
+    public String readFully(Reader rdr) throws IOException {
         return FileUtils.readFully(rdr, bufferSize);
     }
 
@@ -227,57 +306,45 @@
                                 final List<AntClassLoader> classLoadersToCleanUp) {
         final String className = filter.getClassName();
         final Path classpath = filter.getClasspath();
-        final Project pro = filter.getProject();
         if (className != null) {
             try {
-                Class<?> clazz = null;
-                if (classpath == null) {
-                    clazz = Class.forName(className);
-                } else {
-                    AntClassLoader al = pro.createClassLoader(classpath);
-                    classLoadersToCleanUp.add(al);
-                    clazz = Class.forName(className, true, al);
-                }
-                if (clazz != null) {
-                    if (!FilterReader.class.isAssignableFrom(clazz)) {
-                        throw new BuildException(className + " does not extend"
-                                                 + " java.io.FilterReader");
-                    }
-                    final Constructor<?>[] constructors = clazz.getConstructors();
-                    int j = 0;
-                    boolean consPresent = false;
-                    for (; j < constructors.length; j++) {
-                        Class<?>[] types = constructors[j].getParameterTypes();
-                        if (types.length == 1
-                            && types[0].isAssignableFrom(Reader.class)) {
-                            consPresent = true;
-                            break;
-                        }
+                Class<? extends FilterReader> clazz;
+                try {
+                    if (classpath == null) {
+                        clazz = Class.forName(className)
+                            .asSubclass(FilterReader.class);
+                    } else {
+                        AntClassLoader al =
+                            filter.getProject().createClassLoader(classpath);
+                        classLoadersToCleanUp.add(al);
+                        clazz = Class.forName(className, true, al)
+                            .asSubclass(FilterReader.class);
                     }
-                    if (!consPresent) {
-                        throw new BuildException(className + " does not define"
-                                                 + " a public constructor"
-                                                 + " that takes in a Reader"
-                                                 + " as its single argument.");
-                    }
-                    final Reader[] rdr = {ancestor};
-                    Reader instream =
-                        (Reader) constructors[j].newInstance((Object[]) rdr);
-                    setProjectOnObject(instream);
-                    if (Parameterizable.class.isAssignableFrom(clazz)) {
-                        final Parameter[] params = filter.getParams();
-                        ((Parameterizable) instream).setParameters(params);
-                    }
-                    return instream;
+                } catch (ClassCastException ex) {
+                    throw new BuildException("%s does not extend %s", className,
+                        FilterReader.class.getName());
+                }
+                Optional<Constructor<?>> ctor =
+                    Stream.of(clazz.getConstructors())
+                        .filter(c -> c.getParameterCount() == 1
+                            && c.getParameterTypes()[0]
+                                .isAssignableFrom(Reader.class))
+                        .findFirst();
+
+                Object instream = ctor
+                    .orElseThrow(() -> new BuildException(
+                        "%s does not define a public constructor that takes in a %s as its single argument.",
+                        className, Reader.class.getSimpleName()))
+                    .newInstance(ancestor);
+
+                setProjectOnObject(instream);
+                if (Parameterizable.class.isAssignableFrom(clazz)) {
+                    ((Parameterizable) instream).setParameters(filter.getParams());
                 }
-            } catch (final ClassNotFoundException cnfe) {
-                throw new BuildException(cnfe);
-            } catch (final InstantiationException ie) {
-                throw new BuildException(ie);
-            } catch (final IllegalAccessException iae) {
-                throw new BuildException(iae);
-            } catch (final InvocationTargetException ite) {
-                throw new BuildException(ite);
+                return (Reader) instream;
+            } catch (ClassNotFoundException | InstantiationException
+                    | IllegalAccessException | InvocationTargetException ex) {
+                throw new BuildException(ex);
             }
         }
         // Ant 1.7.1 and earlier ignore <filterreader> without a
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/helper/AntXMLContext.java ant-1.10.3/src/main/org/apache/tools/ant/helper/AntXMLContext.java
--- ant-1.9.10/src/main/org/apache/tools/ant/helper/AntXMLContext.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/helper/AntXMLContext.java	2018-03-24 12:37:12.000000000 +0000
@@ -91,7 +91,7 @@
     /** The stack of RuntimeConfigurable2 wrapping the
         objects.
     */
-    private Vector<RuntimeConfigurable> wStack = new Vector<RuntimeConfigurable>();
+    private Vector<RuntimeConfigurable> wStack = new Vector<>();
 
     /**
      * Indicates whether the project tag attributes are to be ignored
@@ -377,7 +377,7 @@
      */
     public void endPrefixMapping(String prefix) {
         List<String> list = prefixMapping.get(prefix);
-        if (list == null || list.size() == 0) {
+        if (list == null || list.isEmpty()) {
             return; // Should not happen
         }
         list.remove(list.size() - 1);
@@ -391,7 +391,7 @@
      */
     public String getPrefixMapping(String prefix) {
         List<String> list = prefixMapping.get(prefix);
-        if (list == null || list.size() == 0) {
+        if (list == null || list.isEmpty()) {
             return null;
         }
         return (String) list.get(list.size() - 1);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/helper/ProjectHelper2.java ant-1.10.3/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
--- ant-1.9.10/src/main/org/apache/tools/ant/helper/ProjectHelper2.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/helper/ProjectHelper2.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,13 +18,13 @@
 package org.apache.tools.ant.helper;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLConnection;
+import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Map;
@@ -88,6 +88,7 @@
      *
      * @since Ant 1.8.0
      */
+    @Override
     public boolean canParseAntlibDescriptor(Resource resource) {
         return true;
     }
@@ -102,6 +103,7 @@
      *
      * @since Ant 1.8.0
      */
+    @Override
     public UnknownElement parseAntlibDescriptor(Project containingProject,
                                                 Resource resource) {
         URLProvider up = resource.as(URLProvider.class);
@@ -143,6 +145,7 @@
      * @param source  the xml source
      * @exception BuildException if an error occurs
      */
+    @Override
     public void parse(Project project, Object source) throws BuildException {
         getImportStack().addElement(source);
         AntXMLContext context = null;
@@ -247,7 +250,7 @@
             String uri = null;
             if (buildFile != null) {
                 uri = FILE_UTILS.toURI(buildFile.getAbsolutePath());
-                inputStream = new FileInputStream(buildFile);
+                inputStream = Files.newInputStream(buildFile.toPath());
             } else {
                 uri = url.toString();
                 int pling = -1;
@@ -521,6 +524,7 @@
          *                 document. Will not be <code>null</code>.
          * @return an inputsource for this identifier
          */
+        @Override
         public InputSource resolveEntity(String publicId, String systemId) {
 
             context.getProject().log("resolving systemId: " + systemId, Project.MSG_VERBOSE);
@@ -538,10 +542,10 @@
                 }
                 context.getProject().log("file=" + file, Project.MSG_DEBUG);
                 try {
-                    InputSource inputSource = new InputSource(new FileInputStream(file));
+                    InputSource inputSource = new InputSource(Files.newInputStream(file.toPath()));
                     inputSource.setSystemId(FILE_UTILS.toURI(file.getAbsolutePath()));
                     return inputSource;
-                } catch (FileNotFoundException fne) {
+                } catch (IOException fne) {
                     context.getProject().log(file.getAbsolutePath() + " could not be found",
                                              Project.MSG_WARN);
                 }
@@ -566,6 +570,7 @@
          * @exception org.xml.sax.SAXParseException if the tag given is not
          *                              <code>"project"</code>
          */
+        @Override
         public void startElement(String uri, String tag, String qname, Attributes attrs)
             throws SAXParseException {
             AntHandler next = currentHandler.onStartChild(uri, tag, qname, attrs, context);
@@ -580,6 +585,7 @@
          * @param locator The locator used by the parser.
          *                Will not be <code>null</code>.
          */
+        @Override
         public void setDocumentLocator(Locator locator) {
             context.setLocator(locator);
         }
@@ -595,9 +601,10 @@
          *
          * @exception SAXException in case of error (not thrown in this implementation)
          */
+        @Override
         public void endElement(String uri, String name, String qName) throws SAXException {
             currentHandler.onEndElement(uri, name, context);
-            AntHandler prev = (AntHandler) antHandlers.pop();
+            AntHandler prev = antHandlers.pop();
             currentHandler = prev;
             if (currentHandler != null) {
                 currentHandler.onEndChild(uri, name, qName, context);
@@ -612,6 +619,7 @@
          * @param count The number of characters to read.
          * @exception SAXParseException if an error occurs
          */
+        @Override
         public void characters(char[] buf, int start, int count) throws SAXParseException {
             currentHandler.characters(buf, start, count, context);
         }
@@ -622,6 +630,7 @@
          * @param prefix the namespace prefix
          * @param uri the namespace uri
          */
+        @Override
         public void startPrefixMapping(String prefix, String uri) {
             context.startPrefixMapping(prefix, uri);
         }
@@ -631,6 +640,7 @@
          *
          * @param prefix the prefix that is not mapped anymore
          */
+        @Override
         public void endPrefixMapping(String prefix) {
             context.endPrefixMapping(prefix);
         }
@@ -654,10 +664,11 @@
          * @return The project handler that handles subelements of project
          * @exception SAXParseException if the qualified name is not "project".
          */
+        @Override
         public AntHandler onStartChild(String uri, String name, String qname, Attributes attrs,
                                        AntXMLContext context) throws SAXParseException {
             if ("project".equals(name)
-                && (uri.equals("") || uri.equals(ANT_CORE_URI))) {
+                && (uri.isEmpty() || uri.equals(ANT_CORE_URI))) {
                 return ProjectHelper2.projectHandler;
             }
             if (name.equals(qname)) {
@@ -693,6 +704,7 @@
          *            encountered or if the <code>"default"</code> attribute
          *            is missing.
          */
+        @Override
         public void onStartElement(String uri, String tag, String qname, Attributes attrs,
                                    AntXMLContext context) throws SAXParseException {
             String baseDir = null;
@@ -715,14 +727,14 @@
 
             for (int i = 0; i < attrs.getLength(); i++) {
                 String attrUri = attrs.getURI(i);
-                if (attrUri != null && !attrUri.equals("") && !attrUri.equals(uri)) {
+                if (attrUri != null && !attrUri.isEmpty() && !attrUri.equals(uri)) {
                     continue; // Ignore attributes from unknown uris
                 }
                 String key = attrs.getLocalName(i);
                 String value = attrs.getValue(i);
 
                 if ("default".equals(key)) {
-                    if (value != null && !value.equals("")) {
+                    if (value != null && !value.isEmpty()) {
                         if (!context.isIgnoringProjectTag()) {
                             project.setDefault(value);
                         }
@@ -849,10 +861,11 @@
          *            <code>"extension-point"</code>
          *            or a data type definition
          */
+        @Override
         public AntHandler onStartChild(String uri, String name, String qname, Attributes attrs,
                                        AntXMLContext context) throws SAXParseException {
-            return (name.equals("target") || name.equals("extension-point"))
-                && (uri.equals("") || uri.equals(ANT_CORE_URI))
+            return ("target".equals(name) || "extension-point".equals(name))
+                && (uri.isEmpty() || uri.equals(ANT_CORE_URI))
                 ? ProjectHelper2.targetHandler : ProjectHelper2.elementHandler;
         }
     }
@@ -882,6 +895,7 @@
          * @exception SAXParseException if an unexpected attribute is encountered
          *            or if the <code>"name"</code> attribute is missing.
          */
+        @Override
         public void onStartElement(String uri, String tag, String qname, Attributes attrs,
                                    AntXMLContext context) throws SAXParseException {
             String name = null;
@@ -898,7 +912,7 @@
 
             for (int i = 0; i < attrs.getLength(); i++) {
                 String attrUri = attrs.getURI(i);
-                if (attrUri != null && !attrUri.equals("") && !attrUri.equals(uri)) {
+                if (attrUri != null && !attrUri.isEmpty() && !attrUri.equals(uri)) {
                     continue; // Ignore attributes from unknown uris
                 }
                 String key = attrs.getLocalName(i);
@@ -906,7 +920,7 @@
 
                 if ("name".equals(key)) {
                     name = value;
-                    if ("".equals(name)) {
+                    if (name.isEmpty()) {
                         throw new BuildException("name attribute must " + "not be empty");
                     }
                 } else if ("depends".equals(key)) {
@@ -916,7 +930,7 @@
                 } else if ("unless".equals(key)) {
                     target.setUnless(value);
                 } else if ("id".equals(key)) {
-                    if (value != null && !value.equals("")) {
+                    if (value != null && !value.isEmpty()) {
                         context.getProject().addReference(value, target);
                     }
                 } else if ("description".equals(key)) {
@@ -1062,6 +1076,7 @@
          * @exception SAXParseException if an error occurs when initialising
          *                              the appropriate child handler
          */
+        @Override
         public AntHandler onStartChild(String uri, String name, String qname, Attributes attrs,
                                        AntXMLContext context) throws SAXParseException {
             return ProjectHelper2.elementHandler;
@@ -1075,6 +1090,7 @@
          * @param tag The name of the element.
          * @param context The current context.
          */
+        @Override
         public void onEndElement(String uri, String tag, AntXMLContext context) {
             context.setCurrentTarget(context.getImplicitTarget());
         }
@@ -1109,6 +1125,7 @@
          * @exception SAXParseException in case of error (not thrown in
          *                              this implementation)
          */
+        @Override
         public void onStartElement(String uri, String tag, String qname, Attributes attrs,
                                    AntXMLContext context) throws SAXParseException {
             RuntimeConfigurable parentWrapper = context.currentWrapper();
@@ -1150,7 +1167,7 @@
             for (int i = 0; i < attrs.getLength(); i++) {
                 String name = attrs.getLocalName(i);
                 String attrUri = attrs.getURI(i);
-                if (attrUri != null && !attrUri.equals("") && !attrUri.equals(uri)) {
+                if (attrUri != null && !attrUri.isEmpty() && !attrUri.equals(uri)) {
                     name = attrUri + ":" + attrs.getQName(i);
                 }
                 String value = attrs.getValue(i);
@@ -1195,6 +1212,7 @@
          *
          * @see ProjectHelper#addText(Project,java.lang.Object,char[],int,int)
          */
+        @Override
         public void characters(char[] buf, int start, int count,
                                AntXMLContext context) throws SAXParseException {
             RuntimeConfigurable wrapper = context.currentWrapper();
@@ -1218,6 +1236,7 @@
          * @exception SAXParseException if an error occurs when initialising
          *                              the appropriate child handler
          */
+        @Override
         public AntHandler onStartChild(String uri, String tag, String qname, Attributes attrs,
                                        AntXMLContext context) throws SAXParseException {
             return ProjectHelper2.elementHandler;
@@ -1231,6 +1250,7 @@
          * @param tag The name of the element.
          * @param context The current context.
          */
+        @Override
         public void onEndElement(String uri, String tag, AntXMLContext context) {
             context.popWrapper();
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java ant-1.10.3/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
--- ant-1.9.10/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,10 +18,11 @@
 package org.apache.tools.ant.helper;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
+import java.nio.file.Files;
 import java.util.Locale;
 
 import org.apache.tools.ant.BuildException;
@@ -110,7 +111,7 @@
                 + "default plugin");
         }
         File bFile = (File) source;
-        FileInputStream inputStream = null;
+        InputStream inputStream = null;
         InputSource inputSource = null;
 
         this.project = project;
@@ -124,7 +125,7 @@
                 parser = new XMLReaderAdapter(JAXPUtils.getXMLReader());
             }
             String uri = FILE_UTILS.toURI(bFile.getAbsolutePath());
-            inputStream = new FileInputStream(bFile);
+            inputStream = Files.newInputStream(bFile.toPath());
             inputSource = new InputSource(inputStream);
             inputSource.setSystemId(uri);
             project.log("parsing buildfile " + bFile + " with URI = " + uri, Project.MSG_VERBOSE);
@@ -302,10 +303,10 @@
                             + "' for compliance with other XML tools", Project.MSG_WARN);
                 }
                 try {
-                    InputSource inputSource = new InputSource(new FileInputStream(file));
+                    InputSource inputSource = new InputSource(Files.newInputStream(file.toPath()));
                     inputSource.setSystemId(FILE_UTILS.toURI(file.getAbsolutePath()));
                     return inputSource;
-                } catch (FileNotFoundException fne) {
+                } catch (IOException fne) {
                     helperImpl.project.log(file.getAbsolutePath() + " could not be found",
                             Project.MSG_WARN);
                 }
@@ -403,7 +404,7 @@
                 }
             }
 
-            if (def != null && !def.equals("")) {
+            if (def != null && !def.isEmpty()) {
                 helperImpl.project.setDefault(def);
             } else {
                 throw new BuildException("The default attribute is required");
@@ -526,7 +527,7 @@
 
                 if ("name".equals(key)) {
                     name = value;
-                    if (name.equals("")) {
+                    if (name.isEmpty()) {
                         throw new BuildException("name attribute must not" + " be empty",
                                 new Location(helperImpl.locator));
                     }
@@ -562,7 +563,7 @@
             target.setDescription(description);
             helperImpl.project.addTarget(name, target);
 
-            if (id != null && !id.equals("")) {
+            if (id != null && !id.isEmpty()) {
                 helperImpl.project.addReference(id, target);
             }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/input/MultipleChoiceInputRequest.java ant-1.10.3/src/main/org/apache/tools/ant/input/MultipleChoiceInputRequest.java
--- ant-1.9.10/src/main/org/apache/tools/ant/input/MultipleChoiceInputRequest.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/input/MultipleChoiceInputRequest.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,6 +18,7 @@
 
 package org.apache.tools.ant.input;
 
+import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.Vector;
 
@@ -33,26 +34,39 @@
      * @param prompt The prompt to show to the user.  Must not be null.
      * @param choices holds all input values that are allowed.
      *                Must not be null.
+     * @deprecated Use {@link #MultipleChoiceInputRequest(String,Collection)} instead
      */
+    @Deprecated
     public MultipleChoiceInputRequest(String prompt, Vector<String> choices) {
+        this(prompt, (Collection<String>) choices);
+    }
+
+    /**
+     * @param prompt The prompt to show to the user.  Must not be null.
+     * @param choices holds all input values that are allowed.
+     *                Must not be null.
+     */
+    public MultipleChoiceInputRequest(String prompt, Collection<String> choices) {
         super(prompt);
         if (choices == null) {
             throw new IllegalArgumentException("choices must not be null");
         }
-        this.choices = new LinkedHashSet<String>(choices);
+        this.choices = new LinkedHashSet<>(choices);
     }
 
     /**
      * @return The possible values.
      */
     public Vector<String> getChoices() {
-        return new Vector<String>(choices);
+        return new Vector<>(choices);
     }
 
     /**
      * @return true if the input is one of the allowed values.
      */
+    @Override
     public boolean isInputValid() {
-        return choices.contains(getInput()) || ("".equals(getInput()) && getDefaultValue() != null);
+        return choices.contains(getInput())
+            || ("".equals(getInput()) && getDefaultValue() != null);
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java ant-1.10.3/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java
--- ant-1.9.10/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/input/PropertyFileInputHandler.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,8 +18,9 @@
 
 package org.apache.tools.ant.input;
 
-import java.io.FileInputStream;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.Properties;
 
 import org.apache.tools.ant.BuildException;
@@ -82,7 +83,7 @@
             props = new Properties();
 
             try {
-                props.load(new FileInputStream(propsFile));
+                props.load(Files.newInputStream(Paths.get(propsFile)));
             } catch (IOException e) {
                 throw new BuildException("Couldn't load " + propsFile, e);
             }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/IntrospectionHelper.java ant-1.10.3/src/main/org/apache/tools/ant/IntrospectionHelper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/IntrospectionHelper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/IntrospectionHelper.java	2018-03-24 12:37:12.000000000 +0000
@@ -63,7 +63,7 @@
     /**
      * Helper instances we've already created (Class.getName() to IntrospectionHelper).
      */
-    private static final Map<String, IntrospectionHelper> HELPERS = new Hashtable<String, IntrospectionHelper>();
+    private static final Map<String, IntrospectionHelper> HELPERS = new Hashtable<>();
 
     /**
      * Map from primitive types to wrapper classes for use in
@@ -71,7 +71,7 @@
      * and boolean are in here even though they get special treatment
      * - this way we only need to test for the wrapper class.
      */
-    private static final Map<Class<?>, Class<?>> PRIMITIVE_TYPE_MAP = new HashMap<Class<?>, Class<?>>(8);
+    private static final Map<Class<?>, Class<?>> PRIMITIVE_TYPE_MAP = new HashMap<>(8);
 
     // Set up PRIMITIVE_TYPE_MAP
     static {
@@ -91,30 +91,30 @@
      * Map from attribute names to attribute types
      * (String to Class).
      */
-    private final Hashtable<String, Class<?>> attributeTypes = new Hashtable<String, Class<?>>();
+    private final Map<String, Class<?>> attributeTypes = new Hashtable<>();
 
     /**
      * Map from attribute names to attribute setter methods
      * (String to AttributeSetter).
      */
-    private final Hashtable<String, AttributeSetter> attributeSetters = new Hashtable<String, AttributeSetter>();
+    private final Map<String, AttributeSetter> attributeSetters = new Hashtable<>();
 
     /**
      * Map from attribute names to nested types
      * (String to Class).
      */
-    private final Hashtable<String, Class<?>> nestedTypes = new Hashtable<String, Class<?>>();
+    private final Map<String, Class<?>> nestedTypes = new Hashtable<>();
 
     /**
      * Map from attribute names to methods to create nested types
      * (String to NestedCreator).
      */
-    private final Hashtable<String, NestedCreator> nestedCreators = new Hashtable<String, NestedCreator>();
+    private final Map<String, NestedCreator> nestedCreators = new Hashtable<>();
 
     /**
      * Vector of methods matching add[Configured](Class) pattern.
      */
-    private final List<Method> addTypeMethods = new ArrayList<Method>();
+    private final List<Method> addTypeMethods = new ArrayList<>();
 
     /**
      * The method to invoke to add PCDATA.
@@ -706,7 +706,7 @@
      * @return true if the given nested element is supported
      */
     public boolean supportsNestedElement(final String parentUri, final String elementName) {
-        if (isDynamic() || addTypeMethods.size() > 0) {
+        if (isDynamic() || !addTypeMethods.isEmpty()) {
             return true;
         }
         return supportsReflectElement(parentUri, elementName);
@@ -731,7 +731,7 @@
      */
     public boolean supportsNestedElement(final String parentUri, final String elementName,
                                          final Project project, final Object parent) {
-        if (addTypeMethods.size() > 0
+        if (!addTypeMethods.isEmpty()
             && createAddTypeCreator(project, parent, elementName) != null) {
             return true;
         }
@@ -944,7 +944,7 @@
      * @see #getAttributeMap
      */
     public Enumeration<String> getAttributes() {
-        return attributeSetters.keys();
+        return Collections.enumeration(attributeSetters.keySet());
     }
 
     /**
@@ -968,7 +968,7 @@
      * @see #getNestedElementMap
      */
     public Enumeration<String> getNestedElements() {
-        return nestedTypes.keys();
+        return Collections.enumeration(nestedTypes.keySet());
     }
 
     /**
@@ -1118,6 +1118,16 @@
                 }
             };
         }
+        // resolve relative nio paths through Project
+        if (java.nio.file.Path.class.equals(reflectedArg)) {
+            return new AttributeSetter(m, arg) {
+                @Override
+                public void set(final Project p, final Object parent, final String value) throws InvocationTargetException, IllegalAccessException {
+                    m.invoke(parent, new Object[] { p.resolveFile(value).toPath() });
+                }
+            };
+        }
+
         // resolve Resources/FileProviders as FileResources relative to Project:
         if (Resource.class.equals(reflectedArg) || FileProvider.class.equals(reflectedArg)) {
             return new AttributeSetter(m, arg) {
@@ -1533,7 +1543,7 @@
      */
     private NestedCreator createAddTypeCreator(
             final Project project, final Object parent, final String elementName) throws BuildException {
-        if (addTypeMethods.size() == 0) {
+        if (addTypeMethods.isEmpty()) {
             return null;
         }
         final ComponentHelper helper = ComponentHelper.getComponentHelper(project);
@@ -1602,7 +1612,7 @@
         for (int c = 0; c < size; ++c) {
             final Method current = addTypeMethods.get(c);
             if (current.getParameterTypes()[0].equals(argClass)) {
-                if (method.getName().equals("addConfigured")) {
+                if ("addConfigured".equals(method.getName())) {
                     // add configured replaces the add method
                     addTypeMethods.set(c, method);
                 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/launch/Launcher.java ant-1.10.3/src/main/org/apache/tools/ant/launch/Launcher.java
--- ant-1.9.10/src/main/org/apache/tools/ant/launch/Launcher.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/launch/Launcher.java	2018-03-24 12:37:12.000000000 +0000
@@ -25,9 +25,6 @@
 import java.util.List;
 import java.util.StringTokenizer;
 
-
-
-
 /**
  * This is a launcher for Ant.
  *
@@ -35,9 +32,6 @@
  */
 public class Launcher {
 
-    private Launcher() {
-    }
-
     /**
      * The Ant Home (installation) Directory property.
      * {@value}
@@ -63,11 +57,6 @@
     public static final String ANT_PRIVATELIB = "lib";
 
     /**
-     * launch diagnostics flag; for debugging trouble at launch time.
-     */
-    public boolean launchDiag = false;
-
-    /**
      * The location of a per-user library directory.
      * <p>It's value is the concatenation of {@link #ANT_PRIVATEDIR}
      * with {@link #ANT_PRIVATELIB}, with an appropriate file separator
@@ -126,6 +115,13 @@
         }
     }
 
+    /**
+     * launch diagnostics flag; for debugging trouble at launch time.
+     */
+    public boolean launchDiag = false;
+
+    private Launcher() {
+    }
 
     /**
      * Add a CLASSPATH or -lib to lib path urls.
@@ -155,7 +151,7 @@
                 }
             }
 
-            final URL url = Locator.fileToURL(element);
+            final URL url = new URL(element.toURI().toASCIIString());
             if (launchDiag) {
                 System.out.println("adding library URL: " + url);
             }
@@ -192,44 +188,45 @@
         }
 
         if (!antHome.exists()) {
-            throw new LaunchException("Ant home is set incorrectly or "
-                + "ant could not be located (estimated value="+antHome.getAbsolutePath()+")");
+            throw new LaunchException(
+                "Ant home is set incorrectly or ant could not be located (estimated value="
+                    + antHome.getAbsolutePath() + ")");
         }
 
-        final List<String> libPaths = new ArrayList<String>();
+        final List<String> libPaths = new ArrayList<>();
         String cpString = null;
-        final List<String> argList = new ArrayList<String>();
+        final List<String> argList = new ArrayList<>();
         String[] newArgs;
         boolean  noUserLib = false;
         boolean  noClassPath = false;
 
         for (int i = 0; i < args.length; ++i) {
-            if (args[i].equals("-lib")) {
+            if ("-lib".equals(args[i])) {
                 if (i == args.length - 1) {
-                    throw new LaunchException("The -lib argument must "
-                        + "be followed by a library location");
+                    throw new LaunchException(
+                        "The -lib argument must be followed by a library location");
                 }
                 libPaths.add(args[++i]);
-            } else if (args[i].equals("-cp")) {
+            } else if ("-cp".equals(args[i])) {
                 if (i == args.length - 1) {
-                    throw new LaunchException("The -cp argument must "
-                        + "be followed by a classpath expression");
+                    throw new LaunchException(
+                        "The -cp argument must be followed by a classpath expression");
                 }
                 if (cpString != null) {
-                    throw new LaunchException("The -cp argument must "
-                        + "not be repeated");
+                    throw new LaunchException(
+                        "The -cp argument must not be repeated");
                 }
                 cpString = args[++i];
-            } else if (args[i].equals("--nouserlib") || args[i].equals("-nouserlib")) {
+            } else if ("--nouserlib".equals(args[i]) || "-nouserlib".equals(args[i])) {
                 noUserLib = true;
-            } else if (args[i].equals("--launchdiag")) {
+            } else if ("--launchdiag".equals(args[i])) {
                 launchDiag = true;
-            } else if (args[i].equals("--noclasspath") || args[i].equals("-noclasspath")) {
+            } else if ("--noclasspath".equals(args[i]) || "-noclasspath".equals(args[i])) {
                 noClassPath = true;
-            } else if (args[i].equals("-main")) {
+            } else if ("-main".equals(args[i])) {
                 if (i == args.length - 1) {
-                    throw new LaunchException("The -main argument must "
-                            + "be followed by a library location");
+                    throw new LaunchException(
+                        "The -main argument must be followed by a library location");
                 }
                 mainClassname = args[++i];
             } else {
@@ -261,8 +258,8 @@
             libURLs, userURLs, systemURLs, toolsJAR);
 
         // now update the class.path property
-        final StringBuffer baseClassPath
-            = new StringBuffer(System.getProperty(JAVA_CLASS_PATH));
+        final StringBuilder baseClassPath
+            = new StringBuilder(System.getProperty(JAVA_CLASS_PATH));
         if (baseClassPath.charAt(baseClassPath.length() - 1)
                 == File.pathSeparatorChar) {
             baseClassPath.setLength(baseClassPath.length() - 1);
@@ -277,12 +274,12 @@
 
         final URLClassLoader loader = new URLClassLoader(jars, Launcher.class.getClassLoader());
         Thread.currentThread().setContextClassLoader(loader);
-        Class<?> mainClass = null;
+        Class<? extends AntMain> mainClass = null;
         int exitCode = 0;
         Throwable thrown = null;
         try {
-            mainClass = loader.loadClass(mainClassname);
-            final AntMain main = (AntMain) mainClass.newInstance();
+            mainClass = loader.loadClass(mainClassname).asSubclass(AntMain.class);
+            final AntMain main = mainClass.newInstance();
             main.startAnt(newArgs, null, null);
         } catch (final InstantiationException ex) {
             System.err.println(
@@ -319,7 +316,7 @@
      */
     private URL[] getLibPathURLs(final String cpString, final List<String> libPaths)
         throws MalformedURLException {
-        final List<URL> libPathURLs = new ArrayList<URL>();
+        final List<URL> libPathURLs = new ArrayList<>();
 
         if (cpString != null) {
             addPath(cpString, false, libPathURLs);
@@ -388,7 +385,7 @@
             systemJars.length);
 
         if (toolsJar != null) {
-            jars[jars.length - 1] = Locator.fileToURL(toolsJar);
+            jars[jars.length - 1] = new URL(toolsJar.toURI().toASCIIString());
         }
         return jars;
     }
@@ -406,8 +403,8 @@
     }
 
     private void logPath(final String name, final File path) {
-        if(launchDiag) {
-            System.out.println(name+"= \""+path+"\"");
+        if (launchDiag) {
+            System.out.println(name + "= \"" + path + "\"");
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/launch/Locator.java ant-1.10.3/src/main/org/apache/tools/ant/launch/Locator.java
--- ant-1.9.10/src/main/org/apache/tools/ant/launch/Locator.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/launch/Locator.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,13 +19,14 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FilenameFilter;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.text.CharacterIterator;
 import java.text.StringCharacterIterator;
 import java.util.Locale;
+import java.util.stream.Stream;
 
 // CheckStyle:LineLengthCheck OFF - urls are long!
 /**
@@ -35,9 +36,9 @@
  * It is used at boot time in the launcher, and cannot make use of any of Ant's other classes.
  * <p>
  * This is a surprisingly brittle piece of code, and has had lots of bugs filed against it:
- * <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=42275">running ant off a network share can cause Ant to fail</a>,
- * <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=8031">use File.toURI().toURL().toExternalForm()</a>,
- * <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=42222">Locator implementation not encoding URI strings properly: spaces in paths</a>.
+ * <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=42275">running ant off a network share can cause Ant to fail</a>,
+ * <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=8031">use File.toURI().toURL().toExternalForm()</a>,
+ * <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=42222">Locator implementation not encoding URI strings properly: spaces in paths</a>.
  * It also breaks Eclipse 3.3 Betas:
  * <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=183283">Exception if installation path has spaces</a>.
  * <p>
@@ -59,10 +60,6 @@
     private static final int SPACE = 0x20;
     private static final int DEL = 0x7F;
 
-    /**
-     * encoding used to represent URIs
-     */
-    public static final String URI_ENCODING = "UTF-8";
     // stolen from org.apache.xerces.impl.XMLEntityManager#getUserDir()
     // of the Xerces-J team
     // which ASCII characters need to be escaped
@@ -98,11 +95,6 @@
             gAfterEscaping2[ch] = gHexChs[ch & NIBBLE_MASK];
         }
     }
-    /**
-     * Not instantiable
-     */
-    private Locator() {
-    }
 
     /**
      * Find the directory or jar file the class has been loaded from.
@@ -133,7 +125,7 @@
         if (c == null) {
             c = Locator.class.getClassLoader();
         }
-        URL url = null;
+        URL url;
         if (c == null) {
             url = ClassLoader.getSystemResource(resource);
         } else {
@@ -144,21 +136,19 @@
             try {
                 if (u.startsWith("jar:file:")) {
                     return new File(fromJarURI(u));
-                } else if (u.startsWith("file:")) {
+                }
+                if (u.startsWith("file:")) {
                     int tail = u.indexOf(resource);
                     String dirName = u.substring(0, tail);
                     return new File(fromURI(dirName));
                 }
             } catch (IllegalArgumentException e) {
                 //unable to determine the URI for reasons unknown.
-                return null;
             }
         }
         return null;
     }
 
-
-
     /**
      * Constructs a file path from a <code>file:</code> URI.
      *
@@ -167,7 +157,7 @@
      * <p>Prior to Java 1.4,<!-- TODO is JDK version actually relevant? -->
      * swallows '%' that are not followed by two characters.</p>
      *
-     * See <a href="http://www.w3.org/TR/xml11/#dt-sysid">dt-sysid</a>
+     * See <a href="https://www.w3.org/TR/xml11/#dt-sysid">dt-sysid</a>
      * which makes some mention of how
      * characters not supported by URI Reference syntax should be escaped.
      *
@@ -237,7 +227,7 @@
         if (url == null || !("file".equals(url.getProtocol()))) {
             throw new IllegalArgumentException(ERROR_NOT_FILE_URI + uri);
         }
-        StringBuffer buf = new StringBuffer(url.getHost());
+        StringBuilder buf = new StringBuilder(url.getHost());
         if (buf.length() > 0) {
             buf.insert(0, File.separatorChar).insert(0, File.separatorChar);
         }
@@ -315,11 +305,11 @@
             } else if (c >= 0x0000 && c < 0x0080) {
                 sb.write(c);
             } else { // #50543
-                byte[] bytes = String.valueOf(c).getBytes(URI_ENCODING);
+                byte[] bytes = String.valueOf(c).getBytes(StandardCharsets.UTF_8);
                 sb.write(bytes, 0, bytes.length);
             }
         }
-        return sb.toString(URI_ENCODING);
+        return sb.toString(StandardCharsets.UTF_8.name());
     }
 
     /**
@@ -327,14 +317,13 @@
      * The URI is escaped
      * @param path String to encode.
      * @return The encoded string, according to URI norms
-     * @throws UnsupportedEncodingException if UTF-8 is not available
      * @since Ant 1.7
      */
-    public static String encodeURI(String path) throws UnsupportedEncodingException {
+    public static String encodeURI(String path) {
         int i = 0;
         int len = path.length();
         int ch = 0;
-        StringBuffer sb = null;
+        StringBuilder sb = null;
         for (; i < len; i++) {
             ch = path.charAt(i);
             // if it's not an ASCII character, break here, and use UTF-8 encoding
@@ -343,7 +332,7 @@
             }
             if (gNeedEscaping[ch]) {
                 if (sb == null) {
-                    sb = new StringBuffer(path.substring(0, i));
+                    sb = new StringBuilder(path.substring(0, i));
                 }
                 sb.append('%');
                 sb.append(gAfterEscaping1[ch]);
@@ -357,17 +346,15 @@
         // we saw some non-ascii character
         if (i < len) {
             if (sb == null) {
-                sb = new StringBuffer(path.substring(0, i));
+                sb = new StringBuilder(path.substring(0, i));
             }
             // get UTF-8 bytes for the remaining sub-string
-            byte[] bytes = null;
-            byte b;
-            bytes = path.substring(i).getBytes(URI_ENCODING);
+            byte[] bytes = path.substring(i).getBytes(StandardCharsets.UTF_8);
             len = bytes.length;
 
             // for each byte
             for (i = 0; i < len; i++) {
-                b = bytes[i];
+                byte b = bytes[i];
                 // for non-ascii character: make it positive, then escape
                 if (b < 0) {
                     ch = b + BYTE_SIZE;
@@ -469,7 +456,7 @@
      */
     public static URL[] getLocationURLs(File location)
          throws MalformedURLException {
-        return getLocationURLs(location, new String[]{".jar"});
+        return getLocationURLs(location, ".jar");
     }
 
     /**
@@ -487,7 +474,7 @@
      *            formed.
      */
     public static URL[] getLocationURLs(File location,
-                                        final String[] extensions)
+                                        final String... extensions)
          throws MalformedURLException {
         URL[] urls = new URL[0];
 
@@ -506,22 +493,21 @@
             }
             return urls;
         }
-        File[] matches = location.listFiles(
-            new FilenameFilter() {
-                public boolean accept(File dir, String name) {
-                    String littleName = name.toLowerCase(Locale.ENGLISH);
-                    for (int i = 0; i < extensions.length; ++i) {
-                        if (littleName.endsWith(extensions[i])) {
-                            return true;
-                        }
-                    }
-                    return false;
-                }
-            });
+        File[] matches = location.listFiles((dir, name) -> {
+            String littleName = name.toLowerCase(Locale.ENGLISH);
+            return Stream.of(extensions).anyMatch(x -> littleName.endsWith(x));
+        });
         urls = new URL[matches.length];
         for (int i = 0; i < matches.length; ++i) {
             urls[i] = fileToURL(matches[i]);
         }
         return urls;
     }
+
+    /**
+     * Not instantiable
+     */
+    private Locator() {
+    }
+
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java ant-1.10.3/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java
--- ant-1.9.10/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,10 +17,11 @@
  */
 package org.apache.tools.ant.listener;
 
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.Properties;
 
 import org.apache.tools.ant.DefaultLogger;
@@ -162,7 +163,7 @@
             Properties prop = new Properties();
 
             if (userColorFile != null) {
-                in = new FileInputStream(userColorFile);
+                in = Files.newInputStream(Paths.get(userColorFile));
             } else {
                 in = getClass().getResourceAsStream(systemColorFile);
             }
@@ -212,7 +213,7 @@
                 colorsSet = true;
             }
 
-            final StringBuffer msg = new StringBuffer(message);
+            final StringBuilder msg = new StringBuilder(message);
             switch (priority) {
                 case Project.MSG_ERR:
                     msg.insert(0, errColor);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java ant-1.10.3/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java
--- ant-1.9.10/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java	2018-03-24 12:37:12.000000000 +0000
@@ -102,6 +102,7 @@
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void buildStarted(final BuildEvent event) {
         final Log log = getLog(PROJECT_LOG, null);
 
@@ -111,6 +112,7 @@
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void buildFinished(final BuildEvent event) {
         if (initialized) {
             final Log log = getLog(PROJECT_LOG, event.getProject().getName());
@@ -128,6 +130,7 @@
      * @see BuildListener#targetStarted
      * {@inheritDoc}.
      */
+    @Override
     public void targetStarted(final BuildEvent event) {
         if (initialized) {
             final Log log = getLog(TARGET_LOG,
@@ -143,6 +146,7 @@
      * @see BuildListener#targetFinished
      * {@inheritDoc}.
      */
+    @Override
     public void targetFinished(final BuildEvent event) {
         if (initialized) {
             final String targetName = event.getTarget().getName();
@@ -162,6 +166,7 @@
      * @see BuildListener#taskStarted
      * {@inheritDoc}.
      */
+    @Override
     public void taskStarted(final BuildEvent event) {
         if (initialized) {
             final Task task = event.getTask();
@@ -184,6 +189,7 @@
      * @see BuildListener#taskFinished
      * {@inheritDoc}.
      */
+    @Override
     public void taskFinished(final BuildEvent event) {
         if (initialized) {
             final Task task = event.getTask();
@@ -213,16 +219,16 @@
      * @see BuildListener#messageLogged
      * {@inheritDoc}.
      */
+    @Override
     public void messageLogged(final BuildEvent event) {
         if (initialized) {
             Object categoryObject = event.getTask();
-            String categoryString = null;
+            String categoryString;
             String categoryDetail = null;
 
             if (categoryObject == null) {
                 categoryObject = event.getTarget();
                 if (categoryObject == null) {
-                    categoryObject = event.getProject();
                     categoryString = PROJECT_LOG;
                     categoryDetail = event.getProject().getName();
                 } else {
@@ -298,6 +304,7 @@
      * This is not used, the logger config is used instead.
      * @param level ignored
      */
+    @Override
     public void setMessageOutputLevel(final int level) {
         // Use the logger config
     }
@@ -306,6 +313,7 @@
      * Set the output print stream.
      * @param output the output stream
      */
+    @Override
     public void setOutputPrintStream(final PrintStream output) {
         this.out = output;
     }
@@ -315,6 +323,7 @@
      * This is ignored.
      * @param emacsMode ignored
      */
+    @Override
     public void setEmacsMode(final boolean emacsMode) {
         // Doesn't make sense for c-l. Use the logger config
     }
@@ -323,6 +332,7 @@
      * Set the error print stream.
      * @param err the error stream
      */
+    @Override
     public void setErrorPrintStream(final PrintStream err) {
         this.err = err;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/listener/Log4jListener.java ant-1.10.3/src/main/org/apache/tools/ant/listener/Log4jListener.java
--- ant-1.9.10/src/main/org/apache/tools/ant/listener/Log4jListener.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/listener/Log4jListener.java	2018-03-24 12:37:12.000000000 +0000
@@ -51,6 +51,7 @@
      * @see BuildListener#buildStarted
      * {@inheritDoc}.
      */
+    @Override
     public void buildStarted(final BuildEvent event) {
         final Logger log = Logger.getLogger(Project.class.getName());
         log.info("Build started.");
@@ -60,6 +61,7 @@
      * @see BuildListener#buildFinished
      * {@inheritDoc}.
      */
+    @Override
     public void buildFinished(final BuildEvent event) {
         final Logger log = Logger.getLogger(Project.class.getName());
         if (event.getException() == null) {
@@ -73,6 +75,7 @@
      * @see BuildListener#targetStarted
      * {@inheritDoc}.
      */
+    @Override
     public void targetStarted(final BuildEvent event) {
         final Logger log = Logger.getLogger(Target.class.getName());
         log.info("Target \"" + event.getTarget().getName() + "\" started.");
@@ -82,6 +85,7 @@
      * @see BuildListener#targetFinished
      * {@inheritDoc}.
      */
+    @Override
     public void targetFinished(final BuildEvent event) {
         final String targetName = event.getTarget().getName();
         final Logger cat = Logger.getLogger(Target.class.getName());
@@ -97,6 +101,7 @@
      * @see BuildListener#taskStarted
      * {@inheritDoc}.
      */
+    @Override
     public void taskStarted(final BuildEvent event) {
         final Task task = event.getTask();
         final Logger log = Logger.getLogger(task.getClass().getName());
@@ -107,6 +112,7 @@
      * @see BuildListener#taskFinished
      * {@inheritDoc}.
      */
+    @Override
     public void taskFinished(final BuildEvent event) {
         final Task task = event.getTask();
         final Logger log = Logger.getLogger(task.getClass().getName());
@@ -122,7 +128,7 @@
      * @see BuildListener#messageLogged
      * {@inheritDoc}.
      */
-    /** {@inheritDoc}. */
+    @Override
     public void messageLogged(final BuildEvent event) {
         Object categoryObject = event.getTask();
         if (categoryObject == null) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/listener/MailLogger.java ant-1.10.3/src/main/org/apache/tools/ant/listener/MailLogger.java
--- ant-1.9.10/src/main/org/apache/tools/ant/listener/MailLogger.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/listener/MailLogger.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,15 +18,18 @@
 package org.apache.tools.ant.listener;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.Map;
 import java.util.Properties;
 import java.util.StringTokenizer;
 import java.util.Vector;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.BuildException;
@@ -96,21 +99,22 @@
  *
  */
 public class MailLogger extends DefaultLogger {
+    private static final String DEFAULT_MIME_TYPE = "text/plain";
+
     /** Buffer in which the message is constructed prior to sending */
     private StringBuffer buffer = new StringBuffer();
 
-    private static final String DEFAULT_MIME_TYPE = "text/plain";
-
     /**
      *  Sends an e-mail with the log results.
      *
      * @param event the build finished event
      */
+    @Override
     public void buildFinished(BuildEvent event) {
         super.buildFinished(event);
 
         Project project = event.getProject();
-        Hashtable<String, Object> properties = project.getProperties();
+        Map<String, Object> properties = project.getProperties();
 
         // overlay specified properties file (if any), which overrides project
         // settings
@@ -119,7 +123,7 @@
         if (filename != null) {
             InputStream is = null;
             try {
-                is = new FileInputStream(filename);
+                is = Files.newInputStream(Paths.get(filename));
                 fileProperties.load(is);
             } catch (IOException ioe) {
                 // ignore because properties file is not required
@@ -167,8 +171,8 @@
                 .subject(getValue(
                              properties, prefix + ".subject",
                              (success) ? "Build Success" : "Build Failure"));
-            if (values.user().equals("")
-                && values.password().equals("")
+            if (values.user().isEmpty()
+                && values.password().isEmpty()
                 && !values.ssl() && !values.starttls()) {
                 sendMail(values, buffer.substring(0));
             } else {
@@ -309,6 +313,7 @@
      *
      * @param message the message being logger
      */
+    @Override
     protected void log(String message) {
         buffer.append(message).append(StringUtils.LINE_SEP);
     }
@@ -324,7 +329,7 @@
      *      Set to null to make required.
      * @return                The value of the property, or default value.
      */
-    private String getValue(Hashtable<String, Object> properties, String name,
+    private String getValue(Map<String, Object> properties, String name,
                             String defaultValue) {
         String propertyName = "MailLogger." + name;
         String value = (String) properties.get(propertyName);
@@ -353,7 +358,7 @@
         mailMessage.setHeader("Date", DateUtils.getDateForHeader());
 
         mailMessage.from(values.from());
-        if (!values.replytoList().equals("")) {
+        if (!values.replytoList().isEmpty()) {
             StringTokenizer t = new StringTokenizer(
                 values.replytoList(), ", ", false);
             while (t.hasMoreTokens()) {
@@ -388,7 +393,7 @@
     private void sendMimeMail(Project project, Values values, String message) {
         Mailer mailer = null;
         try {
-            mailer = (Mailer) ClasspathUtils.newInstance(
+            mailer = ClasspathUtils.newInstance(
                     "org.apache.tools.ant.taskdefs.email.MimeMailer",
                     MailLogger.class.getClassLoader(), Mailer.class);
         } catch (BuildException e) {
@@ -397,7 +402,7 @@
             return;
         }
         // convert the replyTo string into a vector of emailaddresses
-        Vector<EmailAddress> replyToList = vectorizeEmailAddresses(values.replytoList());
+        Vector<EmailAddress> replyToList = splitEmailAddresses(values.replytoList());
         mailer.setHost(values.mailhost());
         mailer.setPort(values.port());
         mailer.setUser(values.user());
@@ -414,25 +419,20 @@
         mailer.setMessage(mymessage);
         mailer.setFrom(new EmailAddress(values.from()));
         mailer.setReplyToList(replyToList);
-        Vector<EmailAddress> toList = vectorizeEmailAddresses(values.toList());
+        Vector<EmailAddress> toList = splitEmailAddresses(values.toList());
         mailer.setToList(toList);
-        Vector<EmailAddress> toCcList = vectorizeEmailAddresses(values.toCcList());
+        Vector<EmailAddress> toCcList = splitEmailAddresses(values.toCcList());
         mailer.setCcList(toCcList);
-        Vector<EmailAddress> toBccList = vectorizeEmailAddresses(values.toBccList());
+        Vector<EmailAddress> toBccList = splitEmailAddresses(values.toBccList());
         mailer.setBccList(toBccList);
         mailer.setFiles(new Vector<File>());
         mailer.setSubject(values.subject());
         mailer.setHeaders(new Vector<Header>());
         mailer.send();
     }
-    private Vector<EmailAddress> vectorizeEmailAddresses(String listString) {
-        Vector<EmailAddress> emailList = new Vector<EmailAddress>();
-        StringTokenizer tokens = new StringTokenizer(listString, ",");
-        while (tokens.hasMoreTokens()) {
-            emailList.addElement(new EmailAddress(tokens.nextToken()));
-        }
-        return emailList;
+
+    private Vector<EmailAddress> splitEmailAddresses(String listString) {
+        return Stream.of(listString.split(",")).map(EmailAddress::new)
+            .collect(Collectors.toCollection(Vector::new));
     }
 }
-
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/listener/ProfileLogger.java ant-1.10.3/src/main/org/apache/tools/ant/listener/ProfileLogger.java
--- ant-1.9.10/src/main/org/apache/tools/ant/listener/ProfileLogger.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/listener/ProfileLogger.java	2018-03-24 12:37:12.000000000 +0000
@@ -32,7 +32,7 @@
  */
 public class ProfileLogger extends DefaultLogger {
 
-    private Map<Object, Date> profileData = new ConcurrentHashMap<Object, Date>();
+    private Map<Object, Date> profileData = new ConcurrentHashMap<>();
 
     /**
      * Logs a message to say that the target has started.
@@ -41,6 +41,7 @@
      *            An event with any relevant extra information. Must not be
      *            <code>null</code>.
      */
+    @Override
     public void targetStarted(BuildEvent event) {
         Date now = new Date();
         String name = "Target " + event.getTarget().getName();
@@ -55,8 +56,9 @@
      *            An event with any relevant extra information. Must not be
      *            <code>null</code>.
      */
+    @Override
     public void targetFinished(BuildEvent event) {
-        Date start = (Date) profileData.remove(event.getTarget());
+        Date start = profileData.remove(event.getTarget());
         String name = "Target " + event.getTarget().getName();
         logFinish(event, start, name);
     }
@@ -68,6 +70,7 @@
      *            An event with any relevant extra information. Must not be
      *            <code>null</code>.
      */
+    @Override
     public void taskStarted(BuildEvent event) {
         String name = event.getTask().getTaskName();
         Date now = new Date();
@@ -82,15 +85,16 @@
      *            An event with any relevant extra information. Must not be
      *            <code>null</code>.
      */
+    @Override
     public void taskFinished(BuildEvent event) {
-        Date start = (Date) profileData.remove(event.getTask());
+        Date start = profileData.remove(event.getTask());
         String name = event.getTask().getTaskName();
         logFinish(event, start, name);
     }
 
     private void logFinish(BuildEvent event, Date start, String name) {
         Date now = new Date();
-        String msg = null;
+        String msg;
         if (start != null) {
             long diff = now.getTime() - start.getTime();
             msg = StringUtils.LINE_SEP + name + ": finished " + now + " ("
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/listener/SimpleBigProjectLogger.java ant-1.10.3/src/main/org/apache/tools/ant/listener/SimpleBigProjectLogger.java
--- ant-1.9.10/src/main/org/apache/tools/ant/listener/SimpleBigProjectLogger.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/listener/SimpleBigProjectLogger.java	2018-03-24 12:37:12.000000000 +0000
@@ -33,14 +33,14 @@
      * @param event the event to work on
      * @return the target name -including the owning project name (if non-null)
      */
+    @Override
     protected String extractTargetName(BuildEvent event) {
         String targetName = super.extractTargetName(event);
         String projectName = extractProjectName(event);
-        if (projectName != null && targetName != null) {
-            return projectName + '.' + targetName;
-        } else {
+        if (projectName == null || targetName == null) {
             return targetName;
         }
+        return projectName + '.' + targetName;
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/listener/TimestampedLogger.java ant-1.10.3/src/main/org/apache/tools/ant/listener/TimestampedLogger.java
--- ant-1.9.10/src/main/org/apache/tools/ant/listener/TimestampedLogger.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/listener/TimestampedLogger.java	2018-03-24 12:37:12.000000000 +0000
@@ -30,13 +30,13 @@
      */
     public static final String SPACER = " - at ";
 
-
     /**
      * This is an override point: the message that indicates whether a build failed.
      * Subclasses can change/enhance the message.
      *
      * @return The classic "BUILD FAILED" plus a timestamp
      */
+    @Override
     protected String getBuildFailedMessage() {
         return super.getBuildFailedMessage() + SPACER + getTimestamp();
     }
@@ -47,6 +47,7 @@
      *
      * @return The classic "BUILD SUCCESSFUL" plus a timestamp
      */
+    @Override
     protected String getBuildSuccessfulMessage() {
         return super.getBuildSuccessfulMessage() + SPACER + getTimestamp();
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/loader/AntClassLoader2.java ant-1.10.3/src/main/org/apache/tools/ant/loader/AntClassLoader2.java
--- ant-1.9.10/src/main/org/apache/tools/ant/loader/AntClassLoader2.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/loader/AntClassLoader2.java	2018-03-24 12:37:12.000000000 +0000
@@ -25,6 +25,10 @@
  *             Just use {@link AntClassLoader} itself.
  */
 public class AntClassLoader2 extends AntClassLoader {
+    static {
+        registerAsParallelCapable();
+    }
+
     /** No args constructor. */
     public AntClassLoader2() {
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/loader/AntClassLoader5.java ant-1.10.3/src/main/org/apache/tools/ant/loader/AntClassLoader5.java
--- ant-1.9.10/src/main/org/apache/tools/ant/loader/AntClassLoader5.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/loader/AntClassLoader5.java	2018-03-24 12:37:12.000000000 +0000
@@ -27,6 +27,10 @@
  *             Just use {@link AntClassLoader} itself.
  */
 public class AntClassLoader5 extends AntClassLoader {
+    static {
+        registerAsParallelCapable();
+    }
+
     /**
      * Creates a classloader for the given project using the classpath given.
      *
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/Location.java ant-1.10.3/src/main/org/apache/tools/ant/Location.java
--- ant-1.9.10/src/main/org/apache/tools/ant/Location.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/Location.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,6 +19,7 @@
 package org.apache.tools.ant;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 import org.apache.tools.ant.util.FileUtils;
 import org.xml.sax.Locator;
@@ -131,8 +132,9 @@
      *         <code>"fileName: "</code> if only the file name is known,
      *         and the empty string for unknown locations.
      */
+    @Override
     public String toString() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
 
         if (fileName != null) {
             buf.append(fileName);
@@ -155,6 +157,7 @@
      *              as this object.
      * @since Ant 1.6.3
      */
+    @Override
     public boolean equals(Object other) {
         if (this == other) {
             return true;
@@ -173,7 +176,8 @@
      * @return a hash code value for this location.
      * @since Ant 1.6.3
      */
+    @Override
     public int hashCode() {
-        return toString().hashCode();
+        return Objects.hash(fileName, lineNumber);
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/MagicNames.java ant-1.10.3/src/main/org/apache/tools/ant/MagicNames.java
--- ant-1.9.10/src/main/org/apache/tools/ant/MagicNames.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/MagicNames.java	2018-03-24 12:37:12.000000000 +0000
@@ -56,6 +56,12 @@
     public static final String SCRIPT_REPOSITORY = "org.apache.ant.scriptrepo";
 
     /**
+     * The name of the script cache used by the script runner.
+     * Value {@value}
+     */
+    public static final String SCRIPT_CACHE = "org.apache.ant.scriptcache";
+
+    /**
      * The name of the reference to the System Class Loader.
      * Value {@value}
      **/
@@ -299,8 +305,21 @@
      * as seconds since the epoch.</p>
      *
      * Value: {@value}
-     * @since Ant 1.9.10
+     * @since Ant 1.10.2
      */
     public static final String TSTAMP_NOW = "ant.tstamp.now";
+
+    /**
+     * Magic property that can be set to contain a value for tstamp's
+     * "now" in order to make builds that use the task create
+     * reproducible results.
+     *
+     * <p>The value is expected to be in ISO time format
+     * (<i>1972-04-17T08:07</i>)</p>
+     *
+     * Value: {@value}
+     * @since Ant 1.10.2
+     */
+    public static final String TSTAMP_NOW_ISO = "ant.tstamp.now.iso";
 }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/Main.java ant-1.10.3/src/main/org/apache/tools/ant/Main.java
--- ant-1.9.10/src/main/org/apache/tools/ant/Main.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/Main.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,11 +19,11 @@
 package org.apache.tools.ant;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -87,16 +87,16 @@
     private PrintStream err = System.err;
 
     /** The build targets. */
-    private final Vector<String> targets = new Vector<String>();
+    private final Vector<String> targets = new Vector<>();
 
     /** Set of properties that can be used by tasks. */
     private final Properties definedProps = new Properties();
 
     /** Names of classes to add as listeners to project. */
-    private final Vector<String> listeners = new Vector<String>(1);
+    private final Vector<String> listeners = new Vector<>(1);
 
     /** File names of property files to load on startup. */
-    private final Vector<String> propertyFiles = new Vector<String>(1);
+    private final Vector<String> propertyFiles = new Vector<>(1);
 
     /** Indicates whether this build is to support interactive input */
     private boolean allowInput = true;
@@ -155,17 +155,9 @@
      */
     private boolean proxy = false;
 
-    private final Map<Class<?>, List<String>> extraArguments = new HashMap<Class<?>, List<String>>();
-
-    private static final GetProperty NOPROPERTIES = new GetProperty() {
-        public Object getProperty(final String aName) {
-            // No existing property takes precedence
-            return null;
-        }
-    };
-
-
+    private final Map<Class<?>, List<String>> extraArguments = new HashMap<>();
 
+    private static final GetProperty NOPROPERTIES = aName -> null;
 
     /**
      * Prints the message of the Throwable if it (the message) is not
@@ -355,10 +347,10 @@
                 try {
                     final File logFile = new File(args[i + 1]);
                     i++;
-                    // life-cycle of FileOutputStream is controlled by
+                    // life-cycle of OutputStream is controlled by
                     // logTo which becomes "out" and is closed in
                     // handleLogfile
-                    logTo = new PrintStream(new FileOutputStream(logFile)); //NOSONAR
+                    logTo = new PrintStream(Files.newOutputStream(logFile.toPath())); //NOSONAR
                     isLogFileUsed = true;
                 } catch (final IOException ioe) {
                     final String msg = "Cannot write on the specified log file. "
@@ -569,8 +561,8 @@
          */
         final String arg = args[argPos];
         String name = arg.substring(2, arg.length());
-        String value = null;
-        final int posEq = name.indexOf("=");
+        String value;
+        final int posEq = name.indexOf('=');
         if (posEq > 0) {
             value = name.substring(posEq + 1);
             name = name.substring(0, posEq);
@@ -656,9 +648,9 @@
     private void loadPropertyFiles() {
         for (final String filename : propertyFiles) {
             final Properties props = new Properties();
-            FileInputStream fis = null;
+            InputStream fis = null;
             try {
-                fis = new FileInputStream(filename);
+                fis = Files.newInputStream(Paths.get(filename));
                 props.load(fis);
             } catch (final IOException e) {
                 System.out.println("Could not load property file "
@@ -848,7 +840,7 @@
                 }
 
                 // make sure that we have a target to execute
-                if (targets.size() == 0) {
+                if (targets.isEmpty()) {
                     if (project.getDefaultTarget() != null) {
                         targets.addElement(project.getDefaultTarget());
                     }
@@ -1153,7 +1145,7 @@
      * @return the filtered targets.
      */
     private static Map<String, Target> removeDuplicateTargets(final Map<String, Target> targets) {
-        final Map<Location, Target> locationMap = new HashMap<Location, Target>();
+        final Map<Location, Target> locationMap = new HashMap<>();
         for (final Entry<String, Target> entry : targets.entrySet()) {
             final String name = entry.getKey();
             final Target target = entry.getValue();
@@ -1168,7 +1160,7 @@
                     target.getLocation(), target); // Smallest name wins
             }
         }
-        final Map<String, Target> ret = new HashMap<String, Target>();
+        final Map<String, Target> ret = new HashMap<>();
         for (final Target target : locationMap.values()) {
             ret.put(target.getName(), target);
         }
@@ -1191,15 +1183,15 @@
         final Map<String, Target> ptargets = removeDuplicateTargets(project.getTargets());
         // split the targets in top-level and sub-targets depending
         // on the presence of a description
-        final Vector<String> topNames = new Vector<String>();
-        final Vector<String> topDescriptions = new Vector<String>();
-        final Vector<Enumeration<String>> topDependencies = new Vector<Enumeration<String>>();
-        final Vector<String> subNames = new Vector<String>();
-        final Vector<Enumeration<String>> subDependencies = new Vector<Enumeration<String>>();
+        final Vector<String> topNames = new Vector<>();
+        final Vector<String> topDescriptions = new Vector<>();
+        final Vector<Enumeration<String>> topDependencies = new Vector<>();
+        final Vector<String> subNames = new Vector<>();
+        final Vector<Enumeration<String>> subDependencies = new Vector<>();
 
         for (final Target currentTarget : ptargets.values()) {
             final String targetName = currentTarget.getName();
-            if (targetName.equals("")) {
+            if ("".equals(targetName)) {
                 continue;
             }
             final String targetDescription = currentTarget.getDescription();
@@ -1227,7 +1219,7 @@
                 "Main targets:", maxLength);
         //if there were no main targets, we list all subtargets
         //as it means nothing has a description
-        if (topNames.size() == 0) {
+        if (topNames.isEmpty()) {
             printSubTargets = true;
         }
         if (printSubTargets) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/PathTokenizer.java ant-1.10.3/src/main/org/apache/tools/ant/PathTokenizer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/PathTokenizer.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/PathTokenizer.java	2018-03-24 12:37:12.000000000 +0000
@@ -127,7 +127,7 @@
         } else {
             // we are on NetWare, tokenizing is handled a little differently,
             // due to the fact that NetWare has multiple-character volume names.
-            if (token.equals(File.pathSeparator) || token.equals(":")) {
+            if (token.equals(File.pathSeparator) || ":".equals(token)) {
                 // ignore ";" and get the next token
                 token = tokenizer.nextToken().trim();
             }
@@ -138,7 +138,7 @@
 
                 // make sure we aren't going to get the path separator next
                 if (!nextToken.equals(File.pathSeparator)) {
-                    if (nextToken.equals(":")) {
+                    if (":".equals(nextToken)) {
                         if (!token.startsWith("/") && !token.startsWith("\\")
                             && !token.startsWith(".")
                             && !token.startsWith("..")) {
@@ -163,4 +163,3 @@
         return token;
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/ProjectComponent.java ant-1.10.3/src/main/org/apache/tools/ant/ProjectComponent.java
--- ant-1.9.10/src/main/org/apache/tools/ant/ProjectComponent.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/ProjectComponent.java	2018-03-24 12:37:12.000000000 +0000
@@ -32,6 +32,7 @@
      *             You should access project object via the getProject()
      *             or setProject() accessor/mutators.
      */
+    @Deprecated
     protected Project project;
 
     /**
@@ -40,6 +41,7 @@
      *             You should not be accessing this variable directly.
      *             Please use the {@link #getLocation()} method.
      */
+    @Deprecated
     protected Location location = Location.UNKNOWN_LOCATION;
 
     /**
@@ -47,6 +49,7 @@
      * @deprecated since 1.6.x.
      *             You should not be accessing this variable directly.
      */
+    @Deprecated
     protected String description;
     // CheckStyle:VisibilityModifier ON
 
@@ -160,6 +163,7 @@
      * @throws CloneNotSupportedException does not happen,
      *                                    but is declared to allow subclasses to do so.
      */
+    @Override
     public Object clone() throws CloneNotSupportedException {
         ProjectComponent pc = (ProjectComponent) super.clone();
         pc.setLocation(getLocation());
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/ProjectHelper.java ant-1.10.3/src/main/org/apache/tools/ant/ProjectHelper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/ProjectHelper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/ProjectHelper.java	2018-03-24 12:37:12.000000000 +0000
@@ -146,16 +146,12 @@
         }
     }
 
-    /** Default constructor */
-    public ProjectHelper() {
-    }
-
     // -------------------- Common properties  --------------------
     // The following properties are required by import (and other tasks
     // that read build files using ProjectHelper).
 
-    private Vector<Object> importStack = new Vector<Object>();
-    private List<String[]> extensionStack = new LinkedList<String[]>();
+    private Vector<Object> importStack = new Vector<>();
+    private List<String[]> extensionStack = new LinkedList<>();
 
     /**
      *  Import stack.
@@ -181,7 +177,7 @@
         return extensionStack;
     }
 
-    private static final ThreadLocal<String> targetPrefix = new ThreadLocal<String>();
+    private static final ThreadLocal<String> targetPrefix = new ThreadLocal<>();
 
     /**
      * The prefix to prepend to imported target names.
@@ -297,7 +293,7 @@
      * @see org.apache.tools.ant.ProjectHelperRepository#getHelpers()
      */
     public static ProjectHelper getProjectHelper() {
-        return (ProjectHelper) ProjectHelperRepository.getInstance().getHelpers().next();
+        return ProjectHelperRepository.getInstance().getHelpers().next();
     }
 
     /**
@@ -309,6 +305,7 @@
      * @return the current context class loader, or <code>null</code>
      * if the context class loader is unavailable.
      */
+    @Deprecated
     public static ClassLoader getContextClassLoader() {
         return LoaderUtils.isContextLoaderAvailable() ? LoaderUtils.getContextClassLoader() : null;
     }
@@ -331,6 +328,7 @@
      * @exception BuildException if any of the attributes can't be handled by
      *                           the target
      */
+    @Deprecated
     public static void configure(Object target, AttributeList attrs,
                                  Project project) throws BuildException {
         if (target instanceof TypeAdapter) {
@@ -434,6 +432,7 @@
      *             Use project.replaceProperties().
      * @since 1.5
      */
+    @Deprecated
      public static String replaceProperties(Project project, String value) throws BuildException {
         // needed since project properties are not accessible
          return project.replaceProperties(value);
@@ -459,6 +458,7 @@
      * @deprecated since 1.6.x.
      *             Use PropertyHelper.
      */
+    @Deprecated
      public static String replaceProperties(Project project, String value, Hashtable<String, Object> keys)
              throws BuildException {
         PropertyHelper ph = PropertyHelper.getPropertyHelper(project);
@@ -486,6 +486,7 @@
      * @exception BuildException if the string contains an opening
      *                           <code>${</code> without a closing <code>}</code>
      */
+    @Deprecated
     public static void parsePropertyString(String value, Vector<String> fragments, Vector<String> propertyRefs)
             throws BuildException {
         PropertyHelper.parsePropertyStringDefault(value, fragments, propertyRefs);
@@ -501,7 +502,7 @@
      * @return      The stringified form of the ns name
      */
     public static String genComponentName(String uri, String name) {
-        if (uri == null || uri.equals("") || uri.equals(ANT_CORE_URI)) {
+        if (uri == null || "".equals(uri) || uri.equals(ANT_CORE_URI)) {
             return name;
         }
         return uri + ":" + name;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/ProjectHelperRepository.java ant-1.10.3/src/main/org/apache/tools/ant/ProjectHelperRepository.java
--- ant-1.9.10/src/main/org/apache/tools/ant/ProjectHelperRepository.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/ProjectHelperRepository.java	2018-03-24 12:37:12.000000000 +0000
@@ -27,6 +27,7 @@
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.helper.ProjectHelper2;
 import org.apache.tools.ant.types.Resource;
@@ -53,7 +54,7 @@
     private static ProjectHelperRepository instance =
         new ProjectHelperRepository();
 
-    private List<Constructor<? extends ProjectHelper>> helpers = new ArrayList<Constructor<? extends ProjectHelper>>();
+    private List<Constructor<? extends ProjectHelper>> helpers = new ArrayList<>();
 
     private static Constructor<ProjectHelper2> PROJECTHELPER2_CONSTRUCTOR;
 
@@ -300,40 +301,15 @@
      * @return an iterator of {@link ProjectHelper}
      */
     public Iterator<ProjectHelper> getHelpers() {
-        return new ConstructingIterator(helpers.iterator());
-    }
-
-    private static class ConstructingIterator implements Iterator<ProjectHelper> {
-        private final Iterator<Constructor<? extends ProjectHelper>> nested;
-        private boolean empty = false;
-
-        ConstructingIterator(Iterator<Constructor<? extends ProjectHelper>> nested) {
-            this.nested = nested;
-        }
-
-        public boolean hasNext() {
-            return nested.hasNext() || !empty;
-        }
-
-        public ProjectHelper next() {
-            Constructor<? extends ProjectHelper> c;
-            if (nested.hasNext()) {
-                c = nested.next();
-            } else {
-                // last but not least, ant default project helper
-                empty = true;
-                c = PROJECTHELPER2_CONSTRUCTOR;
-            }
+        Stream.Builder<Constructor<? extends ProjectHelper>> b = Stream.builder();
+        helpers.forEach(b::add);
+        return b.add(PROJECTHELPER2_CONSTRUCTOR).build().map(c -> {
             try {
                 return c.newInstance();
             } catch (Exception e) {
                 throw new BuildException("Failed to invoke no-arg constructor"
-                                         + " on " + c.getName());
+                        + " on " + c.getName());
             }
-        }
-
-        public void remove() {
-            throw new UnsupportedOperationException("remove is not supported");
-        }
+        }).map(ProjectHelper.class::cast).iterator();
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/Project.java ant-1.10.3/src/main/org/apache/tools/ant/Project.java
--- ant-1.9.10/src/main/org/apache/tools/ant/Project.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/Project.java	2018-03-24 12:37:12.000000000 +0000
@@ -144,13 +144,13 @@
     private final Hashtable<String, Object> references = new AntRefTable();
 
     /** Map of id references - used for indicating broken build files */
-    private final HashMap<String, Object> idReferences = new HashMap<String, Object>();
+    private final HashMap<String, Object> idReferences = new HashMap<>();
 
     /** Name of the project's default target. */
     private String defaultTarget;
 
     /** Map from target names to targets (String to Target). */
-    private final Hashtable<String, Target> targets = new Hashtable<String, Target>();
+    private final Hashtable<String, Target> targets = new Hashtable<>();
 
     /** Set of global filters. */
     private final FilterSet globalFilterSet = new FilterSet();
@@ -193,11 +193,11 @@
 
     /** Records the latest task to be executed on a thread. */
     private final Map<Thread, Task> threadTasks
-            = Collections.synchronizedMap(new WeakHashMap<Thread, Task>());
+            = Collections.synchronizedMap(new WeakHashMap<>());
 
     /** Records the latest task to be executed on a thread group. */
     private final Map<ThreadGroup, Task> threadGroupTasks
-            = Collections.synchronizedMap(new WeakHashMap<ThreadGroup,Task>());
+            = Collections.synchronizedMap(new WeakHashMap<>());
 
     /**
      * Called to handle any input requests.
@@ -437,7 +437,7 @@
      */
     public Vector<BuildListener> getBuildListeners() {
         synchronized (listenersLock) {
-            final Vector<BuildListener> r = new Vector<BuildListener>(listeners.length);
+            final Vector<BuildListener> r = new Vector<>(listeners.length);
             for (int i = 0; i < listeners.length; i++) {
                 r.add(listeners[i]);
             }
@@ -930,8 +930,8 @@
         setPropertyInternal(MagicNames.ANT_JAVA_VERSION, javaVersion);
 
         // sanity check
-        if (!JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_1_5))  {
-            throw new BuildException("Ant cannot work on Java prior to 1.5");
+        if (!JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_1_8))  {
+            throw new BuildException("Ant cannot work on Java prior to 1.8");
         }
         log("Detected Java version: " + javaVersion + " in: "
             + System.getProperty("java.home"), MSG_VERBOSE);
@@ -1046,7 +1046,7 @@
      * @since Ant 1.8.1
      */
     public Map<String, Class<?>> getCopyOfTaskDefinitions() {
-        return new HashMap<String, Class<?>>(getTaskDefinitions());
+        return new HashMap<>(getTaskDefinitions());
     }
 
     /**
@@ -1088,7 +1088,7 @@
      * @since Ant 1.8.1
      */
     public Map<String, Class<?>> getCopyOfDataTypeDefinitions() {
-        return new HashMap<String, Class<?>>(getDataTypeDefinitions());
+        return new HashMap<>(getDataTypeDefinitions());
     }
 
     /**
@@ -1168,7 +1168,7 @@
      * @since Ant 1.8.1
      */
     public Map<String, Target> getCopyOfTargets() {
-        return new HashMap<String, Target>(targets);
+        return new HashMap<>(targets);
     }
 
     /**
@@ -1273,12 +1273,10 @@
         final Task task = getThreadTask(Thread.currentThread());
         if (task == null) {
             log(output, isWarning ? MSG_WARN : MSG_INFO);
+        } else if (isWarning) {
+            task.handleErrorOutput(output);
         } else {
-            if (isWarning) {
-                task.handleErrorOutput(output);
-            } else {
-                task.handleOutput(output);
-            }
+            task.handleOutput(output);
         }
     }
 
@@ -1297,12 +1295,11 @@
      */
     public int defaultInput(final byte[] buffer, final int offset, final int length)
         throws IOException {
-        if (defaultInputStream != null) {
-            System.out.flush();
-            return defaultInputStream.read(buffer, offset, length);
-        } else {
+        if (defaultInputStream == null) {
             throw new EOFException("No input provided for project");
         }
+        System.out.flush();
+        return defaultInputStream.read(buffer, offset, length);
     }
 
     /**
@@ -1322,9 +1319,8 @@
         final Task task = getThreadTask(Thread.currentThread());
         if (task == null) {
             return defaultInput(buffer, offset, length);
-        } else {
-            return task.handleInput(buffer, offset, length);
         }
+        return task.handleInput(buffer, offset, length);
     }
 
     /**
@@ -1342,12 +1338,10 @@
         final Task task = getThreadTask(Thread.currentThread());
         if (task == null) {
             fireMessageLogged(this, output, isError ? MSG_ERR : MSG_INFO);
+        } else if (isError) {
+            task.handleErrorFlush(output);
         } else {
-            if (isError) {
-                task.handleErrorFlush(output);
-            } else {
-                task.handleFlush(output);
-            }
+            task.handleFlush(output);
         }
     }
 
@@ -1383,7 +1377,7 @@
      */
     public void executeSortedTargets(final Vector<Target> sortedTargets)
         throws BuildException {
-        final Set<String> succeededTargets = new HashSet<String>();
+        final Set<String> succeededTargets = new HashSet<>();
         BuildException buildException = null; // first build exception
         for (final Target curtarget : sortedTargets) {
             boolean canExecute = true;
@@ -1749,9 +1743,9 @@
             return ((ProjectComponent) o).getProject();
         }
         try {
-            final Method m = o.getClass().getMethod("getProject", (Class[]) null);
-            if (Project.class == m.getReturnType()) {
-                return (Project) m.invoke(o, (Object[]) null);
+            final Method m = o.getClass().getMethod("getProject");
+            if (Project.class.equals(m.getReturnType())) {
+                return (Project) m.invoke(o);
             }
         } catch (final Exception e) {
             //too bad
@@ -1819,9 +1813,9 @@
      */
     public final Vector<Target> topoSort(final String[] roots, final Hashtable<String, Target> targetTable,
                                  final boolean returnAll) throws BuildException {
-        final Vector<Target> ret = new VectorSet<Target>();
-        final Hashtable<String, String> state = new Hashtable<String, String>();
-        final Stack<String> visiting = new Stack<String>();
+        final Vector<Target> ret = new VectorSet<>();
+        final Hashtable<String, String> state = new Hashtable<>();
+        final Stack<String> visiting = new Stack<>();
 
         // We first run a DFS based sort using each root as a starting node.
         // This creates the minimum sequence of Targets to the root node(s).
@@ -1832,7 +1826,7 @@
         // build Target.
 
         for (int i = 0; i < roots.length; i++) {
-            final String st = (state.get(roots[i]));
+            final String st = state.get(roots[i]);
             if (st == null) {
                 tsort(roots[i], targetTable, state, visiting, ret);
             } else if (st == VISITING) {
@@ -1840,7 +1834,7 @@
                     + roots[i]);
             }
         }
-        final StringBuffer buf = new StringBuffer("Build sequence for target(s)");
+        final StringBuilder buf = new StringBuilder("Build sequence for target(s)");
 
         for (int j = 0; j < roots.length; j++) {
             buf.append((j == 0) ? " `" : ", `").append(roots[j]).append('\'');
@@ -1848,7 +1842,7 @@
         buf.append(" is ").append(ret);
         log(buf.toString(), MSG_VERBOSE);
 
-        final Vector<Target> complete = (returnAll) ? ret : new Vector<Target>(ret);
+        final Vector<Target> complete = (returnAll) ? ret : new Vector<>(ret);
         for (final Enumeration<String> en = targetTable.keys(); en.hasMoreElements();) {
             final String curTarget = en.nextElement();
             final String st = state.get(curTarget);
@@ -2037,7 +2031,7 @@
      * @since Ant 1.8.1
      */
     public Map<String, Object> getCopyOfReferences() {
-        return new HashMap<String, Object>(references);
+        return new HashMap<>(references);
     }
 
     /**
@@ -2491,6 +2485,7 @@
      * @return the file resource.
      * @since Ant 1.7
      */
+    @Override
     public Resource getResource(final String name) {
         return new FileResource(getBaseDir(), name);
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/property/LocalProperties.java ant-1.10.3/src/main/org/apache/tools/ant/property/LocalProperties.java
--- ant-1.9.10/src/main/org/apache/tools/ant/property/LocalProperties.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/property/LocalProperties.java	2018-03-24 12:37:12.000000000 +0000
@@ -36,8 +36,8 @@
      * @return the localproperties.
      */
     public static synchronized LocalProperties get(Project project) {
-        LocalProperties l = (LocalProperties) project.getReference(
-            MagicNames.REFID_LOCAL_PROPERTIES);
+        LocalProperties l =
+            project.getReference(MagicNames.REFID_LOCAL_PROPERTIES);
         if (l == null) {
             l = new LocalProperties();
             project.addReference(MagicNames.REFID_LOCAL_PROPERTIES, l);
@@ -62,14 +62,11 @@
      * Get the initial value.
      * @return a new localproperties stack.
      */
+    @Override
     protected synchronized LocalPropertyStack initialValue() {
         return new LocalPropertyStack();
     }
 
-    private LocalPropertyStack current() {
-        return (LocalPropertyStack) get();
-    }
-
     // --------------------------------------------------
     //
     //  Local property adding and scoping
@@ -81,17 +78,17 @@
      * @param property the property name to add.
      */
     public void addLocal(String property) {
-        current().addLocal(property);
+        get().addLocal(property);
     }
 
     /** enter the scope */
     public void enterScope() {
-        current().enterScope();
+        get().enterScope();
     }
 
     /** exit the scope */
     public void exitScope() {
-        current().exitScope();
+        get().exitScope();
     }
 
     // --------------------------------------------------
@@ -105,7 +102,7 @@
      * To be called from the parallel thread itself.
      */
     public void copy() {
-        set(current().copy());
+        set(get().copy());
     }
 
     // --------------------------------------------------
@@ -120,8 +117,9 @@
      * @param helper the invoking PropertyHelper.
      * @return Object value.
      */
+    @Override
     public Object evaluate(String property, PropertyHelper helper) {
-        return current().evaluate(property, helper);
+        return get().evaluate(property, helper);
     }
 
     /**
@@ -131,9 +129,10 @@
      * @param propertyHelper the invoking PropertyHelper.
      * @return true if this entity 'owns' the property.
      */
+    @Override
     public boolean setNew(
         String property, Object value, PropertyHelper propertyHelper) {
-        return current().setNew(property, value, propertyHelper);
+        return get().setNew(property, value, propertyHelper);
     }
 
     /**
@@ -143,10 +142,9 @@
      * @param propertyHelper the invoking PropertyHelper.
      * @return true if this entity 'owns' the property.
      */
+    @Override
     public boolean set(
         String property, Object value, PropertyHelper propertyHelper) {
-        return current().set(property, value, propertyHelper);
+        return get().set(property, value, propertyHelper);
     }
 }
-
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/property/LocalPropertyStack.java ant-1.10.3/src/main/org/apache/tools/ant/property/LocalPropertyStack.java
--- ant-1.9.10/src/main/org/apache/tools/ant/property/LocalPropertyStack.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/property/LocalPropertyStack.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,6 +17,7 @@
  */
 package org.apache.tools.ant.property;
 
+import java.util.Deque;
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -29,7 +30,7 @@
  * @since Ant 1.8.0
  */
 public class LocalPropertyStack {
-    private final LinkedList<Map<String, Object>> stack = new LinkedList<Map<String, Object>>();
+    private final Deque<Map<String, Object>> stack = new LinkedList<>();
     private final Object LOCK = new Object();
 
     // --------------------------------------------------
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/property/NullReturn.java ant-1.10.3/src/main/org/apache/tools/ant/property/NullReturn.java
--- ant-1.9.10/src/main/org/apache/tools/ant/property/NullReturn.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/property/NullReturn.java	2018-03-24 12:37:12.000000000 +0000
@@ -32,6 +32,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toString() {
         return "null";
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/property/ParseProperties.java ant-1.10.3/src/main/org/apache/tools/ant/property/ParseProperties.java
--- ant-1.9.10/src/main/org/apache/tools/ant/property/ParseProperties.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/property/ParseProperties.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,6 +19,7 @@
 
 import java.text.ParsePosition;
 import java.util.Collection;
+import java.util.Objects;
 
 import org.apache.tools.ant.Project;
 
@@ -49,6 +50,7 @@
      * Get the project.
      * @return the current Ant project.
      */
+    @Override
     public Project getProject() {
         return project;
     }
@@ -90,7 +92,7 @@
      *         <code>null</code> if the original string is <code>null</code>.
      */
     public Object parseProperties(String value) {
-        if (value == null || "".equals(value)) {
+        if (value == null || value.isEmpty()) {
             return value;
         }
         final int len = value.length();
@@ -99,7 +101,7 @@
         if (o != null && pos.getIndex() >= len) {
             return o;
         }
-        StringBuffer sb = new StringBuffer(len * 2);
+        StringBuilder sb = new StringBuilder(len * 2);
         if (o == null) {
             sb.append(value.charAt(pos.getIndex()));
             pos.setIndex(pos.getIndex() + 1);
@@ -157,6 +159,7 @@
      * property doesn't expand to a value, the property's name is
      * returned.
      */
+    @Override
     public Object parseNextProperty(String value, ParsePosition pos) {
         final int start = pos.getIndex();
 
@@ -183,14 +186,9 @@
     }
 
     private String parsePropertyName(String value, ParsePosition pos) {
-        for (PropertyExpander propertyExpander : expanders) {
-            String propertyName = propertyExpander.parsePropertyName(value, pos, this);
-            if (propertyName == null) {
-                continue;
-            }
-            return propertyName;
-        }
-        return null;
+        return expanders.stream()
+            .map(xp -> xp.parsePropertyName(value, pos, this))
+            .filter(Objects::nonNull).findFirst().orElse(null);
     }
 
     private Object getProperty(String propertyName) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java ant-1.10.3/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java
--- ant-1.9.10/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java	2018-03-24 12:37:12.000000000 +0000
@@ -30,7 +30,7 @@
  * @since Ant 1.8.0
  */
 public class ResolvePropertyMap implements GetProperty {
-    private final Set<String> seen = new HashSet<String>();
+    private final Set<String> seen = new HashSet<>();
     private final ParseProperties parseProperties;
     private final GetProperty master;
     private Map<String, Object> map;
@@ -58,10 +58,11 @@
      * @param name name of the property.
      * @return the property value, or null for no match or for name being null.
      */
+    @Override
     public Object getProperty(String name) {
         if (seen.contains(name)) {
-            throw new BuildException(
-                "Property " + name + " was circularly " + "defined.");
+            throw new BuildException("Property %s was circularly defined.",
+                name);
         }
 
         try {
@@ -110,6 +111,7 @@
      * @param map the map to resolve properties in.
      * @deprecated since Ant 1.8.2, use the three-arg method instead.
      */
+    @Deprecated
     public void resolveAllProperties(Map<String, Object> map) {
         resolveAllProperties(map, null, false);
     }
@@ -121,6 +123,7 @@
      * will finally receive - may be null.
      * @deprecated since Ant 1.8.2, use the three-arg method instead.
      */
+    @Deprecated
     public void resolveAllProperties(Map<String, Object> map, String prefix) {
         resolveAllProperties(map, null, false);
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/PropertyHelper.java ant-1.10.3/src/main/org/apache/tools/ant/PropertyHelper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/PropertyHelper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/PropertyHelper.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,7 +17,6 @@
  */
 package org.apache.tools.ant;
 
-import java.text.ParsePosition;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -30,7 +29,6 @@
 
 import org.apache.tools.ant.property.GetProperty;
 import org.apache.tools.ant.property.NullReturn;
-import org.apache.tools.ant.property.ParseNextProperty;
 import org.apache.tools.ant.property.ParseProperties;
 import org.apache.tools.ant.property.PropertyExpander;
 
@@ -184,52 +182,41 @@
         }
     };
 
-    private static final PropertyExpander DEFAULT_EXPANDER = new PropertyExpander() {
-        public String parsePropertyName(
-            String s, ParsePosition pos, ParseNextProperty notUsed) {
+    private static final PropertyExpander DEFAULT_EXPANDER =
+        (s, pos, notUsed) -> {
             int index = pos.getIndex();
             //directly check near, triggering characters:
-            if (s.length() - index >= 3
-                    && '$' == s.charAt(index) && '{' == s.charAt(index + 1)) {
+            if (s.length() - index >= 3 && '$' == s.charAt(index)
+                && '{' == s.charAt(index + 1)) {
                 int start = index + 2;
                 //defer to String.indexOf() for protracted check:
                 int end = s.indexOf('}', start);
                 if (end < 0) {
-                    throw new BuildException("Syntax error in property: "
-                            + s.substring(index));
+                    throw new BuildException(
+                        "Syntax error in property: " + s.substring(index));
                 }
                 pos.setIndex(end + 1);
-                return start == end ? "" :  s.substring(start, end);
+                return start == end ? "" : s.substring(start, end);
             }
             return null;
-        }
-    };
+        };
 
     /** dummy */
-    private static final PropertyExpander SKIP_DOUBLE_DOLLAR
-        = new PropertyExpander() {
-            // CheckStyle:LineLengthCheck OFF see too long
-            /**
-             * {@inheritDoc}
-             * @see org.apache.tools.ant.property.PropertyExpander#parsePropertyName(java.lang.String, java.text.ParsePosition, org.apache.tools.ant.PropertyHelper)
-             */
-            // CheckStyle:LineLengthCheck ON
-            public String parsePropertyName(
-                String s, ParsePosition pos, ParseNextProperty notUsed) {
-                int index = pos.getIndex();
-                if (s.length() - index >= 2) {
-                    /* check for $$; if found, advance by one--
-                     * this expander is at the bottom of the stack
-                     * and will thus be the last consulted,
-                     * so the next thing that ParseProperties will do
-                     * is advance the parse position beyond the second $
-                     */
-                    if ('$' == s.charAt(index) && '$' == s.charAt(++index)) {
-                        pos.setIndex(index);
-                    }
+    private static final PropertyExpander SKIP_DOUBLE_DOLLAR =
+        (s, pos, notUsed) -> {
+            int index = pos.getIndex();
+            if (s.length() - index >= 2) {
+                /* check for $$; if found, advance by one--
+                 * this expander is at the bottom of the stack
+                 * and will thus be the last consulted,
+                 * so the next thing that ParseProperties will do
+                 * is advance the parse position beyond the second $
+                 */
+                if ('$' == s.charAt(index) && '$' == s.charAt(++index)) {
+                    pos.setIndex(index);
                 }
-                return null;
             }
+            return null;
         };
 
     /**
@@ -248,24 +235,24 @@
 
     private Project project;
     private PropertyHelper next;
-    private final Hashtable<Class<? extends Delegate>, List<Delegate>> delegates = new Hashtable<Class<? extends Delegate>, List<Delegate>>();
+    private final Hashtable<Class<? extends Delegate>, List<Delegate>> delegates = new Hashtable<>();
 
     /** Project properties map (usually String to String). */
-    private Hashtable<String, Object> properties = new Hashtable<String, Object>();
+    private Hashtable<String, Object> properties = new Hashtable<>();
 
     /**
      * Map of "user" properties (as created in the Ant task, for example).
      * Note that these key/value pairs are also always put into the
      * project properties, so only the project properties need to be queried.
      */
-    private Hashtable<String, Object> userProperties = new Hashtable<String, Object>();
+    private Hashtable<String, Object> userProperties = new Hashtable<>();
 
     /**
      * Map of inherited "user" properties - that are those "user"
      * properties that have been created by tasks and not been set
      * from the command line or a GUI tool.
      */
-    private Hashtable<String, Object> inheritedProperties = new Hashtable<String, Object>();
+    private Hashtable<String, Object> inheritedProperties = new Hashtable<>();
 
     /**
      * Default constructor.
@@ -360,6 +347,7 @@
      * @param next the next property helper in the chain.
      * @deprecated use the delegate mechanism instead
      */
+    @Deprecated
     public void setNext(PropertyHelper next) {
         this.next = next;
     }
@@ -375,6 +363,7 @@
      * @return the next property helper.
      * @deprecated use the delegate mechanism instead
      */
+    @Deprecated
     public PropertyHelper getNext() {
         return next;
     }
@@ -445,6 +434,7 @@
      *    has a good reason not to).
      * @deprecated PropertyHelper chaining is deprecated.
      */
+    @Deprecated
     public boolean setPropertyHook(String ns, String name,
                                    Object value,
                                    boolean inherited, boolean user,
@@ -472,6 +462,7 @@
      * @return The property, if returned by a hook, or null if none.
      * @deprecated PropertyHelper chaining is deprecated.
      */
+    @Deprecated
     public Object getPropertyHook(String ns, String name, boolean user) {
         if (getNext() != null) {
             Object o = getNext().getPropertyHook(ns, name, user);
@@ -519,6 +510,7 @@
      *                           <code>}</code>
      * @deprecated use the other mechanisms of this class instead
      */
+    @Deprecated
     public void parsePropertyString(String value, Vector<String> fragments,
                                     Vector<String> propertyRefs) throws BuildException {
         parsePropertyStringDefault(value, fragments, propertyRefs);
@@ -618,6 +610,7 @@
      * @return true if the property is set.
      * @deprecated namespaces are unnecessary.
      */
+    @Deprecated
     public boolean setProperty(String ns, String name, Object value, boolean verbose) {
         return setProperty(name, value, verbose);
     }
@@ -675,6 +668,7 @@
      * @since Ant 1.6
      * @deprecated namespaces are unnecessary.
      */
+    @Deprecated
     public void setNewProperty(String ns, String name, Object value) {
         setNewProperty(name, value);
     }
@@ -726,6 +720,7 @@
      *              Must not be <code>null</code>.
      * @deprecated namespaces are unnecessary.
      */
+    @Deprecated
     public void setUserProperty(String ns, String name, Object value) {
         setUserProperty(name, value);
     }
@@ -768,6 +763,7 @@
      *              Must not be <code>null</code>.
      * @deprecated namespaces are unnecessary.
      */
+    @Deprecated
     public void setInheritedProperty(String ns, String name, Object value) {
         setInheritedProperty(name, value);
     }
@@ -814,6 +810,7 @@
      *         or if a <code>null</code> name is provided.
      * @deprecated namespaces are unnecessary.
      */
+    @Deprecated
     public Object getProperty(String ns, String name) {
         return getProperty(name);
     }
@@ -862,6 +859,7 @@
      *         or if a <code>null</code> name is provided.
      * @deprecated namespaces are unnecessary.
      */
+    @Deprecated
     public Object getUserProperty(String ns, String name) {
         return getUserProperty(name);
     }
@@ -900,7 +898,7 @@
     public Hashtable<String, Object> getProperties() {
         //avoid concurrent modification:
         synchronized (properties) {
-            return new Hashtable<String, Object>(properties);
+            return new Hashtable<>(properties);
         }
         // There is a better way to save the context. This shouldn't
         // delegate to next, it's for backward compatibility only.
@@ -917,7 +915,7 @@
     public Hashtable<String, Object> getUserProperties() {
         //avoid concurrent modification:
         synchronized (userProperties) {
-            return new Hashtable<String, Object>(userProperties);
+            return new Hashtable<>(userProperties);
         }
     }
 
@@ -932,7 +930,7 @@
     public Hashtable<String, Object> getInheritedProperties() {
         //avoid concurrent modification:
         synchronized (inheritedProperties) {
-            return new Hashtable<String, Object>(inheritedProperties);
+            return new Hashtable<>(inheritedProperties);
         }
     }
 
@@ -982,7 +980,7 @@
         synchronized (inheritedProperties) {
             Enumeration<String> e = inheritedProperties.keys();
             while (e.hasMoreElements()) {
-                String arg = e.nextElement().toString();
+                String arg = e.nextElement();
                 if (other.getUserProperty(arg) != null) {
                     continue;
                 }
@@ -1036,7 +1034,7 @@
         int prev = 0;
         int pos;
         //search for the next instance of $ from the 'prev' position
-        while ((pos = value.indexOf("$", prev)) >= 0) {
+        while ((pos = value.indexOf('$', prev)) >= 0) {
 
             //if there was any text before this, add it as a fragment
             //TODO, this check could be modified to go if pos>prev;
@@ -1096,10 +1094,10 @@
             for (Class<? extends Delegate> key : getDelegateInterfaces(delegate)) {
                 List<Delegate> list = delegates.get(key);
                 if (list == null) {
-                    list = new ArrayList<Delegate>();
+                    list = new ArrayList<>();
                 } else {
                     //copy on write, top priority
-                    list = new ArrayList<Delegate>(list);
+                    list = new ArrayList<>(list);
                     list.remove(delegate);
                 }
                 list.add(0, delegate);
@@ -1130,7 +1128,7 @@
      * @since Ant 1.8.0
      */
     protected static Set<Class<? extends Delegate>> getDelegateInterfaces(Delegate d) {
-        final HashSet<Class<? extends Delegate>> result = new HashSet<Class<? extends Delegate>>();
+        final HashSet<Class<? extends Delegate>> result = new HashSet<>();
         Class<?> c = d.getClass();
         while (c != null) {
             Class<?>[] ifs = c.getInterfaces();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/RuntimeConfigurable.java ant-1.10.3/src/main/org/apache/tools/ant/RuntimeConfigurable.java
--- ant-1.9.10/src/main/org/apache/tools/ant/RuntimeConfigurable.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/RuntimeConfigurable.java	2018-03-24 12:37:12.000000000 +0000
@@ -25,12 +25,11 @@
 import java.util.Hashtable;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map.Entry;
+import java.util.Map;
 
 import org.apache.tools.ant.attribute.EnableAttribute;
 import org.apache.tools.ant.taskdefs.MacroDef.Attribute;
 import org.apache.tools.ant.taskdefs.MacroInstance;
-import org.apache.tools.ant.util.CollectionUtils;
 import org.xml.sax.AttributeList;
 import org.xml.sax.helpers.AttributeListImpl;
 
@@ -46,14 +45,14 @@
 
     /** Empty Hashtable. */
     private static final Hashtable<String, Object> EMPTY_HASHTABLE =
-            new Hashtable<String, Object>(0);
+            new Hashtable<>(0);
 
     /** Name of the element to configure. */
     private String elementTag = null;
 
     /** List of child element wrappers. */
     // picking ArrayList rather than List as arrayList is Serializable
-    private ArrayList<RuntimeConfigurable> children = null;
+    private List<RuntimeConfigurable> children = null;
 
     /** The element to configure. It is only used during
      * maybeConfigure.
@@ -64,6 +63,7 @@
      * XML attributes for the element.
      * @deprecated since 1.6.x
      */
+    @Deprecated
     private transient AttributeList attributes;
 
     // The following is set to true if any of the attributes are namespaced
@@ -304,17 +304,17 @@
             this.polyType = value == null ? null : value.toString();
         } else {
             if (attributeMap == null) {
-                attributeMap = new LinkedHashMap<String, Object>();
+                attributeMap = new LinkedHashMap<>();
             }
-            if (name.equalsIgnoreCase("refid") && !attributeMap.isEmpty()) {
-                LinkedHashMap<String, Object> newAttributeMap = new LinkedHashMap<String, Object>();
+            if ("refid".equalsIgnoreCase(name) && !attributeMap.isEmpty()) {
+                LinkedHashMap<String, Object> newAttributeMap = new LinkedHashMap<>();
                 newAttributeMap.put(name, value);
                 newAttributeMap.putAll(attributeMap);
                 attributeMap = newAttributeMap;
             } else {
                 attributeMap.put(name, value);
             }
-            if (name.equals("id")) {
+            if ("id".equals(name)) {
                 this.id = value == null ? null : value.toString();
             }
         }
@@ -336,7 +336,7 @@
      */
     public synchronized Hashtable<String, Object> getAttributeMap() {
         return (attributeMap == null)
-            ? EMPTY_HASHTABLE : new Hashtable<String, Object>(attributeMap);
+            ? EMPTY_HASHTABLE : new Hashtable<>(attributeMap);
     }
 
     /**
@@ -358,7 +358,7 @@
      *              Must not be <code>null</code>.
      */
     public synchronized void addChild(RuntimeConfigurable child) {
-        children = (children == null) ? new ArrayList<RuntimeConfigurable>() : children;
+        children = (children == null) ? new ArrayList<>() : children;
         children.add(child);
     }
 
@@ -380,7 +380,7 @@
      * @since Ant 1.6
      */
     public synchronized Enumeration<RuntimeConfigurable> getChildren() {
-        return (children == null) ? new CollectionUtils.EmptyEnumeration<RuntimeConfigurable>()
+        return (children == null) ? Collections.emptyEnumeration()
             : Collections.enumeration(children);
     }
 
@@ -500,7 +500,7 @@
             IntrospectionHelper.getHelper(p, target.getClass());
          ComponentHelper componentHelper = ComponentHelper.getComponentHelper(p);
         if (attributeMap != null) {
-            for (Entry<String, Object> entry : attributeMap.entrySet()) {
+            for (Map.Entry<String, Object> entry : attributeMap.entrySet()) {
                 String name = entry.getKey();
                 // skip restricted attributes such as if:set
                 AttributeComponentInformation attributeComponentInformation = isRestrictedAttribute(name, componentHelper);
@@ -512,8 +512,8 @@
                 // MacroInstance where properties are expanded for the
                 // nested sequential
                 Object attrValue;
-                if (value instanceof Evaluable) {
-                    attrValue = ((Evaluable) value).eval();
+                if (value instanceof Evaluable<?>) {
+                    attrValue = ((Evaluable<?>) value).eval();
                 } else {
                     attrValue = PropertyHelper.getPropertyHelper(p).parseProperties(value.toString());
                 }
@@ -531,7 +531,7 @@
                     ih.setAttribute(p, target, name, attrValue);
                 } catch (UnsupportedAttributeException be) {
                     // id attribute must be set externally
-                    if (name.equals("id")) {
+                    if ("id".equals(name)) {
                         // Do nothing
                     } else if (getElementTag() == null) {
                         throw be;
@@ -541,7 +541,7 @@
                             + be.getAttribute() + "\" attribute", be);
                     }
                 } catch (BuildException be) {
-                    if (name.equals("id")) {
+                    if ("id".equals(name)) {
                         // Assume that this is an not supported attribute type
                         // thrown for example by a dynamic attribute task
                         // Do nothing
@@ -593,7 +593,7 @@
 
         // Children (this is a shadow of UnknownElement#children)
         if (r.children != null) {
-            ArrayList<RuntimeConfigurable> newChildren = new ArrayList<RuntimeConfigurable>(r.children);
+            List<RuntimeConfigurable> newChildren = new ArrayList<>(r.children);
             if (children != null) {
                 newChildren.addAll(children);
             }
@@ -603,7 +603,7 @@
         // Text
         if (r.characters != null) {
             if (characters == null
-                || characters.toString().trim().length() == 0) {
+                || characters.toString().trim().isEmpty()) {
                 characters = new StringBuffer(r.characters.toString());
             }
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/Target.java ant-1.10.3/src/main/org/apache/tools/ant/Target.java
--- ant-1.9.10/src/main/org/apache/tools/ant/Target.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/Target.java	2018-03-24 12:37:12.000000000 +0000
@@ -55,7 +55,7 @@
     private List<String> dependencies = null;
 
     /** Children of this target (tasks and data types). */
-    private List<Object> children = new ArrayList<Object>();
+    private List<Object> children = new ArrayList<>();
 
     /** Since Ant 1.6.2 */
     private Location location = Location.UNKNOWN_LOCATION;
@@ -145,7 +145,7 @@
     public static List<String> parseDepends(String depends,
                                                 String targetName,
                                                 String attributeName) {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         if (depends.length() > 0) {
             StringTokenizer tok =
                 new StringTokenizer(depends, ",", true);
@@ -225,7 +225,7 @@
      * @return an array of the tasks currently within this target
      */
     public Task[] getTasks() {
-        List<Task> tasks = new ArrayList<Task>(children.size());
+        List<Task> tasks = new ArrayList<>(children.size());
         for (Object o : children) {
             if (o instanceof Task) {
                 tasks.add((Task) o);
@@ -242,7 +242,7 @@
      */
     public void addDependency(String dependency) {
         if (dependencies == null) {
-            dependencies = new ArrayList<String>(2);
+            dependencies = new ArrayList<>(2);
         }
         dependencies.add(dependency);
     }
@@ -253,8 +253,8 @@
      * @return an enumeration of the dependencies of this target (enumeration of String)
      */
     public Enumeration<String> getDependencies() {
-        return Collections
-                .enumeration(dependencies == null ? Collections.<String> emptyList() : dependencies);
+        return dependencies == null ? Collections.emptyEnumeration()
+            : Collections.enumeration(dependencies);
     }
 
     /**
@@ -284,7 +284,12 @@
      */
     public void setIf(String property) {
         ifString = property == null ? "" : property;
-        setIf(new IfStringCondition(ifString));
+        setIf(() -> {
+            PropertyHelper propertyHelper =
+                PropertyHelper.getPropertyHelper(getProject());
+            Object o = propertyHelper.parseProperties(ifString);
+            return propertyHelper.testIfCondition(o);
+        });
     }
 
     /**
@@ -332,7 +337,12 @@
      */
     public void setUnless(String property) {
         unlessString = property == null ? "" : property;
-        setUnless(new UnlessStringCondition(unlessString));
+        setUnless(() -> {
+            PropertyHelper propertyHelper =
+                PropertyHelper.getPropertyHelper(getProject());
+            Object o = propertyHelper.parseProperties(unlessString);
+            return !propertyHelper.testUnlessCondition(o);
+        });
     }
 
     /**
@@ -392,6 +402,7 @@
      * @return the name of this target, or <code>null</code> if the
      *         name has not been set yet.
      */
+    @Override
     public String toString() {
         return name;
     }
@@ -493,42 +504,4 @@
             children.set(index, o);
         }
     }
-
-    /**
-     * Condition evaluating the 'if' attribute with the PropertyHelper.
-     */
-    private class IfStringCondition implements Condition {
-
-        private String condition;
-
-        public IfStringCondition(String condition) {
-            this.condition = condition;
-        }
-
-        public boolean eval() throws BuildException {
-            PropertyHelper propertyHelper = PropertyHelper.getPropertyHelper(getProject());
-            Object o = propertyHelper.parseProperties(condition);
-            return propertyHelper.testIfCondition(o);
-        }
-
-    }
-
-    /**
-     * Condition evaluating the 'unless' attribute with the PropertyHelper.
-     */
-    private class UnlessStringCondition implements Condition {
-
-        private String condition;
-
-        public UnlessStringCondition(String condition) {
-            this.condition = condition;
-        }
-
-        public boolean eval() throws BuildException {
-            PropertyHelper propertyHelper = PropertyHelper.getPropertyHelper(getProject());
-            Object o = propertyHelper.parseProperties(condition);
-            return !propertyHelper.testUnlessCondition(o);
-        }
-
-    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/TaskAdapter.java ant-1.10.3/src/main/org/apache/tools/ant/TaskAdapter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/TaskAdapter.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/TaskAdapter.java	2018-03-24 12:37:12.000000000 +0000
@@ -81,7 +81,7 @@
             // don't have to check for interface, since then
             // taskClass would be abstract too.
             try {
-                final Method executeM = taskClass.getMethod("execute", (Class[]) null);
+                final Method executeM = taskClass.getMethod("execute");
                 // don't have to check for public, since
                 // getMethod finds public method only.
                 // don't have to check for abstract, since then
@@ -122,10 +122,10 @@
      */
     public void execute() throws BuildException {
         try {
-            Method setLocationM = proxy.getClass().getMethod(
-                "setLocation", new Class[] {Location.class});
+            Method setLocationM =
+                proxy.getClass().getMethod("setLocation", Location.class);
             if (setLocationM != null) {
-                setLocationM.invoke(proxy, new Object[] {getLocation()});
+                setLocationM.invoke(proxy, getLocation());
             }
         } catch (NoSuchMethodException e) {
             // ignore this if the class being used as a task does not have
@@ -137,10 +137,10 @@
         }
 
         try {
-            Method setProjectM = proxy.getClass().getMethod(
-                "setProject", new Class[] {Project.class});
+            Method setProjectM =
+                proxy.getClass().getMethod("setProject", Project.class);
             if (setProjectM != null) {
-                setProjectM.invoke(proxy, new Object[] {getProject()});
+                setProjectM.invoke(proxy, getProject());
             }
         } catch (NoSuchMethodException e) {
             // ignore this if the class being used as a task does not have
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/TaskConfigurationChecker.java ant-1.10.3/src/main/org/apache/tools/ant/TaskConfigurationChecker.java
--- ant-1.9.10/src/main/org/apache/tools/ant/TaskConfigurationChecker.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/TaskConfigurationChecker.java	2018-03-24 12:37:12.000000000 +0000
@@ -55,7 +55,7 @@
 public class TaskConfigurationChecker {
 
     /** List of all collected error messages. */
-    private List<String> errors = new ArrayList<String>();
+    private List<String> errors = new ArrayList<>();
 
     /** Task for which the configuration should be checked. */
     private final Task task;
@@ -94,8 +94,7 @@
      */
     public void checkErrors() throws BuildException {
         if (!errors.isEmpty()) {
-            StringBuffer sb = new StringBuffer();
-            sb.append("Configuration error on <");
+            StringBuilder sb = new StringBuilder("Configuration error on <");
             sb.append(task.getTaskName());
             sb.append(">:");
             sb.append(System.getProperty("line.separator"));
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,10 +20,10 @@
 
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
@@ -56,10 +56,10 @@
 
     private Commandline cmd = new Commandline();
 
-    private ArrayList<Module> modules = new ArrayList<Module>();
+    private List<Module> modules = new ArrayList<>();
 
     /** list of Commandline children */
-    private Vector<Commandline> vecCommandlines = new Vector<Commandline>();
+    private List<Commandline> commandlines = new Vector<>();
 
     /**
      * the CVSROOT variable.
@@ -155,11 +155,6 @@
     private OutputStream outputStream;
     private OutputStream errorStream;
 
-    /** empty no-arg constructor*/
-    public AbstractCvsTask() {
-        super();
-    }
-
     /**
      * sets the handler
      * @param handler a handler able of processing the output and error streams from the cvs exe
@@ -207,8 +202,7 @@
                 try {
                     setOutputStream(new PrintStream(
                                         new BufferedOutputStream(
-                                            new FileOutputStream(output
-                                                                 .getPath(),
+                                            FileUtils.newOutputStream(Paths.get(output.getPath()),
                                                                  append))));
                 } catch (IOException e) {
                     throw new BuildException(e, getLocation());
@@ -247,7 +241,7 @@
                 try {
                     setErrorStream(new PrintStream(
                                        new BufferedOutputStream(
-                                           new FileOutputStream(error.getPath(),
+                                           FileUtils.newOutputStream(Paths.get(error.getPath()),
                                                                 append))));
                 } catch (IOException e) {
                     throw new BuildException(e, getLocation());
@@ -392,11 +386,12 @@
      * @throws BuildException if failonerror is set to true and the
      * cvs command fails.
      */
+    @Override
     public void execute() throws BuildException {
 
         String savedCommand = getCommand();
 
-        if (this.getCommand() == null && vecCommandlines.size() == 0) {
+        if (this.getCommand() == null && commandlines.isEmpty()) {
             // re-implement legacy behaviour:
             this.setCommand(AbstractCvsTask.DEFAULT_COMMAND);
         }
@@ -410,10 +405,7 @@
         }
 
         try {
-            final int size = vecCommandlines.size();
-            for (int i = 0; i < size; i++) {
-                this.runCommand((Commandline) vecCommandlines.elementAt(i));
-            }
+            commandlines.forEach(this::runCommand);
         } finally {
             if (cloned != null) {
                 removeCommandline(cloned);
@@ -428,24 +420,24 @@
 
         String cmdLine = Commandline.describeCommand(execute
                 .getCommandline());
-        StringBuffer stringBuffer = removeCvsPassword(cmdLine);
+        StringBuilder buf = removeCvsPassword(cmdLine);
 
         String newLine = StringUtils.LINE_SEP;
         String[] variableArray = execute.getEnvironment();
 
         if (variableArray != null) {
-            stringBuffer.append(newLine);
-            stringBuffer.append(newLine);
-            stringBuffer.append("environment:");
-            stringBuffer.append(newLine);
+            buf.append(newLine);
+            buf.append(newLine);
+            buf.append("environment:");
+            buf.append(newLine);
             for (int z = 0; z < variableArray.length; z++) {
-                stringBuffer.append(newLine);
-                stringBuffer.append("\t");
-                stringBuffer.append(variableArray[z]);
+                buf.append(newLine);
+                buf.append("\t");
+                buf.append(variableArray[z]);
             }
         }
 
-        return stringBuffer.toString();
+        return buf.toString();
     }
 
     /**
@@ -456,24 +448,24 @@
      * @param cmdLine the CVS command line
      * @return a StringBuffer where the password has been removed (if available)
      */
-    private StringBuffer removeCvsPassword(String cmdLine) {
-        StringBuffer stringBuffer = new StringBuffer(cmdLine);
+    private StringBuilder removeCvsPassword(String cmdLine) {
+        StringBuilder buf = new StringBuilder(cmdLine);
 
         int start = cmdLine.indexOf("-d:");
 
         if (start >= 0) {
-            int stop = cmdLine.indexOf("@", start);
-            int startproto = cmdLine.indexOf(":", start);
-            int startuser = cmdLine.indexOf(":", startproto + 1);
-            int startpass = cmdLine.indexOf(":", startuser + 1);
-            stop = cmdLine.indexOf("@", start);
+            int stop = cmdLine.indexOf('@', start);
+            int startproto = cmdLine.indexOf(':', start);
+            int startuser = cmdLine.indexOf(':', startproto + 1);
+            int startpass = cmdLine.indexOf(':', startuser + 1);
+            stop = cmdLine.indexOf('@', start);
             if (stop >= 0 && startpass > startproto && startpass < stop) {
                 for (int i = startpass + 1; i < stop; i++) {
-                    stringBuffer.replace(i, i + 1, "*");
+                    buf.replace(i, i + 1, "*");
                 }
             }
         }
-        return stringBuffer;
+        return buf;
     }
 
     /**
@@ -485,10 +477,8 @@
     public void setCvsRoot(String root) {
 
         // Check if not real cvsroot => set it to null
-        if (root != null) {
-            if (root.trim().equals("")) {
-                root = null;
-            }
+        if (root != null && root.trim().isEmpty()) {
+            root = null;
         }
 
         this.cvsRoot = root;
@@ -509,11 +499,8 @@
      * @param rsh the CVS_RSH variable
      */
     public void setCvsRsh(String rsh) {
-        // Check if not real cvsrsh => set it to null
-        if (rsh != null) {
-            if (rsh.trim().equals("")) {
-                rsh = null;
-            }
+        if (rsh != null && rsh.trim().isEmpty()) {
+            rsh = null;
         }
 
         this.cvsRsh = rsh;
@@ -542,7 +529,6 @@
      * @return the port of CVS
      */
     public int getPort() {
-
         return this.port;
     }
 
@@ -560,7 +546,6 @@
      * @return password file
      */
     public File getPassFile() {
-
         return this.passFile;
     }
 
@@ -583,7 +568,6 @@
      * @return directory where the checked out files should be placed
      */
     public File getDest() {
-
         return this.dest;
     }
 
@@ -602,7 +586,6 @@
      * @return package/module
      */
     public String getPackage() {
-
         return this.cvsPackage;
     }
     /**
@@ -620,7 +603,7 @@
      */
     public void setTag(String p) {
         // Check if not real tag => set it to null
-        if (p != null && p.trim().length() > 0) {
+        if (!(p == null || p.trim().isEmpty())) {
             tag = p;
             addCommandArgument("-r" + p);
         }
@@ -656,7 +639,7 @@
      * can understand see man cvs
      */
     public void setDate(String p) {
-        if (p != null && p.trim().length() > 0) {
+        if (!(p == null || p.trim().isEmpty())) {
             addCommandArgument("-D");
             addCommandArgument(p);
         }
@@ -702,7 +685,6 @@
         reallyquiet = q;
     }
 
-
     /**
      * If true, report only and don't change any files.
      *
@@ -801,7 +783,7 @@
      * @param c command line which should be removed
      */
     protected void removeCommandline(Commandline c) {
-        vecCommandlines.removeElement(c);
+        commandlines.remove(c);
     }
 
     /**
@@ -825,9 +807,9 @@
         }
         this.configureCommandline(c);
         if (insertAtStart) {
-            vecCommandlines.insertElementAt(c, 0);
+            commandlines.add(0, c);
         } else {
-            vecCommandlines.addElement(c);
+            commandlines.add(c);
         }
     }
 
@@ -862,13 +844,12 @@
     }
 
     protected List<Module> getModules() {
-        @SuppressWarnings("unchecked")
-        final List<Module> clone = (List<Module>) modules.clone();
-        return clone;
+        return new ArrayList<>(modules);
     }
 
     public static final class Module {
         private String name;
+
         public void setName(String s) {
             name = s;
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -37,6 +37,17 @@
  */
 
 public abstract class AbstractJarSignerTask extends Task {
+    /**
+     * error string for unit test verification: {@value}
+     */
+    public static final String ERROR_NO_SOURCE =
+        "jar must be set through jar attribute or nested filesets";
+
+    /**
+     * name of JDK program we are looking for
+     */
+    protected static final String JARSIGNER_COMMAND = "jarsigner";
+
     // CheckStyle:VisibilityModifier OFF - bc
     /**
      * The name of the jar file.
@@ -78,12 +89,7 @@
     /**
      * the filesets of the jars to sign
      */
-    protected Vector<FileSet> filesets = new Vector<FileSet>();
-    /**
-     * name of JDK program we are looking for
-     */
-    protected static final String JARSIGNER_COMMAND = "jarsigner";
-
+    protected Vector<FileSet> filesets = new Vector<>();
     // CheckStyle:VisibilityModifier ON
 
     /**
@@ -97,12 +103,6 @@
     private Environment sysProperties = new Environment();
 
     /**
-     * error string for unit test verification: {@value}
-     */
-    public static final String ERROR_NO_SOURCE = "jar must be set through jar attribute "
-            + "or nested filesets";
-
-    /**
      * Path holding all non-filesets of filesystem resources we want to sign.
      *
      * @since Ant 1.7
@@ -253,7 +253,7 @@
     private RedirectorElement createRedirector() {
         RedirectorElement result = new RedirectorElement();
         if (storepass != null) {
-            StringBuffer input = new StringBuffer(storepass).append('\n');
+            StringBuilder input = new StringBuilder(storepass).append('\n');
             if (keypass != null) {
                 input.append(keypass).append('\n');
             }
@@ -324,7 +324,6 @@
         addValue(cmd, "-J-D" + property.getContent());
     }
 
-
     /**
      * bind to a keystore if the attributes are there
      * @param cmd command to configure
@@ -373,8 +372,7 @@
      * @return a vector of FileSet instances
      */
     protected Vector<FileSet> createUnifiedSources() {
-        @SuppressWarnings("unchecked")
-        Vector<FileSet> sources = (Vector<FileSet>) filesets.clone();
+        Vector<FileSet> sources = new Vector<>(filesets);
         if (jar != null) {
             //we create a fileset with the source file.
             //this lets us combine our logic for handling output directories,
@@ -408,7 +406,7 @@
      * @since Ant 1.7
      */
     protected boolean hasResources() {
-        return path != null || filesets.size() > 0;
+        return !(path == null && filesets.isEmpty());
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Ant.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Ant.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Ant.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Ant.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,14 +19,16 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.lang.reflect.Method;
-import java.util.Enumeration;
+import java.util.HashMap;
+import java.nio.file.Files;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.Vector;
 
@@ -88,10 +90,10 @@
     private boolean inheritRefs = false;
 
     /** the properties to pass to the new project */
-    private Vector<Property> properties = new Vector<Property>();
+    private List<Property> properties = new Vector<>();
 
     /** the references to pass to the new project */
-    private Vector<Reference> references = new Vector<Reference>();
+    private List<Reference> references = new Vector<>();
 
     /** the temporary project created to run the build file */
     private Project newProject;
@@ -100,10 +102,10 @@
     private PrintStream out = null;
 
     /** the sets of properties to pass to the new project */
-    private Vector<PropertySet> propertySets = new Vector<PropertySet>();
+    private List<PropertySet> propertySets = new Vector<>();
 
     /** the targets to call on the new project */
-    private Vector<String> targets = new Vector<String>();
+    private List<String> targets = new Vector<>();
 
     /** whether the target attribute was specified **/
     private boolean targetAttributeSet = false;
@@ -165,6 +167,7 @@
     /**
      * Creates a Project instance for the project to call.
      */
+    @Override
     public void init() {
         newProject = getProject().createSubProject();
         newProject.setJavaVersionProperty();
@@ -196,18 +199,18 @@
 
         Iterator<BuildListener> iter = getBuildListeners();
         while (iter.hasNext()) {
-            newProject.addBuildListener((BuildListener) iter.next());
+            newProject.addBuildListener(iter.next());
         }
 
         if (output != null) {
-            File outfile = null;
+            File outfile;
             if (dir != null) {
                 outfile = FILE_UTILS.resolveFile(dir, output);
             } else {
                 outfile = getProject().resolveFile(output);
             }
             try {
-                out = new PrintStream(new FileOutputStream(outfile));
+                out = new PrintStream(Files.newOutputStream(outfile.toPath()));
                 DefaultLogger logger = new DefaultLogger();
                 logger.setMessageOutputLevel(Project.MSG_INFO);
                 logger.setOutputPrintStream(out);
@@ -247,6 +250,7 @@
      * @see Task#handleOutput(String)
      * @since Ant 1.5
      */
+    @Override
     public void handleOutput(String outputToHandle) {
         if (newProject != null) {
             newProject.demuxOutput(outputToHandle, false);
@@ -269,6 +273,7 @@
      * @see Task#handleInput(byte[], int, int)
      * @since Ant 1.6
      */
+    @Override
     public int handleInput(byte[] buffer, int offset, int length)
         throws IOException {
         if (newProject != null) {
@@ -285,6 +290,7 @@
      * @see Task#handleFlush(String)
      * @since Ant 1.5.2
      */
+    @Override
     public void handleFlush(String toFlush) {
         if (newProject != null) {
             newProject.demuxFlush(toFlush, false);
@@ -302,6 +308,7 @@
      * @see Task#handleErrorOutput(String)
      * @since Ant 1.5
      */
+    @Override
     public void handleErrorOutput(String errorOutputToHandle) {
         if (newProject != null) {
             newProject.demuxOutput(errorOutputToHandle, true);
@@ -318,6 +325,7 @@
      * @see Task#handleErrorFlush(String)
      * @since Ant 1.5.2
      */
+    @Override
     public void handleErrorFlush(String errorOutputToFlush) {
         if (newProject != null) {
             newProject.demuxFlush(errorOutputToFlush, true);
@@ -331,10 +339,11 @@
      * @throws BuildException if a target tries to call itself;
      * probably also if a BuildException is thrown by the new project.
      */
+    @Override
     public void execute() throws BuildException {
         File savedDir = dir;
         String savedAntFile = antFile;
-        Vector<String> locals = new VectorSet<String>(targets);
+        Vector<String> locals = new VectorSet<>(targets);
         try {
             getNewProject();
 
@@ -367,7 +376,7 @@
             antFile = file.getAbsolutePath();
 
             log("calling target(s) "
-                + ((locals.size() > 0) ? locals.toString() : "[default]")
+                + (!locals.isEmpty() ? locals.toString() : "[default]")
                 + " in build file " + antFile, Project.MSG_VERBOSE);
             newProject.setUserProperty(MagicNames.ANT_FILE, antFile);
 
@@ -378,14 +387,14 @@
                 && file.equals(getProject().resolveFile(thisAntFile))
                 && getOwningTarget() != null) {
 
-                if (getOwningTarget().getName().equals("")) {
-                    if (getTaskName().equals("antcall")) {
-                        throw new BuildException("antcall must not be used at"
-                                                 + " the top level.");
+                if ("".equals(getOwningTarget().getName())) {
+                    if ("antcall".equals(getTaskName())) {
+                        throw new BuildException(
+                            "antcall must not be used at the top level.");
                     }
-                    throw new BuildException(getTaskName() + " task at the"
-                                + " top level must not invoke"
-                                + " its own build file.");
+                    throw new BuildException(
+                        "%s task at the top level must not invoke its own build file.",
+                        getTaskName());
                 }
             }
 
@@ -396,7 +405,7 @@
                     ex, getLocation());
             }
 
-            if (locals.size() == 0) {
+            if (locals.isEmpty()) {
                 String defaultTarget = newProject.getDefaultTarget();
                 if (defaultTarget != null) {
                     locals.add(defaultTarget);
@@ -410,30 +419,25 @@
                 String owningTargetName = getOwningTarget().getName();
 
                 if (locals.contains(owningTargetName)) {
-                    throw new BuildException(getTaskName() + " task calling "
-                                             + "its own parent target.");
+                    throw new BuildException(
+                        "%s task calling its own parent target.",
+                        getTaskName());
                 }
-                boolean circular = false;
-                for (Iterator<String> it = locals.iterator();
-                     !circular && it.hasNext();) {
-                    Target other =
-                        getProject().getTargets().get(it.next());
-                    circular |= (other != null
-                                 && other.dependsOn(owningTargetName));
-                }
-                if (circular) {
-                    throw new BuildException(getTaskName()
-                                             + " task calling a target"
-                                             + " that depends on"
-                                             + " its parent target \'"
-                                             + owningTargetName
-                                             + "\'.");
+
+                final Map<String, Target> targetsMap = getProject().getTargets();
+
+                if (locals.stream().map(targetsMap::get)
+                    .filter(Objects::nonNull)
+                    .anyMatch(other -> other.dependsOn(owningTargetName))) {
+                    throw new BuildException(
+                        "%s task calling a target that depends on its parent target '%s'.",
+                        getTaskName(), owningTargetName);
                 }
             }
 
             addReferences();
 
-            if (locals.size() > 0 && !(locals.size() == 1
+            if (!locals.isEmpty() && !(locals.size() == 1
                                        && "".equals(locals.get(0)))) {
                 BuildException be = null;
                 try {
@@ -485,10 +489,10 @@
     private void overrideProperties() throws BuildException {
         // remove duplicate properties - last property wins
         // Needed for backward compatibility
-        Set<String> set = new HashSet<String>();
+        Set<String> set = new HashSet<>();
         for (int i = properties.size() - 1; i >= 0; --i) {
             Property p = properties.get(i);
-            if (p.getName() != null && !p.getName().equals("")) {
+            if (p.getName() != null && !"".equals(p.getName())) {
                 if (set.contains(p.getName())) {
                     properties.remove(i);
                 } else {
@@ -496,12 +500,9 @@
                 }
             }
         }
-        Enumeration<Property> e = properties.elements();
-        while (e.hasMoreElements()) {
-            Property p = e.nextElement();
-            p.setProject(newProject);
-            p.execute();
-        }
+        properties.stream().peek(p -> p.setProject(newProject))
+            .forEach(Property::execute);
+
         if (useNativeBasedir) {
             addAlmostAll(getProject().getInheritedProperties(),
                          PropertyType.INHERITED);
@@ -518,14 +519,13 @@
      * @throws BuildException if a reference does not have a refid.
      */
     private void addReferences() throws BuildException {
-        @SuppressWarnings("unchecked")
-        Hashtable<String, Object> thisReferences
-            = (Hashtable<String, Object>) getProject().getReferences().clone();
+        Map<String, Object> thisReferences =
+            new HashMap<>(getProject().getReferences());
         for (Reference ref : references) {
             String refid = ref.getRefId();
             if (refid == null) {
-                throw new BuildException("the refid attribute is required"
-                                         + " for reference elements");
+                throw new BuildException(
+                    "the refid attribute is required for reference elements");
             }
             if (!thisReferences.containsKey(refid)) {
                 log("Parent project doesn't contain any reference '"
@@ -545,7 +545,7 @@
         // Now add all references that are not defined in the
         // subproject, if inheritRefs is true
         if (inheritRefs) {
-            Hashtable<String, Object> newReferences = newProject.getReferences();
+            Map<String, Object> newReferences = newProject.getReferences();
             for (String key : thisReferences.keySet()) {
                 if (newReferences.containsKey(key)) {
                     continue;
@@ -577,32 +577,32 @@
         Class<?> c = orig.getClass();
         Object copy = orig;
         try {
-            Method cloneM = c.getMethod("clone", new Class[0]);
+            Method cloneM = c.getMethod("clone");
             if (cloneM != null) {
-                copy = cloneM.invoke(orig, new Object[0]);
+                copy = cloneM.invoke(orig);
                 log("Adding clone of reference " + oldKey, Project.MSG_DEBUG);
             }
         } catch (Exception e) {
             // not Clonable
         }
 
-
         if (copy instanceof ProjectComponent) {
             ((ProjectComponent) copy).setProject(newProject);
         } else {
             try {
                 Method setProjectM =
-                    c.getMethod("setProject", new Class[] {Project.class});
+                    c.getMethod("setProject", Project.class);
                 if (setProjectM != null) {
-                    setProjectM.invoke(copy, new Object[] {newProject});
+                    setProjectM.invoke(copy, newProject);
                 }
             } catch (NoSuchMethodException e) {
                 // ignore this if the class being referenced does not have
                 // a set project method.
             } catch (Exception e2) {
-                String msg = "Error setting new project instance for "
-                    + "reference with id " + oldKey;
-                throw new BuildException(msg, e2, getLocation());
+                throw new BuildException(
+                    "Error setting new project instance for "
+                        + "reference with id " + oldKey,
+                    e2, getLocation());
             }
         }
         newProject.addReference(newKey, copy);
@@ -618,29 +618,31 @@
      * user property or an inherited property).
      * @since Ant 1.8.0
      */
-    private void addAlmostAll(Hashtable<?, ?> props, PropertyType type) {
-        Enumeration<?> e = props.keys();
-        while (e.hasMoreElements()) {
-            String key = e.nextElement().toString();
+    private void addAlmostAll(Map<?, ?> props, PropertyType type) {
+        props.forEach((k, v) -> {
+            String key = k.toString();
             if (MagicNames.PROJECT_BASEDIR.equals(key)
-                || MagicNames.ANT_FILE.equals(key)) {
+                    || MagicNames.ANT_FILE.equals(key)) {
                 // basedir and ant.file get special treatment in execute()
-                continue;
+                return;
             }
-
-            String value = props.get(key).toString();
-            if (type == PropertyType.PLAIN) {
+            String value = v.toString();
+            switch (type) {
+            case PLAIN:
                 // don't re-set user properties, avoid the warning message
                 if (newProject.getProperty(key) == null) {
                     // no user property
                     newProject.setNewProperty(key, value);
                 }
-            } else if (type == PropertyType.USER) {
+                break;
+            case USER:
                 newProject.setUserProperty(key, value);
-            } else if (type == PropertyType.INHERITED) {
+                break;
+            case INHERITED:
                 newProject.setInheritedProperty(key, value);
+                break;
             }
-        }
+        });
     }
 
     /**
@@ -672,7 +674,7 @@
      * @param targetToAdd the name of the target to invoke.
      */
     public void setTarget(String targetToAdd) {
-        if (targetToAdd.equals("")) {
+        if ("".equals(targetToAdd)) {
             throw new BuildException("target attribute must not be empty");
         }
         targets.add(targetToAdd);
@@ -698,7 +700,7 @@
         Property p = new Property(true, getProject());
         p.setProject(getNewProject());
         p.setTaskName("property");
-        properties.addElement(p);
+        properties.add(p);
         return p;
     }
 
@@ -708,7 +710,7 @@
      * @param ref <code>Reference</code> to add.
      */
     public void addReference(Reference ref) {
-        references.addElement(ref);
+        references.add(ref);
     }
 
     /**
@@ -722,7 +724,7 @@
                 "nested target is incompatible with the target attribute");
         }
         String name = t.getName();
-        if (name.equals("")) {
+        if ("".equals(name)) {
             throw new BuildException("target name must not be empty");
         }
         targets.add(name);
@@ -735,7 +737,7 @@
      * @since Ant 1.6
      */
     public void addPropertyset(PropertySet ps) {
-        propertySets.addElement(ps);
+        propertySets.add(ps);
     }
 
     /**
@@ -761,14 +763,10 @@
      * Helper class that implements the nested &lt;reference&gt;
      * element of &lt;ant&gt; and &lt;antcall&gt;.
      */
+    @SuppressWarnings("deprecation")
     public static class Reference
         extends org.apache.tools.ant.types.Reference {
 
-        /** Creates a reference to be configured by Ant. */
-        public Reference() {
-            super();
-        }
-
         private String targetid = null;
 
         /**
@@ -824,10 +822,7 @@
         }
     }
 
-    private static final class PropertyType {
-        private PropertyType() {}
-        private static final PropertyType PLAIN = new PropertyType();
-        private static final PropertyType INHERITED = new PropertyType();
-        private static final PropertyType USER = new PropertyType();
+    private enum PropertyType {
+        PLAIN, INHERITED, USER
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/AntlibDefinition.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/AntlibDefinition.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/AntlibDefinition.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/AntlibDefinition.java	2018-03-24 12:37:12.000000000 +0000
@@ -44,11 +44,11 @@
      * @throws BuildException if a reserved URI is used
      */
     public void setURI(String uri) throws BuildException {
-        if (uri.equals(ProjectHelper.ANT_CORE_URI)) {
+        if (ProjectHelper.ANT_CORE_URI.equals(uri)) {
             uri = "";
         }
         if (uri.startsWith("ant:")) {
-            throw new BuildException("Attempt to use a reserved URI " + uri);
+            throw new BuildException("Attempt to use a reserved URI %s", uri);
         }
         this.uri = uri;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Antlib.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Antlib.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Antlib.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Antlib.java	2018-03-24 12:37:12.000000000 +0000
@@ -22,9 +22,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
-
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.ComponentHelper;
 import org.apache.tools.ant.Project;
@@ -94,7 +92,7 @@
             UnknownElement ue =
                 parser.parseAntlibDescriptor(project, antlibResource);
             // Check name is "antlib"
-            if (!(ue.getTag().equals(TAG))) {
+            if (!(TAG.equals(ue.getTag()))) {
                 throw new BuildException(
                     "Unexpected tag " + ue.getTag() + " expecting "
                     + TAG, ue.getLocation());
@@ -116,7 +114,7 @@
     //
     private ClassLoader classLoader;
     private String uri = "";
-    private List<Object> tasks = new ArrayList<Object>();
+    private List<Task> tasks = new ArrayList<>();
 
     /**
      * Set the class loader for this antlib.
@@ -149,6 +147,7 @@
      *
      * @param nestedTask Nested task to execute in antlib
      */
+    @Override
     public void addTask(Task nestedTask) {
         tasks.add(nestedTask);
     }
@@ -157,10 +156,12 @@
      * Execute the nested tasks, setting the classloader for
      * any tasks that derive from Definer.
      */
+    @Override
     public void execute() {
         //TODO handle tasks added via #addTask()
-        for (Iterator<Object> i = tasks.iterator(); i.hasNext();) {
-            UnknownElement ue = (UnknownElement) i.next();
+
+        for (Task task : tasks) {
+            UnknownElement ue = (UnknownElement) task;
             setLocation(ue.getLocation());
             ue.maybeConfigure();
             Object configuredObject = ue.getRealThing();
@@ -169,9 +170,9 @@
             }
             if (!(configuredObject instanceof AntlibDefinition)) {
                 throw new BuildException(
-                    "Invalid task in antlib " + ue.getTag()
-                    + " " + configuredObject.getClass() + " does not "
-                    + "extend org.apache.tools.ant.taskdefs.AntlibDefinition");
+                    "Invalid task in antlib %s %s does not extend %s",
+                    ue.getTag(), configuredObject.getClass(),
+                    AntlibDefinition.class.getName());
             }
             AntlibDefinition def = (AntlibDefinition) configuredObject;
             def.setURI(uri);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/AntStructure.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/AntStructure.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/AntStructure.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,15 +19,21 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.nio.file.Files;
 import java.util.Enumeration;
 import java.util.Hashtable;
-import java.util.Vector;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.IntrospectionHelper;
@@ -85,9 +91,9 @@
 
         PrintWriter out = null;
         try {
-            FileOutputStream fos = null;
+            OutputStream fos = null;
             try {
-                fos = new FileOutputStream(output);
+                fos = Files.newOutputStream(output.toPath());
                 out = new PrintWriter(new OutputStreamWriter(fos, "UTF8"));
             } catch (final UnsupportedEncodingException ue) {
                 FileUtils.close(fos);
@@ -121,8 +127,8 @@
             printer.printTail(out);
 
             if (out.checkError()) {
-                throw new IOException("Encountered an error writing Ant"
-                                      + " structure");
+                throw new IOException(
+                    "Encountered an error writing Ant structure");
             }
         } catch (final IOException ioe) {
             throw new BuildException("Error writing "
@@ -186,13 +192,15 @@
 
         private final Hashtable<String, String> visited = new Hashtable<String, String>();
 
+        @Override
         public void printTail(final PrintWriter out) {
             visited.clear();
         }
 
+        @Override
         public void printHead(final PrintWriter out, final Project p, final Hashtable<String, Class<?>> tasks,
                               final Hashtable<String, Class<?>> types) {
-            printHead(out, tasks.keys(), types.keys());
+            printHead(out, tasks.keySet(), types.keySet());
         }
 
 
@@ -202,36 +210,18 @@
          * <p>Basically this prints the XML declaration, defines some
          * entities and the project element.</p>
          */
-        private void printHead(final PrintWriter out, final Enumeration<String> tasks,
-                               final Enumeration<String> types) {
+        private void printHead(final PrintWriter out, final Set<String> tasks,
+                               final Set<String> types) {
             out.println("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
             out.println("<!ENTITY % boolean \"(true|false|on|off|yes|no)\">");
-            out.print("<!ENTITY % tasks \"");
-            boolean first = true;
-            while (tasks.hasMoreElements()) {
-                final String tName = tasks.nextElement();
-                if (!first) {
-                    out.print(" | ");
-                } else {
-                    first = false;
-                }
-                out.print(tName);
-            }
-            out.println("\">");
-            out.print("<!ENTITY % types \"");
-            first = true;
-            while (types.hasMoreElements()) {
-                final String typeName = types.nextElement();
-                if (!first) {
-                    out.print(" | ");
-                } else {
-                    first = false;
-                }
-                out.print(typeName);
-            }
-            out.println("\">");
 
-            out.println("");
+            out.println(tasks.stream().collect(
+                Collectors.joining(" | ", "<!ENTITY % tasks \"", "\">")));
+
+            out.println(types.stream().collect(
+                Collectors.joining(" | ", "<!ENTITY % types \"", "\">")));
+
+            out.println();
 
             out.print("<!ELEMENT project (target | extension-point | ");
             out.print(TASKS);
@@ -248,6 +238,7 @@
         /**
          * Prints the definition for the target element.
          */
+        @Override
         public void printTargetDecl(final PrintWriter out) {
             out.print("<!ELEMENT target (");
             out.print(TASKS);
@@ -281,6 +272,7 @@
         /**
          * Print the definition for a given element.
          */
+        @Override
         public void printElementDecl(final PrintWriter out, final Project p,
                                      final String name, final Class<?> element) {
 
@@ -289,7 +281,7 @@
             }
             visited.put(name, "");
 
-            IntrospectionHelper ih = null;
+            IntrospectionHelper ih;
             try {
                 ih = IntrospectionHelper.getHelper(p, element);
             } catch (final Throwable t) {
@@ -301,10 +293,10 @@
                 return;
             }
 
-            StringBuffer sb = new StringBuffer("<!ELEMENT ");
-            sb.append(name).append(" ");
+            StringBuilder sb =
+                new StringBuilder("<!ELEMENT ").append(name).append(" ");
 
-            if (org.apache.tools.ant.types.Reference.class.equals(element)) {
+            if (Reference.class.equals(element)) {
                 sb.append("EMPTY>").append(LINE_SEP);
                 sb.append("<!ATTLIST ").append(name);
                 sb.append(LINE_SEP).append("          id ID #IMPLIED");
@@ -314,40 +306,35 @@
                 return;
             }
 
-            final Vector<String> v = new Vector<String>();
+            final List<String> v = new ArrayList<>();
             if (ih.supportsCharacters()) {
-                v.addElement("#PCDATA");
+                v.add("#PCDATA");
             }
 
             if (TaskContainer.class.isAssignableFrom(element)) {
-                v.addElement(TASKS);
+                v.add(TASKS);
             }
 
             Enumeration<String> e = ih.getNestedElements();
             while (e.hasMoreElements()) {
-                v.addElement(e.nextElement());
+                v.add(e.nextElement());
             }
 
+            final Collector<CharSequence, ?, String> joinAlts =
+                Collectors.joining(" | ", "(", ")");
+
             if (v.isEmpty()) {
                 sb.append("EMPTY");
             } else {
-                sb.append("(");
-                final int count = v.size();
-                for (int i = 0; i < count; i++) {
-                    if (i != 0) {
-                        sb.append(" | ");
-                    }
-                    sb.append(v.elementAt(i));
-                }
-                sb.append(")");
-                if (count > 1 || !v.elementAt(0).equals("#PCDATA")) {
+                sb.append(v.stream().collect(joinAlts));
+                if (v.size() > 1 || !"#PCDATA".equals(v.get(0))) {
                     sb.append("*");
                 }
             }
             sb.append(">");
             out.println(sb);
 
-            sb = new StringBuffer("<!ATTLIST ");
+            sb = new StringBuilder("<!ATTLIST ");
             sb.append(name);
             sb.append(LINE_SEP).append("          id ID #IMPLIED");
 
@@ -361,29 +348,23 @@
                 sb.append(LINE_SEP).append("          ")
                     .append(attrName).append(" ");
                 final Class<?> type = ih.getAttributeType(attrName);
-                if (type.equals(java.lang.Boolean.class)
-                    || type.equals(java.lang.Boolean.TYPE)) {
+                if (type.equals(Boolean.class)
+                    || type.equals(Boolean.TYPE)) {
                     sb.append(BOOLEAN).append(" ");
                 } else if (Reference.class.isAssignableFrom(type)) {
                     sb.append("IDREF ");
                 } else if (EnumeratedAttribute.class.isAssignableFrom(type)) {
                     try {
                         final EnumeratedAttribute ea =
-                            (EnumeratedAttribute) type.newInstance();
+                            type.asSubclass(EnumeratedAttribute.class)
+                                .newInstance();
                         final String[] values = ea.getValues();
                         if (values == null
                             || values.length == 0
                             || !areNmtokens(values)) {
                             sb.append("CDATA ");
                         } else {
-                            sb.append("(");
-                            for (int i = 0; i < values.length; i++) {
-                                if (i != 0) {
-                                    sb.append(" | ");
-                                }
-                                sb.append(values[i]);
-                            }
-                            sb.append(") ");
+                            sb.append(Stream.of(values).collect(joinAlts));
                         }
                     } catch (final InstantiationException ie) {
                         sb.append("CDATA ");
@@ -392,20 +373,13 @@
                     }
                 } else if (Enum.class.isAssignableFrom(type)) {
                     try {
-                        final Object[] values = (Object[]) type.getMethod("values", (Class[])  null)
-                            .invoke(null, (Object[]) null);
+                        final Enum<?>[] values =
+                            (Enum<?>[]) type.getMethod("values").invoke(null);
                         if (values.length == 0) {
                             sb.append("CDATA ");
                         } else {
-                            sb.append('(');
-                            for (int i = 0; i < values.length; i++) {
-                                if (i != 0) {
-                                    sb.append(" | ");
-                                }
-                                sb.append(type.getMethod("name", (Class[]) null)
-                                          .invoke(values[i], (Object[]) null));
-                            }
-                            sb.append(") ");
+                            sb.append(Stream.of(values).map(Enum::name)
+                                .collect(joinAlts));
                         }
                     } catch (final Exception x) {
                         sb.append("CDATA ");
@@ -418,9 +392,7 @@
             sb.append(">").append(LINE_SEP);
             out.println(sb);
 
-            final int count = v.size();
-            for (int i = 0; i < count; i++) {
-                final String nestedName = v.elementAt(i);
+            for (String nestedName : v) {
                 if (!"#PCDATA".equals(nestedName)
                     && !TASKS.equals(nestedName)
                     && !TYPES.equals(nestedName)) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Apt.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Apt.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Apt.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Apt.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,270 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (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
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-package org.apache.tools.ant.taskdefs;
-
-import java.io.File;
-import java.util.Vector;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.compilers.AptExternalCompilerAdapter;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.Reference;
-import org.apache.tools.ant.util.JavaEnvUtils;
-
-/**
- * Apt Task for running the Annotation processing tool for JDK 1.5.  It derives
- * from the existing Javac task, and forces the compiler based on whether we're
- * executing internally, or externally.
- *
- * @since Ant 1.7
- */
-
-
-public class Apt
-        extends Javac {
-    private boolean compile = true;
-    private String factory;
-    private Path factoryPath;
-    private Vector<Option> options = new Vector<Option>();
-    private File preprocessDir;
-    /** The name of the apt tool. */
-    public static final String EXECUTABLE_NAME = "apt";
-    /** An warning message when ignoring compiler attribute. */
-    public static final String ERROR_IGNORING_COMPILER_OPTION
-        = "Ignoring compiler attribute for the APT task, as it is fixed";
-    /** A warning message if used with java &lt; 1.5. */
-    public static final String ERROR_WRONG_JAVA_VERSION
-        = "Apt task requires Java 1.5+";
-
-    /**
-     * exposed for debug messages
-     */
-    public static final String WARNING_IGNORING_FORK =
-        "Apt only runs in its own JVM; fork=false option ignored";
-
-    /**
-     * The nested option element.
-     */
-    public static final class Option {
-        private String name;
-        private String value;
-
-        /** Constructor for Option */
-        public Option() {
-            //default
-        }
-
-        /**
-         * Get the name attribute.
-         * @return the name attribute.
-         */
-        public String getName() {
-            return name;
-        }
-
-        /**
-         * Set the name attribute.
-         * @param name the name of the option.
-         */
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        /**
-         * Get the value attribute.
-         * @return the value attribute.
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Set the value attribute.
-         * @param value the value of the option.
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-    }
-
-    /**
-     * Constructor for Apt task.
-     * This sets the apt compiler adapter as the compiler in the super class.
-     */
-    public Apt() {
-        super();
-        super.setCompiler(AptExternalCompilerAdapter.class.getName());
-        super.setFork(true);
-    }
-
-    /**
-     * Get the name of the apt executable.
-     *
-     * @return the name of the executable.
-     */
-    public String getAptExecutable() {
-        String exe = getExecutable();
-        return exe != null ? exe :
-            JavaEnvUtils.getJdkExecutable(EXECUTABLE_NAME);
-    }
-
-    /**
-     * Set the compiler.
-     * This is not allowed and a warning log message is made.
-     * @param compiler not used.
-     */
-    public void setCompiler(String compiler) {
-        log(ERROR_IGNORING_COMPILER_OPTION, Project.MSG_WARN);
-    }
-
-    /**
-     * Set the fork attribute.
-     * Non-forking APT is highly classpath dependent and appears to be too
-     * brittle to work. The sole reason this attribute is retained
-     * is the superclass does it
-     * @param fork if false; warn the option is ignored.
-     */
-    public void setFork(boolean fork) {
-        if (!fork) {
-            log(WARNING_IGNORING_FORK, Project.MSG_WARN);
-        }
-    }
-
-    /**
-     * Get the compiler class name.
-     * @return the compiler class name.
-     */
-    public String getCompiler() {
-        return super.getCompiler();
-    }
-
-    /**
-     * Get the compile option for the apt compiler.
-     * If this is false the "-nocompile" argument will be used.
-     * @return the value of the compile option.
-     */
-    public boolean isCompile() {
-        return compile;
-    }
-
-    /**
-     * Set the compile option for the apt compiler.
-     * Default value is true.
-     * @param compile if true set the compile option.
-     */
-    public void setCompile(boolean compile) {
-        this.compile = compile;
-    }
-
-    /**
-     * Get the factory option for the apt compiler.
-     * If this is non-null the "-factory" argument will be used.
-     * @return the value of the factory option.
-     */
-    public String getFactory() {
-        return factory;
-    }
-
-    /**
-     * Set the factory option for the apt compiler.
-     * Default value is null.
-     * @param factory the classname of the factory.
-     */
-    public void setFactory(String factory) {
-        this.factory = factory;
-    }
-
-    /**
-     * Add a reference to a path to the factoryPath attribute.
-     * @param ref a reference to a path.
-     */
-    public void setFactoryPathRef(Reference ref) {
-        createFactoryPath().setRefid(ref);
-    }
-
-    /**
-     * Add a path to the factoryPath attribute.
-     * @return a path to be configured.
-     */
-    public Path createFactoryPath() {
-        if (factoryPath == null) {
-            factoryPath = new Path(getProject());
-        }
-        return factoryPath.createPath();
-    }
-
-    /**
-     * Get the factory path attribute.
-     * If this is not null, the "-factorypath" argument will be used.
-     * The default value is null.
-     * @return the factory path attribute.
-     */
-    public Path getFactoryPath() {
-        return factoryPath;
-    }
-
-    /**
-     * Create a nested option.
-     * @return an option to be configured.
-     */
-    public Option createOption() {
-        Option opt = new Option();
-        options.add(opt);
-        return opt;
-    }
-
-    /**
-     * Get the options to the compiler.
-     * Each option will use '"-E" name ["=" value]' argument.
-     * @return the options.
-     */
-    public Vector<Option> getOptions() {
-        return options;
-    }
-
-    /**
-     * Get the preprocessdir attribute.
-     * This corresponds to the "-s" argument.
-     * The default value is null.
-     * @return the preprocessdir attribute.
-     */
-    public File getPreprocessDir() {
-        return preprocessDir;
-    }
-
-    /**
-     * Set the preprocessdir attribute.
-     * @param preprocessDir where to place processor generated source files.
-     */
-    public void setPreprocessDir(File preprocessDir) {
-        this.preprocessDir = preprocessDir;
-    }
-
-    /**
-     * Do the compilation.
-     * @throws BuildException on error.
-     */
-    public void execute()
-            throws BuildException {
-        if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_1_8)) {
-           throw new BuildException("apt does not exist under Java 1.8 and higher");
-        }
-        super.execute();
-    }
-}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Available.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Available.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Available.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Available.java	2018-03-24 12:37:12.000000000 +0000
@@ -193,9 +193,9 @@
      *             the type in its own class.
      * @param type the type of resource
      */
+    @Deprecated
     public void setType(String type) {
-        log("DEPRECATED - The setType(String) method has been deprecated."
-            + " Use setType(Available.FileDir) instead.",
+        log("DEPRECATED - The setType(String) method has been deprecated. Use setType(Available.FileDir) instead.",
             Project.MSG_WARN);
         this.type = new FileDir();
         this.type.setValue(type);
@@ -227,6 +227,7 @@
      *
      * @exception BuildException if the task is not configured correctly.
      */
+    @Override
     public void execute() throws BuildException {
         if (property == null) {
             throw new BuildException("property attribute is required",
@@ -261,17 +262,19 @@
      * @return boolean is the resource is available.
      * @exception BuildException if the condition is not configured correctly
      */
+    @Override
     public boolean eval() throws BuildException {
         try {
             if (classname == null && file == null && resource == null) {
-                throw new BuildException("At least one of (classname|file|"
-                                         + "resource) is required", getLocation());
+                throw new BuildException(
+                    "At least one of (classname|file|resource) is required",
+                    getLocation());
             }
             if (type != null) {
                 if (file == null) {
-                    throw new BuildException("The type attribute is only valid "
-                                             + "when specifying the file "
-                                             + "attribute.", getLocation());
+                    throw new BuildException(
+                        "The type attribute is only valid when specifying the file attribute.",
+                        getLocation());
                 }
             }
             if (classpath != null) {
@@ -284,13 +287,13 @@
             } else {
                 setTaskName("available");
             }
-            if ((classname != null) && !checkClass(classname)) {
+            if (!(classname == null || checkClass(classname))) {
                 log("Unable to load class " + classname + appendix,
                     Project.MSG_VERBOSE);
                 return false;
             }
             if ((file != null) && !checkFile()) {
-                StringBuffer buf = new StringBuffer("Unable to find ");
+                StringBuilder buf = new StringBuilder("Unable to find ");
                 if (type != null) {
                     buf.append(type).append(' ');
                 }
@@ -334,62 +337,64 @@
     private boolean checkFile() {
         if (filepath == null) {
             return checkFile(file, filename);
-        } else {
-            String[] paths = filepath.list();
-            for (int i = 0; i < paths.length; ++i) {
-                log("Searching " + paths[i], Project.MSG_VERBOSE);
-                File path = new File(paths[i]);
-
-                // **   full-pathname specified == path in list
-                // **   simple name specified   == path in list
-                if (path.exists()
-                    && (filename.equals(paths[i])
-                        || filename.equals(path.getName()))) {
-                    if (type == null) {
-                        log("Found: " + path, Project.MSG_VERBOSE);
-                        return true;
-                    } else if (type.isDir()
-                               && path.isDirectory()) {
-                        log("Found directory: " + path, Project.MSG_VERBOSE);
-                        return true;
-                    } else if (type.isFile()
-                               && path.isFile()) {
-                        log("Found file: " + path, Project.MSG_VERBOSE);
-                        return true;
-                    }
-                    // not the requested type
-                    return false;
-                }
-                File parent = path.getParentFile();
-                // **   full-pathname specified == parent dir of path in list
-                if (parent != null && parent.exists()
-                    && filename.equals(parent.getAbsolutePath())) {
-                    if (type == null) {
-                        log("Found: " + parent, Project.MSG_VERBOSE);
-                        return true;
-                    } else if (type.isDir()) {
-                        log("Found directory: " + parent, Project.MSG_VERBOSE);
-                        return true;
-                    }
-                    // not the requested type
-                    return false;
-                }
-                // **   simple name specified   == path in list + name
-                if (path.exists() && path.isDirectory()) {
-                    if (checkFile(new File(path, filename),
-                                  filename + " in " + path)) {
-                        return true;
-                    }
-                }
-
-                // **   simple name specified   == parent dir + name
-                while (searchParents && parent != null && parent.exists()) {
-                    if (checkFile(new File(parent, filename),
-                                  filename + " in " + parent)) {
-                        return true;
-                    }
-                    parent = parent.getParentFile();
+        }
+        String[] paths = filepath.list();
+        for (String p : paths) {
+            log("Searching " + p, Project.MSG_VERBOSE);
+            File path = new File(p);
+
+            // **   full-pathname specified == path in list
+            // **   simple name specified   == path in list
+            if (path.exists()
+                && (filename.equals(p)
+                    || filename.equals(path.getName()))) {
+                if (type == null) {
+                    log("Found: " + path, Project.MSG_VERBOSE);
+                    return true;
+                }
+                if (type.isDir()
+                           && path.isDirectory()) {
+                    log("Found directory: " + path, Project.MSG_VERBOSE);
+                    return true;
+                }
+                if (type.isFile()
+                           && path.isFile()) {
+                    log("Found file: " + path, Project.MSG_VERBOSE);
+                    return true;
                 }
+                // not the requested type
+                return false;
+            }
+            File parent = path.getParentFile();
+            // **   full-pathname specified == parent dir of path in list
+            if (parent != null && parent.exists()
+                && filename.equals(parent.getAbsolutePath())) {
+                if (type == null) {
+                    log("Found: " + parent, Project.MSG_VERBOSE);
+                    return true;
+                }
+                if (type.isDir()) {
+                    log("Found directory: " + parent, Project.MSG_VERBOSE);
+                    return true;
+                }
+                // not the requested type
+                return false;
+            }
+            // **   simple name specified   == path in list + name
+            if (path.exists() && path.isDirectory()) {
+                if (checkFile(new File(path, filename),
+                              filename + " in " + path)) {
+                    return true;
+                }
+            }
+
+            // **   simple name specified   == parent dir + name
+            while (searchParents && parent != null && parent.exists()) {
+                if (checkFile(new File(parent, filename),
+                              filename + " in " + parent)) {
+                    return true;
+                }
+                parent = parent.getParentFile();
             }
         }
         return false;
@@ -405,7 +410,8 @@
                     log("Found directory: " + text, Project.MSG_VERBOSE);
                 }
                 return f.isDirectory();
-            } else if (type.isFile()) {
+            }
+            if (type.isFile()) {
                 if (f.isFile()) {
                     log("Found file: " + text, Project.MSG_VERBOSE);
                 }
@@ -494,6 +500,7 @@
          * @see EnumeratedAttribute#getValues
          * {@inheritDoc}.
          */
+        @Override
         public String[] getValues() {
             return VALUES;
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Basename.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Basename.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Basename.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Basename.java	2018-03-24 12:37:12.000000000 +0000
@@ -85,6 +85,7 @@
      * @throws BuildException if required attributes are not supplied
      * property and attribute are required attributes
      */
+    @Override
     public void execute() throws BuildException {
         if (property == null) {
             throw new BuildException("property attribute required", getLocation());
@@ -92,19 +93,21 @@
         if (file == null) {
             throw new BuildException("file attribute required", getLocation());
         }
-        String value = file.getName();
-        if (suffix != null && value.endsWith(suffix)) {
-            // if the suffix does not starts with a '.' and the
-            // char preceding the suffix is a '.', we assume the user
-            // wants to remove the '.' as well (see docs)
-            int pos = value.length() - suffix.length();
-            if (pos > 0 && suffix.charAt(0) != '.'
-                && value.charAt(pos - 1) == '.') {
-                pos--;
-            }
-            value = value.substring(0, pos);
+        getProject().setNewProperty(property,
+            removeExtension(file.getName(), suffix));
+    }
+
+    private String removeExtension(String s, String ext) {
+        if (ext == null || !s.endsWith(ext)) {
+            return s;
         }
-        getProject().setNewProperty(property, value);
+        int clipFrom = s.length() - ext.length();
+        // if the suffix does not starts with a '.' and the
+        // char preceding the suffix is a '.', we assume the user
+        // wants to remove the '.' as well (see docs)
+        if (ext.charAt(0) != '.' && clipFrom > 0 && s.charAt(clipFrom - 1) == '.') {
+            clipFrom -= 1;
+        }
+        return s.substring(0, clipFrom);
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/BindTargets.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/BindTargets.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/BindTargets.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/BindTargets.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,8 +18,8 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.ProjectHelper;
@@ -54,13 +54,8 @@
     }
 
     public void setTargets(final String target) {
-        final String[] inputs = target.split(",");
-        for (int i = 0; i < inputs.length; i++) {
-            final String input = inputs[i].trim();
-            if (input.length() > 0) {
-                targets.add(input);
-            }
-        }
+        Stream.of(target.split(",")).map(String::trim).filter(s -> !s.isEmpty())
+            .forEach(targets::add);
     }
 
     @Override
@@ -81,10 +76,9 @@
         final ProjectHelper helper = (ProjectHelper) getProject().getReference(
                 ProjectHelper.PROJECTHELPER_REFERENCE);
 
-        for (final Iterator<String> itTarget = targets.iterator(); itTarget.hasNext();) {
+        for (String target : targets) {
             helper.getExtensionStack().add(new String[] {extensionPoint,
-                    itTarget.next(), onMissingExtensionPoint.name()});
+                target, onMissingExtensionPoint.name()});
         }
-
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,13 +18,13 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.Properties;
 
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.util.FileUtils;
 
@@ -39,8 +39,7 @@
  * @since Ant 1.5
  * @ant.task name="buildnumber"
  */
-public class BuildNumber
-     extends Task {
+public class BuildNumber extends Task {
     /**
      * The name of the property in which the build number is stored.
      */
@@ -54,7 +53,6 @@
     /** The File in which the build number is stored.  */
     private File myFile;
 
-
     /**
      * The file in which the build number is stored. Defaults to
      * "build.number" if not specified.
@@ -65,14 +63,13 @@
         myFile = file;
     }
 
-
     /**
      * Run task.
      *
      * @exception BuildException if an error occurs
      */
-    public void execute()
-         throws BuildException {
+    @Override
+    public void execute() throws BuildException {
         File savedFile = myFile; // may be altered in validate
 
         validate();
@@ -84,26 +81,12 @@
             String.valueOf(buildNumber + 1));
 
         // Write the properties file back out
-        FileOutputStream output = null;
-
-        try {
-            output = new FileOutputStream(myFile);
 
-            final String header = "Build Number for ANT. Do not edit!";
-
-            properties.store(output, header);
+        try (OutputStream output = Files.newOutputStream(myFile.toPath())) {
+            properties.store(output, "Build Number for ANT. Do not edit!");
         } catch (final IOException ioe) {
-            final String message = "Error while writing " + myFile;
-
-            throw new BuildException(message, ioe);
+            throw new BuildException("Error while writing " + myFile, ioe);
         } finally {
-            if (null != output) {
-                try {
-                    output.close();
-                } catch (final IOException ioe) {
-                    log("error closing output stream " + ioe, Project.MSG_ERR);
-                }
-            }
             myFile = savedFile;
         }
 
@@ -112,7 +95,6 @@
             String.valueOf(buildNumber));
     }
 
-
     /**
      * Utility method to retrieve build number from properties object.
      *
@@ -129,43 +111,28 @@
         try {
             return Integer.parseInt(buildNumber);
         } catch (final NumberFormatException nfe) {
-            final String message =
-                myFile + " contains a non integer build number: " + buildNumber;
-            throw new BuildException(message, nfe);
+            throw new BuildException(
+                myFile + " contains a non integer build number: " + buildNumber,
+                nfe);
         }
     }
 
-
     /**
      * Utility method to load properties from file.
      *
      * @return the loaded properties
      * @throws BuildException if something goes wrong
      */
-    private Properties loadProperties()
-         throws BuildException {
-        FileInputStream input = null;
-
-        try {
+    private Properties loadProperties() throws BuildException {
+        try (InputStream input = Files.newInputStream(myFile.toPath())) {
             final Properties properties = new Properties();
-
-            input = new FileInputStream(myFile);
             properties.load(input);
             return properties;
         } catch (final IOException ioe) {
             throw new BuildException(ioe);
-        } finally {
-            if (null != input) {
-                try {
-                    input.close();
-                } catch (final IOException ioe) {
-                    log("error closing input stream " + ioe, Project.MSG_ERR);
-                }
-            }
         }
     }
 
-
     /**
      * Validate that the task parameters are valid.
      *
@@ -181,21 +148,18 @@
             try {
                 FILE_UTILS.createNewFile(myFile);
             } catch (final IOException ioe) {
-                final String message =
-                    myFile + " doesn't exist and new file can't be created.";
-                throw new BuildException(message, ioe);
+                throw new BuildException(
+                    myFile + " doesn't exist and new file can't be created.",
+                    ioe);
             }
         }
 
         if (!myFile.canRead()) {
-            final String message = "Unable to read from " + myFile + ".";
-            throw new BuildException(message);
+            throw new BuildException("Unable to read from " + myFile + ".");
         }
 
         if (!myFile.canWrite()) {
-            final String message = "Unable to write to " + myFile + ".";
-            throw new BuildException(message);
+            throw new BuildException("Unable to write to " + myFile + ".");
         }
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,9 +20,10 @@
 
 
 import java.io.BufferedInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.FileUtils;
@@ -60,12 +61,12 @@
             log("Expanding " + srcResource.getName() + " to "
                 + dest.getAbsolutePath());
 
-            FileOutputStream out = null;
+            OutputStream out = null;
             CBZip2InputStream zIn = null;
             InputStream fis = null;
             BufferedInputStream bis = null;
             try {
-                out = new FileOutputStream(dest);
+                out = Files.newOutputStream(dest.toPath());
                 fis = srcResource.getInputStream();
                 bis = new BufferedInputStream(fis);
                 int b = bis.read();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/BZip2.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/BZip2.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/BZip2.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/BZip2.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,8 +20,8 @@
 
 
 import java.io.BufferedOutputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.file.Files;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.FileUtils;
@@ -44,7 +44,7 @@
         CBZip2OutputStream zOut = null;
         try {
             BufferedOutputStream bos =
-                new BufferedOutputStream(new FileOutputStream(zipFile));
+                new BufferedOutputStream(Files.newOutputStream(zipFile.toPath()));
             bos.write('B');
             bos.write('Z');
             zOut = new CBZip2OutputStream(bos);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Checksum.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Checksum.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Checksum.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Checksum.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,10 +19,11 @@
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -70,6 +71,7 @@
             super.add(u);
             super.add(Type.FILE);
         }
+        @Override
         public void add(ResourceCollection rc) {
             u.add(rc);
         }
@@ -109,14 +111,14 @@
      * Key:   java.util.File (source file)
      * Value: java.lang.String (digest)
      */
-    private Map<File, byte[]> allDigests = new HashMap<File, byte[]>();
+    private Map<File, byte[]> allDigests = new HashMap<>();
     /**
      * Holds relative file names for all files (always with a forward slash).
      * This is used to calculate the total hash.
      * Key:   java.util.File (source file)
      * Value: java.lang.String (relative file name)
      */
-    private Map<File, String> relativeFilePaths = new HashMap<File, String>();
+    private Map<File, String> relativeFilePaths = new HashMap<>();
     /**
      * Property where totalChecksum gets set.
      */
@@ -137,7 +139,7 @@
     /**
      * Stores SourceFile, DestFile pairs and SourceFile, Property String pairs.
      */
-    private Hashtable<File, Object> includeFileMap = new Hashtable<File, Object>();
+    private Hashtable<File, Object> includeFileMap = new Hashtable<>();
     /**
      * Message Digest instance
      */
@@ -293,13 +295,13 @@
      * Calculate the checksum(s).
      * @throws BuildException on error
      */
+    @Override
     public void execute() throws BuildException {
         isCondition = false;
         boolean value = validateAndExecute();
         if (verifyProperty != null) {
-            getProject().setNewProperty(
-                verifyProperty,
-                (value ? Boolean.TRUE.toString() : Boolean.FALSE.toString()));
+            getProject().setNewProperty(verifyProperty,
+                Boolean.toString(value));
         }
     }
 
@@ -310,6 +312,7 @@
      * false otherwise.
      * @throws BuildException on error
      */
+    @Override
     public boolean eval() throws BuildException {
         isCondition = true;
         return validateAndExecute();
@@ -385,7 +388,7 @@
         }
         if (fileext == null) {
             fileext = "." + algorithm;
-        } else if (fileext.trim().length() == 0) {
+        } else if (fileext.trim().isEmpty()) {
             throw new BuildException("File extension when specified must not be an empty string");
         }
         try {
@@ -462,8 +465,7 @@
             // This directory will exist
             directory = file.getParentFile();
         }
-        File checksumFile = new File(directory, file.getName() + fileext);
-        return checksumFile;
+        return new File(directory, file.getName() + fileext);
     }
 
     /**
@@ -471,8 +473,8 @@
      */
     private boolean generateChecksums() throws BuildException {
         boolean checksumMatches = true;
-        FileInputStream fis = null;
-        FileOutputStream fos = null;
+        InputStream fis = null;
+        OutputStream fos = null;
         byte[] buf = new byte[readBufferSize];
         try {
             for (Map.Entry<File, Object> e : includeFileMap.entrySet()) {
@@ -481,7 +483,7 @@
                 if (!isCondition) {
                     log("Calculating " + algorithm + " checksum for " + src, Project.MSG_VERBOSE);
                 }
-                fis = new FileInputStream(src);
+                fis = Files.newInputStream(src.toPath());
                 DigestInputStream dis = new DigestInputStream(fis,
                                                               messageDigest);
                 while (dis.read(buf, 0, readBufferSize) != -1) {
@@ -497,7 +499,7 @@
                 String checksum = createDigestString(fileDigest);
                 //can either be a property name string or a file
                 Object destination = e.getValue();
-                if (destination instanceof java.lang.String) {
+                if (destination instanceof String) {
                     String prop = (String) destination;
                     if (isCondition) {
                         checksumMatches
@@ -505,7 +507,7 @@
                     } else {
                         getProject().setNewProperty(prop, checksum);
                     }
-                } else if (destination instanceof java.io.File) {
+                } else if (destination instanceof File) {
                     if (isCondition) {
                         File existingFile = (File) destination;
                         if (existingFile.exists()) {
@@ -523,7 +525,7 @@
                         }
                     } else {
                         File dest = (File) destination;
-                        fos = new FileOutputStream(dest);
+                        fos = Files.newOutputStream(dest.toPath());
                         fos.write(format.format(new Object[] {
                                                     checksum,
                                                     src.getName(),
@@ -549,14 +551,9 @@
                 File[] keyArray = allDigests.keySet().toArray(new File[allDigests.size()]);
                 // File is Comparable, but sort-order is platform
                 // dependent (case-insensitive on Windows)
-                Arrays.sort(keyArray, new Comparator<File>() {
-                        public int compare(File f1, File f2) {
-                            return f1 == null ? (f2 == null ? 0 : -1)
-                                : (f2 == null ? 1
-                                   : getRelativeFilePath(f1)
-                                   .compareTo(getRelativeFilePath(f2)));
-                        }
-                    });
+                Arrays.sort(keyArray, Comparator.nullsFirst(
+                    Comparator.comparing(this::getRelativeFilePath)));
+
                 // Loop over the checksums and generate a total hash.
                 messageDigest.reset();
                 for (File src : keyArray) {
@@ -581,11 +578,11 @@
     }
 
     private String createDigestString(byte[] fileDigest) {
-        StringBuffer checksumSb = new StringBuffer();
+        StringBuilder checksumSb = new StringBuilder();
         for (int i = 0; i < fileDigest.length; i++) {
             String hexStr = Integer.toHexString(BYTE_MASK & fileDigest[i]);
             if (hexStr.length() < 2) {
-                checksumSb.append("0");
+                checksumSb.append('0');
             }
             checksumSb.append(hexStr);
         }
@@ -629,20 +626,15 @@
      * @since 1.7
      */
     private String readChecksum(File f) {
-        BufferedReader diskChecksumReader = null;
-        try {
-            diskChecksumReader = new BufferedReader(new FileReader(f));
+        try (BufferedReader diskChecksumReader =
+            new BufferedReader(new FileReader(f))) {
             Object[] result = format.parse(diskChecksumReader.readLine());
             if (result == null || result.length == 0 || result[0] == null) {
                 throw new BuildException("failed to find a checksum");
             }
             return (String) result[0];
-        } catch (IOException e) {
-            throw new BuildException("Couldn't read checksum file " + f, e);
-        } catch (ParseException e) {
+        } catch (IOException | ParseException e) {
             throw new BuildException("Couldn't read checksum file " + f, e);
-        } finally {
-            FileUtils.close(diskChecksumReader);
         }
     }
 
@@ -650,13 +642,12 @@
      * @since Ant 1.8.2
      */
     private String getRelativeFilePath(File f) {
-        String path = (String) relativeFilePaths.get(f);
+        String path = relativeFilePaths.get(f);
         if (path == null) {
             //bug 37386. this should not occur, but it has, once.
-            throw new BuildException("Internal error: "
-                                     + "relativeFilePaths could not match file "
-                                     + f + "\n"
-                                     + "please file a bug report on this");
+            throw new BuildException(
+                "Internal error: relativeFilePaths could not match file %s\nplease file a bug report on this",
+                f);
         }
         return path;
     }
@@ -678,11 +669,6 @@
             formatMap.put(SVF, new MessageFormat("MD5 ({1}) = {0}"));
         }
 
-        /** Constructor for FormatElement */
-        public FormatElement() {
-            super();
-        }
-
         /**
          * Get the default value - CHECKSUM.
          * @return the defaul value.
@@ -698,13 +684,14 @@
          * @return a <code>MessageFormat</code> object.
          */
         public MessageFormat getFormat() {
-            return (MessageFormat) formatMap.get(getValue());
+            return formatMap.get(getValue());
         }
 
         /**
          * Get the valid values.
          * @return an array of values.
          */
+        @Override
         public String[] getValues() {
             return new String[] {CHECKSUM, MD5SUM, SVF};
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Chmod.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Chmod.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Chmod.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Chmod.java	2018-03-24 12:37:12.000000000 +0000
@@ -58,6 +58,7 @@
      * @param project the project for this task.
      * @see org.apache.tools.ant.ProjectComponent#setProject
      */
+    @Override
     public void setProject(Project project) {
         super.setProject(project);
         defaultSet.setProject(project);
@@ -77,6 +78,7 @@
      * The directory which holds the files whose permissions must be changed.
      * @param src the directory.
      */
+    @Override
     public void setDir(File src) {
         defaultSet.setDir(src);
     }
@@ -154,6 +156,7 @@
     /**
      * Check the attributes and nested elements.
      */
+    @Override
     protected void checkConfiguration() {
         if (!havePerm) {
             throw new BuildException("Required attribute perm not set in chmod",
@@ -170,6 +173,7 @@
      * Carry out the chmoding.
      * @throws BuildException on error.
      */
+    @Override
     public void execute() throws BuildException {
         /*
          * In Ant 1.1, <chmod dir="foo" /> means, change the permissions
@@ -210,6 +214,7 @@
      * @throws BuildException always.
      * @ant.attribute ignore="true"
      */
+    @Override
     public void setExecutable(String e) {
         throw new BuildException(getTaskType()
             + " doesn\'t support the executable attribute", getLocation());
@@ -222,6 +227,7 @@
      * @throws BuildException always.
      * @ant.attribute ignore="true"
      */
+    @Override
     public void setCommand(Commandline cmdl) {
         throw new BuildException(getTaskType()
             + " doesn\'t support the command attribute", getLocation());
@@ -233,6 +239,7 @@
      * @throws BuildException always.
      * @ant.attribute ignore="true"
      */
+    @Override
     public void setSkipEmptyFilesets(boolean skip) {
         throw new BuildException(getTaskType()
             + " doesn\'t support the skipemptyfileset attribute", getLocation());
@@ -244,6 +251,7 @@
      * @throws BuildException always.
      * @ant.attribute ignore="true"
      */
+    @Override
     public void setAddsourcefile(boolean b) {
         throw new BuildException(getTaskType()
             + " doesn\'t support the addsourcefile attribute", getLocation());
@@ -254,6 +262,7 @@
      * Always include unix.
      * @return true if the os is valid.
      */
+    @Override
     protected boolean isValidOs() {
         return getOs() == null && getOsFamily() == null
             ? Os.isFamily(Os.FAMILY_UNIX) : super.isValidOs();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Classloader.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Classloader.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Classloader.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Classloader.java	2018-03-24 12:37:12.000000000 +0000
@@ -70,12 +70,6 @@
     private boolean parentFirst = true;
     private String parentName = null;
 
-    /**
-     * Default constructor
-     */
-    public Classloader() {
-    }
-
     /** Name of the loader. If none, the default loader will be modified
      *
      * @param name the name of this loader
@@ -101,6 +95,7 @@
      * @param b if true reverse the normal classloader lookup.
      * @deprecated use setParentFirst with a negated argument instead
      */
+    @Deprecated
     public void setReverse(boolean b) {
         this.parentFirst = !b;
     }
@@ -156,17 +151,17 @@
         return this.classpath.createPath();
     }
 
-
     /**
      * do the classloader manipulation.
      */
+    @Override
     public void execute() {
         try {
             // Gump friendly - don't mess with the core loader if only classpath
             if ("only".equals(getProject().getProperty("build.sysclasspath"))
                 && (name == null || SYSTEM_LOADER_REF.equals(name))) {
-                log("Changing the system loader is disabled "
-                    + "by build.sysclasspath=only", Project.MSG_WARN);
+                log("Changing the system loader is disabled by build.sysclasspath=only",
+                    Project.MSG_WARN);
                 return;
             }
 
@@ -186,6 +181,7 @@
                 return;
             }
 
+            @SuppressWarnings("resource")
             AntClassLoader acl = (AntClassLoader) obj;
             boolean existingLoader = acl != null;
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,187 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (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
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package org.apache.tools.ant.taskdefs.compilers;
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.util.Enumeration;
-import java.util.Vector;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Apt;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.Path;
-
-
-/**
- * <p>The implementation of the apt compiler for JDK 1.5.</p>
- *
- * <p>As usual, the low level entry points for Java tools are neither documented or
- * stable; this entry point may change from that of 1.5.0_01-b08 without any
- * warning at all. The IDE decompile of the tool entry points is as follows:</p>
- * <pre>
- * public class Main {
- * public Main() ;
- *
- * public static transient void main(String... strings);
- *
- * public static transient int process(String... strings);
- *
- * public static transient int process(PrintWriter printWriter,
- *      String... strings);
- * public static transient int process(
- *      AnnotationProcessorFactory annotationProcessorFactory,
- *      String... strings);
- *
- * public static transient int process(
- *      AnnotationProcessorFactory annotationProcessorFactory,
- *      PrintWriter printWriter,
- *      String... strings);
- * private static transient int processing(
- *      AnnotationProcessorFactory annotationProcessorFactory,
- *      PrintWriter printWriter,
- *      String... strings) ;
- * }
- * </pre>
- *
- * This Adapter is designed to run Apt in-JVM, an option that is not actually
- * exposed to end-users, because it was too brittle during beta testing; classpath
- * problems being the core issue.
- *
- * @since Ant 1.7
- */
-public class AptCompilerAdapter extends DefaultCompilerAdapter {
-
-    /**
-     * Integer returned by the Apt compiler to indicate success.
-     */
-    private static final int APT_COMPILER_SUCCESS = 0;
-    /**
-     * class in tools.jar that implements APT
-     */
-    public static final String APT_ENTRY_POINT = "com.sun.tools.apt.Main";
-
-    /**
-     * method used to compile.
-     */
-    public static final String APT_METHOD_NAME = "process";
-
-    /**
-     * Get the facade task that fronts this adapter
-     *
-     * @return task instance
-     * @see DefaultCompilerAdapter#getJavac()
-     */
-    protected Apt getApt() {
-        return (Apt) getJavac();
-    }
-
-    /**
-     * Using the front end arguments, set up the command line to run Apt
-     *
-     * @param apt task
-     * @param cmd command that is set up with the various switches from the task
-     *            options
-     */
-    static void setAptCommandlineSwitches(final Apt apt, final Commandline cmd) {
-
-        if (!apt.isCompile()) {
-            cmd.createArgument().setValue("-nocompile");
-        }
-
-        // Process the factory class
-        final String factory = apt.getFactory();
-        if (factory != null) {
-            cmd.createArgument().setValue("-factory");
-            cmd.createArgument().setValue(factory);
-        }
-
-        // Process the factory path
-        final Path factoryPath = apt.getFactoryPath();
-        if (factoryPath != null) {
-            cmd.createArgument().setValue("-factorypath");
-            cmd.createArgument().setPath(factoryPath);
-        }
-
-        final File preprocessDir = apt.getPreprocessDir();
-        if (preprocessDir != null) {
-            cmd.createArgument().setValue("-s");
-            cmd.createArgument().setFile(preprocessDir);
-        }
-
-        // Process the processor options
-        final Vector options = apt.getOptions();
-        final Enumeration elements = options.elements();
-        Apt.Option opt;
-        StringBuffer arg = null;
-        while (elements.hasMoreElements()) {
-            opt = (Apt.Option) elements.nextElement();
-            arg = new StringBuffer();
-            arg.append("-A").append(opt.getName());
-            if (opt.getValue() != null) {
-                arg.append("=").append(opt.getValue());
-            }
-            cmd.createArgument().setValue(arg.toString());
-        }
-    }
-
-    /**
-     * using our front end task, set up the command line switches
-     *
-     * @param cmd command line to set up
-     */
-    protected void setAptCommandlineSwitches(final Commandline cmd) {
-        final Apt apt = getApt();
-        setAptCommandlineSwitches(apt, cmd);
-    }
-
-    /**
-     * Run the compilation.
-     * @return true on success.
-     * @throws BuildException if the compilation has problems.
-     */
-    public boolean execute() throws BuildException {
-        attributes.log("Using apt compiler", Project.MSG_VERBOSE);
-        //set up the javac options
-        final Commandline cmd = setupModernJavacCommand();
-        //then add the Apt options
-        setAptCommandlineSwitches(cmd);
-
-        //finally invoke APT
-        // Use reflection to be able to build on all JDKs:
-        try {
-            final Class c = Class.forName(APT_ENTRY_POINT);
-            final Object compiler = c.newInstance();
-            final Method compile = c.getMethod(APT_METHOD_NAME,
-                    new Class[]{(new String[]{}).getClass()});
-            final int result = ((Integer) compile.invoke
-                    (compiler, new Object[]{cmd.getArguments()}))
-                    .intValue();
-            return (result == APT_COMPILER_SUCCESS);
-        } catch (final BuildException be) {
-            //rethrow build exceptions
-            throw be;
-        } catch (final Exception ex) {
-            //cast everything else to a build exception
-            throw new BuildException("Error starting apt compiler",
-                    ex, location);
-        }
-    }
-}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/AptExternalCompilerAdapter.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/AptExternalCompilerAdapter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/AptExternalCompilerAdapter.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/AptExternalCompilerAdapter.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (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
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package org.apache.tools.ant.taskdefs.compilers;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Apt;
-import org.apache.tools.ant.types.Commandline;
-
-/**
- * The implementation of the apt compiler for JDK 1.5 using an external process
- *
- * @since Ant 1.7
- */
-public class AptExternalCompilerAdapter extends DefaultCompilerAdapter {
-
-
-    /**
-     * Get the facade task that fronts this adapter
-     *
-     * @return task instance
-     * @see DefaultCompilerAdapter#getJavac()
-     */
-    protected Apt getApt() {
-        return (Apt) getJavac();
-    }
-
-    /**
-     * Performs a compile using the Javac externally.
-     * @return true  the compilation was successful.
-     * @throws BuildException if there is a problem.
-     */
-    public boolean execute() throws BuildException {
-        attributes.log("Using external apt compiler", Project.MSG_VERBOSE);
-
-
-        // Setup the apt executable
-        Apt apt = getApt();
-        Commandline cmd = new Commandline();
-        cmd.setExecutable(apt.getAptExecutable());
-        setupModernJavacCommandlineSwitches(cmd);
-        AptCompilerAdapter.setAptCommandlineSwitches(apt, cmd);
-        int firstFileName = cmd.size();
-        //add the files
-        logAndAddFilesToCompile(cmd);
-
-        //run
-        return 0 == executeExternalCompile(cmd.getCommandline(),
-                firstFileName,
-                true);
-
-    }
-
-}
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java	2018-03-24 12:37:12.000000000 +0000
@@ -96,70 +96,60 @@
      * @since Ant 1.8.0
      */
     public static CompilerAdapter getCompiler(String compilerType, Task task,
-                                              Path classpath)
-        throws BuildException {
-            if (compilerType.equalsIgnoreCase("jikes")) {
-                return new Jikes();
-            }
-            if (compilerType.equalsIgnoreCase("extjavac")) {
-                return new JavacExternal();
-            }
-            if (compilerType.equalsIgnoreCase("classic")
-                || compilerType.equalsIgnoreCase("javac1.1")
-                || compilerType.equalsIgnoreCase("javac1.2")) {
-                task.log("This version of java does "
-                                         + "not support the classic "
-                                         + "compiler; upgrading to modern",
-                                         Project.MSG_WARN);
-                compilerType = "modern";
-            }
-            //on java<=1.3 the modern falls back to classic if it is not found
-            //but on java>=1.4 we just bail out early
-            if (compilerType.equalsIgnoreCase("modern")
-                || compilerType.equalsIgnoreCase("javac1.3")
-                || compilerType.equalsIgnoreCase("javac1.4")
-                || compilerType.equalsIgnoreCase("javac1.5")
-                || compilerType.equalsIgnoreCase("javac1.6")
-                || compilerType.equalsIgnoreCase("javac1.7")
-                || compilerType.equalsIgnoreCase("javac1.8")
-                || compilerType.equalsIgnoreCase("javac1.9")
-                || compilerType.equalsIgnoreCase("javac9")
-                || compilerType.equalsIgnoreCase("javac10+")) {
-                // does the modern compiler exist?
-                if (doesModernCompilerExist()) {
-                    return new Javac13();
-                } else {
-                    throw new BuildException("Unable to find a javac "
-                                             + "compiler;\n"
-                                             + MODERN_COMPILER
-                                             + " is not on the "
-                                             + "classpath.\n"
-                                             + "Perhaps JAVA_HOME does not"
-                                             + " point to the JDK.\n"
-                            + "It is currently set to \""
-                            + JavaEnvUtils.getJavaHome()
-                            + "\"");
-                }
-            }
+        Path classpath) throws BuildException {
+        if ("jikes".equalsIgnoreCase(compilerType)) {
+            return new Jikes();
+        }
+        if ("extjavac".equalsIgnoreCase(compilerType)) {
+            return new JavacExternal();
+        }
+        if ("classic".equalsIgnoreCase(compilerType)
+            || "javac1.1".equalsIgnoreCase(compilerType)
+            || "javac1.2".equalsIgnoreCase(compilerType)) {
+            task.log(
+                "This version of java does not support the classic compiler; upgrading to modern",
+                Project.MSG_WARN);
+            compilerType = "modern";
+        }
+        //on java<=1.3 the modern falls back to classic if it is not found
+        //but on java>=1.4 we just bail out early
+        if ("modern".equalsIgnoreCase(compilerType)
+            || "javac1.3".equalsIgnoreCase(compilerType)
+            || "javac1.4".equalsIgnoreCase(compilerType)
+            || "javac1.5".equalsIgnoreCase(compilerType)
+            || "javac1.6".equalsIgnoreCase(compilerType)
+            || "javac1.7".equalsIgnoreCase(compilerType)
+            || "javac1.8".equalsIgnoreCase(compilerType)
+            || "javac1.9".equalsIgnoreCase(compilerType)
+            || "javac9".equalsIgnoreCase(compilerType)
+            || "javac10+".equalsIgnoreCase(compilerType)) {
+            // does the modern compiler exist?
+            if (doesModernCompilerExist()) {
+                return new Javac13();
+            }
+            throw new BuildException(
+                "Unable to find a javac compiler;\n%s is not on the classpath.\nPerhaps JAVA_HOME does not point to the JDK.\nIt is currently set to \"%s\"",
+                MODERN_COMPILER, JavaEnvUtils.getJavaHome());
+        }
 
-            if (compilerType.equalsIgnoreCase("jvc")
-                || compilerType.equalsIgnoreCase("microsoft")) {
-                return new Jvc();
-            }
-            if (compilerType.equalsIgnoreCase("kjc")) {
-                return new Kjc();
-            }
-            if (compilerType.equalsIgnoreCase("gcj")) {
-                return new Gcj();
-            }
-            if (compilerType.equalsIgnoreCase("sj")
-                || compilerType.equalsIgnoreCase("symantec")) {
-                return new Sj();
-            }
-            return resolveClassName(compilerType,
-                                    // Memory-Leak in line below
-                                task.getProject().createClassLoader(classpath));
+        if ("jvc".equalsIgnoreCase(compilerType)
+            || "microsoft".equalsIgnoreCase(compilerType)) {
+            return new Jvc();
         }
+        if ("kjc".equalsIgnoreCase(compilerType)) {
+            return new Kjc();
+        }
+        if ("gcj".equalsIgnoreCase(compilerType)) {
+            return new Gcj();
+        }
+        if ("sj".equalsIgnoreCase(compilerType)
+            || "symantec".equalsIgnoreCase(compilerType)) {
+            return new Sj();
+        }
+        return resolveClassName(compilerType,
+            // Memory-Leak in line below
+            task.getProject().createClassLoader(classpath));
+    }
 
     /**
      * query for the Modern compiler existing
@@ -195,7 +185,7 @@
     private static CompilerAdapter resolveClassName(String className,
                                                     ClassLoader loader)
         throws BuildException {
-        return (CompilerAdapter) ClasspathUtils.newInstance(className,
+        return ClasspathUtils.newInstance(className,
                 loader != null ? loader :
                 CompilerAdapterFactory.class.getClassLoader(),
                 CompilerAdapter.class);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,13 +18,13 @@
 
 package org.apache.tools.ant.taskdefs.compilers;
 
-//Java5 style
-//import static org.apache.tools.ant.util.StringUtils.LINE_SEP;
-
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Location;
@@ -61,6 +61,11 @@
 
     private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
 
+    //must keep for subclass BC, though unused:
+    // CheckStyle:ConstantNameCheck OFF - bc
+    protected static final String lSep = StringUtils.LINE_SEP;
+    // CheckStyle:ConstantNameCheck ON
+
     protected Path src;
     protected File destDir;
     protected String encoding;
@@ -88,11 +93,6 @@
     protected File[] compileList;
     protected Javac attributes;
 
-    //must keep for subclass BC, though unused:
-    // CheckStyle:ConstantNameCheck OFF - bc
-    protected static final String lSep = StringUtils.LINE_SEP;
-
-    // CheckStyle:ConstantNameCheck ON
     // CheckStyle:VisibilityModifier ON
 
     /**
@@ -101,6 +101,7 @@
      *
      * @param attributes a configured Javac task.
      */
+    @Override
     public void setJavac(final Javac attributes) {
         this.attributes = attributes;
         src = attributes.getSrcdir();
@@ -147,6 +148,7 @@
      * but specialized compilers can recognize multiple kinds
      * of files.
      */
+    @Override
     public String[] getSupportedFileExtensions() {
         return new String[] {"java"};
     }
@@ -254,7 +256,7 @@
         final Path classpath = getCompileClasspath();
         // For -sourcepath, use the "sourcepath" value if present.
         // Otherwise default to the "srcdir" value.
-        Path sourcepath = null;
+        Path sourcepath;
         if (compileSourcepath != null) {
             sourcepath = compileSourcepath;
         } else {
@@ -264,9 +266,9 @@
         final String memoryParameterPrefix = assumeJava11() ? "-J-" : "-J-X";
         if (memoryInitialSize != null) {
             if (!attributes.isForkedJavac()) {
-                attributes.log("Since fork is false, ignoring "
-                               + "memoryInitialSize setting.",
-                               Project.MSG_WARN);
+                attributes.log(
+                    "Since fork is false, ignoring memoryInitialSize setting.",
+                    Project.MSG_WARN);
             } else {
                 cmd.createArgument().setValue(memoryParameterPrefix
                                               + "ms" + memoryInitialSize);
@@ -275,9 +277,9 @@
 
         if (memoryMaximumSize != null) {
             if (!attributes.isForkedJavac()) {
-                attributes.log("Since fork is false, ignoring "
-                               + "memoryMaximumSize setting.",
-                               Project.MSG_WARN);
+                attributes.log(
+                    "Since fork is false, ignoring memoryMaximumSize setting.",
+                    Project.MSG_WARN);
             } else {
                 cmd.createArgument().setValue(memoryParameterPrefix
                                               + "mx" + memoryMaximumSize);
@@ -303,11 +305,7 @@
         // as well as "bootclasspath" and "extdirs"
         if (assumeJava11()) {
             final Path cp = new Path(project);
-
-            final Path bp = getBootClassPath();
-            if (bp.size() > 0) {
-                cp.append(bp);
-            }
+            Optional.ofNullable(getBootClassPath()).ifPresent(cp::append);
 
             if (extdirs != null) {
                 cp.addExtdirs(extdirs);
@@ -330,13 +328,13 @@
                 }
 
                 final Path bp = getBootClassPath();
-                if (bp.size() > 0) {
+                if (!bp.isEmpty()) {
                     cmd.createArgument().setValue("-bootclasspath");
                     cmd.createArgument().setPath(bp);
                 }
             }
 
-            if (extdirs != null && extdirs.size() > 0) {
+            if (!(extdirs == null || extdirs.isEmpty())) {
                 cmd.createArgument().setValue("-extdirs");
                 cmd.createArgument().setPath(extdirs);
             }
@@ -370,8 +368,9 @@
             } else if (assumeJava12()) {
                 cmd.createArgument().setValue("-Xdepend");
             } else {
-                attributes.log("depend attribute is not supported by the "
-                               + "modern compiler", Project.MSG_WARN);
+                attributes.log(
+                    "depend attribute is not supported by the modern compiler",
+                    Project.MSG_WARN);
             }
         }
 
@@ -397,8 +396,8 @@
             final String s = attributes.getSource();
             if (release == null || !assumeJava9Plus()) {
                 if (release != null) {
-                    attributes.log("Support for javac --release has been added"
-                                   + " in Java9 ignoring it");
+                    attributes.log(
+                        "Support for javac --release has been added in Java9 ignoring it");
                 }
                 if (s != null) {
                     cmd.createArgument().setValue("-source");
@@ -409,34 +408,34 @@
                 }
             } else { // Java 9+ and release has been set
                 if (t != null || s != null || getBootClassPath().size() > 0) {
-                    attributes.log("Ignoring source, target and bootclasspath"
-                                   + " as release has been set",
-                                   Project.MSG_WARN);
+                    attributes.log(
+                        "Ignoring source, target and bootclasspath as release has been set",
+                        Project.MSG_WARN);
                 }
                 cmd.createArgument().setValue("--release");
                 cmd.createArgument().setValue(release);
             }
         }
         final Path msp = getModulesourcepath();
-        if (msp.size() > 0) {
+        if (!msp.isEmpty()) {
             cmd.createArgument().setValue("--module-source-path");
             cmd.createArgument().setPath(msp);
         }
         final Path mp = getModulepath();
-        if (mp.size() > 0) {
+        if (!mp.isEmpty()) {
             cmd.createArgument().setValue("--module-path");
             cmd.createArgument().setPath(mp);
         }
         final Path ump = getUpgrademodulepath();
-        if (ump.size() > 0) {
+        if (!ump.isEmpty()) {
             cmd.createArgument().setValue("--upgrade-module-path");
             cmd.createArgument().setPath(ump);
         }
         if (attributes.getNativeHeaderDir() != null) {
             if (assumeJava13() || assumeJava14() || assumeJava15() || assumeJava16()
                     || assumeJava17()) {
-                attributes.log("Support for javac -h has been added in Java8,"
-                               + " ignoring it");
+                attributes.log(
+                    "Support for javac -h has been added in Java8, ignoring it");
             } else {
                 cmd.createArgument().setValue("-h");
                 cmd.createArgument().setFile(attributes.getNativeHeaderDir());
@@ -487,23 +486,13 @@
     protected void logAndAddFilesToCompile(final Commandline cmd) {
         attributes.log("Compilation " + cmd.describeArguments(), Project.MSG_VERBOSE);
 
-        final StringBuffer niceSourceList = new StringBuffer("File");
-        if (compileList.length != 1) {
-            niceSourceList.append("s");
-        }
-        niceSourceList.append(" to be compiled:");
-
-        niceSourceList.append(StringUtils.LINE_SEP);
+        attributes.log(String.format("%s to be compiled:",
+                compileList.length == 1 ? "File" : "Files"), Project.MSG_VERBOSE);
 
-        for (int i = 0; i < compileList.length; i++) {
-            final String arg = compileList[i].getAbsolutePath();
-            cmd.createArgument().setValue(arg);
-            niceSourceList.append("    ");
-            niceSourceList.append(arg);
-            niceSourceList.append(StringUtils.LINE_SEP);
-        }
-
-        attributes.log(niceSourceList.toString(), Project.MSG_VERBOSE);
+        attributes.log(Stream.of(compileList).map(File::getAbsolutePath)
+                        .peek(arg -> cmd.createArgument().setValue(arg))
+                        .map(arg -> "    " + arg)
+                        .collect(Collectors.joining(StringUtils.LINE_SEP)), Project.MSG_VERBOSE);
     }
 
     /**
@@ -553,29 +542,30 @@
              */
             if (Commandline.toString(args).length() > COMMAND_LINE_LIMIT
                 && firstFileName >= 0) {
-                BufferedWriter out = null;
                 try {
                     tmpFile = FILE_UTILS.createTempFile(
                         "files", "", getJavac().getTempdir(), true, true);
-                    out = new BufferedWriter(new FileWriter(tmpFile));
-                    for (int i = firstFileName; i < args.length; i++) {
-                        if (quoteFiles && args[i].indexOf(" ") > -1) {
-                            args[i] = args[i].replace(File.separatorChar, '/');
-                            out.write("\"" + args[i] + "\"");
-                        } else {
-                            out.write(args[i]);
+                    try (BufferedWriter out =
+                        new BufferedWriter(new FileWriter(tmpFile))) {
+                        for (int i = firstFileName; i < args.length; i++) {
+                            if (quoteFiles && args[i].indexOf(' ') > -1) {
+                                args[i] =
+                                    args[i].replace(File.separatorChar, '/');
+                                out.write("\"" + args[i] + "\"");
+                            } else {
+                                out.write(args[i]);
+                            }
+                            out.newLine();
                         }
-                        out.newLine();
+                        out.flush();
+                        commandArray = new String[firstFileName + 1];
+                        System.arraycopy(args, 0, commandArray, 0,
+                            firstFileName);
+                        commandArray[firstFileName] = "@" + tmpFile;
                     }
-                    out.flush();
-                    commandArray = new String[firstFileName + 1];
-                    System.arraycopy(args, 0, commandArray, 0, firstFileName);
-                    commandArray[firstFileName] = "@" + tmpFile;
                 } catch (final IOException e) {
                     throw new BuildException("Error creating temporary file",
                                              e, location);
-                } finally {
-                    FileUtils.close(out);
                 }
             } else {
                 commandArray = args;
@@ -704,6 +694,7 @@
      * @since Ant 1.9.4
      * @deprecated use #assumeJava9 instead
      */
+    @Deprecated
     protected boolean assumeJava19() {
         return assumeJavaXY("javac1.9", JavaEnvUtils.JAVA_9)
             || assumeJavaXY("javac9", JavaEnvUtils.JAVA_9);
@@ -721,7 +712,7 @@
     /**
      * Shall we assume JDK 9+ command line switches?
      * @return true if JDK 9+
-     * @since Ant 1.9.10
+     * @since Ant 1.10.2
      */
     protected boolean assumeJava9Plus() {
         return "javac1.9".equals(attributes.getCompilerVersion())
@@ -828,23 +819,21 @@
         if (t.startsWith("1.")) {
             t = t.substring(2);
         }
-        return t.equals("1") || t.equals("2") || t.equals("3") || t.equals("4")
-            || ((t.equals("5") || t.equals("6")) && !assumeJava15() && !assumeJava16())
-            || (t.equals("7") && !assumeJava17())
-            || (t.equals("8") && !assumeJava18())
-            || (t.equals("9") && !assumeJava9Plus());
+        return "1".equals(t) || "2".equals(t) || "3".equals(t) || "4".equals(t)
+                || (("5".equals(t) || "6".equals(t)) && !assumeJava15() && !assumeJava16())
+                || ("7".equals(t) && !assumeJava17())
+                || ("8".equals(t) && !assumeJava18())
+                || ("9".equals(t) && !assumeJava9Plus());
     }
 
-
     /**
-     * Turn the task's attribute for -source into soemthing that is
+     * Turn the task's attribute for -source into something that is
      * understood by all javac's after 1.4.
      *
      * <p>support for -source 1.1 and -source 1.2 has been added with
      * JDK 1.4.2 but isn't present in 1.5.0+</p>
      */
     private String adjustSourceValue(final String source) {
-        return (source.equals("1.1") || source.equals("1.2")) ? "1.3" : source;
+        return "1.1".equals(source) || "1.2".equals(source) ? "1.3" : source;
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java	2018-03-24 12:37:12.000000000 +0000
@@ -31,16 +31,17 @@
  * @since Ant 1.4
  */
 public class Gcj extends DefaultCompilerAdapter {
+    private static final String[] CONFLICT_WITH_DASH_C = {"-o", "--main=", "-D", "-fjni", "-L"};
 
     /**
      * Performs a compile using the gcj compiler.
      * @return true if the compilation succeeded
      * @throws BuildException on error
      */
+    @Override
     public boolean execute() throws BuildException {
-        Commandline cmd;
         attributes.log("Using gcj compiler", Project.MSG_VERBOSE);
-        cmd = setupGCJCommand();
+        Commandline cmd = setupGCJCommand();
 
         int firstFileName = cmd.size();
         logAndAddFilesToCompile(cmd);
@@ -60,7 +61,7 @@
         // gcj doesn't support bootclasspath dir (-bootclasspath)
         // so we'll emulate it for compatibility and convenience.
         Path p = getBootClassPath();
-        if (p.size() > 0) {
+        if (!p.isEmpty()) {
             classpath.append(p);
         }
 
@@ -89,8 +90,8 @@
 
             if (!destDir.exists()
                 && !(destDir.mkdirs() || destDir.isDirectory())) {
-                throw new BuildException("Can't make output directories. "
-                                         + "Maybe permission is wrong. ");
+                throw new BuildException(
+                    "Can't make output directories. Maybe permission is wrong.");
             }
         }
 
@@ -152,6 +153,4 @@
         return nativeBuild;
     }
 
-    private static final String[] CONFLICT_WITH_DASH_C = {"-o", "--main=", "-D", "-fjni", "-L"};
-
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java	2018-03-24 12:37:12.000000000 +0000
@@ -37,6 +37,7 @@
  * @since Ant 1.3
  * @deprecated Use {@link Javac13} instead.
  */
+@Deprecated
 public class Javac12 extends DefaultCompilerAdapter {
     protected static final String CLASSIC_COMPILER_CLASSNAME = "sun.tools.javac.Main";
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java	2018-03-24 12:37:12.000000000 +0000
@@ -44,27 +44,25 @@
      * @return true if the compiler ran with a zero exit result (ok)
      * @exception BuildException if the compilation has problems.
      */
+    @Override
     public boolean execute() throws BuildException {
         attributes.log("Using modern compiler", Project.MSG_VERBOSE);
         Commandline cmd = setupModernJavacCommand();
 
         // Use reflection to be able to build on all JDKs >= 1.1:
         try {
-            Class c = Class.forName("com.sun.tools.javac.Main");
-            Object compiler = c.newInstance ();
-            Method compile = c.getMethod ("compile",
-                new Class [] {(new String [] {}).getClass ()});
-            int result = ((Integer) compile.invoke
-                          (compiler, new Object[] {cmd.getArguments()}))
-                .intValue ();
-            return (result == MODERN_COMPILER_SUCCESS);
+            Class<?> c = Class.forName("com.sun.tools.javac.Main");
+            Object compiler = c.newInstance();
+            Method compile = c.getMethod("compile", String[].class);
+            int result = ((Integer) compile.invoke(compiler,
+                (Object) cmd.getArguments())).intValue();
+            return result == MODERN_COMPILER_SUCCESS;
         } catch (Exception ex) {
             if (ex instanceof BuildException) {
                 throw (BuildException) ex;
-            } else {
-                throw new BuildException("Error starting modern compiler",
-                                         ex, location);
             }
+            throw new BuildException("Error starting modern compiler",
+                                     ex, location);
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java	2018-03-24 12:37:12.000000000 +0000
@@ -40,6 +40,7 @@
      * @return true if the compilation succeeded
      * @throws BuildException on error
      */
+    @Override
     public boolean execute() throws BuildException {
         attributes.log("Using external javac compiler", Project.MSG_VERBOSE);
 
@@ -82,7 +83,8 @@
                             true);
 
         } catch (IOException e) {
-            throw new BuildException("Failed to create a temporary file for \"-V\" switch");
+            throw new BuildException(
+                "Failed to create a temporary file for \"-V\" switch");
         } finally {
             FileUtils.delete(vmsFile);
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java	2018-03-24 12:37:12.000000000 +0000
@@ -43,6 +43,7 @@
      * @return true if the compilation succeeded
      * @throws BuildException on error
      */
+    @Override
     public boolean execute() throws BuildException {
         attributes.log("Using jikes compiler", Project.MSG_VERBOSE);
 
@@ -50,7 +51,7 @@
 
         // For -sourcepath, use the "sourcepath" value if present.
         // Otherwise default to the "srcdir" value.
-        Path sourcepath = null;
+        Path sourcepath;
         if (compileSourcepath != null) {
             sourcepath = compileSourcepath;
         } else {
@@ -58,14 +59,14 @@
         }
         // If the buildfile specifies sourcepath="", then don't
         // output any sourcepath.
-        if (sourcepath.size() > 0) {
+        if (!sourcepath.isEmpty()) {
             cmd.createArgument().setValue("-sourcepath");
             cmd.createArgument().setPath(sourcepath);
         }
 
         Path classpath = new Path(project);
 
-        if (bootclasspath == null || bootclasspath.size() == 0) {
+        if (bootclasspath == null || bootclasspath.isEmpty()) {
             // no bootclasspath, therefore, get one from the java runtime
             includeJavaRuntime = true;
         } else {
@@ -82,7 +83,7 @@
             classpath.append(new Path(project, jikesPath));
         }
 
-        if (extdirs != null && extdirs.size() > 0) {
+        if (!(extdirs == null || extdirs.isEmpty())) {
             cmd.createArgument().setValue("-extdirs");
             cmd.createArgument().setPath(extdirs);
         }
@@ -136,7 +137,7 @@
         if (attributes.getSource() != null) {
             cmd.createArgument().setValue("-source");
             String source = attributes.getSource();
-            if (source.equals("1.1") || source.equals("1.2")) {
+            if ("1.1".equals(source) || "1.2".equals(source)) {
                 // support for -source 1.1 and -source 1.2 has been
                 // added with JDK 1.4.2, Jikes doesn't like it
                 attributes.log("Jikes doesn't support '-source " + source
@@ -151,7 +152,7 @@
         int firstFileName = cmd.size();
 
         Path boot = getBootClassPath();
-        if (boot.size() > 0) {
+        if (!boot.isEmpty()) {
             cmd.createArgument().setValue("-bootclasspath");
             cmd.createArgument().setPath(boot);
         }
@@ -161,7 +162,7 @@
     }
 
     private void addPropertyParams(Commandline cmd) {
-        /**
+        /*
          * TODO
          * Perhaps we shouldn't use properties for these
          * three options (emacs mode, warnings and pedantic),
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java	2018-03-24 12:37:12.000000000 +0000
@@ -37,6 +37,7 @@
      * @return true if the compiler ran with a zero exit result (ok)
      * @exception BuildException if the compilation has problems.
      */
+    @Override
     public boolean execute() throws BuildException {
         attributes.log("Using jvc compiler", Project.MSG_VERBOSE);
 
@@ -45,7 +46,7 @@
         // jvc doesn't support bootclasspath dir (-bootclasspath)
         // so we'll emulate it for compatibility and convenience.
         Path p = getBootClassPath();
-        if (p.size() > 0) {
+        if (!p.isEmpty()) {
             classpath.append(p);
         }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java	2018-03-24 12:37:12.000000000 +0000
@@ -38,6 +38,7 @@
      * @return true if the compilation succeeded
      * @exception BuildException if the compilation has problems.
      */
+    @Override
     public boolean execute() throws BuildException {
         attributes.log("Using kjc compiler", Project.MSG_VERBOSE);
         Commandline cmd = setupKjcCommand();
@@ -73,7 +74,7 @@
 
         // kjc don't have bootclasspath option.
         Path p = getBootClassPath();
-        if (p.size() > 0) {
+        if (!p.isEmpty()) {
             cp.append(p);
         }
 
@@ -115,5 +116,3 @@
         return cmd;
     }
 }
-
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/Sj.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/Sj.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/compilers/Sj.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/compilers/Sj.java	2018-03-24 12:37:12.000000000 +0000
@@ -35,6 +35,7 @@
      * @return true if the compilation succeeded
      * @throws BuildException on error
      */
+    @Override
     public boolean execute() throws BuildException {
         attributes.log("Using symantec java compiler", Project.MSG_VERBOSE);
 
@@ -54,8 +55,8 @@
      * @return null.
      * @since Ant 1.6.3
      */
+    @Override
     protected String getNoDebugArgument() {
         return null;
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Concat.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Concat.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Concat.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Concat.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,6 @@
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,6 +26,7 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.Writer;
+import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
@@ -130,7 +130,7 @@
         public void setFile(File file) throws BuildException {
             // non-existing files are not allowed
             if (!file.exists()) {
-                throw new BuildException("File " + file + " does not exist.");
+                throw new BuildException("File %s does not exist.", file);
             }
 
             BufferedReader reader = null;
@@ -139,7 +139,7 @@
                     reader = new BufferedReader(new FileReader(file));
                 } else {
                     reader = new BufferedReader(
-                        new InputStreamReader(new FileInputStream(file),
+                        new InputStreamReader(Files.newInputStream(file.toPath()),
                                               this.encoding));
                 }
                 value = FileUtils.safeReadFully(reader);
@@ -181,12 +181,12 @@
             if (value == null) {
                 value = "";
             }
-            if (value.trim().length() == 0) {
+            if (value.trim().isEmpty()) {
                 value = "";
             }
             if (trimLeading) {
                 char[] current = value.toCharArray();
-                StringBuffer b = new StringBuffer(current.length);
+                StringBuilder b = new StringBuilder(current.length);
                 boolean startOfLine = true;
                 int pos = 0;
                 while (pos < current.length) {
@@ -253,6 +253,7 @@
          * @exception IOException - possibly thrown by the read for a reader
          *            object.
          */
+        @Override
         public int read() throws IOException {
             if (needAddSeparator) {
                 if (lastPos >= eolString.length()) {
@@ -287,6 +288,7 @@
          * @exception IOException - possibly thrown by the reads to the
          *            reader objects.
          */
+        @Override
         public int read(char[] cbuf, int off, int len)
             throws IOException {
 
@@ -334,14 +336,14 @@
             }
             if (amountRead == 0) {
                 return -1;
-            } else {
-                return amountRead;
             }
+            return amountRead;
         }
 
         /**
          * Close the current reader
          */
+        @Override
         public void close() throws IOException {
             if (reader != null) {
                 reader.close();
@@ -383,6 +385,7 @@
         private ConcatResource(ResourceCollection c) {
             this.c = c;
         }
+        @Override
         public InputStream getInputStream() {
             if (binary) {
                 ConcatResourceInputStream result = new ConcatResourceInputStream(c);
@@ -424,6 +427,7 @@
             return outputEncoding == null ? new ReaderInputStream(rdr)
                     : new ReaderInputStream(rdr, outputEncoding);
         }
+        @Override
         public String getName() {
             return resourceName == null
                     ? "concat (" + String.valueOf(c) + ")" : resourceName;
@@ -492,6 +496,7 @@
     private String resourceName;
 
     private ReaderFactory<Resource> resourceReaderFactory = new ReaderFactory<Resource>() {
+        @Override
         public Reader getReader(Resource o) throws IOException {
             InputStream is = o.getInputStream();
             return new BufferedReader(encoding == null
@@ -501,6 +506,7 @@
     };
 
     private ReaderFactory<Reader> identityReaderFactory = new ReaderFactory<Reader>() {
+        @Override
         public Reader getReader(Reader o) {
             return o;
         }
@@ -594,6 +600,7 @@
      * @since Ant 1.6
      * @deprecated use #setOverwrite instead
      */
+    @Deprecated
     public void setForce(boolean forceOverwrite) {
         this.forceOverwrite = forceOverwrite;
     }
@@ -753,11 +760,11 @@
      */
     public void setEol(FixCRLF.CrLf crlf) {
         String s = crlf.getValue();
-        if (s.equals("cr") || s.equals("mac")) {
+        if ("cr".equals(s) || "mac".equals(s)) {
             eolString = "\r";
-        } else if (s.equals("lf") || s.equals("unix")) {
+        } else if ("lf".equals(s) || "unix".equals(s)) {
             eolString = "\n";
-        } else if (s.equals("crlf") || s.equals("dos")) {
+        } else if ("crlf".equals(s) || "dos".equals(s)) {
             eolString = "\r\n";
         }
     }
@@ -786,6 +793,7 @@
     /**
      * Execute the concat task.
      */
+    @Override
     public void execute() {
         validate();
         if (binary && dest == null) {
@@ -797,7 +805,7 @@
             log(dest + " is up-to-date.", Project.MSG_VERBOSE);
             return;
         }
-        if (c.size() == 0 && ignoreEmpty) {
+        if (c.isEmpty() && ignoreEmpty) {
             return;
         }
         try {
@@ -816,15 +824,19 @@
      * Implement ResourceCollection.
      * @return Iterator&lt;Resource&gt;.
      */
+    @Override
     public Iterator<Resource> iterator() {
         validate();
-        return Collections.<Resource>singletonList(new ConcatResource(getResources())).iterator();
+        return Collections
+            .<Resource> singletonList(new ConcatResource(getResources()))
+            .iterator();
     }
 
     /**
      * Implement ResourceCollection.
      * @return 1.
      */
+    @Override
     public int size() {
         return 1;
     }
@@ -833,6 +845,7 @@
      * Implement ResourceCollection.
      * @return false.
      */
+    @Override
     public boolean isFilesystemOnly() {
         return false;
     }
@@ -853,8 +866,7 @@
             }
             if (encoding != null || outputEncoding != null) {
                 throw new BuildException(
-                    "Setting input or output encoding is incompatible with binary"
-                    + " concatenation");
+                    "Setting input or output encoding is incompatible with binary concatenation");
             }
             if (filterChains != null) {
                 throw new BuildException(
@@ -900,8 +912,9 @@
             checkDestNotInSources.add(rc);
             checkDestNotInSources.add(dest);
             if (checkDestNotInSources.size() > 0) {
-                throw new BuildException("Destination resource " + dest
-                        + " was specified as an input resource.");
+                throw new BuildException(
+                    "Destination resource %s was specified as an input resource.",
+                    dest);
             }
         }
         Restrict noexistRc = new Restrict();
@@ -920,12 +933,8 @@
         if (dest == null || forceOverwrite) {
             return false;
         }
-        for (Resource r : c) {
-            if (SelectorUtils.isOutOfDate(r, dest, FILE_UTILS.getFileTimestampGranularity())) {
-                return false;
-            }
-        }
-        return true;
+        return c.stream().noneMatch(r -> SelectorUtils.isOutOfDate(r, dest,
+            FILE_UTILS.getFileTimestampGranularity()));
     }
 
     /**
@@ -935,7 +944,7 @@
      * for &quot;ignorable whitespace&quot; as well.</p>
      */
     private void sanitizeText() {
-        if (textBuffer != null && "".equals(textBuffer.toString().trim())) {
+        if (textBuffer != null && textBuffer.toString().trim().isEmpty()) {
             textBuffer = null;
         }
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/And.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/And.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/And.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/And.java	2018-03-24 12:37:12.000000000 +0000
@@ -36,11 +36,11 @@
      * @return true if all the contained conditions evaluates to true
      * @exception BuildException if an error occurs
      */
+    @Override
     public boolean eval() throws BuildException {
-        Enumeration e = getConditions();
+        Enumeration<Condition> e = getConditions();
         while (e.hasMoreElements()) {
-            Condition c = (Condition) e.nextElement();
-            if (!c.eval()) {
+            if (!e.nextElement().eval()) {
                 return false;
             }
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/AntVersion.java	2018-03-24 12:37:12.000000000 +0000
@@ -36,6 +36,7 @@
      * Run as a task.
      * @throws BuildException if an error occurs.
      */
+    @Override
     public void execute() throws BuildException {
         if (propertyname == null) {
             throw new BuildException("'property' must be set.");
@@ -56,6 +57,7 @@
      * @return true if the condition is true.
      * @throws BuildException if an error occurs.
      */
+    @Override
     public boolean eval() throws BuildException {
         validate();
         DeweyDecimal actual = getVersion();
@@ -82,8 +84,8 @@
                 new DeweyDecimal(atLeast); //NOSONAR
             } catch (NumberFormatException e) {
                 throw new BuildException(
-                    "The 'atleast' attribute is not a Dewey Decimal eg 1.1.0 : "
-                    + atLeast);
+                    "The 'atleast' attribute is not a Dewey Decimal eg 1.1.0 : %s",
+                    atLeast);
             }
         } else {
             try {
@@ -91,8 +93,8 @@
                 new DeweyDecimal(exactly); //NOSONAR
             } catch (NumberFormatException e) {
                 throw new BuildException(
-                    "The 'exactly' attribute is not a Dewey Decimal eg 1.1.0 : "
-                    + exactly);
+                    "The 'exactly' attribute is not a Dewey Decimal eg 1.1.0 : %s",
+                    exactly);
             }
         }
     }
@@ -101,7 +103,7 @@
         Project p = new Project();
         p.init();
         char[] versionString = p.getProperty("ant.version").toCharArray();
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         boolean foundFirstDigit = false;
         for (int i = 0; i < versionString.length; i++) {
             if (Character.isDigit(versionString[i])) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/ConditionBase.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,7 +18,9 @@
 
 package org.apache.tools.ant.taskdefs.condition;
 
+import java.util.Collections;
 import java.util.Enumeration;
+import java.util.List;
 import java.util.Vector;
 
 import org.apache.tools.ant.ProjectComponent;
@@ -43,7 +45,7 @@
     /**
      *
      */
-    private Vector conditions = new Vector();
+    private List<Condition> conditions = new Vector<>();
 
     /**
      * Simple constructor.
@@ -77,8 +79,8 @@
      * @return an enumeration to use for iteration
      * @since 1.1
      */
-    protected final Enumeration getConditions() {
-        return conditions.elements();
+    protected final Enumeration<Condition> getConditions() {
+        return Collections.enumeration(conditions);
     }
 
     /**
@@ -108,7 +110,7 @@
      * @since 1.1
      */
     public void addAvailable(Available a) {
-        conditions.addElement(a);
+        conditions.add(a);
     }
 
     /**
@@ -118,7 +120,7 @@
      * @since 1.4, Ant 1.5
      */
     public void addChecksum(Checksum c) {
-        conditions.addElement(c);
+        conditions.add(c);
     }
 
     /**
@@ -128,7 +130,7 @@
      * @since 1.1
      */
     public void addUptodate(UpToDate u) {
-        conditions.addElement(u);
+        conditions.add(u);
     }
 
     /**
@@ -138,7 +140,7 @@
      * @since 1.1
      */
     public void addNot(Not n) {
-        conditions.addElement(n);
+        conditions.add(n);
     }
 
     /**
@@ -148,7 +150,7 @@
      * @since 1.1
      */
     public void addAnd(And a) {
-        conditions.addElement(a);
+        conditions.add(a);
     }
 
     /**
@@ -158,7 +160,7 @@
      * @since 1.1
      */
     public void addOr(Or o) {
-        conditions.addElement(o);
+        conditions.add(o);
     }
 
     /**
@@ -168,7 +170,7 @@
      * @since 1.1
      */
     public void addEquals(Equals e) {
-        conditions.addElement(e);
+        conditions.add(e);
     }
 
     /**
@@ -178,7 +180,7 @@
      * @since 1.1
      */
     public void addOs(Os o) {
-        conditions.addElement(o);
+        conditions.add(o);
     }
 
     /**
@@ -188,7 +190,7 @@
      * @since Ant 1.5
      */
     public void addIsSet(IsSet i) {
-        conditions.addElement(i);
+        conditions.add(i);
     }
 
     /**
@@ -198,7 +200,7 @@
      * @since Ant 1.5
      */
     public void addHttp(Http h) {
-        conditions.addElement(h);
+        conditions.add(h);
     }
 
     /**
@@ -208,7 +210,7 @@
      * @since Ant 1.5
      */
     public void addSocket(Socket s) {
-        conditions.addElement(s);
+        conditions.add(s);
     }
 
     /**
@@ -218,7 +220,7 @@
      * @since Ant 1.5
      */
     public void addFilesMatch(FilesMatch test) {
-        conditions.addElement(test);
+        conditions.add(test);
     }
 
     /**
@@ -228,7 +230,7 @@
      * @since Ant 1.5
      */
     public void addContains(Contains test) {
-        conditions.addElement(test);
+        conditions.add(test);
     }
 
     /**
@@ -238,7 +240,7 @@
      * @since Ant 1.5
      */
     public void addIsTrue(IsTrue test) {
-        conditions.addElement(test);
+        conditions.add(test);
     }
 
     /**
@@ -248,7 +250,7 @@
      * @since Ant 1.5
      */
     public void addIsFalse(IsFalse test) {
-        conditions.addElement(test);
+        conditions.add(test);
     }
 
     /**
@@ -258,7 +260,7 @@
      * @since Ant 1.6
      */
     public void addIsReference(IsReference i) {
-        conditions.addElement(i);
+        conditions.add(i);
     }
 
     /**
@@ -266,7 +268,7 @@
      * @param test the condition
      */
     public void addIsFileSelected(IsFileSelected test) {
-        conditions.addElement(test);
+        conditions.add(test);
     }
 
     /**
@@ -275,7 +277,7 @@
      * @since Ant 1.6
      */
     public void add(Condition c) {
-        conditions.addElement(c);
+        conditions.add(c);
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/Condition.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/Condition.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/Condition.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/Condition.java	2018-03-24 12:37:12.000000000 +0000
@@ -32,4 +32,3 @@
      */
     boolean eval() throws BuildException;
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/Contains.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/Contains.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/Contains.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/Contains.java	2018-03-24 12:37:12.000000000 +0000
@@ -63,10 +63,11 @@
      * @return true if the substring is within the string
      * @exception BuildException if the attributes are not set correctly
      */
+    @Override
     public boolean eval() throws BuildException {
         if (string == null || subString == null) {
-            throw new BuildException("both string and substring are required "
-                                     + "in contains");
+            throw new BuildException(
+                "both string and substring are required in contains");
         }
 
         return caseSensitive
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java	2018-03-24 12:37:12.000000000 +0000
@@ -44,7 +44,6 @@
 
     private boolean textfile = false;
 
-
     /**
      * Sets the File1 attribute
      *
@@ -54,7 +53,6 @@
         this.file1 = file1;
     }
 
-
     /**
      * Sets the File2 attribute
      *
@@ -78,13 +76,14 @@
      * @return true if the files are equal
      * @exception BuildException if it all went pear-shaped
      */
+    @Override
     public boolean eval()
         throws BuildException {
 
         //validate
         if (file1 == null || file2 == null) {
-            throw new BuildException("both file1 and file2 are required in "
-                                     + "filesmatch");
+            throw new BuildException(
+                "both file1 and file2 are required in filesmatch");
         }
 
         //#now match the files
@@ -98,4 +97,3 @@
         return matches;
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/HasFreeSpace.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/HasFreeSpace.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/HasFreeSpace.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/HasFreeSpace.java	2018-03-24 12:37:12.000000000 +0000
@@ -41,6 +41,7 @@
      * @return true if there enough free space.
      * @throws BuildException if there is a problem.
      */
+    @Override
     public boolean eval() throws BuildException {
         validate();
         try {
@@ -48,11 +49,11 @@
                 //reflection to avoid bootstrap/build problems
                 File fs = new File(partition);
                 ReflectWrapper w = new ReflectWrapper(fs);
-                long free = ((Long) w.invoke("getFreeSpace")).longValue();
+                long free = w.<Long> invoke("getFreeSpace").longValue();
                 return free >= StringUtils.parseHumanSizes(needed);
-            } else {
-                throw new BuildException("HasFreeSpace condition not supported on Java5 or less.");
             }
+            throw new BuildException(
+                "HasFreeSpace condition not supported on Java5 or less.");
         } catch (Exception e) {
             throw new BuildException(e);
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/HasMethod.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/HasMethod.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/HasMethod.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/HasMethod.java	2018-03-24 12:37:12.000000000 +0000
@@ -37,7 +37,6 @@
     private AntClassLoader loader;
     private boolean ignoreSystemClasses = false;
 
-
     /**
      * Set the classpath to be used when searching for classes and resources.
      *
@@ -104,7 +103,7 @@
     /**
      * Check if a given class can be loaded.
      */
-    private Class loadClass(String classname) {
+    private Class<?> loadClass(String classname) {
         try {
             if (ignoreSystemClasses) {
                 loader = getProject().createClassLoader(classpath);
@@ -114,25 +113,23 @@
                     return loader.findClass(classname);
                 } catch (SecurityException se) {
                     // class found but restricted name
-                    throw new BuildException("class \"" + classname
-                                             + "\" was found but a"
-                                             + " SecurityException has been"
-                                             + " raised while loading it",
-                                             se);
+                    throw new BuildException(
+                        "class \"" + classname
+                            + "\" was found but a SecurityException has been raised while loading it",
+                        se);
                 }
-            } else if (loader != null) {
+            }
+            if (loader != null) {
                 // How do we ever get here?
                 return loader.loadClass(classname);
-            } else {
-                ClassLoader l = this.getClass().getClassLoader();
-                // Can return null to represent the bootstrap class loader.
-                // see API docs of Class.getClassLoader.
-                if (l != null) {
-                    return Class.forName(classname, true, l);
-                } else {
-                    return Class.forName(classname);
-                }
             }
+            ClassLoader l = this.getClass().getClassLoader();
+            // Can return null to represent the bootstrap class loader.
+            // see API docs of Class.getClassLoader.
+            if (l != null) {
+                return Class.forName(classname, true, l);
+            }
+            return Class.forName(classname);
         } catch (ClassNotFoundException e) {
             throw new BuildException("class \"" + classname
                                      + "\" was not found");
@@ -143,15 +140,15 @@
         }
     }
 
-
     /** {@inheritDoc}. */
+    @Override
     public boolean eval() throws BuildException {
         if (classname == null) {
             throw new BuildException("No classname defined");
         }
         ClassLoader preLoadClass = loader;
         try {
-            Class clazz = loadClass(classname);
+            Class<?> clazz = loadClass(classname);
             if (method != null) {
                 return isMethodFound(clazz);
             }
@@ -167,7 +164,7 @@
         }
     }
 
-    private boolean isFieldFound(Class clazz) {
+    private boolean isFieldFound(Class<?> clazz) {
         Field[] fields = clazz.getDeclaredFields();
         for (int i = 0; i < fields.length; i++) {
             Field fieldEntry = fields[i];
@@ -178,7 +175,7 @@
         return false;
     }
 
-    private boolean isMethodFound(Class clazz) {
+    private boolean isMethodFound(Class<?> clazz) {
         Method[] methods = clazz.getDeclaredMethods();
         for (int i = 0; i < methods.length; i++) {
             Method methodEntry = methods[i];
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/Http.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/Http.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/Http.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,6 +18,7 @@
 
 package org.apache.tools.ant.taskdefs.condition;
 
+import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.ProtocolException;
@@ -44,6 +45,8 @@
     private String requestMethod = DEFAULT_REQUEST_METHOD;
     private boolean followRedirects = true;
 
+    private int errorsBeginAt = ERROR_BEGINS;
+
     /**
      * Set the url attribute
      * @param url the url of the request
@@ -52,8 +55,6 @@
         spec = url;
     }
 
-    private int errorsBeginAt = ERROR_BEGINS;
-
     /**
      * Set the errorsBeginAt attribute
      * @param errorsBeginAt number at which errors begin at, default is
@@ -95,6 +96,7 @@
      * @return true if the HTTP request succeeds
      * @exception BuildException if an error occurs
      */
+    @Override
     public boolean eval() throws BuildException {
         if (spec == null) {
             throw new BuildException("No url specified in http condition");
@@ -119,7 +121,7 @@
             } catch (ProtocolException pe) {
                 throw new BuildException("Invalid HTTP protocol: "
                                          + requestMethod, pe);
-            } catch (java.io.IOException e) {
+            } catch (IOException e) {
                 return false;
             }
         } catch (MalformedURLException e) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/IsLastModified.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/IsLastModified.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/IsLastModified.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/IsLastModified.java	2018-03-24 12:37:12.000000000 +0000
@@ -69,9 +69,11 @@
      */
     public void setPattern(final String pattern) {
         dfFactory = new Touch.DateFormatFactory() {
+            @Override
             public DateFormat getPrimaryFormat() {
                 return new SimpleDateFormat(pattern);
             }
+            @Override
             public DateFormat getFallbackFormat() {
                 return null;
             }
@@ -104,8 +106,8 @@
      */
     protected void validate() throws BuildException {
         if (millis >= 0 && dateTime != null) {
-            throw new BuildException("Only one of dateTime and millis can be"
-                                     + " set");
+            throw new BuildException(
+                "Only one of dateTime and millis can be set");
         }
         if (millis < 0 && dateTime == null) {
             throw new BuildException("millis or dateTime is required");
@@ -129,7 +131,7 @@
             return System.currentTimeMillis();
         }
         DateFormat df = dfFactory.getPrimaryFormat();
-        ParseException pe = null;
+        ParseException pe;
         try {
             return df.parse(dateTime).getTime();
         } catch (ParseException peOne) {
@@ -144,11 +146,7 @@
                 }
             }
         }
-        if (pe != null) {
-            throw new BuildException(pe.getMessage(), pe, getLocation());
-        }
-        /* NOTREACHED */
-        return 0;
+        throw new BuildException(pe.getMessage(), pe, getLocation());
     }
 
     /**
@@ -156,6 +154,7 @@
      * @return true or false depending on the comparison mode and the time of the resource
      * @throws BuildException if something goes wrong
      */
+    @Override
     public boolean eval() throws BuildException {
         validate();
         long expected = getMillis();
@@ -209,6 +208,7 @@
             setValue(s);
         }
 
+        @Override
         public String[] getValues() {
             return new String[] {
                 EQUALS_TEXT, BEFORE_TEXT, AFTER_TEXT, NOT_BEFORE_TEXT,
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java	2018-03-24 12:37:12.000000000 +0000
@@ -52,16 +52,13 @@
  * @since Ant 1.7
  */
 public class IsReachable extends ProjectComponent implements Condition {
-
-    private static final int SECOND = 1000; // millis per second
-    private String host;
-    private String url;
-
     /**
      * The default timeout.
      */
     public static final int DEFAULT_TIMEOUT = 30;
-    private int timeout = DEFAULT_TIMEOUT;
+
+    private static final int SECOND = 1000; // millis per second
+
     /**
      * Error when no hostname is defined
      */
@@ -91,6 +88,11 @@
     /** The method name to look for in InetAddress */
     public static final String METHOD_NAME = "isReachable";
 
+    private String host;
+    private String url;
+
+    private int timeout = DEFAULT_TIMEOUT;
+
     /**
      * Set the host to ping.
      *
@@ -129,8 +131,6 @@
         return string == null || string.length() == 0;
     }
 
-    private static Class[] parameterTypes = {Integer.TYPE};
-
     /**
      * Evaluate the condition.
      *
@@ -139,6 +139,7 @@
      * @throws org.apache.tools.ant.BuildException
      *          if an error occurs
      */
+    @Override
     public boolean eval() throws BuildException {
         if (empty(host) && empty(url)) {
             throw new BuildException(ERROR_NO_HOSTNAME);
@@ -174,15 +175,12 @@
                 Project.MSG_VERBOSE);
         boolean reachable;
         //Java1.5: reachable = address.isReachable(timeout * 1000);
-        Method reachableMethod = null;
         try {
-            reachableMethod = InetAddress.class.getMethod(METHOD_NAME,
-                    parameterTypes);
-            final Object[] params = new Object[1];
-            params[0] = new Integer(timeout * SECOND);
+            Method reachableMethod =
+                InetAddress.class.getMethod(METHOD_NAME, Integer.class);
             try {
-                reachable = ((Boolean) reachableMethod.invoke(address, params))
-                        .booleanValue();
+                reachable = ((Boolean) reachableMethod.invoke(address,
+                    Integer.valueOf(timeout * SECOND))).booleanValue();
             } catch (final IllegalAccessException e) {
                 //utterly implausible, but catered for anyway
                 throw new BuildException("When calling " + reachableMethod);
@@ -198,7 +196,6 @@
             log("Not found: InetAddress." + METHOD_NAME, Project.MSG_VERBOSE);
             log(MSG_NO_REACHABLE_TEST);
             reachable = true;
-
         }
 
         log("host is" + (reachable ? "" : " not") + " reachable", Project.MSG_VERBOSE);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/IsReference.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/IsReference.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/IsReference.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/IsReference.java	2018-03-24 12:37:12.000000000 +0000
@@ -56,34 +56,35 @@
      *              the reference is the same type
      * @exception BuildException if an error occurs
      */
+    @Override
     public boolean eval() throws BuildException {
         if (ref == null) {
-            throw new BuildException("No reference specified for isreference "
-                                     + "condition");
+            throw new BuildException(
+                "No reference specified for isreference condition");
         }
 
         String key = ref.getRefId();
         if (!getProject().hasReference(key)) {
             return false;
-        } else if (type == null) {
+        }
+        if (type == null) {
             return true;
-        } else {
-            Object o = getProject().getReference(key);
-            Class typeClass =
-                (Class) getProject().getDataTypeDefinitions().get(type);
-
-            if (typeClass == null) {
-                typeClass =
-                    (Class) getProject().getTaskDefinitions().get(type);
-            }
+        }
+        Object o = getProject().getReference(key);
+        Class<?> typeClass =
+            getProject().getDataTypeDefinitions().get(type);
 
-            if (typeClass == null) {
-                // don't know the type, should throw exception instead?
-                return false;
-            }
+        if (typeClass == null) {
+            typeClass =
+                getProject().getTaskDefinitions().get(type);
+        }
 
-            return typeClass.isAssignableFrom(o.getClass());
+        if (typeClass == null) {
+            // don't know the type, should throw exception instead?
+            return false;
         }
+
+        return typeClass.isAssignableFrom(o.getClass());
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/IsSet.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/IsSet.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/IsSet.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/IsSet.java	2018-03-24 12:37:12.000000000 +0000
@@ -41,9 +41,11 @@
      * @return true if the property exists
      * @exception BuildException if the property attribute is not set
      */
+    @Override
     public boolean eval() throws BuildException {
         if (property == null) {
-            throw new BuildException("No property specified for isset " + "condition");
+            throw new BuildException(
+                "No property specified for isset condition");
         }
         return getProject().getProperty(property) != null;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/IsSigned.java	2018-03-24 12:37:12.000000000 +0000
@@ -71,13 +71,11 @@
      */
     public static boolean isSigned(File zipFile, String name)
         throws IOException {
-        ZipFile jarFile = null;
-        try {
-            jarFile = new ZipFile(zipFile);
+        try (ZipFile jarFile = new ZipFile(zipFile)) {
             if (null == name) {
-                Enumeration entries = jarFile.getEntries();
+                Enumeration<ZipEntry> entries = jarFile.getEntries();
                 while (entries.hasMoreElements()) {
-                    String eName = ((ZipEntry) entries.nextElement()).getName();
+                    String eName = entries.nextElement().getName();
                     if (eName.startsWith(SIG_START)
                         && eName.endsWith(SIG_END)) {
                         return true;
@@ -98,8 +96,6 @@
             }
 
             return shortSig || longSig;
-        } finally {
-            ZipFile.closeQuietly(jarFile);
         }
     }
 
@@ -109,6 +105,7 @@
      * specified, if the file contains a signature.
      * @return true if the file is signed.
      */
+    @Override
     public boolean eval() {
         if (file == null) {
             throw new BuildException("The file attribute must be set.");
@@ -135,7 +132,7 @@
     }
 
     private static String replaceInvalidChars(final String name) {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         final int len = name.length();
         boolean changes = false;
         for (int i = 0; i < len; i++) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/IsTrue.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/IsTrue.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/IsTrue.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/IsTrue.java	2018-03-24 12:37:12.000000000 +0000
@@ -44,6 +44,7 @@
      * @return the value
      * @throws BuildException if someone forgot to spec a value
      */
+    @Override
     public boolean eval() throws BuildException {
         if (value == null) {
             throw new BuildException("Nothing to test for truth");
@@ -52,4 +53,3 @@
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/JavaVersion.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/JavaVersion.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/JavaVersion.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/JavaVersion.java	2018-03-24 12:37:12.000000000 +0000
@@ -23,7 +23,7 @@
 
 /**
  * An Java version condition.
- * @since Java 1.9.10
+ * @since Java 1.10.2
  */
 public class JavaVersion implements Condition {
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/Not.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/Not.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/Not.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/Not.java	2018-03-24 12:37:12.000000000 +0000
@@ -36,15 +36,16 @@
      * @return true if the condition is true.
      * @throws BuildException if the condition is not configured correctly.
      */
+    @Override
     public boolean eval() throws BuildException {
         if (countConditions() > 1) {
-            throw new BuildException("You must not nest more than one "
-                + "condition into <not>");
+            throw new BuildException(
+                "You must not nest more than one condition into <not>");
         }
         if (countConditions() < 1) {
             throw new BuildException("You must nest a condition into <not>");
         }
-        return !((Condition) getConditions().nextElement()).eval();
+        return !getConditions().nextElement().eval();
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/Or.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/Or.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/Or.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/Or.java	2018-03-24 12:37:12.000000000 +0000
@@ -36,10 +36,11 @@
      * @return true if any of the contained conditions evaluate to true
      * @exception BuildException if an error occurs
      */
+    @Override
     public boolean eval() throws BuildException {
-        Enumeration e = getConditions();
+        Enumeration<Condition> e = getConditions();
         while (e.hasMoreElements()) {
-            Condition c = (Condition) e.nextElement();
+            Condition c = e.nextElement();
             if (c.eval()) {
                 return true;
             }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/Os.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/Os.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/Os.java	2018-03-24 12:37:12.000000000 +0000
@@ -38,22 +38,6 @@
         System.getProperty("path.separator");
 
     /**
-     * OS family to look for
-     */
-    private String family;
-    /**
-     * Name of OS
-     */
-    private String name;
-    /**
-     * version of OS
-     */
-    private String version;
-    /**
-     * OS architecture
-     */
-    private String arch;
-    /**
      * OS family that can be tested for. {@value}
      */
     public static final String FAMILY_WINDOWS = "windows";
@@ -108,6 +92,23 @@
     private static final String DARWIN = "darwin";
 
     /**
+     * OS family to look for
+     */
+    private String family;
+    /**
+     * Name of OS
+     */
+    private String name;
+    /**
+     * version of OS
+     */
+    private String version;
+    /**
+     * OS architecture
+     */
+    private String arch;
+
+    /**
      * Default constructor
      *
      */
@@ -179,6 +180,7 @@
      * @throws BuildException if there is an error.
      * @see Os#setFamily(String)
      */
+    @Override
     public boolean eval() throws BuildException {
         return isOs(family, name, arch, version);
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/ParserSupports.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/ParserSupports.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/ParserSupports.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/ParserSupports.java	2018-03-24 12:37:12.000000000 +0000
@@ -31,9 +31,6 @@
  */
 public class ParserSupports extends ProjectComponent implements Condition {
 
-    private String feature;
-    private String property;
-    private String value;
     // Error messages
     /** error - combined attributes not allowed */
     public static final String ERROR_BOTH_ATTRIBUTES =
@@ -56,6 +53,10 @@
     public static final String ERROR_NO_VALUE =
         "A value is needed when testing for property support";
 
+    private String feature;
+    private String property;
+    private String value;
+
     /**
      * Feature to probe for.
      * @param feature the feature to probe for.
@@ -82,6 +83,7 @@
     }
 
     /** {@inheritDoc}. */
+    @Override
     public boolean eval() throws BuildException {
         if (feature != null && property != null) {
             throw new BuildException(ERROR_BOTH_ATTRIBUTES);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java	2018-03-24 12:37:12.000000000 +0000
@@ -88,8 +88,8 @@
                         o = rc.iterator().next();
                     }
                 } else {
-                    throw new BuildException(
-                        "Illegal value at '" + refid + "': " + String.valueOf(o));
+                    throw new BuildException("Illegal value at '%s': %s", refid,
+                        o);
                 }
             }
             this.resource = (Resource) o;
@@ -122,8 +122,8 @@
             resolveRefid();
         }
         if (resource == null || substring == null) {
-            throw new BuildException("both resource and substring are required "
-                                     + "in <resourcecontains>");
+            throw new BuildException(
+                "both resource and substring are required in <resourcecontains>");
         }
     }
 
@@ -132,6 +132,7 @@
      * @return true if the substring is contained in the resource
      * @throws BuildException if there is a problem.
      */
+    @Override
     public synchronized boolean eval() throws BuildException {
         validate();
 
@@ -146,9 +147,8 @@
             return false;
         }
 
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new InputStreamReader(resource.getInputStream()));
+        try (BufferedReader reader = new BufferedReader(
+            new InputStreamReader(resource.getInputStream()))) {
             String contents = FileUtils.safeReadFully(reader);
             String sub = substring;
             if (!casesensitive) {
@@ -158,8 +158,6 @@
             return contents.indexOf(sub) >= 0;
         } catch (IOException e) {
             throw new BuildException("There was a problem accessing resource : " + resource);
-        } finally {
-            FileUtils.close(reader);
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/ResourcesMatch.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/ResourcesMatch.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/ResourcesMatch.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/ResourcesMatch.java	2018-03-24 12:37:12.000000000 +0000
@@ -65,6 +65,7 @@
      * @return true if all resources are equal.
      * @exception BuildException if there is an error.
      */
+    @Override
     public boolean eval() throws BuildException {
         if (resources == null) {
             throw new BuildException(
@@ -72,11 +73,11 @@
         }
         if (resources.size() > 1) {
             Iterator<Resource> i = resources.iterator();
-            Resource r1 = (Resource) i.next();
-            Resource r2 = null;
+            Resource r1 = i.next();
+            Resource r2;
 
             while (i.hasNext()) {
-                r2 = (Resource) i.next();
+                r2 = i.next();
                 try {
                     if (!ResourceUtils.contentEquals(r1, r2, asText)) {
                         return false;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java	2018-03-24 12:37:12.000000000 +0000
@@ -57,31 +57,21 @@
      * @return true if a socket can be created
      * @exception BuildException if the attributes are not set
      */
+    @Override
     public boolean eval() throws BuildException {
         if (server == null) {
-            throw new BuildException("No server specified in socket "
-                                     + "condition");
+            throw new BuildException("No server specified in socket condition");
         }
         if (port == 0) {
             throw new BuildException("No port specified in socket condition");
         }
         log("Checking for listener at " + server + ":" + port,
             Project.MSG_VERBOSE);
-        java.net.Socket s = null;
-        try {
-            s = new java.net.Socket(server, port);
+        try (java.net.Socket s = new java.net.Socket(server, port)) {
+            return true;
         } catch (IOException e) {
             return false;
-        } finally {
-          if (s != null) {
-            try {
-              s.close();
-            } catch (IOException ioe) {
-              // Intentionally left blank
-            }
-          }
         }
-        return true;
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/TypeFound.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/TypeFound.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/TypeFound.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/TypeFound.java	2018-03-24 12:37:12.000000000 +0000
@@ -58,7 +58,6 @@
      * @return true if the typename exists
      */
     protected boolean doesTypeExist(String typename) {
-
         ComponentHelper helper =
             ComponentHelper.getComponentHelper(getProject());
         String componentName = ProjectHelper.genComponentName(uri, typename);
@@ -81,6 +80,7 @@
      * @return true if the condition is true
      * @exception BuildException if an error occurs
      */
+    @Override
     public boolean eval() throws BuildException {
         if (name == null) {
             throw new BuildException("No type specified");
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java	2018-03-24 12:37:12.000000000 +0000
@@ -34,12 +34,13 @@
      * @throws org.apache.tools.ant.BuildException
      *          if an error occurs.
      */
+    @Override
     public boolean eval() throws BuildException {
-        Enumeration e = getConditions();
+        Enumeration<Condition> e = getConditions();
         //initial state is false.
         boolean state = false;
         while (e.hasMoreElements()) {
-            Condition c = (Condition) e.nextElement();
+            Condition c = e.nextElement();
             //every condition is xored against the previous one
             state ^= c.eval();
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -107,16 +107,18 @@
      */
     public void execute() throws BuildException {
         if (countConditions() > 1) {
-            throw new BuildException("You must not nest more than one condition into <"
-                    + getTaskName() + ">");
+            throw new BuildException(
+                "You must not nest more than one condition into <%s>",
+                getTaskName());
         }
         if (countConditions() < 1) {
-            throw new BuildException("You must nest a condition into <" + getTaskName() + ">");
+            throw new BuildException("You must nest a condition into <%s>",
+                getTaskName());
         }
         if (property == null) {
             throw new BuildException("The property attribute is required.");
         }
-        Condition c = (Condition) getConditions().nextElement();
+        Condition c = getConditions().nextElement();
         if (c.eval()) {
             log("Condition true; setting " + property + " to " + value, Project.MSG_DEBUG);
             PropertyHelper.getPropertyHelper(getProject()).setNewProperty(property, value);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Copydir.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Copydir.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Copydir.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Copydir.java	2018-03-24 12:37:12.000000000 +0000
@@ -35,6 +35,7 @@
  * @deprecated The copydir task is deprecated since Ant 1.2.  Use copy instead.
  */
 
+@Deprecated
 public class Copydir extends MatchingTask {
 
     private File srcDir;
@@ -42,7 +43,7 @@
     private boolean filtering = false;
     private boolean flatten = false;
     private boolean forceOverwrite = false;
-    private Hashtable<String, String> filecopyList = new Hashtable<String, String>();
+    private Map<String, String> filecopyList = new Hashtable<>();
 
     /**
      * The src attribute
@@ -94,6 +95,7 @@
      * Execute the task.
      * @throws BuildException on error
      */
+    @Override
     public void execute() throws BuildException {
         log("DEPRECATED - The copydir task is deprecated.  Use copy instead.");
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Copyfile.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Copyfile.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Copyfile.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Copyfile.java	2018-03-24 12:37:12.000000000 +0000
@@ -34,6 +34,7 @@
  * copy instead.
  */
 
+@Deprecated
 public class Copyfile extends Task {
 
     private File srcFile;
@@ -80,6 +81,7 @@
      * Execute the task.
      * @throws BuildException on error
      */
+    @Override
     public void execute() throws BuildException {
         log("DEPRECATED - The copyfile task is deprecated.  Use copy instead.");
 
@@ -107,9 +109,9 @@
             try {
                 getProject().copyFile(srcFile, destFile, filtering, forceOverwrite);
             } catch (IOException ioe) {
-                String msg = "Error copying file: " + srcFile.getAbsolutePath()
-                    + " due to " + ioe.getMessage();
-                throw new BuildException(msg);
+                throw new BuildException(
+                    "Error copying file: " + srcFile.getAbsolutePath()
+                        + " due to " + ioe.getMessage());
             }
         }
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Copy.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Copy.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Copy.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Copy.java	2018-03-24 12:37:12.000000000 +0000
@@ -26,6 +26,7 @@
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.Vector;
 
 import org.apache.tools.ant.BuildException;
@@ -75,7 +76,7 @@
     protected File file = null;     // the source file
     protected File destFile = null; // the destination file
     protected File destDir = null;  // the destination directory
-    protected Vector<ResourceCollection> rcs = new Vector<ResourceCollection>();
+    protected Vector<ResourceCollection> rcs = new Vector<>();
     // here to provide API backwards compatibility
     protected Vector<ResourceCollection> filesets = rcs;
 
@@ -88,15 +89,15 @@
     protected boolean includeEmpty = true;
     protected boolean failonerror = true;
 
-    protected Hashtable<String, String[]> fileCopyMap = new LinkedHashtable<String, String[]>();
-    protected Hashtable<String, String[]> dirCopyMap = new LinkedHashtable<String, String[]>();
-    protected Hashtable<File, File> completeDirMap = new LinkedHashtable<File, File>();
+    protected Hashtable<String, String[]> fileCopyMap = new LinkedHashtable<>();
+    protected Hashtable<String, String[]> dirCopyMap = new LinkedHashtable<>();
+    protected Hashtable<File, File> completeDirMap = new LinkedHashtable<>();
 
     protected Mapper mapperElement = null;
     protected FileUtils fileUtils;
     //CheckStyle:VisibilityModifier ON
-    private final Vector<FilterChain> filterChains = new Vector<FilterChain>();
-    private final Vector<FilterSet> filterSets = new Vector<FilterSet>();
+    private final Vector<FilterChain> filterChains = new Vector<>();
+    private final Vector<FilterSet> filterSets = new Vector<>();
     private String inputEncoding = null;
     private String outputEncoding = null;
     private long granularity = 0;
@@ -476,18 +477,17 @@
                separate lists and then each list is handled in one go.
             */
 
-            final HashMap<File, List<String>> filesByBasedir = new HashMap<File, List<String>>();
-            final HashMap<File, List<String>> dirsByBasedir = new HashMap<File, List<String>>();
-            final HashSet<File> baseDirs = new HashSet<File>();
-            final ArrayList<Resource> nonFileResources = new ArrayList<Resource>();
-            final int size = rcs.size();
-            for (int i = 0; i < size; i++) {
-                final ResourceCollection rc = rcs.elementAt(i);
+            final Map<File, List<String>> filesByBasedir = new HashMap<>();
+            final Map<File, List<String>> dirsByBasedir = new HashMap<>();
+            final Set<File> baseDirs = new HashSet<>();
+            final List<Resource> nonFileResources = new ArrayList<>();
+
+            for (ResourceCollection rc : rcs) {
 
                 // Step (1) - beware of the ZipFileSet
                 if (rc instanceof FileSet && rc.isFilesystemOnly()) {
                     final FileSet fs = (FileSet) rc;
-                    DirectoryScanner ds = null;
+                    DirectoryScanner ds;
                     try {
                         ds = fs.getDirectoryScanner(getProject());
                     } catch (final BuildException e) {
@@ -495,12 +495,11 @@
                             || !getMessage(e).endsWith(DirectoryScanner
                                                        .DOES_NOT_EXIST_POSTFIX)) {
                             throw e;
-                        } else {
-                            if (!quiet) {
-                                log("Warning: " + getMessage(e), Project.MSG_ERR);
-                            }
-                            continue;
                         }
+                        if (!quiet) {
+                            log("Warning: " + getMessage(e), Project.MSG_ERR);
+                        }
+                        continue;
                     }
                     final File fromDir = fs.getDir(getProject());
 
@@ -576,7 +575,7 @@
                 }
             }
 
-            if (nonFileResources.size() > 0 || singleResource != null) {
+            if (!nonFileResources.isEmpty() || singleResource != null) {
                 final Resource[] nonFiles =
                     nonFileResources.toArray(new Resource[nonFileResources.size()]);
                 // restrict to out-of-date resources
@@ -647,8 +646,9 @@
         }
     }
 
-    private void iterateOverBaseDirs(
-        final HashSet<File> baseDirs, final HashMap<File, List<String>> dirsByBasedir, final HashMap<File, List<String>> filesByBasedir) {
+    private void iterateOverBaseDirs(final Set<File> baseDirs,
+        final Map<File, List<String>> dirsByBasedir,
+        final Map<File, List<String>> filesByBasedir) {
 
         for (final File f : baseDirs) {
             final List<String> files = filesByBasedir.get(f);
@@ -674,7 +674,7 @@
      * @exception BuildException if an error occurs.
      */
     protected void validateAttributes() throws BuildException {
-        if (file == null && rcs.size() == 0) {
+        if (file == null && rcs.isEmpty()) {
             throw new BuildException(
                 "Specify at least one source--a file or a resource collection.");
         }
@@ -688,36 +688,36 @@
         if (file != null && file.isDirectory()) {
             throw new BuildException("Use a resource collection to copy directories.");
         }
-        if (destFile != null && rcs.size() > 0) {
+        if (destFile != null && !rcs.isEmpty()) {
             if (rcs.size() > 1) {
                 throw new BuildException(
                     "Cannot concatenate multiple files into a single file.");
-            } else {
-                final ResourceCollection rc = rcs.elementAt(0);
-                if (!rc.isFilesystemOnly() && !supportsNonFileResources()) {
-                    throw new BuildException("Only FileSystem resources are"
-                                             + " supported.");
-                }
-                if (rc.size() == 0) {
-                    throw new BuildException(MSG_WHEN_COPYING_EMPTY_RC_TO_FILE);
-                } else if (rc.size() == 1) {
-                    final Resource res = rc.iterator().next();
-                    final FileProvider r = res.as(FileProvider.class);
-                    if (file == null) {
-                        if (r != null) {
-                            file = r.getFile();
-                        } else {
-                            singleResource = res;
-                        }
-                        rcs.removeElementAt(0);
+            }
+            final ResourceCollection rc = rcs.elementAt(0);
+            if (!rc.isFilesystemOnly() && !supportsNonFileResources()) {
+                throw new BuildException(
+                    "Only FileSystem resources are supported.");
+            }
+            if (rc.isEmpty()) {
+                throw new BuildException(MSG_WHEN_COPYING_EMPTY_RC_TO_FILE);
+            }
+            if (rc.size() == 1) {
+                final Resource res = rc.iterator().next();
+                final FileProvider r = res.as(FileProvider.class);
+                if (file == null) {
+                    if (r != null) {
+                        file = r.getFile();
                     } else {
-                        throw new BuildException(
-                            "Cannot concatenate multiple files into a single file.");
+                        singleResource = res;
                     }
+                    rcs.removeElementAt(0);
                 } else {
                     throw new BuildException(
                         "Cannot concatenate multiple files into a single file.");
                 }
+            } else {
+                throw new BuildException(
+                    "Cannot concatenate multiple files into a single file.");
             }
         }
         if (destFile != null) {
@@ -788,6 +788,9 @@
         for (int i = 0; i < toCopy.length; i++) {
             final File src = new File(fromDir, toCopy[i]);
             final String[] mappedFiles = mapper.mapFileName(toCopy[i]);
+            if (mappedFiles == null || mappedFiles.length == 0) {
+                continue;
+            }
 
             if (!enableMultipleMappings) {
                 map.put(src.getAbsolutePath(),
@@ -813,37 +816,29 @@
      */
     protected Map<Resource, String[]> buildMap(final Resource[] fromResources, final File toDir,
                            final FileNameMapper mapper) {
-        final HashMap<Resource, String[]> map = new HashMap<Resource, String[]>();
-        Resource[] toCopy = null;
+        final Map<Resource, String[]> map = new HashMap<>();
+        Resource[] toCopy;
         if (forceOverwrite) {
-            final Vector<Resource> v = new Vector<Resource>();
+            final List<Resource> v = new ArrayList<>();
             for (int i = 0; i < fromResources.length; i++) {
                 if (mapper.mapFileName(fromResources[i].getName()) != null) {
-                    v.addElement(fromResources[i]);
+                    v.add(fromResources[i]);
                 }
             }
-            toCopy = new Resource[v.size()];
-            v.copyInto(toCopy);
+            toCopy = v.toArray(new Resource[v.size()]);
         } else {
             toCopy = ResourceUtils.selectOutOfDateSources(this, fromResources,
                                                           mapper,
-                                                          new ResourceFactory() {
-                                            public Resource getResource(final String name) {
-                                                return new FileResource(toDir, name);
-                                            }
-                                                          },
+                                                          (ResourceFactory) name -> new FileResource(toDir, name),
                                                           granularity);
         }
         for (int i = 0; i < toCopy.length; i++) {
             final String[] mappedFiles = mapper.mapFileName(toCopy[i].getName());
-            for (int j = 0; j < mappedFiles.length; j++) {
-                if (mappedFiles[j] == null) {
-                    throw new BuildException("Can't copy a resource without a"
-                                             + " name if the mapper doesn't"
-                                             + " provide one.");
-                }
+            if (mappedFiles == null || mappedFiles.length == 0) {
+                throw new BuildException("Can't copy a resource without a"
+                        + " name if the mapper doesn't"
+                        + " provide one.");
             }
-
             if (!enableMultipleMappings) {
                 map.put(toCopy[i],
                         new String[] {new File(toDir, mappedFiles[0]).getAbsolutePath()});
@@ -863,7 +858,7 @@
      * This is a good method for subclasses to override.
      */
     protected void doFileOperations() {
-        if (fileCopyMap.size() > 0) {
+        if (!fileCopyMap.isEmpty()) {
             log("Copying " + fileCopyMap.size()
                 + " file" + (fileCopyMap.size() == 1 ? "" : "s")
                 + " to " + destDir.getAbsolutePath());
@@ -872,9 +867,7 @@
                 final String fromFile = e.getKey();
                 final String[] toFiles = e.getValue();
 
-                for (int i = 0; i < toFiles.length; i++) {
-                    final String toFile = toFiles[i];
-
+                for (final String toFile : toFiles) {
                     if (fromFile.equals(toFile)) {
                         log("Skipping self-copy of " + fromFile, verbosity);
                         continue;
@@ -918,8 +911,8 @@
         if (includeEmpty) {
             int createCount = 0;
             for (final String[] dirs : dirCopyMap.values()) {
-                for (int i = 0; i < dirs.length; i++) {
-                    final File d = new File(dirs[i]);
+                for (String dir : dirs) {
+                    final File d = new File(dir);
                     if (!d.exists()) {
                         if (!(d.mkdirs() || d.isDirectory())) {
                             log("Unable to create directory "
@@ -949,7 +942,7 @@
      * @since Ant 1.7
      */
     protected void doResourceOperations(final Map<Resource, String[]> map) {
-        if (map.size() > 0) {
+        if (!map.isEmpty()) {
             log("Copying " + map.size()
                 + " resource" + (map.size() == 1 ? "" : "s")
                 + " to " + destDir.getAbsolutePath());
@@ -1028,7 +1021,7 @@
             baseDir = getKeyFile(baseDir);
             List<String> l = m.get(baseDir);
             if (l == null) {
-                l = new ArrayList<String>(names.length);
+                l = new ArrayList<>(names.length);
                 m.put(baseDir, l);
             }
             l.addAll(java.util.Arrays.asList(names));
@@ -1087,7 +1080,7 @@
      */
     private String getDueTo(final Exception ex) {
         final boolean baseIOException = ex.getClass() == IOException.class;
-        final StringBuffer message = new StringBuffer();
+        final StringBuilder message = new StringBuilder();
         if (!baseIOException || ex.getMessage() == null) {
             message.append(ex.getClass().getName());
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/CopyPath.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/CopyPath.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/CopyPath.java	2018-03-24 12:37:12.000000000 +0000
@@ -39,7 +39,7 @@
  * obsoleted by ResourceCollection support in Copy available since Ant
  * 1.7.0.  Don't use it.
  */
-
+@Deprecated
 public class CopyPath extends Task {
 
     // Error messages
@@ -182,6 +182,9 @@
             String sourceFileName = sourceFiles[sources];
             File sourceFile = new File(sourceFileName);
             String[] toFiles = (String[]) mapper.mapFileName(sourceFileName);
+            if (toFiles == null) {
+                continue;
+            }
 
             for (int i = 0; i < toFiles.length; i++) {
                 String destFileName = toFiles[i];
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,24 +20,23 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
-import java.util.Enumeration;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.StringTokenizer;
 import java.util.TimeZone;
 
 import org.apache.tools.ant.taskdefs.AbstractCvsTask;
-import org.apache.tools.ant.util.CollectionUtils;
+import org.apache.tools.ant.taskdefs.AbstractCvsTask.Module;
 
 /**
  * A class used to parse the output of the CVS log command.
  *
  */
 class ChangeLogParser {
-    //private static final int GET_ENTRY = 0;
     private static final int GET_FILE = 1;
     private static final int GET_DATE = 2;
     private static final int GET_COMMENT = 3;
@@ -53,9 +52,6 @@
     private final SimpleDateFormat cvs1129InputDate =
         new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z", Locale.US);
 
-    static {
-    }
-
     //The following is data used while processing stdout of CVS command
     private String file;
     private String date;
@@ -67,32 +63,29 @@
     private int status = GET_FILE;
 
     /** rcs entries */
-    private final Hashtable entries = new Hashtable();
+    private final Map<String, CVSEntry> entries = new Hashtable<>();
 
     private final boolean remote;
     private final String[] moduleNames;
     private final int[] moduleNameLengths;
 
     public ChangeLogParser() {
-        this(false, "", CollectionUtils.EMPTY_LIST);
+        this(false, "", Collections.emptyList());
     }
 
-    public ChangeLogParser(boolean remote, String packageName, List modules) {
+    public ChangeLogParser(boolean remote, String packageName, List<AbstractCvsTask.Module> modules) {
         this.remote = remote;
 
-        ArrayList names = new ArrayList();
+        List<String> names = new ArrayList<>();
         if (packageName != null) {
             for (StringTokenizer tok = new StringTokenizer(packageName);
                  tok.hasMoreTokens();) {
                 names.add(tok.nextToken());
             }
         }
-        for (Iterator iter = modules.iterator(); iter.hasNext();) {
-            AbstractCvsTask.Module m = (AbstractCvsTask.Module) iter.next();
-            names.add(m.getName());
-        }
+        modules.stream().map(Module::getName).forEach(names::add);
 
-        moduleNames = (String[]) names.toArray(new String[names.size()]);
+        moduleNames = names.toArray(new String[names.size()]);
         moduleNameLengths = new int[moduleNames.length];
         for (int i = 0; i < moduleNames.length; i++) {
             moduleNameLengths[i] = moduleNames[i].length();
@@ -109,12 +102,7 @@
      * @return a list of rcs entries as an array
      */
     public CVSEntry[] getEntrySetAsArray() {
-        final CVSEntry[] array = new CVSEntry[ entries.size() ];
-        int i = 0;
-        for (Enumeration e = entries.elements(); e.hasMoreElements();) {
-            array[i++] = (CVSEntry) e.nextElement();
-        }
-        return array;
+        return entries.values().toArray(new CVSEntry[entries.size()]);
     }
 
     /**
@@ -123,7 +111,7 @@
      * @param line the line to process
      */
     public void stdout(final String line) {
-        switch(status) {
+        switch (status) {
             case GET_FILE:
                 // make sure attributes are reset when
                 // working on a 'new' file.
@@ -159,8 +147,8 @@
      */
     private void processComment(final String line) {
         final String lineSeparator = System.getProperty("line.separator");
-        if (line.equals(
-                "=============================================================================")) {
+        if ("============================================================================="
+            .equals(line)) {
             //We have ended changelog for that particular file
             //so we can save it
             final int end
@@ -168,7 +156,7 @@
             comment = comment.substring(0, end);
             saveEntry();
             status = GET_FILE;
-        } else if (line.equals("----------------------------")) {
+        } else if ("----------------------------".equals(line)) {
             final int end
                 = comment.length() - lineSeparator.length(); //was -1
             comment = comment.substring(0, end);
@@ -275,17 +263,9 @@
      * Utility method that saves the current entry.
      */
     private void saveEntry() {
-        final String entryKey = date + author + comment;
-        CVSEntry entry;
-        if (!entries.containsKey(entryKey)) {
-            Date dateObject = parseDate(date);
-            entry = new CVSEntry(dateObject, author, comment);
-            entries.put(entryKey, entry);
-        } else {
-            entry = (CVSEntry) entries.get(entryKey);
-        }
-
-        entry.addFile(file, revision, previousRevision);
+        entries.computeIfAbsent(date + author + comment, k -> {
+            return new CVSEntry(parseDate(date), author, comment);
+        }).addFile(file, revision, previousRevision);
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,15 +18,15 @@
 package org.apache.tools.ant.taskdefs.cvslib;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
+import java.nio.file.Files;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
-import java.util.Enumeration;
+import java.util.List;
 import java.util.Properties;
 import java.util.Vector;
 
@@ -35,7 +35,6 @@
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.AbstractCvsTask;
 import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.util.FileUtils;
 
 /**
  * Examines the output of cvs log and group related changes together.
@@ -70,7 +69,7 @@
     private File usersFile;
 
     /** User list */
-    private Vector cvsUsers = new Vector();
+    private List<CvsUser> cvsUsers = new Vector<>();
 
     /** Input dir */
     private File inputDir;
@@ -98,8 +97,7 @@
      * performed. If empty then all files in the working directory will
      * be checked.
      */
-    private final Vector filesets = new Vector();
-
+    private final List<FileSet> filesets = new Vector<>();
 
     /**
      * Set the base dir for cvs.
@@ -110,7 +108,6 @@
         this.inputDir = inputDir;
     }
 
-
     /**
      * Set the output file for the log.
      *
@@ -120,7 +117,6 @@
         this.destFile = destFile;
     }
 
-
     /**
      * Set a lookup list of user names &amp; addresses
      *
@@ -130,17 +126,15 @@
         this.usersFile = usersFile;
     }
 
-
     /**
      * Add a user to list changelog knows about.
      *
      * @param user the user
      */
     public void addUser(final CvsUser user) {
-        cvsUsers.addElement(user);
+        cvsUsers.add(user);
     }
 
-
     /**
      * Set the date at which the changelog should start.
      *
@@ -150,7 +144,6 @@
         this.startDate = start;
     }
 
-
     /**
      * Set the date at which the changelog should stop.
      *
@@ -160,7 +153,6 @@
         this.endDate = endDate;
     }
 
-
     /**
      * Set the number of days worth of log entries to process.
      *
@@ -195,7 +187,6 @@
         this.startTag = start;
     }
 
-
     /**
      * Set the tag at which the changelog should stop.
      *
@@ -211,29 +202,26 @@
      * @param fileSet a set of files about which cvs logs will be generated.
      */
     public void addFileset(final FileSet fileSet) {
-        filesets.addElement(fileSet);
+        filesets.add(fileSet);
     }
 
-
     /**
      * Execute task
      *
      * @exception BuildException if something goes wrong executing the
      *            cvs command
      */
+    @Override
     public void execute() throws BuildException {
         File savedDir = inputDir; // may be altered in validate
 
         try {
-
             validate();
             final Properties userList = new Properties();
 
             loadUserlist(userList);
 
-            final int size = cvsUsers.size();
-            for (int i = 0; i < size; i++) {
-                final CvsUser user = (CvsUser) cvsUsers.get(i);
+            for (CvsUser user : cvsUsers) {
                 user.validate();
                 userList.put(user.getUserID(), user.getDisplayname());
             }
@@ -283,18 +271,11 @@
             }
 
             // Check if list of files to check has been specified
-            if (!filesets.isEmpty()) {
-                final Enumeration e = filesets.elements();
-
-                while (e.hasMoreElements()) {
-                    final FileSet fileSet = (FileSet) e.nextElement();
-                    final DirectoryScanner scanner =
-                        fileSet.getDirectoryScanner(getProject());
-                    final String[] files = scanner.getIncludedFiles();
-
-                    for (int i = 0; i < files.length; i++) {
-                        addCommandArgument(files[i]);
-                    }
+            for (FileSet fileSet : filesets) {
+                final DirectoryScanner scanner =
+                    fileSet.getDirectoryScanner(getProject());
+                for (String file : scanner.getIncludedFiles()) {
+                    addCommandArgument(file);
                 }
             }
 
@@ -340,27 +321,20 @@
             inputDir = getProject().getBaseDir();
         }
         if (null == destFile) {
-            final String message = "Destfile must be set.";
-
-            throw new BuildException(message);
+            throw new BuildException("Destfile must be set.");
         }
         if (!inputDir.exists()) {
-            final String message = "Cannot find base dir "
-                 + inputDir.getAbsolutePath();
-
-            throw new BuildException(message);
+            throw new BuildException("Cannot find base dir %s",
+                inputDir.getAbsolutePath());
         }
         if (null != usersFile && !usersFile.exists()) {
-            final String message = "Cannot find user lookup list "
-                 + usersFile.getAbsolutePath();
-
-            throw new BuildException(message);
+            throw new BuildException("Cannot find user lookup list %s",
+                usersFile.getAbsolutePath());
         }
         if ((null != startTag || null != endTag)
             && (null != startDate || null != endDate)) {
-            final String message = "Specify either a tag or date range,"
-                + " not both";
-            throw new BuildException(message);
+            throw new BuildException(
+                "Specify either a tag or date range, not both");
         }
     }
 
@@ -375,7 +349,7 @@
          throws BuildException {
         if (null != usersFile) {
             try {
-                userList.load(new FileInputStream(usersFile));
+                userList.load(Files.newInputStream(usersFile.toPath()));
             } catch (final IOException ioe) {
                 throw new BuildException(ioe.toString(), ioe);
             }
@@ -389,10 +363,9 @@
      * @return the filtered entry set
      */
     private CVSEntry[] filterEntrySet(final CVSEntry[] entrySet) {
-        final Vector results = new Vector();
+        final List<CVSEntry> results = new ArrayList<>();
 
-        for (int i = 0; i < entrySet.length; i++) {
-            final CVSEntry cvsEntry = entrySet[i];
+        for (CVSEntry cvsEntry : entrySet) {
             final Date date = cvsEntry.getDate();
 
             //bug#30471
@@ -420,13 +393,10 @@
                 //Skip dates that are too late
                 continue;
             }
-            results.addElement(cvsEntry);
+            results.add(cvsEntry);
         }
 
-        final CVSEntry[] resultArray = new CVSEntry[results.size()];
-
-        results.copyInto(resultArray);
-        return resultArray;
+        return results.toArray(new CVSEntry[results.size()]);
     }
 
     /**
@@ -434,9 +404,7 @@
      */
     private void replaceAuthorIdWithName(final Properties userList,
                                          final CVSEntry[] entrySet) {
-        for (int i = 0; i < entrySet.length; i++) {
-
-            final CVSEntry entry = entrySet[ i ];
+        for (final CVSEntry entry : entrySet) {
             if (userList.containsKey(entry.getAuthor())) {
                 entry.setAuthor(userList.getProperty(entry.getAuthor()));
             }
@@ -451,17 +419,11 @@
      */
     private void writeChangeLog(final CVSEntry[] entrySet)
          throws BuildException {
-        FileOutputStream output = null;
 
-        try {
-            output = new FileOutputStream(destFile);
-
-            final PrintWriter writer =
-                new PrintWriter(new OutputStreamWriter(output, "UTF-8"));
-
-            final ChangeLogWriter serializer = new ChangeLogWriter();
+        try (final PrintWriter writer = new PrintWriter(
+            new OutputStreamWriter(Files.newOutputStream(destFile.toPath()), "UTF-8"))) {
 
-            serializer.printChangeLog(writer, entrySet);
+            new ChangeLogWriter().printChangeLog(writer, entrySet);
 
             if (writer.checkError()) {
                 throw new IOException("Encountered an error writing changelog");
@@ -470,9 +432,6 @@
             getProject().log(uee.toString(), Project.MSG_ERR);
         } catch (final IOException ioe) {
             throw new BuildException(ioe.toString(), ioe);
-        } finally {
-            FileUtils.close(output);
         }
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,9 +20,9 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
-import java.util.Enumeration;
 import java.util.TimeZone;
 
+import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.DOMElementWriter;
 import org.apache.tools.ant.util.DOMUtils;
 import org.w3c.dom.Document;
@@ -36,9 +36,11 @@
     /** output format for dates written to xml file */
     private final SimpleDateFormat outputDate
         = new SimpleDateFormat("yyyy-MM-dd");
+
     /** output format for times written to xml file */
     private SimpleDateFormat outputTime
         = new SimpleDateFormat("HH:mm");
+
     /** stateless helper for writing the XML document */
     private static final DOMElementWriter DOM_WRITER = new DOMElementWriter();
 
@@ -62,20 +64,17 @@
             Element root = doc.createElement("changelog");
             DOM_WRITER.openElement(root, output, 0, "\t");
             output.println();
-            for (int i = 0; i < entries.length; i++) {
-                final CVSEntry entry = entries[i];
-
+            for (final CVSEntry entry : entries) {
                 printEntry(doc, output, entry);
             }
             DOM_WRITER.closeElement(root, output, 0, "\t", true);
             output.flush();
             output.close();
         } catch (IOException e) {
-            throw new org.apache.tools.ant.BuildException(e);
+            throw new BuildException(e);
         }
     }
 
-
     /**
      * Print out an individual entry in changelog.
      *
@@ -92,11 +91,7 @@
                                    outputTime.format(entry.getDate()));
         DOMUtils.appendCDATAElement(ent, "author", entry.getAuthor());
 
-        final Enumeration enumeration = entry.getFiles().elements();
-
-        while (enumeration.hasMoreElements()) {
-            final RCSFile file = (RCSFile) enumeration.nextElement();
-
+        for (RCSFile file : entry.getFiles()) {
             Element f = DOMUtils.createChildElement(ent, "file");
             DOMUtils.appendCDATAElement(f, "name", file.getName());
             DOMUtils.appendTextElement(f, "revision", file.getRevision());
@@ -111,4 +106,3 @@
         DOM_WRITER.write(ent, output, 1, "\t");
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/CVSEntry.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/CVSEntry.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/CVSEntry.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/CVSEntry.java	2018-03-24 12:37:12.000000000 +0000
@@ -28,7 +28,7 @@
     private Date date;
     private String author;
     private final String comment;
-    private final Vector files = new Vector();
+    private final Vector<RCSFile> files = new Vector<>();
 
     /**
      * Creates a new instance of a CVSEntry
@@ -48,7 +48,7 @@
      * @param revision the revision
      */
     public void addFile(final String file, final String revision) {
-        files.addElement(new RCSFile(file, revision));
+        files.add(new RCSFile(file, revision));
     }
 
     /**
@@ -58,7 +58,7 @@
      * @param previousRevision the previous revision
      */
     public void addFile(final String file, final String revision, final String previousRevision) {
-        files.addElement(new RCSFile(file, revision, previousRevision));
+        files.add(new RCSFile(file, revision, previousRevision));
     }
 
     /**
@@ -97,7 +97,7 @@
      * Gets the files in this CVSEntry
      * @return the files
      */
-    public Vector getFiles() {
+    public Vector<RCSFile> getFiles() {
         return files;
     }
 
@@ -105,6 +105,7 @@
      * Gets a String containing author, date, files and comment
      * @return a string representation of this CVSEntry
      */
+    @Override
     public String toString() {
         return getAuthor() + "\n" + getDate() + "\n" + getFiles() + "\n"
             + getComment();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,18 +19,15 @@
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
+import java.nio.file.Files;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
-import java.util.Vector;
-
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.AbstractCvsTask;
@@ -151,7 +148,7 @@
     /**
      * temporary list of package names.
      */
-    private List packageNames = new ArrayList();
+    private List<String> packageNames = new ArrayList<>();
 
     /**
      * temporary list of "File:" + package name + "/" for all packages.
@@ -228,7 +225,6 @@
         ignoreRemoved = b;
     }
 
-
     /**
      * Execute task.
      *
@@ -296,10 +292,9 @@
      */
     private CvsTagEntry[] parseRDiff(File tmpFile) throws BuildException {
         // parse the output of the command
-        BufferedReader reader = null;
 
-        try {
-            reader = new BufferedReader(new FileReader(tmpFile)); //NOSONAR
+        try (BufferedReader reader =
+            new BufferedReader(new FileReader(tmpFile))) {
 
             // entries are of the form:
             //CVS 1.11
@@ -315,7 +310,7 @@
             // File testantoine/antoine.bat is removed; TESTANTOINE_1 revision 1.1.1.1
             //
             // get rid of 'File module/"
-            Vector entries = new Vector();
+            List<CvsTagEntry> entries = new ArrayList<>();
 
             String line = reader.readLine();
 
@@ -324,6 +319,7 @@
                                          packageNamePrefixLengths);
                 if (line != null) {
                     // use || in a perl like fashion
+                    @SuppressWarnings("unused")
                     boolean processed
                         =  doFileIsNew(entries, line)
                         || doFileHasChanged(entries, line)
@@ -332,24 +328,13 @@
                 line = reader.readLine();
             }
 
-            CvsTagEntry[] array = new CvsTagEntry[entries.size()];
-            entries.copyInto(array);
-
-            return array;
+            return entries.toArray(new CvsTagEntry[entries.size()]);
         } catch (IOException e) {
             throw new BuildException("Error in parsing", e);
-        } finally {
-            if (reader != null) {
-                try {
-                    reader.close();
-                } catch (IOException e) {
-                    log(e.toString(), Project.MSG_ERR);
-                }
-            }
         }
     }
 
-    private boolean doFileIsNew(Vector entries, String line) {
+    private boolean doFileIsNew(List<CvsTagEntry> entries, String line) {
         int index = line.indexOf(FILE_IS_NEW);
         if (index == -1) {
             return false;
@@ -363,12 +348,12 @@
             rev = line.substring(indexrev + REVISION.length());
         }
         CvsTagEntry entry = new CvsTagEntry(filename, rev);
-        entries.addElement(entry);
+        entries.add(entry);
         log(entry.toString(), Project.MSG_VERBOSE);
         return true;
     }
 
-    private boolean doFileHasChanged(Vector entries, String line) {
+    private boolean doFileHasChanged(List<CvsTagEntry> entries, String line) {
         int index = line.indexOf(FILE_HAS_CHANGED);
         if (index == -1) {
             return false;
@@ -384,12 +369,12 @@
         CvsTagEntry entry = new CvsTagEntry(filename,
                                             revision,
                                             prevRevision);
-        entries.addElement(entry);
+        entries.add(entry);
         log(entry.toString(), Project.MSG_VERBOSE);
         return true;
     }
 
-    private boolean doFileWasRemoved(Vector entries, String line) {
+    private boolean doFileWasRemoved(List<CvsTagEntry> entries, String line) {
         if (ignoreRemoved) {
             return false;
         }
@@ -405,7 +390,7 @@
             rev = line.substring(indexrev + REVISION.length());
         }
         CvsTagEntry entry = new CvsTagEntry(filename, null, rev);
-        entries.addElement(entry);
+        entries.add(entry);
         log(entry.toString(), Project.MSG_VERBOSE);
         return true;
     }
@@ -417,11 +402,8 @@
      * @exception BuildException if an error occurs
      */
     private void writeTagDiff(CvsTagEntry[] entries) throws BuildException {
-        FileOutputStream output = null;
-        try {
-            output = new FileOutputStream(mydestfile);
-            PrintWriter writer = new PrintWriter(
-                                     new OutputStreamWriter(output, "UTF-8"));
+        try (PrintWriter writer = new PrintWriter(new OutputStreamWriter(
+            Files.newOutputStream(mydestfile.toPath()), "UTF-8"))) {
             writer.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
             Document doc = DOMUtils.newDocument();
             Element root = doc.createElement("tagdiff");
@@ -454,14 +436,6 @@
             log(uee.toString(), Project.MSG_ERR);
         } catch (IOException ioe) {
             throw new BuildException(ioe.toString(), ioe);
-        } finally {
-            if (null != output) {
-                try {
-                    output.close();
-                } catch (IOException ioe) {
-                    log(ioe.toString(), Project.MSG_ERR);
-                }
-            }
         }
     }
 
@@ -494,7 +468,7 @@
      * @exception BuildException if a parameter is not correctly set
      */
     private void validate() throws BuildException {
-        if (null == mypackage && getModules().size() == 0) {
+        if (null == mypackage && getModules().isEmpty()) {
             throw new BuildException("Package/module must be set.");
         }
 
@@ -507,8 +481,8 @@
         }
 
         if (null != mystartTag && null != mystartDate) {
-            throw new BuildException("Only one of start tag and start date "
-                                     + "must be set.");
+            throw new BuildException(
+                "Only one of start tag and start date must be set.");
         }
 
         if (null == myendTag && null == myendDate) {
@@ -516,8 +490,8 @@
         }
 
         if (null != myendTag && null != myendDate) {
-            throw new BuildException("Only one of end tag and end date must "
-                                     + "be set.");
+            throw new BuildException(
+                "Only one of end tag and end date must be set.");
         }
     }
 
@@ -535,8 +509,7 @@
                 addCommandArgument(pack);
             }
         }
-        for (Iterator iter = getModules().iterator(); iter.hasNext();) {
-            AbstractCvsTask.Module m = (AbstractCvsTask.Module) iter.next();
+        for (Module m : getModules()) {
             packageNames.add(m.getName());
             // will be added to command line in super.execute()
         }
@@ -548,7 +521,6 @@
         }
     }
 
-
     /**
      * removes a "File: module/" prefix if present.
      *
@@ -560,17 +532,11 @@
         if (line.length() < FILE_STRING_LENGTH) {
             return null;
         }
-        boolean matched = false;
         for (int i = 0; i < packagePrefixes.length; i++) {
             if (line.startsWith(packagePrefixes[i])) {
-                matched = true;
-                line = line.substring(prefixLengths[i]);
-                break;
+                return line.substring(prefixLengths[i]);
             }
         }
-        if (!matched) {
-            line = line.substring(FILE_STRING_LENGTH);
-        }
-        return line;
+        return line.substring(FILE_STRING_LENGTH);
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagEntry.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagEntry.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagEntry.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagEntry.java	2018-03-24 12:37:12.000000000 +0000
@@ -89,8 +89,9 @@
      * Gets a String containing filename and difference from previous version
      * @return a string representation of this CVSTagEntry
      */
+    @Override
     public String toString() {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         buffer.append(filename);
         if (revision == null) {
             buffer.append(" was removed");
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsUser.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsUser.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsUser.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsUser.java	2018-03-24 12:37:12.000000000 +0000
@@ -26,10 +26,10 @@
 public class CvsUser {
     /** The user's Id */
     private String userID;
+
     /** The user's full name */
     private String displayName;
 
-
     /**
      * Set the user's fullname
      *
@@ -39,7 +39,6 @@
         this.displayName = displayName;
     }
 
-
     /**
      * Set the user's id
      *
@@ -49,7 +48,6 @@
         this.userID = userID;
     }
 
-
     /**
      * Get the user's id.
      *
@@ -59,7 +57,6 @@
         return userID;
     }
 
-
     /**
      * Get the user's full name
      *
@@ -69,7 +66,6 @@
         return displayName;
     }
 
-
     /**
      * Validate that this object is configured.
      *
@@ -78,16 +74,11 @@
      */
     public void validate() throws BuildException {
         if (null == userID) {
-            final String message = "Username attribute must be set.";
-
-            throw new BuildException(message);
+            throw new BuildException("Username attribute must be set.");
         }
         if (null == displayName) {
-            final String message =
-                "Displayname attribute must be set for userID " + userID;
-
-            throw new BuildException(message);
+            throw new BuildException(
+                "Displayname attribute must be set for userID %s", userID);
         }
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.java	2018-03-24 12:37:12.000000000 +0000
@@ -43,6 +43,7 @@
 public class CvsVersion extends AbstractCvsTask {
     static final long VERSION_1_11_2 = 11102;
     static final long MULTIPLY = 100;
+
     private String clientVersion;
     private String serverVersion;
     private String clientVersionProperty;
@@ -55,6 +56,7 @@
     public String getClientVersion() {
         return clientVersion;
     }
+
     /**
      * Get the CVS server version
      * @return CVS server version
@@ -62,6 +64,7 @@
     public String getServerVersion() {
         return serverVersion;
     }
+
     /**
      * Set a property where to store the CVS client version
      * @param clientVersionProperty  property for CVS client version
@@ -77,6 +80,7 @@
     public void setServerVersionProperty(String serverVersionProperty) {
         this.serverVersionProperty = serverVersionProperty;
     }
+
     /**
      * Find out if the server version supports log with S option
      * @return  boolean indicating if the server version supports log with S option
@@ -90,7 +94,7 @@
         long version = 0;
         while (tokenizer.hasMoreTokens()) {
             String s = tokenizer.nextToken();
-            int i = 0;
+            int i;
             for (i = 0; i < s.length(); i++) {
                 if (!Character.isDigit(s.charAt(i))) {
                     break;
@@ -103,11 +107,13 @@
             }
             counter = counter / MULTIPLY;
         }
-        return (version >= VERSION_1_11_2);
+        return version >= VERSION_1_11_2;
     }
+
     /**
      * the execute method running CvsVersion
      */
+    @Override
     public void execute() {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         this.setOutputStream(bos);
@@ -127,9 +133,9 @@
         while (haveReadAhead || st.hasMoreTokens()) {
             String currentToken = haveReadAhead ? cachedVersion : st.nextToken();
             haveReadAhead = false;
-            if (currentToken.equals("Client:")) {
+            if ("Client:".equals(currentToken)) {
                 client = true;
-            } else if (currentToken.equals("Server:")) {
+            } else if ("Server:".equals(currentToken)) {
                 server = true;
             } else if (currentToken.startsWith("(CVS")
                        && currentToken.endsWith(")")) {
@@ -151,7 +157,7 @@
                 }
                 server = false;
                 cvs = null;
-            } else if (currentToken.equals("(client/server)")
+            } else if ("(client/server)".equals(currentToken)
                        && cvs != null && cachedVersion != null
                        && !client && !server) {
                 client = server = true;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/RCSFile.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/RCSFile.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/RCSFile.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/RCSFile.java	2018-03-24 12:37:12.000000000 +0000
@@ -26,12 +26,10 @@
     private String revision;
     private String previousRevision;
 
-
     RCSFile(final String name, final String rev) {
         this(name, rev, null);
     }
 
-
     RCSFile(final String name,
                   final String revision,
                   final String previousRevision) {
@@ -66,4 +64,3 @@
         return previousRevision;
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingOutputStream.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingOutputStream.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingOutputStream.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingOutputStream.java	2018-03-24 12:37:12.000000000 +0000
@@ -39,8 +39,8 @@
      *
      * @param line the line to log.
      */
+    @Override
     protected void processLine(final String line) {
         parser.stdout(line);
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,10 +18,9 @@
 package org.apache.tools.ant.taskdefs.cvslib;
 
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 
-import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.taskdefs.PumpStreamHandler;
+import org.apache.tools.ant.util.FileUtils;
 
 /**
  * A dummy stream handler that just passes stuff to the parser.
@@ -34,7 +33,6 @@
             new ByteArrayOutputStream());
     }
 
-
     String getErrors() {
         try {
             final ByteArrayOutputStream error
@@ -46,16 +44,10 @@
         }
     }
 
-
+    @Override
     public void stop() {
         super.stop();
-        try {
-            getErr().close();
-            getOut().close();
-        } catch (final IOException e) {
-            // plain impossible
-            throw new BuildException(e);
-        }
+        FileUtils.close(getErr());
+        FileUtils.close(getOut());
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/CVSPass.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/CVSPass.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/CVSPass.java	2018-03-24 12:37:12.000000000 +0000
@@ -82,6 +82,7 @@
      *
      * @exception BuildException if something goes wrong with the build
      */
+    @Override
     public final void execute() throws BuildException {
         if (cvsRoot == null) {
             throw new BuildException("cvsroot is required");
@@ -97,7 +98,7 @@
         BufferedReader reader = null;
         BufferedWriter writer = null;
         try {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
 
             if (passFile.exists()) {
                 reader = new BufferedReader(new FileReader(passFile));
@@ -129,7 +130,7 @@
     }
 
     private final String mangle(String password) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         for (int i = 0; i < password.length(); i++) {
             buf.append(shifts[password.charAt(i)]);
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java	2018-03-24 12:37:12.000000000 +0000
@@ -45,29 +45,28 @@
      *
      * @exception BuildException if something goes wrong with the build
      */
+    @Override
     public void execute() throws BuildException {
-        if (!defaultrequested && add.equals("") && remove.equals("") && !echo) {
-            throw new BuildException("<defaultexcludes> task must set "
-                + "at least one attribute (echo=\"false\""
-                + " doesn't count since that is the default");
+        if (!defaultrequested && "".equals(add) && "".equals(remove) && !echo) {
+            throw new BuildException(
+                "<defaultexcludes> task must set at least one attribute (echo=\"false\" doesn't count since that is the default");
         }
         if (defaultrequested) {
             DirectoryScanner.resetDefaultExcludes();
         }
-        if (!add.equals("")) {
+        if (!"".equals(add)) {
             DirectoryScanner.addDefaultExclude(add);
         }
-        if (!remove.equals("")) {
+        if (!"".equals(remove)) {
             DirectoryScanner.removeDefaultExclude(remove);
         }
         if (echo) {
-            StringBuffer message
-                = new StringBuffer("Current Default Excludes:");
+            StringBuilder message
+                = new StringBuilder("Current Default Excludes:");
             message.append(StringUtils.LINE_SEP);
-            String[] excludes = DirectoryScanner.getDefaultExcludes();
-            for (int i = 0; i < excludes.length; i++) {
+            for (String exclude : DirectoryScanner.getDefaultExcludes()) {
                 message.append("  ");
-                message.append(excludes[i]);
+                message.append(exclude);
                 message.append(StringUtils.LINE_SEP);
             }
             log(message.toString(), logLevel);
@@ -111,5 +110,4 @@
         this.echo = echo;
     }
 
-
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/defaults.properties ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/defaults.properties
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/defaults.properties	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/defaults.properties	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,6 @@
 antstructure=org.apache.tools.ant.taskdefs.AntStructure
 antversion=org.apache.tools.ant.taskdefs.condition.AntVersion
 apply=org.apache.tools.ant.taskdefs.Transform
-apt=org.apache.tools.ant.taskdefs.Apt
 attributenamespacedef=org.apache.tools.ant.taskdefs.AttributeNamespaceDef
 augment=org.apache.tools.ant.taskdefs.AugmentReference
 available=org.apache.tools.ant.taskdefs.Available
@@ -92,6 +91,7 @@
 resourcecount=org.apache.tools.ant.taskdefs.ResourceCount
 retry=org.apache.tools.ant.taskdefs.Retry
 rmic=org.apache.tools.ant.taskdefs.Rmic
+setpermissions=org.apache.tools.ant.taskdefs.SetPermissions
 sequential=org.apache.tools.ant.taskdefs.Sequential
 signjar=org.apache.tools.ant.taskdefs.SignJar
 sleep=org.apache.tools.ant.taskdefs.Sleep
@@ -108,6 +108,7 @@
 unjar=org.apache.tools.ant.taskdefs.Expand
 untar=org.apache.tools.ant.taskdefs.Untar
 unwar=org.apache.tools.ant.taskdefs.Expand
+unxz=org.apache.tools.ant.taskdefs.optional.xz.Unxz
 unzip=org.apache.tools.ant.taskdefs.Expand
 uptodate=org.apache.tools.ant.taskdefs.UpToDate
 waitfor=org.apache.tools.ant.taskdefs.WaitFor
@@ -115,6 +116,7 @@
 whichresource=org.apache.tools.ant.taskdefs.WhichResource
 xmlproperty=org.apache.tools.ant.taskdefs.XmlProperty
 xslt=org.apache.tools.ant.taskdefs.XSLTProcess
+xz=org.apache.tools.ant.taskdefs.optional.xz.Xz
 zip=org.apache.tools.ant.taskdefs.Zip
 
 # optional tasks
@@ -158,6 +160,7 @@
 jjtree=org.apache.tools.ant.taskdefs.optional.javacc.JJTree
 junit=org.apache.tools.ant.taskdefs.optional.junit.JUnitTask
 junitreport=org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator
+junitlauncher=org.apache.tools.ant.taskdefs.optional.junitlauncher.JUnitLauncherTask
 native2ascii=org.apache.tools.ant.taskdefs.optional.Native2Ascii
 netrexxc=org.apache.tools.ant.taskdefs.optional.NetRexxC
 propertyfile=org.apache.tools.ant.taskdefs.optional.PropertyFile
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/DefBase.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/DefBase.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/DefBase.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/DefBase.java	2018-03-24 12:37:12.000000000 +0000
@@ -51,6 +51,7 @@
      *             stop using this attribute
      * @ant.attribute ignore="true"
      */
+    @Deprecated
     public void setReverseLoader(boolean reverseLoader) {
         getDelegate().setReverseLoader(reverseLoader);
         log("The reverseloader attribute is DEPRECATED. It will be removed",
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Definer.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Definer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Definer.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Definer.java	2018-03-24 12:37:12.000000000 +0000
@@ -50,13 +50,14 @@
 
     /**
      * the extension of an antlib file for autoloading.
-     * {@value[
+     * {@value /antlib.xml}
      */
     private static final String ANTLIB_XML = "/antlib.xml";
 
     private static final ThreadLocal<Map<URL, Location>> RESOURCE_STACK = new ThreadLocal<Map<URL, Location>>() {
+        @Override
         protected Map<URL, Location> initialValue() {
-            return new HashMap<URL, Location>();
+            return new HashMap<>();
         }
     };
 
@@ -120,9 +121,10 @@
          * get the values
          * @return an array of the allowed values for this attribute.
          */
+        @Override
         public String[] getValues() {
             return new String[] {POLICY_FAIL, POLICY_REPORT, POLICY_IGNORE,
-                    POLICY_FAILALL};
+                POLICY_FAILALL};
         }
     }
 
@@ -139,6 +141,7 @@
          * get the values
          * @return an array of the allowed values for this attribute.
          */
+        @Override
         public String[] getValues() {
             return new String[] {"properties", "xml"};
         }
@@ -203,6 +206,7 @@
      *
      * @exception BuildException if an error occurs
      */
+    @Override
     public void execute() throws BuildException {
         ClassLoader al = createLoader();
 
@@ -224,23 +228,22 @@
                 setResource(makeResourceFromURI(uri1));
             } else {
                 throw new BuildException(
-                        "Only antlib URIs can be located from the URI alone,"
-                                + " not the URI '" + getURI() + "'");
+                    "Only antlib URIs can be located from the URI alone, not the URI '"
+                        + getURI() + "'");
             }
         }
 
         if (name != null) {
             if (classname == null) {
-                throw new BuildException(
-                    "classname attribute of " + getTaskName() + " element "
-                    + "is undefined", getLocation());
+                throw new BuildException("classname attribute of "
+                    + getTaskName() + " element is undefined", getLocation());
             }
             addDefinition(al, name, classname);
         } else {
             if (classname != null) {
-                String msg = "You must not specify classname "
-                    + "together with file or resource.";
-                throw new BuildException(msg, getLocation());
+                throw new BuildException(
+                    "You must not specify classname together with file or resource.",
+                    getLocation());
             }
             final Enumeration<URL> urls;
             if (file == null) {
@@ -264,21 +267,19 @@
                 if (fmt == Format.PROPERTIES) {
                     loadProperties(al, url);
                     break;
+                } else if (RESOURCE_STACK.get().get(url) != null) {
+                    log("Warning: Recursive loading of " + url
+                        + " ignored"
+                        + " at " + getLocation()
+                        + " originally loaded at "
+                        + RESOURCE_STACK.get().get(url),
+                        Project.MSG_WARN);
                 } else {
-                    if (RESOURCE_STACK.get().get(url) != null) {
-                        log("Warning: Recursive loading of " + url
-                            + " ignored"
-                            + " at " + getLocation()
-                            + " originally loaded at "
-                            + RESOURCE_STACK.get().get(url),
-                            Project.MSG_WARN);
-                    } else {
-                        try {
-                            RESOURCE_STACK.get().put(url, getLocation());
-                            loadAntlib(al, url);
-                        } finally {
-                            RESOURCE_STACK.get().remove(url);
-                        }
+                    try {
+                        RESOURCE_STACK.get().put(url, getLocation());
+                        loadAntlib(al, url);
+                    } finally {
+                        RESOURCE_STACK.get().remove(url);
                     }
                 }
             }
@@ -291,7 +292,6 @@
      * @param uri the xml namespace uri that to convert.
      * @return the name of a resource. It may not exist
      */
-
     public static String makeResourceFromURI(String uri) {
         String path = uri.substring(MagicNames.ANTLIB_PREFIX.length());
         String resource;
@@ -392,9 +392,7 @@
      * @param url the url to get the definitions from
      */
     protected void loadProperties(ClassLoader al, URL url) {
-        InputStream is = null;
-        try {
-            is = url.openStream();
+        try (InputStream is = url.openStream()) {
             if (is == null) {
                 log("Could not load definitions from " + url,
                     Project.MSG_WARN);
@@ -402,16 +400,13 @@
             }
             Properties props = new Properties();
             props.load(is);
-            Enumeration<?> keys = props.keys();
-            while (keys.hasMoreElements()) {
-                name = ((String) keys.nextElement());
+            for (String key : props.stringPropertyNames()) {
+                name = key;
                 classname = props.getProperty(name);
                 addDefinition(al, name, classname);
             }
         } catch (IOException ex) {
             throw new BuildException(ex, getLocation());
-        } finally {
-            FileUtils.close(is);
         }
     }
 
@@ -560,7 +555,6 @@
         this.adaptToClass = adaptToClass;
     }
 
-
     /**
      * Add a definition using the attributes of Definer
      *
@@ -602,15 +596,16 @@
                 ComponentHelper.getComponentHelper(getProject())
                         .addDataTypeDefinition(def);
             } catch (ClassNotFoundException cnfe) {
-                String msg = getTaskName() + " class " + classname
-                        + " cannot be found"
-                        + "\n using the classloader " + al;
-                throw new BuildException(msg, cnfe, getLocation());
+                throw new BuildException(
+                    getTaskName() + " class " + classname
+                        + " cannot be found\n using the classloader " + al,
+                    cnfe, getLocation());
             } catch (NoClassDefFoundError ncdfe) {
-                String msg = getTaskName() + " A class needed by class "
-                        + classname + " cannot be found: " + ncdfe.getMessage()
-                        + "\n using the classloader " + al;
-                throw new BuildException(msg, ncdfe, getLocation());
+                throw new BuildException(
+                    getTaskName() + " A class needed by class " + classname
+                        + " cannot be found: " + ncdfe.getMessage()
+                        + "\n using the classloader " + al,
+                    ncdfe, getLocation());
             }
         } catch (BuildException ex) {
             switch (onError) {
@@ -634,7 +629,7 @@
      */
     private void tooManyDefinitions() {
         throw new BuildException(
-            "Only one of the attributes name, file and resource"
-            + " can be set", getLocation());
+            "Only one of the attributes name, file and resource can be set",
+            getLocation());
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Delete.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Delete.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Delete.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Delete.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,6 +19,9 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Iterator;
@@ -60,7 +63,6 @@
 import org.apache.tools.ant.types.selectors.SizeSelector;
 import org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector;
 import org.apache.tools.ant.util.FileUtils;
-import org.apache.tools.ant.util.SymbolicLinkUtils;
 
 /**
  * Deletes a file or directory, or set of files defined by a fileset.
@@ -79,33 +81,41 @@
 public class Delete extends MatchingTask {
     private static final ResourceComparator REVERSE_FILESYSTEM = new Reverse(new FileSystem());
     private static final ResourceSelector EXISTS = new Exists();
+    private static FileUtils FILE_UTILS = FileUtils.getFileUtils();
 
     private static class ReverseDirs implements ResourceCollection {
-        static final Comparator<Comparable<?>> REVERSE = new Comparator<Comparable<?>>() {
-            public int compare(Comparable<?> foo, Comparable<?> bar) {
-                return ((Comparable) foo).compareTo(bar) * -1;
-            }
-        };
+
         private Project project;
         private File basedir;
         private String[] dirs;
+
         ReverseDirs(Project project, File basedir, String[] dirs) {
             this.project = project;
             this.basedir = basedir;
             this.dirs = dirs;
-            Arrays.sort(this.dirs, REVERSE);
+            Arrays.sort(this.dirs, Comparator.reverseOrder());
         }
+
+        @Override
         public Iterator<Resource> iterator() {
             return new FileResourceIterator(project, basedir, dirs);
         }
-        public boolean isFilesystemOnly() { return true; }
-        public int size() { return dirs.length; }
+
+        @Override
+        public boolean isFilesystemOnly() {
+            return true;
+        }
+
+        @Override
+        public int size() {
+            return dirs.length;
+        }
     }
 
     // CheckStyle:VisibilityModifier OFF - bc
     protected File file = null;
     protected File dir = null;
-    protected Vector<FileSet> filesets = new Vector<FileSet>();
+    protected Vector<FileSet> filesets = new Vector<>();
     protected boolean usedMatchingTask = false;
     // by default, remove matching empty dirs
     protected boolean includeEmpty = false;
@@ -117,9 +127,6 @@
     private boolean deleteOnExit = false;
     private boolean removeNotFollowedSymlinks = false;
     private Resources rcs = null;
-    private static FileUtils FILE_UTILS = FileUtils.getFileUtils();
-    private static SymbolicLinkUtils SYMLINK_UTILS =
-        SymbolicLinkUtils.getSymbolicLinkUtils();
     private boolean performGc = Os.isFamily("windows");
 
     /**
@@ -175,9 +182,9 @@
      *
      * @param failonerror true or false
      */
-     public void setFailOnError(boolean failonerror) {
-         this.failonerror = failonerror;
-     }
+    public void setFailOnError(boolean failonerror) {
+        this.failonerror = failonerror;
+    }
 
     /**
      * If true, on failure to delete, note the error and set
@@ -185,10 +192,9 @@
      *
      * @param deleteOnExit true or false
      */
-     public void setDeleteOnExit(boolean deleteOnExit) {
-         this.deleteOnExit = deleteOnExit;
-     }
-
+    public void setDeleteOnExit(boolean deleteOnExit) {
+        this.deleteOnExit = deleteOnExit;
+    }
 
     /**
      * If true, delete empty directories.
@@ -213,10 +219,10 @@
         performGc = b;
     }
 
-   /**
-    * Adds a set of files to be deleted.
-    * @param set the set of files to be deleted
-    */
+    /**
+     * Adds a set of files to be deleted.
+     * @param set the set of files to be deleted
+     */
     public void addFileset(FileSet set) {
         filesets.addElement(set);
     }
@@ -240,6 +246,7 @@
      * add a name entry on the include list
      * @return a NameEntry object to be configured
      */
+    @Override
     public PatternSet.NameEntry createInclude() {
         usedMatchingTask = true;
         return super.createInclude();
@@ -249,6 +256,7 @@
      * add a name entry on the include files list
      * @return a NameEntry object to be configured
      */
+    @Override
     public PatternSet.NameEntry createIncludesFile() {
         usedMatchingTask = true;
         return super.createIncludesFile();
@@ -258,6 +266,7 @@
      * add a name entry on the exclude list
      * @return a NameEntry object to be configured
      */
+    @Override
     public PatternSet.NameEntry createExclude() {
         usedMatchingTask = true;
         return super.createExclude();
@@ -267,6 +276,7 @@
      * add a name entry on the include files list
      * @return a NameEntry object to be configured
      */
+    @Override
     public PatternSet.NameEntry createExcludesFile() {
         usedMatchingTask = true;
         return super.createExcludesFile();
@@ -276,6 +286,7 @@
      * add a set of patterns
      * @return PatternSet object to be configured
      */
+    @Override
     public PatternSet createPatternSet() {
         usedMatchingTask = true;
         return super.createPatternSet();
@@ -287,6 +298,7 @@
      *
      * @param includes the string containing the include patterns
      */
+    @Override
     public void setIncludes(String includes) {
         usedMatchingTask = true;
         super.setIncludes(includes);
@@ -298,6 +310,7 @@
      *
      * @param excludes the string containing the exclude patterns
      */
+    @Override
     public void setExcludes(String excludes) {
         usedMatchingTask = true;
         super.setExcludes(excludes);
@@ -310,6 +323,7 @@
      *                           should be used, "false"|"off"|"no" when they
      *                           shouldn't be used.
      */
+    @Override
     public void setDefaultexcludes(boolean useDefaultExcludes) {
         usedMatchingTask = true;
         super.setDefaultexcludes(useDefaultExcludes);
@@ -321,6 +335,7 @@
      * @param includesfile A string containing the filename to fetch
      * the include patterns from.
      */
+    @Override
     public void setIncludesfile(File includesfile) {
         usedMatchingTask = true;
         super.setIncludesfile(includesfile);
@@ -332,6 +347,7 @@
      * @param excludesfile A string containing the filename to fetch
      * the include patterns from.
      */
+    @Override
     public void setExcludesfile(File excludesfile) {
         usedMatchingTask = true;
         super.setExcludesfile(excludesfile);
@@ -343,6 +359,7 @@
      * @param isCaseSensitive "true"|"on"|"yes" if file system is case
      *                           sensitive, "false"|"off"|"no" when not.
      */
+    @Override
     public void setCaseSensitive(boolean isCaseSensitive) {
         usedMatchingTask = true;
         super.setCaseSensitive(isCaseSensitive);
@@ -353,6 +370,7 @@
      *
      * @param followSymlinks whether or not symbolic links should be followed
      */
+    @Override
     public void setFollowSymlinks(boolean followSymlinks) {
         usedMatchingTask = true;
         super.setFollowSymlinks(followSymlinks);
@@ -374,6 +392,7 @@
      *
      * @param selector the selector to be added
      */
+    @Override
     public void addSelector(SelectSelector selector) {
         usedMatchingTask = true;
         super.addSelector(selector);
@@ -384,6 +403,7 @@
      *
      * @param selector the selector to be added
      */
+    @Override
     public void addAnd(AndSelector selector) {
         usedMatchingTask = true;
         super.addAnd(selector);
@@ -394,6 +414,7 @@
      *
      * @param selector the selector to be added
      */
+    @Override
     public void addOr(OrSelector selector) {
         usedMatchingTask = true;
         super.addOr(selector);
@@ -404,6 +425,7 @@
      *
      * @param selector the selector to be added
      */
+    @Override
     public void addNot(NotSelector selector) {
         usedMatchingTask = true;
         super.addNot(selector);
@@ -414,6 +436,7 @@
      *
      * @param selector the selector to be added
      */
+    @Override
     public void addNone(NoneSelector selector) {
         usedMatchingTask = true;
         super.addNone(selector);
@@ -424,6 +447,7 @@
      *
      * @param selector the selector to be added
      */
+    @Override
     public void addMajority(MajoritySelector selector) {
         usedMatchingTask = true;
         super.addMajority(selector);
@@ -434,6 +458,7 @@
      *
      * @param selector the selector to be added
      */
+    @Override
     public void addDate(DateSelector selector) {
         usedMatchingTask = true;
         super.addDate(selector);
@@ -444,6 +469,7 @@
      *
      * @param selector the selector to be added
      */
+    @Override
     public void addSize(SizeSelector selector) {
         usedMatchingTask = true;
         super.addSize(selector);
@@ -454,6 +480,7 @@
      *
      * @param selector the selector to be added
      */
+    @Override
     public void addFilename(FilenameSelector selector) {
         usedMatchingTask = true;
         super.addFilename(selector);
@@ -464,6 +491,7 @@
      *
      * @param selector the selector to be added
      */
+    @Override
     public void addCustom(ExtendSelector selector) {
         usedMatchingTask = true;
         super.addCustom(selector);
@@ -474,6 +502,7 @@
      *
      * @param selector the selector to be added
      */
+    @Override
     public void addContains(ContainsSelector selector) {
         usedMatchingTask = true;
         super.addContains(selector);
@@ -484,6 +513,7 @@
      *
      * @param selector the selector to be added
      */
+    @Override
     public void addPresent(PresentSelector selector) {
         usedMatchingTask = true;
         super.addPresent(selector);
@@ -494,6 +524,7 @@
      *
      * @param selector the selector to be added
      */
+    @Override
     public void addDepth(DepthSelector selector) {
         usedMatchingTask = true;
         super.addDepth(selector);
@@ -504,6 +535,7 @@
      *
      * @param selector the selector to be added
      */
+    @Override
     public void addDepend(DependSelector selector) {
         usedMatchingTask = true;
         super.addDepend(selector);
@@ -514,6 +546,7 @@
      *
      * @param selector the selector to be added
      */
+    @Override
     public void addContainsRegexp(ContainsRegexpSelector selector) {
         usedMatchingTask = true;
         super.addContainsRegexp(selector);
@@ -525,6 +558,7 @@
      * @param selector the selector to add
      * @since ant 1.6
      */
+    @Override
     public void addModified(ModifiedSelector selector) {
         usedMatchingTask = true;
         super.addModified(selector);
@@ -536,6 +570,7 @@
      * @param selector the selector to be added
      * @since Ant 1.6
      */
+    @Override
     public void add(FileSelector selector) {
         usedMatchingTask = true;
         super.add(selector);
@@ -546,20 +581,21 @@
      *
      * @exception BuildException if an error occurs
      */
+    @Override
     public void execute() throws BuildException {
         if (usedMatchingTask) {
-            log("DEPRECATED - Use of the implicit FileSet is deprecated.  "
-                + "Use a nested fileset element instead.", quiet ? Project.MSG_VERBOSE : verbosity);
+            log("DEPRECATED - Use of the implicit FileSet is deprecated.  Use a nested fileset element instead.",
+                quiet ? Project.MSG_VERBOSE : verbosity);
         }
 
-        if (file == null && dir == null && filesets.size() == 0 && rcs == null) {
-            throw new BuildException("At least one of the file or dir "
-                                     + "attributes, or a nested resource collection, "
-                                     + "must be set.");
+        if (file == null && dir == null && filesets.isEmpty() && rcs == null) {
+            throw new BuildException(
+                "At least one of the file or dir attributes, or a nested resource collection, must be set.");
         }
 
         if (quiet && failonerror) {
-            throw new BuildException("quiet and failonerror cannot both be set to true", getLocation());
+            throw new BuildException(
+                "quiet and failonerror cannot both be set to true", getLocation());
         }
 
         // delete the single file
@@ -567,8 +603,8 @@
             if (file.exists()) {
                 if (file.isDirectory()) {
                     log("Directory " + file.getAbsolutePath()
-                        + " cannot be removed using the file attribute.  "
-                        + "Use dir instead.", quiet ? Project.MSG_VERBOSE : verbosity);
+                        + " cannot be removed using the file attribute.  Use dir instead.",
+                        quiet ? Project.MSG_VERBOSE : verbosity);
                 } else {
                     log("Deleting: " + file.getAbsolutePath());
 
@@ -628,10 +664,10 @@
 
         final int size = filesets.size();
         for (int i = 0; i < size; i++) {
-            FileSet fs = (FileSet) filesets.get(i);
+            FileSet fs = filesets.get(i);
             if (fs.getProject() == null) {
-                log("Deleting fileset with no project specified;"
-                    + " assuming executing project", Project.MSG_VERBOSE);
+                log("Deleting fileset with no project specified; assuming executing project",
+                    Project.MSG_VERBOSE);
                 fs = (FileSet) fs.clone();
                 fs.setProject(getProject());
             }
@@ -650,19 +686,22 @@
                 // iterating, capture the results now and store them
                 final String[] files = ds.getIncludedFiles();
                 resourcesToDelete.add(new ResourceCollection() {
-                        public boolean isFilesystemOnly() {
-                            return true;
-                        }
+                    @Override
+                    public boolean isFilesystemOnly() {
+                        return true;
+                    }
 
-                        public int size() {
-                            return files.length;
-                        }
+                    @Override
+                    public int size() {
+                        return files.length;
+                    }
 
-                        public Iterator<Resource> iterator() {
-                            return new FileResourceIterator(getProject(),
-                                                            fsDir, files);
-                        }
-                    });
+                    @Override
+                    public Iterator<Resource> iterator() {
+                        return new FileResourceIterator(getProject(),
+                                fsDir, files);
+                    }
+                });
                 if (includeEmpty) {
                     filesetDirs.add(new ReverseDirs(getProject(), fsDir,
                             ds.getIncludedDirectories()));
@@ -673,14 +712,17 @@
                     if (n.length > 0) {
                         String[] links = new String[n.length];
                         System.arraycopy(n, 0, links, 0, n.length);
-                        Arrays.sort(links, ReverseDirs.REVERSE);
+                        Arrays.sort(links, Comparator.reverseOrder());
                         for (int l = 0; l < links.length; l++) {
-                            try {
-                                SYMLINK_UTILS
-                                    .deleteSymbolicLink(new File(links[l]),
-                                                        this);
-                            } catch (java.io.IOException ex) {
-                                handle(ex);
+                            final Path filePath = Paths.get(links[l]);
+                            if (!Files.isSymbolicLink(filePath)) {
+                                // it's not a symbolic link, so move on
+                                continue;
+                            }
+                            // it's a symbolic link, so delete it
+                            final boolean deleted = filePath.toFile().delete();
+                            if (!deleted) {
+                                handle("Could not delete symbolic link at " + filePath);
                             }
                         }
                     }
@@ -836,14 +878,13 @@
         }
     }
 
-    private boolean isDanglingSymlink(File f) {
-        try {
-            return SYMLINK_UTILS.isDanglingSymbolicLink(f);
-        } catch (java.io.IOException e) {
-            log("Error while trying to detect " + f.getAbsolutePath()
-                + " as broken symbolic link. " + e.getMessage(),
-                quiet ? Project.MSG_VERBOSE : verbosity);
+    private boolean isDanglingSymlink(final File f) {
+        if (!Files.isSymbolicLink(f.toPath())) {
+            // it's not a symlink, so clearly it's not a dangling one
             return false;
         }
+        // it's a symbolic link, now  check the existence of the (target) file (by "following links")
+        final boolean targetFileExists = Files.exists(f.toPath());
+        return !targetFileExists;
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Deltree.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Deltree.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Deltree.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Deltree.java	2018-03-24 12:37:12.000000000 +0000
@@ -32,7 +32,7 @@
  * @deprecated The deltree task is deprecated since Ant 1.2.  Use
  * delete instead.
  */
-
+@Deprecated
 public class Deltree extends Task {
 
     private File dir;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/DependSet.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/DependSet.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/DependSet.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/DependSet.java	2018-03-24 12:37:12.000000000 +0000
@@ -102,12 +102,15 @@
         private HideMissingBasedir(FileSet fs) {
             this.fs = fs;
         }
+        @Override
         public Iterator<Resource> iterator() {
             return basedirExists() ? fs.iterator() : Resources.EMPTY_ITERATOR;
         }
+        @Override
         public int size() {
             return basedirExists() ? fs.size() : 0;
         }
+        @Override
         public boolean isFilesystemOnly() {
             return true;
         }
@@ -191,6 +194,7 @@
      * Execute the task.
      * @throws BuildException if errors occur.
      */
+    @Override
     public void execute() throws BuildException {
         if (sources == null) {
           throw new BuildException(
@@ -201,12 +205,11 @@
               "At least one set of target files must be specified");
         }
         //no sources = nothing to compare; no targets = nothing to delete:
-        if (sources.size() > 0 && targets.size() > 0 && !uptodate(sources, targets)) {
+        if (!(sources.isEmpty() || targets.isEmpty() || uptodate(sources, targets))) {
            log("Deleting all target files.", Project.MSG_VERBOSE);
            if (verbose) {
-               String[] t = targets.list();
-               for (int i = 0; i < t.length; i++) {
-                   log("Deleting " + t[i]);
+               for (String t : targets.list()) {
+                   log("Deleting " + t);
                }
            }
            Delete delete = new Delete();
@@ -245,7 +248,7 @@
             logMissing(missingSources, "source");
             return false;
         }
-        Resource newestSource = (Resource) getNewest(sources);
+        Resource newestSource = getNewest(sources);
         logWithModificationTime(newestSource, "newest source");
         return oldestTarget.getLastModified() >= newestSource.getLastModified();
     }
@@ -263,7 +266,6 @@
         Iterator<Resource> i = rc.iterator();
         if (!i.hasNext()) {
             return null;
-
         }
         Resource xest = i.next();
         while (i.hasNext()) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Dirname.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Dirname.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Dirname.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Dirname.java	2018-03-24 12:37:13.000000000 +0000
@@ -68,15 +68,14 @@
      * Execute this task.
      * @throws BuildException on error
      */
+    @Override
     public void execute() throws BuildException {
         if (property == null) {
             throw new BuildException("property attribute required", getLocation());
         }
         if (file == null) {
             throw new BuildException("file attribute required", getLocation());
-        } else {
-            String value = file.getParent();
-            getProject().setNewProperty(property, value);
         }
+        getProject().setNewProperty(property, file.getParent());
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Ear.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Ear.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Ear.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Ear.java	2018-03-24 12:37:12.000000000 +0000
@@ -55,6 +55,7 @@
      * @deprecated since 1.5.x.
      *             Use setDestFile(destfile) instead.
      */
+    @Deprecated
     public void setEarfile(File earFile) {
         setDestFile(earFile);
     }
@@ -66,9 +67,9 @@
     public void setAppxml(File descr) {
         deploymentDescriptor = descr;
         if (!deploymentDescriptor.exists()) {
-            throw new BuildException("Deployment descriptor: "
-                                     + deploymentDescriptor
-                                     + " does not exist.");
+            throw new BuildException(
+                "Deployment descriptor: %s does not exist.",
+                deploymentDescriptor);
         }
 
         // Create a ZipFileSet for this file, and pass it up.
@@ -78,7 +79,6 @@
         super.addFileset(fs);
     }
 
-
     /**
      * Adds zipfileset.
      *
@@ -91,13 +91,13 @@
         super.addFileset(fs);
     }
 
-
     /**
      * Initialize the output stream.
      * @param zOut the zip output stream.
      * @throws IOException on I/O errors
      * @throws BuildException on other errors
      */
+    @Override
     protected void initZipOutputStream(ZipOutputStream zOut)
         throws IOException, BuildException {
         // If no webxml file is specified, it's an error.
@@ -116,6 +116,7 @@
      * @param mode the Unix permissions to set.
      * @throws IOException on error
      */
+    @Override
     protected void zipFile(File file, ZipOutputStream zOut, String vPath,
                            int mode)
         throws IOException {
@@ -147,6 +148,7 @@
      * Make sure we don't think we already have a application.xml next
      * time this task gets executed.
      */
+    @Override
     protected void cleanUp() {
         descriptorAdded = false;
         super.cleanUp();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/EchoXML.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/EchoXML.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/EchoXML.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/EchoXML.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,7 +18,6 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.OutputStream;
 
 import org.apache.tools.ant.BuildException;
@@ -82,7 +81,7 @@
         OutputStream os = null;
         try {
             if (file != null) {
-                os = new FileOutputStream(file.getAbsolutePath(), append);
+                os = FileUtils.newOutputStream(file.toPath(), append);
             } else {
                 os = new LogOutputStream(this, Project.MSG_INFO);
             }
@@ -114,6 +113,7 @@
         public NamespacePolicy(String s) {
             setValue(s);
         }
+
         /** {@inheritDoc}. */
         @Override
         public String[] getValues() {
@@ -124,14 +124,15 @@
             String s = getValue();
             if (IGNORE.equalsIgnoreCase(s)) {
                 return DOMElementWriter.XmlNamespacePolicy.IGNORE;
-            } else if (ELEMENTS.equalsIgnoreCase(s)) {
+            }
+            if (ELEMENTS.equalsIgnoreCase(s)) {
                 return
                     DOMElementWriter.XmlNamespacePolicy.ONLY_QUALIFY_ELEMENTS;
-            } else if (ALL.equalsIgnoreCase(s)) {
+            }
+            if (ALL.equalsIgnoreCase(s)) {
                 return DOMElementWriter.XmlNamespacePolicy.QUALIFY_ALL;
-            } else {
-                throw new BuildException("Invalid namespace policy: " + s);
             }
+            throw new BuildException("Invalid namespace policy: " + s);
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/email/EmailAddress.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/email/EmailAddress.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/email/EmailAddress.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/email/EmailAddress.java	2018-03-24 12:37:12.000000000 +0000
@@ -119,7 +119,7 @@
     private String trim(String t, boolean trimAngleBrackets) {
         int start = 0;
         int end = t.length();
-        boolean trim = false;
+        boolean trim;
         do {
             trim = false;
             if (t.charAt(end - 1) == ')'
@@ -140,7 +140,6 @@
         return t.substring(start, end);
     }
 
-
     /**
      * Sets the personal / display name of the address.
      *
@@ -150,7 +149,6 @@
         this.name = name;
     }
 
-
     /**
      * Sets the email address.
      *
@@ -160,21 +158,19 @@
         this.address = address;
     }
 
-
     /**
      * Constructs a string "name &lt;address&gt;" or "address"
      *
      * @return a string representation of the address
      */
+    @Override
     public String toString() {
         if (name == null) {
             return address;
-        } else {
-            return name + " <" + address + ">";
         }
+        return name + " <" + address + ">";
     }
 
-
     /**
      * Returns the address
      *
@@ -184,7 +180,6 @@
         return address;
     }
 
-
     /**
      * Returns the display name
      *
@@ -194,4 +189,3 @@
         return name;
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,7 +20,6 @@
 import java.io.File;
 import java.util.StringTokenizer;
 import java.util.Vector;
-
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
@@ -60,6 +59,7 @@
          *
          * @return a list of valid entries
          */
+        @Override
         public String[] getValues() {
             return new String[] {AUTO, MIME, UU, PLAIN};
         }
@@ -82,16 +82,16 @@
     /** sender  */
     private EmailAddress from = null;
     /** replyto */
-    private Vector replyToList = new Vector();
+    private Vector<EmailAddress> replyToList = new Vector<>();
     /** TO recipients  */
-    private Vector toList = new Vector();
+    private Vector<EmailAddress> toList = new Vector<>();
     /** CC (Carbon Copy) recipients  */
-    private Vector ccList = new Vector();
+    private Vector<EmailAddress> ccList = new Vector<>();
     /** BCC (Blind Carbon Copy) recipients  */
-    private Vector bccList = new Vector();
+    private Vector<EmailAddress> bccList = new Vector<>();
 
     /** generic headers */
-    private Vector headers = new Vector();
+    private Vector<Header> headers = new Vector<>();
 
     /** file list  */
     private Path attachments = null;
@@ -193,8 +193,8 @@
      */
     public void setMessage(String message) {
         if (this.message != null) {
-            throw new BuildException("Only one message can be sent in an "
-                 + "email");
+            throw new BuildException(
+                "Only one message can be sent in an email");
         }
         this.message = new Message(message);
         this.message.setProject(getProject());
@@ -207,8 +207,8 @@
      */
     public void setMessageFile(File file) {
         if (this.message != null) {
-            throw new BuildException("Only one message can be sent in an "
-                 + "email");
+            throw new BuildException(
+                "Only one message can be sent in an email");
         }
         this.message = new Message(file);
         this.message.setProject(getProject());
@@ -288,7 +288,7 @@
      * @param address An email address.
      */
     public void addTo(EmailAddress address) {
-        toList.addElement(address);
+        toList.add(address);
     }
 
     /**
@@ -300,7 +300,7 @@
         StringTokenizer tokens = new StringTokenizer(list, ",");
 
         while (tokens.hasMoreTokens()) {
-            toList.addElement(new EmailAddress(tokens.nextToken()));
+            toList.add(new EmailAddress(tokens.nextToken()));
         }
     }
 
@@ -310,7 +310,7 @@
      * @param address The email address.
      */
     public void addCc(EmailAddress address) {
-        ccList.addElement(address);
+        ccList.add(address);
     }
 
     /**
@@ -322,7 +322,7 @@
         StringTokenizer tokens = new StringTokenizer(list, ",");
 
         while (tokens.hasMoreTokens()) {
-            ccList.addElement(new EmailAddress(tokens.nextToken()));
+            ccList.add(new EmailAddress(tokens.nextToken()));
         }
     }
 
@@ -332,7 +332,7 @@
      * @param address The email address.
      */
     public void addBcc(EmailAddress address) {
-        bccList.addElement(address);
+        bccList.add(address);
     }
 
     /**
@@ -344,7 +344,7 @@
         StringTokenizer tokens = new StringTokenizer(list, ",");
 
         while (tokens.hasMoreTokens()) {
-            bccList.addElement(new EmailAddress(tokens.nextToken()));
+            bccList.add(new EmailAddress(tokens.nextToken()));
         }
     }
 
@@ -439,6 +439,7 @@
     /**
      * Send an email.
      */
+    @Override
     public void execute() {
         Message savedMessage = message;
 
@@ -448,15 +449,15 @@
             // prepare for the auto select mechanism
             boolean autoFound = false;
             // try MIME format
-            if (encoding.equals(MIME)
-                 || (encoding.equals(AUTO) && !autoFound)) {
+            if (MIME.equals(encoding)
+                 || (AUTO.equals(encoding) && !autoFound)) {
                 try {
                     //check to make sure that activation.jar
                     //and mail.jar are available - see bug 31969
                     Class.forName("javax.activation.DataHandler");
                     Class.forName("javax.mail.internet.MimeMessage");
 
-                    mailer = (Mailer) ClasspathUtils.newInstance(
+                    mailer = ClasspathUtils.newInstance(
                             "org.apache.tools.ant.taskdefs.email.MimeMailer",
                             EmailTask.class.getClassLoader(), Mailer.class);
                     autoFound = true;
@@ -468,20 +469,20 @@
             }
             // SMTP auth only allowed with MIME mail
             if (!autoFound && ((user != null) || (password != null))
-                && (encoding.equals(UU) || encoding.equals(PLAIN))) {
+                && (UU.equals(encoding) || PLAIN.equals(encoding))) {
                 throw new BuildException("SMTP auth only possible with MIME mail");
             }
             // SSL only allowed with MIME mail
             if (!autoFound  && (ssl || starttls)
-                && (encoding.equals(UU) || encoding.equals(PLAIN))) {
-                throw new BuildException("SSL and STARTTLS only possible with"
-                                         + " MIME mail");
+                && (UU.equals(encoding) || PLAIN.equals(encoding))) {
+                throw new BuildException(
+                    "SSL and STARTTLS only possible with MIME mail");
             }
             // try UU format
-            if (encoding.equals(UU)
-                 || (encoding.equals(AUTO) && !autoFound)) {
+            if (UU.equals(encoding)
+                 || (AUTO.equals(encoding) && !autoFound)) {
                 try {
-                    mailer = (Mailer) ClasspathUtils.newInstance(
+                    mailer = ClasspathUtils.newInstance(
                             "org.apache.tools.ant.taskdefs.email.UUMailer",
                             EmailTask.class.getClassLoader(), Mailer.class);
                     autoFound = true;
@@ -491,16 +492,16 @@
                 }
             }
             // try plain format
-            if (encoding.equals(PLAIN)
-                 || (encoding.equals(AUTO) && !autoFound)) {
+            if (PLAIN.equals(encoding)
+                 || (AUTO.equals(encoding) && !autoFound)) {
                 mailer = new PlainMailer();
                 autoFound = true;
                 log("Using plain mail", Project.MSG_VERBOSE);
             }
             // a valid mailer must be present by now
             if (mailer == null) {
-                throw new BuildException("Failed to initialise encoding: "
-                     + encoding);
+                throw new BuildException("Failed to initialise encoding: %s",
+                    encoding);
             }
             // a valid message is required
             if (message == null) {
@@ -513,33 +514,33 @@
             }
             // at least one address to send to/cc/bcc is required
             if (toList.isEmpty() && ccList.isEmpty() && bccList.isEmpty()) {
-                throw new BuildException("At least one of to, cc or bcc must "
-                     + "be supplied");
+                throw new BuildException(
+                    "At least one of to, cc or bcc must be supplied");
             }
             // set the mimetype if not done already (and required)
             if (messageMimeType != null) {
                 if (message.isMimeTypeSpecified()) {
-                    throw new BuildException("The mime type can only be "
-                         + "specified in one location");
+                    throw new BuildException(
+                        "The mime type can only be specified in one location");
                 }
                 message.setMimeType(messageMimeType);
             }
             // set the character set if not done already (and required)
             if (charset != null) {
                 if (message.getCharset() != null) {
-                    throw new BuildException("The charset can only be "
-                         + "specified in one location");
+                    throw new BuildException(
+                        "The charset can only be specified in one location");
                 }
                 message.setCharset(charset);
             }
             message.setInputEncoding(messageFileInputEncoding);
 
             // identify which files should be attached
-            Vector<File> files = new Vector<File>();
+            Vector<File> files = new Vector<>();
+
             if (attachments != null) {
                 for (Resource r : attachments) {
-                    files.addElement(r.as(FileProvider.class)
-                                     .getFile());
+                    files.add(r.as(FileProvider.class).getFile());
                 }
             }
             // let the user know what's going to happen
@@ -636,4 +637,3 @@
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/email/Header.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/email/Header.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/email/Header.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/email/Header.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,9 @@
 package org.apache.tools.ant.taskdefs.email;
 
 /**
- * Class representing a generic e-mail header.
+ * Class representing a generic key-value header.
+ * TODO: This should be moved out of the email package
+ *
  * @since Ant 1.7
  */
 public class Header {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/email/Mailer.java	2018-03-24 12:37:12.000000000 +0000
@@ -279,4 +279,3 @@
         return DateUtils.getDateForHeader();
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/email/Message.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/email/Message.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/email/Message.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/email/Message.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,13 +20,14 @@
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintStream;
 import java.io.Reader;
+import java.nio.file.Files;
 
 import org.apache.tools.ant.ProjectComponent;
 
@@ -47,7 +48,6 @@
     public Message() {
     }
 
-
     /**
      * Creates a new message based on the given string
      *
@@ -57,7 +57,6 @@
         addText(text);
     }
 
-
     /**
      * Creates a new message using the contents of the given file.
      *
@@ -67,7 +66,6 @@
         messageSource = file;
     }
 
-
     /**
      * Adds a textual part of the message
      *
@@ -77,7 +75,6 @@
         buffer.append(text);
     }
 
-
     /**
      * Sets the source file of the message
      *
@@ -87,7 +84,6 @@
         this.messageSource = src;
     }
 
-
     /**
      * Sets the content type for the message
      *
@@ -98,7 +94,6 @@
         specified = true;
     }
 
-
     /**
      * Returns the content type
      *
@@ -108,7 +103,6 @@
         return mimeType;
     }
 
-
     /**
      * Prints the message onto an output stream
      *
@@ -126,17 +120,13 @@
                 : new BufferedWriter(new OutputStreamWriter(ps));
             if (messageSource != null) {
                 // Read message from a file
-                Reader freader = getReader(messageSource);
-
-                try {
-                    BufferedReader in = new BufferedReader(freader);
-                    String line = null;
+                try (Reader freader = getReader(messageSource);
+                     BufferedReader in = new BufferedReader(freader)) {
+                    String line;
                     while ((line = in.readLine()) != null) {
                         out.write(getProject().replaceProperties(line));
                         out.newLine();
                     }
-                } finally {
-                    freader.close();
                 }
             } else {
                 out.write(getProject().replaceProperties(buffer.substring(0)));
@@ -148,7 +138,6 @@
         }
     }
 
-
     /**
      * Returns true if the mimeType has been set.
      *
@@ -167,6 +156,7 @@
     public void setCharset(String charset) {
         this.charset = charset;
     }
+
     /**
      * Returns the charset of mail message.
      *
@@ -189,7 +179,7 @@
 
     private Reader getReader(File f) throws IOException {
         if (inputEncoding != null) {
-            FileInputStream fis = new FileInputStream(f);
+            InputStream fis = Files.newInputStream(f.toPath());
             try {
                 return new InputStreamReader(fis, inputEncoding);
             } catch (IOException ex) {
@@ -200,4 +190,3 @@
         return new FileReader(f);
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java	2018-03-24 12:37:12.000000000 +0000
@@ -27,8 +27,6 @@
 import java.io.UnsupportedEncodingException;
 import java.security.Provider;
 import java.security.Security;
-import java.util.Enumeration;
-import java.util.Iterator;
 import java.util.Locale;
 import java.util.Properties;
 import java.util.StringTokenizer;
@@ -81,6 +79,7 @@
         private String charset = null;
         private ByteArrayOutputStream out;
 
+        @Override
         public InputStream getInputStream() throws IOException {
             if (data == null && out == null) {
                 throw new IOException("No data");
@@ -93,6 +92,7 @@
             return new ByteArrayInputStream(data.getBytes(charset));
         }
 
+        @Override
         public OutputStream getOutputStream() throws IOException {
             out = (out == null) ? new ByteArrayOutputStream() : out;
             return out;
@@ -102,16 +102,18 @@
             this.type = type.toLowerCase(Locale.ENGLISH);
         }
 
+        @Override
         public String getContentType() {
             if (type != null && type.indexOf("charset") > 0
                 && type.startsWith("text/")) {
                 return type;
             }
             // Must be like "text/plain; charset=windows-1251"
-            return new StringBuffer(type != null ? type : "text/plain").append(
+            return new StringBuilder(type != null ? type : "text/plain").append(
                 "; charset=").append(charset).toString();
         }
 
+        @Override
         public String getName() {
             return "StringDataSource";
         }
@@ -130,6 +132,7 @@
      *
      * @throws BuildException if the email can't be sent.
      */
+    @Override
     public void send() {
         try {
             final Properties props = new Properties();
@@ -144,13 +147,13 @@
             Authenticator auth = null;
             if (SSL) {
                 try {
-                    final Provider p = (Provider) Class.forName(
-                        "com.sun.net.ssl.internal.ssl.Provider").newInstance();
+                    final Provider p =
+                        Class.forName("com.sun.net.ssl.internal.ssl.Provider")
+                            .asSubclass(Provider.class).newInstance();
                     Security.addProvider(p);
                 } catch (final Exception e) {
-                    throw new BuildException("could not instantiate ssl "
-                        + "security provider, check that you have JSSE in "
-                        + "your classpath");
+                    throw new BuildException(
+                        "could not instantiate ssl security provider, check that you have JSSE in your classpath");
                 }
                 // SMTP provider
                 props.put("mail.smtp.socketFactory.class", SSL_FACTORY);
@@ -217,8 +220,7 @@
             msg.addHeader("Date", getDate());
 
             if (headers != null) {
-                for (final Iterator iter = headers.iterator(); iter.hasNext();) {
-                    final Header h = (Header) iter.next();
+                for (Header h : headers) {
                     msg.addHeader(h.getName(), h.getValue());
                 }
             }
@@ -230,18 +232,12 @@
             textbody.setDataHandler(new DataHandler(sds));
             attachments.addBodyPart(textbody);
 
-            final Enumeration e = files.elements();
-
-            while (e.hasMoreElements()) {
-                final File file = (File) e.nextElement();
-
-                MimeBodyPart body;
-
-                body = new MimeBodyPart();
+            for (File file : files) {
+                MimeBodyPart body = new MimeBodyPart();
                 if (!file.exists() || !file.canRead()) {
-                    throw new BuildException("File \"" + file.getAbsolutePath()
-                         + "\" does not exist or is not "
-                         + "readable.");
+                    throw new BuildException(
+                        "File \"%s\" does not exist or is not readable.",
+                        file.getAbsolutePath());
                 }
                 final FileDataSource fileData = new FileDataSource(file);
                 final DataHandler fileDataHandler = new DataHandler(fileData);
@@ -259,41 +255,40 @@
             } catch (final SendFailedException sfe) {
                 if (!shouldIgnoreInvalidRecipients()) {
                     throw new BuildException(GENERIC_ERROR, sfe);
-                } else if (sfe.getValidSentAddresses() == null
+                }
+                if (sfe.getValidSentAddresses() == null
                            || sfe.getValidSentAddresses().length == 0) {
                     throw new BuildException("Couldn't reach any recipient",
                                              sfe);
-                } else {
-                    Address[] invalid = sfe.getInvalidAddresses();
-                    if (invalid == null) {
-                        invalid = new Address[0];
-                    }
-                    for (int i = 0; i < invalid.length; i++) {
-                        didntReach(invalid[i], "invalid", sfe);
-                    }
-                    Address[] validUnsent = sfe.getValidUnsentAddresses();
-                    if (validUnsent == null) {
-                        validUnsent = new Address[0];
-                    }
-                    for (int i = 0; i < validUnsent.length; i++) {
-                        didntReach(validUnsent[i], "valid", sfe);
-                    }
+                }
+                Address[] invalid = sfe.getInvalidAddresses();
+                if (invalid == null) {
+                    invalid = new Address[0];
+                }
+                for (int i = 0; i < invalid.length; i++) {
+                    didntReach(invalid[i], "invalid", sfe);
+                }
+                Address[] validUnsent = sfe.getValidUnsentAddresses();
+                if (validUnsent == null) {
+                    validUnsent = new Address[0];
+                }
+                for (int i = 0; i < validUnsent.length; i++) {
+                    didntReach(validUnsent[i], "valid", sfe);
                 }
             }
-        } catch (final MessagingException e) {
-            throw new BuildException(GENERIC_ERROR, e);
-        } catch (final IOException e) {
+        } catch (MessagingException | IOException e) {
             throw new BuildException(GENERIC_ERROR, e);
         }
     }
 
-    private static InternetAddress[] internetAddresses(final Vector list)
+    private static InternetAddress[] internetAddresses(final Vector<EmailAddress> list)
         throws AddressException, UnsupportedEncodingException {
+
         final int size = list.size();
         final InternetAddress[] addrs = new InternetAddress[size];
 
         for (int i = 0; i < size; ++i) {
-            final EmailAddress addr = (EmailAddress) list.elementAt(i);
+            final EmailAddress addr = list.get(i);
 
             final String name = addr.getName();
             addrs[i] = (name == null)
@@ -309,7 +304,7 @@
         }
         final int pos = type.indexOf("charset");
         if (pos < 0) {
-          return null;
+            return null;
         }
         // Assuming mime type in form "text/XXXX; charset=XXXXXX"
         final StringTokenizer token = new StringTokenizer(type.substring(pos), "=; ");
@@ -331,10 +326,13 @@
     static class SimpleAuthenticator extends Authenticator {
         private String user = null;
         private String password = null;
+
         public SimpleAuthenticator(final String user, final String password) {
             this.user = user;
             this.password = password;
         }
+
+        @Override
         public PasswordAuthentication getPasswordAuthentication() {
             return new PasswordAuthentication(user, password);
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/email/PlainMailer.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/email/PlainMailer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/email/PlainMailer.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/email/PlainMailer.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,11 +19,10 @@
 
 import java.io.BufferedInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintStream;
-import java.util.Enumeration;
-
+import java.nio.file.Files;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.mail.MailMessage;
@@ -39,49 +38,44 @@
      *
      * @see org.apache.tools.mail.MailMessage
      */
+    @Override
     public void send() {
         try {
             MailMessage mailMessage = new MailMessage(host, port);
 
             mailMessage.from(from.toString());
 
-            Enumeration e;
             boolean atLeastOneRcptReached = false;
 
-            e = replyToList.elements();
-            while (e.hasMoreElements()) {
-                mailMessage.replyto(e.nextElement().toString());
-            }
-            e = toList.elements();
-            while (e.hasMoreElements()) {
-                String to = e.nextElement().toString();
+            replyToList.stream().map(Object::toString).forEach(mailMessage::replyto);
+
+            for (EmailAddress to : toList) {
                 try {
-                    mailMessage.to(to);
+                    mailMessage.to(to.toString());
                     atLeastOneRcptReached = true;
                 } catch (IOException ex) {
                     badRecipient(to, ex);
                 }
             }
-            e = ccList.elements();
-            while (e.hasMoreElements()) {
-                String to = e.nextElement().toString();
+
+            for (EmailAddress cc : ccList) {
                 try {
-                    mailMessage.cc(to);
+                    mailMessage.cc(cc.toString());
                     atLeastOneRcptReached = true;
                 } catch (IOException ex) {
-                    badRecipient(to, ex);
+                    badRecipient(cc, ex);
                 }
             }
-            e = bccList.elements();
-            while (e.hasMoreElements()) {
-                String to = e.nextElement().toString();
+
+            for (EmailAddress bcc : bccList) {
                 try {
-                    mailMessage.bcc(to);
+                    mailMessage.bcc(bcc.toString());
                     atLeastOneRcptReached = true;
                 } catch (IOException ex) {
-                    badRecipient(to, ex);
+                    badRecipient(bcc, ex);
                 }
             }
+
             if (!atLeastOneRcptReached) {
                 throw new BuildException("Couldn't reach any recipient");
             }
@@ -96,18 +90,17 @@
                 mailMessage.setHeader("Content-Type", message.getMimeType());
             }
             if (headers != null) {
-                e = headers.elements();
-                while (e.hasMoreElements()) {
-                    Header h = (Header) e.nextElement();
+                for (Header h : headers) {
                     mailMessage.setHeader(h.getName(), h.getValue());
                 }
             }
             PrintStream out = mailMessage.getPrintStream();
             message.print(out);
 
-            e = files.elements();
-            while (e.hasMoreElements()) {
-                attach((File) e.nextElement(), out);
+            if (files != null) {
+                for (File f : files) {
+                    attach(f, out);
+                }
             }
             mailMessage.sendAndClose();
         } catch (IOException ioe) {
@@ -126,9 +119,9 @@
     protected void attach(File file, PrintStream out)
          throws IOException {
         if (!file.exists() || !file.canRead()) {
-            throw new BuildException("File \"" + file.getName()
-                 + "\" does not exist or is not "
-                 + "readable.");
+            throw new BuildException(
+                "File \"%s\" does not exist or is not readable.",
+                file.getAbsolutePath());
         }
 
         if (includeFileNames) {
@@ -144,23 +137,20 @@
             out.println();
         }
 
-        int length;
         final int maxBuf = 1024;
         byte[] buf = new byte[maxBuf];
-        FileInputStream finstr = new FileInputStream(file);
 
-        try {
-            BufferedInputStream in = new BufferedInputStream(finstr, buf.length);
+        try (InputStream finstr = Files.newInputStream(file.toPath());
+             BufferedInputStream in = new BufferedInputStream(finstr, buf.length)) {
 
+            int length;
             while ((length = in.read(buf)) != -1) {
                 out.write(buf, 0, length);
             }
-        } finally {
-            finstr.close();
         }
     }
 
-    private void badRecipient(String rcpt, IOException reason) {
+    private void badRecipient(EmailAddress rcpt, IOException reason) {
         String msg = "Failed to send mail to " + rcpt;
         if (shouldIgnoreInvalidRecipients()) {
             msg += " because of :" + reason.getMessage();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/email/UUMailer.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/email/UUMailer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/email/UUMailer.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/email/UUMailer.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,9 +19,10 @@
 
 import java.io.BufferedInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintStream;
+import java.nio.file.Files;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.UUEncoder;
@@ -32,24 +33,18 @@
  * @since Ant 1.5
  */
 class UUMailer extends PlainMailer {
+    @Override
     protected void attach(File file, PrintStream out)
          throws IOException {
         if (!file.exists() || !file.canRead()) {
-            throw new BuildException("File \"" + file.getName()
-                 + "\" does not exist or is not "
-                 + "readable.");
+            throw new BuildException(
+                "File \"%s" + "\" does not exist or is not " + "readable.",
+                file.getAbsolutePath());
         }
 
-        FileInputStream finstr = new FileInputStream(file);
-
-        try {
-            BufferedInputStream in = new BufferedInputStream(finstr);
-            UUEncoder encoder = new UUEncoder(file.getName());
-
-            encoder.encode(in, out);
-
-        } finally {
-            finstr.close();
+        try (InputStream in =
+            new BufferedInputStream(Files.newInputStream(file.toPath()))) {
+            new UUEncoder(file.getName()).encode(in, out);
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Exec.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Exec.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Exec.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Exec.java	2018-03-24 12:37:12.000000000 +0000
@@ -44,6 +44,7 @@
  *             delegate to {@link org.apache.tools.ant.taskdefs.Execute Execute}
  *             instead.
  */
+@Deprecated
 public class Exec extends Task {
     private String os;
     private String out;
@@ -70,6 +71,7 @@
      * Execute the task.
      * @throws BuildException on error
      */
+    @Override
     public void execute() throws BuildException {
         run(command);
     }
@@ -160,9 +162,8 @@
             if (err != 0) {
                 if (failOnError) {
                     throw new BuildException("Exec returned: " + err, getLocation());
-                } else {
-                    log("Result: " + err, Project.MSG_ERR);
                 }
+                log("Result: " + err, Project.MSG_ERR);
             }
         } catch (IOException ioe) {
             throw new BuildException("Error exec: " + command, ioe, getLocation());
@@ -262,6 +263,7 @@
             }
         }
 
+        @Override
         public void run() {
             try {
                 try {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ExecTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ExecTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ExecTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -125,7 +125,7 @@
      */
     public void setTimeout(Integer value) {
         setTimeout(
-            (Long) ((value == null) ? null : new Long(value.intValue())));
+            (value == null) ? null : Long.valueOf(value.intValue()));
     }
 
     /**
@@ -168,8 +168,7 @@
      * @ant.attribute ignore="true"
      */
     public void setCommand(Commandline cmdl) {
-        log("The command attribute is deprecated.\n"
-            + "Please use the executable attribute and nested arg elements.",
+        log("The command attribute is deprecated.\nPlease use the executable attribute and nested arg elements.",
             Project.MSG_WARN);
         this.cmdl = cmdl;
     }
@@ -192,8 +191,8 @@
      */
     public void setInput(File input) {
         if (inputString != null) {
-            throw new BuildException("The \"input\" and \"inputstring\" "
-                + "attributes cannot both be specified");
+            throw new BuildException(
+                "The \"input\" and \"inputstring\" attributes cannot both be specified");
         }
         this.input = input;
         incompatibleWithSpawn = true;
@@ -206,8 +205,8 @@
      */
     public void setInputString(String inputString) {
         if (input != null) {
-            throw new BuildException("The \"input\" and \"inputstring\" "
-                + "attributes cannot both be specified");
+            throw new BuildException(
+                "The \"input\" and \"inputstring\" attributes cannot both be specified");
         }
         this.inputString = inputString;
         incompatibleWithSpawn = true;
@@ -486,6 +485,7 @@
      * <li>this list is not exhaustive or limitative</li>
      * </ul>
      */
+    @Override
     public void execute() throws BuildException {
         // Quick fail if this is not a valid OS for the command
         if (!isValidOs()) {
@@ -635,9 +635,8 @@
                 String msg = "Timeout: killed the sub-process";
                 if (failOnError) {
                     throw new BuildException(msg);
-                } else {
-                    log(msg, Project.MSG_WARN);
                 }
+                log(msg, Project.MSG_WARN);
             }
             maybeSetResultPropertyValue(returnCode);
             redirector.complete();
@@ -645,9 +644,8 @@
                 if (failOnError) {
                     throw new BuildException(getTaskType() + " returned: "
                         + returnCode, getLocation());
-                } else {
-                    log("Result: " + returnCode, Project.MSG_ERR);
                 }
+                log("Result: " + returnCode, Project.MSG_ERR);
             }
         } else {
             exe.spawn();
@@ -674,9 +672,8 @@
             if (failIfExecFails) {
                 throw new BuildException("Execute failed: " + e.toString(), e,
                                          getLocation());
-            } else {
-                log("Execute failed: " + e.toString(), Project.MSG_ERR);
             }
+            log("Execute failed: " + e.toString(), Project.MSG_ERR);
         } finally {
             // close the output file if required
             logFlush();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Execute.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Execute.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Execute.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Execute.java	2018-03-24 12:37:12.000000000 +0000
@@ -24,7 +24,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringReader;
-import java.util.ArrayList;
+import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -54,18 +54,6 @@
      */
     public static final int INVALID = Integer.MAX_VALUE;
 
-    private String[] cmdl = null;
-    private String[] env = null;
-    private int exitValue = INVALID;
-    private ExecuteStreamHandler streamHandler;
-    private final ExecuteWatchdog watchdog;
-    private File workingDirectory = null;
-    private Project project = null;
-    private boolean newEnvironment = false;
-
-    /** Controls whether the VM is used to launch commands, where possible. */
-    private boolean useVMLauncher = true;
-
     private static String antWorkingDirectory = System.getProperty("user.dir");
     private static Map<String, String> procEnvironment = null;
 
@@ -81,6 +69,18 @@
         }
     }
 
+    private String[] cmdl = null;
+    private String[] env = null;
+    private int exitValue = INVALID;
+    private ExecuteStreamHandler streamHandler;
+    private final ExecuteWatchdog watchdog;
+    private File workingDirectory = null;
+    private Project project = null;
+    private boolean newEnvironment = false;
+
+    /** Controls whether the VM is used to launch commands, where possible. */
+    private boolean useVMLauncher = true;
+
     /**
      * Set whether or not you want the process to be spawned.
      * Default is not spawned.
@@ -104,7 +104,7 @@
      * @return a map containing the environment variables.
      * @since Ant 1.8.2
      */
-    public static synchronized Map<String,String> getEnvironmentVariables() {
+    public static synchronized Map<String, String> getEnvironmentVariables() {
         if (procEnvironment != null) {
             return procEnvironment;
         }
@@ -117,7 +117,7 @@
             }
         }
 
-        procEnvironment = new LinkedHashMap<String, String>();
+        procEnvironment = new LinkedHashMap<>();
         try {
             ByteArrayOutputStream out = new ByteArrayOutputStream();
             Execute exe = new Execute(new PumpStreamHandler(out));
@@ -149,7 +149,7 @@
                 } else {
                     // New env var...append the previous one if we have it.
                     if (var != null) {
-                        int eq = var.indexOf("=");
+                        int eq = var.indexOf('=');
                         procEnvironment.put(var.substring(0, eq),
                                             var.substring(eq + 1));
                     }
@@ -158,10 +158,10 @@
             }
             // Since we "look ahead" before adding, there's one last env var.
             if (var != null) {
-                int eq = var.indexOf("=");
+                int eq = var.indexOf('=');
                 procEnvironment.put(var.substring(0, eq), var.substring(eq + 1));
             }
-        } catch (java.io.IOException exc) {
+        } catch (IOException exc) {
             exc.printStackTrace(); //NOSONAR
             // Just try to see how much we got
         }
@@ -177,7 +177,7 @@
      */
     @Deprecated
     public static synchronized Vector<String> getProcEnvironment() {
-        Vector<String> v = new Vector<String>();
+        Vector<String> v = new Vector<>();
         for (Entry<String, String> entry : getEnvironmentVariables().entrySet()) {
             v.add(entry.getKey() + "=" + entry.getValue());
         }
@@ -195,16 +195,17 @@
         if (Os.isFamily("os/2")) {
             // OS/2 - use same mechanism as Windows 2000
             return new String[] {"cmd", "/c", "set"};
-        } else if (Os.isFamily("windows")) {
+        }
+        if (Os.isFamily("windows")) {
             // Determine if we're running under XP/2000/NT or 98/95
             if (Os.isFamily("win9x")) {
                 // Windows 98/95
                 return new String[] {"command.com", "/c", "set"};
-            } else {
-                // Windows XP/2000/NT/2003
-                return new String[] {"cmd", "/c", "set"};
             }
-        } else if (Os.isFamily("z/os") || Os.isFamily("unix")) {
+            // Windows XP/2000/NT/2003
+            return new String[] {"cmd", "/c", "set"};
+        }
+        if (Os.isFamily("z/os") || Os.isFamily("unix")) {
             // On most systems one could use: /bin/sh -c env
 
             // Some systems have /bin/env, others /usr/bin/env, just try
@@ -218,16 +219,17 @@
                 cmd[0] = "env";
             }
             return cmd;
-        } else if (Os.isFamily("netware") || Os.isFamily("os/400")) {
+        }
+        if (Os.isFamily("netware") || Os.isFamily("os/400")) {
             // rely on PATH
             return new String[] {"env"};
-        } else if (Os.isFamily("openvms")) {
+        }
+        if (Os.isFamily("openvms")) {
             return new String[] {"show", "logical"};
-        } else {
-            // MAC OS 9 and previous
-            // TODO: I have no idea how to get it, someone must fix it
-            return null;
         }
+        // MAC OS 9 and previous
+        // TODO: I have no idea how to get it, someone must fix it
+        return null;
     }
 
     /**
@@ -244,13 +246,13 @@
         if (Os.isFamily("z/os")) {
             try {
                 return bos.toString("Cp1047");
-            } catch (java.io.UnsupportedEncodingException e) {
+            } catch (UnsupportedEncodingException e) {
                 // noop default encoding used
             }
         } else if (Os.isFamily("os/400")) {
             try {
                 return bos.toString("Cp500");
-            } catch (java.io.UnsupportedEncodingException e) {
+            } catch (UnsupportedEncodingException e) {
                 // noop default encoding used
             }
         }
@@ -417,7 +419,7 @@
                                  String[] env, File dir, boolean useVM)
         throws IOException {
         if (dir != null && !dir.exists()) {
-            throw new BuildException(dir + " doesn't exist.");
+            throw new BuildException("%s doesn't exist.", dir);
         }
 
         CommandLauncher vmLauncher = CommandLauncher.getVMLauncher(project);
@@ -435,7 +437,7 @@
      */
     public int execute() throws IOException {
         if (workingDirectory != null && !workingDirectory.exists()) {
-            throw new BuildException(workingDirectory + " doesn't exist.");
+            throw new BuildException("%s doesn't exist.", workingDirectory);
         }
         final Process process = launch(project, getCommandline(),
                                        getEnvironment(), workingDirectory,
@@ -492,7 +494,7 @@
      */
     public void spawn() throws IOException {
         if (workingDirectory != null && !workingDirectory.exists()) {
-            throw new BuildException(workingDirectory + " doesn't exist.");
+            throw new BuildException("%s doesn't exist.", workingDirectory);
         }
         final Process process = launch(project, getCommandline(),
                                        getEnvironment(), workingDirectory,
@@ -611,7 +613,7 @@
             return env;
         }
         Map<String, String> osEnv =
-            new LinkedHashMap<String, String>(getEnvironmentVariables());
+            new LinkedHashMap<>(getEnvironmentVariables());
         for (int i = 0; i < env.length; i++) {
             String keyValue = env[i];
             String key = keyValue.substring(0, keyValue.indexOf('='));
@@ -624,7 +626,7 @@
 
                 for (String osEnvItem : osEnv.keySet()) {
                     // Nb: using default locale as key is a env name
-                    if (osEnvItem.toLowerCase().equals(key.toLowerCase())) {
+                    if (osEnvItem.equalsIgnoreCase(key)) {
                         // Use the original case of the key
                         key = osEnvItem;
                         break;
@@ -636,11 +638,8 @@
             osEnv.put(key, keyValue.substring(key.length() + 1));
         }
 
-        ArrayList<String> l = new ArrayList<String>();
-        for (Entry<String, String> entry : osEnv.entrySet()) {
-            l.add(entry.getKey() + "=" + entry.getValue());
-        }
-        return l.toArray(new String[osEnv.size()]);
+        return osEnv.entrySet().stream()
+            .map(e -> e.getKey() + "=" + e.getValue()).toArray(String[]::new);
     }
 
     /**
@@ -651,7 +650,7 @@
      * @param cmdline The command to execute.
      * @throws BuildException if the command does not exit successfully.
      */
-    public static void runCommand(Task task, String[] cmdline)
+    public static void runCommand(Task task, String... cmdline)
         throws BuildException {
         try {
             task.log(Commandline.describeCommand(cmdline),
@@ -665,7 +664,7 @@
                 throw new BuildException(cmdline[0]
                     + " failed with return code " + retval, task.getLocation());
             }
-        } catch (java.io.IOException exc) {
+        } catch (IOException exc) {
             throw new BuildException("Could not launch " + cmdline[0] + ": "
                 + exc, task.getLocation());
         }
@@ -695,9 +694,9 @@
      */
     private static Map<String, String> getVMSLogicals(BufferedReader in)
         throws IOException {
-        HashMap<String, String> logicals = new HashMap<String, String>();
+        Map<String, String> logicals = new HashMap<>();
         String logName = null, logValue = null, newLogName;
-        String line = null;
+        String line;
         // CheckStyle:MagicNumber OFF
         while ((line = in.readLine()) != null) {
             // parse the VMS logicals into required format ("VAR=VAL[,VAL2]")
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java	2018-03-24 12:37:12.000000000 +0000
@@ -97,6 +97,7 @@
      * @deprecated since 1.4.x.
      *             manage output at the task level.
      */
+    @Deprecated
     public void setOutput(PrintStream out) {
     }
 
@@ -122,7 +123,7 @@
             if (sysProperties != null) {
                 sysProperties.setSystem();
             }
-            Class<?> target = null;
+            Class<?> target;
             try {
                 if (classpath == null) {
                     target = Class.forName(classname);
@@ -137,18 +138,18 @@
                     target = Class.forName(classname, true, loader);
                 }
             } catch (ClassNotFoundException e) {
-                throw new BuildException("Could not find " + classname + "."
-                                         + " Make sure you have it in your"
-                                         + " classpath");
+                throw new BuildException(
+                    "Could not find %s. Make sure you have it in your classpath",
+                    classname);
             }
             main = target.getMethod("main", new Class[] {String[].class});
             if (main == null) {
-                throw new BuildException("Could not find main() method in "
-                                         + classname);
+                throw new BuildException("Could not find main() method in %s",
+                    classname);
             }
             if ((main.getModifiers() & Modifier.STATIC) == 0) {
-                throw new BuildException("main() method in " + classname
-                    + " is not declared static");
+                throw new BuildException(
+                    "main() method in %s is not declared static", classname);
             }
             if (timeout == null) {
                 run(); //NOSONAR
@@ -212,6 +213,7 @@
      * Run this ExecuteJava in a Thread.
      * @since Ant 1.5
      */
+    @Override
     public void run() {
         final Object[] argument = {javaCommand.getArguments()};
         try {
@@ -242,6 +244,7 @@
      * @param w the responsible Watchdog.
      * @since Ant 1.5
      */
+    @Override
     public synchronized void timeoutOccured(Watchdog w) {
         if (thread != null) {
             timedOut = true;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,7 +20,10 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.Vector;
 
 import org.apache.tools.ant.BuildException;
@@ -60,8 +63,9 @@
     // switching type to "dir" when we encounter a DirSet that would
     // be more difficult to achieve otherwise.
 
-    protected Vector<AbstractFileSet> filesets = new Vector<AbstractFileSet>(); // contains AbstractFileSet
-                                              // (both DirSet and FileSet)
+    // (both DirSet and FileSet)
+    protected Vector<AbstractFileSet> filesets = new Vector<>();
+
     private Union resources = null;
     private boolean relative = false;
     private boolean parallel = false;
@@ -296,6 +300,7 @@
     /**
      * Check the configuration of this ExecuteOn instance.
      */
+    @Override
     protected void checkConfiguration() {
 //     * @TODO using taskName here is brittle, as a user could override it.
 //     *       this should probably be modified to use the classname instead.
@@ -303,7 +308,7 @@
             log("!! execon is deprecated. Use apply instead. !!");
         }
         super.checkConfiguration();
-        if (filesets.size() == 0 && resources == null) {
+        if (filesets.isEmpty() && resources == null) {
             throw new BuildException("no resources specified",
                                      getLocation());
         }
@@ -326,6 +331,7 @@
      * @return <code>ExecuteStreamHandler</code>.
      * @throws BuildException on error.
      */
+    @Override
     protected ExecuteStreamHandler createHandler() throws BuildException {
         //if we have a RedirectorElement, return a decoy
         return (redirectorElement == null) ? super.createHandler() : new PumpStreamHandler();
@@ -334,6 +340,7 @@
     /**
      * Set up the I/O Redirector.
      */
+    @Override
     protected void setupRedirector() {
         super.setupRedirector();
         redirector.setAppendProperties(true);
@@ -344,23 +351,21 @@
      * @param exe the Execute instance representing the external process.
      * @throws BuildException on error
      */
+    @Override
     protected void runExec(Execute exe) throws BuildException {
         int totalFiles = 0;
         int totalDirs = 0;
         boolean haveExecuted = false;
         try {
-            Vector<String> fileNames = new Vector<String>();
-            Vector<File> baseDirs = new Vector<File>();
-            final int size = filesets.size();
-            for (int i = 0; i < size; i++) {
+            Vector<String> fileNames = new Vector<>();
+            Vector<File> baseDirs = new Vector<>();
+            for (AbstractFileSet fs : filesets) {
                 String currentType = type;
-                AbstractFileSet fs = filesets.elementAt(i);
                 if (fs instanceof DirSet) {
                     if (!FileDirBoth.DIR.equals(type)) {
                         log("Found a nested dirset but type is " + type + ". "
-                            + "Temporarily switching to type=\"dir\" on the"
-                            + " assumption that you really did mean"
-                            + " <dirset> not <fileset>.", Project.MSG_DEBUG);
+                            + "Temporarily switching to type=\"dir\" on the assumption that you really did mean <dirset> not <fileset>.",
+                            Project.MSG_DEBUG);
                         currentType = FileDirBoth.DIR;
                     }
                 }
@@ -372,33 +377,31 @@
                     String[] s = getFiles(base, ds);
                     for (int j = 0; j < s.length; j++) {
                         totalFiles++;
-                        fileNames.addElement(s[j]);
-                        baseDirs.addElement(base);
+                        fileNames.add(s[j]);
+                        baseDirs.add(base);
                     }
                 }
                 if (!FileDirBoth.FILE.equals(currentType)) {
                     String[] s = getDirs(base, ds);
                     for (int j = 0; j < s.length; j++) {
                         totalDirs++;
-                        fileNames.addElement(s[j]);
-                        baseDirs.addElement(base);
+                        fileNames.add(s[j]);
+                        baseDirs.add(base);
                     }
                 }
-                if (fileNames.size() == 0 && skipEmpty) {
+                if (fileNames.isEmpty() && skipEmpty) {
                     logSkippingFileset(currentType, ds, base);
                     continue;
                 }
                 if (!parallel) {
-                    String[] s = new String[fileNames.size()];
-                    fileNames.copyInto(s);
-                    for (int j = 0; j < s.length; j++) {
-                        String[] command = getCommandline(s[j], base);
+                    for (String srcFile : fileNames) {
+                        String[] command = getCommandline(srcFile, base);
                         log(Commandline.describeCommand(command), Project.MSG_VERBOSE);
                         exe.setCommandline(command);
 
                         if (redirectorElement != null) {
                             setupRedirector();
-                            redirectorElement.configure(redirector, s[j]);
+                            redirectorElement.configure(redirector, srcFile);
                         }
                         if (redirectorElement != null || haveExecuted) {
                             // need to reset the stream handler to restart
@@ -409,8 +412,8 @@
                         runExecute(exe);
                         haveExecuted = true;
                     }
-                    fileNames.removeAllElements();
-                    baseDirs.removeAllElements();
+                    fileNames.clear();
+                    baseDirs.clear();
                 }
             }
 
@@ -464,12 +467,12 @@
                         }
                         runExecute(exe);
                         haveExecuted = true;
-                        fileNames.removeAllElements();
-                        baseDirs.removeAllElements();
+                        fileNames.clear();
+                        baseDirs.clear();
                     }
                 }
             }
-            if (parallel && (fileNames.size() > 0 || !skipEmpty)) {
+            if (parallel && (!fileNames.isEmpty() || !skipEmpty)) {
                 runParallel(exe, fileNames, baseDirs);
                 haveExecuted = true;
             }
@@ -514,31 +517,31 @@
      */
     protected String[] getCommandline(String[] srcFiles, File[] baseDirs) {
         final char fileSeparator = File.separatorChar;
-        Vector<String> targets = new Vector<String>();
+        List<String> targets = new ArrayList<>();
         if (targetFilePos != null) {
-            HashSet<String> addedFiles = new HashSet<String>();
+            Set<String> addedFiles = new HashSet<>();
             for (int i = 0; i < srcFiles.length; i++) {
                 String[] subTargets = mapper.mapFileName(srcFiles[i]);
                 if (subTargets != null) {
-                    for (int j = 0; j < subTargets.length; j++) {
-                        String name = null;
-                        if (!relative) {
-                            name = new File(destDir, subTargets[j]).getAbsolutePath();
+                    for (String subTarget : subTargets) {
+                        String name;
+                        if (relative) {
+                            name = subTarget;
                         } else {
-                            name = subTargets[j];
+                            name = new File(destDir, subTarget).getAbsolutePath();
                         }
                         if (forwardSlash && fileSeparator != '/') {
                             name = name.replace(fileSeparator, '/');
                         }
                         if (!addedFiles.contains(name)) {
-                            targets.addElement(name);
+                            targets.add(name);
                             addedFiles.add(name);
                         }
                     }
                 }
             }
         }
-        String[] targetFiles = (String[]) targets.toArray(new String[targets.size()]);
+        String[] targetFiles = targets.toArray(new String[targets.size()]);
 
         if (!addSourceFile) {
             srcFiles = new String[0];
@@ -686,10 +689,8 @@
     protected void runParallel(Execute exe, Vector<String> fileNames,
                                Vector<File> baseDirs)
         throws IOException, BuildException {
-        String[] s = new String[fileNames.size()];
-        fileNames.copyInto(s);
-        File[] b = new File[baseDirs.size()];
-        baseDirs.copyInto(b);
+        String[] s = fileNames.toArray(new String[fileNames.size()]);
+        File[] b = baseDirs.toArray(new File[baseDirs.size()]);
 
         if (maxParallel <= 0 || s.length == 0 /* this is skipEmpty == false */) {
             String[] command = getCommandline(s, b);
@@ -740,7 +741,7 @@
                                           String[] arguments,
                                           int insertPosition,
                                           String prefix, String suffix) {
-        if (prefix.length() == 0 && suffix.length() == 0) {
+        if (prefix.isEmpty() && suffix.isEmpty()) {
             System.arraycopy(targetFiles, 0, arguments, insertPosition,
                              targetFiles.length);
         } else {
@@ -760,11 +761,13 @@
         public static final String FILE = "file";
         /** Dir value */
         public static final String DIR = "dir";
+
         /**
+         * {@inheritDoc}
          * @see EnumeratedAttribute#getValues
          */
-        /** {@inheritDoc}. */
-       public String[] getValues() {
+        @Override
+        public String[] getValues() {
             return new String[] {FILE, DIR, "both"};
         }
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java	2018-03-24 12:37:12.000000000 +0000
@@ -74,6 +74,7 @@
      *             Use constructor with a long type instead.
      * (1.4.x compatibility)
      */
+    @Deprecated
     public ExecuteWatchdog(int timeout) {
         this((long) timeout);
     }
@@ -112,6 +113,7 @@
      * This can be called in the watchdog thread
      * @param w the watchdog
      */
+    @Override
     public synchronized void timeoutOccured(Watchdog w) {
         try {
             try {
@@ -174,4 +176,3 @@
         return killedProcess;
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Exit.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Exit.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Exit.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Exit.java	2018-03-24 12:37:12.000000000 +0000
@@ -50,12 +50,13 @@
 public class Exit extends Task {
 
     private static class NestedCondition extends ConditionBase implements Condition {
+        @Override
         public boolean eval() {
             if (countConditions() != 1) {
                 throw new BuildException(
                     "A single nested condition is required.");
             }
-            return ((Condition) (getConditions().nextElement())).eval();
+            return getConditions().nextElement().eval();
         }
     }
 
@@ -131,12 +132,13 @@
      * the if and unless parameters (if present).
      * @throws BuildException on error
      */
+    @Override
     public void execute() throws BuildException {
         boolean fail = (nestedConditionPresent()) ? testNestedCondition()
                      : (testIfCondition() && testUnlessCondition());
         if (fail) {
             String text = null;
-            if (message != null && message.trim().length() > 0) {
+            if (!(message == null || message.trim().isEmpty())) {
                 text = message.trim();
             } else {
                 if (ifCondition != null && !"".equals(ifCondition)
@@ -154,15 +156,13 @@
                 }
                 if (nestedConditionPresent()) {
                     text = "condition satisfied";
-                } else {
-                    if (text == null) {
-                        text = "No message";
-                    }
+                } else if (text == null) {
+                    text = "No message";
                 }
             }
             log("failing due to " + text, Project.MSG_DEBUG);
-            throw ((status == null) ? new BuildException(text)
-             : new ExitStatusException(text, status.intValue()));
+            throw status == null ? new BuildException(text)
+                : new ExitStatusException(text, status.intValue());
         }
     }
 
@@ -217,8 +217,8 @@
         boolean result = nestedConditionPresent();
 
         if (result && ifCondition != null || unlessCondition != null) {
-            throw new BuildException("Nested conditions "
-                + "not permitted in conjunction with if/unless attributes");
+            throw new BuildException(
+                "Nested conditions not permitted in conjunction with if/unless attributes");
         }
 
         return result && nestedCondition.eval();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Expand.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Expand.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Expand.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Expand.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,13 +20,15 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
 import java.util.Vector;
 
@@ -58,25 +60,26 @@
  *           name="unwar"
  */
 public class Expand extends Task {
+    public static final String NATIVE_ENCODING = "native-encoding";
+
+    /** Error message when more that one mapper is defined */
+    public static final String ERROR_MULTIPLE_MAPPERS = "Cannot define more than one mapper";
+
+    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
+
     private static final int BUFFER_SIZE = 1024;
     private File dest; //req
     private File source; // req
     private boolean overwrite = true;
     private Mapper mapperElement = null;
-    private Vector<PatternSet> patternsets = new Vector<PatternSet>();
+    private List<PatternSet> patternsets = new Vector<>();
     private Union resources = new Union();
     private boolean resourcesSpecified = false;
     private boolean failOnEmptyArchive = false;
     private boolean stripAbsolutePathSpec = false;
     private boolean scanForUnicodeExtraFields = true;
 
-    public static final String NATIVE_ENCODING = "native-encoding";
-
     private String encoding;
-    /** Error message when more that one mapper is defined */
-    public static final String ERROR_MULTIPLE_MAPPERS = "Cannot define more than one mapper";
-
-    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
 
     /**
      * Creates an Expand instance and sets encoding to UTF-8.
@@ -120,14 +123,15 @@
      *
      * @exception BuildException Thrown in unrecoverable error.
      */
+    @Override
     public void execute() throws BuildException {
         if ("expand".equals(getTaskType())) {
             log("!! expand is deprecated. Use unzip instead. !!");
         }
 
         if (source == null && !resourcesSpecified) {
-            throw new BuildException("src attribute and/or resources must be "
-                                     + "specified");
+            throw new BuildException(
+                "src attribute and/or resources must be specified");
         }
 
         if (dest == null) {
@@ -143,13 +147,14 @@
             if (source.isDirectory()) {
                 throw new BuildException("Src must not be a directory."
                     + " Use nested filesets instead.", getLocation());
-            } else if (!source.exists()) {
+            }
+            if (!source.exists()) {
                 throw new BuildException("src '" + source + "' doesn't exist.");
-            } else if (!source.canRead()) {
+            }
+            if (!source.canRead()) {
                 throw new BuildException("src '" + source + "' cannot be read.");
-            } else {
-                expandFile(FILE_UTILS, source, dest);
             }
+            expandFile(FILE_UTILS, source, dest);
         }
         for (Resource r : resources) {
             if (!r.isExists()) {
@@ -175,7 +180,6 @@
      */
     protected void expandFile(FileUtils fileUtils, File srcF, File dir) {
         log("Expanding: " + srcF + " into " + dir, Project.MSG_INFO);
-        ZipFile zf = null;
         FileNameMapper mapper = getMapper();
         if (!srcF.exists()) {
             throw new BuildException("Unable to expand "
@@ -183,8 +187,9 @@
                     + " as the file does not exist",
                     getLocation());
         }
-        try {
-            zf = new ZipFile(srcF, encoding, scanForUnicodeExtraFields);
+        try (
+            ZipFile
+            zf = new ZipFile(srcF, encoding, scanForUnicodeExtraFields)){
             boolean empty = true;
             Enumeration<ZipEntry> e = zf.getEntries();
             while (e.hasMoreElements()) {
@@ -202,7 +207,7 @@
                 }
             }
             if (empty && getFailOnEmptyArchive()) {
-                throw new BuildException("archive '" + srcF + "' is empty");
+                throw new BuildException("archive '%s' is empty", srcF);
             }
             log("expand complete", Project.MSG_VERBOSE);
         } catch (IOException ioe) {
@@ -210,8 +215,6 @@
                 "Error while expanding " + srcF.getPath()
                 + "\n" + ioe.toString(),
                 ioe);
-        } finally {
-            ZipFile.closeQuietly(zf);
         }
     }
 
@@ -222,8 +225,8 @@
      * @param dir       the destination directory
      */
     protected void expandResource(Resource srcR, File dir) {
-        throw new BuildException("only filesystem based resources are"
-                                 + " supported by this task.");
+        throw new BuildException(
+            "only filesystem based resources are supported by this task.");
     }
 
     /**
@@ -231,13 +234,10 @@
      * @return a filenamemapper for a file
      */
     protected FileNameMapper getMapper() {
-        FileNameMapper mapper = null;
         if (mapperElement != null) {
-            mapper = mapperElement.getImplementation();
-        } else {
-            mapper = new IdentityMapper();
+            return mapperElement.getImplementation();
         }
-        return mapper;
+        return new IdentityMapper();
     }
 
     // CheckStyle:ParameterNumberCheck OFF - bc
@@ -259,7 +259,7 @@
                                boolean isDirectory, FileNameMapper mapper)
                                throws IOException {
 
-        if (stripAbsolutePathSpec && entryName.length() > 0
+        if (stripAbsolutePathSpec && !entryName.isEmpty()
             && (entryName.charAt(0) == File.separatorChar
                 || entryName.charAt(0) == '/'
                 || entryName.charAt(0) == '\\')) {
@@ -268,16 +268,16 @@
             entryName = entryName.substring(1);
         }
 
-        if (patternsets != null && patternsets.size() > 0) {
+        if (!(patternsets == null || patternsets.isEmpty())) {
             String name = entryName.replace('/', File.separatorChar)
                 .replace('\\', File.separatorChar);
 
             boolean included = false;
-            Set<String> includePatterns = new HashSet<String>();
-            Set<String> excludePatterns = new HashSet<String>();
+            Set<String> includePatterns = new HashSet<>();
+            Set<String> excludePatterns = new HashSet<>();
             final int size = patternsets.size();
             for (int v = 0; v < size; v++) {
-                PatternSet p = patternsets.elementAt(v);
+                PatternSet p = patternsets.get(v);
                 String[] incls = p.getIncludePatterns(getProject());
                 if (incls == null || incls.length == 0) {
                     // no include pattern implicitly means includes="**"
@@ -352,20 +352,11 @@
                 f.mkdirs();
             } else {
                 byte[] buffer = new byte[BUFFER_SIZE];
-                int length = 0;
-                FileOutputStream fos = null;
-                try {
-                    fos = new FileOutputStream(f);
-
-                    while ((length =
-                            compressedInputStream.read(buffer)) >= 0) {
+                try (OutputStream fos = Files.newOutputStream(f.toPath())) {
+                    int length;
+                    while ((length = compressedInputStream.read(buffer)) >= 0) {
                         fos.write(buffer, 0, length);
                     }
-
-                    fos.close();
-                    fos = null;
-                } finally {
-                    FileUtils.close(fos);
                 }
             }
 
@@ -412,7 +403,7 @@
      * @param set a pattern set
      */
     public void addPatternset(PatternSet set) {
-        patternsets.addElement(set);
+        patternsets.add(set);
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Filter.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Filter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Filter.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Filter.java	2018-03-24 12:37:12.000000000 +0000
@@ -69,6 +69,7 @@
      * Execute the task.
      * @throws BuildException on error
      */
+    @Override
     public void execute() throws BuildException {
         boolean isFiltersFromFile =
             filtersFile != null && token == null && value == null;
@@ -76,9 +77,9 @@
             filtersFile == null && token != null && value != null;
 
         if (!isFiltersFromFile && !isSingleFilter) {
-            throw new BuildException("both token and value parameters, or "
-                                     + "only a filtersFile parameter is "
-                                     + "required", getLocation());
+            throw new BuildException(
+                "both token and value parameters, or only a filtersFile parameter is required",
+                getLocation());
         }
 
         if (isSingleFilter) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,11 +20,11 @@
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.nio.file.Files;
 import java.util.Enumeration;
 import java.util.NoSuchElementException;
 import java.util.Vector;
@@ -115,6 +115,7 @@
      * @return a Reader.
      * @since Ant 1.7?
      */
+    @Override
     public final Reader chain(final Reader rdr) {
         return filter.chain(rdr);
     }
@@ -181,15 +182,16 @@
      * @deprecated since 1.4.x.
      *             Use {@link #setEol setEol} instead.
      */
+    @Deprecated
     public void setCr(AddAsisRemove attr) {
         log("DEPRECATED: The cr attribute has been deprecated,",
             Project.MSG_WARN);
         log("Please use the eol attribute instead", Project.MSG_WARN);
         String option = attr.getValue();
         CrLf c = new CrLf();
-        if (option.equals("remove")) {
+        if ("remove".equals(option)) {
             c.setValue("lf");
-        } else if (option.equals("asis")) {
+        } else if ("asis".equals(option)) {
             c.setValue("asis");
         } else {
             // must be "add"
@@ -282,6 +284,7 @@
      * Executes the task.
      * @throws BuildException on error.
      */
+    @Override
     public void execute() throws BuildException {
         // first off, make sure that we've got a srcdir and destdir
         validate();
@@ -322,22 +325,21 @@
         }
         if (!srcDir.exists()) {
             throw new BuildException(
-                FIXCRLF_ERROR + "srcdir does not exist: '" + srcDir + "'");
+                FIXCRLF_ERROR + "srcdir does not exist: '%s'", srcDir);
         }
         if (!srcDir.isDirectory()) {
             throw new BuildException(
-                FIXCRLF_ERROR + "srcdir is not a directory: '" + srcDir + "'");
+                FIXCRLF_ERROR + "srcdir is not a directory: '%s'", srcDir);
         }
         if (destDir != null) {
             if (!destDir.exists()) {
                 throw new BuildException(
-                    FIXCRLF_ERROR + "destdir does not exist: '"
-                    + destDir + "'");
+                    FIXCRLF_ERROR + "destdir does not exist: '%s'", destDir);
             }
             if (!destDir.isDirectory()) {
                 throw new BuildException(
-                    FIXCRLF_ERROR + "destdir is not a directory: '"
-                    + destDir + "'");
+                    FIXCRLF_ERROR + "destdir is not a directory: '%s'",
+                    destDir);
             }
         }
     }
@@ -350,7 +352,7 @@
         if (fcv == null) {
             FilterChain fc = new FilterChain();
             fc.add(filter);
-            fcv = new Vector<FilterChain>(1);
+            fcv = new Vector<>(1);
             fcv.add(fc);
         }
         File tmpFile = FILE_UTILS.createTempFile("fixcrlf", "", null, true, true);
@@ -391,6 +393,7 @@
      * Deprecated, the functionality has been moved to filters.FixCrLfFilter.
      * @deprecated since 1.7.0.
      */
+    @Deprecated
     protected class OneLiner implements Enumeration<Object> {
         private static final int UNDEF = -1;
         private static final int NOTJAVA = 0;
@@ -421,7 +424,7 @@
                 reader = new BufferedReader(
                     ((encoding == null) ? new FileReader(srcFile)
                     : new InputStreamReader(
-                    new FileInputStream(srcFile), encoding)), INBUFLEN);
+                    Files.newInputStream(srcFile.toPath()), encoding)), INBUFLEN);
 
                 nextLine();
             } catch (IOException e) {
@@ -549,6 +552,7 @@
         /**
          * @return true if there is more elements.
          */
+        @Override
         public boolean hasMoreElements() {
             return !reachedEof;
         }
@@ -558,6 +562,7 @@
          * @return the next element.
          * @throws NoSuchElementException if there is no more.
          */
+        @Override
         public Object nextElement()
             throws NoSuchElementException {
             if (!hasMoreElements()) {
@@ -673,22 +678,24 @@
      */
     public static class AddAsisRemove extends EnumeratedAttribute {
         /** {@inheritDoc}. */
+        @Override
         public String[] getValues() {
             return new String[] {"add", "asis", "remove"};
         }
     }
 
     /**
-     * Enumerated attribute with the values "asis", "cr", "lf" and "crlf".
+     * Enumerated attribute with the values "asis", "cr", "lf", "crlf", "mac", "unix" and "dos.
      */
     public static class CrLf extends EnumeratedAttribute {
         /**
          * @see EnumeratedAttribute#getValues
          * {@inheritDoc}.
          */
+        @Override
         public String[] getValues() {
             return new String[] {"asis", "cr", "lf", "crlf", "mac", "unix",
-                    "dos"};
+                "dos"};
         }
     }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,8 +17,12 @@
  */
 package org.apache.tools.ant.taskdefs;
 
+import java.util.Collections;
 import java.util.Enumeration;
+import java.util.List;
 import java.util.Vector;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
@@ -83,7 +87,7 @@
      * A class corresponding to the dname nested element.
      */
     public static class DistinguishedName {
-        private Vector<DnameParam> params = new Vector<DnameParam>();
+        private List<DnameParam> params = new Vector<>();
 
         /**
          * Create a param nested element.
@@ -91,8 +95,7 @@
          */
         public Object createParam() {
             DnameParam param = new DnameParam();
-            params.addElement(param);
-
+            params.add(param);
             return param;
         }
 
@@ -101,7 +104,7 @@
          * @return an enumeration of the nested parameters.
          */
         public Enumeration<DnameParam> getParams() {
-            return params.elements();
+            return Collections.enumeration(params);
         }
 
         /**
@@ -111,26 +114,10 @@
          * This is used on the command line.
          * @return a string rep of this name
          */
+        @Override
         public String toString() {
-            final int size = params.size();
-            final StringBuffer sb = new StringBuffer();
-            boolean firstPass = true;
-
-            for (int i = 0; i < size; i++) {
-                if (!firstPass) {
-                    sb.append(" ,");
-                }
-                firstPass = false;
-
-                final DnameParam param = (DnameParam) params.elementAt(i);
-                if (param.isComplete()) {
-                    sb.append(encode(param.getName()));
-                    sb.append('=');
-                    sb.append(encode(param.getValue()));
-                }
-            }
-
-            return sb.toString();
+            return params.stream().map(p -> encode(p.getName()) + "=" + encode(p.getValue()))
+                .collect(Collectors.joining(", "));
         }
 
         /**
@@ -141,26 +128,8 @@
          * @return the encoded value.
          */
         public String encode(final String string) {
-            int end = string.indexOf(',');
-
-            if (-1 == end) {
-              return string;
-            }
-
-            final StringBuffer sb = new StringBuffer();
-
-            int start = 0;
-
-            while (-1 != end) {
-                sb.append(string.substring(start, end));
-                sb.append("\\,");
-                start = end + 1;
-                end = string.indexOf(',', start);
-            }
-
-            sb.append(string.substring(start));
-
-            return sb.toString();
+            return Stream.of(string.split(","))
+                .collect(Collectors.joining("\\,"));
         }
     }
 
@@ -197,12 +166,11 @@
      */
     public DistinguishedName createDname() throws BuildException {
         if (null != expandedDname) {
-            throw new BuildException("DName sub-element can only be "
-                                     + "specified once.");
+            throw new BuildException("DName sub-element can only be specified once.");
         }
         if (null != dname) {
-            throw new BuildException("It is not possible to specify dname "
-                                    + " both as attribute and element.");
+            throw new BuildException(
+                "It is not possible to specify dname  both as attribute and element.");
         }
         expandedDname = new DistinguishedName();
         return expandedDname;
@@ -215,8 +183,8 @@
      */
     public void setDname(final String dname) {
         if (null != expandedDname) {
-            throw new BuildException("It is not possible to specify dname "
-                                    + " both as attribute and element.");
+            throw new BuildException(
+                "It is not possible to specify dname  both as attribute and element.");
         }
         this.dname = dname;
     }
@@ -324,6 +292,7 @@
      * Execute the task.
      * @throws BuildException on error
      */
+    @Override
     public void execute() throws BuildException {
 
         if (null == alias) {
@@ -338,7 +307,7 @@
             throw new BuildException("dname must be set");
         }
 
-        final StringBuffer sb = new StringBuffer();
+        final StringBuilder sb = new StringBuilder();
 
         sb.append("-genkey ");
 
@@ -400,7 +369,6 @@
             sb.append("\" ");
         }
 
-
         if (0 < keysize) {
             sb.append("-keysize \"");
             sb.append(keysize);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Get.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Get.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Get.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Get.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,6 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -27,6 +26,7 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
+import java.nio.file.Files;
 import java.util.Date;
 import java.util.zip.GZIPInputStream;
 
@@ -35,6 +35,7 @@
 import org.apache.tools.ant.Main;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.email.Header;
 import org.apache.tools.ant.types.Mapper;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
@@ -43,6 +44,10 @@
 import org.apache.tools.ant.types.resources.URLResource;
 import org.apache.tools.ant.util.FileNameMapper;
 import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.ant.util.StringUtils;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  * Gets a particular file from a URL source.
@@ -89,6 +94,9 @@
                            DEFAULT_AGENT_PREFIX + "/"
                            + Main.getShortAntVersion());
 
+    // Store headers as key/value pair without duplicate in keyz
+    private Map<String, String> headers = new LinkedHashMap<>();
+
     /**
      * Does the work.
      *
@@ -109,7 +117,7 @@
                     if (path.endsWith("/")) {
                         path = path.substring(0, path.length() - 1);
                     }
-                    final int slash = path.lastIndexOf("/");
+                    final int slash = path.lastIndexOf('/');
                     if (slash > -1) {
                         path = path.substring(slash + 1);
                     }
@@ -121,11 +129,13 @@
                         log("skipping " + r + " - mapper can't handle it",
                             Project.MSG_WARN);
                         continue;
-                    } else if (d.length == 0) {
+                    }
+                    if (d.length == 0) {
                         log("skipping " + r + " - mapper returns no file name",
                             Project.MSG_WARN);
                         continue;
-                    } else if (d.length > 1) {
+                    }
+                    if (d.length > 1) {
                         log("skipping " + r + " - mapper returns multiple file"
                             + " names", Project.MSG_WARN);
                         continue;
@@ -279,8 +289,8 @@
         for (final Resource r : sources) {
             final URLProvider up = r.as(URLProvider.class);
             if (up == null) {
-                throw new BuildException("Only URLProvider resources are"
-                                         + " supported", getLocation());
+                throw new BuildException(
+                    "Only URLProvider resources are supported", getLocation());
             }
         }
 
@@ -290,9 +300,8 @@
 
         if (destination.exists() && sources.size() > 1
             && !destination.isDirectory()) {
-            throw new BuildException("The specified destination is not a"
-                                     + " directory",
-                                     getLocation());
+            throw new BuildException(
+                "The specified destination is not a directory", getLocation());
         }
 
         if (destination.exists() && !destination.canWrite()) {
@@ -383,7 +392,6 @@
         useTimestamp = v;
     }
 
-
     /**
      * Username for basic auth.
      *
@@ -485,6 +493,21 @@
     }
 
     /**
+     * Add a nested header
+     * @param header to be added
+     *
+     */
+    public void addConfiguredHeader(Header header) {
+        if (header != null) {
+            String key = StringUtils.trimToNull(header.getName());
+            String value = StringUtils.trimToNull(header.getValue());
+            if (key != null && value != null) {
+                this.headers.put(key, value);
+            }
+        }
+    }
+
+    /**
      * Define the mapper to map source to destination files.
      * @return a mapper to be configured.
      * @exception BuildException if more than one mapper is defined.
@@ -545,6 +568,7 @@
         /**
          * begin a download
          */
+        @Override
         public void beginDownload() {
         }
 
@@ -552,12 +576,14 @@
          * tick handler
          *
          */
+        @Override
         public void onTick() {
         }
 
         /**
          * end a download
          */
+        @Override
         public void endDownload() {
         }
     }
@@ -582,6 +608,7 @@
         /**
          * begin a download
          */
+        @Override
         public void beginDownload() {
             dots = 0;
         }
@@ -590,6 +617,7 @@
          * tick handler
          *
          */
+        @Override
         public void onTick() {
             out.print(".");
             if (dots++ > DOTS_PER_LINE) {
@@ -601,6 +629,7 @@
         /**
          * end a download
          */
+        @Override
         public void endDownload() {
             out.println();
             out.flush();
@@ -722,6 +751,12 @@
                 connection.setRequestProperty("Accept-Encoding", GZIP_CONTENT_ENCODING);
             }
 
+            for (final Map.Entry<String, String> header : headers.entrySet()) {
+                //we do not log the header value as it may contain sensitive data like passwords
+                log(String.format("Adding header '%s' ", header.getKey()));
+                connection.setRequestProperty(header.getKey(), header.getValue());
+            }
+
             if (connection instanceof HttpURLConnection) {
                 ((HttpURLConnection) connection).setInstanceFollowRedirects(false);
                 connection.setUseCaches(httpUseCaches);
@@ -767,9 +802,8 @@
                     if (ignoreErrors) {
                         log(message, logLevel);
                         return null;
-                    } else {
-                        throw new BuildException(message);
                     }
+                    throw new BuildException(message);
                 }
             }
 
@@ -814,7 +848,7 @@
                 is = new GZIPInputStream(is);
             }
 
-            os = new FileOutputStream(dest);
+            os = Files.newOutputStream(dest.toPath());
             progress.beginDownload();
             boolean finished = false;
             try {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/GUnzip.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/GUnzip.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/GUnzip.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/GUnzip.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,13 +18,12 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.zip.GZIPInputStream;
 
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.util.FileUtils;
 
 /**
  * Expands a file that has been compressed with the GZIP
@@ -44,6 +43,7 @@
      * Get the default extension.
      * @return the value ".gz"
      */
+    @Override
     protected String getDefaultExtension() {
         return DEFAULT_EXTENSION;
     }
@@ -51,18 +51,14 @@
     /**
      * Implement the gunzipping.
      */
+    @Override
     protected void extract() {
         if (srcResource.getLastModified() > dest.lastModified()) {
             log("Expanding " + srcResource.getName() + " to "
                         + dest.getAbsolutePath());
-
-            FileOutputStream out = null;
-            GZIPInputStream zIn = null;
-            InputStream fis = null;
-            try {
-                out = new FileOutputStream(dest);
-                fis = srcResource.getInputStream();
-                zIn = new GZIPInputStream(fis);
+            try (OutputStream out = Files.newOutputStream(dest.toPath());
+                    GZIPInputStream zIn =
+                        new GZIPInputStream(srcResource.getInputStream())) {
                 byte[] buffer = new byte[BUFFER_SIZE];
                 int count = 0;
                 do {
@@ -72,10 +68,6 @@
             } catch (IOException ioe) {
                 String msg = "Problem expanding gzip " + ioe.getMessage();
                 throw new BuildException(msg, ioe, getLocation());
-            } finally {
-                FileUtils.close(fis);
-                FileUtils.close(out);
-                FileUtils.close(zIn);
             }
         }
     }
@@ -91,6 +83,7 @@
      * @return true if this task supports non file resources.
      * @since Ant 1.7
      */
+    @Override
     protected boolean supportsNonFileResources() {
         return getClass().equals(GUnzip.class);
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/GZip.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/GZip.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/GZip.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/GZip.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,12 +18,11 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.zip.GZIPOutputStream;
 
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.util.FileUtils;
 
 /**
  * Compresses a file with the GZIP algorithm. Normally used to compress
@@ -38,16 +37,14 @@
     /**
      * perform the GZip compression operation.
      */
+    @Override
     protected void pack() {
-        GZIPOutputStream zOut = null;
-        try {
-            zOut = new GZIPOutputStream(new FileOutputStream(zipFile));
+        try (GZIPOutputStream zOut =
+            new GZIPOutputStream(Files.newOutputStream(zipFile.toPath()))) {
             zipResource(getSrcResource(), zOut);
         } catch (IOException ioe) {
             String msg = "Problem creating gzip " + ioe.getMessage();
             throw new BuildException(msg, ioe, getLocation());
-        } finally {
-            FileUtils.close(zOut);
         }
     }
 
@@ -62,6 +59,7 @@
      * @return true if this case supports non file resources.
      * @since Ant 1.7
      */
+    @Override
     protected boolean supportsNonFileResources() {
         return getClass().equals(GZip.class);
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/HostInfo.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/HostInfo.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/HostInfo.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/HostInfo.java	2018-03-24 12:37:12.000000000 +0000
@@ -105,8 +105,9 @@
      * @throws BuildException
      *             on error.
      */
+    @Override
     public void execute() throws BuildException {
-        if (host == null || "".equals(host)) {
+        if (host == null || host.isEmpty()) {
             executeLocal();
         } else {
             executeRemote();
@@ -115,7 +116,7 @@
 
     private void executeLocal() {
         try {
-            inetAddrs = new LinkedList<InetAddress>();
+            inetAddrs = new LinkedList<>();
             Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
             while (interfaces.hasMoreElements()) {
                 NetworkInterface currentif = interfaces.nextElement();
@@ -175,34 +176,32 @@
         if (best == null) {
             // none selected so far, so this one is better.
             best = current;
+        } else if (current == null || current.isLoopbackAddress()) {
+            // definitely not better than the previously selected address.
+        } else if (current.isLinkLocalAddress()) {
+            // link local considered better than loopback
+            if (best.isLoopbackAddress()) {
+                best = current;
+            }
+        } else if (current.isSiteLocalAddress()) {
+            // site local considered better than link local (and loopback)
+            // address with hostname resolved considered better than
+            // address without hostname
+            if (best.isLoopbackAddress()
+                    || best.isLinkLocalAddress()
+                    || (best.isSiteLocalAddress() && !hasHostName(best))) {
+                best = current;
+            }
         } else {
-            if (current == null || current.isLoopbackAddress()) {
-                // definitely not better than the previously selected address.
-            } else if (current.isLinkLocalAddress()) {
-                // link local considered better than loopback
-                if (best.isLoopbackAddress()) {
-                    best = current;
-                }
-            } else if (current.isSiteLocalAddress()) {
-                // site local considered better than link local (and loopback)
-                // address with hostname resolved considered better than
-                // address without hostname
-                if (best.isLoopbackAddress()
-                        || best.isLinkLocalAddress()
-                        || (best.isSiteLocalAddress() && !hasHostName(best))) {
-                    best = current;
-                }
-            } else {
-                // current is a "Global address", considered better than
-                // site local (and better than link local, loopback)
-                // address with hostname resolved considered better than
-                // address without hostname
-                if (best.isLoopbackAddress()
-                        || best.isLinkLocalAddress()
-                        || best.isSiteLocalAddress()
-                        || !hasHostName(best)) {
-                    best = current;
-                }
+            // current is a "Global address", considered better than
+            // site local (and better than link local, loopback)
+            // address with hostname resolved considered better than
+            // address without hostname
+            if (best.isLoopbackAddress()
+                    || best.isLinkLocalAddress()
+                    || best.isSiteLocalAddress()
+                    || !hasHostName(best)) {
+                best = current;
             }
         }
         return best;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ImportTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ImportTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ImportTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -63,12 +63,13 @@
  * @ant.task category="control"
  */
 public class ImportTask extends Task {
+    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
+
     private String file;
     private boolean optional;
     private String targetPrefix = ProjectHelper.USE_PROJECT_NAME_AS_TARGET_PREFIX;
     private String prefixSeparator = ".";
     private final Union resources = new Union();
-    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
 
     public ImportTask() {
         resources.setCache(true);
@@ -126,18 +127,18 @@
         resources.add(r);
     }
 
+    @Override
     public void execute() {
-        if (file == null && resources.size() == 0) {
-            throw new BuildException("import requires file attribute or"
-                                     + " at least one nested resource");
+        if (file == null && resources.isEmpty()) {
+            throw new BuildException(
+                "import requires file attribute or at least one nested resource");
         }
         if (getOwningTarget() == null
-            || !"".equals(getOwningTarget().getName())) {
+            || !getOwningTarget().getName().isEmpty()) {
             throw new BuildException("import only allowed as a top-level task");
         }
 
-        ProjectHelper helper =
-                (ProjectHelper) getProject().
+        ProjectHelper helper = getProject().
                     getReference(ProjectHelper.PROJECTHELPER_REFERENCE);
 
         if (helper == null) {
@@ -145,9 +146,7 @@
             throw new BuildException("import requires support in ProjectHelper");
         }
 
-        Vector<Object> importStack = helper.getImportStack();
-
-        if (importStack.size() == 0) {
+        if (helper.getImportStack().isEmpty()) {
             // this happens if ant is used with a project
             // helper that doesn't set the import.
             throw new BuildException("import requires support in ProjectHelper");
@@ -169,8 +168,6 @@
 
     private void importResource(ProjectHelper helper,
                                 Resource importedResource) {
-        Vector<Object> importStack = helper.getImportStack();
-
         getProject().log("Importing file " + importedResource + " from "
                          + getLocation().getFileName(), Project.MSG_VERBOSE);
 
@@ -181,13 +178,12 @@
             if (optional) {
                 getProject().log(message, Project.MSG_VERBOSE);
                 return;
-            } else {
-                throw new BuildException(message);
             }
+            throw new BuildException(message);
         }
 
-        if (!isInIncludeMode() &&
-            hasAlreadyBeenImported(importedResource, importStack)) {
+        if (!isInIncludeMode() && hasAlreadyBeenImported(importedResource,
+            helper.getImportStack())) {
             getProject().log(
                 "Skipped already imported file:\n   "
                 + importedResource + "\n", Project.MSG_VERBOSE);
@@ -206,10 +202,10 @@
                 prefix = oldPrefix + oldSep + targetPrefix;
             } else if (isInIncludeMode()) {
                 prefix = targetPrefix;
-            } else if (!ProjectHelper.USE_PROJECT_NAME_AS_TARGET_PREFIX.equals(targetPrefix)) {
-                prefix = targetPrefix;
-            } else {
+            } else if (ProjectHelper.USE_PROJECT_NAME_AS_TARGET_PREFIX.equals(targetPrefix)) {
                 prefix = oldPrefix;
+            } else {
+                prefix = targetPrefix;
             }
             setProjectHelperProps(prefix, prefixSeparator,
                                   isInIncludeMode());
@@ -263,9 +259,8 @@
             } catch (MalformedURLException ex) {
                 log(ex.toString(), Project.MSG_VERBOSE);
             }
-            throw new BuildException("failed to resolve " + file
-                                     + " relative to "
-                                     + getLocation().getFileName());
+            throw new BuildException("failed to resolve %s relative to %s",
+                file, getLocation().getFileName());
         }
         return null;
     }
@@ -277,22 +272,14 @@
 
     private boolean hasAlreadyBeenImported(Resource importedResource,
                                            Vector<Object> importStack) {
-        File importedFile = null;
-        FileProvider fp = importedResource.as(FileProvider.class);
-        if (fp != null) {
-            importedFile = fp.getFile();
-        }
-        URL importedURL = null;
-        URLProvider up = importedResource.as(URLProvider.class);
-        if (up != null) {
-            importedURL = up.getURL();
-        }
-        for (Object o : importStack) {
-            if (isOneOf(o, importedResource, importedFile, importedURL)) {
-                return true;
-            }
-        }
-        return false;
+        File importedFile = importedResource.asOptional(FileProvider.class)
+            .map(FileProvider::getFile).orElse(null);
+
+        URL importedURL = importedResource.asOptional(URLProvider.class)
+            .map(URLProvider::getURL).orElse(null);
+
+        return importStack.stream().anyMatch(
+            o -> isOneOf(o, importedResource, importedFile, importedURL));
     }
 
     private boolean isOneOf(Object o, Resource importedResource,
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Input.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Input.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Input.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Input.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,8 +18,7 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import java.util.Vector;
-
+import java.util.List;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.input.DefaultInputHandler;
@@ -59,6 +58,7 @@
         public void setRefid(final String refid) {
             this.refid = refid;
         }
+
         /**
          * Get the refid of this Handler.
          * @return String refid.
@@ -66,6 +66,7 @@
         public String getRefid() {
             return refid;
         }
+
         /**
          * Set the InputHandler classname.
          * @param classname the String classname.
@@ -73,6 +74,7 @@
         public void setClassname(final String classname) {
             this.classname = classname;
         }
+
         /**
          * Get the classname of the InputHandler.
          * @return String classname.
@@ -80,6 +82,7 @@
         public String getClassname() {
             return classname;
         }
+
         /**
          * Set the handler type.
          * @param type a HandlerType.
@@ -87,6 +90,7 @@
         public void setType(final HandlerType type) {
             this.type = type;
         }
+
         /**
          * Get the handler type.
          * @return a HandlerType object.
@@ -94,6 +98,7 @@
         public HandlerType getType() {
             return type;
         }
+
         private InputHandler getInputHandler() {
             if (type != null) {
                return type.getInputHandler();
@@ -107,8 +112,8 @@
                }
             }
             if (classname != null) {
-               return (InputHandler) (ClasspathUtils.newInstance(classname,
-                   createLoader(), InputHandler.class));
+               return ClasspathUtils.newInstance(classname,
+                   createLoader(), InputHandler.class);
             }
             throw new BuildException(
                 "Must specify refid, classname or type");
@@ -132,6 +137,7 @@
         public String[] getValues() {
             return VALUES;
         }
+
         private InputHandler getInputHandler() {
             return HANDLERS[getIndex()];
         }
@@ -192,19 +198,13 @@
      * @param msg The message to be displayed.
      */
     public void addText(final String msg) {
-        if (messageAttribute && "".equals(msg.trim())) {
+        if (messageAttribute && msg.trim().isEmpty()) {
             return;
         }
         message += getProject().replaceProperties(msg);
     }
 
     /**
-     * No arg constructor.
-     */
-    public Input () {
-    }
-
-    /**
      * Actual method executed by ant.
      * @throws BuildException on error
      */
@@ -219,7 +219,7 @@
 
         InputRequest request = null;
         if (validargs != null) {
-            final Vector<String> accept = StringUtils.split(validargs, ',');
+            final List<String> accept = StringUtils.split(validargs, ',');
             request = new MultipleChoiceInputRequest(message, accept);
         } else {
             request = new InputRequest(message);
@@ -233,7 +233,7 @@
         h.handleInput(request);
 
         String value = request.getInput();
-        if ((value == null || value.trim().length() == 0)
+        if ((value == null || value.trim().isEmpty())
             && defaultvalue != null) {
             value = defaultvalue;
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Jar.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Jar.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Jar.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Jar.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,7 +21,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -29,12 +28,16 @@
 import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.SortedMap;
 import java.util.StringTokenizer;
 import java.util.TreeMap;
 import java.util.Vector;
@@ -74,7 +77,7 @@
     /**
      * List of all known SPI Services
      */
-    private List<Service> serviceList = new ArrayList<Service>();
+    private List<Service> serviceList = new ArrayList<>();
 
     /** merged manifests added through addConfiguredManifest */
     private Manifest configuredManifest;
@@ -138,7 +141,7 @@
      *
      * @since Ant 1.6
      */
-    private Vector<String> rootEntries;
+    private List<String> rootEntries;
 
     /**
      * Path containing jars that shall be indexed in addition to this archive.
@@ -182,7 +185,7 @@
         emptyBehavior = "create";
         setEncoding("UTF8");
         setZip64Mode(Zip64ModeAttribute.NEVER);
-        rootEntries = new Vector<String>();
+        rootEntries = new Vector<>();
     }
 
     /**
@@ -190,6 +193,7 @@
      * @param we not used
      * @ant.attribute ignore="true"
      */
+    @Override
     public void setWhenempty(WhenEmpty we) {
         log("JARs are never empty, they contain at least a manifest file",
             Project.MSG_WARN);
@@ -225,6 +229,7 @@
      * @deprecated since 1.5.x.
      *             Use setDestFile(File) instead.
      */
+    @Deprecated
     public void setJarfile(File jarFile) {
         setDestFile(jarFile);
     }
@@ -301,29 +306,13 @@
     }
 
     private Manifest getManifest(File manifestFile) {
-
-        Manifest newManifest = null;
-        FileInputStream fis = null;
-        InputStreamReader isr = null;
-        try {
-            fis = new FileInputStream(manifestFile);
-            if (manifestEncoding == null) {
-                isr = new InputStreamReader(fis);
-            } else {
-                isr = new InputStreamReader(fis, manifestEncoding);
-            }
-            newManifest = getManifest(isr);
-        } catch (UnsupportedEncodingException e) {
-            throw new BuildException("Unsupported encoding while reading manifest: "
-                                     + e.getMessage(), e);
+        try (InputStreamReader isr = new InputStreamReader(
+            Files.newInputStream(manifestFile.toPath()), getManifestCharset())) {
+            return getManifest(isr);
         } catch (IOException e) {
             throw new BuildException("Unable to read manifest file: "
-                                     + manifestFile
-                                     + " (" + e.getMessage() + ")", e);
-        } finally {
-            FileUtils.close(isr);
+                + manifestFile + " (" + e.getMessage() + ")", e);
         }
-        return newManifest;
     }
 
     /**
@@ -332,38 +321,27 @@
      * @since Ant 1.5.2
      */
     private Manifest getManifestFromJar(File jarFile) throws IOException {
-        ZipFile zf = null;
-        try {
-            zf = new ZipFile(jarFile);
+        try (ZipFile zf = new ZipFile(jarFile)) {
 
             // must not use getEntry as "well behaving" applications
             // must accept the manifest in any capitalization
             Enumeration<? extends ZipEntry> e = zf.entries();
             while (e.hasMoreElements()) {
                 ZipEntry ze = e.nextElement();
-                if (ze.getName().equalsIgnoreCase(MANIFEST_NAME)) {
-                    InputStreamReader isr =
-                        new InputStreamReader(zf.getInputStream(ze), "UTF-8");
-                    return getManifest(isr);
+                if (MANIFEST_NAME.equalsIgnoreCase(ze.getName())) {
+                    try (InputStreamReader isr =
+                        new InputStreamReader(zf.getInputStream(ze), "UTF-8")) {
+                        return getManifest(isr);
+                    }
                 }
             }
             return null;
-        } finally {
-            if (zf != null) {
-                try {
-                    zf.close();
-                } catch (IOException e) {
-                    // TODO - log an error?  throw an exception?
-                }
-            }
         }
     }
 
     private Manifest getManifest(Reader r) {
-
-        Manifest newManifest = null;
         try {
-            newManifest = new Manifest(r);
+            return new Manifest(r);
         } catch (ManifestException e) {
             log("Manifest is invalid: " + e.getMessage(), Project.MSG_ERR);
             throw new BuildException("Invalid Manifest: " + manifestFile,
@@ -372,29 +350,18 @@
             throw new BuildException("Unable to read manifest file"
                                      + " (" + e.getMessage() + ")", e);
         }
-        return newManifest;
     }
 
     private boolean jarHasIndex(File jarFile) throws IOException {
-        ZipFile zf = null;
-        try {
-            zf = new ZipFile(jarFile);
+        try (ZipFile zf = new ZipFile(jarFile)) {
             Enumeration<? extends ZipEntry> e = zf.entries();
             while (e.hasMoreElements()) {
                 ZipEntry ze = e.nextElement();
-                if (ze.getName().equalsIgnoreCase(INDEX_NAME)) {
+                if (INDEX_NAME.equalsIgnoreCase(ze.getName())) {
                     return true;
                 }
             }
             return false;
-        } finally {
-            if (zf != null) {
-                try {
-                    zf.close();
-                } catch (IOException e) {
-                    // TODO - log an error?  throw an exception?
-                }
-            }
         }
     }
 
@@ -416,7 +383,7 @@
         mergeManifestsMain = config != null && "merge".equals(config.getValue());
 
         if (filesetManifestConfig != null
-            && !filesetManifestConfig.getValue().equals("skip")) {
+            && !"skip".equals(filesetManifestConfig.getValue())) {
 
             doubleFilePass = true;
         }
@@ -461,19 +428,12 @@
      */
     private void writeServices(ZipOutputStream zOut) throws IOException {
         for (Service service : serviceList) {
-           InputStream is = null;
-           try {
-               is = service.getAsStream();
-               //stolen from writeManifest
+            try (InputStream is = service.getAsStream()) {
+                //stolen from writeManifest
                super.zipFile(is, zOut,
                              "META-INF/services/" + service.getType(),
                              System.currentTimeMillis(), null,
                              ZipFileSet.DEFAULT_FILE_MODE);
-           } finally {
-               // technically this is unnecessary since
-               // Service.getAsStream returns a ByteArrayInputStream
-               // and not closing it wouldn't do any harm.
-               FileUtils.close(is);
            }
         }
     }
@@ -505,6 +465,7 @@
      * @throws IOException on I/O errors
      * @throws BuildException on other errors
      */
+    @Override
     protected void initZipOutputStream(ZipOutputStream zOut)
         throws IOException, BuildException {
 
@@ -518,12 +479,10 @@
     private Manifest createManifest()
         throws BuildException {
         try {
-            if (manifest == null) {
-                if (manifestFile != null) {
-                    // if we haven't got the manifest yet, attempt to
-                    // get it now and have manifest be the final merge
-                    manifest = getManifest(manifestFile);
-                }
+            if (manifest == null && manifestFile != null) {
+                // if we haven't got the manifest yet, attempt to
+                // get it now and have manifest be the final merge
+                manifest = getManifest(manifestFile);
             }
 
             // fileset manifest must come even before the default
@@ -612,6 +571,7 @@
      * @throws IOException on I/O errors
      * @throws BuildException on other errors
      */
+    @Override
     protected void finalizeZipOutputStream(ZipOutputStream zOut)
         throws IOException, BuildException {
 
@@ -681,14 +641,10 @@
             throw new IOException("Encountered an error writing jar index");
         }
         writer.close();
-        ByteArrayInputStream bais =
-            new ByteArrayInputStream(baos.toByteArray());
-        try {
+        try (ByteArrayInputStream bais =
+            new ByteArrayInputStream(baos.toByteArray())) {
             super.zipFile(bais, zOut, INDEX_NAME, System.currentTimeMillis(),
                           null, ZipFileSet.DEFAULT_FILE_MODE);
-        } finally {
-            // not really required
-            FileUtils.close(bais);
         }
     }
 
@@ -704,6 +660,7 @@
      * @param mode the Unix permissions to set.
      * @throws IOException on error
      */
+    @Override
     protected void zipFile(InputStream is, ZipOutputStream zOut, String vPath,
                            long lastModified, File fromArchive, int mode)
         throws IOException {
@@ -717,8 +674,8 @@
                            + " be replaced by a newly generated one.",
                            Project.MSG_WARN);
         } else {
-            if (index && vPath.indexOf("/") == -1) {
-                rootEntries.addElement(vPath);
+            if (index && vPath.indexOf('/') == -1) {
+                rootEntries.add(vPath);
             }
             super.zipFile(is, zOut, vPath, lastModified, fromArchive, mode);
         }
@@ -729,40 +686,29 @@
             // If this is the same name specified in 'manifest', this
             // is the manifest to use
             log("Found manifest " + file, Project.MSG_VERBOSE);
-            try {
-                if (is != null) {
-                    InputStreamReader isr;
-                    if (manifestEncoding == null) {
-                        isr = new InputStreamReader(is);
-                    } else {
-                        isr = new InputStreamReader(is, manifestEncoding);
-                    }
+            if (is == null) {
+                manifest = getManifest(file);
+            } else {
+                try (InputStreamReader isr =
+                    new InputStreamReader(is, getManifestCharset())) {
                     manifest = getManifest(isr);
-                } else {
-                    manifest = getManifest(file);
                 }
-            } catch (UnsupportedEncodingException e) {
-                throw new BuildException("Unsupported encoding while reading "
-                    + "manifest: " + e.getMessage(), e);
             }
         } else if (filesetManifestConfig != null
-                    && !filesetManifestConfig.getValue().equals("skip")) {
+                    && !"skip".equals(filesetManifestConfig.getValue())) {
             // we add this to our group of fileset manifests
             logWhenWriting("Found manifest to merge in file " + file,
                            Project.MSG_VERBOSE);
 
             try {
-                Manifest newManifest = null;
-                if (is != null) {
-                    InputStreamReader isr;
-                    if (manifestEncoding == null) {
-                        isr = new InputStreamReader(is);
-                    } else {
-                        isr = new InputStreamReader(is, manifestEncoding);
-                    }
-                    newManifest = getManifest(isr);
-                } else {
+                Manifest newManifest;
+                if (is == null) {
                     newManifest = getManifest(file);
+                } else {
+                    try (InputStreamReader isr =
+                        new InputStreamReader(is, getManifestCharset())) {
+                        newManifest = getManifest(isr);
+                    }
                 }
 
                 if (filesetManifest == null) {
@@ -818,6 +764,7 @@
      *
      * @exception BuildException if it likes
      */
+    @Override
     protected ArchiveState getResourcesToAdd(ResourceCollection[] rcs,
                                              File zipFile,
                                              boolean needsUpdate)
@@ -888,50 +835,48 @@
      * @return true for historic reasons
      * @throws BuildException on error
      */
+    @Override
     protected boolean createEmptyZip(File zipFile) throws BuildException {
         if (!createEmpty) {
             return true;
         }
 
-        if (emptyBehavior.equals("skip")) {
+        if ("skip".equals(emptyBehavior)) {
             if (!skipWriting) {
                 log("Warning: skipping " + archiveType + " archive "
                     + zipFile + " because no files were included.",
                     Project.MSG_WARN);
             }
             return true;
-        } else if (emptyBehavior.equals("fail")) {
+        }
+        if ("fail".equals(emptyBehavior)) {
             throw new BuildException("Cannot create " + archiveType
                                      + " archive " + zipFile
                                      + ": no files were included.",
                                      getLocation());
         }
 
-        ZipOutputStream zOut = null;
-        try {
-            if (!skipWriting) {
-                log("Building MANIFEST-only jar: "
+        if (!skipWriting) {
+            log("Building MANIFEST-only jar: "
                     + getDestFile().getAbsolutePath());
-            }
-            zOut = new ZipOutputStream(getDestFile());
 
-            zOut.setEncoding(getEncoding());
-            zOut.setUseZip64(getZip64Mode().getMode());
-            if (isCompress()) {
-                zOut.setMethod(ZipOutputStream.DEFLATED);
-            } else {
-                zOut.setMethod(ZipOutputStream.STORED);
+            try (ZipOutputStream zOut = new ZipOutputStream(getDestFile())) {
+                zOut.setEncoding(getEncoding());
+                zOut.setUseZip64(getZip64Mode().getMode());
+                if (isCompress()) {
+                    zOut.setMethod(ZipOutputStream.DEFLATED);
+                } else {
+                    zOut.setMethod(ZipOutputStream.STORED);
+                }
+                initZipOutputStream(zOut);
+                finalizeZipOutputStream(zOut);
+            } catch (IOException ioe) {
+                throw new BuildException("Could not create almost empty JAR archive"
+                                         + " (" + ioe.getMessage() + ")", ioe,
+                                         getLocation());
+            } finally {
+                createEmpty = false;
             }
-            initZipOutputStream(zOut);
-            finalizeZipOutputStream(zOut);
-        } catch (IOException ioe) {
-            throw new BuildException("Could not create almost empty JAR archive"
-                                     + " (" + ioe.getMessage() + ")", ioe,
-                                     getLocation());
-        } finally {
-            // Close the output stream.
-            FileUtils.close(zOut);
-            createEmpty = false;
         }
         return true;
     }
@@ -942,6 +887,7 @@
      *
      * @see Zip#cleanUp
      */
+    @Override
     protected void cleanUp() {
         super.cleanUp();
         checkJarSpec();
@@ -953,7 +899,7 @@
             filesetManifest = null;
             originalManifest = null;
         }
-        rootEntries.removeAllElements();
+        rootEntries.clear();
     }
 
     // CheckStyle:LineLength OFF - Link is too long.
@@ -964,7 +910,7 @@
     // CheckStyle:LineLength ON
     private void checkJarSpec() {
         String br = System.getProperty("line.separator");
-        StringBuffer message = new StringBuffer();
+        StringBuilder message = new StringBuilder();
         Section mainSection = (configuredManifest == null)
                             ? null
                             : configuredManifest.getMainSection();
@@ -989,11 +935,10 @@
             message.append(br);
             message.append("Location: ").append(getLocation());
             message.append(br);
-            if (strict.getValue().equalsIgnoreCase("fail")) {
+            if ("fail".equalsIgnoreCase(strict.getValue())) {
                 throw new BuildException(message.toString(), getLocation());
-            } else {
-                logWhenWriting(message.toString(), strict.getLogLevel());
             }
+            logWhenWriting(message.toString(), strict.getLogLevel());
         }
     }
 
@@ -1004,6 +949,7 @@
      *
      * @since 1.44, Ant 1.5
      */
+    @Override
     public void reset() {
         super.reset();
         emptyBehavior = "create";
@@ -1022,6 +968,7 @@
          * Get the list of valid strings.
          * @return the list of values - "skip", "merge" and "mergewithoutmain"
          */
+        @Override
         public String[] getValues() {
             return new String[] {"skip", "merge", "mergewithoutmain"};
         }
@@ -1069,9 +1016,7 @@
             writer.println(dir);
         }
 
-        for (String file : files) {
-            writer.println(file);
-        }
+        files.forEach(writer::println);
     }
 
     /**
@@ -1097,39 +1042,27 @@
     protected static String findJarName(String fileName,
                                               String[] classpath) {
         if (classpath == null) {
-            return (new File(fileName)).getName();
+            return new File(fileName).getName();
         }
         fileName = fileName.replace(File.separatorChar, '/');
-        TreeMap<String, String> matches = new TreeMap<String, String>(new Comparator<Object>() {
-                // longest match comes first
-                public int compare(Object o1, Object o2) {
-                    if (o1 instanceof String && o2 instanceof String) {
-                        return ((String) o2).length()
-                            - ((String) o1).length();
-                    }
-                    return 0;
-                }
-            });
+        SortedMap<String, String> matches = new TreeMap<>(Comparator
+            .<String> comparingInt(s -> s == null ? 0 : s.length()).reversed());
 
-        for (int i = 0; i < classpath.length; i++) {
-            if (fileName.endsWith(classpath[i])) {
-                matches.put(classpath[i], classpath[i]);
-            } else {
-                int slash = classpath[i].indexOf("/");
-                String candidate = classpath[i];
-                while (slash > -1) {
-                    candidate = candidate.substring(slash + 1);
-                    if (fileName.endsWith(candidate)) {
-                        matches.put(candidate, classpath[i]);
-                        break;
-                    }
-                    slash = candidate.indexOf("/");
+        for (String element : classpath) {
+            String candidate = element;
+            while (true) {
+                if (fileName.endsWith(candidate)) {
+                    matches.put(candidate, element);
+                    break;
+                }
+                int slash = candidate.indexOf('/');
+                if (slash < 0) {
+                    break;
                 }
+                candidate = candidate.substring(slash + 1);
             }
         }
-
-        return matches.size() == 0
-            ? null : (String) matches.get(matches.firstKey());
+        return matches.isEmpty() ? null : matches.get(matches.firstKey());
     }
 
     /**
@@ -1144,43 +1077,38 @@
     protected static void grabFilesAndDirs(String file, List<String> dirs,
                                                  List<String> files)
         throws IOException {
-        org.apache.tools.zip.ZipFile zf = null;
-        try {
-            zf = new org.apache.tools.zip.ZipFile(file, "utf-8");
+        try (org.apache.tools.zip.ZipFile zf = new org.apache.tools.zip.ZipFile(file, "utf-8")) {
             Enumeration<org.apache.tools.zip.ZipEntry> entries = zf.getEntries();
-            HashSet<String> dirSet = new HashSet<String>();
+            Set<String> dirSet = new HashSet<>();
             while (entries.hasMoreElements()) {
                 org.apache.tools.zip.ZipEntry ze =
                     entries.nextElement();
                 String name = ze.getName();
                 if (ze.isDirectory()) {
                     dirSet.add(name);
-                } else if (name.indexOf("/") == -1) {
+                } else if (name.indexOf('/') == -1) {
                     files.add(name);
                 } else {
                     // a file, not in the root
                     // since the jar may be one without directory
                     // entries, add the parent dir of this file as
                     // well.
-                    dirSet.add(name.substring(0, name.lastIndexOf("/") + 1));
+                    dirSet.add(name.substring(0, name.lastIndexOf('/') + 1));
                 }
             }
             dirs.addAll(dirSet);
-        } finally {
-            if (zf != null) {
-                zf.close();
-            }
         }
     }
 
     private Resource[][] grabManifests(ResourceCollection[] rcs) {
         Resource[][] manifests = new Resource[rcs.length][];
         for (int i = 0; i < rcs.length; i++) {
-            Resource[][] resources = null;
+            Resource[][] resources;
             if (rcs[i] instanceof FileSet) {
                 resources = grabResources(new FileSet[] {(FileSet) rcs[i]});
             } else {
-                resources = grabNonFileSetResources(new ResourceCollection[] {rcs[i]});
+                resources = grabNonFileSetResources(
+                    new ResourceCollection[] {rcs[i]});
             }
             for (int j = 0; j < resources[0].length; j++) {
                 String name = resources[0][j].getName().replace('\\', '/');
@@ -1196,7 +1124,7 @@
                         name = prefix + name;
                     }
                 }
-                if (name.equalsIgnoreCase(MANIFEST_NAME)) {
+                if (MANIFEST_NAME.equalsIgnoreCase(name)) {
                     manifests[i] = new Resource[] {resources[0][j]};
                     break;
                 }
@@ -1208,11 +1136,26 @@
         return manifests;
     }
 
+    private Charset getManifestCharset() {
+        if (manifestEncoding == null) {
+            return Charset.defaultCharset();
+        }
+        try {
+            return Charset.forName(manifestEncoding);
+        } catch (IllegalArgumentException e) {
+            throw new BuildException(
+                "Unsupported encoding while reading manifest: "
+                    + e.getMessage(),
+                e);
+        }
+    }
+
     /** The strict enumerated type. */
     public static class StrictMode extends EnumeratedAttribute {
         /** Public no arg constructor. */
         public StrictMode() {
         }
+
         /**
          * Constructor with an arg.
          * @param value the enumerated value as a string.
@@ -1220,18 +1163,21 @@
         public StrictMode(String value) {
             setValue(value);
         }
+
         /**
          * Get List of valid strings.
          * @return the list of values.
          */
+        @Override
         public String[] getValues() {
             return new String[] {"fail", "warn", "ignore"};
         }
+
         /**
          * @return The log level according to the strict mode.
          */
         public int getLogLevel() {
-            return (getValue().equals("ignore")) ? Project.MSG_VERBOSE : Project.MSG_WARN;
+            return "ignore".equals(getValue()) ? Project.MSG_VERBOSE : Project.MSG_WARN;
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Javac.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Javac.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Javac.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Javac.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,16 +19,14 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import java.io.FileFilter;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.TreeMap;
 
 import org.apache.tools.ant.BuildException;
@@ -139,7 +137,7 @@
     protected boolean failOnError = true;
     protected boolean listFiles = false;
     protected File[] compileList = new File[0];
-    private Map<String, Long> packageInfos = new HashMap<String, Long>();
+    private Map<String, Long> packageInfos = new HashMap<>();
     // CheckStyle:VisibilityModifier ON
 
     private String source;
@@ -163,21 +161,26 @@
     private String assumedJavaVersion() {
         if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_4)) {
             return JAVAC14;
-        } else if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_5)) {
+        }
+        if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_5)) {
             return JAVAC15;
-        } else if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_6)) {
+        }
+        if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_6)) {
             return JAVAC16;
-        } else if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_7)) {
+        }
+        if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_7)) {
             return JAVAC17;
-        } else if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_8)) {
+        }
+        if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_8)) {
             return JAVAC18;
-        } else if (JavaEnvUtils.isAtLeastJavaVersion("10")) {
+        }
+        if (JavaEnvUtils.isAtLeastJavaVersion("10")) {
             return JAVAC10_PLUS;
-        } else if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_9)) {
+        }
+        if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_9)) {
             return JAVAC9;
-        } else {
-            return CLASSIC;
         }
+        return CLASSIC;
     }
 
     /**
@@ -1091,8 +1094,8 @@
      */
     public void add(final CompilerAdapter adapter) {
         if (nestedAdapter != null) {
-            throw new BuildException("Can't have more than one compiler"
-                                     + " adapter");
+            throw new BuildException(
+                "Can't have more than one compiler adapter");
         }
         nestedAdapter = adapter;
     }
@@ -1140,7 +1143,7 @@
      */
     protected void resetFileLists() {
         compileList = new File[0];
-        packageInfos = new HashMap<String, Long>();
+        packageInfos = new HashMap<>();
     }
 
     /**
@@ -1155,8 +1158,8 @@
         final GlobPatternMapper m = new GlobPatternMapper();
         final String[] extensions = findSupportedFileExtensions();
 
-        for (int i = 0; i < extensions.length; i++) {
-            m.setFrom(extensions[i]);
+        for (String extension : extensions) {
+            m.setFrom(extension);
             m.setTo("*.class");
             final SourceFileScanner sfs = new SourceFileScanner(this);
             final File[] newFiles = sfs.restrictAsFiles(files, srcDir, destDir, m);
@@ -1195,7 +1198,8 @@
         final FileUtils fu = FileUtils.getFileUtils();
         for (String pathElement : moduleSourcepath.list()) {
             boolean valid = false;
-            for (Map.Entry<String,Collection<File>> modules : resolveModuleSourcePathElement(getProject().getBaseDir(), pathElement).entrySet()) {
+            for (Map.Entry<String, Collection<File>> modules : resolveModuleSourcePathElement(
+                getProject().getBaseDir(), pathElement).entrySet()) {
                 final String moduleName = modules.getKey();
                 for (File srcDir : modules.getValue()) {
                     if (srcDir.exists()) {
@@ -1307,8 +1311,8 @@
             if (isJdkCompiler(compilerImpl)) {
                 compilerImpl = EXTJAVAC;
             } else {
-                log("Since compiler setting isn't classic or modern, "
-                    + "ignoring fork setting.", Project.MSG_WARN);
+                log("Since compiler setting isn't classic or modern, ignoring fork setting.",
+                    Project.MSG_WARN);
             }
         }
         return compilerImpl;
@@ -1363,13 +1367,12 @@
         if (destDir != null && !destDir.isDirectory()) {
             throw new BuildException("destination directory \""
                                      + destDir
-                                     + "\" does not exist "
-                                     + "or is not a directory", getLocation());
+                                     + "\" does not exist or is not a directory", getLocation());
         }
         if (includeAntRuntime == null && getProject().getProperty("build.sysclasspath") == null) {
-            log(getLocation() + "warning: 'includeantruntime' was not set, " +
-                    "defaulting to build.sysclasspath=last; set to false for repeatable builds",
-                    Project.MSG_WARN);
+            log(getLocation()
+                + "warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds",
+                Project.MSG_WARN);
         }
     }
 
@@ -1387,9 +1390,8 @@
                 + (destDir != null ? " to " + destDir : ""));
 
             if (listFiles) {
-                for (int i = 0; i < compileList.length; i++) {
-                  final String filename = compileList[i].getAbsolutePath();
-                  log(filename);
+                for (File element : compileList) {
+                  log(element.getAbsolutePath());
                 }
             }
 
@@ -1424,9 +1426,8 @@
                 }
                 if (failOnError) {
                     throw new BuildException(FAIL_MSG, getLocation());
-                } else {
-                    log(FAIL_MSG, Project.MSG_ERR);
                 }
+                log(FAIL_MSG, Project.MSG_ERR);
             }
         }
     }
@@ -1448,9 +1449,8 @@
     }
 
     private void lookForPackageInfos(final File srcDir, final File[] newFiles) {
-        for (int i = 0; i < newFiles.length; i++) {
-            final File f = newFiles[i];
-            if (!f.getName().equals("package-info.java")) {
+        for (File f : newFiles) {
+            if (!"package-info.java".equals(f.getName())) {
                 continue;
             }
             final String path = FILE_UTILS.removeLeadingPath(srcDir, f).
@@ -1461,7 +1461,7 @@
                 continue;
             }
             final String pkg = path.substring(0, path.length() - suffix.length());
-            packageInfos.put(pkg, new Long(f.lastModified()));
+            packageInfos.put(pkg, Long.valueOf(f.lastModified()));
         }
     }
 
@@ -1471,7 +1471,7 @@
      * @see <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=43114">Bug #43114</a>
      */
     private void generateMissingPackageInfoClasses(final File dest) throws IOException {
-        for (final Entry<String, Long> entry : packageInfos.entrySet()) {
+        for (final Map.Entry<String, Long> entry : packageInfos.entrySet()) {
             final String pkg = entry.getKey();
             final Long sourceLastMod = entry.getValue();
             final File pkgBinDir = new File(dest, pkg.replace('/', File.separatorChar));
@@ -1481,8 +1481,7 @@
                 continue;
             }
             log("Creating empty " + pkgInfoClass);
-            final OutputStream os = new FileOutputStream(pkgInfoClass);
-            try {
+            try (OutputStream os = Files.newOutputStream(pkgInfoClass.toPath())) {
                 os.write(PACKAGE_INFO_CLASS_HEADER);
                 final byte[] name = pkg.getBytes("UTF-8");
                 final int length = name.length + /* "/package-info" */ 13;
@@ -1490,8 +1489,6 @@
                 os.write((byte) length % 256);
                 os.write(name);
                 os.write(PACKAGE_INFO_CLASS_FOOTER);
-            } finally {
-                os.close();
             }
         }
     }
@@ -1503,7 +1500,7 @@
      * @since 1.9.7
      */
     private static boolean hasPath(final Path path) {
-        return path != null && path.size() > 0;
+        return path != null && !path.isEmpty();
     }
 
     /**
@@ -1537,7 +1534,7 @@
      */
     private static Collection<? extends CharSequence> expandGroups(
             final CharSequence element) {
-        List<StringBuilder> result = new ArrayList<StringBuilder>();
+        List<StringBuilder> result = new ArrayList<>();
         result.add(new StringBuilder());
         StringBuilder resolved = new StringBuilder();
         for (int i = 0; i < element.length(); i++) {
@@ -1560,7 +1557,7 @@
                             break;
                         default:
                             final List<StringBuilder> oldRes = result;
-                            result = new ArrayList<StringBuilder>(oldRes.size() * parts.size());
+                            result = new ArrayList<>(oldRes.size() * parts.size());
                             for (CharSequence part : parts) {
                                 for (CharSequence prefix : oldRes) {
                                     result.add(new StringBuilder(prefix).append(resolved).append(part));
@@ -1587,7 +1584,7 @@
      * @since 1.9.7
      */
     private static Collection<? extends CharSequence> resolveGroup(final CharSequence group) {
-        final Collection<CharSequence> result = new ArrayList<CharSequence>();
+        final Collection<CharSequence> result = new ArrayList<>();
         int start = 0;
         int depth = 0;
         for (int i = 0; i < group.length(); i++) {
@@ -1656,25 +1653,25 @@
         final int startIndex = pattern.indexOf(MODULE_MARKER);
         if (startIndex == -1) {
             findModules(root, pattern, null, collector);
-        } else {
-            if (startIndex == 0) {
-                throw new BuildException("The modulesourcepath entry must be a folder.");
-            }
-            final int endIndex = startIndex + MODULE_MARKER.length();
-            if (pattern.charAt(startIndex - 1) != File.separatorChar) {
-                    throw new BuildException("The module mark must be preceded by separator");
-            }
-            if (endIndex < pattern.length() && pattern.charAt(endIndex) != File.separatorChar) {
-                throw new BuildException("The module mark must be followed by separator");
-            }
-            if (pattern.indexOf(MODULE_MARKER, endIndex) != -1) {
-                throw new BuildException("The modulesourcepath entry must contain at most one module mark");
-            }
-            final String pathToModule = pattern.substring(0, startIndex);
-            final String pathInModule = endIndex == pattern.length()
-                    ? null : pattern.substring(endIndex + 1);  //+1 the separator
-            findModules(root, pathToModule, pathInModule, collector);
+            return;
         }
+        if (startIndex == 0) {
+            throw new BuildException("The modulesourcepath entry must be a folder.");
+        }
+        final int endIndex = startIndex + MODULE_MARKER.length();
+        if (pattern.charAt(startIndex - 1) != File.separatorChar) {
+                throw new BuildException("The module mark must be preceded by separator");
+        }
+        if (endIndex < pattern.length() && pattern.charAt(endIndex) != File.separatorChar) {
+            throw new BuildException("The module mark must be followed by separator");
+        }
+        if (pattern.indexOf(MODULE_MARKER, endIndex) != -1) {
+            throw new BuildException("The modulesourcepath entry must contain at most one module mark");
+        }
+        final String pathToModule = pattern.substring(0, startIndex);
+        final String pathInModule = endIndex == pattern.length()
+                ? null : pattern.substring(endIndex + 1);  //+1 the separator
+        findModules(root, pathToModule, pathInModule, collector);
     }
 
     /**
@@ -1695,19 +1692,14 @@
         if (!f.isDirectory()) {
             return;
         }
-        final File[] modules = f.listFiles(new FileFilter() {
-            public boolean accept(File pathname) {
-                return pathname.isDirectory();
-            }
-        });
-        for (File module : modules) {
+        for (File module : f.listFiles(File::isDirectory)) {
             final String moduleName = module.getName();
             final File moduleSourceRoot = pathInModule == null ?
                     module :
                     new File(module, pathInModule);
             Collection<File> moduleRoots = collector.get(moduleName);
             if (moduleRoots == null) {
-                moduleRoots = new ArrayList<File>();
+                moduleRoots = new ArrayList<>();
                 collector.put(moduleName, moduleRoots);
             }
             moduleRoots.add(moduleSourceRoot);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Javadoc.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Javadoc.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Javadoc.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,25 +20,27 @@
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.file.Files;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.Vector;
+import java.util.stream.Collectors;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
@@ -225,7 +227,7 @@
     public class DocletInfo extends ExtensionInfo {
 
         /** Collection of doclet parameters. */
-        private final Vector<DocletParam> params = new Vector<DocletParam>();
+        private final List<DocletParam> params = new Vector<>();
 
         /**
          * Create a doclet parameter to be configured by Ant.
@@ -234,8 +236,7 @@
          */
         public DocletParam createParam() {
             final DocletParam param = new DocletParam();
-            params.addElement(param);
-
+            params.add(param);
             return param;
         }
 
@@ -245,7 +246,7 @@
          * @return an Enumeration of DocletParam instances.
          */
         public Enumeration<DocletParam> getParams() {
-            return params.elements();
+            return Collections.enumeration(params);
         }
     }
 
@@ -378,8 +379,11 @@
      * contains special handling for FileSets that has to occur at
      * task runtime.</p>
      */
-    public class ResourceCollectionContainer {
-        private final ArrayList<ResourceCollection> rcs = new ArrayList<ResourceCollection>();
+    public class ResourceCollectionContainer
+        implements Iterable<ResourceCollection> {
+
+        private final List<ResourceCollection> rcs = new ArrayList<>();
+
         /**
          * Add a resource collection to the container.
          * @param rc the collection to add.
@@ -392,7 +396,8 @@
          * Get an iterator on the collection.
          * @return an iterator.
          */
-        private Iterator<ResourceCollection> iterator() {
+        @Override
+        public Iterator<ResourceCollection> iterator() {
             return rcs.iterator();
         }
     }
@@ -422,12 +427,12 @@
      * @param value the argument value.
      */
     private void addArgIfNotEmpty(final String key, final String value) {
-        if (value != null && value.length() != 0) {
-            cmd.createArgument().setValue(key);
-            cmd.createArgument().setValue(value);
-        } else {
+        if (value == null || value.isEmpty()) {
             log("Warning: Leaving out empty argument '" + key + "'",
                 Project.MSG_WARN);
+        } else {
+            cmd.createArgument().setValue(key);
+            cmd.createArgument().setValue(value);
         }
     }
 
@@ -443,9 +448,9 @@
     private boolean failOnWarning = false;
     private Path sourcePath = null;
     private File destDir = null;
-    private final Vector<SourceFile> sourceFiles = new Vector<SourceFile>();
-    private final Vector<PackageName> packageNames = new Vector<PackageName>();
-    private final Vector<PackageName> excludePackageNames = new Vector<PackageName>(1);
+    private final List<SourceFile> sourceFiles = new Vector<>();
+    private final List<PackageName> packageNames = new Vector<>();
+    private final List<PackageName> excludePackageNames = new Vector<>(1);
     private boolean author = true;
     private boolean version = true;
     private DocletInfo doclet = null;
@@ -453,9 +458,9 @@
     private Path bootclasspath = null;
     private String group = null;
     private String packageList = null;
-    private final Vector<LinkArgument> links = new Vector<LinkArgument>();
-    private final Vector<GroupArgument> groups = new Vector<GroupArgument>();
-    private final Vector<Object> tags = new Vector<Object>();
+    private final List<LinkArgument> links = new Vector<>();
+    private final List<GroupArgument> groups = new Vector<>();
+    private final List<Object> tags = new Vector<>();
     private boolean useDefaultExcludes = true;
     private Html doctitle = null;
     private Html header = null;
@@ -475,7 +480,7 @@
 
     private final ResourceCollectionContainer nestedSourceFiles
         = new ResourceCollectionContainer();
-    private final Vector<DirSet> packageSets = new Vector<DirSet>();
+    private final List<DirSet> packageSets = new Vector<>();
 
     /**
      * Work around command line length limit by using an external file
@@ -593,7 +598,7 @@
      * @param sf the source file to be processed.
      */
     public void addSource(final SourceFile sf) {
-        sourceFiles.addElement(sf);
+        sourceFiles.add(sf);
     }
 
     /**
@@ -623,7 +628,7 @@
      * @param pn the package name, possibly wildcarded.
      */
     public void addPackage(final PackageName pn) {
-        packageNames.addElement(pn);
+        packageNames.add(pn);
     }
 
     /**
@@ -648,7 +653,7 @@
      * @param pn the name of the package (wildcards are not permitted).
      */
     public void addExcludePackage(final PackageName pn) {
-        excludePackageNames.addElement(pn);
+        excludePackageNames.add(pn);
     }
 
     /**
@@ -772,7 +777,7 @@
      * @param tagletInfo information about the taglet.
      */
     public void addTaglet(final ExtensionInfo tagletInfo) {
-        tags.addElement(tagletInfo);
+        tags.add(tagletInfo);
     }
 
     /**
@@ -1191,7 +1196,7 @@
      */
     public LinkArgument createLink() {
         final LinkArgument la = new LinkArgument();
-        links.addElement(la);
+        links.add(la);
         return la;
     }
 
@@ -1304,7 +1309,7 @@
      */
     public TagArgument createTag() {
         final TagArgument ta = new TagArgument();
-        tags.addElement (ta);
+        tags.add(ta);
         return ta;
     }
 
@@ -1377,48 +1382,47 @@
             final StringTokenizer tok = new StringTokenizer(verboseScope, ",");
             while (tok.hasMoreTokens()) {
                 final String next = tok.nextToken().trim();
-                if (next.equals("all")) {
+                if ("all".equals(next)) {
                     if (gotAll) {
-                        getProject().log ("Repeated tag scope element: all",
+                        getProject().log("Repeated tag scope element: all",
                                           Project.MSG_VERBOSE);
                     }
                     gotAll = true;
                 } else {
                     int i;
                     for (i = 0; i < SCOPE_ELEMENTS.length; i++) {
-                        if (next.equals (SCOPE_ELEMENTS[i])) {
+                        if (SCOPE_ELEMENTS[i].equals(next)) {
                             break;
                         }
                     }
                     if (i == SCOPE_ELEMENTS.length) {
-                        throw new BuildException ("Unrecognised scope element: "
-                                                  + next);
-                    } else {
-                        if (elements[i]) {
-                            getProject().log ("Repeated tag scope element: "
-                                              + next, Project.MSG_VERBOSE);
-                        }
-                        elements[i] = true;
-                        gotNotAll = true;
+                        throw new BuildException(
+                            "Unrecognised scope element: %s", next);
                     }
+                    if (elements[i]) {
+                        getProject().log("Repeated tag scope element: " + next,
+                            Project.MSG_VERBOSE);
+                    }
+                    elements[i] = true;
+                    gotNotAll = true;
                 }
             }
 
             if (gotNotAll && gotAll) {
-                throw new BuildException ("Mixture of \"all\" and other scope "
-                                          + "elements in tag parameter.");
+                throw new BuildException(
+                    "Mixture of \"all\" and other scope elements in tag parameter.");
             }
             if (!gotNotAll && !gotAll) {
-                throw new BuildException ("No scope elements specified in tag "
-                                          + "parameter.");
+                throw new BuildException(
+                    "No scope elements specified in tag parameter.");
             }
             if (gotAll) {
                 this.scope = "a";
             } else {
-                final StringBuffer buff = new StringBuffer (elements.length);
+                final StringBuilder buff = new StringBuilder(elements.length);
                 for (int i = 0; i < elements.length; i++) {
                     if (elements[i]) {
-                        buff.append (SCOPE_ELEMENTS[i].charAt(0));
+                        buff.append(SCOPE_ELEMENTS[i].charAt(0));
                     }
                 }
                 this.scope = buff.toString();
@@ -1441,17 +1445,17 @@
          *                           is <code>null</code> or empty.
          */
         public String getParameter() throws BuildException {
-            if (name == null || name.equals("")) {
-                throw new BuildException ("No name specified for custom tag.");
+            if (name == null || name.isEmpty()) {
+                throw new BuildException("No name specified for custom tag.");
             }
             if (getDescription() != null) {
                 return name + ":" + (enabled ? "" : "X")
                     + scope + ":" + getDescription();
-            } else if (!enabled || !"a".equals(scope)) {
+            }
+            if (!enabled || !"a".equals(scope)) {
                 return name + ":" + (enabled ? "" : "X") + scope;
-            } else {
-                return name;
             }
+            return name;
         }
     }
 
@@ -1462,22 +1466,16 @@
      */
     public GroupArgument createGroup() {
         final GroupArgument ga = new GroupArgument();
-        groups.addElement(ga);
+        groups.add(ga);
         return ga;
     }
 
-
     /**
      * A class corresponding to the group nested element.
      */
     public class GroupArgument {
         private Html title;
-        private final Vector<PackageName> packages = new Vector<PackageName>();
-
-        /** Constructor for GroupArgument */
-        public GroupArgument() {
-            //empty
-        }
+        private final List<PackageName> packages = new Vector<>();
 
         /**
          * Set the title attribute using a string.
@@ -1488,6 +1486,7 @@
             h.addText(src);
             addTitle(h);
         }
+
         /**
          * Set the title attribute using a nested Html value.
          * @param text a <code>Html</code> value
@@ -1517,12 +1516,13 @@
                 addPackage(pn);
             }
         }
+
         /**
          * Add a package nested element.
          * @param pn a nested element specifying the package.
          */
         public void addPackage(final PackageName pn) {
-            packages.addElement(pn);
+            packages.add(pn);
         }
 
         /**
@@ -1530,15 +1530,8 @@
          * @return the packages as a string
          */
         public String getPackages() {
-            final StringBuffer p = new StringBuffer();
-            final int size = packages.size();
-            for (int i = 0; i < size; i++) {
-                if (i > 0) {
-                    p.append(":");
-                }
-                p.append(packages.elementAt(i).toString());
-            }
-            return p.toString();
+            return packages.stream().map(Object::toString)
+                .collect(Collectors.joining(":"));
         }
     }
 
@@ -1602,7 +1595,7 @@
      * @since 1.5
      */
     public void addPackageset(final DirSet packageSet) {
-        packageSets.addElement(packageSet);
+        packageSets.add(packageSet);
     }
 
     /**
@@ -1709,7 +1702,7 @@
     public void execute() throws BuildException {
         checkTaskName();
 
-        final Vector<String> packagesToDoc = new Vector<String>();
+        final List<String> packagesToDoc = new Vector<>();
         final Path sourceDirs = new Path(getProject());
 
         checkPackageAndSourcePath();
@@ -1721,8 +1714,7 @@
         parsePackages(packagesToDoc, sourceDirs);
         checkPackages(packagesToDoc, sourceDirs);
 
-        @SuppressWarnings("unchecked")
-        final Vector<SourceFile> sourceFilesToDoc = (Vector<SourceFile>) sourceFiles.clone();
+        final List<SourceFile> sourceFilesToDoc = new ArrayList<>(sourceFiles);
         addSourceFiles(sourceFilesToDoc);
 
         checkPackagesToDoc(packagesToDoc, sourceFilesToDoc);
@@ -1850,25 +1842,24 @@
         }
     }
 
-    private void checkPackages(final Vector<String> packagesToDoc, final Path sourceDirs) {
-        if (packagesToDoc.size() != 0 && sourceDirs.size() == 0) {
-            final String msg = "sourcePath attribute must be set when "
-                + "specifying package names.";
-            throw new BuildException(msg);
+    private void checkPackages(final List<String> packagesToDoc, final Path sourceDirs) {
+        if (!packagesToDoc.isEmpty() && sourceDirs.isEmpty()) {
+            throw new BuildException(
+                "sourcePath attribute must be set when specifying package names.");
         }
     }
 
     private void checkPackagesToDoc(
-        final Vector<String> packagesToDoc, final Vector<SourceFile> sourceFilesToDoc) {
-        if (packageList == null && packagesToDoc.size() == 0
-            && sourceFilesToDoc.size() == 0) {
-            throw new BuildException("No source files and no packages have "
-                                     + "been specified.");
+        final List<String> packagesToDoc, final List<SourceFile> sourceFilesToDoc) {
+        if (packageList == null && packagesToDoc.isEmpty()
+            && sourceFilesToDoc.isEmpty()) {
+            throw new BuildException(
+                "No source files and no packages have been specified.");
         }
     }
 
     private void doSourcePath(final Commandline toExecute, final Path sourceDirs) {
-        if (sourceDirs.size() > 0) {
+        if (!sourceDirs.isEmpty()) {
             toExecute.createArgument().setValue("-sourcepath");
             toExecute.createArgument().setPath(sourceDirs);
         }
@@ -1893,7 +1884,7 @@
         }
 
         if (classpath == null) {
-            classpath = (new Path(getProject())).concatSystemClasspath("last");
+            classpath = new Path(getProject()).concatSystemClasspath("last");
         } else {
             classpath = classpath.concatSystemClasspath("ignore");
         }
@@ -1918,32 +1909,31 @@
     private void doDoclet(final Commandline toExecute) {
         if (doclet != null) {
             if (doclet.getName() == null) {
-                throw new BuildException("The doclet name must be "
-                                         + "specified.", getLocation());
-            } else {
-                toExecute.createArgument().setValue("-doclet");
-                toExecute.createArgument().setValue(doclet.getName());
-                if (doclet.getPath() != null) {
-                    final Path docletPath
-                        = doclet.getPath().concatSystemClasspath("ignore");
-                    if (docletPath.size() != 0) {
-                        toExecute.createArgument().setValue("-docletpath");
-                        toExecute.createArgument().setPath(docletPath);
-                    }
+                throw new BuildException("The doclet name must be specified.",
+                    getLocation());
+            }
+            toExecute.createArgument().setValue("-doclet");
+            toExecute.createArgument().setValue(doclet.getName());
+            if (doclet.getPath() != null) {
+                final Path docletPath
+                    = doclet.getPath().concatSystemClasspath("ignore");
+                if (docletPath.size() != 0) {
+                    toExecute.createArgument().setValue("-docletpath");
+                    toExecute.createArgument().setPath(docletPath);
+                }
+            }
+            for (final Enumeration<DocletParam> e = doclet.getParams();
+                 e.hasMoreElements();) {
+                final DocletParam param = e.nextElement();
+                if (param.getName() == null) {
+                    throw new BuildException(
+                        "Doclet parameters must have a name");
                 }
-                for (final Enumeration<DocletParam> e = doclet.getParams();
-                     e.hasMoreElements();) {
-                    final DocletParam param = e.nextElement();
-                    if (param.getName() == null) {
-                        throw new BuildException("Doclet parameters must "
-                                                 + "have a name");
-                    }
 
-                    toExecute.createArgument().setValue(param.getName());
-                    if (param.getValue() != null) {
-                        toExecute.createArgument()
-                            .setValue(param.getValue());
-                    }
+                toExecute.createArgument().setValue(param.getName());
+                if (param.getValue() != null) {
+                    toExecute.createArgument()
+                        .setValue(param.getValue());
                 }
             }
         }
@@ -1952,7 +1942,6 @@
     private void writeExternalArgs(final Commandline toExecute) {
         // If using an external file, write the command line options to it
         File optionsTmpFile = null;
-        BufferedWriter optionsListWriter = null;
         try {
             optionsTmpFile = FILE_UTILS.createTempFile(
                 "javadocOptions", "", null, true, true);
@@ -1960,23 +1949,20 @@
             toExecute.clearArgs();
             toExecute.createArgument().setValue(
                 "@" + optionsTmpFile.getAbsolutePath());
-            optionsListWriter = new BufferedWriter(
-                new FileWriter(optionsTmpFile.getAbsolutePath(), true));
-            for (int i = 0; i < listOpt.length; i++) {
-                final String string = listOpt[i];
-                if (string.startsWith("-J-")) {
-                    toExecute.createArgument().setValue(string);
-                } else  {
-                    if (string.startsWith("-")) {
-                        optionsListWriter.write(string);
+            try (BufferedWriter optionsListWriter = new BufferedWriter(
+                new FileWriter(optionsTmpFile.getAbsolutePath(), true))) {
+                for (final String opt : listOpt) {
+                    if (opt.startsWith("-J-")) {
+                        toExecute.createArgument().setValue(opt);
+                    } else if (opt.startsWith("-")) {
+                        optionsListWriter.write(opt);
                         optionsListWriter.write(" ");
                     } else {
-                        optionsListWriter.write(quoteString(string));
+                        optionsListWriter.write(quoteString(opt));
                         optionsListWriter.newLine();
                     }
                 }
             }
-            optionsListWriter.close();
         } catch (final IOException ex) {
             if (optionsTmpFile != null) {
                 optionsTmpFile.delete();
@@ -1984,8 +1970,6 @@
             throw new BuildException(
                 "Error creating or writing temporary file for javadoc options",
                 ex, getLocation());
-        } finally {
-            FileUtils.close(optionsListWriter);
         }
     }
 
@@ -2002,85 +1986,78 @@
     }
 
     private void doLinks(final Commandline toExecute) {
-        if (links.size() != 0) {
-            for (final Enumeration<LinkArgument> e = links.elements(); e.hasMoreElements();) {
-                final LinkArgument la = e.nextElement();
-
-                if (la.getHref() == null || la.getHref().length() == 0) {
-                    log("No href was given for the link - skipping",
-                        Project.MSG_VERBOSE);
+        for (final LinkArgument la : links) {
+            if (la.getHref() == null || la.getHref().isEmpty()) {
+                log("No href was given for the link - skipping",
+                    Project.MSG_VERBOSE);
+                continue;
+            }
+            String link = null;
+            if (la.shouldResolveLink()) {
+                final File hrefAsFile =
+                    getProject().resolveFile(la.getHref());
+                if (hrefAsFile.exists()) {
+                    try {
+                        link = FILE_UTILS.getFileURL(hrefAsFile)
+                            .toExternalForm();
+                    } catch (final MalformedURLException ex) {
+                        // should be impossible
+                        log("Warning: link location was invalid "
+                            + hrefAsFile, Project.MSG_WARN);
+                    }
+                }
+            }
+            if (link == null) {
+                // is the href a valid URL
+                try {
+                    final URL base = new URL("file://.");
+                    // created for the side effect of throwing a MalformedURLException
+                    new URL(base, la.getHref()); //NOSONAR
+                    link = la.getHref();
+                } catch (final MalformedURLException mue) {
+                    // ok - just skip
+                    log("Link href \"" + la.getHref()
+                        + "\" is not a valid url - skipping link",
+                        Project.MSG_WARN);
                     continue;
                 }
-                String link = null;
-                if (la.shouldResolveLink()) {
-                    final File hrefAsFile =
-                        getProject().resolveFile(la.getHref());
-                    if (hrefAsFile.exists()) {
+            }
+
+            if (la.isLinkOffline()) {
+                final File packageListLocation = la.getPackagelistLoc();
+                URL packageListURL = la.getPackagelistURL();
+                if (packageListLocation == null
+                    && packageListURL == null) {
+                    throw new BuildException(
+                        "The package list location for link " + la.getHref()
+                            + " must be provided because the link is offline");
+                }
+                if (packageListLocation != null) {
+                    final File packageListFile =
+                        new File(packageListLocation, "package-list");
+                    if (packageListFile.exists()) {
                         try {
-                            link = FILE_UTILS.getFileURL(hrefAsFile)
-                                .toExternalForm();
+                            packageListURL =
+                                FILE_UTILS.getFileURL(packageListLocation);
                         } catch (final MalformedURLException ex) {
-                            // should be impossible
-                            log("Warning: link location was invalid "
-                                + hrefAsFile, Project.MSG_WARN);
+                            log("Warning: Package list location was "
+                                + "invalid " + packageListLocation,
+                                Project.MSG_WARN);
                         }
+                    } else {
+                        log("Warning: No package list was found at "
+                            + packageListLocation, Project.MSG_VERBOSE);
                     }
                 }
-                if (link == null) {
-                    // is the href a valid URL
-                    try {
-                        final URL base = new URL("file://.");
-                        // created for the side effect of throwing a MalformedURLException
-                        new URL(base, la.getHref()); //NOSONAR
-                        link = la.getHref();
-                    } catch (final MalformedURLException mue) {
-                        // ok - just skip
-                        log("Link href \"" + la.getHref()
-                            + "\" is not a valid url - skipping link",
-                            Project.MSG_WARN);
-                        continue;
-                    }
-                }
-
-                if (la.isLinkOffline()) {
-                    final File packageListLocation = la.getPackagelistLoc();
-                    URL packageListURL = la.getPackagelistURL();
-                    if (packageListLocation == null
-                        && packageListURL == null) {
-                        throw new BuildException("The package list"
-                                                 + " location for link "
-                                                 + la.getHref()
-                                                 + " must be provided "
-                                                 + "because the link is "
-                                                 + "offline");
-                    }
-                    if (packageListLocation != null) {
-                        final File packageListFile =
-                            new File(packageListLocation, "package-list");
-                        if (packageListFile.exists()) {
-                            try {
-                                packageListURL =
-                                    FILE_UTILS.getFileURL(packageListLocation);
-                            } catch (final MalformedURLException ex) {
-                                log("Warning: Package list location was "
-                                    + "invalid " + packageListLocation,
-                                    Project.MSG_WARN);
-                            }
-                        } else {
-                            log("Warning: No package list was found at "
-                                + packageListLocation, Project.MSG_VERBOSE);
-                        }
-                    }
-                    if (packageListURL != null) {
-                        toExecute.createArgument().setValue("-linkoffline");
-                        toExecute.createArgument().setValue(link);
-                        toExecute.createArgument()
-                            .setValue(packageListURL.toExternalForm());
-                    }
-                } else {
-                    toExecute.createArgument().setValue("-link");
+                if (packageListURL != null) {
+                    toExecute.createArgument().setValue("-linkoffline");
                     toExecute.createArgument().setValue(link);
+                    toExecute.createArgument()
+                        .setValue(packageListURL.toExternalForm());
                 }
+            } else {
+                toExecute.createArgument().setValue("-link");
+                toExecute.createArgument().setValue(link);
             }
         }
     }
@@ -2102,7 +2079,7 @@
             final StringTokenizer tok = new StringTokenizer(group, ",", false);
             while (tok.hasMoreTokens()) {
                 final String grp = tok.nextToken().trim();
-                final int space = grp.indexOf(" ");
+                final int space = grp.indexOf(' ');
                 if (space > 0) {
                     final String name = grp.substring(0, space);
                     final String pkgList = grp.substring(space + 1);
@@ -2116,36 +2093,30 @@
 
     // add the group arguments
     private void doGroups(final Commandline toExecute) {
-        if (groups.size() != 0) {
-            for (final Enumeration<GroupArgument> e = groups.elements(); e.hasMoreElements();) {
-                final GroupArgument ga = e.nextElement();
-                final String title = ga.getTitle();
-                final String packages = ga.getPackages();
-                if (title == null || packages == null) {
-                    throw new BuildException("The title and packages must "
-                                             + "be specified for group "
-                                             + "elements.");
-                }
-                toExecute.createArgument().setValue("-group");
-                toExecute.createArgument().setValue(expand(title));
-                toExecute.createArgument().setValue(packages);
-            }
+        for (final GroupArgument ga : groups) {
+            final String title = ga.getTitle();
+            final String packages = ga.getPackages();
+            if (title == null || packages == null) {
+                throw new BuildException(
+                    "The title and packages must be specified for group elements.");
+            }
+            toExecute.createArgument().setValue("-group");
+            toExecute.createArgument().setValue(expand(title));
+            toExecute.createArgument().setValue(packages);
         }
     }
 
     // Do java1.4 arguments
     private void doJava14(final Commandline toExecute) {
-        for (final Enumeration<Object> e = tags.elements(); e.hasMoreElements();) {
-            final Object element = e.nextElement();
+        for (final Object element : tags) {
             if (element instanceof TagArgument) {
                 final TagArgument ta = (TagArgument) element;
                 final File tagDir = ta.getDir(getProject());
                 if (tagDir == null) {
                     // The tag element is not used as a fileset,
                     // but specifies the tag directly.
-                    toExecute.createArgument().setValue ("-tag");
-                    toExecute.createArgument()
-                        .setValue (ta.getParameter());
+                    toExecute.createArgument().setValue("-tag");
+                    toExecute.createArgument().setValue(ta.getParameter());
                 } else {
                     // The tag element is used as a
                     // fileset. Parse all the files and create
@@ -2153,26 +2124,22 @@
                     final DirectoryScanner tagDefScanner =
                         ta.getDirectoryScanner(getProject());
                     final String[] files = tagDefScanner.getIncludedFiles();
-                    for (int i = 0; i < files.length; i++) {
-                        final File tagDefFile = new File(tagDir, files[i]);
-                        try {
-                            final BufferedReader in
-                                = new BufferedReader(
-                                    new FileReader(tagDefFile)
-                                                     );
-                            String line = null;
+                    for (String file : files) {
+                        final File tagDefFile = new File(tagDir, file);
+                        try (final BufferedReader in =
+                            new BufferedReader(new FileReader(tagDefFile))) {
+                            String line;
                             while ((line = in.readLine()) != null) {
                                 toExecute.createArgument()
                                     .setValue("-tag");
                                 toExecute.createArgument()
                                     .setValue(line);
                             }
-                            in.close();
                         } catch (final IOException ioe) {
                             throw new BuildException(
-                                "Couldn't read "
-                                + " tag file from "
-                                + tagDefFile.getAbsolutePath(), ioe);
+                                "Couldn't read tag file from "
+                                    + tagDefFile.getAbsolutePath(),
+                                ioe);
                         }
                     }
                 }
@@ -2184,7 +2151,7 @@
                 if (tagletInfo.getPath() != null) {
                     final Path tagletPath = tagletInfo.getPath()
                         .concatSystemClasspath("ignore");
-                    if (tagletPath.size() != 0) {
+                    if (!tagletPath.isEmpty()) {
                         toExecute.createArgument()
                             .setValue("-tagletpath");
                         toExecute.createArgument().setPath(tagletPath);
@@ -2212,8 +2179,8 @@
     private void doDocFilesSubDirs(final Commandline toExecute) {
         if (docFilesSubDirs) {
             toExecute.createArgument().setValue("-docfilessubdirs");
-            if (excludeDocFilesSubDir != null
-                && excludeDocFilesSubDir.trim().length() > 0) {
+            if (!(excludeDocFilesSubDir == null
+                || excludeDocFilesSubDir.trim().isEmpty())) {
                 toExecute.createArgument().setValue("-excludedocfilessubdir");
                 toExecute.createArgument().setValue(excludeDocFilesSubDir);
             }
@@ -2222,10 +2189,10 @@
 
     private void doSourceAndPackageNames(
         final Commandline toExecute,
-        final Vector<String> packagesToDoc,
-        final Vector<SourceFile> sourceFilesToDoc,
+        final List<String> packagesToDoc,
+        final List<SourceFile> sourceFilesToDoc,
         final boolean useExternalFile,
-        final File    tmpList,
+        final File tmpList,
         final BufferedWriter srcListWriter)
         throws IOException {
         for (final String packageName : packagesToDoc) {
@@ -2242,7 +2209,7 @@
             if (useExternalFile) {
                 // TODO what is the following doing?
                 //     should it run if !javadoc4 && executable != null?
-                if (sourceFileName.indexOf(" ") > -1) {
+                if (sourceFileName.indexOf(' ') > -1) {
                     String name = sourceFileName;
                     if (File.separatorChar == '\\') {
                         name = sourceFileName.replace(File.separatorChar, '/');
@@ -2272,9 +2239,8 @@
         }
         if (str.indexOf('\'') == -1) {
             return quoteString(str, '\'');
-        } else {
-            return quoteString(str, '"');
         }
+        return quoteString(str, '"');
     }
 
     private boolean containsWhitespace(final String s) {
@@ -2288,7 +2254,7 @@
     }
 
     private String quoteString(final String str, final char delim) {
-        final StringBuffer buf = new StringBuffer(str.length() * 2);
+        final StringBuilder buf = new StringBuilder(str.length() * 2);
         buf.append(delim);
         final int len = str.length();
         boolean lastCharWasCR = false;
@@ -2336,13 +2302,11 @@
      *
      * @since 1.7
      */
-    private void addSourceFiles(final Vector<SourceFile> sf) {
-        final Iterator<ResourceCollection> e = nestedSourceFiles.iterator();
-        while (e.hasNext()) {
-            ResourceCollection rc = e.next();
+    private void addSourceFiles(final List<SourceFile> sf) {
+        for (ResourceCollection rc : nestedSourceFiles) {
             if (!rc.isFilesystemOnly()) {
-                throw new BuildException("only file system based resources are"
-                                         + " supported by javadoc");
+                throw new BuildException(
+                    "only file system based resources are supported by javadoc");
             }
             if (rc instanceof FileSet) {
                 final FileSet fs = (FileSet) rc;
@@ -2356,7 +2320,7 @@
                 }
             }
             for (final Resource r : rc) {
-                sf.addElement(new SourceFile(r.as(FileProvider.class).getFile()));
+                sf.add(new SourceFile(r.as(FileProvider.class).getFile()));
             }
         }
     }
@@ -2369,10 +2333,9 @@
      *
      * @since 1.5
      */
-    private void parsePackages(final Vector<String> pn, final Path sp) {
-        final HashSet<String> addedPackages = new HashSet<String>();
-        @SuppressWarnings("unchecked")
-        final Vector<DirSet> dirSets = (Vector<DirSet>) packageSets.clone();
+    private void parsePackages(final List<String> pn, final Path sp) {
+        final Set<String> addedPackages = new HashSet<>();
+        final List<DirSet> dirSets = new ArrayList<>(packageSets);
 
         // for each sourcePath entry, add a directoryset with includes
         // taken from packagenames attribute and nested package
@@ -2381,51 +2344,35 @@
         if (sourcePath != null) {
             final PatternSet ps = new PatternSet();
             ps.setProject(getProject());
-            if (packageNames.size() > 0) {
-                final Enumeration<PackageName> e = packageNames.elements();
-                while (e.hasMoreElements()) {
-                    final PackageName p = e.nextElement();
-                    String pkg = p.getName().replace('.', '/');
-                    if (pkg.endsWith("*")) {
-                        pkg += "*";
-                    }
-                    ps.createInclude().setName(pkg);
-                }
-            } else {
+            if (packageNames.isEmpty()) {
                 ps.createInclude().setName("**");
+            } else {
+                packageNames.stream().map(PackageName::getName)
+                    .map(s -> s.replace('.', '/').replaceFirst("\\*$", "**"))
+                    .forEach(pkg -> ps.createInclude().setName(pkg));
             }
 
-            final Enumeration<PackageName> e = excludePackageNames.elements();
-            while (e.hasMoreElements()) {
-                final PackageName p = e.nextElement();
-                String pkg = p.getName().replace('.', '/');
-                if (pkg.endsWith("*")) {
-                    pkg += "*";
-                }
-                ps.createExclude().setName(pkg);
-            }
-
+            excludePackageNames.stream().map(PackageName::getName)
+                .map(s -> s.replace('.', '/').replaceFirst("\\*$", "**"))
+                .forEach(pkg -> ps.createExclude().setName(pkg));
 
-            final String[] pathElements = sourcePath.list();
-            for (int i = 0; i < pathElements.length; i++) {
-                final File dir = new File(pathElements[i]);
+            for (String pathElement : sourcePath.list()) {
+                final File dir = new File(pathElement);
                 if (dir.isDirectory()) {
                     final DirSet ds = new DirSet();
                     ds.setProject(getProject());
                     ds.setDefaultexcludes(useDefaultExcludes);
                     ds.setDir(dir);
                     ds.createPatternSet().addConfiguredPatternset(ps);
-                    dirSets.addElement(ds);
+                    dirSets.add(ds);
                 } else {
-                    log("Skipping " + pathElements[i]
+                    log("Skipping " + pathElement
                         + " since it is no directory.", Project.MSG_WARN);
                 }
             }
         }
 
-        final Enumeration<DirSet> e = dirSets.elements();
-        while (e.hasMoreElements()) {
-            final DirSet ds = e.nextElement();
+        for (DirSet ds : dirSets) {
             final File baseDir = ds.getDir(getProject());
             log("scanning " + baseDir + " for packages.", Project.MSG_DEBUG);
             final DirectoryScanner dsc = ds.getDirectoryScanner(getProject());
@@ -2434,20 +2381,14 @@
             for (int i = 0; i < dirs.length; i++) {
                 // are there any java files in this directory?
                 final File pd = new File(baseDir, dirs[i]);
-                final String[] files = pd.list(new FilenameFilter () {
-                        public boolean accept(final File dir1, final String name) {
-                            return name.endsWith(".java")
-                                || (includeNoSourcePackages
-                                    && name.equals("package.html"));
-                        }
-                    });
+                final String[] files = pd.list((dir1,
+                    name) -> name.endsWith(".java") || (includeNoSourcePackages
+                        && name.equals("package.html")));
 
                 if (files.length > 0) {
                     if ("".equals(dirs[i])) {
                         log(baseDir
-                            + " contains source files in the default package,"
-                            + " you must specify them as source files"
-                            + " not packages.",
+                            + " contains source files in the default package, you must specify them as source files not packages.",
                             Project.MSG_WARN);
                     } else {
                         containsPackages = true;
@@ -2455,7 +2396,7 @@
                             dirs[i].replace(File.separatorChar, '.');
                         if (!addedPackages.contains(packageName)) {
                             addedPackages.add(packageName);
-                            pn.addElement(packageName);
+                            pn.add(packageName);
                         }
                     }
                 }
@@ -2480,14 +2421,13 @@
                 Project.MSG_VERBOSE);
             return;
         }
-        final String fixData;
         final InputStream in = Javadoc.class
             .getResourceAsStream("javadoc-frame-injections-fix.txt");
         if (in == null) {
-            throw new FileNotFoundException("Missing resource "
-                                            + "'javadoc-frame-injections-fix.txt' in "
-                                            + "classpath.");
+            throw new FileNotFoundException(
+                "Missing resource 'javadoc-frame-injections-fix.txt' in classpath.");
         }
+        final String fixData;
         try {
             fixData =
                 fixLineFeeds(FileUtils
@@ -2520,14 +2460,10 @@
             : FILE_UTILS.getDefaultEncoding();
         // we load the whole file as one String (toc/index files are
         // generally small, because they only contain frameset declaration):
-        final InputStream fin = new FileInputStream(file);
         String fileContents;
-        try {
-            fileContents =
-                fixLineFeeds(FileUtils
-                             .safeReadFully(new InputStreamReader(fin, enc)));
-        } finally {
-            FileUtils.close(fin);
+        try (InputStreamReader reader =
+            new InputStreamReader(Files.newInputStream(file.toPath()), enc)) {
+            fileContents = fixLineFeeds(FileUtils.safeReadFully(reader));
         }
 
         // check if file may be vulnerable because it was not
@@ -2536,14 +2472,11 @@
             // we need to patch the file!
             final String patchedFileContents = patchContent(fileContents, fixData);
             if (!patchedFileContents.equals(fileContents)) {
-                final FileOutputStream fos = new FileOutputStream(file);
-                try {
-                    final OutputStreamWriter w = new OutputStreamWriter(fos, enc);
+                try (final OutputStreamWriter w =
+                    new OutputStreamWriter(Files.newOutputStream(file.toPath()), enc)) {
                     w.write(patchedFileContents);
                     w.close();
                     return 1;
-                } finally {
-                    FileUtils.close(fos);
                 }
             }
         }
@@ -2602,7 +2535,6 @@
             }
         }
 
-
         protected void logFlush() {
             if (queuedLine != null) {
                 super.processLine(queuedLine, Project.MSG_VERBOSE);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Java.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Java.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Java.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Java.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,8 +20,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.util.Vector;
 
 import org.apache.tools.ant.BuildException;
@@ -52,6 +50,8 @@
  * @ant.task category="java"
  */
 public class Java extends Task {
+    private static final String TIMEOUT_MESSAGE =
+            "Timeout: killed the sub-process";
 
     private CommandlineJava cmdl = new CommandlineJava();
     private Environment env = new Environment();
@@ -78,9 +78,6 @@
     private boolean spawn = false;
     private boolean incompatibleWithSpawn = false;
 
-    private static final String TIMEOUT_MESSAGE =
-        "Timeout: killed the sub-process";
-
     /**
      * Normal constructor
      */
@@ -100,6 +97,7 @@
      * @throws BuildException if failOnError is set to true and the application
      * returns a nonzero result code.
      */
+    @Override
     public void execute() throws BuildException {
         File savedDir = dir;
         Permissions savedPermissions = perm;
@@ -148,30 +146,32 @@
             throw new BuildException("Classname must not be null.");
         }
         if (!fork && getCommandLine().getJar() != null) {
-            throw new BuildException("Cannot execute a jar in non-forked mode."
-                                     + " Please set fork='true'. ");
+            throw new BuildException(
+                "Cannot execute a jar in non-forked mode. Please set fork='true'. ");
         }
         if (!fork && getCommandLine().getModule() != null) {
-            throw new BuildException("Cannot execute a module in non-forked mode."
-                                     + " Please set fork='true'. ");
+            throw new BuildException(
+                "Cannot execute a module in non-forked mode. Please set fork='true'. ");
         }
         if (spawn && !fork) {
-            throw new BuildException("Cannot spawn a java process in non-forked mode."
-                                     + " Please set fork='true'. ");
+            throw new BuildException(
+                "Cannot spawn a java process in non-forked mode. Please set fork='true'. ");
         }
         if (getCommandLine().getClasspath() != null
             && getCommandLine().getJar() != null) {
-            log("When using 'jar' attribute classpath-settings are ignored. "
-                + "See the manual for more information.", Project.MSG_VERBOSE);
+            log("When using 'jar' attribute classpath-settings are ignored. See the manual for more information.",
+                Project.MSG_VERBOSE);
         }
         if (spawn && incompatibleWithSpawn) {
-            getProject().log("spawn does not allow attributes related to input, "
-            + "output, error, result", Project.MSG_ERR);
+            getProject().log(
+                "spawn does not allow attributes related to input, output, error, result",
+                Project.MSG_ERR);
             getProject().log("spawn also does not allow timeout", Project.MSG_ERR);
-            getProject().log("finally, spawn is not compatible "
-                + "with a nested I/O <redirector>", Project.MSG_ERR);
-            throw new BuildException("You have used an attribute "
-                + "or nested element which is not compatible with spawn");
+            getProject().log(
+                "finally, spawn is not compatible with a nested I/O <redirector>",
+                Project.MSG_ERR);
+            throw new BuildException(
+                "You have used an attribute or nested element which is not compatible with spawn");
         }
         if (getCommandLine().getAssertions() != null && !fork) {
             log("Assertion statements are currently ignored in non-forked mode");
@@ -191,8 +191,8 @@
                     Project.MSG_WARN);
             }
             if (newEnvironment || null != env.getVariables()) {
-                log("Changes to environment variables are ignored when same "
-                    + "JVM is used.", Project.MSG_WARN);
+                log("Changes to environment variables are ignored when same JVM is used.",
+                    Project.MSG_WARN);
             }
             if (getCommandLine().getBootclasspath() != null) {
                 log("bootclasspath ignored when same JVM is used.",
@@ -217,19 +217,17 @@
     protected int executeJava(CommandlineJava commandLine) {
         try {
             if (fork) {
-                if (!spawn) {
-                    return fork(commandLine.getCommandline());
-                } else {
+                if (spawn) {
                     spawn(commandLine.getCommandline());
                     return 0;
                 }
-            } else {
-                try {
-                    run(commandLine);
-                    return 0;
-                } catch (ExitException ex) {
-                    return ex.getStatus();
-                }
+                return fork(commandLine.getCommandline());
+            }
+            try {
+                run(commandLine);
+                return 0;
+            } catch (ExitException ex) {
+                return ex.getStatus();
             }
         } catch (BuildException e) {
             if (e.getLocation() == null && getLocation() != null) {
@@ -237,23 +235,21 @@
             }
             if (failOnError) {
                 throw e;
+            }
+            if (TIMEOUT_MESSAGE.equals(e.getMessage())) {
+                log(TIMEOUT_MESSAGE);
             } else {
-                if (TIMEOUT_MESSAGE.equals(e.getMessage())) {
-                    log(TIMEOUT_MESSAGE);
-                } else {
-                    log(e);
-                }
-                return -1;
+                log(e);
             }
+            return -1;
         } catch (ThreadDeath t) {
             throw t; // cf. NB #47191
         } catch (Throwable t) {
             if (failOnError) {
                 throw new BuildException(t, getLocation());
-            } else {
-                log(t);
-                return -1;
             }
+            log(t);
+            return -1;
         }
     }
 
@@ -363,8 +359,8 @@
      */
     public void setJar(File jarfile) throws BuildException {
         if (getCommandLine().getClassname() != null || getCommandLine().getModule() != null) {
-            throw new BuildException("Cannot use 'jar' with 'classname' or 'module' "
-                                     + "attributes in same command.");
+            throw new BuildException(
+                "Cannot use 'jar' with 'classname' or 'module' attributes in same command.");
         }
         getCommandLine().setJar(jarfile.getAbsolutePath());
     }
@@ -378,8 +374,8 @@
      */
     public void setClassname(String s) throws BuildException {
         if (getCommandLine().getJar() != null) {
-            throw new BuildException("Cannot use 'jar' and 'classname' "
-                                     + "attributes in same command");
+            throw new BuildException(
+                "Cannot use 'jar' and 'classname' attributes in same command");
         }
         getCommandLine().setClassname(s);
     }
@@ -394,8 +390,8 @@
      */
     public void setModule(String module) throws BuildException {
         if (getCommandLine().getJar() != null) {
-            throw new BuildException("Cannot use 'jar' and 'module' "
-                                     + "attributes in same command");
+            throw new BuildException(
+                "Cannot use 'jar' and 'module' attributes in same command");
         }
         getCommandLine().setModule(module);
     }
@@ -409,8 +405,8 @@
      * @ant.attribute ignore="true"
      */
     public void setArgs(String s) {
-        log("The args attribute is deprecated. "
-            + "Please use nested arg elements.", Project.MSG_WARN);
+        log("The args attribute is deprecated. Please use nested arg elements.",
+            Project.MSG_WARN);
         getCommandLine().createArgument().setLine(s);
     }
 
@@ -477,8 +473,8 @@
      * @param s jvmargs.
      */
     public void setJvmargs(String s) {
-        log("The jvmargs attribute is deprecated. "
-            + "Please use nested jvmarg elements.", Project.MSG_WARN);
+        log("The jvmargs attribute is deprecated. Please use nested jvmarg elements.",
+            Project.MSG_WARN);
         getCommandLine().createVmArgument().setLine(s);
     }
 
@@ -559,8 +555,8 @@
      */
     public void setInput(File input) {
         if (inputString != null) {
-            throw new BuildException("The \"input\" and \"inputstring\" "
-                + "attributes cannot both be specified");
+            throw new BuildException(
+                "The \"input\" and \"inputstring\" attributes cannot both be specified");
         }
         this.input = input;
         incompatibleWithSpawn = true;
@@ -573,8 +569,8 @@
      */
     public void setInputString(String inputString) {
         if (input != null) {
-            throw new BuildException("The \"input\" and \"inputstring\" "
-                + "attributes cannot both be specified");
+            throw new BuildException(
+                "The \"input\" and \"inputstring\" attributes cannot both be specified");
         }
         this.inputString = inputString;
         incompatibleWithSpawn = true;
@@ -728,6 +724,7 @@
      *
      * @since Ant 1.5
      */
+    @Override
     protected void handleOutput(String output) {
         if (redirector.getOutputStream() != null) {
             redirector.handleOutput(output);
@@ -748,6 +745,7 @@
      * @exception IOException if the data cannot be read.
      * @since Ant 1.6
      */
+    @Override
     public int handleInput(byte[] buffer, int offset, int length)
         throws IOException {
         // Should work whether or not redirector.inputStream == null:
@@ -761,6 +759,7 @@
      *
      * @since Ant 1.5.2
      */
+    @Override
     protected void handleFlush(String output) {
         if (redirector.getOutputStream() != null) {
             redirector.handleFlush(output);
@@ -776,6 +775,7 @@
      *
      * @since Ant 1.5
      */
+    @Override
     protected void handleErrorOutput(String output) {
         if (redirector.getErrorStream() != null) {
             redirector.handleErrorOutput(output);
@@ -791,6 +791,7 @@
      *
      * @since Ant 1.5.2
      */
+    @Override
     protected void handleErrorFlush(String output) {
         if (redirector.getErrorStream() != null) {
             redirector.handleErrorFlush(output);
@@ -897,8 +898,8 @@
     private void setupEnvironment(Execute exe) {
         String[] environment = env.getVariables();
         if (environment != null) {
-            for (int i = 0; i < environment.length; i++) {
-                log("Setting environment variable: " + environment[i],
+            for (String element : environment) {
+                log("Setting environment variable: " + element,
                     Project.MSG_VERBOSE);
             }
         }
@@ -914,7 +915,7 @@
     private void setupWorkingDir(Execute exe) {
         if (dir == null) {
             dir = getProject().getBaseDir();
-        } else if (!dir.exists() || !dir.isDirectory()) {
+        } else if (!dir.isDirectory()) {
             throw new BuildException(dir.getAbsolutePath()
                                      + " is not a valid directory",
                                      getLocation());
@@ -962,10 +963,7 @@
     protected void run(String classname, Vector<String> args) throws BuildException {
         CommandlineJava cmdj = new CommandlineJava();
         cmdj.setClassname(classname);
-        final int size = args.size();
-        for (int i = 0; i < size; i++) {
-            cmdj.createArgument().setValue(args.elementAt(i));
-        }
+        args.forEach(arg -> cmdj.createArgument().setValue(arg));
         run(cmdj);
     }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/JDBCTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -24,7 +24,6 @@
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
@@ -98,7 +97,7 @@
      * getting an OutOfMemoryError when calling this task
      * multiple times in a row.
      */
-    private static Hashtable<String, AntClassLoader> LOADER_MAP = new Hashtable<String, AntClassLoader>(HASH_TABLE_SIZE);
+    private static Hashtable<String, AntClassLoader> LOADER_MAP = new Hashtable<>(HASH_TABLE_SIZE);
 
     private boolean caching = true;
 
@@ -152,7 +151,7 @@
      *
      * @since Ant 1.8.0
      */
-    private List<Property> connectionProperties = new ArrayList<Property>();
+    private List<Property> connectionProperties = new ArrayList<>();
 
     /**
      * Sets the classpath for loading the driver.
@@ -344,20 +343,17 @@
             throw new BuildException("Url attribute must be set!", getLocation());
         }
         try {
-
             log("connecting to " + getUrl(), Project.MSG_VERBOSE);
             Properties info = new Properties();
             info.put("user", getUserId());
             info.put("password", getPassword());
 
-            for (Iterator<Property> props = connectionProperties.iterator();
-                 props.hasNext();) {
-                Property p = props.next();
+            for (Property p : connectionProperties) {
                 String name = p.getName();
                 String value = p.getValue();
                 if (name == null || value == null) {
-                    log("Only name/value pairs are supported as connection"
-                        + " properties.", Project.MSG_WARN);
+                    log("Only name/value pairs are supported as connection properties.",
+                        Project.MSG_WARN);
                 } else {
                     log("Setting connection property " + name + " to " + value,
                         Project.MSG_VERBOSE);
@@ -376,14 +372,12 @@
             return conn;
         } catch (SQLException e) {
             // failed to connect
-            if (!failOnConnectionError) {
-                log("Failed to connect: " + e.getMessage(), Project.MSG_WARN);
-                return null;
-            } else {
+            if (failOnConnectionError) {
                 throw new BuildException(e, getLocation());
             }
+            log("Failed to connect: " + e.getMessage(), Project.MSG_WARN);
+            return null;
         }
-
     }
 
     /**
@@ -397,9 +391,9 @@
             throw new BuildException("Driver attribute must be set!", getLocation());
         }
 
-        Driver driverInstance = null;
+        Driver driverInstance;
         try {
-            Class<?> dc;
+            Class<? extends Driver> dc;
             if (classpath != null) {
                 // check first that it is not already loaded otherwise
                 // consecutive runs seems to end into an OutOfMemoryError
@@ -425,13 +419,13 @@
                                 Project.MSG_VERBOSE);
                     }
                 }
-                dc = loader.loadClass(driver);
+                dc = loader.loadClass(driver).asSubclass(Driver.class);
             } else {
                 log("Loading " + driver + " using system loader.",
                     Project.MSG_VERBOSE);
-                dc = Class.forName(driver);
+                dc = Class.forName(driver).asSubclass(Driver.class);
             }
-            driverInstance = (Driver) dc.newInstance();
+            driverInstance = dc.newInstance();
         } catch (ClassNotFoundException e) {
             throw new BuildException(
                     "Class Not Found: JDBC driver " + driver + " could not be loaded",
@@ -451,7 +445,6 @@
         return driverInstance;
     }
 
-
     /**
      * Set the caching attribute.
      * @param value a <code>boolean</code> value
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Jikes.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Jikes.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Jikes.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Jikes.java	2018-03-24 12:37:12.000000000 +0000
@@ -38,6 +38,7 @@
  * @deprecated since 1.2.
  *             Merged into the class Javac.
  */
+@Deprecated
 public class Jikes {
     // There have been reports that 300 files could be compiled
     // on a command line so 250 is a conservative approach
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java	2018-03-24 12:37:12.000000000 +0000
@@ -38,6 +38,7 @@
  * @deprecated since 1.2.
  *             Use Jikes' exit value to detect compilation failure.
  */
+@Deprecated
 public class JikesOutputParser implements ExecuteStreamHandler {
     // CheckStyle:VisibilityModifier OFF - bc
     protected Task task;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/KeySubst.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/KeySubst.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/KeySubst.java	2018-03-24 12:37:12.000000000 +0000
@@ -43,6 +43,7 @@
  * @deprecated KeySubst is deprecated since Ant 1.1. Use Filter + Copy
  * instead.
  */
+@Deprecated
 public class KeySubst extends Task {
     private File source = null;
     private File dest = null;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/launcher/CommandLauncher.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/launcher/CommandLauncher.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/launcher/CommandLauncher.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/launcher/CommandLauncher.java	2018-03-24 12:37:13.000000000 +0000
@@ -22,6 +22,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Optional;
 
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.condition.Os;
@@ -41,7 +42,7 @@
     private static CommandLauncher shellLauncher = null;
 
     static {
-        if(!Os.isFamily("os/2")) {
+        if (!Os.isFamily("os/2")) {
             vmLauncher = new Java13CommandLauncher();
         }
 
@@ -94,7 +95,7 @@
      */
     public Process exec(Project project, String[] cmd, String[] env)
         throws IOException {
-        if(project != null) {
+        if (project != null) {
             project.log("Execute:CommandLauncher: "
                 + Commandline.describeCommand(cmd), Project.MSG_DEBUG);
         }
@@ -124,8 +125,8 @@
         if (workingDir == null) {
             return exec(project, cmd, env);
         }
-        throw new IOException("Cannot execute a process in different "
-            + "directory under this JVM");
+        throw new IOException(
+            "Cannot execute a process in different directory under this JVM");
     }
 
     /**
@@ -163,37 +164,24 @@
 
     private static CommandLauncher extractLauncher(String referenceName,
                                                    Project project) {
-        CommandLauncher launcher = null;
-        if (project != null) {
-            launcher = (CommandLauncher) project.getReference(referenceName);
-        }
-
-        if (launcher == null) {
-            launcher = getSystemLauncher(referenceName);
-        }
-        return launcher;
+        return Optional.ofNullable(project)
+            .map(p -> p.<CommandLauncher> getReference(referenceName))
+            .orElseGet(() -> getSystemLauncher(referenceName));
     }
 
     private static CommandLauncher getSystemLauncher(String launcherRefId) {
-        CommandLauncher launcher = null;
         String launcherClass = System.getProperty(launcherRefId);
         if (launcherClass != null) {
             try {
-                launcher = (CommandLauncher) Class.forName(launcherClass)
-                    .newInstance();
-            } catch(InstantiationException e) {
-                System.err.println("Could not instantiate launcher class "
-                                   + launcherClass + ": " + e.getMessage());
-            } catch(IllegalAccessException e) {
-                System.err.println("Could not instantiate launcher class "
-                                   + launcherClass + ": " + e.getMessage());
-            } catch(ClassNotFoundException e) {
+                return Class.forName(launcherClass)
+                    .asSubclass(CommandLauncher.class).newInstance();
+            } catch (InstantiationException | IllegalAccessException
+                    | ClassNotFoundException e) {
                 System.err.println("Could not instantiate launcher class "
-                                   + launcherClass + ": " + e.getMessage());
+                    + launcherClass + ": " + e.getMessage());
             }
         }
-
-        return launcher;
+        return null;
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/launcher/PerlScriptCommandLauncher.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/launcher/PerlScriptCommandLauncher.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/launcher/PerlScriptCommandLauncher.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/launcher/PerlScriptCommandLauncher.java	2018-03-24 12:37:13.000000000 +0000
@@ -58,15 +58,14 @@
             if (workingDir == null) {
                 return exec(project, cmd, env);
             }
-            throw new IOException("Cannot locate antRun script: "
-                                  + "No project provided");
+            throw new IOException(
+                "Cannot locate antRun script: No project provided");
         }
         // Locate the auxiliary script
         String antHome = project.getProperty(MagicNames.ANT_HOME);
         if (antHome == null) {
-            throw new IOException("Cannot locate antRun script: "
-                                  + "Property '" + MagicNames.ANT_HOME
-                                  + "' not found");
+            throw new IOException("Cannot locate antRun script: Property '"
+                + MagicNames.ANT_HOME + "' not found");
         }
         String antRun = FILE_UTILS.resolveFile(project.getBaseDir(),
                                                antHome + File.separator
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/launcher/ScriptCommandLauncher.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/launcher/ScriptCommandLauncher.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/launcher/ScriptCommandLauncher.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/launcher/ScriptCommandLauncher.java	2018-03-24 12:37:13.000000000 +0000
@@ -58,15 +58,14 @@
             if (workingDir == null) {
                 return exec(project, cmd, env);
             }
-            throw new IOException("Cannot locate antRun script: "
-                                  + "No project provided");
+            throw new IOException(
+                "Cannot locate antRun script: No project provided");
         }
         // Locate the auxiliary script
         String antHome = project.getProperty(MagicNames.ANT_HOME);
         if (antHome == null) {
-            throw new IOException("Cannot locate antRun script: "
-                                  + "Property '" + MagicNames.ANT_HOME
-                                  + "' not found");
+            throw new IOException("Cannot locate antRun script: Property '"
+                + MagicNames.ANT_HOME + "' not found");
         }
         String antRun = FILE_UTILS.resolveFile(project.getBaseDir(),
                                                antHome + File.separator
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/launcher/VmsCommandLauncher.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/launcher/VmsCommandLauncher.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/launcher/VmsCommandLauncher.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/launcher/VmsCommandLauncher.java	2018-03-24 12:37:12.000000000 +0000
@@ -32,10 +32,6 @@
  */
 public class VmsCommandLauncher extends Java13CommandLauncher {
 
-    public VmsCommandLauncher() {
-        super();
-    }
-
     /**
      * Launches the given command in a new process.
      *
@@ -53,7 +49,8 @@
     public Process exec(Project project, String[] cmd, String[] env)
         throws IOException {
         File cmdFile = createCommandFile(cmd, env);
-        Process p = super.exec(project, new String[] {cmdFile.getPath()}, env);
+        Process p =
+            super.exec(project, new String[] {cmdFile.getPath()}, env);
         deleteAfter(cmdFile, p);
         return p;
     }
@@ -80,7 +77,8 @@
     public Process exec(Project project, String[] cmd, String[] env,
                         File workingDir) throws IOException {
         File cmdFile = createCommandFile(cmd, env);
-        Process p = super.exec(project, new String[] {cmdFile.getPath()}, env, workingDir);
+        Process p = super.exec(project, new String[] {cmdFile.getPath()}, env,
+            workingDir);
         deleteAfter(cmdFile, p);
         return p;
     }
@@ -96,9 +94,7 @@
     private File createCommandFile(String[] cmd, String[] env)
         throws IOException {
         File script = FILE_UTILS.createTempFile("ANT", ".COM", null, true, true);
-        BufferedWriter out = null;
-        try {
-            out = new BufferedWriter(new FileWriter(script));
+        try (BufferedWriter out = new BufferedWriter(new FileWriter(script))) {
 
             // add the environment as logicals to the DCL script
             if (env != null) {
@@ -121,8 +117,6 @@
                 out.newLine();
                 out.write(cmd[i]);
             }
-        } finally {
-            FileUtils.close(out);
         }
         return script;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Length.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Length.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Length.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Length.java	2018-03-24 12:37:12.000000000 +0000
@@ -108,7 +108,7 @@
      * @param ell the long length to compare with.
      */
     public synchronized void setLength(long ell) {
-        length = new Long(ell);
+        length = Long.valueOf(ell);
     }
 
     /**
@@ -152,7 +152,7 @@
      * @param trim <code>boolean</code>.
      */
     public synchronized void setTrim(boolean trim) {
-        this.trim = trim ? Boolean.TRUE : Boolean.FALSE;
+        this.trim = Boolean.valueOf(trim);
     }
 
     /**
@@ -160,25 +160,31 @@
      * @return boolean trim setting.
      */
     public boolean getTrim() {
-        return trim != null && trim.booleanValue();
+        return Boolean.TRUE.equals(trim);
     }
 
     /**
      * Execute the length task.
      */
+    @Override
     public void execute() {
         validate();
-        PrintStream ps = new PrintStream((property != null)
-            ? (OutputStream) new PropertyOutputStream(getProject(), property)
-            : (OutputStream) new LogOutputStream(this, Project.MSG_INFO));
+        OutputStream out =
+            property == null ? new LogOutputStream(this, Project.MSG_INFO)
+                : new PropertyOutputStream(getProject(), property);
+        PrintStream ps = new PrintStream(out);
 
-        if (STRING.equals(mode)) {
+        switch (mode) {
+        case STRING:
             ps.print(getLength(string, getTrim()));
             ps.close();
-        } else if (EACH.equals(mode)) {
+            break;
+        case EACH:
             handleResources(new EachHandler(ps));
-        } else if (ALL.equals(mode)) {
+            break;
+        case ALL:
             handleResources(new AllHandler(ps));
+            break;
         }
     }
 
@@ -187,6 +193,7 @@
      * @return true if the condition is true.
      * @throws BuildException if an error occurs.
      */
+    @Override
     public boolean eval() {
         validate();
         if (length == null) {
@@ -194,11 +201,11 @@
         }
         Long ell;
         if (STRING.equals(mode)) {
-            ell = new Long(getLength(string, getTrim()));
+            ell = Long.valueOf(getLength(string, getTrim()));
         } else {
             AccumHandler h = new AccumHandler();
             handleResources(h);
-            ell = new Long(h.getAccum());
+            ell = Long.valueOf(h.getAccum());
         }
         return when.evaluate(ell.compareTo(length));
     }
@@ -206,25 +213,26 @@
     private void validate() {
         if (string != null) {
             if (resources != null) {
-                throw new BuildException("the string length function"
-                    + " is incompatible with the file/resource length function");
+                throw new BuildException(
+                    "the string length function is incompatible with the file/resource length function");
             }
             if (!(STRING.equals(mode))) {
-                throw new BuildException("the mode attribute is for use"
-                    + " with the file/resource length function");
+                throw new BuildException(
+                    "the mode attribute is for use with the file/resource length function");
             }
         } else if (resources != null) {
             if (!(EACH.equals(mode) || ALL.equals(mode))) {
-                throw new BuildException("invalid mode setting for"
-                    + " file/resource length function: \"" + mode + "\"");
-            } else if (trim != null) {
-                throw new BuildException("the trim attribute is"
-                    + " for use with the string length function only");
+                throw new BuildException(
+                    "invalid mode setting for file/resource length function: \""
+                        + mode + "\"");
+            }
+            if (trim != null) {
+                throw new BuildException(
+                    "the trim attribute is for use with the string length function only");
             }
         } else {
-            throw new BuildException("you must set either the string attribute"
-                + " or specify one or more files using the file attribute or"
-                + " nested resource collections");
+            throw new BuildException(
+                "you must set either the string attribute or specify one or more files using the file attribute or nested resource collections");
         }
     }
 
@@ -253,6 +261,7 @@
          * Return the possible values for FileMode.
          * @return <code>String[]</code>.
          */
+        @Override
         public String[] getValues() {
             return MODES;
         }
@@ -268,6 +277,7 @@
 
     private abstract class Handler {
         private PrintStream ps;
+
         Handler(PrintStream ps) {
             this.ps = ps;
         }
@@ -287,6 +297,8 @@
         EachHandler(PrintStream ps) {
             super(ps);
         }
+
+        @Override
         protected void handle(Resource r) {
             getPs().print(r.toString());
             getPs().print(" : ");
@@ -306,12 +318,16 @@
         AccumHandler() {
             super(null);
         }
+
         protected AccumHandler(PrintStream ps) {
             super(ps);
         }
+
         protected long getAccum() {
             return accum;
         }
+
+        @Override
         protected synchronized void handle(Resource r) {
             long size = r.getSize();
             if (size == Resource.UNKNOWN_SIZE) {
@@ -326,6 +342,8 @@
         AllHandler(PrintStream ps) {
             super(ps);
         }
+
+        @Override
         void complete() {
             getPs().print(getAccum());
             super.complete();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java	2018-03-24 12:37:12.000000000 +0000
@@ -22,7 +22,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.Reader;
+import java.nio.charset.Charset;
+import java.util.List;
 import java.util.Properties;
 import java.util.Vector;
 
@@ -30,6 +31,7 @@
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.filters.util.ChainReaderHelper;
+import org.apache.tools.ant.filters.util.ChainReaderHelper.ChainReader;
 import org.apache.tools.ant.types.FilterChain;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
@@ -37,7 +39,6 @@
 import org.apache.tools.ant.types.ResourceCollection;
 import org.apache.tools.ant.types.resources.FileResource;
 import org.apache.tools.ant.types.resources.JavaResource;
-import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.ResourceUtils;
 
 /**
@@ -56,7 +57,7 @@
     /**
      * Holds filterchains
      */
-    private final Vector<FilterChain> filterChains = new Vector<FilterChain>();
+    private final List<FilterChain> filterChains = new Vector<>();
 
     /**
      * Encoding to use for input; defaults to the platform's default encoding.
@@ -159,6 +160,7 @@
      *
      * @exception BuildException if something goes wrong with the build
      */
+    @Override
     public final void execute() throws BuildException {
         //validation
         if (src == null) {
@@ -172,30 +174,21 @@
             }
             throw new BuildException("Source resource does not exist: " + src);
         }
-        BufferedInputStream bis = null;
-        Reader instream = null;
-        ByteArrayInputStream tis = null;
-
-        try {
-            bis = new BufferedInputStream(src.getInputStream());
-            if (encoding == null) {
-                instream = new InputStreamReader(bis);
-            } else {
-                instream = new InputStreamReader(bis, encoding);
-            }
-            ChainReaderHelper crh = new ChainReaderHelper();
-            crh.setPrimaryReader(instream);
-            crh.setFilterChains(filterChains);
-            crh.setProject(getProject());
-            instream = crh.getAssembledReader();
 
-            String text = crh.readFully(instream);
+        Charset charset = encoding == null ? Charset.defaultCharset() : Charset.forName(encoding);
+
+        try (ChainReader instream = new ChainReaderHelper(getProject(),
+            new InputStreamReader(new BufferedInputStream(src.getInputStream()), charset), filterChains)
+                .getAssembledReader()) {
+
+            String text = instream.readFully();
 
-            if (text != null && text.length() != 0) {
+            if (!(text == null || text.isEmpty())) {
                 if (!text.endsWith("\n")) {
                     text = text + "\n";
                 }
-                tis = new ByteArrayInputStream(text.getBytes(ResourceUtils.ISO_8859_1));
+                ByteArrayInputStream tis = new ByteArrayInputStream(
+                    text.getBytes(ResourceUtils.ISO_8859_1));
                 final Properties props = new Properties();
                 props.load(tis);
 
@@ -207,9 +200,6 @@
             }
         } catch (final IOException ioe) {
             throw new BuildException("Unable to load file: " + ioe, ioe, getLocation());
-        } finally {
-            FileUtils.close(bis);
-            FileUtils.close(tis);
         }
     }
 
@@ -218,7 +208,7 @@
      * @param filter the filter to add
      */
     public final void addFilterChain(FilterChain filter) {
-        filterChains.addElement(filter);
+        filterChains.add(filter);
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/LoadResource.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/LoadResource.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/LoadResource.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/LoadResource.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,19 +19,18 @@
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.Reader;
+import java.nio.charset.Charset;
+import java.util.List;
 import java.util.Vector;
-
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.filters.util.ChainReaderHelper;
+import org.apache.tools.ant.filters.util.ChainReaderHelper.ChainReader;
 import org.apache.tools.ant.types.FilterChain;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
-import org.apache.tools.ant.util.FileUtils;
 
 /**
  * Load a resource into a property
@@ -70,7 +69,7 @@
     /**
      * Holds FilterChains
      */
-    private final Vector<FilterChain> filterChains = new Vector<FilterChain>();
+    private final List<FilterChain> filterChains = new Vector<>();
 
     /**
      * Encoding to use for input, defaults to the platform's default
@@ -124,6 +123,7 @@
      *
      * @exception BuildException if something goes wrong with the build
      */
+    @Override
     public final void execute()
         throws BuildException {
         //validation
@@ -134,82 +134,67 @@
             throw new BuildException("output property not defined");
         }
         if (quiet && failOnError) {
-            throw new BuildException("quiet and failonerror cannot both be "
-                                     + "set to true");
+            throw new BuildException("quiet and failonerror cannot both be set to true");
         }
         if (!src.isExists()) {
             String message = src + " doesn't exist";
             if (failOnError) {
                 throw new BuildException(message);
-            } else {
-                log(message, quiet ? Project.MSG_WARN : Project.MSG_ERR);
-                return;
             }
+            log(message, quiet ? Project.MSG_WARN : Project.MSG_ERR);
+            return;
         }
-        InputStream is = null;
-        BufferedInputStream bis = null;
-        Reader instream = null;
+
         log("loading " + src + " into property " + property,
             Project.MSG_VERBOSE);
+
+        Charset charset = encoding == null ? Charset.defaultCharset()
+            : Charset.forName(encoding);
         try {
             final long len = src.getSize();
-            log("resource size = "
-                + (len != Resource.UNKNOWN_SIZE ? String.valueOf(len)
-                   : "unknown"), Project.MSG_DEBUG);
+            log("resource size = " + (len != Resource.UNKNOWN_SIZE
+                ? String.valueOf(len) : "unknown"), Project.MSG_DEBUG);
             //discard most of really big resources
             final int size = (int) len;
             //open up the resource
-            is = src.getInputStream();
-            bis = new BufferedInputStream(is);
-            if (encoding == null) {
-                instream = new InputStreamReader(bis);
-            } else {
-                instream = new InputStreamReader(bis, encoding);
-            }
 
-            String text = "";
+            String text;
             if (size != 0) {
-                ChainReaderHelper crh = new ChainReaderHelper();
-                if (len != Resource.UNKNOWN_SIZE) {
-                    crh.setBufferSize(size);
-                }
-                crh.setPrimaryReader(instream);
-                crh.setFilterChains(filterChains);
-                crh.setProject(getProject());
-                instream = crh.getAssembledReader();
+                try (ChainReader chainReader = new ChainReaderHelper(
+                    getProject(),
+                    new InputStreamReader(
+                        new BufferedInputStream(src.getInputStream()), charset),
+                    filterChains).with(crh -> {
+                        if (src.getSize() != Resource.UNKNOWN_SIZE) {
+                            crh.setBufferSize(size);
+                        }
+                    }).getAssembledReader()) {
 
-                text = crh.readFully(instream);
+                    text = chainReader.readFully();
+                }
             } else {
                 log("Do not set property " + property + " as its length is 0.",
                     quiet ? Project.MSG_VERBOSE : Project.MSG_INFO);
+                text = null;
             }
 
-            if (text != null) {
-                if (text.length() > 0) {
-                    getProject().setNewProperty(property, text);
-                    log("loaded " + text.length() + " characters",
-                        Project.MSG_VERBOSE);
-                    log(property + " := " + text, Project.MSG_DEBUG);
-                }
+            if (!(text == null || text.isEmpty())) {
+                getProject().setNewProperty(property, text);
+                log("loaded " + text.length() + " characters",
+                    Project.MSG_VERBOSE);
+                log(property + " := " + text, Project.MSG_DEBUG);
             }
-
         } catch (final IOException ioe) {
-            final String message = "Unable to load resource: "
-                + ioe.toString();
+            final String message = "Unable to load resource: " + ioe;
             if (failOnError) {
                 throw new BuildException(message, ioe, getLocation());
-            } else {
-                log(message, quiet ? Project.MSG_VERBOSE : Project.MSG_ERR);
             }
+            log(message, quiet ? Project.MSG_VERBOSE : Project.MSG_ERR);
         } catch (final BuildException be) {
             if (failOnError) {
                 throw be;
-            } else {
-                log(be.getMessage(),
-                    quiet ? Project.MSG_VERBOSE : Project.MSG_ERR);
             }
-        } finally {
-            FileUtils.close(is);
+            log(be.getMessage(), quiet ? Project.MSG_VERBOSE : Project.MSG_ERR);
         }
     }
 
@@ -218,7 +203,7 @@
      * @param filter the filter to add
      */
     public final void addFilterChain(FilterChain filter) {
-        filterChains.addElement(filter);
+        filterChains.add(filter);
     }
 
     /**
@@ -227,8 +212,8 @@
      */
     public void addConfigured(ResourceCollection a) {
         if (a.size() != 1) {
-            throw new BuildException("only single argument resource collections"
-                                     + " are supported");
+            throw new BuildException(
+                "only single argument resource collections are supported");
         }
         src = a.iterator().next();
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,11 +18,9 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import java.io.IOException;
-
-import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.ProjectComponent;
 import org.apache.tools.ant.Task;
+import org.apache.tools.ant.util.FileUtils;
 
 /**
  * Logs standard output and error of a subprocess to the log system of ant.
@@ -57,14 +55,10 @@
     /**
      * Stop the log stream handler.
      */
+    @Override
     public void stop() {
         super.stop();
-        try {
-            getErr().close();
-            getOut().close();
-        } catch (IOException e) {
-            // plain impossible
-            throw new BuildException(e);
-        }
+        FileUtils.close(getErr());
+        FileUtils.close(getOut());
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/MacroDef.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/MacroDef.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/MacroDef.java	2018-03-24 12:37:12.000000000 +0000
@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 
 import org.apache.tools.ant.AntTypeDefinition;
 import org.apache.tools.ant.BuildException;
@@ -42,13 +43,13 @@
 public class MacroDef extends AntlibDefinition  {
 
     private NestedSequential nestedSequential;
-    private String     name;
-    private boolean    backTrace = true;
-    private List<Attribute>       attributes = new ArrayList<Attribute>();
-    private Map<String, TemplateElement>        elements   = new HashMap<String, TemplateElement>();
-    private String     textName   = null;
-    private Text       text       = null;
-    private boolean    hasImplicitElement = false;
+    private String name;
+    private boolean backTrace = true;
+    private List<Attribute> attributes = new ArrayList<>();
+    private Map<String, TemplateElement> elements = new HashMap<>();
+    private String textName = null;
+    private Text text = null;
+    private boolean hasImplicitElement = false;
 
     /**
      * Name of the definition
@@ -76,8 +77,8 @@
         for (Attribute attribute : attributes) {
             if (text.getName().equals(attribute.getName())) {
                 throw new BuildException(
-                    "the name \"" + text.getName()
-                    + "\" is already used as an attribute");
+                    "the name \"%s\" is already used as an attribute",
+                    text.getName());
             }
         }
         this.text = text;
@@ -132,13 +133,14 @@
      * This is a simple task container.
      */
     public static class NestedSequential implements TaskContainer {
-        private List<Task> nested = new ArrayList<Task>();
+        private List<Task> nested = new ArrayList<>();
 
         /**
          * Add a task or type to the container.
          *
          * @param task an unknown element.
          */
+        @Override
         public void addTask(Task task) {
             nested.add(task);
         }
@@ -258,17 +260,16 @@
         }
         if (attribute.getName().equals(textName)) {
             throw new BuildException(
-                "the name \"" + attribute.getName()
-                + "\" has already been used by the text element");
+                "the name \"%s\" has already been used by the text element",
+                attribute.getName());
         }
         final int size = attributes.size();
         for (int i = 0; i < size; ++i) {
-            Attribute att = (Attribute) attributes.get(i);
+            Attribute att = attributes.get(i);
             if (att.getName().equals(attribute.getName())) {
                 throw new BuildException(
-                    "the name \"" + attribute.getName()
-                        + "\" has already been used in "
-                        + "another attribute element");
+                    "the name \"%s\" has already been used in another attribute element",
+                    attribute.getName());
             }
         }
         attributes.add(attribute);
@@ -286,11 +287,10 @@
         }
         if (elements.get(element.getName()) != null) {
             throw new BuildException(
-                "the element " + element.getName()
-                + " has already been specified");
+                "the element %s has already been specified", element.getName());
         }
         if (hasImplicitElement
-            || (element.isImplicit() && elements.size() != 0)) {
+            || (element.isImplicit() && !elements.isEmpty())) {
             throw new BuildException(
                 "Only one element allowed when using implicit elements");
         }
@@ -301,6 +301,7 @@
     /**
      * Create a new ant type based on the embedded tasks and types.
      */
+    @Override
     public void execute() {
         if (nestedSequential == null) {
             throw new BuildException("Missing sequential element");
@@ -322,7 +323,6 @@
         log("creating macro  " + name, Project.MSG_VERBOSE);
     }
 
-
     /**
      * An attribute for the MacroDef task.
      *
@@ -340,8 +340,8 @@
          */
         public void setName(String name) {
             if (!isValidName(name)) {
-                throw new BuildException(
-                    "Illegal name [" + name + "] for attribute");
+                throw new BuildException("Illegal name [%s] for attribute",
+                    name);
             }
             this.name = name.toLowerCase(Locale.ENGLISH);
         }
@@ -412,6 +412,7 @@
          * @param obj an <code>Object</code> value
          * @return a <code>boolean</code> value
          */
+        @Override
         public boolean equals(Object obj) {
             if (obj == null) {
                 return false;
@@ -440,8 +441,9 @@
         /**
          * @return a hash code value for this object.
          */
+        @Override
         public int hashCode() {
-            return objectHashCode(defaultValue) + objectHashCode(name);
+            return Objects.hashCode(defaultValue) + Objects.hashCode(name);
         }
     }
 
@@ -463,8 +465,8 @@
          */
         public void setName(String name) {
             if (!isValidName(name)) {
-                throw new BuildException(
-                    "Illegal name [" + name + "] for attribute");
+                throw new BuildException("Illegal name [%s] for element",
+                    name);
             }
             this.name = name.toLowerCase(Locale.ENGLISH);
         }
@@ -544,6 +546,7 @@
          * @param obj an <code>Object</code> value
          * @return a <code>boolean</code> value
          */
+        @Override
         public boolean equals(Object obj) {
             if (obj == null) {
                 return false;
@@ -552,24 +555,21 @@
                 return false;
             }
             Text other = (Text) obj;
-            return safeCompare(name, other.name)
+            return Objects.equals(name, other.name)
                 && optional == other.optional
                 && trim == other.trim
-                && safeCompare(defaultString, other.defaultString);
+                && Objects.equals(defaultString, other.defaultString);
         }
 
         /**
          * @return a hash code value for this object.
          */
+        @Override
         public int hashCode() {
-            return objectHashCode(name);
+            return Objects.hashCode(name);
         }
     }
 
-    private static boolean safeCompare(Object a, Object b) {
-        return a == null ? b == null : a.equals(b);
-    }
-
     /**
      * A nested element for the MacroDef task.
      */
@@ -587,8 +587,8 @@
          */
         public void setName(String name) {
             if (!isValidName(name)) {
-                throw new BuildException(
-                    "Illegal name [" + name + "] for macro element");
+                throw new BuildException("Illegal name [%s] for macro element",
+                    name);
             }
             this.name = name.toLowerCase(Locale.ENGLISH);
         }
@@ -668,6 +668,7 @@
          * @param obj an <code>Object</code> value
          * @return a <code>boolean</code> value
          */
+        @Override
         public boolean equals(Object obj) {
             if (obj == this) {
               return true;
@@ -685,8 +686,9 @@
         /**
          * @return a hash code value for this object.
          */
+        @Override
         public int hashCode() {
-            return objectHashCode(name)
+            return Objects.hashCode(name)
                 + (optional ? 1 : 0) + (implicit ? 1 : 0);
         }
 
@@ -729,21 +731,17 @@
             if (other.text != null) {
                 return false;
             }
-        } else {
-            if (!text.equals(other.text)) {
-                return false;
-            }
+        } else if (!text.equals(other.text)) {
+            return false;
         }
-        if (getURI() == null || getURI().equals("")
+        if (getURI() == null || "".equals(getURI())
             || getURI().equals(ProjectHelper.ANT_CORE_URI)) {
-            if (!(other.getURI() == null || other.getURI().equals("")
+            if (!(other.getURI() == null || "".equals(other.getURI())
                   || other.getURI().equals(ProjectHelper.ANT_CORE_URI))) {
                 return false;
             }
-        } else {
-            if (!getURI().equals(other.getURI())) {
-                return false;
-            }
+        } else if (!getURI().equals(other.getURI())) {
+            return false;
         }
 
         if (!nestedSequential.similar(other.nestedSequential)) {
@@ -801,6 +799,7 @@
          * @param project the current project
          * @return the created object
          */
+        @Override
         public Object create(Project project) {
             Object o = super.create(project);
             if (o == null) {
@@ -817,6 +816,7 @@
          * @param project the current project
          * @return true if the definitions are the same
          */
+        @Override
         public boolean sameDefinition(AntTypeDefinition other, Project project) {
             if (!super.sameDefinition(other, project)) {
                 return false;
@@ -832,6 +832,7 @@
          * @param project the current project
          * @return true if the definitions are the same
          */
+        @Override
         public boolean similarDefinition(
             AntTypeDefinition other, Project project) {
             if (!super.similarDefinition(other, project)) {
@@ -842,12 +843,4 @@
         }
     }
 
-    private static int objectHashCode(Object o) {
-        if (o == null) {
-            return 0;
-        } else {
-            return o.hashCode();
-        }
-    }
-
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java	2018-03-24 12:37:12.000000000 +0000
@@ -23,11 +23,9 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 
 import org.apache.tools.ant.BuildException;
@@ -50,13 +48,13 @@
  */
 public class MacroInstance extends Task implements DynamicAttribute, TaskContainer {
     private MacroDef macroDef;
-    private Map<String, String>      map = new HashMap<String, String>();
-    private Map<String, MacroDef.TemplateElement>      nsElements = null;
-    private Map<String, UnknownElement>      presentElements;
-    private Hashtable<String, String> localAttributes;
-    private String    text = null;
-    private String    implicitTag =     null;
-    private List<Task>      unknownElements = new ArrayList<Task>();
+    private Map<String, String> map = new HashMap<>();
+    private Map<String, MacroDef.TemplateElement> nsElements = null;
+    private Map<String, UnknownElement> presentElements;
+    private Map<String, String> localAttributes;
+    private String text = null;
+    private String implicitTag = null;
+    private List<Task> unknownElements = new ArrayList<>();
 
     /**
      * Called from MacroDef.MyAntTypeDefinition#create()
@@ -80,6 +78,7 @@
      * @param name the name of the attribute
      * @param value the value of the attribute
      */
+    @Override
     public void setDynamicAttribute(String name, String value) {
         map.put(name.toLowerCase(Locale.ENGLISH), value);
     }
@@ -91,22 +90,22 @@
      * @deprecated since 1.6.x.
      * @throws BuildException always
      */
+    @Deprecated
     public Object createDynamicElement(String name) throws BuildException {
         throw new BuildException("Not implemented any more");
     }
 
     private Map<String, MacroDef.TemplateElement> getNsElements() {
         if (nsElements == null) {
-            nsElements = new HashMap<String, MacroDef.TemplateElement>();
-            for (Entry<String, MacroDef.TemplateElement> entry : macroDef.getElements().entrySet()) {
-            nsElements.put((String) entry.getKey(),
-                           entry.getValue());
-            MacroDef.TemplateElement te = (MacroDef.TemplateElement)
-                entry.getValue();
-            if (te.isImplicit()) {
-                implicitTag = te.getName();
+            nsElements = new HashMap<>();
+            for (Map.Entry<String, MacroDef.TemplateElement> entry : macroDef
+                .getElements().entrySet()) {
+                nsElements.put(entry.getKey(), entry.getValue());
+                MacroDef.TemplateElement te = entry.getValue();
+                if (te.isImplicit()) {
+                    implicitTag = te.getName();
+                }
             }
-         }
         }
         return nsElements;
     }
@@ -116,6 +115,7 @@
      *
      * @param nestedTask a nested element.
      */
+    @Override
     public void addTask(Task nestedTask) {
         unknownElements.add(nestedTask);
     }
@@ -124,15 +124,15 @@
         if (implicitTag != null) {
             return;
         }
-        for (Iterator<Task> i = unknownElements.iterator(); i.hasNext();) {
-            UnknownElement ue = (UnknownElement) i.next();
+        for (Task task : unknownElements) {
+            UnknownElement ue = (UnknownElement) task;
             String name = ProjectHelper.extractNameFromComponentName(
                 ue.getTag()).toLowerCase(Locale.ENGLISH);
             if (getNsElements().get(name) == null) {
-                throw new BuildException("unsupported element " + name);
+                throw new BuildException("unsupported element %s", name);
             }
             if (presentElements.get(name) != null) {
-                throw new BuildException("Element " + name + " already present");
+                throw new BuildException("Element %s already present", name);
             }
             presentElements.put(name, ue);
         }
@@ -142,13 +142,14 @@
      * Embedded element in macro instance
      */
     public static class Element implements TaskContainer {
-        private List<Task> unknownElements = new ArrayList<Task>();
+        private List<Task> unknownElements = new ArrayList<>();
 
         /**
          * Add an unknown element (to be snipped into the macroDef instance)
          *
          * @param nestedTask an unknown element
          */
+        @Override
         public void addTask(Task nestedTask) {
             unknownElements.add(nestedTask);
         }
@@ -169,8 +170,8 @@
         if (s == null) {
             return null;
         }
-        StringBuffer ret = new StringBuffer();
-        StringBuffer macroName = null;
+        StringBuilder ret = new StringBuilder();
+        StringBuilder macroName = null;
 
         int state = STATE_NORMAL;
         for (int i = 0; i < s.length(); ++i) {
@@ -186,7 +187,7 @@
                 case STATE_EXPECT_BRACKET:
                     if (ch == '{') {
                         state = STATE_EXPECT_NAME;
-                        macroName = new StringBuffer();
+                        macroName = new StringBuilder();
                     } else if (ch == '@') {
                         state = STATE_NORMAL;
                         ret.append('@');
@@ -203,7 +204,7 @@
                     if (ch == '}') {
                         state = STATE_NORMAL;
                         String name = macroName.toString().toLowerCase(Locale.ENGLISH); //NOSONAR
-                        String value = (String) macroMapping.get(name);
+                        String value = macroMapping.get(name);
                         if (value == null) {
                             ret.append("@{");
                             ret.append(name);
@@ -292,40 +293,36 @@
                 rc.addChild(child.getWrapper());
                 ret.addChild(child);
             } else if (templateElement.isImplicit()) {
-                if (unknownElements.size() == 0 && !templateElement.isOptional()) {
+                if (unknownElements.isEmpty() && !templateElement.isOptional()) {
                     throw new BuildException(
-                        "Missing nested elements for implicit element "
-                        + templateElement.getName());
+                        "Missing nested elements for implicit element %s",
+                        templateElement.getName());
                 }
-                for (Iterator<Task> i = unknownElements.iterator();
-                     i.hasNext();) {
-                    UnknownElement child
-                        = copy((UnknownElement) i.next(), true);
+                for (Task task : unknownElements) {
+                    UnknownElement child = copy((UnknownElement) task, true);
                     rc.addChild(child.getWrapper());
                     ret.addChild(child);
                 }
             } else {
                 UnknownElement presentElement =
-                    (UnknownElement) presentElements.get(tag);
+                    presentElements.get(tag);
                 if (presentElement == null) {
                     if (!templateElement.isOptional()) {
                         throw new BuildException(
-                            "Required nested element "
-                            + templateElement.getName() + " missing");
+                            "Required nested element %s missing",
+                            templateElement.getName());
                     }
                     continue;
                 }
                 String presentText =
                     presentElement.getWrapper().getText().toString();
-                if (!"".equals(presentText)) {
+                if (!presentText.isEmpty()) {
                     rc.addText(macroSubs(presentText, localAttributes));
                 }
                 List<UnknownElement> list = presentElement.getChildren();
                 if (list != null) {
-                    for (Iterator<UnknownElement> i = list.iterator();
-                         i.hasNext();) {
-                        UnknownElement child
-                            = copy(i.next(), true);
+                    for (UnknownElement unknownElement2 : list) {
+                        UnknownElement child = copy(unknownElement2, true);
                         rc.addChild(child.getWrapper());
                         ret.addChild(child);
                     }
@@ -341,14 +338,15 @@
      * and calls perform on the unknown element.
      *
      */
+    @Override
     public void execute() {
-        presentElements = new HashMap<String, UnknownElement>();
+        presentElements = new HashMap<>();
         getNsElements();
         processTasks();
-        localAttributes = new Hashtable<String, String>();
-        Set<String> copyKeys = new HashSet<String>(map.keySet());
+        localAttributes = new Hashtable<>();
+        Set<String> copyKeys = new HashSet<>(map.keySet());
         for (Attribute attribute : macroDef.getAttributes()) {
-            String value = (String) map.get(attribute.getName());
+            String value = map.get(attribute.getName());
             if (value == null && "description".equals(attribute.getName())) {
                 value = getDescription();
             }
@@ -357,21 +355,19 @@
                 value = macroSubs(value, localAttributes);
             }
             if (value == null) {
-                throw new BuildException(
-                    "required attribute " + attribute.getName() + " not set");
+                throw new BuildException("required attribute %s not set",
+                    attribute.getName());
             }
             localAttributes.put(attribute.getName(), value);
             copyKeys.remove(attribute.getName());
         }
-        if (copyKeys.contains("id")) {
-            copyKeys.remove("id");
-        }
+        copyKeys.remove("id");
+
         if (macroDef.getText() != null) {
             if (text == null) {
                 String defaultText =  macroDef.getText().getDefault();
                 if (!macroDef.getText().getOptional() && defaultText == null) {
-                    throw new BuildException(
-                        "required text missing");
+                    throw new BuildException("required text missing");
                 }
                 text = defaultText == null ? "" : defaultText;
             }
@@ -379,24 +375,20 @@
                 text = text.trim();
             }
             localAttributes.put(macroDef.getText().getName(), text);
-        } else {
-            if (text != null && !text.trim().equals("")) {
-                throw new BuildException(
-                    "The \"" + getTaskName() + "\" macro does not support"
-                    + " nested text data.");
-            }
-        }
-        if (copyKeys.size() != 0) {
+        } else if (!(text == null || text.trim().isEmpty())) {
             throw new BuildException(
-                "Unknown attribute" + (copyKeys.size() > 1 ? "s " : " ")
-                + copyKeys);
+                "The \"%s\" macro does not support nested text data.",
+                getTaskName());
+        }
+        if (!copyKeys.isEmpty()) {
+            throw new BuildException("Unknown attribute"
+                + (copyKeys.size() > 1 ? "s " : " ") + copyKeys);
         }
 
         // need to set the project on unknown element
         UnknownElement c = copy(macroDef.getNestedTask(), false);
         c.init();
-        LocalProperties localProperties
-            = LocalProperties.get(getProject());
+        LocalProperties localProperties = LocalProperties.get(getProject());
         localProperties.enterScope();
         try {
             c.perform();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/MakeUrl.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,7 +21,6 @@
 import java.io.File;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.ListIterator;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
@@ -42,6 +41,13 @@
  */
 
 public class MakeUrl extends Task {
+    // error message strings
+    /** Missing file */
+    public static final String ERROR_MISSING_FILE = "A source file is missing: ";
+    /** No property defined */
+    public static final String ERROR_NO_PROPERTY = "No property defined";
+    /** No files defined */
+    public static final String ERROR_NO_FILES = "No files defined";
 
     /**
      * name of the property to set
@@ -61,26 +67,18 @@
     /**
      * filesets of nested files to add to this url
      */
-    private List<FileSet> filesets = new LinkedList<FileSet>();
+    private List<FileSet> filesets = new LinkedList<>();
 
     /**
      * paths to add
      */
-    private List<Path> paths = new LinkedList<Path>();
+    private List<Path> paths = new LinkedList<>();
 
     /**
      * validation flag
      */
     private boolean validate = true;
 
-    // error message strings
-    /** Missing file */
-    public static final String ERROR_MISSING_FILE = "A source file is missing: ";
-    /** No property defined */
-    public static final String ERROR_NO_PROPERTY = "No property defined";
-    /** No files defined */
-    public static final String ERROR_NO_FILES = "No files defined";
-
     /**
      * set the name of a property to fill with the URL
      *
@@ -149,13 +147,10 @@
         }
         int count = 0;
         StringBuilder urls = new StringBuilder();
-        ListIterator<FileSet> list = filesets.listIterator();
-        while (list.hasNext()) {
-            FileSet set = list.next();
-            DirectoryScanner scanner = set.getDirectoryScanner(getProject());
-            String[] files = scanner.getIncludedFiles();
-            for (int i = 0; i < files.length; i++) {
-                File f = new File(scanner.getBasedir(), files[i]);
+        for (FileSet fs : filesets) {
+            DirectoryScanner scanner = fs.getDirectoryScanner(getProject());
+            for (String file : scanner.getIncludedFiles()) {
+                File f = new File(scanner.getBasedir(), file);
                 validateFile(f);
                 String asUrl = toURL(f);
                 urls.append(asUrl);
@@ -181,9 +176,8 @@
         if (count > 0) {
             urls.delete(urls.length() - separator.length(), urls.length());
             return new String(urls);
-        } else {
-            return "";
         }
+        return "";
     }
 
 
@@ -198,12 +192,9 @@
         }
         int count = 0;
         StringBuilder urls = new StringBuilder();
-        ListIterator<Path> list = paths.listIterator();
-        while (list.hasNext()) {
-            Path path = list.next();
-            String[] elements = path.list();
-            for (int i = 0; i < elements.length; i++) {
-                File f = new File(elements[i]);
+        for (Path path : paths) {
+            for (String element : path.list()) {
+                File f = new File(element);
                 validateFile(f);
                 String asUrl = toURL(f);
                 urls.append(asUrl);
@@ -224,7 +215,7 @@
      */
     private void validateFile(File fileToCheck) {
         if (validate && !fileToCheck.exists()) {
-            throw new BuildException(ERROR_MISSING_FILE + fileToCheck.toString());
+            throw new BuildException(ERROR_MISSING_FILE + fileToCheck);
         }
     }
 
@@ -243,23 +234,23 @@
         }
         String url;
         String filesetURL = filesetsToURL();
-        if (file != null) {
+        if (file == null) {
+            url = filesetURL;
+        } else {
             validateFile(file);
             url = toURL(file);
             //and add any files if also defined
-            if (filesetURL.length() > 0) {
+            if (!filesetURL.isEmpty()) {
                 url = url + separator + filesetURL;
             }
-        } else {
-            url = filesetURL;
         }
         //add path URLs
         String pathURL = pathsToURL();
-        if (pathURL.length() > 0) {
-            if (url.length() > 0) {
-                url = url + separator + pathURL;
-            } else {
+        if (!pathURL.isEmpty()) {
+            if (url.isEmpty()) {
                 url = pathURL;
+            } else {
+                url = url + separator + pathURL;
             }
         }
         log("Setting " + property + " to URL " + url, Project.MSG_VERBOSE);
@@ -287,12 +278,9 @@
      * @return the file converted to a URL
      */
     private String toURL(File fileToConvert) {
-        String url;
         //create the URL
         //ant equivalent of  fileToConvert.toURI().toURL().toExternalForm();
-        url = FileUtils.getFileUtils().toURI(fileToConvert.getAbsolutePath());
-
-        return url;
+        return FileUtils.getFileUtils().toURI(fileToConvert.getAbsolutePath());
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ManifestClassPath.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,7 +18,6 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import java.io.UnsupportedEncodingException;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
@@ -52,6 +51,7 @@
      * separated list of files and directories relative to the jar
      * file's parent directory.
      */
+    @Override
     public void execute() {
         if (name == null) {
             throw new BuildException("Missing 'property' attribute!");
@@ -60,13 +60,13 @@
             throw new BuildException("Missing 'jarfile' attribute!");
         }
         if (getProject().getProperty(name) != null) {
-            throw new BuildException("Property '" + name + "' already set!");
+            throw new BuildException("Property '%s' already set!", name);
         }
         if (path == null) {
             throw new BuildException("Missing nested <classpath>!");
         }
 
-        StringBuffer tooLongSb = new StringBuffer();
+        StringBuilder tooLongSb = new StringBuilder();
         for (int i = 0; i < maxParentLevels + 1; i++) {
             tooLongSb.append("../");
         }
@@ -77,10 +77,10 @@
         dir = fileUtils.normalize(dir.getAbsolutePath());
 
         String[] elements = path.list();
-        StringBuffer buffer = new StringBuffer();
-        for (int i = 0; i < elements.length; ++i) {
+        StringBuilder buffer = new StringBuilder();
+        for (String element : elements) {
             // Normalize the current file
-            File pathEntry = new File(elements[i]);
+            File pathEntry = new File(element);
             String fullPath = pathEntry.getAbsolutePath();
             pathEntry = fileUtils.normalize(fullPath);
 
@@ -108,18 +108,15 @@
             // No match, so bail out!
             if (relPath.equals(canonicalPath)
                 || relPath.startsWith(tooLongPrefix)) {
-                throw new BuildException("No suitable relative path from "
-                                         + dir + " to " + fullPath);
+                throw new BuildException(
+                    "No suitable relative path from %s to %s", dir, fullPath);
             }
 
             if (pathEntry.isDirectory() && !relPath.endsWith("/")) {
                 relPath = relPath + '/';
             }
-            try {
-                relPath = Locator.encodeURI(relPath);
-            } catch (UnsupportedEncodingException exc) {
-                throw new BuildException(exc);
-            }
+            relPath = Locator.encodeURI(relPath);
+
             // Manifest's ClassPath: attribute always uses forward
             // slashes '/', and is space-separated. Ant will properly
             // format it on 72 columns with proper line continuation
@@ -149,7 +146,7 @@
     public void setJarFile(File jarfile) {
         File parent = jarfile.getParentFile();
         if (!parent.isDirectory()) {
-            throw new BuildException("Jar's directory not found: " + parent);
+            throw new BuildException("Jar's directory not found: %s", parent);
         }
         this.dir = parent;
     }
@@ -162,8 +159,8 @@
      */
     public void setMaxParentLevels(int levels) {
         if (levels < 0) {
-            throw new BuildException("maxParentLevels must not be a negative"
-                                     + " number");
+            throw new BuildException(
+                "maxParentLevels must not be a negative number");
         }
         this.maxParentLevels = levels;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Manifest.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Manifest.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Manifest.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Manifest.java	2018-03-24 12:37:12.000000000 +0000
@@ -26,11 +26,15 @@
 import java.io.Reader;
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Vector;
+import java.util.stream.Collectors;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.CollectionUtils;
@@ -168,14 +172,7 @@
          */
         @Override
         public int hashCode() {
-            int hashCode = 0;
-
-            if (name != null) {
-                hashCode += getKey().hashCode();
-            }
-
-            hashCode += values.hashCode();
-            return hashCode;
+            return Objects.hash(getKey(), values);
         }
 
         /**
@@ -216,8 +213,7 @@
             int index = line.indexOf(": ");
             if (index == -1) {
                 throw new ManifestException("Manifest line \"" + line
-                    + "\" is not valid as it does not "
-                    + "contain a name and a value separated by ': ' ");
+                    + "\" is not valid as it does not contain a name and a value separated by ': '");
             }
             name = line.substring(0, index);
             setValue(line.substring(index + 2));
@@ -273,16 +269,8 @@
          * @return the attribute's value.
          */
         public String getValue() {
-            if (values.size() == 0) {
-                return null;
-            }
-
-            String fullValue = "";
-            for (Enumeration<String> e = getValues(); e.hasMoreElements();) {
-                String value = e.nextElement();
-                fullValue += value + " ";
-            }
-            return fullValue.trim();
+            return values.isEmpty() ? null
+                : values.stream().collect(Collectors.joining(" "));
         }
 
         /**
@@ -343,12 +331,12 @@
          */
         public void write(PrintWriter writer, boolean flatten)
             throws IOException {
-            if (!flatten) {
-            for (Enumeration<String> e = getValues(); e.hasMoreElements();) {
-                writeValue(writer, e.nextElement());
-            }
-            } else {
+            if (flatten) {
                 writeValue(writer, getValue());
+            } else {
+                for (String value : values) {
+                    writeValue(writer, value);
+                }
             }
         }
 
@@ -362,7 +350,7 @@
          */
         private void writeValue(PrintWriter writer, String value)
              throws IOException {
-            String line = null;
+            String line;
             int nameLength = name.getBytes(JAR_ENCODING).length;
             if (nameLength > MAX_NAME_VALUE_LENGTH) {
                 if (nameLength > MAX_NAME_LENGTH) {
@@ -404,7 +392,7 @@
      */
     public static class Section {
         /** Warnings for this section */
-        private Vector<String> warnings = new Vector<String>();
+        private List<String> warnings = new Vector<>();
 
         /**
          * The section's name if any. The main section in a
@@ -413,7 +401,7 @@
         private String name = null;
 
         /** The section's attributes.*/
-        private Map<String, Attribute> attributes = new LinkedHashMap<String, Attribute>();
+        private Map<String, Attribute> attributes = new LinkedHashMap<>();
 
         /**
          * The name of the section; optional -default is the main section.
@@ -450,21 +438,20 @@
             Attribute attribute = null;
             while (true) {
                 String line = reader.readLine();
-                if (line == null || line.length() == 0) {
+                if (line == null || line.isEmpty()) {
                     return null;
                 }
                 if (line.charAt(0) == ' ') {
                     // continuation line
                     if (attribute == null) {
-                        if (name != null) {
-                            // a continuation on the first line is a
-                            // continuation of the name - concatenate this
-                            // line and the name
-                            name += line.substring(1);
-                        } else {
+                        if (name == null) {
                             throw new ManifestException("Can't start an "
                                 + "attribute with a continuation line " + line);
                         }
+                        // a continuation on the first line is a
+                        // continuation of the name - concatenate this
+                        // line and the name
+                        name += line.substring(1);
                     } else {
                         attribute.addContinuation(line);
                     }
@@ -507,8 +494,8 @@
                     && !(name.toLowerCase(Locale.ENGLISH)
                          .equals(section.getName().toLowerCase(Locale.ENGLISH))))
                 ) {
-                throw new ManifestException("Unable to merge sections "
-                    + "with different names");
+                throw new ManifestException(
+                    "Unable to merge sections with different names");
             }
 
             Enumeration<String> e = section.getAttributeKeys();
@@ -516,7 +503,7 @@
             while (e.hasMoreElements()) {
                 String attributeName = e.nextElement();
                 Attribute attribute = section.getAttribute(attributeName);
-                if (attributeName.equalsIgnoreCase(ATTRIBUTE_CLASSPATH)) {
+                if (ATTRIBUTE_CLASSPATH.equalsIgnoreCase(attributeName)) {
                     if (classpathAttribute == null) {
                         classpathAttribute = new Attribute();
                         classpathAttribute.setName(ATTRIBUTE_CLASSPATH);
@@ -547,10 +534,7 @@
             }
 
             // add in the warnings
-            Enumeration<String> warnEnum = section.warnings.elements();
-            while (warnEnum.hasMoreElements()) {
-                warnings.addElement(warnEnum.nextElement());
-            }
+            warnings.addAll(section.warnings);
         }
 
         /**
@@ -650,9 +634,8 @@
              throws ManifestException {
             String check = addAttributeAndCheck(attribute);
             if (check != null) {
-                throw new BuildException("Specify the section name using "
-                    + "the \"name\" attribute of the <section> element rather "
-                    + "than using a \"Name\" manifest attribute");
+                throw new BuildException(
+                    "Specify the section name using the \"name\" attribute of the <section> element rather than using a \"Name\" manifest attribute");
             }
         }
 
@@ -674,15 +657,14 @@
             }
             String attributeKey = attribute.getKey();
             if (attributeKey.equals(ATTRIBUTE_NAME_LC)) {
-                warnings.addElement("\"" + ATTRIBUTE_NAME + "\" attributes "
-                    + "should not occur in the main section and must be the "
-                    + "first element in all other sections: \""
+                warnings.add("\"" + ATTRIBUTE_NAME
+                    + "\" attributes should not occur in the main section and must be the first element in all other sections: \""
                     + attribute.getName() + ": " + attribute.getValue() + "\"");
                 return attribute.getValue();
             }
 
             if (attributeKey.startsWith(ATTRIBUTE_FROM_LC)) {
-                warnings.addElement(ERROR_FROM_FORBIDDEN
+                warnings.add(ERROR_FROM_FORBIDDEN
                     + attribute.getName() + ": " + attribute.getValue() + "\"");
             } else {
                 // classpath attributes go into a vector
@@ -693,10 +675,8 @@
                     if (classpathAttribute == null) {
                         storeAttribute(attribute);
                     } else {
-                        warnings.addElement("Multiple Class-Path attributes "
-                            + "are supported but violate the Jar "
-                            + "specification and may not be correctly "
-                            + "processed in all environments");
+                        warnings.add(
+                            "Multiple Class-Path attributes are supported but violate the Jar specification and may not be correctly processed in all environments");
                         Enumeration<String> e = attribute.getValues();
                         while (e.hasMoreElements()) {
                             String value = e.nextElement();
@@ -705,8 +685,8 @@
                     }
                 } else if (attributes.containsKey(attributeKey)) {
                     throw new ManifestException("The attribute \""
-                        + attribute.getName() + "\" may not occur more "
-                        + "than once in the same section");
+                        + attribute.getName()
+                        + "\" may not occur more than once in the same section");
                 } else {
                     storeAttribute(attribute);
                 }
@@ -753,7 +733,7 @@
          * @return an Enumeration of warning strings.
          */
         public Enumeration<String> getWarnings() {
-            return warnings.elements();
+            return Collections.enumeration(warnings);
         }
 
         /**
@@ -794,7 +774,7 @@
     private Section mainSection = new Section();
 
     /** The named sections of this manifest */
-    private Map<String, Section> sections = new LinkedHashMap<String, Section>();
+    private Map<String, Section> sections = new LinkedHashMap<>();
 
     /**
      * Construct a manifest from Ant's default manifest file.
@@ -804,14 +784,12 @@
      *            default manifest
      */
     public static Manifest getDefaultManifest() throws BuildException {
-        InputStream in = null;
         InputStreamReader insr = null;
-        try {
-            String defManifest = "/org/apache/tools/ant/defaultManifest.mf";
-            in = Manifest.class.getResourceAsStream(defManifest);
+        String defManifest = "/org/apache/tools/ant/defaultManifest.mf";
+        try (InputStream in = Manifest.class.getResourceAsStream(defManifest)) {
             if (in == null) {
-                throw new BuildException("Could not find default manifest: "
-                    + defManifest);
+                throw new BuildException("Could not find default manifest: %s",
+                    defManifest);
             }
             try {
                 insr = new InputStreamReader(in, "UTF-8");
@@ -835,7 +813,6 @@
             throw new BuildException("Unable to read default manifest", e);
         } finally {
             FileUtils.close(insr);
-            FileUtils.close(in);
         }
     }
 
@@ -864,20 +841,20 @@
             mainSection.removeAttribute(ATTRIBUTE_MANIFEST_VERSION);
         }
 
-        String line = null;
+        String line;
         while ((line = reader.readLine()) != null) {
-            if (line.length() == 0) {
+            if (line.isEmpty()) {
                 continue;
             }
 
             Section section = new Section();
             if (nextSectionName == null) {
                 Attribute sectionName = new Attribute(line);
-                if (!sectionName.getName().equalsIgnoreCase(ATTRIBUTE_NAME)) {
-                    throw new ManifestException("Manifest sections should "
-                        + "start with a \"" + ATTRIBUTE_NAME
-                        + "\" attribute and not \""
-                        + sectionName.getName() + "\"");
+                if (!ATTRIBUTE_NAME.equalsIgnoreCase(sectionName.getName())) {
+                    throw new ManifestException(
+                        "Manifest sections should start with a \""
+                            + ATTRIBUTE_NAME + "\" attribute and not \""
+                            + sectionName.getName() + "\"");
                 }
                 nextSectionName = sectionName.getValue();
             } else {
@@ -922,7 +899,7 @@
         if (attribute.getKey() == null || attribute.getValue() == null) {
             throw new BuildException("Attributes must have name and value");
         }
-        if (attribute.getKey().equals(ATTRIBUTE_MANIFEST_VERSION_LC)) {
+        if (ATTRIBUTE_MANIFEST_VERSION_LC.equals(attribute.getKey())) {
             manifestVersion = attribute.getValue();
         } else {
             mainSection.addConfiguredAttribute(attribute);
@@ -1077,7 +1054,7 @@
      * @return an enumeration of warning strings
      */
     public Enumeration<String> getWarnings() {
-        Vector<String> warnings = new Vector<String>();
+        Vector<String> warnings = new Vector<>();
 
         Enumeration<String> warnEnum = mainSection.getWarnings();
         while (warnEnum.hasMoreElements()) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,12 +19,12 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
 import java.util.Enumeration;
 
 import org.apache.tools.ant.BuildException;
@@ -32,7 +32,6 @@
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.Manifest.Attribute;
 import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.util.FileUtils;
 
 /**
  * Creates a manifest file for inclusion in a JAR, Ant task wrapper
@@ -91,6 +90,7 @@
          *
          * @return a String array of the allowed values.
          */
+        @Override
         public String[] getValues() {
             return new String[] {"update", "replace"};
         }
@@ -157,13 +157,15 @@
         char ch = name.charAt(0);
 
         if (ch == '-' || ch == '_') {
-            throw new BuildException("Manifest attribute names must not start with '" + ch + "'.");
+            throw new BuildException(
+                "Manifest attribute names must not start with '%c'.", ch);
         }
 
         for (int i = 0; i < name.length(); i++) {
             ch = name.charAt(i);
             if (VALID_ATTRIBUTE_CHARS.indexOf(ch) < 0) {
-                throw new BuildException("Manifest attribute names must not contain '" + ch + "'");
+                throw new BuildException(
+                    "Manifest attribute names must not contain '%c'", ch);
             }
         }
     }
@@ -219,6 +221,7 @@
      *
      * @throws BuildException if the manifest cannot be written.
      */
+    @Override
     public void execute() throws BuildException {
         if (manifestFile == null) {
             throw new BuildException("the file attribute is required");
@@ -229,15 +232,9 @@
         BuildException error = null;
 
         if (manifestFile.exists()) {
-            FileInputStream fis = null;
-            InputStreamReader isr = null;
-            try {
-                fis = new FileInputStream(manifestFile);
-                if (encoding == null) {
-                    isr = new InputStreamReader(fis, "UTF-8");
-                } else {
-                    isr = new InputStreamReader(fis, encoding);
-                }
+            Charset charset = Charset.forName(encoding == null ? "UTF-8" : encoding);
+            try (InputStreamReader isr = new InputStreamReader(
+                Files.newInputStream(manifestFile.toPath()), charset)) {
                 current = new Manifest(isr);
             } catch (ManifestException m) {
                 error = new BuildException("Existing manifest " + manifestFile
@@ -245,8 +242,6 @@
             } catch (IOException e) {
                 error = new BuildException("Failed to read " + manifestFile,
                                            e, getLocation());
-            } finally {
-                FileUtils.close(isr);
             }
         }
 
@@ -257,7 +252,7 @@
                     Project.MSG_WARN);
         }
         try {
-            if (mode.getValue().equals("update") && manifestFile.exists()) {
+            if ("update".equals(mode.getValue()) && manifestFile.exists()) {
                 if (current != null) {
                     toWrite.merge(current, false, mergeClassPaths);
                 } else if (error != null) {
@@ -276,11 +271,8 @@
             return;
         }
 
-        PrintWriter w = null;
-        try {
-            FileOutputStream fos = new FileOutputStream(manifestFile);
-            OutputStreamWriter osw = new OutputStreamWriter(fos, Manifest.JAR_ENCODING);
-            w = new PrintWriter(osw);
+        try (PrintWriter w = new PrintWriter(new OutputStreamWriter(
+            Files.newOutputStream(manifestFile.toPath()), Manifest.JAR_ENCODING))) {
             toWrite.write(w, flattenClassPaths);
             if (w.checkError()) {
                 throw new IOException("Encountered an error writing manifest");
@@ -288,8 +280,6 @@
         } catch (IOException e) {
             throw new BuildException("Failed to write " + manifestFile,
                                      e, getLocation());
-        } finally {
-            FileUtils.close(w);
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -62,6 +62,7 @@
     // CheckStyle:VisibilityModifier ON
 
     /** {@inheritDoc}. */
+    @Override
     public void setProject(Project project) {
         super.setProject(project);
         fileset.setProject(project);
@@ -128,8 +129,8 @@
     public void XsetItems(String itemString) {
         log("The items attribute is deprecated. "
             + "Please use the includes attribute.", Project.MSG_WARN);
-        if (itemString == null || itemString.equals("*")
-            || itemString.equals(".")) {
+        if (itemString == null || "*".equals(itemString)
+            || ".".equals(itemString)) {
             createInclude().setName("**");
         } else {
             StringTokenizer tok = new StringTokenizer(itemString, ", ");
@@ -161,7 +162,7 @@
     public void XsetIgnore(String ignoreString) {
         log("The ignore attribute is deprecated."
             + "Please use the excludes attribute.", Project.MSG_WARN);
-        if (ignoreString != null && ignoreString.length() > 0) {
+        if (!(ignoreString == null || ignoreString.isEmpty())) {
             StringTokenizer tok = new StringTokenizer(ignoreString, ", ",
                                                       false);
             while (tok.hasMoreTokens()) {
@@ -237,6 +238,7 @@
      *
      * @return whether any selectors are in this container
      */
+    @Override
     public boolean hasSelectors() {
         return fileset.hasSelectors();
     }
@@ -246,6 +248,7 @@
      *
      * @return the number of selectors in this container
      */
+    @Override
     public int selectorCount() {
         return fileset.selectorCount();
     }
@@ -255,6 +258,7 @@
      * @param p the current project
      * @return an array of selectors in this container
      */
+    @Override
     public FileSelector[] getSelectors(Project p) {
         return fileset.getSelectors(p);
     }
@@ -264,6 +268,7 @@
      *
      * @return an enumerator that goes through each of the selectors
      */
+    @Override
     public Enumeration<FileSelector> selectorElements() {
         return fileset.selectorElements();
     }
@@ -273,6 +278,7 @@
      *
      * @param selector the new selector to add
      */
+    @Override
     public void appendSelector(FileSelector selector) {
         fileset.appendSelector(selector);
     }
@@ -283,6 +289,7 @@
      * add a "Select" selector entry on the selector list
      * @param selector the selector to add
      */
+    @Override
     public void addSelector(SelectSelector selector) {
         fileset.addSelector(selector);
     }
@@ -291,6 +298,7 @@
      * add an "And" selector entry on the selector list
      * @param selector the selector to add
      */
+    @Override
     public void addAnd(AndSelector selector) {
         fileset.addAnd(selector);
     }
@@ -299,6 +307,7 @@
      * add an "Or" selector entry on the selector list
      * @param selector the selector to add
      */
+    @Override
     public void addOr(OrSelector selector) {
         fileset.addOr(selector);
     }
@@ -307,6 +316,7 @@
      * add a "Not" selector entry on the selector list
      * @param selector the selector to add
      */
+    @Override
     public void addNot(NotSelector selector) {
         fileset.addNot(selector);
     }
@@ -315,6 +325,7 @@
      * add a "None" selector entry on the selector list
      * @param selector the selector to add
      */
+    @Override
     public void addNone(NoneSelector selector) {
         fileset.addNone(selector);
     }
@@ -323,6 +334,7 @@
      * add a majority selector entry on the selector list
      * @param selector the selector to add
      */
+    @Override
     public void addMajority(MajoritySelector selector) {
         fileset.addMajority(selector);
     }
@@ -331,6 +343,7 @@
      * add a selector date entry on the selector list
      * @param selector the selector to add
      */
+    @Override
     public void addDate(DateSelector selector) {
         fileset.addDate(selector);
     }
@@ -339,6 +352,7 @@
      * add a selector size entry on the selector list
      * @param selector the selector to add
      */
+    @Override
     public void addSize(SizeSelector selector) {
         fileset.addSize(selector);
     }
@@ -347,6 +361,7 @@
      * add a selector filename entry on the selector list
      * @param selector the selector to add
      */
+    @Override
     public void addFilename(FilenameSelector selector) {
         fileset.addFilename(selector);
     }
@@ -355,6 +370,7 @@
      * add an extended selector entry on the selector list
      * @param selector the selector to add
      */
+    @Override
     public void addCustom(ExtendSelector selector) {
         fileset.addCustom(selector);
     }
@@ -363,6 +379,7 @@
      * add a contains selector entry on the selector list
      * @param selector the selector to add
      */
+    @Override
     public void addContains(ContainsSelector selector) {
         fileset.addContains(selector);
     }
@@ -371,6 +388,7 @@
      * add a present selector entry on the selector list
      * @param selector the selector to add
      */
+    @Override
     public void addPresent(PresentSelector selector) {
         fileset.addPresent(selector);
     }
@@ -379,6 +397,7 @@
      * add a depth selector entry on the selector list
      * @param selector the selector to add
      */
+    @Override
     public void addDepth(DepthSelector selector) {
         fileset.addDepth(selector);
     }
@@ -387,6 +406,7 @@
      * add a depends selector entry on the selector list
      * @param selector the selector to add
      */
+    @Override
     public void addDepend(DependSelector selector) {
         fileset.addDepend(selector);
     }
@@ -395,6 +415,7 @@
      * add a regular expression selector entry on the selector list
      * @param selector the selector to add
      */
+    @Override
     public void addContainsRegexp(ContainsRegexpSelector selector) {
         fileset.addContainsRegexp(selector);
     }
@@ -404,6 +425,7 @@
      * @param selector the selector to add
      * @since ant 1.6
      */
+    @Override
     public void addDifferent(DifferentSelector selector) {
         fileset.addDifferent(selector);
     }
@@ -413,6 +435,7 @@
      * @param selector the selector to add
      * @since ant 1.6
      */
+    @Override
     public void addType(TypeSelector selector) {
         fileset.addType(selector);
     }
@@ -422,6 +445,7 @@
      * @param selector the selector to add
      * @since ant 1.6
      */
+    @Override
     public void addModified(ModifiedSelector selector) {
         fileset.addModified(selector);
     }
@@ -431,6 +455,7 @@
      * @param selector the selector to add
      * @since Ant 1.6
      */
+    @Override
     public void add(FileSelector selector) {
         fileset.add(selector);
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Mkdir.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Mkdir.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Mkdir.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Mkdir.java	2018-03-24 12:37:12.000000000 +0000
@@ -46,29 +46,30 @@
      * create the directory and all parents
      * @throws BuildException if dir is somehow invalid, or creation failed.
      */
+    @Override
     public void execute() throws BuildException {
         if (dir == null) {
             throw new BuildException("dir attribute is required", getLocation());
         }
 
         if (dir.isFile()) {
-            throw new BuildException("Unable to create directory as a file "
-                                     + "already exists with that name: "
-                                     + dir.getAbsolutePath());
+            throw new BuildException(
+                "Unable to create directory as a file already exists with that name: %s",
+                dir.getAbsolutePath());
         }
 
         if (!dir.exists()) {
             boolean result = mkdirs(dir);
             if (!result) {
                 if (dir.exists()) {
-                    log("A different process or task has already created "
-                        + "dir " + dir.getAbsolutePath(),
-                        Project.MSG_VERBOSE);
+                    log("A different process or task has already created dir "
+                        + dir.getAbsolutePath(), Project.MSG_VERBOSE);
                     return;
                 }
-                String msg = "Directory " + dir.getAbsolutePath()
-                    + " creation was not successful for an unknown reason";
-                throw new BuildException(msg, getLocation());
+                throw new BuildException(
+                    "Directory " + dir.getAbsolutePath()
+                        + " creation was not successful for an unknown reason",
+                    getLocation());
             }
             log("Created dir: " + dir.getAbsolutePath());
         } else {
@@ -111,4 +112,3 @@
         return true;
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Move.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Move.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Move.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Move.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,14 +19,13 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Iterator;
+import java.util.Map;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.condition.Os;
 import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.FilterSet;
 import org.apache.tools.ant.types.FilterSetCollection;
 
 /**
@@ -80,6 +79,7 @@
     }
 
     /** {@inheritDoc}. */
+    @Override
     protected void validateAttributes() throws BuildException {
         if (file != null && file.isDirectory()) {
             if ((destFile != null && destDir != null)
@@ -103,12 +103,13 @@
     /**
      * Override copy's doFileOperations to move the files instead of copying them.
      */
+    @Override
     protected void doFileOperations() {
         //Attempt complete directory renames, if any, first.
         if (completeDirMap.size() > 0) {
-            for (Iterator fromDirs = completeDirMap.keySet().iterator(); fromDirs.hasNext();) {
-                File fromDir = (File) fromDirs.next();
-                File toDir = (File) completeDirMap.get(fromDir);
+            for (Map.Entry<File, File> entry : completeDirMap.entrySet()) {
+                File fromDir = entry.getKey();
+                File toDir = entry.getValue();
                 boolean renamed = false;
                 try {
                     log("Attempting to rename dir: " + fromDir + " to " + toDir, verbosity);
@@ -135,14 +136,14 @@
             log("Moving " + moveCount + " file" + ((moveCount == 1) ? "" : "s")
                     + " to " + destDir.getAbsolutePath());
 
-            for (Iterator fromFiles = fileCopyMap.keySet().iterator(); fromFiles.hasNext();) {
-                String fromFile = (String) fromFiles.next();
+            for (Map.Entry<String, String[]> entry : fileCopyMap.entrySet()) {
+                String fromFile = entry.getKey();
                 File f = new File(fromFile);
                 boolean selfMove = false;
                 if (f.exists()) { //Is this file still available to be moved?
-                    String[] toFiles = (String[]) fileCopyMap.get(fromFile);
+                    String[] toFiles = entry.getValue();
                     for (int i = 0; i < toFiles.length; i++) {
-                        String toFile = (String) toFiles[i];
+                        String toFile = toFiles[i];
 
                         if (fromFile.equals(toFile)) {
                             log("Skipping self-move of " + fromFile, verbosity);
@@ -167,9 +168,9 @@
 
         if (includeEmpty) {
             int createCount = 0;
-            for (Iterator fromDirNames = dirCopyMap.keySet().iterator(); fromDirNames.hasNext();) {
-                String fromDirName = (String) fromDirNames.next();
-                String[] toDirNames = (String[]) dirCopyMap.get(fromDirName);
+            for (Map.Entry<String, String[]> entry : dirCopyMap.entrySet()) {
+                String fromDirName = entry.getKey();
+                String[] toDirNames = entry.getValue();
                 boolean selfMove = false;
                 for (int i = 0; i < toDirNames.length; i++) {
                     if (fromDirName.equals(toDirNames[i])) {
@@ -214,16 +215,15 @@
             log("Attempting to rename: " + fromFile + " to " + toFile, verbosity);
             moved = renameFile(fromFile, toFile, filtering, forceOverwrite);
         } catch (IOException ioe) {
-            String msg = "Failed to rename " + fromFile
-                + " to " + toFile + " due to " + ioe.getMessage();
-            throw new BuildException(msg, ioe, getLocation());
+            throw new BuildException("Failed to rename " + fromFile + " to "
+                + toFile + " due to " + ioe.getMessage(), ioe, getLocation());
         }
 
         if (!moved) {
             copyFile(fromFile, toFile, filtering, overwrite);
             if (!getFileUtils().tryHardToDelete(fromFile, performGc)) {
-                throw new BuildException("Unable to delete " + "file "
-                        + fromFile.getAbsolutePath());
+                throw new BuildException("Unable to delete file %s",
+                    fromFile.getAbsolutePath());
             }
         }
     }
@@ -243,9 +243,7 @@
             if (filtering) {
                 executionFilters.addFilterSet(getProject().getGlobalFilterSet());
             }
-            for (Iterator filterIter = getFilterSets().iterator(); filterIter.hasNext();) {
-                executionFilters.addFilterSet((FilterSet) filterIter.next());
-            }
+            getFilterSets().forEach(executionFilters::addFilterSet);
             getFileUtils().copyFile(fromFile, toFile, executionFilters,
                                     getFilterChains(),
                                     forceOverwrite,
@@ -255,9 +253,8 @@
                                     getOutputEncoding(),
                                     getProject(), getForce());
         } catch (IOException ioe) {
-            String msg = "Failed to copy " + fromFile
-                    + " to " + toFile + " due to " + ioe.getMessage();
-            throw new BuildException(msg, ioe, getLocation());
+            throw new BuildException("Failed to copy " + fromFile + " to "
+                + toFile + " due to " + ioe.getMessage(), ioe, getLocation());
         }
     }
 
@@ -272,8 +269,7 @@
             return false;
         }     // maybe io error?
 
-        for (int i = 0; i < list.length; i++) {
-            String s = list[i];
+        for (String s : list) {
             File f = new File(d, s);
             if (f.isDirectory()) {
                 if (!okToDelete(f)) {
@@ -305,22 +301,24 @@
             return;
         }      // on an io error list() can return null
 
-        for (int i = 0; i < list.length; i++) {
-            String s = list[i];
+        for (String s : list) {
             File f = new File(d, s);
             if (f.isDirectory()) {
                 deleteDir(f);
-            } else if (deleteFiles && !getFileUtils().tryHardToDelete(f,
-                                                                      performGc)) {
-                throw new BuildException("Unable to delete file " + f.getAbsolutePath());
+            } else if (deleteFiles
+                && !getFileUtils().tryHardToDelete(f, performGc)) {
+                throw new BuildException("Unable to delete file %s",
+                    f.getAbsolutePath());
             } else {
-                throw new BuildException("UNEXPECTED ERROR - The file "
-                        + f.getAbsolutePath() + " should not exist!");
+                throw new BuildException(
+                    "UNEXPECTED ERROR - The file %s should not exist!",
+                    f.getAbsolutePath());
             }
         }
         log("Deleting directory " + d.getAbsolutePath(), verbosity);
         if (!getFileUtils().tryHardToDelete(d, performGc)) {
-            throw new BuildException("Unable to delete directory " + d.getAbsolutePath());
+            throw new BuildException("Unable to delete directory %s",
+                d.getAbsolutePath());
         }
     }
 
@@ -344,19 +342,21 @@
      */
     protected boolean renameFile(File sourceFile, File destFile, boolean filtering,
                                  boolean overwrite) throws IOException, BuildException {
-        if (destFile.isDirectory() || filtering || getFilterSets().size() > 0
-                || getFilterChains().size() > 0) {
+        if (destFile.isDirectory() || filtering || !getFilterSets().isEmpty()
+                || !getFilterChains().isEmpty()) {
             return false;
         }
 
         // identical logic lives in ResourceUtils.copyResource():
         if (destFile.isFile() && !destFile.canWrite()) {
             if (!getForce()) {
-                throw new IOException("can't replace read-only destination "
-                                      + "file " + destFile);
-            } else if (!getFileUtils().tryHardToDelete(destFile)) {
-                throw new IOException("failed to delete read-only "
-                                      + "destination file " + destFile);
+                throw new IOException(String.format(
+                    "can't replace read-only destination file %s", destFile));
+            }
+            if (!getFileUtils().tryHardToDelete(destFile)) {
+                throw new IOException(String.format(
+                    "failed to delete read-only destination file %s",
+                    destFile));
             }
         }
 
@@ -375,7 +375,8 @@
             }
             if (!(getFileUtils().areSame(sourceFile, destFile)
                   || getFileUtils().tryHardToDelete(destFile, performGc))) {
-                throw new BuildException("Unable to remove existing file " + destFile);
+                throw new BuildException("Unable to remove existing file %s",
+                    destFile);
             }
         }
         return sourceFile.renameTo(destFile);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Nice.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Nice.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Nice.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Nice.java	2018-03-24 12:37:12.000000000 +0000
@@ -48,12 +48,11 @@
      */
     private String currentPriority;
 
-
-
     /**
      * Execute the task
      * @exception BuildException if something goes wrong with the build
      */
+    @Override
     public void execute() throws BuildException {
 
         Thread self = Thread.currentThread();
@@ -93,7 +92,7 @@
         if (newPriority < Thread.MIN_PRIORITY || newPriority > Thread.MAX_PRIORITY) {
             throw new BuildException("The thread priority is out of the range 1-10");
         }
-        this.newPriority = new Integer(newPriority);
+        this.newPriority = Integer.valueOf(newPriority);
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java	2018-03-24 12:37:12.000000000 +0000
@@ -118,8 +118,9 @@
      * @param superGrammar the super grammar filename
      * @deprecated  since ant 1.6
      */
+    @Deprecated
     public void setGlib(String superGrammar) {
-        String sg = null;
+        String sg;
         if (Os.isFamily("dos")) {
             sg = superGrammar.replace('\\', '/');
         } else {
@@ -127,6 +128,7 @@
         }
         setGlib(FILE_UTILS.resolveFile(getProject().getBaseDir(), sg));
     }
+
     /**
      * Sets an optional super grammar file
      * @param superGrammar the super grammar file
@@ -135,6 +137,7 @@
     public void setGlib(File superGrammar) {
         this.superGrammar = superGrammar;
     }
+
     /**
      * Sets a flag to enable ParseView debugging
      * @param enable a <code>boolean</code> value
@@ -200,7 +203,6 @@
      * @param s a <code>boolean</code> value
      */
     public void setFork(boolean s) {
-        //this.fork = s;
     }
 
     /**
@@ -235,6 +237,7 @@
      * specify it directly.
      * @throws BuildException on error
      */
+    @Override
     public void init() throws BuildException {
         addClasspathEntry("/antlr/ANTLRGrammarParseBehavior.class");
     }
@@ -278,6 +281,7 @@
      * Execute the task.
      * @throws BuildException on error
      */
+    @Override
     public void execute() throws BuildException {
         validateAttributes();
 
@@ -302,12 +306,11 @@
             int err = run(commandline.getCommandline());
             if (err != 0) {
                 throw new BuildException("ANTLR returned: " + err, getLocation());
-            } else {
-                String output = bos.toString();
-                if (output.indexOf("error:") > -1) {
-                    throw new BuildException("ANTLR signaled an error: "
-                                             + output, getLocation());
-                }
+            }
+            String output = bos.toString();
+            if (output.indexOf("error:") > -1) {
+                throw new BuildException("ANTLR signaled an error: "
+                                         + output, getLocation());
             }
         } else {
             log("Skipped grammar file. Generated file " + generatedFile
@@ -357,7 +360,6 @@
         if (targetFile == null || !targetFile.isFile()) {
             throw new BuildException("Invalid target: " + targetFile);
         }
-
         // if no output directory is specified, used the target's directory
         if (outputDirectory == null) {
             setOutputdirectory(new File(targetFile.getParent()));
@@ -369,8 +371,8 @@
 
     private File getGeneratedFile() throws BuildException {
         String generatedFileName = null;
-        try {
-            BufferedReader in = new BufferedReader(new FileReader(targetFile));
+        try (BufferedReader in =
+            new BufferedReader(new FileReader(targetFile))) {
             String line;
             while ((line = in.readLine()) != null) {
                 int extendsIndex = line.indexOf(" extends ");
@@ -380,7 +382,6 @@
                     break;
                 }
             }
-            in.close();
         } catch (Exception e) {
             throw new BuildException("Unable to determine generated class", e);
         }
@@ -422,17 +423,12 @@
      * @since Ant 1.6
      */
     protected boolean is272() {
-        AntClassLoader l = null;
-        try {
-            l = getProject().createClassLoader(commandline.getClasspath());
+        try (AntClassLoader l =
+             getProject().createClassLoader(commandline.getClasspath())) {
             l.loadClass("antlr.Version");
             return true;
         } catch (ClassNotFoundException e) {
             return false;
-        } finally {
-            if (l != null) {
-                l.cleanup();
-            }
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java	2018-03-24 12:37:12.000000000 +0000
@@ -23,7 +23,7 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Enumeration;
+import java.util.Collections;
 import java.util.Vector;
 
 import org.apache.tools.ant.BuildException;
@@ -46,9 +46,9 @@
 
 public class Cab extends MatchingTask {
     private static final int DEFAULT_RESULT = -99;
+
     private File cabFile;
     private File baseDir;
-    private Vector filesets = new Vector();
     private boolean doCompress = true;
     private boolean doVerbose = false;
     private String cmdOptions;
@@ -59,6 +59,10 @@
 
     private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
 
+    {
+        fileset = null;
+    }
+
     /**
      * The name/location of where to create the .cab file.
      * @param cabFile the location of the cab file.
@@ -101,13 +105,13 @@
 
     /**
      * Adds a set of files to archive.
-     * @param set a set of files to archive.
+     * @param fileset a set of files to archive.
      */
-    public void addFileset(FileSet set) {
-        if (filesets.size() > 0) {
+    public void addFileset(FileSet fileset) {
+        if (fileset != null) {
             throw new BuildException("Only one nested fileset allowed");
         }
-        filesets.addElement(set);
+        this.fileset = fileset;
     }
 
     /*
@@ -120,15 +124,15 @@
      * @throws BuildException on error.
      */
     protected void checkConfiguration() throws BuildException {
-        if (baseDir == null && filesets.size() == 0) {
-            throw new BuildException("basedir attribute or one "
-                                     + "nested fileset is required!",
-                                     getLocation());
+        if (baseDir == null && fileset == null) {
+            throw new BuildException(
+                "basedir attribute or one nested fileset is required!",
+                getLocation());
         }
         if (baseDir != null && !baseDir.exists()) {
             throw new BuildException("basedir does not exist!", getLocation());
         }
-        if (baseDir != null && filesets.size() > 0) {
+        if (baseDir != null && fileset != null) {
             throw new BuildException(
                 "Both basedir attribute and a nested fileset is not allowed");
         }
@@ -145,8 +149,7 @@
      * @throws BuildException on error.
      */
     protected ExecTask createExec() throws BuildException {
-        ExecTask exec = new ExecTask(this);
-        return exec;
+        return new ExecTask(this);
     }
 
     /**
@@ -154,17 +157,10 @@
      * @param files the list of files to check.
      * @return true if the cab file is newer than its dependents.
      */
-    protected boolean isUpToDate(Vector files) {
-        boolean upToDate = true;
-        final int size = files.size();
-        for (int i = 0; i < size && upToDate; i++) {
-            String file = files.elementAt(i).toString();
-            if (FILE_UTILS.resolveFile(baseDir, file).lastModified()
-                    > cabFile.lastModified()) {
-                upToDate = false;
-            }
-        }
-        return upToDate;
+    protected boolean isUpToDate(Vector<String> files) {
+        final long cabModified = cabFile.lastModified();
+        return files.stream().map(f -> FILE_UTILS.resolveFile(baseDir, f))
+            .mapToLong(File::lastModified).allMatch(t -> t < cabModified);
     }
 
     /**
@@ -177,23 +173,18 @@
      * @return the list file created.
      * @throws IOException if there is an error.
      */
-    protected File createListFile(Vector files)
+    protected File createListFile(Vector<String> files)
         throws IOException {
         File listFile = FILE_UTILS.createTempFile("ant", "", null, true, true);
 
-        BufferedWriter writer = null;
-        try {
-            writer = new BufferedWriter(new FileWriter(listFile));
-
-            final int size = files.size();
-            for (int i = 0; i < size; i++) {
-                writer.write('\"' + files.elementAt(i).toString() + '\"');
+        try (BufferedWriter writer =
+            new BufferedWriter(new FileWriter(listFile))) {
+            for (String f : files) {
+                String s = String.format("\"%s\"", f);
+                writer.write(s);
                 writer.newLine();
             }
-        } finally {
-            FileUtils.close(writer);
         }
-
         return listFile;
     }
 
@@ -202,12 +193,8 @@
      * @param files the vector to append the files to.
      * @param ds the scanner to get the files from.
      */
-    protected void appendFiles(Vector files, DirectoryScanner ds) {
-        String[] dsfiles = ds.getIncludedFiles();
-
-        for (int i = 0; i < dsfiles.length; i++) {
-            files.addElement(dsfiles[i]);
-        }
+    protected void appendFiles(Vector<String> files, DirectoryScanner ds) {
+        Collections.addAll(files, ds.getIncludedFiles());
     }
 
     /**
@@ -217,18 +204,16 @@
      * @return the list of files.
      * @throws BuildException if there is an error.
      */
-    protected Vector getFileList() throws BuildException {
-        Vector files = new Vector();
+    protected Vector<String> getFileList() throws BuildException {
+        Vector<String> files = new Vector<>();
 
         if (baseDir != null) {
             // get files from old methods - includes and nested include
             appendFiles(files, super.getDirectoryScanner(baseDir));
         } else {
-            FileSet fs = (FileSet) filesets.elementAt(0);
-            baseDir = fs.getDir();
-            appendFiles(files, fs.getDirectoryScanner(getProject()));
+            baseDir = fileset.getDir();
+            appendFiles(files, fileset.getDirectoryScanner(getProject()));
         }
-
         return files;
     }
 
@@ -236,11 +221,12 @@
      * execute this task.
      * @throws BuildException on error.
      */
+    @Override
     public void execute() throws BuildException {
 
         checkConfiguration();
 
-        Vector files = getFileList();
+        Vector<String> files = getFileList();
 
         // quick exit if the target is up to date
         if (isUpToDate(files)) {
@@ -252,20 +238,17 @@
         if (!Os.isFamily("windows")) {
             log("Using listcab/libcabinet", Project.MSG_VERBOSE);
 
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
 
-            Enumeration fileEnum = files.elements();
+            files.forEach(f -> sb.append(f).append("\n"));
 
-            while (fileEnum.hasMoreElements()) {
-                sb.append(fileEnum.nextElement()).append("\n");
-            }
             sb.append("\n").append(cabFile.getAbsolutePath()).append("\n");
 
             try {
                 Process p = Execute.launch(getProject(),
-                                           new String[] {"listcab"}, null,
-                                           baseDir != null ? baseDir : getProject().getBaseDir(),
-                                           true);
+                    new String[] {"listcab"}, null,
+                    baseDir != null ? baseDir : getProject().getBaseDir(),
+                    true);
                 OutputStream out = p.getOutputStream();
 
                 // Create the stream pumpers to forward listcab's stdout and stderr to the log
@@ -277,8 +260,8 @@
                 StreamPumper    errPump = new StreamPumper(p.getErrorStream(), errLog);
 
                 // Pump streams asynchronously
-                (new Thread(outPump)).start();
-                (new Thread(errPump)).start();
+                new Thread(outPump).start();
+                new Thread(errPump).start();
 
                 out.write(sb.toString().getBytes());
                 out.flush();
@@ -305,8 +288,9 @@
                     log("Error executing listcab; error code: " + result);
                 }
             } catch (IOException ex) {
-                String msg = "Problem creating " + cabFile + " " + ex.getMessage();
-                throw new BuildException(msg, getLocation());
+                throw new BuildException(
+                    "Problem creating " + cabFile + " " + ex.getMessage(),
+                    getLocation());
             }
         } else {
             try {
@@ -348,8 +332,9 @@
 
                 listFile.delete();
             } catch (IOException ioe) {
-                String msg = "Problem creating " + cabFile + " " + ioe.getMessage();
-                throw new BuildException(msg, getLocation());
+                throw new BuildException(
+                    "Problem creating " + cabFile + " " + ioe.getMessage(),
+                    getLocation());
             }
         }
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.java	2018-03-24 12:37:12.000000000 +0000
@@ -25,14 +25,13 @@
  */
 public class CCMCheckinDefault extends CCMCheck {
 
+    /** The default task */
+    public static final String DEFAULT_TASK = "default";
+
     /** Constructor for CCMCheckinDefault. */
     public CCMCheckinDefault() {
         super();
         setCcmAction(COMMAND_CHECKIN);
         setTask(DEFAULT_TASK);
     }
-
-    /** The default task */
-    public static final String DEFAULT_TASK = "default";
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckin.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckin.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckin.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckin.java	2018-03-24 12:37:12.000000000 +0000
@@ -36,4 +36,3 @@
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java	2018-03-24 12:37:12.000000000 +0000
@@ -29,12 +29,20 @@
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.FileSet;
 
-
 /**
  * Class common to all check commands (checkout, checkin,checkin default task);
  * @ant.task ignore="true"
  */
 public class CCMCheck extends Continuus {
+    /**
+     * -comment flag -- comment to attach to the file
+     */
+    public static final String FLAG_COMMENT = "/comment";
+
+    /**
+     *  -task flag -- associate checkout task with task
+     */
+    public static final String FLAG_TASK = "/task";
 
     private File file = null;
     private String comment = null;
@@ -42,15 +50,10 @@
 
     // CheckStyle:VisibilityModifier OFF - bc
 
-    protected Vector filesets = new Vector();
+    protected Vector<FileSet> filesets = new Vector<>();
 
     // CheckStyle:VisibilityModifier ON
 
-    /** Constructor for CCMCheck. */
-    public CCMCheck() {
-        super();
-    }
-
     /**
      * Get the value of file.
      * @return value of file.
@@ -84,7 +87,6 @@
         this.comment = v;
     }
 
-
     /**
      * Get the value of task.
      * @return value of task.
@@ -102,7 +104,6 @@
         this.task = v;
     }
 
-
     /**
      * Adds a set of files to copy.
      * @param set the set of files
@@ -120,9 +121,10 @@
      * </p>
      * @throws BuildException on error
      */
+    @Override
     public void execute() throws BuildException {
 
-        if (file == null && filesets.size() == 0) {
+        if (file == null && filesets.isEmpty()) {
             throw new BuildException(
                 "Specify at least one source - a file or a fileset.");
         }
@@ -131,7 +133,7 @@
             throw new BuildException("CCMCheck cannot be generated for directories");
         }
 
-        if (file != null  && filesets.size() > 0) {
+        if (file != null && !filesets.isEmpty()) {
             throw new BuildException("Choose between file and fileset !");
         }
 
@@ -140,14 +142,11 @@
             return;
         }
 
-        int sizeofFileSet = filesets.size();
-        for (int i = 0; i < sizeofFileSet; i++) {
-            FileSet fs = (FileSet) filesets.elementAt(i);
+        for (FileSet fs : filesets) {
+            final File basedir = fs.getDir(getProject());
             DirectoryScanner ds = fs.getDirectoryScanner(getProject());
-            String[] srcFiles = ds.getIncludedFiles();
-            for (int j = 0; j < srcFiles.length; j++) {
-                File src = new File(fs.getDir(getProject()), srcFiles[j]);
-                setFile(src);
+            for (String srcFile : ds.getIncludedFiles()) {
+                setFile(new File(basedir, srcFile));
                 doit();
             }
         }
@@ -170,12 +169,11 @@
 
         int result = run(commandLine);
         if (Execute.isFailure(result)) {
-            String msg = "Failed executing: " + commandLine.toString();
-            throw new BuildException(msg, getLocation());
+            throw new BuildException("Failed executing: " + commandLine,
+                getLocation());
         }
     }
 
-
     /**
      * Check the command line options.
      */
@@ -195,14 +193,4 @@
         }
     }
 
-    /**
-     * -comment flag -- comment to attach to the file
-     */
-    public static final String FLAG_COMMENT = "/comment";
-
-    /**
-     *  -task flag -- associate checkout task with task
-     */
-    public static final String FLAG_TASK = "/task";
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckout.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckout.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckout.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckout.java	2018-03-24 12:37:12.000000000 +0000
@@ -32,4 +32,3 @@
         setCcmAction(COMMAND_CHECKOUT);
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -38,6 +38,35 @@
  * @ant.task name="ccmcreatetask" category="scm"
  */
 public class CCMCreateTask extends Continuus implements ExecuteStreamHandler {
+    /**
+     * /comment -- comments associated to the task
+     */
+    public static final String FLAG_COMMENT = "/synopsis";
+
+    /**
+     *  /platform flag -- target platform
+     */
+    public static final String FLAG_PLATFORM = "/plat";
+
+    /**
+     * /resolver flag
+     */
+    public static final String FLAG_RESOLVER = "/resolver";
+
+    /**
+     * /release flag
+     */
+    public static final String FLAG_RELEASE = "/release";
+
+    /**
+     * /release flag
+     */
+    public static final String FLAG_SUBSYSTEM = "/subsystem";
+
+    /**
+     *  -task flag -- associate checkout task with task
+     */
+    public static final String FLAG_TASK = "/task";
 
     private String comment = null;
     private String platform = null;
@@ -63,9 +92,9 @@
      * </p>
      * @throws BuildException on error
      */
+    @Override
     public void execute() throws BuildException {
         Commandline commandLine = new Commandline();
-        int result = 0;
 
         // build the command line from what we got the format
         // as specified in the CCM.EXE help
@@ -74,10 +103,9 @@
 
         checkOptions(commandLine);
 
-        result = run(commandLine, this);
-        if (Execute.isFailure(result)) {
-            String msg = "Failed executing: " + commandLine.toString();
-            throw new BuildException(msg, getLocation());
+        if (Execute.isFailure(run(commandLine, this))) {
+            throw new BuildException("Failed executing: " + commandLine,
+                getLocation());
         }
 
         //create task ok, set this task as the default one
@@ -88,15 +116,12 @@
 
         log(commandLine.describeCommand(), Project.MSG_DEBUG);
 
-        result = run(commandLine2);
-        if (result != 0) {
-            String msg = "Failed executing: " + commandLine2.toString();
-            throw new BuildException(msg, getLocation());
+        if (run(commandLine2) != 0) {
+            throw new BuildException("Failed executing: " + commandLine2,
+                getLocation());
         }
-
     }
 
-
     /**
      * Check the command line options.
      */
@@ -127,7 +152,6 @@
         }
     }
 
-
     /**
      * Get the value of comment.
      * @return value of comment.
@@ -145,7 +169,6 @@
         this.comment = v;
     }
 
-
     /**
      * Get the value of platform.
      * @return value of platform.
@@ -163,7 +186,6 @@
         this.platform = v;
     }
 
-
     /**
      * Get the value of resolver.
      * @return value of resolver.
@@ -181,7 +203,6 @@
         this.resolver = v;
     }
 
-
     /**
      * Get the value of release.
      * @return value of release.
@@ -216,7 +237,6 @@
         this.subSystem = v;
     }
 
-
     /**
      * Get the value of task.
      * @return value of task.
@@ -235,71 +255,45 @@
         this.task = v;
     }
 
-    /**
-     * /comment -- comments associated to the task
-     */
-    public static final String FLAG_COMMENT = "/synopsis";
-
-    /**
-     *  /platform flag -- target platform
-     */
-    public static final String FLAG_PLATFORM = "/plat";
-
-    /**
-     * /resolver flag
-     */
-    public static final String FLAG_RESOLVER = "/resolver";
-
-    /**
-     * /release flag
-     */
-    public static final String FLAG_RELEASE = "/release";
-
-    /**
-     * /release flag
-     */
-    public static final String FLAG_SUBSYSTEM = "/subsystem";
-
-    /**
-     *  -task flag -- associate checkout task with task
-     */
-    public static final String FLAG_TASK = "/task";
-
-
     // implementation of org.apache.tools.ant.taskdefs.ExecuteStreamHandler interface
 
     /**
      *
      * @throws IOException on error
      */
+    @Override
     public void start() throws IOException {
     }
 
     /**
      *
      */
+    @Override
     public void stop() {
     }
 
     /**
      *
      * @param param1 the output stream
-     * @exception java.io.IOException on error
+     * @exception IOException on error
      */
+    @Override
     public void setProcessInputStream(OutputStream param1) throws IOException {
     }
 
     /**
      *
      * @param is the input stream
-     * @exception java.io.IOException on error
+     * @exception IOException on error
      */
+    @Override
     public void setProcessErrorStream(InputStream is) throws IOException {
-        BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-        String s = reader.readLine();
-        if (s != null) {
-            log("err " + s, Project.MSG_DEBUG);
-        } // end of if ()
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(is))) {
+            String s = reader.readLine();
+            if (s != null) {
+                log("err " + s, Project.MSG_DEBUG);
+            }
+        }
     }
 
     /**
@@ -307,12 +301,11 @@
      * @param is InputStream
      * @throws IOException on error
      */
+    @Override
     public void setProcessOutputStream(InputStream is) throws IOException {
-
-        String buffer = "";
-        try {
-            BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-            buffer = reader.readLine();
+        try (BufferedReader reader =
+            new BufferedReader(new InputStreamReader(is))) {
+            String buffer = reader.readLine();
             if (buffer != null) {
                 log("buffer:" + buffer, Project.MSG_DEBUG);
                 String taskstring = buffer.substring(buffer.indexOf(' ')).trim();
@@ -323,7 +316,7 @@
         } catch (NullPointerException npe) {
             log("error procession stream, null pointer exception", Project.MSG_ERR);
             log(StringUtils.getStackTrace(npe), Project.MSG_ERR);
-            throw new BuildException(npe.getClass().getName());
+            throw new BuildException(npe);
         } catch (Exception e) {
             log("error procession stream " + e.getMessage(), Project.MSG_ERR);
             throw new BuildException(e.getMessage());
@@ -332,4 +325,3 @@
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java	2018-03-24 12:37:12.000000000 +0000
@@ -28,6 +28,21 @@
  * Task allows to reconfigure a project, recursively or not
  */
 public class CCMReconfigure extends Continuus {
+    /**
+     * /recurse --
+     */
+    public static final String FLAG_RECURSE = "/recurse";
+
+    /**
+     * /recurse --
+     */
+    public static final String FLAG_VERBOSE = "/verbose";
+
+
+    /**
+     *  /project flag -- target project
+     */
+    public static final String FLAG_PROJECT = "/project";
 
     private String ccmProject = null;
     private boolean recurse = false;
@@ -39,7 +54,6 @@
         setCcmAction(COMMAND_RECONFIGURE);
     }
 
-
     /**
      * Executes the task.
      * <p>
@@ -48,9 +62,9 @@
      * </p>
      * @throws BuildException on error
      */
+    @Override
     public void execute() throws BuildException {
         Commandline commandLine = new Commandline();
-        int result = 0;
 
         // build the command line from what we got the format
         // as specified in the CCM.EXE help
@@ -59,14 +73,13 @@
 
         checkOptions(commandLine);
 
-        result = run(commandLine);
+        int result = run(commandLine);
         if (Execute.isFailure(result)) {
-            String msg = "Failed executing: " + commandLine.toString();
-            throw new BuildException(msg, getLocation());
+            throw new BuildException("Failed executing: " + commandLine,
+                getLocation());
         }
     }
 
-
     /**
      * Check the command line options.
      */
@@ -103,7 +116,6 @@
         this.ccmProject = v;
     }
 
-
     /**
      * Get the value of recurse.
      * @return value of recurse.
@@ -121,7 +133,6 @@
         this.recurse = v;
     }
 
-
     /**
      * Get the value of verbose.
      * @return value of verbose.
@@ -138,22 +149,4 @@
         this.verbose = v;
     }
 
-
-    /**
-     * /recurse --
-     */
-    public static final String FLAG_RECURSE = "/recurse";
-
-    /**
-     * /recurse --
-     */
-    public static final String FLAG_VERBOSE = "/verbose";
-
-
-    /**
-     *  /project flag -- target project
-     */
-    public static final String FLAG_PROJECT = "/project";
-
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,6 +18,8 @@
 
 package org.apache.tools.ant.taskdefs.optional.ccm;
 
+import java.io.IOException;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
@@ -39,6 +41,32 @@
  *
  */
 public abstract class Continuus extends Task {
+    /**
+     * Constant for the thing to execute
+     */
+    private static final String CCM_EXE = "ccm";
+
+    /**
+     * The 'CreateTask' command
+     */
+    public static final String COMMAND_CREATE_TASK = "create_task";
+    /**
+     * The 'Checkout' command
+     */
+    public static final String COMMAND_CHECKOUT = "co";
+    /**
+     * The 'Checkin' command
+     */
+    public static final String COMMAND_CHECKIN = "ci";
+    /**
+     * The 'Reconfigure' command
+     */
+    public static final String COMMAND_RECONFIGURE = "reconfigure";
+
+    /**
+     * The 'Reconfigure' command
+     */
+    public static final String COMMAND_DEFAULT_TASK = "default_task";
 
     private String ccmDir = "";
     private String ccmAction = "";
@@ -60,7 +88,6 @@
         this.ccmAction = v;
     }
 
-
     /**
      * Set the directory where the ccm executable is located.
      *
@@ -76,7 +103,7 @@
      */
     protected final String getCcmCommand() {
         String toReturn = ccmDir;
-        if (!toReturn.equals("") && !toReturn.endsWith("/")) {
+        if (!("".equals(toReturn) || toReturn.endsWith("/"))) {
             toReturn += "/";
         }
 
@@ -85,7 +112,6 @@
         return toReturn;
     }
 
-
     /**
      * Run the command.
      * @param cmd the command line
@@ -99,7 +125,7 @@
             exe.setWorkingDirectory(getProject().getBaseDir());
             exe.setCommandline(cmd.getCommandline());
             return exe.execute();
-        } catch (java.io.IOException e) {
+        } catch (IOException e) {
             throw new BuildException(e, getLocation());
         }
     }
@@ -113,32 +139,4 @@
         return run(cmd, new LogStreamHandler(this, Project.MSG_VERBOSE, Project.MSG_WARN));
     }
 
-    /**
-     * Constant for the thing to execute
-     */
-    private static final String CCM_EXE = "ccm";
-
-    /**
-     * The 'CreateTask' command
-     */
-    public static final String COMMAND_CREATE_TASK = "create_task";
-    /**
-     * The 'Checkout' command
-     */
-    public static final String COMMAND_CHECKOUT = "co";
-    /**
-     * The 'Checkin' command
-     */
-    public static final String COMMAND_CHECKIN = "ci";
-    /**
-     * The 'Reconfigure' command
-     */
-    public static final String COMMAND_RECONFIGURE = "reconfigure";
-
-    /**
-     * The 'Reconfigure' command
-     */
-    public static final String COMMAND_DEFAULT_TASK = "default_task";
-
-
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java	2018-03-24 12:37:12.000000000 +0000
@@ -79,6 +79,41 @@
  *
  */
 public class CCCheckin extends ClearCase {
+    /**
+     * -c flag -- comment to attach to the file
+     */
+    public static final String FLAG_COMMENT = "-c";
+
+    /**
+     * -cfile flag -- file containing a comment to attach to the file
+     */
+    public static final String FLAG_COMMENTFILE = "-cfile";
+
+    /**
+     * -nc flag -- no comment is specified
+     */
+    public static final String FLAG_NOCOMMENT = "-nc";
+
+    /**
+     * -nwarn flag -- suppresses warning messages
+     */
+    public static final String FLAG_NOWARN = "-nwarn";
+
+    /**
+     * -ptime flag -- preserves the modification time
+     */
+    public static final String FLAG_PRESERVETIME = "-ptime";
+
+    /**
+     * -keep flag -- keeps a copy of the file with a .keep extension
+     */
+    public static final String FLAG_KEEPCOPY = "-keep";
+
+    /**
+     * -identical flag -- allows the file to be checked in even if it is identical to the original
+     */
+    public static final String FLAG_IDENTICAL = "-identical";
+
     private String mComment = null;
     private String mCfile = null;
     private boolean mNwarn = false;
@@ -93,10 +128,10 @@
      * to execute the command line.
      * @throws BuildException if the command fails and failonerr is set to true
      */
+    @Override
     public void execute() throws BuildException {
         Commandline commandLine = new Commandline();
         Project aProj = getProject();
-        int result = 0;
 
         // Default the viewpath to basedir if it is not specified
         if (getViewPath() == null) {
@@ -115,14 +150,12 @@
             getProject().log("Ignoring any errors that occur for: "
                     + getViewPathBasename(), Project.MSG_VERBOSE);
         }
-        result = run(commandLine);
+        int result = run(commandLine);
         if (Execute.isFailure(result) && getFailOnErr()) {
-            String msg = "Failed executing: " + commandLine.toString();
-            throw new BuildException(msg, getLocation());
+            throw new BuildException("Failed executing: " + commandLine, getLocation());
         }
     }
 
-
     /**
      * Check the command line options.
      */
@@ -273,7 +306,6 @@
         return mIdentical;
     }
 
-
     /**
      * Get the 'comment' command
      *
@@ -310,35 +342,5 @@
         }
     }
 
-
-        /**
-     * -c flag -- comment to attach to the file
-     */
-    public static final String FLAG_COMMENT = "-c";
-        /**
-     * -cfile flag -- file containing a comment to attach to the file
-     */
-    public static final String FLAG_COMMENTFILE = "-cfile";
-        /**
-     * -nc flag -- no comment is specified
-     */
-    public static final String FLAG_NOCOMMENT = "-nc";
-        /**
-     * -nwarn flag -- suppresses warning messages
-     */
-    public static final String FLAG_NOWARN = "-nwarn";
-        /**
-     * -ptime flag -- preserves the modification time
-     */
-    public static final String FLAG_PRESERVETIME = "-ptime";
-        /**
-     * -keep flag -- keeps a copy of the file with a .keep extension
-     */
-    public static final String FLAG_KEEPCOPY = "-keep";
-        /**
-     * -identical flag -- allows the file to be checked in even if it is identical to the original
-     */
-    public static final String FLAG_IDENTICAL = "-identical";
-
 }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java	2018-03-24 12:37:12.000000000 +0000
@@ -95,6 +95,56 @@
  *
  */
 public class CCCheckout extends ClearCase {
+    /**
+     *  -reserved flag -- check out the file as reserved
+     */
+    public static final String FLAG_RESERVED = "-reserved";
+
+    /**
+     *  -reserved flag -- check out the file as unreserved
+     */
+    public static final String FLAG_UNRESERVED = "-unreserved";
+
+    /**
+     * -out flag -- create a writable file under a different filename
+     */
+    public static final String FLAG_OUT = "-out";
+
+    /**
+     * -ndata flag -- checks out the file but does not create an editable file containing its data
+     */
+    public static final String FLAG_NODATA = "-ndata";
+
+    /**
+     * -branch flag -- checks out the file on a specified branch
+     */
+    public static final String FLAG_BRANCH = "-branch";
+
+    /**
+     * -version flag -- allows checkout of a version that is not main latest
+     */
+    public static final String FLAG_VERSION = "-version";
+
+    /**
+     * -nwarn flag -- suppresses warning messages
+     */
+    public static final String FLAG_NOWARN = "-nwarn";
+
+    /**
+     * -c flag -- comment to attach to the file
+     */
+    public static final String FLAG_COMMENT = "-c";
+
+    /**
+     * -cfile flag -- file containing a comment to attach to the file
+     */
+    public static final String FLAG_COMMENTFILE = "-cfile";
+
+    /**
+     * -nc flag -- no comment is specified
+     */
+    public static final String FLAG_NOCOMMENT = "-nc";
+
     private boolean mReserved = true;
     private String mOut = null;
     private boolean mNdata = false;
@@ -112,10 +162,10 @@
      * to execute the command line.
      * @throws BuildException if the command fails and failonerr is set to true
      */
+    @Override
     public void execute() throws BuildException {
         Commandline commandLine = new Commandline();
         Project aProj = getProject();
-        int result = 0;
 
         // Default the viewpath to basedir if it is not specified
         if (getViewPath() == null) {
@@ -143,10 +193,10 @@
             getProject().log("Ignoring any errors that occur for: "
                     + getViewPathBasename(), Project.MSG_VERBOSE);
         }
-        result = run(commandLine);
+        int result = run(commandLine);
         if (Execute.isFailure(result) && getFailOnErr()) {
-            String msg = "Failed executing: " + commandLine.toString();
-            throw new BuildException(msg, getLocation());
+            throw new BuildException("Failed executing: " + commandLine,
+                getLocation());
         }
     }
 
@@ -155,7 +205,6 @@
      */
     private boolean lsCheckout() {
         Commandline cmdl = new Commandline();
-        String result;
 
         // build the command line from what we got the format is
         // cleartool lsco [options...] [viewpath ...]
@@ -168,12 +217,11 @@
         // viewpath
         cmdl.createArgument().setValue(getViewPath());
 
-        result = runS(cmdl);
-
-        // System.out.println( "lsCheckout: " + result );
+        String result = runS(cmdl);
 
-        return (result != null && result.length() > 0) ? true : false;
+        return (result != null && result.length() > 0);
     }
+
     /**
      * Check the command line options.
      */
@@ -190,23 +238,17 @@
         if (getOut() != null) {
             // -out
             getOutCommand(cmd);
-        } else {
-            if (getNoData()) {
-                // -ndata
-                cmd.createArgument().setValue(FLAG_NODATA);
-            }
-
+        } else if (getNoData()) {
+            // -ndata
+            cmd.createArgument().setValue(FLAG_NODATA);
         }
 
         if (getBranch() != null) {
             // -branch
             getBranchCommand(cmd);
-        } else {
-            if (getVersion()) {
-                // -version
-                cmd.createArgument().setValue(FLAG_VERSION);
-            }
-
+        } else if (getVersion()) {
+            // -version
+            cmd.createArgument().setValue(FLAG_VERSION);
         }
 
         if (getNoWarn()) {
@@ -217,20 +259,15 @@
         if (getComment() != null) {
             // -c
             getCommentCommand(cmd);
+        } else if (getCommentFile() != null) {
+            // -cfile
+            getCommentFileCommand(cmd);
         } else {
-            if (getCommentFile() != null) {
-                // -cfile
-                getCommentFileCommand(cmd);
-            } else {
-                cmd.createArgument().setValue(FLAG_NOCOMMENT);
-            }
+            cmd.createArgument().setValue(FLAG_NOCOMMENT);
         }
 
         // viewpath
         cmd.createArgument().setValue(getViewPath());
-
-        // Print out info about the notco option
-        // System.out.println( "Notco: " + (getNotco() ? "yes" : "no") );
     }
 
     /**
@@ -271,7 +308,6 @@
         return mNotco;
     }
 
-
     /**
      * Creates a writable file under a different filename.
      *
@@ -435,7 +471,6 @@
         }
     }
 
-
     /**
      * Get the 'comment' command
      *
@@ -472,46 +507,5 @@
         }
     }
 
-        /**
-     *  -reserved flag -- check out the file as reserved
-     */
-    public static final String FLAG_RESERVED = "-reserved";
-        /**
-     *  -reserved flag -- check out the file as unreserved
-     */
-    public static final String FLAG_UNRESERVED = "-unreserved";
-        /**
-     * -out flag -- create a writable file under a different filename
-     */
-    public static final String FLAG_OUT = "-out";
-        /**
-     * -ndata flag -- checks out the file but does not create an editable file containing its data
-     */
-    public static final String FLAG_NODATA = "-ndata";
-        /**
-     * -branch flag -- checks out the file on a specified branch
-     */
-    public static final String FLAG_BRANCH = "-branch";
-        /**
-     * -version flag -- allows checkout of a version that is not main latest
-     */
-    public static final String FLAG_VERSION = "-version";
-        /**
-     * -nwarn flag -- suppresses warning messages
-     */
-    public static final String FLAG_NOWARN = "-nwarn";
-        /**
-     * -c flag -- comment to attach to the file
-     */
-    public static final String FLAG_COMMENT = "-c";
-        /**
-     * -cfile flag -- file containing a comment to attach to the file
-     */
-    public static final String FLAG_COMMENTFILE = "-cfile";
-        /**
-     * -nc flag -- no comment is specified
-     */
-    public static final String FLAG_NOCOMMENT = "-nc";
-
 }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCLock.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCLock.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCLock.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCLock.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,19 +18,19 @@
 
 package org.apache.tools.ant.taskdefs.optional.clearcase;
 
+import java.util.Optional;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Execute;
 import org.apache.tools.ant.types.Commandline;
 
 
-/**
+/*
  * TODO:
  * comment field doesn't include all options yet
  */
 
-
-
 /**
  * Performs a ClearCase Lock command.
  *
@@ -86,6 +86,31 @@
  *
  */
 public class CCLock extends ClearCase {
+    /**
+     *  -replace flag -- replace existing lock on object(s)
+     */
+    public static final String FLAG_REPLACE = "-replace";
+
+    /**
+     * -nusers flag -- list of users to exclude from lock
+     */
+    public static final String FLAG_NUSERS = "-nusers";
+
+    /**
+     * -obsolete flag -- mark locked object as obsolete
+     */
+    public static final String FLAG_OBSOLETE = "-obsolete";
+
+    /**
+     * -comment flag -- method to use for commenting events
+     */
+    public static final String FLAG_COMMENT = "-comment";
+
+    /**
+     * -pname flag -- pathname to lock
+     */
+    public static final String FLAG_PNAME = "-pname";
+
     private boolean mReplace = false;
     private boolean mObsolete = false;
     private String mComment = null;
@@ -100,10 +125,10 @@
      * to execute the command line.
      * @throws BuildException if the command fails and failonerr is set to true
      */
+    @Override
     public void execute() throws BuildException {
         Commandline commandLine = new Commandline();
         Project aProj = getProject();
-        int result = 0;
 
         // Default the viewpath to basedir if it is not specified
         if (getViewPath() == null) {
@@ -126,17 +151,17 @@
             getProject().log("Ignoring any errors that occur for: "
                     + getOpType(), Project.MSG_VERBOSE);
         }
-        result = run(commandLine);
+        int result = run(commandLine);
         if (Execute.isFailure(result) && getFailOnErr()) {
-            String msg = "Failed executing: " + commandLine.toString();
-            throw new BuildException(msg, getLocation());
+            throw new BuildException("Failed executing: " + commandLine,
+                getLocation());
         }
     }
 
     /**
      * Check the command line options.
      */
-private void checkOptions(Commandline cmd) {
+    private void checkOptions(Commandline cmd) {
         // ClearCase items
         if (getReplace()) {
             // -replace
@@ -151,15 +176,15 @@
         getCommentCommand(cmd);
 
         if (getObjselect() == null && getPname() == null) {
-            throw new BuildException("Should select either an element "
-            + "(pname) or an object (objselect)");
+            throw new BuildException(
+                "Should select either an element (pname) or an object (objselect)");
         }
         getPnameCommand(cmd);
         // object selector
         if (getObjselect() != null) {
             cmd.createArgument().setValue(getObjselect());
         }
-}
+    }
 
     /**
      * If true, replace an existing lock.
@@ -290,15 +315,14 @@
     private void getNusersCommand(Commandline cmd) {
         if (getNusers() == null) {
             return;
-        } else {
-            /* Had to make two separate commands here because if a space is
-               inserted between the flag and the value, it is treated as a
-               Windows filename with a space and it is enclosed in double
-               quotes ("). This breaks clearcase.
-            */
-            cmd.createArgument().setValue(FLAG_NUSERS);
-            cmd.createArgument().setValue(getNusers());
         }
+        /* Had to make two separate commands here because if a space is
+           inserted between the flag and the value, it is treated as a
+           Windows filename with a space and it is enclosed in double
+           quotes ("). This breaks clearcase.
+        */
+        cmd.createArgument().setValue(FLAG_NUSERS);
+        cmd.createArgument().setValue(getNusers());
     }
 
     /**
@@ -310,15 +334,14 @@
     private void getCommentCommand(Commandline cmd) {
         if (getComment() == null) {
             return;
-        } else {
-            /* Had to make two separate commands here because if a space is
-               inserted between the flag and the value, it is treated as a
-               Windows filename with a space and it is enclosed in double
-               quotes ("). This breaks clearcase.
-            */
-            cmd.createArgument().setValue(FLAG_COMMENT);
-            cmd.createArgument().setValue(getComment());
         }
+        /* Had to make two separate commands here because if a space is
+           inserted between the flag and the value, it is treated as a
+           Windows filename with a space and it is enclosed in double
+           quotes ("). This breaks clearcase.
+        */
+        cmd.createArgument().setValue(FLAG_COMMENT);
+        cmd.createArgument().setValue(getComment());
     }
 
     /**
@@ -330,15 +353,14 @@
     private void getPnameCommand(Commandline cmd) {
         if (getPname() == null) {
             return;
-        } else {
-            /* Had to make two separate commands here because if a space is
-               inserted between the flag and the value, it is treated as a
-               Windows filename with a space and it is enclosed in double
-               quotes ("). This breaks clearcase.
-            */
-            cmd.createArgument().setValue(FLAG_PNAME);
-            cmd.createArgument().setValue(getPname());
         }
+        /* Had to make two separate commands here because if a space is
+           inserted between the flag and the value, it is treated as a
+           Windows filename with a space and it is enclosed in double
+           quotes ("). This breaks clearcase.
+        */
+        cmd.createArgument().setValue(FLAG_PNAME);
+        cmd.createArgument().setValue(getPname());
     }
 
     /**
@@ -347,33 +369,7 @@
      * @return String containing the object/pname being worked on
      */
     private String getOpType() {
-
-        if (getPname() != null) {
-            return getPname();
-        } else {
-            return getObjselect();
-        }
+        return Optional.ofNullable(getPname()).orElseGet(this::getObjselect);
     }
 
-    /**
-     *  -replace flag -- replace existing lock on object(s)
-     */
-    public static final String FLAG_REPLACE = "-replace";
-    /**
-     * -nusers flag -- list of users to exclude from lock
-     */
-    public static final String FLAG_NUSERS = "-nusers";
-    /**
-     * -obsolete flag -- mark locked object as obsolete
-     */
-    public static final String FLAG_OBSOLETE = "-obsolete";
-    /**
-     * -comment flag -- method to use for commenting events
-     */
-    public static final String FLAG_COMMENT = "-comment";
-    /**
-     * -pname flag -- pathname to lock
-     */
-    public static final String FLAG_PNAME = "-pname";
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkattr.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkattr.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkattr.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkattr.java	2018-03-24 12:37:12.000000000 +0000
@@ -84,6 +84,31 @@
  *
  */
 public class CCMkattr extends ClearCase {
+    /**
+     * -replace flag -- replace the existing value of the attribute
+     */
+    public static final String FLAG_REPLACE = "-replace";
+    /**
+     * -recurse flag -- process all subdirectories
+     */
+    public static final String FLAG_RECURSE = "-recurse";
+    /**
+     * -version flag -- attach attribute to specified version
+     */
+    public static final String FLAG_VERSION = "-version";
+    /**
+     * -c flag -- comment to attach to the element
+     */
+    public static final String FLAG_COMMENT = "-c";
+    /**
+     * -cfile flag -- file containing a comment to attach to the file
+     */
+    public static final String FLAG_COMMENTFILE = "-cfile";
+    /**
+     * -nc flag -- no comment is specified
+     */
+    public static final String FLAG_NOCOMMENT = "-nc";
+
     private boolean mReplace = false;
     private boolean mRecurse = false;
     private String mVersion = null;
@@ -99,10 +124,10 @@
      * to execute the command line.
      * @throws BuildException if the command fails and failonerr is set to true
      */
+    @Override
     public void execute() throws BuildException {
         Commandline commandLine = new Commandline();
         Project aProj = getProject();
-        int result = 0;
 
         // Check for required attributes
         if (getTypeName() == null) {
@@ -132,10 +157,10 @@
         // For debugging
         // System.out.println(commandLine.toString());
 
-        result = run(commandLine);
+        int result = run(commandLine);
         if (Execute.isFailure(result) && getFailOnErr()) {
-            String msg = "Failed executing: " + commandLine.toString();
-            throw new BuildException(msg, getLocation());
+            throw new BuildException("Failed executing: " + commandLine,
+                getLocation());
         }
     }
 
@@ -162,13 +187,11 @@
         if (getComment() != null) {
             // -c
             getCommentCommand(cmd);
+        } else if (getCommentFile() != null) {
+            // -cfile
+            getCommentFileCommand(cmd);
         } else {
-            if (getCommentFile() != null) {
-                // -cfile
-                getCommentFileCommand(cmd);
-            } else {
-                cmd.createArgument().setValue(FLAG_NOCOMMENT);
-            }
+            cmd.createArgument().setValue(FLAG_NOCOMMENT);
         }
 
         if (getTypeName() != null) {
@@ -183,7 +206,6 @@
         cmd.createArgument().setValue(getViewPath());
     }
 
-
     /**
      * Set the replace flag
      *
@@ -310,7 +332,6 @@
         return mTypeValue;
     }
 
-
     /**
      * Get the 'version' command
      *
@@ -398,29 +419,4 @@
         }
     }
 
-    /**
-     * -replace flag -- replace the existing value of the attribute
-     */
-    public static final String FLAG_REPLACE = "-replace";
-    /**
-     * -recurse flag -- process all subdirectories
-     */
-    public static final String FLAG_RECURSE = "-recurse";
-    /**
-     * -version flag -- attach attribute to specified version
-     */
-    public static final String FLAG_VERSION = "-version";
-    /**
-     * -c flag -- comment to attach to the element
-     */
-    public static final String FLAG_COMMENT = "-c";
-    /**
-     * -cfile flag -- file containing a comment to attach to the file
-     */
-    public static final String FLAG_COMMENTFILE = "-cfile";
-    /**
-     * -nc flag -- no comment is specified
-     */
-    public static final String FLAG_NOCOMMENT = "-nc";
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkbl.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkbl.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkbl.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkbl.java	2018-03-24 12:37:12.000000000 +0000
@@ -81,6 +81,36 @@
  *
  */
 public class CCMkbl extends ClearCase {
+
+    /**
+     * -c flag -- comment to attach to the file
+     */
+    public static final String FLAG_COMMENT = "-c";
+    /**
+     * -cfile flag -- file containing a comment to attach to the file
+     */
+    public static final String FLAG_COMMENTFILE = "-cfile";
+    /**
+     * -nc flag -- no comment is specified
+     */
+    public static final String FLAG_NOCOMMENT = "-nc";
+    /**
+     * -identical flag -- allows the file to be checked in even if it is identical to the original
+     */
+    public static final String FLAG_IDENTICAL = "-identical";
+    /**
+     * -incremental flag -- baseline to be created is incremental
+     */
+    public static final String FLAG_INCREMENTAL = "-incremental";
+    /**
+     * -full flag -- baseline to be created is full
+     */
+    public static final String FLAG_FULL = "-full";
+    /**
+     * -nlabel -- baseline to be created without a label
+     */
+    public static final String FLAG_NLABEL = "-nlabel";
+
     private String mComment = null;
     private String mCfile = null;
     private String mBaselineRootName = null;
@@ -89,7 +119,6 @@
     private boolean mFull = false;
     private boolean mNlabel = false;
 
-
     /**
      * Executes the task.
      * <p>
@@ -97,10 +126,10 @@
      * to execute the command line.
      * @throws BuildException if the command fails and failonerr is set to true
      */
+    @Override
     public void execute() throws BuildException {
         Commandline commandLine = new Commandline();
         Project aProj = getProject();
-        int result = 0;
 
         // Default the viewpath to basedir if it is not specified
         if (getViewPath() == null) {
@@ -119,14 +148,13 @@
             getProject().log("Ignoring any errors that occur for: "
                     + getBaselineRootName(), Project.MSG_VERBOSE);
         }
-        result = run(commandLine);
+        int result = run(commandLine);
         if (Execute.isFailure(result) && getFailOnErr()) {
-            String msg = "Failed executing: " + commandLine.toString();
-            throw new BuildException(msg, getLocation());
+            throw new BuildException("Failed executing: " + commandLine,
+                getLocation());
         }
     }
 
-
     /**
      * Check the command line options.
      */
@@ -134,13 +162,11 @@
         if (getComment() != null) {
             // -c
             getCommentCommand(cmd);
+        } else if (getCommentFile() != null) {
+            // -cfile
+            getCommentFileCommand(cmd);
         } else {
-            if (getCommentFile() != null) {
-                // -cfile
-                getCommentFileCommand(cmd);
-            } else {
-                cmd.createArgument().setValue(FLAG_NOCOMMENT);
-            }
+            cmd.createArgument().setValue(FLAG_NOCOMMENT);
         }
 
         if (getIdentical()) {
@@ -163,10 +189,8 @@
 
        // baseline_root_name
         cmd.createArgument().setValue(getBaselineRootName());
-
     }
 
-
     /**
      * Set comment string
      *
@@ -222,8 +246,6 @@
     }
 
     /**
-
-    /**
      * Set the nowarn flag
      *
      * @param nwarn the status to set the flag to
@@ -295,7 +317,6 @@
         return mNlabel;
     }
 
-
     /**
      * Get the 'comment' command
      *
@@ -332,35 +353,4 @@
         }
     }
 
-
-        /**
-     * -c flag -- comment to attach to the file
-     */
-    public static final String FLAG_COMMENT = "-c";
-        /**
-     * -cfile flag -- file containing a comment to attach to the file
-     */
-    public static final String FLAG_COMMENTFILE = "-cfile";
-        /**
-     * -nc flag -- no comment is specified
-     */
-    public static final String FLAG_NOCOMMENT = "-nc";
-        /**
-     * -identical flag -- allows the file to be checked in even if it is identical to the original
-     */
-    public static final String FLAG_IDENTICAL = "-identical";
-       /**
-     * -incremental flag -- baseline to be created is incremental
-     */
-    public static final String FLAG_INCREMENTAL = "-incremental";
-       /**
-     * -full flag -- baseline to be created is full
-     */
-    public static final String FLAG_FULL = "-full";
-       /**
-     * -nlabel -- baseline to be created without a label
-     */
-    public static final String FLAG_NLABEL = "-nlabel";
-
-
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkdir.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkdir.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkdir.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkdir.java	2018-03-24 12:37:12.000000000 +0000
@@ -64,6 +64,23 @@
  *
  */
 public class CCMkdir extends ClearCase {
+    /**
+     * -c flag -- comment to attach to the directory
+     */
+    public static final String FLAG_COMMENT = "-c";
+    /**
+     * -cfile flag -- file containing a comment to attach to the directory
+     */
+    public static final String FLAG_COMMENTFILE = "-cfile";
+    /**
+     * -nc flag -- no comment is specified
+     */
+    public static final String FLAG_NOCOMMENT = "-nc";
+    /**
+     * -nco flag -- do not checkout element after creation
+     */
+    public static final String FLAG_NOCHECKOUT = "-nco";
+
     private String  mComment = null;
     private String  mCfile   = null;
     private boolean mNoco    = false;
@@ -75,10 +92,10 @@
      * to execute the command line.
      * @throws BuildException if the command fails and failonerr is set to true
      */
+    @Override
     public void execute() throws BuildException {
         Commandline commandLine = new Commandline();
         Project aProj = getProject();
-        int result = 0;
 
         // Default the viewpath to basedir if it is not specified
         if (getViewPath() == null) {
@@ -97,10 +114,10 @@
             getProject().log("Ignoring any errors that occur for: "
                     + getViewPathBasename(), Project.MSG_VERBOSE);
         }
-        result = run(commandLine);
+        int result = run(commandLine);
         if (Execute.isFailure(result) && getFailOnErr()) {
-            String msg = "Failed executing: " + commandLine.toString();
-            throw new BuildException(msg, getLocation());
+            throw new BuildException("Failed executing: " + commandLine,
+                getLocation());
         }
     }
 
@@ -111,13 +128,11 @@
         if (getComment() != null) {
             // -c
             getCommentCommand(cmd);
+        } else if (getCommentFile() != null) {
+            // -cfile
+            getCommentFileCommand(cmd);
         } else {
-            if (getCommentFile() != null) {
-                // -cfile
-                getCommentFileCommand(cmd);
-            } else {
-                cmd.createArgument().setValue(FLAG_NOCOMMENT);
-            }
+            cmd.createArgument().setValue(FLAG_NOCOMMENT);
         }
         if (getNoCheckout()) {
             // -nco
@@ -181,7 +196,6 @@
         return mNoco;
     }
 
-
     /**
      * Get the 'comment' command
      *
@@ -218,21 +232,4 @@
         }
     }
 
-    /**
-     * -c flag -- comment to attach to the directory
-     */
-    public static final String FLAG_COMMENT = "-c";
-    /**
-     * -cfile flag -- file containing a comment to attach to the directory
-     */
-    public static final String FLAG_COMMENTFILE = "-cfile";
-    /**
-     * -nc flag -- no comment is specified
-     */
-    public static final String FLAG_NOCOMMENT = "-nc";
-    /**
-     * -nco flag -- do not checkout element after creation
-     */
-    public static final String FLAG_NOCHECKOUT = "-nco";
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkelem.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkelem.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkelem.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkelem.java	2018-03-24 12:37:12.000000000 +0000
@@ -89,6 +89,43 @@
  *
  */
 public class CCMkelem extends ClearCase {
+    /**
+     * -c flag -- comment to attach to the file
+     */
+    public static final String FLAG_COMMENT = "-c";
+    /**
+     * -cfile flag -- file containing a comment to attach to the file
+     */
+    public static final String FLAG_COMMENTFILE = "-cfile";
+    /**
+     * -nc flag -- no comment is specified
+     */
+    public static final String FLAG_NOCOMMENT = "-nc";
+    /**
+     * -nwarn flag -- suppresses warning messages
+     */
+    public static final String FLAG_NOWARN = "-nwarn";
+    /**
+     * -ptime flag -- preserves the modification time on checkin
+     */
+    public static final String FLAG_PRESERVETIME = "-ptime";
+    /**
+     * -nco flag -- do not checkout element after creation
+     */
+    public static final String FLAG_NOCHECKOUT = "-nco";
+    /**
+     * -ci flag -- checkin element after creation
+     */
+    public static final String FLAG_CHECKIN = "-ci";
+    /**
+     * -master flag -- change mastership of main branch to current site
+     */
+    public static final String FLAG_MASTER = "-master";
+    /**
+     * -eltype flag -- element type to use during creation
+     */
+    public static final String FLAG_ELTYPE = "-eltype";
+
     private String  mComment = null;
     private String  mCfile   = null;
     private boolean mNwarn   = false;
@@ -105,10 +142,10 @@
      * to execute the command line.
      * @throws BuildException if the command fails and failonerr is set to true
      */
+    @Override
     public void execute() throws BuildException {
         Commandline commandLine = new Commandline();
         Project aProj = getProject();
-        int result = 0;
 
         // Default the viewpath to basedir if it is not specified
         if (getViewPath() == null) {
@@ -127,14 +164,13 @@
             getProject().log("Ignoring any errors that occur for: "
                     + getViewPathBasename(), Project.MSG_VERBOSE);
         }
-        result = run(commandLine);
+        int result = run(commandLine);
         if (Execute.isFailure(result) && getFailOnErr()) {
-            String msg = "Failed executing: " + commandLine.toString();
-            throw new BuildException(msg, getLocation());
+            throw new BuildException("Failed executing: " + commandLine,
+                getLocation());
         }
     }
 
-
     /**
      * Check the command line options.
      */
@@ -142,13 +178,11 @@
         if (getComment() != null) {
             // -c
             getCommentCommand(cmd);
+        } else if (getCommentFile() != null) {
+            // -cfile
+            getCommentFileCommand(cmd);
         } else {
-            if (getCommentFile() != null) {
-                // -cfile
-                getCommentFileCommand(cmd);
-            } else {
-                cmd.createArgument().setValue(FLAG_NOCOMMENT);
-            }
+            cmd.createArgument().setValue(FLAG_NOCOMMENT);
         }
 
         if (getNoWarn()) {
@@ -330,7 +364,6 @@
         return mEltype;
     }
 
-
     /**
      * Get the 'comment' command
      *
@@ -385,41 +418,4 @@
         }
     }
 
-    /**
-     * -c flag -- comment to attach to the file
-     */
-    public static final String FLAG_COMMENT = "-c";
-    /**
-     * -cfile flag -- file containing a comment to attach to the file
-     */
-    public static final String FLAG_COMMENTFILE = "-cfile";
-    /**
-     * -nc flag -- no comment is specified
-     */
-    public static final String FLAG_NOCOMMENT = "-nc";
-    /**
-     * -nwarn flag -- suppresses warning messages
-     */
-    public static final String FLAG_NOWARN = "-nwarn";
-    /**
-     * -ptime flag -- preserves the modification time on checkin
-     */
-    public static final String FLAG_PRESERVETIME = "-ptime";
-    /**
-     * -nco flag -- do not checkout element after creation
-     */
-    public static final String FLAG_NOCHECKOUT = "-nco";
-    /**
-     * -ci flag -- checkin element after creation
-     */
-    public static final String FLAG_CHECKIN = "-ci";
-    /**
-     * -master flag -- change mastership of main branch to current site
-     */
-    public static final String FLAG_MASTER = "-master";
-    /**
-     * -eltype flag -- element type to use during creation
-     */
-    public static final String FLAG_ELTYPE = "-eltype";
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklabel.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklabel.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklabel.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklabel.java	2018-03-24 12:37:12.000000000 +0000
@@ -83,6 +83,31 @@
  *
  */
 public class CCMklabel extends ClearCase {
+    /**
+     * -replace flag -- replace another label of the same type
+     */
+    public static final String FLAG_REPLACE = "-replace";
+    /**
+     * -recurse flag -- process all subdirectories
+     */
+    public static final String FLAG_RECURSE = "-recurse";
+    /**
+     * -version flag -- attach label to specified version
+     */
+    public static final String FLAG_VERSION = "-version";
+    /**
+     * -c flag -- comment to attach to the file
+     */
+    public static final String FLAG_COMMENT = "-c";
+    /**
+     * -cfile flag -- file containing a comment to attach to the file
+     */
+    public static final String FLAG_COMMENTFILE = "-cfile";
+    /**
+     * -nc flag -- no comment is specified
+     */
+    public static final String FLAG_NOCOMMENT = "-nc";
+
     private boolean mReplace = false;
     private boolean mRecurse = false;
     private String mVersion = null;
@@ -98,10 +123,10 @@
      * to execute the command line.
      * @throws BuildException if the command fails and failonerr is set to true
      */
+    @Override
     public void execute() throws BuildException {
         Commandline commandLine = new Commandline();
         Project aProj = getProject();
-        int result = 0;
 
         // Check for required attributes
         if (getTypeName() == null) {
@@ -125,10 +150,10 @@
             getProject().log("Ignoring any errors that occur for: "
                     + getViewPathBasename(), Project.MSG_VERBOSE);
         }
-        result = run(commandLine);
+        int result = run(commandLine);
         if (Execute.isFailure(result) && getFailOnErr()) {
-            String msg = "Failed executing: " + commandLine.toString();
-            throw new BuildException(msg, getLocation());
+            throw new BuildException("Failed executing: " + commandLine,
+                getLocation());
         }
     }
 
@@ -155,13 +180,11 @@
         if (getComment() != null) {
             // -c
             getCommentCommand(cmd);
+        } else if (getCommentFile() != null) {
+            // -cfile
+            getCommentFileCommand(cmd);
         } else {
-            if (getCommentFile() != null) {
-                // -cfile
-                getCommentFileCommand(cmd);
-            } else {
-                cmd.createArgument().setValue(FLAG_NOCOMMENT);
-            }
+            cmd.createArgument().setValue(FLAG_NOCOMMENT);
         }
 
         if (getTypeName() != null) {
@@ -173,7 +196,6 @@
         cmd.createArgument().setValue(getViewPath());
     }
 
-
     /**
      * Set the replace flag
      *
@@ -300,7 +322,6 @@
         return mVOB;
     }
 
-
     /**
      * Get the 'version' command
      *
@@ -362,10 +383,9 @@
      *        without the type-name
      */
     private void getTypeCommand(Commandline cmd) {
-        String typenm = null;
 
         if (getTypeName() != null) {
-            typenm = getTypeName();
+            String typenm = getTypeName();
             if (getVOB() != null) {
                 typenm += "@" + getVOB();
             }
@@ -373,31 +393,4 @@
         }
     }
 
-
-    /**
-     * -replace flag -- replace another label of the same type
-     */
-    public static final String FLAG_REPLACE = "-replace";
-    /**
-     * -recurse flag -- process all subdirectories
-     */
-    public static final String FLAG_RECURSE = "-recurse";
-    /**
-     * -version flag -- attach label to specified version
-     */
-    public static final String FLAG_VERSION = "-version";
-    /**
-     * -c flag -- comment to attach to the file
-     */
-    public static final String FLAG_COMMENT = "-c";
-    /**
-     * -cfile flag -- file containing a comment to attach to the file
-     */
-    public static final String FLAG_COMMENTFILE = "-cfile";
-    /**
-     * -nc flag -- no comment is specified
-     */
-    public static final String FLAG_NOCOMMENT = "-nc";
-
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklbtype.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklbtype.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklbtype.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklbtype.java	2018-03-24 12:37:12.000000000 +0000
@@ -95,6 +95,39 @@
  *
  */
 public class CCMklbtype extends ClearCase {
+    /**
+     * -replace flag -- replace existing label definition of the same type
+     */
+    public static final String FLAG_REPLACE = "-replace";
+    /**
+     * -global flag -- creates a label type that is global to the VOB or to VOBs that use this VOB
+     */
+    public static final String FLAG_GLOBAL = "-global";
+    /**
+     * -ordinary flag -- creates a label type that can be used only in the current VOB
+     */
+    public static final String FLAG_ORDINARY = "-ordinary";
+    /**
+     * -pbranch flag -- allows label type to be used once per branch
+     */
+    public static final String FLAG_PBRANCH = "-pbranch";
+    /**
+     * -shared flag -- sets the way mastership is checked by ClearCase
+     */
+    public static final String FLAG_SHARED = "-shared";
+    /**
+     * -c flag -- comment to attach to the file
+     */
+    public static final String FLAG_COMMENT = "-c";
+    /**
+     * -cfile flag -- file containing a comment to attach to the file
+     */
+    public static final String FLAG_COMMENTFILE = "-cfile";
+    /**
+     * -nc flag -- no comment is specified
+     */
+    public static final String FLAG_NOCOMMENT = "-nc";
+
     private String mTypeName = null;
     private String mVOB = null;
     private String mComment = null;
@@ -112,9 +145,9 @@
      * to execute the command line.
      * @throws BuildException if the command fails and failonerr is set to true
      */
+    @Override
     public void execute() throws BuildException {
         Commandline commandLine = new Commandline();
-        int result = 0;
 
         // Check for required attributes
         if (getTypeName() == null) {
@@ -133,14 +166,13 @@
             getProject().log("Ignoring any errors that occur for: "
                     + getTypeSpecifier(), Project.MSG_VERBOSE);
         }
-        result = run(commandLine);
+        int result = run(commandLine);
         if (Execute.isFailure(result) && getFailOnErr()) {
-            String msg = "Failed executing: " + commandLine.toString();
-            throw new BuildException(msg, getLocation());
+            throw new BuildException("Failed executing: " + commandLine,
+                getLocation());
         }
     }
 
-
     /**
      * Check the command line options.
      */
@@ -153,11 +185,9 @@
         if (getOrdinary()) {
             // -ordinary
             cmd.createArgument().setValue(FLAG_ORDINARY);
-        } else {
-            if (getGlobal()) {
-                // -global
-                cmd.createArgument().setValue(FLAG_GLOBAL);
-            }
+        } else if (getGlobal()) {
+            // -global
+            cmd.createArgument().setValue(FLAG_GLOBAL);
         }
 
         if (getPbranch()) {
@@ -173,20 +203,17 @@
         if (getComment() != null) {
             // -c
             getCommentCommand(cmd);
+        } else if (getCommentFile() != null) {
+            // -cfile
+            getCommentFileCommand(cmd);
         } else {
-            if (getCommentFile() != null) {
-                // -cfile
-                getCommentFileCommand(cmd);
-            } else {
-                cmd.createArgument().setValue(FLAG_NOCOMMENT);
-            }
+            cmd.createArgument().setValue(FLAG_NOCOMMENT);
         }
 
         // type-name@vob
         cmd.createArgument().setValue(getTypeSpecifier());
     }
 
-
     /**
      * Set type-name string
      *
@@ -349,7 +376,6 @@
         return mCfile;
     }
 
-
     /**
      * Get the 'comment' command
      *
@@ -393,49 +419,11 @@
      *         specified, otherwise an empty string
      */
     private String getTypeSpecifier() {
-        String typenm = null;
-
-        typenm = getTypeName();
+        String typenm = getTypeName();
         if (getVOB() != null) {
             typenm += "@" + getVOB();
         }
-
         return typenm;
     }
 
-
-    /**
-     * -replace flag -- replace existing label definition of the same type
-     */
-    public static final String FLAG_REPLACE = "-replace";
-    /**
-     * -global flag -- creates a label type that is global to the VOB or to VOBs that use this VOB
-     */
-    public static final String FLAG_GLOBAL = "-global";
-    /**
-     * -ordinary flag -- creates a label type that can be used only in the current VOB
-     */
-    public static final String FLAG_ORDINARY = "-ordinary";
-    /**
-     * -pbranch flag -- allows label type to be used once per branch
-     */
-    public static final String FLAG_PBRANCH = "-pbranch";
-    /**
-     * -shared flag -- sets the way mastership is checked by ClearCase
-     */
-    public static final String FLAG_SHARED = "-shared";
-    /**
-     * -c flag -- comment to attach to the file
-     */
-    public static final String FLAG_COMMENT = "-c";
-    /**
-     * -cfile flag -- file containing a comment to attach to the file
-     */
-    public static final String FLAG_COMMENTFILE = "-cfile";
-    /**
-     * -nc flag -- no comment is specified
-     */
-    public static final String FLAG_NOCOMMENT = "-nc";
-
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCRmtype.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCRmtype.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCRmtype.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCRmtype.java	2018-03-24 12:37:12.000000000 +0000
@@ -87,6 +87,31 @@
  *
  */
 public class CCRmtype extends ClearCase {
+    /**
+     * -ignore flag -- ignore pre-trigger operations when removing a trigger type
+     */
+    public static final String FLAG_IGNORE = "-ignore";
+    /**
+     * -rmall flag -- removes all instances of a type and the type object itself
+     */
+    public static final String FLAG_RMALL = "-rmall";
+    /**
+     * -force flag -- suppresses confirmation prompts
+     */
+    public static final String FLAG_FORCE = "-force";
+    /**
+     * -c flag -- comment to attach to the file
+     */
+    public static final String FLAG_COMMENT = "-c";
+    /**
+     * -cfile flag -- file containing a comment to attach to the file
+     */
+    public static final String FLAG_COMMENTFILE = "-cfile";
+    /**
+     * -nc flag -- no comment is specified
+     */
+    public static final String FLAG_NOCOMMENT = "-nc";
+
     private String mTypeKind = null;
     private String mTypeName = null;
     private String mVOB = null;
@@ -102,9 +127,9 @@
      * to execute the command line.
      * @throws BuildException if the command fails and failonerr is set to true
      */
+    @Override
     public void execute() throws BuildException {
         Commandline commandLine = new Commandline();
-        int result = 0;
 
         // Check for required attributes
         if (getTypeKind() == null) {
@@ -126,14 +151,13 @@
             getProject().log("Ignoring any errors that occur for: "
                     + getTypeSpecifier(), Project.MSG_VERBOSE);
         }
-        result = run(commandLine);
+        int result = run(commandLine);
         if (Execute.isFailure(result) && getFailOnErr()) {
-            String msg = "Failed executing: " + commandLine.toString();
-            throw new BuildException(msg, getLocation());
+            throw new BuildException("Failed executing: " + commandLine,
+                getLocation());
         }
     }
 
-
     /**
      * Check the command line options.
      */
@@ -150,13 +174,11 @@
         if (getComment() != null) {
             // -c
             getCommentCommand(cmd);
+        } else if (getCommentFile() != null) {
+            // -cfile
+            getCommentFileCommand(cmd);
         } else {
-            if (getCommentFile() != null) {
-                // -cfile
-                getCommentFileCommand(cmd);
-            } else {
-                cmd.createArgument().setValue(FLAG_NOCOMMENT);
-            }
+            cmd.createArgument().setValue(FLAG_NOCOMMENT);
         }
 
         // type-kind:type-name
@@ -298,10 +320,9 @@
     private String getTypeSpecifier() {
         String tkind = getTypeKind();
         String tname = getTypeName();
-        String typeSpec = null;
 
         // Return the type-selector
-        typeSpec = tkind + ":" + tname;
+        String typeSpec = tkind + ":" + tname;
         if (getVOB() != null) {
             typeSpec += "@" + getVOB();
         }
@@ -344,31 +365,4 @@
         }
     }
 
-
-    /**
-     * -ignore flag -- ignore pre-trigger operations when removing a trigger type
-     */
-    public static final String FLAG_IGNORE = "-ignore";
-    /**
-     * -rmall flag -- removes all instances of a type and the type object itself
-     */
-    public static final String FLAG_RMALL = "-rmall";
-    /**
-     * -force flag -- suppresses confirmation prompts
-     */
-    public static final String FLAG_FORCE = "-force";
-    /**
-     * -c flag -- comment to attach to the file
-     */
-    public static final String FLAG_COMMENT = "-c";
-    /**
-     * -cfile flag -- file containing a comment to attach to the file
-     */
-    public static final String FLAG_COMMENTFILE = "-cfile";
-    /**
-     * -nc flag -- no comment is specified
-     */
-    public static final String FLAG_NOCOMMENT = "-nc";
-
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java	2018-03-24 12:37:12.000000000 +0000
@@ -54,6 +54,15 @@
  *
  */
 public class CCUnCheckout extends ClearCase {
+    /**
+     *  -keep flag -- keep a copy of the file with .keep extension
+     */
+    public static final String FLAG_KEEPCOPY = "-keep";
+    /**
+     *  -rm flag -- remove the copy of the file
+     */
+    public static final String FLAG_RM = "-rm";
+
     private boolean mKeep = false;
 
     /**
@@ -63,10 +72,10 @@
      * to execute the command line.
      * @throws BuildException if the command fails and failonerr is set to true
      */
+    @Override
     public void execute() throws BuildException {
         Commandline commandLine = new Commandline();
         Project aProj = getProject();
-        int result = 0;
 
         // Default the viewpath to basedir if it is not specified
         if (getViewPath() == null) {
@@ -85,14 +94,13 @@
             getProject().log("Ignoring any errors that occur for: "
                     + getViewPathBasename(), Project.MSG_VERBOSE);
         }
-        result = run(commandLine);
+        int result = run(commandLine);
         if (Execute.isFailure(result) && getFailOnErr()) {
-            String msg = "Failed executing: " + commandLine.toString();
-            throw new BuildException(msg, getLocation());
+            throw new BuildException("Failed executing: " + commandLine,
+                getLocation());
         }
     }
 
-
     /**
      * Check the command line options.
      */
@@ -128,15 +136,4 @@
         return mKeep;
     }
 
-
-    /**
-     *  -keep flag -- keep a copy of the file with .keep extension
-     */
-    public static final String FLAG_KEEPCOPY = "-keep";
-    /**
-     *  -rm flag -- remove the copy of the file
-     */
-    public static final String FLAG_RM = "-rm";
-
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,12 +18,14 @@
 
 package org.apache.tools.ant.taskdefs.optional.clearcase;
 
+import java.util.Optional;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Execute;
 import org.apache.tools.ant.types.Commandline;
 
-/**
+/*
  * TODO:
  * comment field doesn't include all options yet
  */
@@ -69,6 +71,15 @@
  *
  */
 public class CCUnlock extends ClearCase {
+    /**
+     * -comment flag -- method to use for commenting events
+     */
+    public static final String FLAG_COMMENT = "-comment";
+    /**
+     * -pname flag -- pathname to lock
+     */
+    public static final String FLAG_PNAME = "-pname";
+
     private String mComment = null;
     private String mPname = null;
 
@@ -79,10 +90,10 @@
      * to execute the command line.
      * @throws BuildException if the command fails and failonerr is set to true
      */
+    @Override
     public void execute() throws BuildException {
         Commandline commandLine = new Commandline();
         Project aProj = getProject();
-        int result = 0;
 
         // Default the viewpath to basedir if it is not specified
         if (getViewPath() == null) {
@@ -105,10 +116,10 @@
             getProject().log("Ignoring any errors that occur for: "
                     + getOpType(), Project.MSG_VERBOSE);
         }
-        result = run(commandLine);
+        int result = run(commandLine);
         if (Execute.isFailure(result) && getFailOnErr()) {
-            String msg = "Failed executing: " + commandLine.toString();
-            throw new BuildException(msg, getLocation());
+            throw new BuildException("Failed executing: " + commandLine,
+                getLocation());
         }
     }
 
@@ -120,8 +131,8 @@
         getCommentCommand(cmd);
 
         if (getObjSelect() == null && getPname() == null) {
-            throw new BuildException("Should select either an element "
-            + "(pname) or an object (objselect)");
+            throw new BuildException(
+                "Should select either an element (pname) or an object (objselect)");
         }
         getPnameCommand(cmd);
         // object selector
@@ -204,15 +215,14 @@
     private void getCommentCommand(Commandline cmd) {
         if (getComment() == null) {
             return;
-        } else {
-            /* Had to make two separate commands here because if a space is
-               inserted between the flag and the value, it is treated as a
-               Windows filename with a space and it is enclosed in double
-               quotes ("). This breaks clearcase.
-            */
-            cmd.createArgument().setValue(FLAG_COMMENT);
-            cmd.createArgument().setValue(getComment());
         }
+        /* Had to make two separate commands here because if a space is
+           inserted between the flag and the value, it is treated as a
+           Windows filename with a space and it is enclosed in double
+           quotes ("). This breaks clearcase.
+        */
+        cmd.createArgument().setValue(FLAG_COMMENT);
+        cmd.createArgument().setValue(getComment());
     }
 
     /**
@@ -224,15 +234,14 @@
     private void getPnameCommand(Commandline cmd) {
         if (getPname() == null) {
             return;
-        } else {
-            /* Had to make two separate commands here because if a space is
-               inserted between the flag and the value, it is treated as a
-               Windows filename with a space and it is enclosed in double
-               quotes ("). This breaks clearcase.
-            */
-            cmd.createArgument().setValue(FLAG_PNAME);
-            cmd.createArgument().setValue(getPname());
         }
+        /* Had to make two separate commands here because if a space is
+           inserted between the flag and the value, it is treated as a
+           Windows filename with a space and it is enclosed in double
+           quotes ("). This breaks clearcase.
+        */
+        cmd.createArgument().setValue(FLAG_PNAME);
+        cmd.createArgument().setValue(getPname());
     }
 
     /**
@@ -241,21 +250,7 @@
      * @return String containing the object/pname being worked on
      */
     private String getOpType() {
-
-        if (getPname() != null) {
-            return getPname();
-        } else {
-            return getObjSelect();
-        }
+        return Optional.ofNullable(getPname()).orElseGet(this::getObjSelect);
     }
 
-    /**
-     * -comment flag -- method to use for commenting events
-     */
-    public static final String FLAG_COMMENT = "-comment";
-    /**
-     * -pname flag -- pathname to lock
-     */
-    public static final String FLAG_PNAME = "-pname";
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java	2018-03-24 12:37:12.000000000 +0000
@@ -81,6 +81,35 @@
  *
  */
 public class CCUpdate extends ClearCase {
+    /**
+     *  -graphical flag -- display graphical dialog during update operation
+     */
+    public static final String FLAG_GRAPHICAL = "-graphical";
+    /**
+     * -log flag -- file to log status to
+     */
+    public static final String FLAG_LOG = "-log";
+    /**
+     * -overwrite flag -- overwrite hijacked files
+     */
+    public static final String FLAG_OVERWRITE = "-overwrite";
+    /**
+     * -noverwrite flag -- do not overwrite hijacked files
+     */
+    public static final String FLAG_NOVERWRITE = "-noverwrite";
+    /**
+     * -rename flag -- rename hijacked files with .keep extension
+     */
+    public static final String FLAG_RENAME = "-rename";
+    /**
+     * -ctime flag -- modified time is written as the current time
+     */
+    public static final String FLAG_CURRENTTIME = "-ctime";
+    /**
+     * -ptime flag -- modified time is written as the VOB time
+     */
+    public static final String FLAG_PRESERVETIME = "-ptime";
+
     private boolean mGraphical = false;
     private boolean mOverwrite = false;
     private boolean mRename = false;
@@ -95,10 +124,10 @@
      * to execute the command line.
      * @throws BuildException if the command fails and failonerr is set to true
      */
+    @Override
     public void execute() throws BuildException {
         Commandline commandLine = new Commandline();
         Project aProj = getProject();
-        int result = 0;
 
         // Default the viewpath to basedir if it is not specified
         if (getViewPath() == null) {
@@ -121,10 +150,10 @@
             getProject().log("Ignoring any errors that occur for: "
                     + getViewPathBasename(), Project.MSG_VERBOSE);
         }
-        result = run(commandLine);
+        int result = run(commandLine);
         if (Execute.isFailure(result) && getFailOnErr()) {
-            String msg = "Failed executing: " + commandLine.toString();
-            throw new BuildException(msg, getLocation());
+            throw new BuildException("Failed executing: " + commandLine,
+                getLocation());
         }
     }
 
@@ -140,24 +169,20 @@
             if (getOverwrite()) {
                 // -overwrite
                 cmd.createArgument().setValue(FLAG_OVERWRITE);
+            } else if (getRename()) {
+                // -rename
+                cmd.createArgument().setValue(FLAG_RENAME);
             } else {
-                if (getRename()) {
-                    // -rename
-                    cmd.createArgument().setValue(FLAG_RENAME);
-                } else {
-                    // -noverwrite
-                    cmd.createArgument().setValue(FLAG_NOVERWRITE);
-                }
+                // -noverwrite
+                cmd.createArgument().setValue(FLAG_NOVERWRITE);
             }
 
             if (getCurrentTime()) {
                 // -ctime
                 cmd.createArgument().setValue(FLAG_CURRENTTIME);
-            } else {
-                if (getPreserveTime()) {
-                    // -ptime
-                    cmd.createArgument().setValue(FLAG_PRESERVETIME);
-                }
+            } else if (getPreserveTime()) {
+                // -ptime
+                cmd.createArgument().setValue(FLAG_PRESERVETIME);
             }
 
             // -log logname
@@ -279,7 +304,6 @@
         return mLog;
     }
 
-
     /**
      * Get the 'log' command
      *
@@ -288,45 +312,14 @@
     private void getLogCommand(Commandline cmd) {
         if (getLog() == null) {
             return;
-        } else {
-            /* Had to make two separate commands here because if a space is
-               inserted between the flag and the value, it is treated as a
-               Windows filename with a space and it is enclosed in double
-               quotes ("). This breaks clearcase.
-            */
-            cmd.createArgument().setValue(FLAG_LOG);
-            cmd.createArgument().setValue(getLog());
         }
+        /* Had to make two separate commands here because if a space is
+           inserted between the flag and the value, it is treated as a
+           Windows filename with a space and it is enclosed in double
+           quotes ("). This breaks clearcase.
+        */
+        cmd.createArgument().setValue(FLAG_LOG);
+        cmd.createArgument().setValue(getLog());
     }
 
-    /**
-     *  -graphical flag -- display graphical dialog during update operation
-     */
-    public static final String FLAG_GRAPHICAL = "-graphical";
-    /**
-     * -log flag -- file to log status to
-     */
-    public static final String FLAG_LOG = "-log";
-    /**
-     * -overwrite flag -- overwrite hijacked files
-     */
-    public static final String FLAG_OVERWRITE = "-overwrite";
-    /**
-     * -noverwrite flag -- do not overwrite hijacked files
-     */
-    public static final String FLAG_NOVERWRITE = "-noverwrite";
-    /**
-     * -rename flag -- rename hijacked files with .keep extension
-     */
-    public static final String FLAG_RENAME = "-rename";
-    /**
-     * -ctime flag -- modified time is written as the current time
-     */
-    public static final String FLAG_CURRENTTIME = "-ctime";
-    /**
-     * -ptime flag -- modified time is written as the VOB time
-     */
-    public static final String FLAG_PRESERVETIME = "-ptime";
-
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,6 +19,7 @@
 package org.apache.tools.ant.taskdefs.optional.clearcase;
 
 import java.io.File;
+import java.io.IOException;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -29,8 +30,6 @@
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.util.FileUtils;
 
-
-
 /**
  * A base class for creating tasks for executing commands on ClearCase.
  * <p>
@@ -46,11 +45,73 @@
  *
  */
 public abstract class ClearCase extends Task {
+    /**
+     * Constant for the thing to execute
+     */
+    private static final String CLEARTOOL_EXE = "cleartool";
+    /**
+     * The 'Update' command
+     */
+    public static final String COMMAND_UPDATE = "update";
+    /**
+     * The 'Checkout' command
+     */
+    public static final String COMMAND_CHECKOUT = "checkout";
+    /**
+     * The 'Checkin' command
+     */
+    public static final String COMMAND_CHECKIN = "checkin";
+    /**
+     * The 'UndoCheckout' command
+     */
+    public static final String COMMAND_UNCHECKOUT = "uncheckout";
+    /**
+     * The 'Lock' command
+     */
+    public static final String COMMAND_LOCK = "lock";
+    /**
+     * The 'Unlock' command
+     */
+    public static final String COMMAND_UNLOCK = "unlock";
+    /**
+     * The 'Mkbl' command
+     */
+    public static final String COMMAND_MKBL = "mkbl";
+    /**
+     * The 'Mklabel' command
+     */
+    public static final String COMMAND_MKLABEL = "mklabel";
+    /**
+     * The 'Mklbtype' command
+     */
+    public static final String COMMAND_MKLBTYPE = "mklbtype";
+    /**
+     * The 'Rmtype' command
+     */
+    public static final String COMMAND_RMTYPE = "rmtype";
+    /**
+     * The 'LsCheckout' command
+     */
+    public static final String COMMAND_LSCO = "lsco";
+    /**
+     * The 'Mkelem' command
+     */
+    public static final String COMMAND_MKELEM = "mkelem";
+    /**
+     * The 'Mkattr' command
+     */
+    public static final String COMMAND_MKATTR = "mkattr";
+    /**
+     * The 'Mkdir' command
+     */
+    public static final String COMMAND_MKDIR = "mkdir";
+
     private String mClearToolDir = "";
     private String mviewPath = null;
     private String mobjSelect = null;
     private int pcnt = 0;
     private boolean mFailonerr = true;
+
     /**
      * Set the directory where the cleartool executable is located.
      *
@@ -67,7 +128,7 @@
      */
     protected final String getClearToolCommand() {
         String toReturn = mClearToolDir;
-        if (!toReturn.equals("") && !toReturn.endsWith("/")) {
+        if (!("".equals(toReturn) || toReturn.endsWith("/"))) {
             toReturn += "/";
         }
 
@@ -129,13 +190,13 @@
     protected int run(Commandline cmd) {
         try {
             Project aProj = getProject();
-            Execute exe
-                = new Execute(new LogStreamHandler(this, Project.MSG_INFO, Project.MSG_WARN));
+            Execute exe = new Execute(
+                new LogStreamHandler(this, Project.MSG_INFO, Project.MSG_WARN));
             exe.setAntRun(aProj);
             exe.setWorkingDirectory(aProj.getBaseDir());
             exe.setCommandline(cmd.getCommandline());
             return exe.execute();
-        } catch (java.io.IOException e) {
+        } catch (IOException e) {
             throw new BuildException(e, getLocation());
         }
     }
@@ -157,6 +218,7 @@
 
         return getProject().getProperty(outV);
     }
+
     /**
      * If true, command will throw an exception on failure.
      *
@@ -177,66 +239,4 @@
         return mFailonerr;
     }
 
-    /**
-     * Constant for the thing to execute
-     */
-    private static final String CLEARTOOL_EXE = "cleartool";
-    /**
-     * The 'Update' command
-     */
-    public static final String COMMAND_UPDATE = "update";
-    /**
-     * The 'Checkout' command
-     */
-    public static final String COMMAND_CHECKOUT = "checkout";
-    /**
-     * The 'Checkin' command
-     */
-    public static final String COMMAND_CHECKIN = "checkin";
-    /**
-     * The 'UndoCheckout' command
-     */
-    public static final String COMMAND_UNCHECKOUT = "uncheckout";
-    /**
-     * The 'Lock' command
-     */
-    public static final String COMMAND_LOCK = "lock";
-    /**
-     * The 'Unlock' command
-     */
-    public static final String COMMAND_UNLOCK = "unlock";
-    /**
-     * The 'Mkbl' command
-     */
-    public static final String COMMAND_MKBL = "mkbl";
-    /**
-     * The 'Mklabel' command
-     */
-    public static final String COMMAND_MKLABEL = "mklabel";
-    /**
-     * The 'Mklbtype' command
-     */
-    public static final String COMMAND_MKLBTYPE = "mklbtype";
-    /**
-     * The 'Rmtype' command
-     */
-    public static final String COMMAND_RMTYPE = "rmtype";
-    /**
-     * The 'LsCheckout' command
-     */
-    public static final String COMMAND_LSCO = "lsco";
-    /**
-     * The 'Mkelem' command
-     */
-    public static final String COMMAND_MKELEM = "mkelem";
-    /**
-     * The 'Mkattr' command
-     */
-    public static final String COMMAND_MKATTR = "mkattr";
-    /**
-     * The 'Mkdir' command
-     */
-    public static final String COMMAND_MKDIR = "mkdir";
-
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,11 +18,13 @@
 package org.apache.tools.ant.taskdefs.optional.depend;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.Vector;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -36,11 +38,6 @@
  *
  */
 public class AntAnalyzer extends AbstractAnalyzer {
-    /**
-     * Default constructor
-     */
-    public AntAnalyzer() {
-    }
 
     /**
      * Determine the dependencies of the configured root classes.
@@ -50,37 +47,33 @@
      * @param classes a vector to be populated with the names of the
      *      dependency classes.
      */
+    @Override
     protected void determineDependencies(Vector<File> files, Vector<String> classes) {
         // we get the root classes and build up a set of
         // classes upon which they depend
-        Hashtable<String, String> dependencies = new Hashtable<String, String>();
-        Hashtable<File, File> containers = new Hashtable<File, File>();
-        Hashtable<String, String> toAnalyze = new Hashtable<String, String>();
-        for (Enumeration<String> e = getRootClasses(); e.hasMoreElements();) {
-            String classname = e.nextElement();
-            toAnalyze.put(classname, classname);
-        }
+        Set<String> toAnalyze = new HashSet<>(Collections.list(getRootClasses()));
 
         int count = 0;
         int maxCount = isClosureRequired() ? MAX_LOOPS : 1;
-        Hashtable<String, String> analyzedDeps = null;
-        while (toAnalyze.size() != 0 && count++ < maxCount) {
-            analyzedDeps = new Hashtable<String, String>();
-            for (Enumeration<String> e = toAnalyze.keys(); e.hasMoreElements();) {
-                String classname = e.nextElement();
-                dependencies.put(classname, classname);
+        Set<String> dependencies = new HashSet<>();
+        Set<File> containers = new HashSet<>();
+        Set<String> analyzedDeps = null;
+        while (!toAnalyze.isEmpty() && count++ < maxCount) {
+            analyzedDeps = new HashSet<>();
+            for (String classname : toAnalyze) {
+                dependencies.add(classname);
                 try {
                     File container = getClassContainer(classname);
                     if (container == null) {
                         continue;
                     }
-                    containers.put(container, container);
+                    containers.add(container);
 
                     ZipFile zipFile = null;
                     InputStream inStream = null;
                     try {
                         if (container.getName().endsWith(".class")) {
-                            inStream = new FileInputStream(container.getPath());
+                            inStream = Files.newInputStream(Paths.get(container.getPath()));
                         } else {
                             zipFile = new ZipFile(container.getPath());
                             String entryName
@@ -92,13 +85,11 @@
                         ClassFile classFile = new ClassFile();
                         classFile.read(inStream);
                         for (String dependency : classFile.getClassRefs()) {
-                            analyzedDeps.put(dependency, dependency);
+                            analyzedDeps.add(dependency);
                         }
                     } finally {
                         FileUtils.close(inStream);
-                        if (zipFile != null) {
-                            zipFile.close();
-                        }
+                        FileUtils.close(zipFile);
                     }
                 } catch (IOException ioe) {
                     // ignore
@@ -108,27 +99,20 @@
             toAnalyze.clear();
 
             // now recover all the dependencies collected and add to the list.
-            for (String className : analyzedDeps.values()) {
-                if (!dependencies.containsKey(className)) {
-                    toAnalyze.put(className, className);
+            for (String className : analyzedDeps) {
+                if (!dependencies.contains(className)) {
+                    toAnalyze.add(className);
                 }
             }
         }
 
         // pick up the last round of dependencies that were determined
-        for (String className : analyzedDeps.values()) {
-            dependencies.put(className, className);
-        }
+        dependencies.addAll(analyzedDeps);
 
         files.removeAllElements();
-        for (File f : containers.keySet()) {
-            files.add(f);
-        }
-
+        files.addAll(containers);
         classes.removeAllElements();
-        for (String dependency :dependencies.keySet()) {
-            classes.add(dependency);
-        }
+        classes.addAll(dependencies);
     }
 
     /**
@@ -136,9 +120,9 @@
      *
      * @return true if the analyzer provides dependency file information.
      */
+    @Override
     protected boolean supportsFileDependencies() {
         return true;
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,11 +17,14 @@
  */
 package org.apache.tools.ant.taskdefs.optional.depend;
 
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
 /**
  * Iterator interface for iterating over a set of class files
  *
  */
-public interface ClassFileIterator {
+public interface ClassFileIterator extends Iterable<ClassFile> {
 
     /**
      * Get the next class file in the iteration
@@ -29,5 +32,33 @@
      * @return the next class file in the iteration
      */
     ClassFile getNextClassFile();
-}
 
+    @Override
+    default Iterator<ClassFile> iterator() {
+
+        return new Iterator<ClassFile>() {
+            ClassFile next;
+            {
+                next = getNextClassFile();
+            }
+
+            @Override
+            public boolean hasNext() {
+                return next != null;
+            }
+
+            @Override
+            public ClassFile next() {
+                if (next == null) {
+                    throw new NoSuchElementException();
+                }
+                try {
+                    return next;
+                } finally {
+                    next = getNextClassFile();
+                }
+            }
+
+        };
+    }
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java	2018-03-24 12:37:12.000000000 +0000
@@ -59,8 +59,8 @@
         DataInputStream classStream = new DataInputStream(stream);
 
         if (classStream.readInt() != CLASS_MAGIC) {
-            throw new ClassFormatError("No Magic Code Found "
-                + "- probably not a Java class file.");
+            throw new ClassFormatError(
+                "No Magic Code Found - probably not a Java class file.");
         }
 
         // right we have a good looking class file.
@@ -81,7 +81,6 @@
         className  = classInfo.getClassName();
     }
 
-
     /**
      * Get the classes which this class references.
      *
@@ -89,7 +88,7 @@
      */
     public Vector<String> getClassRefs() {
 
-        Vector<String> classRefs = new Vector<String>();
+        Vector<String> classRefs = new Vector<>();
 
         final int size = constantPool.size();
         for (int i = 0; i < size; ++i) {
@@ -118,4 +117,3 @@
         return ClassFileUtils.convertSlashName(className);
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java	2018-03-24 12:37:12.000000000 +0000
@@ -49,4 +49,3 @@
         return dotName.replace('.', '/');
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ClassCPInfo.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ClassCPInfo.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ClassCPInfo.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ClassCPInfo.java	2018-03-24 12:37:12.000000000 +0000
@@ -54,6 +54,7 @@
      * @exception IOException thrown if there is a problem reading the entry
      *      from the stream.
      */
+    @Override
     public void read(DataInputStream cpStream) throws IOException {
         index = cpStream.readUnsignedShort();
         className = "unresolved";
@@ -64,6 +65,7 @@
      *
      * @return string representation of this constant pool entry
      */
+    @Override
     public String toString() {
         return "Class Constant Pool Entry for " + className + "[" + index + "]";
     }
@@ -74,6 +76,7 @@
      * @param constantPool the constant pool with which to resolve the
      *      class.
      */
+    @Override
     public void resolve(ConstantPool constantPool) {
         className = ((Utf8CPInfo) constantPool.getEntry(index)).getValue();
 
@@ -90,4 +93,3 @@
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantCPInfo.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantCPInfo.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantCPInfo.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantCPInfo.java	2018-03-24 12:37:12.000000000 +0000
@@ -60,4 +60,3 @@
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java	2018-03-24 12:37:12.000000000 +0000
@@ -115,72 +115,57 @@
      */
     public static ConstantPoolEntry readEntry(DataInputStream cpStream)
          throws IOException {
-        ConstantPoolEntry cpInfo = null;
         int cpTag = cpStream.readUnsignedByte();
 
+        ConstantPoolEntry cpInfo;
         switch (cpTag) {
 
             case CONSTANT_UTF8:
                 cpInfo = new Utf8CPInfo();
-
                 break;
             case CONSTANT_INTEGER:
                 cpInfo = new IntegerCPInfo();
-
                 break;
             case CONSTANT_FLOAT:
                 cpInfo = new FloatCPInfo();
-
                 break;
             case CONSTANT_LONG:
                 cpInfo = new LongCPInfo();
-
                 break;
             case CONSTANT_DOUBLE:
                 cpInfo = new DoubleCPInfo();
-
                 break;
             case CONSTANT_CLASS:
                 cpInfo = new ClassCPInfo();
-
                 break;
             case CONSTANT_STRING:
                 cpInfo = new StringCPInfo();
-
                 break;
             case CONSTANT_FIELDREF:
                 cpInfo = new FieldRefCPInfo();
-
                 break;
             case CONSTANT_METHODREF:
                 cpInfo = new MethodRefCPInfo();
-
                 break;
             case CONSTANT_INTERFACEMETHODREF:
                 cpInfo = new InterfaceMethodRefCPInfo();
-
                 break;
             case CONSTANT_NAMEANDTYPE:
                 cpInfo = new NameAndTypeCPInfo();
-
                 break;
             case CONSTANT_METHODHANDLE:
                 cpInfo = new MethodHandleCPInfo();
-
                 break;
             case CONSTANT_METHODTYPE:
                 cpInfo = new MethodTypeCPInfo();
-
                 break;
             case CONSTANT_INVOKEDYNAMIC:
                 cpInfo = new InvokeDynamicCPInfo();
-
                 break;
             default:
                 throw new ClassFormatError("Invalid Constant Pool entry Type "
                      + cpTag);
         }
-
         cpInfo.read(cpStream);
 
         return cpInfo;
@@ -239,4 +224,3 @@
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java	2018-03-24 12:37:12.000000000 +0000
@@ -23,6 +23,8 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
  * The constant pool of a Java class. The constant pool is a collection of
@@ -343,16 +345,11 @@
      *
      * @return the constant pool entries as strings
      */
+    @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder("\n");
-        final int size = entries.size();
-
-        for (int i = 0; i < size; ++i) {
-            sb.append('[').append(i).append("] = ").append(getEntry(i)).append('\n');
-        }
-
-        return sb.toString();
+        return IntStream.range(0, entries.size())
+            .mapToObj(i -> String.format("[%d] = %s", i, getEntry(i)))
+            .collect(Collectors.joining("\n", "\n", "\n"));
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/DoubleCPInfo.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/DoubleCPInfo.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/DoubleCPInfo.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/DoubleCPInfo.java	2018-03-24 12:37:12.000000000 +0000
@@ -41,8 +41,9 @@
      * @exception IOException if there is a problem reading the entry from the
      *      stream.
      */
+    @Override
     public void read(DataInputStream cpStream) throws IOException {
-        setValue(new Double(cpStream.readDouble()));
+        setValue(Double.valueOf(cpStream.readDouble()));
     }
 
     /**
@@ -50,9 +51,9 @@
      *
      * @return the string representation of this constant pool entry.
      */
+    @Override
     public String toString() {
         return "Double Constant Pool Entry: " + getValue();
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FieldRefCPInfo.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FieldRefCPInfo.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FieldRefCPInfo.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FieldRefCPInfo.java	2018-03-24 12:37:12.000000000 +0000
@@ -49,6 +49,7 @@
      * @exception IOException if there is a problem reading the entry from
      *      the stream.
      */
+    @Override
     public void read(DataInputStream cpStream) throws IOException {
         classIndex = cpStream.readUnsignedShort();
         nameAndTypeIndex = cpStream.readUnsignedShort();
@@ -61,6 +62,7 @@
      * @param constantPool the constant pool of which this entry is a member
      *      and against which this entry is to be resolved.
      */
+    @Override
     public void resolve(ConstantPool constantPool) {
         ClassCPInfo fieldClass
             = (ClassCPInfo) constantPool.getEntry(classIndex);
@@ -85,18 +87,14 @@
      *
      * @return the string representation of this constant pool entry.
      */
+    @Override
     public String toString() {
-        String value;
-
         if (isResolved()) {
-            value = "Field : Class = " + fieldClassName + ", name = "
-                + fieldName + ", type = " + fieldType;
-        } else {
-            value = "Field : Class index = " + classIndex
-                + ", name and type index = " + nameAndTypeIndex;
+            return "Field : Class = " + fieldClassName + ", name = " + fieldName
+                + ", type = " + fieldType;
         }
-
-        return value;
+        return "Field : Class index = " + classIndex
+            + ", name and type index = " + nameAndTypeIndex;
     }
 
     /**
@@ -127,4 +125,3 @@
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.java	2018-03-24 12:37:12.000000000 +0000
@@ -39,8 +39,9 @@
      * @exception IOException if there is a problem reading the entry from
      *      the stream.
      */
+    @Override
     public void read(DataInputStream cpStream) throws IOException {
-        setValue(new Float(cpStream.readFloat()));
+        setValue(Float.valueOf(cpStream.readFloat()));
     }
 
     /**
@@ -48,9 +49,9 @@
      *
      * @return the string representation of this constant pool entry.
      */
+    @Override
     public String toString() {
         return "Float Constant Pool Entry: " + getValue();
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.java	2018-03-24 12:37:12.000000000 +0000
@@ -39,8 +39,9 @@
      * @exception IOException if there is a problem reading the entry from
      *      the stream.
      */
+    @Override
     public void read(DataInputStream cpStream) throws IOException {
-        setValue(new Integer(cpStream.readInt()));
+        setValue(Integer.valueOf(cpStream.readInt()));
     }
 
     /**
@@ -48,9 +49,9 @@
      *
      * @return the string representation of this constant pool entry.
      */
+    @Override
     public String toString() {
         return "Integer Constant Pool Entry: " + getValue();
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InterfaceMethodRefCPInfo.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InterfaceMethodRefCPInfo.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InterfaceMethodRefCPInfo.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InterfaceMethodRefCPInfo.java	2018-03-24 12:37:12.000000000 +0000
@@ -55,6 +55,7 @@
      * @exception IOException if there is a problem reading the entry from
      *      the stream.
      */
+    @Override
     public void read(DataInputStream cpStream) throws IOException {
         classIndex = cpStream.readUnsignedShort();
         nameAndTypeIndex = cpStream.readUnsignedShort();
@@ -67,6 +68,7 @@
      * @param constantPool the constant pool of which this entry is a member
      *      and against which this entry is to be resolved.
      */
+    @Override
     public void resolve(ConstantPool constantPool) {
         ClassCPInfo interfaceMethodClass
              = (ClassCPInfo) constantPool.getEntry(classIndex);
@@ -91,19 +93,16 @@
      *
      * @return the string representation of this constant pool entry.
      */
+    @Override
     public String toString() {
-        String value;
-
         if (isResolved()) {
-            value = "InterfaceMethod : Class = " + interfaceMethodClassName
+            return "InterfaceMethod : Class = " + interfaceMethodClassName
                  + ", name = " + interfaceMethodName + ", type = "
                  + interfaceMethodType;
-        } else {
-            value = "InterfaceMethod : Class index = " + classIndex
-                 + ", name and type index = " + nameAndTypeIndex;
         }
+        return "InterfaceMethod : Class index = " + classIndex
+             + ", name and type index = " + nameAndTypeIndex;
 
-        return value;
     }
 
     /**
@@ -134,4 +133,3 @@
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InvokeDynamicCPInfo.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InvokeDynamicCPInfo.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InvokeDynamicCPInfo.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InvokeDynamicCPInfo.java	2018-03-24 12:37:12.000000000 +0000
@@ -32,7 +32,7 @@
     private int nameAndTypeIndex;
     /** the name and type CP info pointed to */
     private NameAndTypeCPInfo nameAndTypeCPInfo;
-    /** */
+
     /** Constructor.  */
     public InvokeDynamicCPInfo() {
         super(CONSTANT_INVOKEDYNAMIC, 1);
@@ -46,6 +46,7 @@
      * @exception java.io.IOException if there is a problem reading the entry from
      *      the stream.
      */
+    @Override
     public void read(DataInputStream cpStream) throws IOException {
         bootstrapMethodAttrIndex = cpStream.readUnsignedShort();
         nameAndTypeIndex = cpStream.readUnsignedShort();
@@ -56,16 +57,14 @@
      *
      * @return the string representation of this constant pool entry.
      */
+    @Override
     public String toString() {
-        String value;
         if (isResolved()) {
-            value = "Name = " + nameAndTypeCPInfo.getName() + ", type = " + nameAndTypeCPInfo.getType();
-        } else {
-            value = "BootstrapMethodAttrIndex inx = " + bootstrapMethodAttrIndex
-            + "NameAndType index = " + nameAndTypeIndex;
+            return "Name = " + nameAndTypeCPInfo.getName() + ", type = "
+                + nameAndTypeCPInfo.getType();
         }
-
-        return value;
+        return "BootstrapMethodAttrIndex inx = " + bootstrapMethodAttrIndex
+            + "NameAndType index = " + nameAndTypeIndex;
     }
     /**
      * Resolve this constant pool entry with respect to its dependents in
@@ -74,6 +73,7 @@
      * @param constantPool the constant pool of which this entry is a member
      *      and against which this entry is to be resolved.
      */
+    @Override
     public void resolve(ConstantPool constantPool) {
         nameAndTypeCPInfo
                 = (NameAndTypeCPInfo) constantPool.getEntry(nameAndTypeIndex);
@@ -82,4 +82,3 @@
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.java	2018-03-24 12:37:12.000000000 +0000
@@ -39,8 +39,9 @@
      * @exception IOException if there is a problem reading the entry from
      *      the stream.
      */
+    @Override
     public void read(DataInputStream cpStream) throws IOException {
-        setValue(new Long(cpStream.readLong()));
+        setValue(Long.valueOf(cpStream.readLong()));
     }
 
     /**
@@ -48,9 +49,9 @@
      *
      * @return the string representation of this constant pool entry.
      */
+    @Override
     public String toString() {
         return "Long Constant Pool Entry: " + getValue();
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodHandleCPInfo.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodHandleCPInfo.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodHandleCPInfo.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodHandleCPInfo.java	2018-03-24 12:37:12.000000000 +0000
@@ -36,22 +36,23 @@
      * signature of the method
      */
     private int nameAndTypeIndex;
+
     public enum ReferenceKind {
-        REF_getField(1),
-        REF_getStatic(2),
-        REF_putField(3),
-        REF_putStatic(4),
-        REF_invokeVirtual(5),
-        REF_invokeStatic(6),
-        REF_invokeSpecial(7),
-        REF_newInvokeSpecial(8),
-        REF_invokeInterface(9);
-        private final int referenceKind;
-        ReferenceKind(int referenceKind) {
-            this.referenceKind = referenceKind;
-        }
+        REF_getField,
+        REF_getStatic,
+        REF_putField,
+        REF_putStatic,
+        REF_invokeVirtual,
+        REF_invokeStatic,
+        REF_invokeSpecial,
+        REF_newInvokeSpecial,
+        REF_invokeInterface;
 
+        public int value() {
+            return ordinal() + 1;
+        }
     }
+
     /** Constructor. */
     public MethodHandleCPInfo() {
         super(CONSTANT_METHODHANDLE, 1);
@@ -65,9 +66,9 @@
      * @exception java.io.IOException if there is a problem reading the entry from
      *      the stream.
      */
+    @Override
     public void read(DataInputStream cpStream) throws IOException {
         referenceKind = ReferenceKind.values()[cpStream.readUnsignedByte() - 1];
-
         referenceIndex = cpStream.readUnsignedShort();
     }
 
@@ -76,17 +77,13 @@
      *
      * @return the string representation of this constant pool entry.
      */
+    @Override
     public String toString() {
-        String value;
-
         if (isResolved()) {
-            value = "MethodHandle : " + reference.toString();
-        } else {
-            value = "MethodHandle : Reference kind = " + referenceKind
-                 +  "Reference index = " + referenceIndex;
+            return "MethodHandle : " + reference.toString();
         }
-
-        return value;
+        return "MethodHandle : Reference kind = " + referenceKind
+            + "Reference index = " + referenceIndex;
     }
 
     /**
@@ -96,12 +93,11 @@
      * @param constantPool the constant pool of which this entry is a member
      *      and against which this entry is to be resolved.
      */
+    @Override
     public void resolve(ConstantPool constantPool) {
         reference = constantPool.getEntry(referenceIndex);
         reference.resolve(constantPool);
         super.resolve(constantPool);
     }
 
-
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodRefCPInfo.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodRefCPInfo.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodRefCPInfo.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodRefCPInfo.java	2018-03-24 12:37:12.000000000 +0000
@@ -52,6 +52,7 @@
      * @exception IOException if there is a problem reading the entry from
      *      the stream.
      */
+    @Override
     public void read(DataInputStream cpStream) throws IOException {
         classIndex = cpStream.readUnsignedShort();
         nameAndTypeIndex = cpStream.readUnsignedShort();
@@ -62,18 +63,14 @@
      *
      * @return the string representation of this constant pool entry.
      */
+    @Override
     public String toString() {
-        String value;
-
         if (isResolved()) {
-            value = "Method : Class = " + methodClassName + ", name = "
-                 + methodName + ", type = " + methodType;
-        } else {
-            value = "Method : Class index = " + classIndex
-                 + ", name and type index = " + nameAndTypeIndex;
+            return "Method : Class = " + methodClassName + ", name = "
+                + methodName + ", type = " + methodType;
         }
-
-        return value;
+        return "Method : Class index = " + classIndex
+            + ", name and type index = " + nameAndTypeIndex;
     }
 
     /**
@@ -83,6 +80,7 @@
      * @param constantPool the constant pool of which this entry is a member
      *      and against which this entry is to be resolved.
      */
+    @Override
     public void resolve(ConstantPool constantPool) {
         ClassCPInfo methodClass
              = (ClassCPInfo) constantPool.getEntry(classIndex);
@@ -130,4 +128,3 @@
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodTypeCPInfo.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodTypeCPInfo.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodTypeCPInfo.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodTypeCPInfo.java	2018-03-24 12:37:12.000000000 +0000
@@ -30,6 +30,7 @@
     private int methodDescriptorIndex;
     /** the value of the method descriptor pointed to */
     private String methodDescriptor;
+
     /** Constructor.  */
     public MethodTypeCPInfo() {
         super(CONSTANT_METHODTYPE, 1);
@@ -63,6 +64,7 @@
         methodDescriptor = methodClass.getValue();
         super.resolve(constantPool);
     }
+
     /**
      * Print a readable version of the constant pool entry.
      *
@@ -70,13 +72,10 @@
      */
     @Override
     public String toString() {
-        if (!isResolved()) {
-            return "MethodDescriptorIndex: " + methodDescriptorIndex;
-        } else {
+        if (isResolved()) {
             return "MethodDescriptor: " + methodDescriptor;
-
         }
+        return "MethodDescriptorIndex: " + methodDescriptorIndex;
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/NameAndTypeCPInfo.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/NameAndTypeCPInfo.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/NameAndTypeCPInfo.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/NameAndTypeCPInfo.java	2018-03-24 12:37:12.000000000 +0000
@@ -25,6 +25,20 @@
  *
  */
 public class NameAndTypeCPInfo extends ConstantPoolEntry {
+    /** the name component of this entry */
+    private String name;
+    /** the type component of this entry */
+    private String type;
+    /**
+     * the index into the constant pool at which the name component's string
+     * value is stored
+     */
+    private int nameIndex;
+    /**
+     * the index into the constant pool where the type descriptor string is
+     * stored.
+     */
+    private int descriptorIndex;
 
     /** Constructor. */
     public NameAndTypeCPInfo() {
@@ -39,6 +53,7 @@
      * @exception IOException if there is a problem reading the entry from
      *      the stream.
      */
+    @Override
     public void read(DataInputStream cpStream) throws IOException {
         nameIndex = cpStream.readUnsignedShort();
         descriptorIndex = cpStream.readUnsignedShort();
@@ -49,17 +64,13 @@
      *
      * @return the string representation of this constant pool entry.
      */
+    @Override
     public String toString() {
-        String value;
-
         if (isResolved()) {
-            value = "Name = " + name + ", type = " + type;
-        } else {
-            value = "Name index = " + nameIndex
-                 + ", descriptor index = " + descriptorIndex;
+            return "Name = " + name + ", type = " + type;
         }
-
-        return value;
+        return "Name index = " + nameIndex + ", descriptor index = "
+            + descriptorIndex;
     }
 
     /**
@@ -69,6 +80,7 @@
      * @param constantPool the constant pool of which this entry is a member
      *      and against which this entry is to be resolved.
      */
+    @Override
     public void resolve(ConstantPool constantPool) {
         name = ((Utf8CPInfo) constantPool.getEntry(nameIndex)).getValue();
         type = ((Utf8CPInfo) constantPool.getEntry(descriptorIndex)).getValue();
@@ -94,19 +106,4 @@
         return type;
     }
 
-    /** the name component of this entry */
-    private String name;
-    /** the type component of this entry */
-    private String type;
-    /**
-     * the index into the constant pool at which the name component's string
-     * value is stored
-     */
-    private int nameIndex;
-    /**
-     * the index into the constant pool where the type descriptor string is
-     * stored.
-     */
-    private int descriptorIndex;
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/StringCPInfo.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/StringCPInfo.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/StringCPInfo.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/StringCPInfo.java	2018-03-24 12:37:12.000000000 +0000
@@ -26,6 +26,8 @@
  *
  */
 public class StringCPInfo extends ConstantCPInfo {
+    /** the index into the constant pool containing the string's content */
+    private int index;
 
     /** Constructor.  */
     public StringCPInfo() {
@@ -40,9 +42,9 @@
      * @exception IOException if there is a problem reading the entry from
      *      the stream.
      */
+    @Override
     public void read(DataInputStream cpStream) throws IOException {
         index = cpStream.readUnsignedShort();
-
         setValue("unresolved");
     }
 
@@ -51,6 +53,7 @@
      *
      * @return the string representation of this constant pool entry.
      */
+    @Override
     public String toString() {
         return "String Constant Pool Entry for "
             + getValue() + "[" + index + "]";
@@ -63,12 +66,11 @@
      * @param constantPool the constant pool of which this entry is a member
      *      and against which this entry is to be resolved.
      */
+    @Override
     public void resolve(ConstantPool constantPool) {
         setValue(((Utf8CPInfo) constantPool.getEntry(index)).getValue());
         super.resolve(constantPool);
     }
 
-    /** the index into the constant pool containing the string's content */
-    private int index;
 }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/Utf8CPInfo.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/Utf8CPInfo.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/Utf8CPInfo.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/Utf8CPInfo.java	2018-03-24 12:37:12.000000000 +0000
@@ -41,6 +41,7 @@
      * @exception IOException if there is a problem reading the entry from
      *      the stream.
      */
+    @Override
     public void read(DataInputStream cpStream) throws IOException {
         value = cpStream.readUTF();
     }
@@ -50,6 +51,7 @@
      *
      * @return the string representation of this constant pool entry.
      */
+    @Override
     public String toString() {
         return "UTF8 Value = " + value;
     }
@@ -64,4 +66,3 @@
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java	2018-03-24 12:37:12.000000000 +0000
@@ -24,9 +24,17 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
@@ -37,6 +45,9 @@
 import org.apache.tools.ant.taskdefs.rmic.WLRmic;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
+import org.apache.tools.ant.types.Resource;
+import org.apache.tools.ant.types.ResourceCollection;
+import org.apache.tools.ant.types.resources.FileProvider;
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.depend.DependencyAnalyzer;
 
@@ -74,26 +85,23 @@
     /** The directory which contains the dependency cache. */
     private File cache;
 
-    /** The list of source paths derived from the srcPath field. */
-    private String[] srcPathList;
-
     /**
      * A map which gives for every class a list of the class which it
      * affects.
      */
-    private Hashtable affectedClassMap;
+    private Map<String, Map<String, ClassFileInfo>> affectedClassMap;
 
     /** A map which gives information about a class */
-    private Hashtable classFileInfoMap;
+    private Map<String, ClassFileInfo> classFileInfoMap;
 
     /**
      * A map which gives the list of jars and classes from the classpath
      * that a class depends upon
      */
-    private Hashtable classpathDependencies;
+    private Map<String, Set<File>> classpathDependencies;
 
     /** The list of classes which are out of date. */
-    private Hashtable outOfDateClasses;
+    private Map<String, String> outOfDateClasses;
 
     /**
      * indicates that the dependency relationships should be extended beyond
@@ -182,29 +190,24 @@
      * @return a collection of class dependencies
      * @exception IOException if the dependency file cannot be read
      */
-    private Hashtable readCachedDependencies(File depFile) throws IOException {
-        Hashtable dependencyMap = new Hashtable();
+    private Map<String, List<String>> readCachedDependencies(File depFile) throws IOException {
+        Map<String, List<String>> dependencyMap = new HashMap<>();
 
-        BufferedReader in = null;
-        try {
-            in = new BufferedReader(new FileReader(depFile));
-            String line = null;
-            Vector dependencyList = null;
-            String className = null;
-            int prependLength = CLASSNAME_PREPEND.length();
+        int prependLength = CLASSNAME_PREPEND.length();
+
+        try (BufferedReader in = new BufferedReader(new FileReader(depFile))) {
+            List<String> dependencyList = null;
+            String line;
             while ((line = in.readLine()) != null) {
                 if (line.startsWith(CLASSNAME_PREPEND)) {
-                    dependencyList = new Vector();
-                    className = line.substring(prependLength);
-                    dependencyMap.put(className, dependencyList);
+                    String className = line.substring(prependLength);
+                    dependencyList = dependencyMap.computeIfAbsent(className,
+                        k -> new ArrayList<>());
                 } else if (dependencyList != null) {
-                    dependencyList.addElement(line);
+                    dependencyList.add(line);
                 }
             }
-        } finally {
-            FileUtils.close(in);
         }
-
         return dependencyMap;
     }
 
@@ -214,32 +217,21 @@
      * @param dependencyMap the map of dependencies to be written out.
      * @exception IOException if the dependency file cannot be written out.
      */
-    private void writeCachedDependencies(Hashtable dependencyMap)
+    private void writeCachedDependencies(Map<String, List<String>> dependencyMap)
         throws IOException {
         if (cache != null) {
-            BufferedWriter pw = null;
-            try {
-                cache.mkdirs();
-                File depFile = new File(cache, CACHE_FILE_NAME);
-
-                pw = new BufferedWriter(new FileWriter(depFile));
-                Enumeration e = dependencyMap.keys();
-                while (e.hasMoreElements()) {
-                    String className = (String) e.nextElement();
-
-                    pw.write(CLASSNAME_PREPEND + className);
-                    pw.newLine();
-
-                    Vector dependencyList
-                        = (Vector) dependencyMap.get(className);
-                    int size = dependencyList.size();
-                    for (int x = 0; x < size; x++) {
-                        pw.write(String.valueOf(dependencyList.elementAt(x)));
+            cache.mkdirs();
+            File depFile = new File(cache, CACHE_FILE_NAME);
+            try (BufferedWriter pw =
+                new BufferedWriter(new FileWriter(depFile))) {
+                for (Map.Entry<String, List<String>> e : dependencyMap
+                    .entrySet()) {
+                    pw.write(String.format("%s%s%n", CLASSNAME_PREPEND, e.getKey()));
+                    for (String s : e.getValue()) {
+                        pw.write(s);
                         pw.newLine();
                     }
                 }
-            } finally {
-                FileUtils.close(pw);
             }
         }
     }
@@ -254,27 +246,16 @@
             return null;
         }
 
-        String[] destPathElements = destPath.list();
-        String[] classpathElements = dependClasspath.list();
-        String checkPath = "";
-        for (int i = 0; i < classpathElements.length; ++i) {
-            String element = classpathElements[i];
-            boolean inDestPath = false;
-            for (int j = 0; j < destPathElements.length && !inDestPath; ++j) {
-                inDestPath = destPathElements[j].equals(element);
-            }
-            if (!inDestPath) {
-                if (checkPath.length() == 0) {
-                    checkPath = element;
-                } else {
-                    checkPath += ":" + element;
-                }
-            }
-        }
-
-        Path p = null;
-        if (checkPath.length() > 0) {
-            p = new Path(getProject(), checkPath);
+        Set<Resource> dependNotInDest = new LinkedHashSet<>();
+        dependClasspath.forEach(dependNotInDest::add);
+        destPath.forEach(dependNotInDest::remove);
+
+        Path p;
+        if (dependNotInDest.isEmpty()) {
+            p = null;
+        } else {
+            p = new Path(getProject());
+            dependNotInDest.forEach(p::add);
         }
 
         log("Classpath without dest dir is " + p, Project.MSG_DEBUG);
@@ -300,11 +281,11 @@
      *      files cannot be read or written
      */
     private void determineDependencies() throws IOException {
-        affectedClassMap = new Hashtable();
-        classFileInfoMap = new Hashtable();
+        affectedClassMap = new HashMap<>();
+        classFileInfoMap = new HashMap<>();
         boolean cacheDirty = false;
 
-        Hashtable dependencyMap = new Hashtable();
+        Map<String, List<String>> dependencyMap = new HashMap<>();
         File cacheFile = null;
         boolean cacheFileExists = true;
         long cacheLastModified = Long.MAX_VALUE;
@@ -318,13 +299,11 @@
                 dependencyMap = readCachedDependencies(cacheFile);
             }
         }
-        Enumeration classfileEnum = getClassFiles(destPath).elements();
-        while (classfileEnum.hasMoreElements()) {
-            ClassFileInfo info = (ClassFileInfo) classfileEnum.nextElement();
+        for (ClassFileInfo info : getClassFiles()) {
             log("Adding class info for " + info.className, Project.MSG_DEBUG);
             classFileInfoMap.put(info.className, info);
 
-            Vector dependencyList = null;
+            List<String> dependencyList = null;
 
             if (cache != null) {
                 // try to read the dependency info from the map if it is
@@ -333,7 +312,7 @@
                     && cacheLastModified > info.absoluteFile.lastModified()) {
                     // depFile exists and is newer than the class file
                     // need to get dependency list from the map.
-                    dependencyList = (Vector) dependencyMap.get(info.className);
+                    dependencyList = dependencyMap.get(info.className);
                 }
             }
 
@@ -343,11 +322,11 @@
                 analyzer.addRootClass(info.className);
                 analyzer.addClassPath(destPath);
                 analyzer.setClosure(false);
-                dependencyList = new Vector();
-                Enumeration depEnum = analyzer.getClassDependencies();
+                dependencyList = new ArrayList<>();
+                Enumeration<String> depEnum = analyzer.getClassDependencies();
                 while (depEnum.hasMoreElements()) {
-                    Object o = depEnum.nextElement();
-                    dependencyList.addElement(o);
+                    String o = depEnum.nextElement();
+                    dependencyList.add(o);
                     log("Class " + info.className + " depends on " + o,
                         Project.MSG_DEBUG);
                 }
@@ -357,18 +336,10 @@
 
             // This class depends on each class in the dependency list. For each
             // one of those, add this class into their affected classes list
-            Enumeration depEnum = dependencyList.elements();
-            while (depEnum.hasMoreElements()) {
-                String dependentClass = (String) depEnum.nextElement();
-
-                Hashtable affectedClasses
-                    = (Hashtable) affectedClassMap.get(dependentClass);
-                if (affectedClasses == null) {
-                    affectedClasses = new Hashtable();
-                    affectedClassMap.put(dependentClass, affectedClasses);
-                }
-
-                affectedClasses.put(info.className, info);
+            for (String dependentClass : dependencyList) {
+                affectedClassMap
+                    .computeIfAbsent(dependentClass, k -> new HashMap<>())
+                    .put(info.className, info);
                 log(dependentClass + " affects " + info.className,
                     Project.MSG_DEBUG);
             }
@@ -378,23 +349,19 @@
         Path checkPath = getCheckClassPath();
         if (checkPath != null) {
             // now determine which jars each class depends upon
-            classpathDependencies = new Hashtable();
-            AntClassLoader loader = null;
-            try {
-                loader = getProject().createClassLoader(checkPath);
+            classpathDependencies = new HashMap<>();
+            try (AntClassLoader loader = getProject().createClassLoader(checkPath)) {
 
-                Hashtable classpathFileCache = new Hashtable();
+                Map<String, Object> classpathFileCache = new HashMap<>();
                 Object nullFileMarker = new Object();
-                for (Enumeration e = dependencyMap.keys(); e.hasMoreElements();) {
-                    String className = (String) e.nextElement();
+                for (Map.Entry<String, List<String>> e : dependencyMap.entrySet()) {
+                    String className = e.getKey();
                     log("Determining classpath dependencies for " + className,
                         Project.MSG_DEBUG);
-                    Vector dependencyList = (Vector) dependencyMap.get(className);
-                    Hashtable dependencies = new Hashtable();
+                    List<String> dependencyList = e.getValue();
+                    Set<File> dependencies = new HashSet<>();
                     classpathDependencies.put(className, dependencies);
-                    Enumeration e2 = dependencyList.elements();
-                    while (e2.hasMoreElements()) {
-                        String dependency = (String) e2.nextElement();
+                    for (String dependency : dependencyList) {
                         log("Looking for " + dependency, Project.MSG_DEBUG);
                         Object classpathFileObject
                             = classpathFileCache.get(dependency);
@@ -407,22 +374,23 @@
                                     = loader.getResource(dependency.replace('.', '/') + ".class");
                                 log("URL is " + classURL, Project.MSG_DEBUG);
                                 if (classURL != null) {
-                                    if (classURL.getProtocol().equals("jar")) {
+                                    if ("jar".equals(classURL.getProtocol())) {
                                         String jarFilePath = classURL.getFile();
                                         int classMarker = jarFilePath.indexOf('!');
                                         jarFilePath = jarFilePath.substring(0, classMarker);
                                         if (jarFilePath.startsWith("file:")) {
                                             classpathFileObject = new File(
-                                                                           FileUtils.getFileUtils().fromURI(jarFilePath));
+                                                FileUtils.getFileUtils()
+                                                    .fromURI(jarFilePath));
                                         } else {
                                             throw new IOException(
-                                                                  "Bizarre nested path in jar: protocol: "
-                                                                  + jarFilePath);
+                                                "Bizarre nested path in jar: protocol: "
+                                                    + jarFilePath);
                                         }
-                                    } else if (classURL.getProtocol().equals("file")) {
+                                    } else if ("file".equals(classURL.getProtocol())) {
                                         classpathFileObject = new File(
-                                                                       FileUtils.getFileUtils()
-                                                                       .fromURI(classURL.toExternalForm()));
+                                            FileUtils.getFileUtils().fromURI(
+                                                classURL.toExternalForm()));
                                     }
                                     log("Class " + className
                                         + " depends on " + classpathFileObject
@@ -439,14 +407,10 @@
                             File jarFile = (File) classpathFileObject;
                             log("Adding a classpath dependency on " + jarFile,
                                 Project.MSG_DEBUG);
-                            dependencies.put(jarFile, jarFile);
+                            dependencies.add(jarFile);
                         }
                     }
                 }
-            } finally {
-                if (loader != null) {
-                    loader.cleanup();
-                }
             }
         } else {
             log("No classpath to check", Project.MSG_DEBUG);
@@ -466,11 +430,9 @@
      */
     private int deleteAllAffectedFiles() {
         int count = 0;
-        for (Enumeration e = outOfDateClasses.elements(); e.hasMoreElements();) {
-            String className = (String) e.nextElement();
+        for (String className : outOfDateClasses.keySet()) {
             count += deleteAffectedFiles(className);
-            ClassFileInfo classInfo
-                = (ClassFileInfo) classFileInfoMap.get(className);
+            ClassFileInfo classInfo = classFileInfoMap.get(className);
             if (classInfo != null && classInfo.absoluteFile.exists()) {
                 if (classInfo.sourceFile == null) {
                     warnOutOfDateButNotDeleted(classInfo, className, className);
@@ -493,14 +455,13 @@
     private int deleteAffectedFiles(String className) {
         int count = 0;
 
-        Hashtable affectedClasses = (Hashtable) affectedClassMap.get(className);
+        Map<String, ClassFileInfo> affectedClasses = affectedClassMap.get(className);
         if (affectedClasses == null) {
             return count;
         }
-        for (Enumeration e = affectedClasses.keys(); e.hasMoreElements();) {
-            String affectedClass = (String) e.nextElement();
-            ClassFileInfo affectedClassInfo
-                = (ClassFileInfo) affectedClasses.get(affectedClass);
+        for (Map.Entry<String, ClassFileInfo> e : affectedClasses.entrySet()) {
+            String affectedClass = e.getKey();
+            ClassFileInfo affectedClassInfo = e.getValue();
 
             if (!affectedClassInfo.absoluteFile.exists()) {
                 continue;
@@ -522,16 +483,16 @@
                 // without closure we may delete an inner class but not the
                 // top level class which would not trigger a recompile.
 
-                if (affectedClass.indexOf("$") == -1) {
+                if (affectedClass.indexOf('$') == -1) {
                     continue;
                 }
                 // need to delete the main class
                 String topLevelClassName
-                    = affectedClass.substring(0, affectedClass.indexOf("$"));
+                    = affectedClass.substring(0, affectedClass.indexOf('$'));
                 log("Top level class = " + topLevelClassName,
                     Project.MSG_VERBOSE);
                 ClassFileInfo topLevelClassInfo
-                    = (ClassFileInfo) classFileInfoMap.get(topLevelClassName);
+                    = classFileInfoMap.get(topLevelClassName);
                 if (topLevelClassInfo != null
                     && topLevelClassInfo.absoluteFile.exists()) {
                     log("Deleting file "
@@ -575,8 +536,8 @@
         log("The class " + affectedClass + " in file "
             + affectedClassInfo.absoluteFile.getPath()
             + " is out of date due to " + className
-            + " but has not been deleted because its source file"
-            + " could not be determined", level);
+            + " but has not been deleted because its source file could not be determined",
+            level);
         affectedClassInfo.isUserWarned = true;
     }
 
@@ -604,75 +565,48 @@
         log("Reverse Dependency Dump for " + affectedClassMap.size()
             + " classes:", Project.MSG_DEBUG);
 
-        Enumeration classEnum = affectedClassMap.keys();
-        while (classEnum.hasMoreElements()) {
-            String className = (String) classEnum.nextElement();
+        affectedClassMap.forEach((className, affectedClasses) -> {
             log(" Class " + className + " affects:", Project.MSG_DEBUG);
-            Hashtable affectedClasses
-                = (Hashtable) affectedClassMap.get(className);
-            Enumeration affectedClassEnum = affectedClasses.keys();
-            while (affectedClassEnum.hasMoreElements()) {
-                String affectedClass = (String) affectedClassEnum.nextElement();
-                ClassFileInfo info
-                    = (ClassFileInfo) affectedClasses.get(affectedClass);
-                log("    " + affectedClass + " in "
-                    + info.absoluteFile.getPath(), Project.MSG_DEBUG);
-            }
-        }
+            affectedClasses.forEach((affectedClass, info) -> log(
+                "    " + affectedClass + " in " + info.absoluteFile.getPath(),
+                Project.MSG_DEBUG));
+        });
 
         if (classpathDependencies != null) {
             log("Classpath file dependencies (Forward):", Project.MSG_DEBUG);
 
-            Enumeration classpathEnum = classpathDependencies.keys();
-            while (classpathEnum.hasMoreElements()) {
-                String className = (String) classpathEnum.nextElement();
+            classpathDependencies.forEach((className, dependencies) -> {
                 log(" Class " + className + " depends on:", Project.MSG_DEBUG);
-                Hashtable dependencies
-                    = (Hashtable) classpathDependencies.get(className);
-
-                Enumeration classpathFileEnum = dependencies.elements();
-                while (classpathFileEnum.hasMoreElements()) {
-                    File classpathFile = (File) classpathFileEnum.nextElement();
-                    log("    " + classpathFile.getPath(), Project.MSG_DEBUG);
-                }
-            }
+                dependencies.forEach(f -> log("    " + f.getPath(), Project.MSG_DEBUG));
+            });
         }
     }
 
     private void determineOutOfDateClasses() {
-        outOfDateClasses = new Hashtable();
-        for (int i = 0; i < srcPathList.length; i++) {
-            File srcDir = getProject().resolveFile(srcPathList[i]);
-            if (srcDir.exists()) {
-                DirectoryScanner ds = this.getDirectoryScanner(srcDir);
-                String[] files = ds.getIncludedFiles();
-                scanDir(srcDir, files);
-            }
-        }
+        outOfDateClasses = new HashMap<>();
+        directories(srcPath).forEach(srcDir -> {
+            DirectoryScanner ds = this.getDirectoryScanner(srcDir);
+            scanDir(srcDir, ds.getIncludedFiles());
+        });
 
         // now check classpath file dependencies
         if (classpathDependencies == null) {
             return;
         }
 
-        Enumeration classpathDepsEnum = classpathDependencies.keys();
-        while (classpathDepsEnum.hasMoreElements()) {
-            String className = (String) classpathDepsEnum.nextElement();
+        for (Map.Entry<String, Set<File>> e : classpathDependencies.entrySet()) {
+            String className = e.getKey();
             if (outOfDateClasses.containsKey(className)) {
                 continue;
             }
-            ClassFileInfo info
-                = (ClassFileInfo) classFileInfoMap.get(className);
+            ClassFileInfo info = classFileInfoMap.get(className);
 
             // if we have no info about the class - it may have been deleted already and we
             // are using cached info.
             if (info != null) {
-                Hashtable dependencies
-                    = (Hashtable) classpathDependencies.get(className);
-                for (Enumeration e2 = dependencies.elements(); e2.hasMoreElements();) {
-                    File classpathFile = (File) e2.nextElement();
-                    if (classpathFile.lastModified()
-                        > info.absoluteFile.lastModified()) {
+                for (File classpathFile : e.getValue()) {
+                    if (classpathFile.lastModified() > info.absoluteFile
+                        .lastModified()) {
                         log("Class " + className
                             + " is out of date with respect to "
                             + classpathFile, Project.MSG_DEBUG);
@@ -689,6 +623,7 @@
      *
      * @exception BuildException Thrown in case of an unrecoverable error.
      */
+    @Override
     public void execute() throws BuildException {
         try {
             long start = System.currentTimeMillis();
@@ -697,8 +632,7 @@
                                          getLocation());
             }
 
-            srcPathList = srcPath.list();
-            if (srcPathList.length == 0) {
+            if (!directories(srcPath).findAny().isPresent()) {
                 throw new BuildException("srcdir attribute must be non-empty",
                                          getLocation());
             }
@@ -708,8 +642,8 @@
             }
 
             if (cache != null && cache.exists() && !cache.isDirectory()) {
-                throw new BuildException("The cache, if specified, must "
-                                         + "point to a directory");
+                throw new BuildException(
+                    "The cache, if specified, must point to a directory");
             }
 
             if (cache != null && !cache.exists()) {
@@ -749,50 +683,38 @@
      *      checked.
      */
     protected void scanDir(File srcDir, String[] files) {
-
-        for (int i = 0; i < files.length; i++) {
-            File srcFile = new File(srcDir, files[i]);
-            if (files[i].endsWith(".java")) {
+        for (String f : files) {
+            File srcFile = new File(srcDir, f);
+            if (f.endsWith(".java")) {
                 String filePath = srcFile.getPath();
                 String className
                     = filePath.substring(srcDir.getPath().length() + 1,
                                          filePath.length() - ".java".length());
                 className = ClassFileUtils.convertSlashName(className);
                 ClassFileInfo info
-                    = (ClassFileInfo) classFileInfoMap.get(className);
+                    = classFileInfoMap.get(className);
                 if (info == null) {
                     // there was no class file. add this class to the list
                     outOfDateClasses.put(className, className);
-                } else {
-                    if (srcFile.lastModified()
-                        > info.absoluteFile.lastModified()) {
-                        outOfDateClasses.put(className, className);
-                    }
+                } else if (srcFile.lastModified() > info.absoluteFile
+                    .lastModified()) {
+                    outOfDateClasses.put(className, className);
                 }
             }
         }
     }
 
-
     /**
      * Get the list of class files we are going to analyse.
      *
-     * @param classLocations a path structure containing all the directories
-     *      where classes can be found.
      * @return a vector containing the classes to analyse.
      */
-    private Vector getClassFiles(Path classLocations) {
+    private List<ClassFileInfo> getClassFiles() {
         // break the classLocations into its components.
-        String[] classLocationsList = classLocations.list();
+        List<ClassFileInfo> classFileList = new ArrayList<>();
 
-        Vector classFileList = new Vector();
-
-        for (int i = 0; i < classLocationsList.length; ++i) {
-            File dir = new File(classLocationsList[i]);
-            if (dir.isDirectory()) {
-                addClassFiles(classFileList, dir, dir);
-            }
-        }
+        directories(destPath)
+            .forEach(dir -> addClassFiles(classFileList, dir, dir));
 
         return classFileList;
     }
@@ -806,21 +728,17 @@
      */
     private File findSourceFile(String classname, File sourceFileKnownToExist) {
         String sourceFilename;
-        int innerIndex = classname.indexOf("$");
+        int innerIndex = classname.indexOf('$');
         if (innerIndex != -1) {
             sourceFilename = classname.substring(0, innerIndex) + ".java";
         } else {
             sourceFilename = classname + ".java";
         }
-
         // search the various source path entries
-        for (int i = 0; i < srcPathList.length; ++i) {
-            File sourceFile = new File(srcPathList[i], sourceFilename);
-            if (sourceFile.equals(sourceFileKnownToExist) || sourceFile.exists()) {
-                return sourceFile;
-            }
-        }
-        return null;
+        return directories(srcPath)
+            .map(d -> new File(d, sourceFilename)).filter(Predicate
+                .<File> isEqual(sourceFileKnownToExist).or(File::exists))
+            .findFirst().orElse(null);
     }
 
     /**
@@ -835,36 +753,34 @@
      *      the absolute class name from the relative position in the
      *      source tree
      */
-    private void addClassFiles(Vector classFileList, File dir, File root) {
-        String[] filesInDir = dir.list();
+    private void addClassFiles(List<ClassFileInfo> classFileList, File dir, File root) {
+        File[] children = dir.listFiles();
 
-        if (filesInDir == null) {
+        if (children == null) {
             return;
         }
-        int length = filesInDir.length;
 
         int rootLength = root.getPath().length();
         File sourceFileKnownToExist = null; // speed optimization
-        for (int i = 0; i < length; ++i) {
-            File file = new File(dir, filesInDir[i]);
-            if (filesInDir[i].endsWith(".class")) {
+        for (File file : children) {
+            if (file.getName().endsWith(".class")) {
                 ClassFileInfo info = new ClassFileInfo();
                 info.absoluteFile = file;
-                String relativeName = file.getPath().substring(
-                                                               rootLength + 1,
-                                                               file.getPath().length() - ".class".length());
+
+                String relativeName = file.getPath().substring(rootLength + 1,
+                    file.getPath().length() - ".class".length());
+
                 info.className
                     = ClassFileUtils.convertSlashName(relativeName);
-                info.sourceFile = sourceFileKnownToExist = findSourceFile(
-                                                                          relativeName, sourceFileKnownToExist);
-                classFileList.addElement(info);
+                info.sourceFile = sourceFileKnownToExist =
+                    findSourceFile(relativeName, sourceFileKnownToExist);
+                classFileList.add(info);
             } else {
                 addClassFiles(classFileList, file, root);
             }
         }
     }
 
-
     /**
      * Set the directories path to find the Java source files.
      *
@@ -913,5 +829,10 @@
     public void setDump(boolean dump) {
         this.dump = dump;
     }
-}
 
+    private Stream<File> directories(ResourceCollection rc) {
+        return rc.stream().map(r -> r.as(FileProvider.class))
+            .filter(Objects::nonNull).map(FileProvider::getFile)
+            .filter(File::isDirectory);
+    }
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,11 +18,15 @@
 package org.apache.tools.ant.taskdefs.optional.depend;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Stack;
-import java.util.Vector;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * An iterator which iterates through the contents of a java directory. The
@@ -36,7 +40,7 @@
      * This is a stack of current iterators supporting the depth first
      * traversal of the directory tree.
      */
-    private Stack enumStack;
+    private Deque<Iterator<File>> enumStack;
 
     /**
      * The current directory iterator. As directories encounter lower level
@@ -45,7 +49,7 @@
      * directory. This implements a depth first traversal of the directory
      * namespace.
      */
-    private Enumeration currentEnum;
+    private Iterator<File> currentIterator;
 
     /**
      * Creates a directory iterator. The directory iterator is created to
@@ -63,12 +67,8 @@
     public DirectoryIterator(File rootDirectory, boolean changeInto)
          throws IOException {
         super();
-
-        enumStack = new Stack();
-
-        Vector filesInRoot = getDirectoryEntries(rootDirectory);
-
-        currentEnum = filesInRoot.elements();
+        enumStack = new ArrayDeque<>();
+        currentIterator = getDirectoryEntries(rootDirectory).iterator();
     }
 
     /**
@@ -79,21 +79,12 @@
      * @return a vector containing File objects for each entry in the
      *      directory.
      */
-    private Vector getDirectoryEntries(File directory) {
-        Vector files = new Vector();
-
-        // File[] filesInDir = directory.listFiles();
-        String[] filesInDir = directory.list();
-
-        if (filesInDir != null) {
-            int length = filesInDir.length;
-
-            for (int i = 0; i < length; ++i) {
-                files.addElement(new File(directory, filesInDir[i]));
-            }
+    private List<File> getDirectoryEntries(File directory) {
+        File[] filesInDir = directory.listFiles();
+        if (filesInDir == null) {
+            return Collections.emptyList();
         }
-
-        return files;
+        return Arrays.asList(filesInDir);
     }
 
     /**
@@ -110,30 +101,28 @@
      *
      * @return the next ClassFile in the iteration.
      */
+    @Override
     public ClassFile getNextClassFile() {
         ClassFile nextElement = null;
 
         try {
             while (nextElement == null) {
-                if (currentEnum.hasMoreElements()) {
-                    File element = (File) currentEnum.nextElement();
+                if (currentIterator.hasNext()) {
+                    File element = currentIterator.next();
 
                     if (element.isDirectory()) {
 
                         // push the current iterator onto the stack and then
                         // iterate through this directory.
-                        enumStack.push(currentEnum);
+                        enumStack.push(currentIterator);
 
-                        Vector files = getDirectoryEntries(element);
+                        List<File> files = getDirectoryEntries(element);
 
-                        currentEnum = files.elements();
+                        currentIterator = files.iterator();
                     } else {
-
                         // we have a file. create a stream for it
-                        FileInputStream inFileStream
-                            = new FileInputStream(element);
-
-                        try {
+                        try (InputStream inFileStream
+                             = Files.newInputStream(element.toPath())) {
                             if (element.getName().endsWith(".class")) {
 
                                 // create a data input stream from the jar
@@ -144,17 +133,13 @@
 
                                 nextElement = javaClass;
                             }
-                        } finally {
-                            inFileStream.close();
                         }
                     }
+                } else // this iterator is exhausted. Can we pop one off the stack
+                if (enumStack.isEmpty()) {
+                    break;
                 } else {
-                    // this iterator is exhausted. Can we pop one off the stack
-                    if (enumStack.empty()) {
-                        break;
-                    } else {
-                        currentEnum = (Enumeration) enumStack.pop();
-                    }
+                    currentIterator = enumStack.pop();
                 }
             }
         } catch (IOException e) {
@@ -165,4 +150,3 @@
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java	2018-03-24 12:37:12.000000000 +0000
@@ -41,7 +41,6 @@
      */
     public JarFileIterator(InputStream stream) throws IOException {
         super();
-
         jarStream = new ZipInputStream(stream);
     }
 
@@ -50,6 +49,7 @@
      *
      * @return a ClassFile object describing the class from the jar
      */
+    @Override
     public ClassFile getNextClassFile() {
         ZipEntry jarEntry;
         ClassFile nextElement = null;
@@ -69,7 +69,6 @@
 
                     nextElement = javaClass;
                 } else {
-
                     jarEntry = jarStream.getNextEntry();
                 }
             }
@@ -83,9 +82,7 @@
 
             throw new BuildException("Problem reading JAR file: " + text);
         }
-
         return nextElement;
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,39 +17,38 @@
  */
 package org.apache.tools.ant.taskdefs.optional;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.Vector;
-
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.LogOutputStream;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.types.PropertySet;
-import org.apache.tools.ant.util.CollectionUtils;
 import org.apache.tools.ant.util.DOMElementWriter;
-import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.JavaEnvUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -130,7 +129,7 @@
      */
     private boolean failonerror = true;
 
-    private Vector propertySets = new Vector();
+    private List<PropertySet> propertySets = new Vector<>();
 
     private String format = "text";
 
@@ -160,7 +159,6 @@
         this.destfile = destfile;
     }
 
-
     /**
      * If true, the task will fail if an error occurs writing the properties
      * file, otherwise errors are just logged.
@@ -172,7 +170,6 @@
         this.failonerror = failonerror;
     }
 
-
     /**
      * If the prefix is set, then only properties which start with this
      * prefix string will be recorded. If regex is not set and  if this
@@ -212,7 +209,7 @@
      * @since Ant 1.7
      */
     public void setRegex(String regex) {
-        if (regex != null && regex.length() != 0) {
+        if (!(regex == null || regex.isEmpty())) {
             this.regex = regex;
             PropertySet ps = new PropertySet();
             ps.setProject(getProject());
@@ -227,7 +224,7 @@
      * @since Ant 1.6
      */
     public void addPropertyset(PropertySet ps) {
-        propertySets.addElement(ps);
+        propertySets.add(ps);
     }
 
     /**
@@ -249,6 +246,7 @@
          * @see EnumeratedAttribute#getValues()
          * @return accepted values
          */
+        @Override
         public String[] getValues() {
             return formats;
         }
@@ -259,27 +257,28 @@
      *
      * @exception BuildException  trouble, probably file IO
      */
+    @Override
     public void execute() throws BuildException {
         if (prefix != null && regex != null) {
-            throw new BuildException("Please specify either prefix"
-                    + " or regex, but not both", getLocation());
+            throw new BuildException(
+                "Please specify either prefix or regex, but not both",
+                getLocation());
         }
         //copy the properties file
-        Hashtable allProps = new Hashtable();
+        Hashtable<Object, Object> allProps = new Hashtable<>();
 
         /* load properties from file if specified, otherwise
         use Ant's properties */
-        if (inFile == null && propertySets.size() == 0) {
+        if (inFile == null && propertySets.isEmpty()) {
             // add ant properties
             allProps.putAll(getProject().getProperties());
         } else if (inFile != null) {
-            if (inFile.exists() && inFile.isDirectory()) {
+            if (inFile.isDirectory()) {
                 String message = "srcfile is a directory!";
                 if (failonerror) {
                     throw new BuildException(message, getLocation());
-                } else {
-                    log(message, Project.MSG_ERR);
                 }
+                log(message, Project.MSG_ERR);
                 return;
             }
 
@@ -293,9 +292,7 @@
                 return;
             }
 
-            FileInputStream in = null;
-            try {
-                in = new FileInputStream(inFile);
+            try (InputStream in = Files.newInputStream(inFile.toPath())) {
                 Properties props = new Properties();
                 props.load(in);
                 allProps.putAll(props);
@@ -304,72 +301,35 @@
                     "Could not find file " + inFile.getAbsolutePath();
                 if (failonerror) {
                     throw new BuildException(message, fnfe, getLocation());
-                } else {
-                    log(message, Project.MSG_WARN);
                 }
+                log(message, Project.MSG_WARN);
                 return;
             } catch (IOException ioe) {
                 String message =
                     "Could not read file " + inFile.getAbsolutePath();
                 if (failonerror) {
                     throw new BuildException(message, ioe, getLocation());
-                } else {
-                    log(message, Project.MSG_WARN);
                 }
+                log(message, Project.MSG_WARN);
                 return;
-            } finally {
-                FileUtils.close(in);
             }
         }
 
-        Enumeration e = propertySets.elements();
-        while (e.hasMoreElements()) {
-            PropertySet ps = (PropertySet) e.nextElement();
-            allProps.putAll(ps.getProperties());
-        }
-
-        OutputStream os = null;
-        try {
-            if (destfile == null) {
-                os = new ByteArrayOutputStream();
-                saveProperties(allProps, os);
-                log(os.toString(), Project.MSG_INFO);
-            } else {
-                if (destfile.exists() && destfile.isDirectory()) {
-                    String message = "destfile is a directory!";
-                    if (failonerror) {
-                        throw new BuildException(message, getLocation());
-                    } else {
-                        log(message, Project.MSG_ERR);
-                    }
-                    return;
-                }
+        propertySets.stream().map(PropertySet::getProperties)
+            .forEach(allProps::putAll);
 
-                if (destfile.exists() && !destfile.canWrite()) {
-                    String message =
-                        "Can not write to the specified destfile!";
-                    if (failonerror) {
-                        throw new BuildException(message, getLocation());
-                    } else {
-                        log(message, Project.MSG_ERR);
-                    }
-                    return;
-                }
-                os = new FileOutputStream(this.destfile);
+        try (OutputStream os = createOutputStream()) {
+            if (os != null) {
                 saveProperties(allProps, os);
             }
         } catch (IOException ioe) {
             if (failonerror) {
                 throw new BuildException(ioe, getLocation());
-            } else {
-                log(ioe.getMessage(), Project.MSG_INFO);
             }
-        } finally {
-            FileUtils.close(os);
+            log(ioe.getMessage(), Project.MSG_INFO);
         }
     }
 
-
     /**
      * Send the key/value pairs in the hashtable to the given output stream.
      * Only those properties matching the <tt>prefix</tt> constraint will be
@@ -381,37 +341,37 @@
      * @throws IOException      on output errors
      * @throws BuildException   on other errors
      */
-    protected void saveProperties(Hashtable allProps, OutputStream os)
+    protected void saveProperties(Hashtable<Object, Object> allProps, OutputStream os)
         throws IOException, BuildException {
-        final List keyList = new ArrayList(allProps.keySet());
-        Collections.sort(keyList);
+        final List<Object> keyList = new ArrayList<>(allProps.keySet());
+
         Properties props = new Properties() {
             private static final long serialVersionUID = 5090936442309201654L;
-            public Enumeration keys() {
-                return CollectionUtils.asEnumeration(keyList.iterator());
+
+            @Override
+            public Enumeration<Object> keys() {
+                return keyList.stream()
+                    .sorted(Comparator.comparing(Object::toString))
+                    .collect(Collectors.collectingAndThen(Collectors.toList(),
+                        Collections::enumeration));
             }
-            public Set entrySet() {
-                Set result = super.entrySet();
+
+            @Override
+            public Set<Map.Entry<Object, Object>> entrySet() {
+                Set<Map.Entry<Object, Object>> result = super.entrySet();
                 if (JavaEnvUtils.isKaffe()) {
-                    TreeSet t = new TreeSet(new Comparator() {
-                        public int compare(Object o1, Object o2) {
-                            String key1 = (String) ((Map.Entry) o1).getKey();
-                            String key2 = (String) ((Map.Entry) o2).getKey();
-                            return key1.compareTo(key2);
-                        }
-                    });
+                    Set<Map.Entry<Object, Object>> t =
+                        new TreeSet<>(Comparator.comparing(
+                            ((Function<Map.Entry<Object, Object>, Object>) Map.Entry::getKey)
+                                .andThen(Object::toString)));
                     t.addAll(result);
-                    result = t;
+                    return t;
                 }
                 return result;
             }
         };
-        final int size = keyList.size();
-        for (int i = 0; i < size; i++) {
-            String name = keyList.get(i).toString();
-            String value = allProps.get(name).toString();
-            props.setProperty(name, value);
-        }
+        allProps.forEach((k, v) -> props.put(String.valueOf(k), String.valueOf(v)));
+
         if ("text".equals(format)) {
             jdkSaveProperties(props, os, "Ant properties");
         } else if ("xml".equals(format)) {
@@ -422,7 +382,7 @@
     /**
      * a tuple for the sort list.
      */
-    private static final class Tuple implements Comparable {
+    private static final class Tuple implements Comparable<Tuple> {
         private String key;
         private String value;
 
@@ -439,9 +399,9 @@
          * @throws ClassCastException if the specified object's type prevents it
          *                            from being compared to this Object.
          */
-        public int compareTo(Object o) {
-            Tuple that = (Tuple) o;
-            return key.compareTo(that.key);
+        @Override
+        public int compareTo(Tuple o) {
+            return Comparator.<String> naturalOrder().compare(key, o.key);
         }
 
         @Override
@@ -453,26 +413,21 @@
                 return false;
             }
             Tuple that = (Tuple) o;
-            return (key == null ? that.key == null : key.equals(that.key))
-                && (value == null ? that.value == null : value.equals(that.value));
+            return Objects.equals(key, that.key)
+                && Objects.equals(value, that.value);
         }
 
         @Override
         public int hashCode() {
-            return key != null ? key.hashCode() : 0;
+            return Objects.hash(key);
         }
     }
 
-    private List sortProperties(Properties props) {
+    private List<Tuple> sortProperties(Properties props) {
         // sort the list. Makes SCM and manual diffs easier.
-        List sorted = new ArrayList(props.size());
-        Enumeration e = props.propertyNames();
-        while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
-            sorted.add(new Tuple(name, props.getProperty(name)));
-        }
-        Collections.sort(sorted);
-        return sorted;
+        return props.stringPropertyNames().stream()
+            .map(k -> new Tuple(k, props.getProperty(k))).sorted()
+            .collect(Collectors.toList());
     }
 
     /**
@@ -487,29 +442,22 @@
         Document doc = getDocumentBuilder().newDocument();
         Element rootElement = doc.createElement(PROPERTIES);
 
-        List sorted = sortProperties(props);
-
+        List<Tuple> sorted = sortProperties(props);
 
         // output properties
-        Iterator iten = sorted.iterator();
-        while (iten.hasNext()) {
-            Tuple tuple = (Tuple) iten.next();
+        for (Tuple tuple : sorted) {
             Element propElement = doc.createElement(PROPERTY);
             propElement.setAttribute(ATTR_NAME, tuple.key);
             propElement.setAttribute(ATTR_VALUE, tuple.value);
             rootElement.appendChild(propElement);
         }
 
-        Writer wri = null;
-        try {
-            wri = new OutputStreamWriter(os, "UTF8");
+        try (Writer wri = new OutputStreamWriter(os, "UTF8")) {
             wri.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-            (new DOMElementWriter()).write(rootElement, wri, 0, "\t");
+            new DOMElementWriter().write(rootElement, wri, 0, "\t");
             wri.flush();
         } catch (IOException ioe) {
             throw new BuildException("Unable to write XML file", ioe);
-        } finally {
-            FileUtils.close(wri);
         }
     }
 
@@ -527,7 +475,6 @@
                                      String header) throws IOException {
        try {
            props.store(os, header);
-
        } catch (IOException ioe) {
            throw new BuildException(ioe, getLocation());
        } finally {
@@ -541,6 +488,29 @@
        }
     }
 
+    private OutputStream createOutputStream() throws IOException {
+        if (destfile == null) {
+            return new LogOutputStream(this);
+        }
+        if (destfile.exists() && destfile.isDirectory()) {
+            String message = "destfile is a directory!";
+            if (failonerror) {
+                throw new BuildException(message, getLocation());
+            }
+            log(message, Project.MSG_ERR);
+            return null;
+        }
+        if (destfile.exists() && !destfile.canWrite()) {
+            String message =
+                "Can not write to the specified destfile!";
+            if (failonerror) {
+                throw new BuildException(message, getLocation());
+            }
+            log(message, Project.MSG_ERR);
+            return null;
+        }
+        return Files.newOutputStream(this.destfile.toPath());
+    }
 
     /**
      * Uses the DocumentBuilderFactory to get a DocumentBuilder instance.
@@ -555,4 +525,3 @@
         }
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java	2018-03-24 12:37:12.000000000 +0000
@@ -26,16 +26,18 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-
+import java.util.List;
+import java.util.Map;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.ExecTask;
 import org.apache.tools.ant.taskdefs.Execute;
 import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
 import org.apache.tools.ant.taskdefs.Java;
+import org.apache.tools.ant.taskdefs.optional.ejb.EjbJar.DTDLocation;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.Path;
 
@@ -78,19 +80,18 @@
 public class BorlandDeploymentTool extends GenericDeploymentTool
                                    implements ExecuteStreamHandler {
     /** Borland 1.1 ejb id */
-    public static final String PUBLICID_BORLAND_EJB
-    = "-//Inprise Corporation//DTD Enterprise JavaBeans 1.1//EN";
+    public static final String PUBLICID_BORLAND_EJB =
+        "-//Inprise Corporation//DTD Enterprise JavaBeans 1.1//EN";
 
-    protected static final String DEFAULT_BAS45_EJB11_DTD_LOCATION
-    = "/com/inprise/j2ee/xml/dtds/ejb-jar.dtd";
+    protected static final String DEFAULT_BAS45_EJB11_DTD_LOCATION =
+        "/com/inprise/j2ee/xml/dtds/ejb-jar.dtd";
 
-    protected static final String DEFAULT_BAS_DTD_LOCATION
-    = "/com/inprise/j2ee/xml/dtds/ejb-inprise.dtd";
+    protected static final String DEFAULT_BAS_DTD_LOCATION =
+        "/com/inprise/j2ee/xml/dtds/ejb-inprise.dtd";
 
     protected static final String BAS_DD = "ejb-inprise.xml";
     protected static final String BES_DD = "ejb-borland.xml";
 
-
     /** Java2iiop executable **/
     protected static final String JAVA2IIOP = "java2iiop";
 
@@ -114,13 +115,13 @@
 
     /** Borland Enterprise Server = version 5 */
     static final int    BES       = 5;
+
     /** Borland Application Server or Inprise Application Server  = version 4 */
     static final int    BAS       = 4;
 
     /** borland appserver version 4 or 5 */
     private int version = BAS;
 
-
     /**
      * Instance variable that determines whether it is necessary to verify the
      * produced jar
@@ -128,7 +129,7 @@
     private boolean verify     = true;
     private String  verifyArgs = "";
 
-    private Hashtable genfiles = new Hashtable();
+    private Map<String, File> genfiles = new Hashtable<>();
 
     /**
      * set the debug mode for java2iiop (default false)
@@ -146,7 +147,6 @@
         this.verify = verify;
     }
 
-
     /**
      * Setter used to store the suffix for the generated borland jar file.
      * @param inString the string to use as the suffix.
@@ -155,7 +155,6 @@
         this.jarSuffix = inString;
     }
 
-
     /**
      * sets some additional args to send to verify command
      * @param args additional command line parameters
@@ -173,7 +172,6 @@
         this.borlandDTD = inString;
     }
 
-
     /**
      * setter used to store whether the task will include the generate client task.
      * (see : BorlandGenerateClient task)
@@ -200,7 +198,6 @@
         this.java2iioparams = params;
     }
 
-
     /**
      * Get the borland descriptor handler.
      * @param srcDir the source directory.
@@ -209,8 +206,9 @@
     protected DescriptorHandler getBorlandDescriptorHandler(final File srcDir) {
         DescriptorHandler handler =
             new DescriptorHandler(getTask(), srcDir) {
+                    @Override
                     protected void processElement() {
-                        if (currentElement.equals("type-storage")) {
+                        if ("type-storage".equals(currentElement)) {
                             // Get the filename of vendor specific descriptor
                             String fileNameWithMETA = currentText;
                             //trim the META_INF\ off of the file name
@@ -226,8 +224,7 @@
         handler.registerDTD(PUBLICID_BORLAND_EJB,
                             borlandDTD == null ? DEFAULT_BAS_DTD_LOCATION : borlandDTD);
 
-        for (Iterator i = getConfig().dtdLocations.iterator(); i.hasNext();) {
-            EjbJar.DTDLocation dtdLocation = (EjbJar.DTDLocation) i.next();
+        for (DTDLocation dtdLocation : getConfig().dtdLocations) {
             handler.registerDTD(dtdLocation.getPublicId(), dtdLocation.getLocation());
         }
         return handler;
@@ -239,14 +236,15 @@
      * @param ejbFiles the map to add the files to.
      * @param ddPrefix the prefix to use.
      */
-    protected void addVendorFiles(Hashtable ejbFiles, String ddPrefix) {
+    @Override
+    protected void addVendorFiles(Hashtable<String, File> ejbFiles, String ddPrefix) {
 
         //choose the right vendor DD
         if (!(version == BES || version == BAS)) {
             throw new BuildException("version " + version + " is not supported");
         }
 
-        String dd = (version == BES ? BES_DD : BAS_DD);
+        String dd = (version == BES) ? BES_DD : BAS_DD;
 
         log("vendor file : " + ddPrefix + dd, Project.MSG_DEBUG);
 
@@ -265,6 +263,7 @@
      * Get the vendor specific name of the Jar that will be output. The modification date
      * of this jar will be checked against the dependent bean classes.
      */
+    @Override
     File getVendorOutputJarFile(String baseName) {
         return new File(getDestDir(), baseName +  jarSuffix);
     }
@@ -293,8 +292,7 @@
     private void verifyBorlandJarV5(File sourceJar) {
         log("verify BES " + sourceJar, Project.MSG_INFO);
         try {
-            ExecTask execTask = null;
-            execTask = new ExecTask(getTask());
+            ExecTask execTask = new ExecTask(getTask());
             execTask.setDir(new File("."));
             execTask.setExecutable("iastool");
             //classpath
@@ -314,9 +312,7 @@
             execTask.execute();
         } catch (Exception e) {
             // Have to catch this because of the semantics of calling main()
-            String msg = "Exception while calling generateclient Details: "
-                + e.toString();
-            throw new BuildException(msg, e);
+            throw new BuildException("Exception while calling generateclient Details: ", e);
         }
     }
 
@@ -353,7 +349,6 @@
         }
     }
 
-
     /**
      * Generate the client jar corresponding to the jar file passed as parameter
      * the method uses the BorlandGenerateClient task.
@@ -363,7 +358,7 @@
         getTask().getProject().addTaskDefinition("internal_bas_generateclient",
             org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient.class);
 
-        org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient gentask = null;
+        BorlandGenerateClient gentask;
         log("generate client for " + sourceJar, Project.MSG_INFO);
         try {
             Project project = getTask().getProject();
@@ -380,9 +375,7 @@
             gentask.execute();
         } catch (Exception e) {
             //TO DO : delete the file if it is not a valid file.
-            String msg = "Exception while calling " + VERIFY + " Details: "
-                + e.toString();
-            throw new BuildException(msg, e);
+            throw new BuildException("Exception while calling " + VERIFY, e);
         }
     }
 
@@ -391,10 +384,8 @@
      * Add all the generate class file into the ejb files
      * @param ithomes : iterator on home class
      */
-    private void buildBorlandStubs(Iterator ithomes) {
-        Execute execTask = null;
-
-        execTask = new Execute(this);
+    private void buildBorlandStubs(Collection<String> ithomes) {
+        Execute execTask = new Execute(this);
         Project project = getTask().getProject();
         execTask.setAntRun(project);
         execTask.setWorkingDirectory(project.getBaseDir());
@@ -418,16 +409,14 @@
             commandline.createArgument().setLine(java2iioparams);
         }
 
-
         //root dir
         commandline.createArgument().setValue("-root_dir");
         commandline.createArgument().setValue(getConfig().srcDir.getAbsolutePath());
         //compiling order
         commandline.createArgument().setValue("-compile");
         //add the home class
-        while (ithomes.hasNext()) {
-            commandline.createArgument().setValue(ithomes.next().toString());
-        }
+        ithomes.stream().map(Object::toString)
+            .forEach(v -> commandline.createArgument().setValue(v));
 
         try {
             log("Calling java2iiop", Project.MSG_VERBOSE);
@@ -435,11 +424,11 @@
             execTask.setCommandline(commandline.getCommandline());
             int result = execTask.execute();
             if (Execute.isFailure(result)) {
-                String msg = "Failed executing java2iiop (ret code is "
-                    + result + ")";
-                throw new BuildException(msg, getTask().getLocation());
+                throw new BuildException(
+                    "Failed executing java2iiop (ret code is " + result + ")",
+                    getTask().getLocation());
             }
-        } catch (java.io.IOException e) {
+        } catch (IOException e) {
             log("java2iiop exception :" + e.getMessage(), Project.MSG_ERR);
             throw new BuildException(e, getTask().getLocation());
         }
@@ -455,13 +444,13 @@
      * @param publicId the id to use.
      * @throws BuildException if there is an error.
      */
-    protected void writeJar(String baseName, File jarFile, Hashtable files, String publicId)
+    @Override
+    protected void writeJar(String baseName, File jarFile, Hashtable<String, File> files, String publicId)
         throws BuildException {
         //build the home classes list.
-        Vector homes = new Vector();
-        Iterator it = files.keySet().iterator();
-        while (it.hasNext()) {
-            String clazz = (String) it.next();
+        List<String> homes = new ArrayList<>();
+
+        for (String clazz : files.keySet()) {
             if (clazz.endsWith("Home.class")) {
                 //remove .class extension
                 String home = toClass(clazz);
@@ -470,7 +459,7 @@
             }
         }
 
-        buildBorlandStubs(homes.iterator());
+        buildBorlandStubs(homes);
 
         //add the gen files to the collection
         files.putAll(genfiles);
@@ -493,9 +482,8 @@
      */
     private String toClass(String filename) {
         //remove the .class
-        String classname = filename.substring(0, filename.lastIndexOf(".class"));
-        classname = classname.replace('\\', '.');
-        return classname;
+        return filename.substring(0, filename.lastIndexOf(".class"))
+            .replace('\\', '.').replace('/', '.');
     }
 
     /**
@@ -504,28 +492,35 @@
      */
     private  String toClassFile(String filename) {
         //remove the .class
-        String classfile = filename.substring(0, filename.lastIndexOf(".java"));
-        classfile = classfile + ".class";
-        return classfile;
+        return filename.replaceFirst("\\.java$", ".class");
     }
 
     // implementation of org.apache.tools.ant.taskdefs.ExecuteStreamHandler interface
 
     /** {@inheritDoc}. */
-    public void start() throws IOException  { }
+    @Override
+    public void start() throws IOException {
+    }
+
     /** {@inheritDoc}. */
-    public void stop()  {  }
+    @Override
+    public void stop() {
+    }
+
     /** {@inheritDoc}. */
-    public void setProcessInputStream(OutputStream param1) throws IOException   { }
+    @Override
+    public void setProcessInputStream(OutputStream param1) throws IOException {
+    }
 
     /**
      * Set the output stream of the process.
      * @param is the input stream.
      * @throws IOException if there is an error.
      */
+    @Override
     public void setProcessOutputStream(InputStream is) throws IOException {
-        try {
-            BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+        try (BufferedReader reader =
+            new BufferedReader(new InputStreamReader(is))) {
             String javafile;
             while ((javafile = reader.readLine()) != null) {
                 if (javafile.endsWith(".java")) {
@@ -535,10 +530,8 @@
                     genfiles.put(key, new File(classfile));
                 }
             }
-            reader.close();
         } catch (Exception e) {
-            String msg = "Exception while parsing  java2iiop output. Details: " + e.toString();
-            throw new BuildException(msg, e);
+            throw new BuildException("Exception while parsing java2iiop output.", e);
         }
     }
 
@@ -547,6 +540,7 @@
      * @param is the input stream.
      * @throws IOException if there is an error.
      */
+    @Override
     public void setProcessErrorStream(InputStream is) throws IOException {
         BufferedReader reader = new BufferedReader(new InputStreamReader(is));
         String s = reader.readLine();
@@ -555,4 +549,3 @@
         }
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java	2018-03-24 12:37:12.000000000 +0000
@@ -133,7 +133,6 @@
         createClasspath().setRefid(r);
     }
 
-
     /**
      * Do the work.
      *
@@ -141,6 +140,7 @@
      *
      * @exception BuildException if something goes wrong with the build
      */
+    @Override
     public void execute() throws BuildException {
         if (ejbjarfile == null || ejbjarfile.isDirectory()) {
             throw new BuildException("invalid ejb jar file.");
@@ -162,13 +162,12 @@
 
         if (!(version == BorlandDeploymentTool.BES
             || version == BorlandDeploymentTool.BAS)) {
-            throw new BuildException("version " + version
-                                      + " is not supported");
+            throw new BuildException("version %d is not supported", version);
         }
 
         log("client jar file is " + clientjarfile);
 
-        if (mode.equalsIgnoreCase(FORK_MODE)) {
+        if (FORK_MODE.equalsIgnoreCase(mode)) {
             executeFork();
         } else {
             executeJava();
@@ -182,15 +181,14 @@
     protected void executeJava() throws BuildException {
         try {
             if (version == BorlandDeploymentTool.BES)  {
-                throw new BuildException("java mode is supported only for "
-                    + "previous version <=" + BorlandDeploymentTool.BAS);
+                throw new BuildException(
+                    "java mode is supported only for previous version <= %d",
+                    BorlandDeploymentTool.BAS);
             }
 
             log("mode : java");
 
-            Java execTask = null;
-            execTask = new Java(this);
-
+            Java execTask = new Java(this);
             execTask.setDir(new File("."));
             execTask.setClassname("com.inprise.server.commandline.EJBUtilities");
             //classpath
@@ -218,8 +216,7 @@
 
         } catch (Exception e) {
             // Have to catch this because of the semantics of calling main()
-            String msg = "Exception while calling generateclient Details: " + e.toString();
-            throw new BuildException(msg, e);
+            throw new BuildException("Exception while calling generateclient", e);
         }
     }
 
@@ -227,7 +224,7 @@
      * launch the generate client using system api.
      * @throws BuildException if there is an error.
      */
-    protected  void executeFork() throws BuildException {
+    protected void executeFork() throws BuildException {
         if (version == BorlandDeploymentTool.BAS) {
             executeForkV4();
         }
@@ -240,13 +237,11 @@
      * launch the generate client using system api.
      * @throws BuildException if there is an error.
      */
-    protected  void executeForkV4() throws BuildException {
+    protected void executeForkV4() throws BuildException {
         try {
-
             log("mode : fork " + BorlandDeploymentTool.BAS, Project.MSG_DEBUG);
 
             ExecTask execTask = new ExecTask(this);
-
             execTask.setDir(new File("."));
             execTask.setExecutable("iastool");
             execTask.createArg().setValue("generateclient");
@@ -267,24 +262,19 @@
             execTask.execute();
         } catch (Exception e) {
             // Have to catch this because of the semantics of calling main()
-            String msg = "Exception while calling generateclient Details: "
-                + e.toString();
-            throw new BuildException(msg, e);
+            throw new BuildException("Exception while calling generateclient", e);
         }
-
     }
 
     /**
      * launch the generate client using system api.
      * @throws BuildException if there is an error.
      */
-    protected  void executeForkV5() throws BuildException {
+    protected void executeForkV5() throws BuildException {
         try {
             log("mode : fork " + BorlandDeploymentTool.BES, Project.MSG_DEBUG);
             ExecTask execTask = new ExecTask(this);
-
             execTask.setDir(new File("."));
-
             execTask.setExecutable("iastool");
             if (debug) {
                 execTask.createArg().setValue("-debug");
@@ -303,11 +293,8 @@
             execTask.execute();
         } catch (Exception e) {
             // Have to catch this because of the semantics of calling main()
-            String msg = "Exception while calling generateclient Details: "
-                + e.toString();
-            throw new BuildException(msg, e);
+            throw new BuildException("Exception while calling generateclient", e);
         }
-
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,12 +19,12 @@
 package org.apache.tools.ant.taskdefs.optional.ejb;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.nio.file.Files;
 import java.util.Hashtable;
+import java.util.Map;
 
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
@@ -96,20 +96,20 @@
      * put into the jar file, mapped to File objects  Accessed by the SAX
      * parser call-back method characters().
      */
-    protected Hashtable ejbFiles = null;
+    protected Hashtable<String, File> ejbFiles = null;
 
     /**
      * Instance variable that stores the value found in the &lt;ejb-name&gt; element
      */
     protected String ejbName = null;
 
-    private Hashtable fileDTDs = new Hashtable();
+    private Map<String, File> fileDTDs = new Hashtable<>();
 
-    private Hashtable resourceDTDs = new Hashtable();
+    private Map<String, String> resourceDTDs = new Hashtable<>();
 
     private boolean inEJBRef = false;
 
-    private Hashtable urlDTDs = new Hashtable();
+    private Map<String, URL> urlDTDs = new Hashtable<>();
     // CheckStyle:VisibilityModifier OFF - bc
 
     /**
@@ -184,22 +184,23 @@
      * @return an inputsource for this identifier
      * @throws SAXException if there is a problem.
      */
+    @Override
     public InputSource resolveEntity(String publicId, String systemId)
         throws SAXException {
         this.publicId = publicId;
 
-        File dtdFile = (File) fileDTDs.get(publicId);
+        File dtdFile = fileDTDs.get(publicId);
         if (dtdFile != null) {
             try {
                 owningTask.log("Resolved " + publicId + " to local file "
                     + dtdFile, Project.MSG_VERBOSE);
-                return new InputSource(new FileInputStream(dtdFile));
-            } catch (FileNotFoundException ex) {
+                return new InputSource(Files.newInputStream(dtdFile.toPath()));
+            } catch (IOException ex) {
                 // ignore
             }
         }
 
-        String dtdResourceName = (String) resourceDTDs.get(publicId);
+        String dtdResourceName = resourceDTDs.get(publicId);
         if (dtdResourceName != null) {
             InputStream is = this.getClass().getResourceAsStream(dtdResourceName);
             if (is != null) {
@@ -209,7 +210,7 @@
             }
         }
 
-        URL dtdUrl = (URL) urlDTDs.get(publicId);
+        URL dtdUrl = urlDTDs.get(publicId);
         if (dtdUrl != null) {
             try {
                 InputStream is = dtdUrl.openStream();
@@ -231,8 +232,8 @@
      * Getter method that returns the set of files to include in the EJB jar.
      * @return the map of files
      */
-    public Hashtable getFiles() {
-        return (ejbFiles == null) ? new Hashtable() : ejbFiles;
+    public Hashtable<String, File> getFiles() {
+        return ejbFiles == null ? new Hashtable<>() : ejbFiles;
     }
 
     /**
@@ -256,13 +257,13 @@
      * instance variables to ensure safe operation.
      * @throws SAXException on error
      */
+    @Override
     public void startDocument() throws SAXException {
-        this.ejbFiles = new Hashtable(DEFAULT_HASH_TABLE_SIZE, 1);
+        this.ejbFiles = new Hashtable<>(DEFAULT_HASH_TABLE_SIZE, 1);
         this.currentElement = null;
         inEJBRef = false;
     }
 
-
     /**
      * SAX parser call-back method that is invoked when a new element is entered
      * into.  Used to store the context (attribute name) in the currentAttribute
@@ -271,26 +272,26 @@
      * @param attrs Attributes associated to the element.
      * @throws SAXException on error
      */
+    @Override
     public void startElement(String name, AttributeList attrs)
         throws SAXException {
         this.currentElement = name;
         currentText = "";
-        if (name.equals(EJB_REF) || name.equals(EJB_LOCAL_REF)) {
+        if (EJB_REF.equals(name) || EJB_LOCAL_REF.equals(name)) {
             inEJBRef = true;
-        } else if (parseState == STATE_LOOKING_EJBJAR && name.equals(EJB_JAR)) {
+        } else if (parseState == STATE_LOOKING_EJBJAR && EJB_JAR.equals(name)) {
             parseState = STATE_IN_EJBJAR;
-        } else if (parseState == STATE_IN_EJBJAR && name.equals(ENTERPRISE_BEANS)) {
+        } else if (parseState == STATE_IN_EJBJAR && ENTERPRISE_BEANS.equals(name)) {
             parseState = STATE_IN_BEANS;
-        } else if (parseState == STATE_IN_BEANS && name.equals(SESSION_BEAN)) {
+        } else if (parseState == STATE_IN_BEANS && SESSION_BEAN.equals(name)) {
             parseState = STATE_IN_SESSION;
-        } else if (parseState == STATE_IN_BEANS && name.equals(ENTITY_BEAN)) {
+        } else if (parseState == STATE_IN_BEANS && ENTITY_BEAN.equals(name)) {
             parseState = STATE_IN_ENTITY;
-        } else if (parseState == STATE_IN_BEANS && name.equals(MESSAGE_BEAN)) {
+        } else if (parseState == STATE_IN_BEANS && MESSAGE_BEAN.equals(name)) {
             parseState = STATE_IN_MESSAGE;
         }
     }
 
-
     /**
      * SAX parser call-back method that is invoked when an element is exited.
      * Used to blank out (set to the empty string, not nullify) the name of
@@ -301,6 +302,7 @@
      *        in this implementation.
      * @throws SAXException on error
      */
+    @Override
     public void endElement(String name) throws SAXException {
         processElement();
         currentText = "";
@@ -336,13 +338,12 @@
      *        char array where the current data terminates.
      * @throws SAXException on error
      */
+    @Override
     public void characters(char[] ch, int start, int length)
         throws SAXException {
-
         currentText += new String(ch, start, length);
     }
 
-
     /**
      * Called when an endelement is seen.
      * This may be overridden in derived classes.
@@ -357,15 +358,14 @@
             return;
         }
 
-        if (currentElement.equals(HOME_INTERFACE)
-            || currentElement.equals(REMOTE_INTERFACE)
-            || currentElement.equals(LOCAL_INTERFACE)
-            || currentElement.equals(LOCAL_HOME_INTERFACE)
-            || currentElement.equals(BEAN_CLASS)
-            || currentElement.equals(PK_CLASS)) {
+        if (HOME_INTERFACE.equals(currentElement)
+            || REMOTE_INTERFACE.equals(currentElement)
+            || LOCAL_INTERFACE.equals(currentElement)
+            || LOCAL_HOME_INTERFACE.equals(currentElement)
+            || BEAN_CLASS.equals(currentElement)
+            || PK_CLASS.equals(currentElement)) {
 
             // Get the filename into a String object
-            File classFile = null;
             String className = currentText.trim();
 
             // If it's a primitive wrapper then we shouldn't try and put
@@ -376,8 +376,7 @@
                 // name, create the File object and add it to the Hashtable.
                 className = className.replace('.', File.separatorChar);
                 className += ".class";
-                classFile = new File(srcDir, className);
-                ejbFiles.put(className, classFile);
+                ejbFiles.put(className, new File(srcDir, className));
             }
         }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,14 +18,11 @@
 
 package org.apache.tools.ant.taskdefs.optional.ejb;
 
-
-
 import javax.xml.parsers.SAXParser;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
 
-
 /**
  * The interface to implement for deployment tools.
  */
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,7 +21,6 @@
 // Standard java imports
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -103,12 +102,12 @@
         /**
          * A Fileset of support classes
          */
-        public List supportFileSets = new ArrayList();
+        public List<FileSet> supportFileSets = new ArrayList<>();
 
         /**
          * The list of configured DTD locations
          */
-        public ArrayList dtdLocations = new ArrayList();
+        public ArrayList<DTDLocation> dtdLocations = new ArrayList<>();
 
         /**
          * The naming scheme used to determine the generated jar name
@@ -162,6 +161,7 @@
          *
          * @return an array of the values of this attribute class.
          */
+        @Override
         public String[] getValues() {
             return new String[] {EJB_NAME, DIRECTORY, DESCRIPTOR, BASEJARNAME};
         }
@@ -178,20 +178,21 @@
         /** 2.0 value */
         public static final String CMP2_0 = "2.0";
         /** {@inheritDoc}. */
+        @Override
         public String[] getValues() {
-            return new String[]{
+            return new String[] {
                 CMP1_0,
                 CMP2_0,
             };
         }
     }
+
     /**
      * The config which is built by this task and used by the various deployment
      * tools to access the configuration of the ejbjar task
      */
     private Config config = new Config();
 
-
     /**
      * Stores a handle to the directory to put the Jar files in. This is
      * only used by the generic deployment descriptor tool which is created
@@ -207,7 +208,7 @@
     private String cmpVersion = CMPVersion.CMP1_0;
 
     /** The list of deployment tools we are going to run. */
-    private ArrayList deploymentTools = new ArrayList();
+    private List<EJBDeploymentTool> deploymentTools = new ArrayList<>();
 
     /**
      * Add a deployment tool to the list of deployment tools that will be
@@ -226,7 +227,7 @@
      * deployment tool for Orion server.
      *
      * @return the deployment tool instance to be configured.
-     * @since Ant 1.9.10
+     * @since Ant 1.10.2
      */
     public OrionDeploymentTool createOrion() {
         OrionDeploymentTool tool = new OrionDeploymentTool();
@@ -361,7 +362,6 @@
         return supportFileSet;
     }
 
-
     /**
      * Set the Manifest file to use when jarring. As of EJB 1.1, manifest
      * files are no longer used to configure the EJB. However, they still
@@ -422,10 +422,10 @@
         if (config.namingScheme == null) {
             config.namingScheme = new NamingScheme();
             config.namingScheme.setValue(NamingScheme.BASEJARNAME);
-        } else if (!config.namingScheme.getValue().equals(NamingScheme.BASEJARNAME)) {
-            throw new BuildException("The basejarname attribute is not "
-                + "compatible with the "
-                + config.namingScheme.getValue() + " naming scheme");
+        } else if (!NamingScheme.BASEJARNAME.equals(config.namingScheme.getValue())) {
+            throw new BuildException(
+                "The basejarname attribute is not compatible with the %s naming scheme",
+                config.namingScheme.getValue());
         }
     }
 
@@ -437,11 +437,11 @@
      */
     public void setNaming(NamingScheme namingScheme) {
         config.namingScheme = namingScheme;
-        if (!config.namingScheme.getValue().equals(NamingScheme.BASEJARNAME)
+        if (!NamingScheme.BASEJARNAME.equals(config.namingScheme.getValue())
             && config.baseJarName != null) {
-            throw new BuildException("The basejarname attribute is not "
-                + "compatible with the "
-                + config.namingScheme.getValue() + " naming scheme");
+            throw new BuildException(
+                "The basejarname attribute is not compatible with the %s naming scheme",
+                config.namingScheme.getValue());
         }
     }
 
@@ -559,10 +559,10 @@
         if (config.namingScheme == null) {
             config.namingScheme = new NamingScheme();
             config.namingScheme.setValue(NamingScheme.DESCRIPTOR);
-        } else if (config.namingScheme.getValue().equals(NamingScheme.BASEJARNAME)
+        } else if (NamingScheme.BASEJARNAME.equals(config.namingScheme.getValue())
                     && config.baseJarName == null) {
-            throw new BuildException("The basejarname attribute must "
-                + "be specified with the basejarname naming scheme");
+            throw new BuildException(
+                "The basejarname attribute must be specified with the basejarname naming scheme");
         }
     }
 
@@ -581,10 +581,11 @@
      *            encountered that cannot be recovered from, to signal to ant
      *            that a major problem occurred within this task.
      */
+    @Override
     public void execute() throws BuildException {
         validateConfig();
 
-        if (deploymentTools.size() == 0) {
+        if (deploymentTools.isEmpty()) {
             GenericDeploymentTool genericTool = new GenericDeploymentTool();
             genericTool.setTask(this);
             genericTool.setDestdir(destDir);
@@ -592,8 +593,7 @@
             deploymentTools.add(genericTool);
         }
 
-        for (Iterator i = deploymentTools.iterator(); i.hasNext();) {
-            EJBDeploymentTool tool = (EJBDeploymentTool) i.next();
+        for (EJBDeploymentTool tool : deploymentTools) {
             tool.configure(config);
             tool.validateConfigured();
         }
@@ -604,7 +604,6 @@
             saxParserFactory.setValidating(true);
             SAXParser saxParser = saxParserFactory.newSAXParser();
 
-
             DirectoryScanner ds = getDirectoryScanner(config.descriptorDir);
             ds.scan();
             String[] files = ds.getIncludedFiles();
@@ -614,30 +613,18 @@
 
             // Loop through the files. Each file represents one deployment
             // descriptor, and hence one bean in our model.
-            for (int index = 0; index < files.length; ++index) {
+            for (String file : files) {
                 // process the deployment descriptor in each tool
-                for (Iterator i = deploymentTools.iterator(); i.hasNext();) {
-                    EJBDeploymentTool tool = (EJBDeploymentTool) i.next();
-                    tool.processDescriptor(files[index], saxParser);
+                for (EJBDeploymentTool tool : deploymentTools) {
+                    tool.processDescriptor(file, saxParser);
                 }
             }
         } catch (SAXException se) {
-            String msg = "SAXException while creating parser."
-                + "  Details: "
-                + se.getMessage();
-            throw new BuildException(msg, se);
+            throw new BuildException("SAXException while creating parser.", se);
         } catch (ParserConfigurationException pce) {
-            String msg = "ParserConfigurationException while creating parser. "
-                       + "Details: " + pce.getMessage();
-            throw new BuildException(msg, pce);
+            throw new BuildException(
+                "ParserConfigurationException while creating parser. ", pce);
         }
     } // end of execute()
 
 }
-
-
-
-
-
-
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,14 +18,13 @@
 package org.apache.tools.ant.taskdefs.optional.ejb;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Hashtable;
-import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
@@ -38,9 +37,9 @@
 import org.apache.tools.ant.Location;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.optional.ejb.EjbJar.DTDLocation;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.depend.DependencyAnalyzer;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -119,7 +118,7 @@
      /**
      * Set of files have been loaded into the EJB jar
      */
-    private Set addedfiles;
+    private Set<String> addedfiles;
 
     /**
      * Handler used to parse the EJB XML descriptor
@@ -131,11 +130,6 @@
      */
     private DependencyAnalyzer dependencyAnalyzer;
 
-    /** No arg constructor */
-    public GenericDeploymentTool() {
-    }
-
-
     /**
      * Set the destination directory; required.
      * @param inDir the destination directory.
@@ -153,12 +147,12 @@
         return destDir;
     }
 
-
     /**
      * Set the task which owns this tool
      *
      * @param task the Task to which this deployment tool is associated.
      */
+    @Override
     public void setTask(Task task) {
         this.task = task;
     }
@@ -235,7 +229,6 @@
                 combinedPath.append(config.classpath);
             }
         }
-
         return combinedPath;
     }
 
@@ -278,9 +271,10 @@
         }
 
         try {
-            Class analyzerClass = Class.forName(analyzerClassName);
-            dependencyAnalyzer
-                = (DependencyAnalyzer) analyzerClass.newInstance();
+            Class<? extends DependencyAnalyzer> analyzerClass =
+                Class.forName(analyzerClassName)
+                    .asSubclass(DependencyAnalyzer.class);
+            dependencyAnalyzer = analyzerClass.newInstance();
             dependencyAnalyzer.addClassPath(new Path(task.getProject(),
                 config.srcDir.getPath()));
             dependencyAnalyzer.addClassPath(config.classpath);
@@ -297,12 +291,12 @@
         }
     }
 
-
     /**
      * Configure this tool for use in the ejbjar task.
      *
      * @param config the configuration from the surrounding ejbjar task.
      */
+    @Override
     public void configure(EjbJar.Config config) {
         this.config = config;
 
@@ -327,12 +321,11 @@
                                 File inputFile,
                                 String logicalFilename)
         throws BuildException {
-        FileInputStream iStream = null;
-        try {
-            if (!addedfiles.contains(logicalFilename)) {
-                iStream = new FileInputStream(inputFile);
+        if (!addedfiles.contains(logicalFilename)) {
+            try (InputStream iStream = Files.newInputStream(inputFile.toPath())) {
                 // Create the zip entry and add it to the jar file
-                ZipEntry zipEntry = new ZipEntry(logicalFilename.replace('\\', '/'));
+                ZipEntry zipEntry =
+                    new ZipEntry(logicalFilename.replace('\\', '/'));
                 jStream.putNextEntry(zipEntry);
 
                 // Create the file input stream, and buffer everything over
@@ -346,15 +339,12 @@
 
                 //add it to list of files in jar
                 addedfiles.add(logicalFilename);
-           }
-        } catch (IOException ioe) {
-            log("WARNING: IOException while adding entry "
-                + logicalFilename + " to jarfile from "
-                + inputFile.getPath() + " "  + ioe.getClass().getName()
-                + "-" + ioe.getMessage(), Project.MSG_WARN);
-        } finally {
-            // Close up the file input stream for the class file
-            FileUtils.close(iStream);
+            } catch (IOException ioe) {
+                log("WARNING: IOException while adding entry " + logicalFilename
+                    + " to jarfile from " + inputFile.getPath() + " "
+                    + ioe.getClass().getName() + "-" + ioe.getMessage(),
+                    Project.MSG_WARN);
+            }
         }
     }
 
@@ -369,8 +359,7 @@
         registerKnownDTDs(h);
 
         // register any DTDs supplied by the user
-        for (Iterator i = getConfig().dtdLocations.iterator(); i.hasNext();) {
-            EjbJar.DTDLocation dtdLocation = (EjbJar.DTDLocation) i.next();
+        for (DTDLocation dtdLocation : getConfig().dtdLocations) {
             h.registerDTD(dtdLocation.getPublicId(), dtdLocation.getLocation());
         }
         return h;
@@ -388,6 +377,7 @@
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void processDescriptor(String descriptorFileName, SAXParser saxParser) {
 
         checkConfiguration(descriptorFileName, saxParser);
@@ -396,7 +386,7 @@
             handler = getDescriptorHandler(config.srcDir);
 
             // Retreive the files to be added to JAR from EJB descriptor
-            Hashtable ejbFiles = parseEjbFiles(descriptorFileName, saxParser);
+            Hashtable<String, File> ejbFiles = parseEjbFiles(descriptorFileName, saxParser);
 
             // Add any support classes specified in the build file
             addSupportClasses(ejbFiles);
@@ -411,8 +401,6 @@
                 ejbFiles.put(MANIFEST, manifestFile);
             }
 
-
-
             // First the regular deployment descriptor
             ejbFiles.put(META_DIR + EJB_DD,
                          new File(config.descriptorDir, descriptorFileName));
@@ -437,7 +425,6 @@
 
             File jarFile = getVendorOutputJarFile(baseName);
 
-
             // Check to see if we need a build and start doing the work!
             if (needToRebuild(ejbFiles, jarFile)) {
                 // Log that we are going to build...
@@ -451,27 +438,23 @@
                 // Use helper method to write the jarfile
                 String publicId = getPublicId();
                 writeJar(baseName, jarFile, ejbFiles, publicId);
-
             } else {
                 // Log that the file is up to date...
                 log(jarFile.toString() + " is up to date.",
                               Project.MSG_VERBOSE);
             }
-
         } catch (SAXException se) {
-            String msg = "SAXException while parsing '"
-                + descriptorFileName
-                + "'. This probably indicates badly-formed XML."
-                + "  Details: "
-                + se.getMessage();
-            throw new BuildException(msg, se);
+            throw new BuildException(
+                "SAXException while parsing '" + descriptorFileName
+                    + "'. This probably indicates badly-formed XML."
+                    + "  Details: " + se.getMessage(),
+                se);
         } catch (IOException ioe) {
-            String msg = "IOException while parsing'"
-                + descriptorFileName
-                + "'.  This probably indicates that the descriptor"
-                + " doesn't exist. Details: "
-                + ioe.getMessage();
-            throw new BuildException(msg, ioe);
+            throw new BuildException(
+                "IOException while parsing'" + descriptorFileName
+                    + "'.  This probably indicates that the descriptor"
+                    + " doesn't exist. Details: " + ioe.getMessage(),
+                ioe);
         }
     }
 
@@ -489,7 +472,6 @@
      */
     protected void checkConfiguration(String descriptorFileName,
                                     SAXParser saxParser) throws BuildException {
-
         /*
          * For the GenericDeploymentTool, do nothing.  Vendor specific
          * subclasses should throw a BuildException if the configuration is
@@ -512,28 +494,17 @@
      * @throws IOException       An IOException from the parser, possibly from a
      *                           the byte stream or character stream
      */
-    protected Hashtable parseEjbFiles(String descriptorFileName, SAXParser saxParser)
+    protected Hashtable<String, File> parseEjbFiles(String descriptorFileName, SAXParser saxParser)
                             throws IOException, SAXException {
-        FileInputStream descriptorStream = null;
-        Hashtable ejbFiles = null;
-
-        try {
-
-            /* Parse the ejb deployment descriptor.  While it may not
-             * look like much, we use a SAXParser and an inner class to
-             * get hold of all the classfile names for the descriptor.
-             */
-            descriptorStream
-                = new FileInputStream(new File(config.descriptorDir, descriptorFileName));
+        /* Parse the ejb deployment descriptor.  While it may not
+         * look like much, we use a SAXParser and an inner class to
+         * get hold of all the classfile names for the descriptor.
+         */
+        try (InputStream descriptorStream = Files.newInputStream(
+            new File(config.descriptorDir, descriptorFileName).toPath())) {
             saxParser.parse(new InputSource(descriptorStream), handler);
-
-            ejbFiles = handler.getFiles();
-
-        } finally {
-            FileUtils.close(descriptorStream);
+            return handler.getFiles();
         }
-
-        return ejbFiles;
     }
 
     /**
@@ -543,22 +514,18 @@
      * @param ejbFiles Hashtable of EJB classes (and other) files that will be
      *                 added to the completed JAR file
      */
-    protected void addSupportClasses(Hashtable ejbFiles) {
+    protected void addSupportClasses(Hashtable<String, File> ejbFiles) {
         // add in support classes if any
         Project project = task.getProject();
-        for (Iterator i = config.supportFileSets.iterator(); i.hasNext();) {
-            FileSet supportFileSet = (FileSet) i.next();
+        for (FileSet supportFileSet : config.supportFileSets) {
             File supportBaseDir = supportFileSet.getDir(project);
             DirectoryScanner supportScanner = supportFileSet.getDirectoryScanner(project);
-            supportScanner.scan();
-            String[] supportFiles = supportScanner.getIncludedFiles();
-            for (int j = 0; j < supportFiles.length; ++j) {
-                ejbFiles.put(supportFiles[j], new File(supportBaseDir, supportFiles[j]));
+            for (String supportFile : supportScanner.getIncludedFiles()) {
+                ejbFiles.put(supportFile, new File(supportBaseDir, supportFile));
             }
         }
     }
 
-
     /**
      * Using the EJB descriptor file name passed from the <code>ejbjar</code>
      * task, this method returns the "basename" which will be used to name the
@@ -574,14 +541,14 @@
         String baseName = "";
 
         // Work out what the base name is
-        if (config.namingScheme.getValue().equals(EjbJar.NamingScheme.BASEJARNAME)) {
+        if (EjbJar.NamingScheme.BASEJARNAME.equals(config.namingScheme.getValue())) {
             String canonicalDescriptor = descriptorFileName.replace('\\', '/');
             int index = canonicalDescriptor.lastIndexOf('/');
             if (index != -1) {
                 baseName = descriptorFileName.substring(0, index + 1);
             }
             baseName += config.baseJarName;
-        } else if (config.namingScheme.getValue().equals(EjbJar.NamingScheme.DESCRIPTOR)) {
+        } else if (EjbJar.NamingScheme.DESCRIPTOR.equals(config.namingScheme.getValue())) {
             int lastSeparatorIndex = descriptorFileName.lastIndexOf(File.separator);
             int endBaseName = -1;
             if (lastSeparatorIndex != -1) {
@@ -594,10 +561,11 @@
             if (endBaseName != -1) {
                 baseName = descriptorFileName.substring(0, endBaseName);
             } else {
-                throw new BuildException("Unable to determine jar name "
-                    + "from descriptor \"" + descriptorFileName + "\"");
+                throw new BuildException(
+                    "Unable to determine jar name from descriptor \"%s\"",
+                    descriptorFileName);
             }
-        } else if (config.namingScheme.getValue().equals(EjbJar.NamingScheme.DIRECTORY)) {
+        } else if (EjbJar.NamingScheme.DIRECTORY.equals(config.namingScheme.getValue())) {
             File descriptorFile = new File(config.descriptorDir, descriptorFileName);
             String path = descriptorFile.getAbsolutePath();
             int lastSeparatorIndex
@@ -610,9 +578,8 @@
             if (dirSeparatorIndex != -1) {
                 dirName = dirName.substring(dirSeparatorIndex + 1);
             }
-
             baseName = dirName;
-        } else if (config.namingScheme.getValue().equals(EjbJar.NamingScheme.EJB_NAME)) {
+        } else if (EjbJar.NamingScheme.EJB_NAME.equals(config.namingScheme.getValue())) {
             baseName = handler.getEjbName();
         }
         return baseName;
@@ -652,11 +619,10 @@
      * @param ejbFiles a hashtable entryname -&gt; file.
      * @param ddPrefix a prefix to use.
      */
-    protected void addVendorFiles(Hashtable ejbFiles, String ddPrefix) {
+    protected void addVendorFiles(Hashtable<String, File> ejbFiles, String ddPrefix) {
         // nothing to add for generic tool.
     }
 
-
     /**
      * Get the vendor specific name of the Jar that will be output. The modification date
      * of this jar will be checked against the dependent bean classes.
@@ -683,16 +649,13 @@
      * @return         boolean indicating whether or not the <code>jarFile</code>
      *                 is up to date
      */
-    protected boolean needToRebuild(Hashtable ejbFiles, File jarFile) {
+    protected boolean needToRebuild(Hashtable<String, File> ejbFiles, File jarFile) {
         if (jarFile.exists()) {
             long lastBuild = jarFile.lastModified();
 
-            Iterator fileIter = ejbFiles.values().iterator();
-
             // Loop through the files seeing if any has been touched
             // more recently than the destination jar.
-            while (fileIter.hasNext()) {
-                File currentFile = (File) fileIter.next();
+            for (File currentFile : ejbFiles.values()) {
                 if (lastBuild < currentFile.lastModified()) {
                     log("Build needed because " + currentFile.getPath() + " is out of date",
                         Project.MSG_VERBOSE);
@@ -701,7 +664,6 @@
             }
             return false;
         }
-
         return true;
     }
 
@@ -733,7 +695,6 @@
         if (manifestFile.exists()) {
             return manifestFile;
         }
-
         if (config.manifest != null) {
             return config.manifest;
         }
@@ -750,17 +711,15 @@
      * @param publicId the id to use.
      * @throws BuildException if there is a problem.
      */
-    protected void writeJar(String baseName, File jarfile, Hashtable files,
+    protected void writeJar(String baseName, File jarfile, Hashtable<String, File> files,
                             String publicId) throws BuildException {
-
-        JarOutputStream jarStream = null;
+        // clean the addedfiles set
+        if (addedfiles == null) {
+            addedfiles = new HashSet<>();
+        } else {
+            addedfiles.clear();
+        }
         try {
-            // clean the addedfiles set
-            if (addedfiles == null) {
-                addedfiles = new HashSet();
-            } else {
-                addedfiles.clear();
-            }
 
             /* If the jarfile already exists then whack it and recreate it.
              * Should probably think of a more elegant way to handle this
@@ -776,18 +735,18 @@
             InputStream in = null;
             Manifest manifest = null;
             try {
-                File manifestFile = (File) files.get(MANIFEST);
+                File manifestFile = files.get(MANIFEST);
                 if (manifestFile != null && manifestFile.exists()) {
-                    in = new FileInputStream(manifestFile);
+                    in = Files.newInputStream(manifestFile.toPath());
                 } else {
                     String defaultManifest = "/org/apache/tools/ant/defaultManifest.mf";
                     in = this.getClass().getResourceAsStream(defaultManifest);
                     if (in == null) {
-                        throw new BuildException("Could not find "
-                            + "default manifest: " + defaultManifest);
+                        throw new BuildException(
+                            "Could not find default manifest: %s",
+                            defaultManifest);
                     }
                 }
-
                 manifest = new Manifest(in);
             } catch (IOException e) {
                 throw new BuildException("Unable to read manifest", e, getLocation());
@@ -799,46 +758,44 @@
 
             // Create the streams necessary to write the jarfile
 
-            jarStream = new JarOutputStream(new FileOutputStream(jarfile), manifest);
-            jarStream.setMethod(JarOutputStream.DEFLATED);
-
-            // Loop through all the class files found and add them to the jar
-            for (Iterator entryIterator = files.keySet().iterator(); entryIterator.hasNext();) {
-                String entryName = (String) entryIterator.next();
-                if (entryName.equals(MANIFEST)) {
-                    continue;
-                }
-
-                File entryFile = (File) files.get(entryName);
-
-                log("adding file '" + entryName + "'",
-                              Project.MSG_VERBOSE);
-
-                addFileToJar(jarStream, entryFile, entryName);
-
-                // See if there are any inner classes for this class and add them in if there are
-                InnerClassFilenameFilter flt = new InnerClassFilenameFilter(entryFile.getName());
-                File entryDir = entryFile.getParentFile();
-                String[] innerfiles = entryDir.list(flt);
-                if (innerfiles != null) {
-                    for (int i = 0, n = innerfiles.length; i < n; i++) {
-
-                        //get and clean up innerclass name
-                        int entryIndex = entryName.lastIndexOf(entryFile.getName()) - 1;
-                        if (entryIndex < 0) {
-                            entryName = innerfiles[i];
-                        } else {
-                            entryName = entryName.substring(0, entryIndex)
-                                + File.separatorChar + innerfiles[i];
-                        }
-                        // link the file
-                        entryFile = new File(config.srcDir, entryName);
+            try (JarOutputStream jarStream = new JarOutputStream(
+                Files.newOutputStream(jarfile.toPath()), manifest)) {
+                jarStream.setMethod(JarOutputStream.DEFLATED);
+
+                // Loop through all the class files found and add them to the jar
+                for (Map.Entry<String, File> entryFiles : files.entrySet()) {
+                    String entryName = entryFiles.getKey();
+                    if (entryName.equals(MANIFEST)) {
+                        continue;
+                    }
+                    File entryFile = entryFiles.getValue();
+                    log("adding file '" + entryName + "'", Project.MSG_VERBOSE);
+                    addFileToJar(jarStream, entryFile, entryName);
+
+                    // See if there are any inner classes for this class and add them in if there are
+                    InnerClassFilenameFilter flt =
+                        new InnerClassFilenameFilter(entryFile.getName());
+                    File entryDir = entryFile.getParentFile();
+                    String[] innerfiles = entryDir.list(flt);
+                    if (innerfiles != null) {
+                        for (String innerfile : innerfiles) {
+                            //get and clean up innerclass name
+                            int entryIndex =
+                                entryName.lastIndexOf(entryFile.getName()) - 1;
+                            if (entryIndex < 0) {
+                                entryName = innerfile;
+                            } else {
+                                entryName = entryName.substring(0, entryIndex)
+                                    + File.separatorChar + innerfile;
+                            }
+                            // link the file
+                            entryFile = new File(config.srcDir, entryName);
 
-                        log("adding innerclass file '" + entryName + "'",
+                            log("adding innerclass file '" + entryName + "'",
                                 Project.MSG_VERBOSE);
 
-                        addFileToJar(jarStream, entryFile, entryName);
-
+                            addFileToJar(jarStream, entryFile, entryName);
+                        }
                     }
                 }
             }
@@ -848,8 +805,6 @@
                 + "'. Details: "
                 + ioe.getMessage();
             throw new BuildException(msg, ioe);
-        } finally {
-            FileUtils.close(jarStream);
         }
     } // end of writeJar
 
@@ -859,7 +814,7 @@
      * @param checkEntries files, that are extracted from the deployment descriptor
      * @throws BuildException if there is a problem.
      */
-    protected void checkAndAddDependants(Hashtable checkEntries)
+    protected void checkAndAddDependants(Hashtable<String, File> checkEntries)
         throws BuildException {
 
         if (dependencyAnalyzer == null) {
@@ -868,9 +823,7 @@
 
         dependencyAnalyzer.reset();
 
-        Iterator i = checkEntries.keySet().iterator();
-        while (i.hasNext()) {
-            String entryName = (String) i.next();
+        for (String entryName : checkEntries.keySet()) {
             if (entryName.endsWith(".class")) {
                 String className = entryName.substring(0,
                     entryName.length() - ".class".length());
@@ -881,10 +834,10 @@
             }
         }
 
-        Enumeration e = dependencyAnalyzer.getClassDependencies();
+        Enumeration<String> e = dependencyAnalyzer.getClassDependencies();
 
         while (e.hasMoreElements()) {
-            String classname = (String) e.nextElement();
+            String classname = e.nextElement();
             String location
                 = classname.replace('.', File.separatorChar) + ".class";
             File classFile = new File(config.srcDir, location);
@@ -896,7 +849,6 @@
         }
     }
 
-
     /**
      * Returns a Classloader object which parses the passed in generic EjbJar classpath.
      * The loader is used to dynamically load classes from javax.ejb.* and the classes
@@ -907,7 +859,6 @@
         if (classpathLoader != null) {
             return classpathLoader;
         }
-
         Path combinedClasspath = getCombinedClasspath();
 
         // only generate a new ClassLoader if we have a classpath
@@ -918,7 +869,6 @@
             classpathLoader
                 = getTask().getProject().createClassLoader(combinedClasspath);
         }
-
         return classpathLoader;
     }
 
@@ -928,11 +878,12 @@
      * @throws BuildException If the Deployment Tool's configuration isn't
      *                        valid
      */
+    @Override
     public void validateConfigured() throws BuildException {
         if ((destDir == null) || (!destDir.isDirectory())) {
-            String msg = "A valid destination directory must be specified "
-                            + "using the \"destdir\" attribute.";
-            throw new BuildException(msg, getLocation());
+            throw new BuildException(
+                "A valid destination directory must be specified using the \"destdir\" attribute.",
+                getLocation());
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java	2018-03-24 12:37:12.000000000 +0000
@@ -44,11 +44,9 @@
      * @param filename the filename to filter on.
      * @return true if the filename is an inner class of the base class.
      */
+    @Override
     public boolean accept(File dir, String filename) {
-        if ((filename.lastIndexOf(".") != filename.lastIndexOf(".class"))
-            || (filename.indexOf(baseClassName + "$") != 0)) {
-            return false;
-        }
-        return true;
+        return filename.lastIndexOf('.') == filename.lastIndexOf(".class")
+            && filename.indexOf(baseClassName + "$") == 0;
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,12 +21,12 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Hashtable;
-import java.util.Iterator;
 
 import javax.xml.parsers.SAXParser;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.optional.ejb.EjbJar.DTDLocation;
 import org.xml.sax.SAXException;
 
 /**
@@ -105,7 +105,7 @@
      * we may determine the name of the EJB JAR file using this display-name,
      * but this has not be implemented yet.
      */
-    private String  displayName;
+    private String displayName;
 
     /*
      * Regardless of the name of the iAS-specific EJB descriptor file, it will
@@ -200,25 +200,26 @@
         int startOfName = descriptorFileName.lastIndexOf(File.separatorChar) + 1;
         String stdXml = descriptorFileName.substring(startOfName);
         if (stdXml.equals(EJB_DD) && (getConfig().baseJarName == null)) {
-            String msg = "No name specified for the completed JAR file.  The EJB"
-                            + " descriptor should be prepended with the JAR "
-                            + "name or it should be specified using the "
-                            + "attribute \"basejarname\" in the \"ejbjar\" task.";
-            throw new BuildException(msg, getLocation());
+            throw new BuildException(
+                "No name specified for the completed JAR file.  The EJB"
+                    + " descriptor should be prepended with the JAR "
+                    + "name or it should be specified using the "
+                    + "attribute \"basejarname\" in the \"ejbjar\" task.",
+                getLocation());
         }
 
         File iasDescriptor = new File(getConfig().descriptorDir,
                                         getIasDescriptorName());
         if ((!iasDescriptor.exists()) || (!iasDescriptor.isFile())) {
-            String msg = "The iAS-specific EJB descriptor ("
-                            + iasDescriptor + ") was not found.";
-            throw new BuildException(msg, getLocation());
+            throw new BuildException("The iAS-specific EJB descriptor ("
+                + iasDescriptor + ") was not found.", getLocation());
         }
 
         if ((iashome != null) && (!iashome.isDirectory())) {
-            String msg = "If \"iashome\" is specified, it must be a valid "
-                            + "directory (it was set to " + iashome + ").";
-            throw new BuildException(msg, getLocation());
+            throw new BuildException(
+                "If \"iashome\" is specified, it must be a valid directory (it was set to "
+                    + iashome + ").",
+                getLocation());
         }
     }
 
@@ -238,10 +239,10 @@
      *                           exception
      */
     @Override
-    protected Hashtable parseEjbFiles(String descriptorFileName,
+    protected Hashtable<String, File> parseEjbFiles(String descriptorFileName,
                          SAXParser saxParser) throws IOException, SAXException {
 
-        Hashtable files;
+        Hashtable<String, File> files;
 
         /* Build and populate an instance of the ejbc utility */
         IPlanetEjbc ejbc = new IPlanetEjbc(
@@ -258,12 +259,9 @@
             ejbc.setIasHomeDir(iashome);
         }
         if (getConfig().dtdLocations != null) {
-            for (Iterator i = getConfig().dtdLocations.iterator();
-                 i.hasNext();) {
-                EjbJar.DTDLocation dtdLocation =
-                    (EjbJar.DTDLocation) i.next();
+            for (DTDLocation dtdLocation : getConfig().dtdLocations) {
                 ejbc.registerDTD(dtdLocation.getPublicId(),
-                                 dtdLocation.getLocation());
+                    dtdLocation.getLocation());
             }
         }
 
@@ -290,7 +288,7 @@
                 int endOfCmp = cmpDescriptors[i].lastIndexOf('/');
                 String cmpDescriptor = cmpDescriptors[i].substring(endOfCmp + 1);
 
-                File   cmpFile = new File(baseDir, relativePath + cmpDescriptor);
+                File cmpFile = new File(baseDir, relativePath + cmpDescriptor);
                 if (!cmpFile.exists()) {
                     throw new BuildException("The CMP descriptor file ("
                             + cmpFile + ") could not be found.", getLocation());
@@ -298,7 +296,6 @@
                 files.put(cmpDescriptors[i], cmpFile);
             }
         }
-
         return files;
     }
 
@@ -311,7 +308,7 @@
      * @param ddPrefix not used
      */
     @Override
-    protected void addVendorFiles(Hashtable ejbFiles, String ddPrefix) {
+    protected void addVendorFiles(Hashtable<String, File> ejbFiles, String ddPrefix) {
         ejbFiles.put(META_DIR + IAS_DD, new File(getConfig().descriptorDir,
                      getIasDescriptorName()));
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,12 +20,15 @@
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.time.Instant;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Date;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -33,6 +36,8 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.StringTokenizer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
@@ -41,8 +46,6 @@
 import org.xml.sax.HandlerBase;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-
-import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.StringUtils;
 
 /**
@@ -111,7 +114,7 @@
      * (relative to the destination directory).  The value for the Hashtable is
      * a File object which reference the actual class file.
      */
-    private Hashtable   ejbFiles     = new Hashtable();
+    private Hashtable<String, File>   ejbFiles     = new Hashtable<>();
 
     /* Value of the display-name element read from the standard EJB descriptor */
     private String      displayName;
@@ -147,15 +150,11 @@
          * Parse the classpath into it's individual elements and store the
          * results in the "classpathElements" instance variable.
          */
-        List elements = new ArrayList();
         if (classpath != null) {
             StringTokenizer st = new StringTokenizer(classpath,
                                                         File.pathSeparator);
-            while (st.hasMoreTokens()) {
-                elements.add(st.nextToken());
-            }
-            classpathElements
-                    = (String[]) elements.toArray(new String[elements.size()]);
+            final int count = st.countTokens();
+            classpathElements = Collections.list(st).toArray(new String[count]);
         }
     }
 
@@ -214,7 +213,7 @@
      *
      * @return The list of EJB files processed by the ejbc utility.
      */
-    public Hashtable getEjbFiles() {
+    public Hashtable<String, File> getEjbFiles() {
         return ejbFiles;
     }
 
@@ -233,16 +232,8 @@
      * @return An array of CMP descriptors.
      */
     public String[] getCmpDescriptors() {
-        List returnList = new ArrayList();
-
-        EjbInfo[] ejbs = handler.getEjbs();
-
-        for (int i = 0; i < ejbs.length; i++) {
-            List descriptors = (List) ejbs[i].getCmpDescriptors();
-            returnList.addAll(descriptors);
-        }
-
-        return (String[]) returnList.toArray(new String[returnList.size()]);
+        return Stream.of(handler.getEjbs()).map(EjbInfo::getCmpDescriptors)
+            .flatMap(Collection::stream).toArray(String[]::new);
     }
 
     /**
@@ -271,13 +262,13 @@
         iasDescriptor = new File(args[args.length - 1]);
 
         for (int i = 0; i < args.length - 2; i++) {
-            if (args[i].equals("-classpath")) {
+            if ("-classpath".equals(args[i])) {
                 classpath = args[++i];
-            } else if (args[i].equals("-d")) {
+            } else if ("-d".equals(args[i])) {
                 destDirectory = new File(args[++i]);
-            } else if (args[i].equals("-debug")) {
+            } else if ("-debug".equals(args[i])) {
                 debug = true;
-            } else if (args[i].equals("-keepsource")) {
+            } else if ("-keepsource".equals(args[i])) {
                 retainSource = true;
             } else {
                 usage();
@@ -377,22 +368,17 @@
 
         EjbInfo[] ejbs = getEjbs(); // Returns list of EJBs for processing
 
-        for (int i = 0; i < ejbs.length; i++) {
+        for (EjbInfo ejb : ejbs) {
             log("EJBInfo...");
-            log(ejbs[i].toString());
+            log(ejb.toString());
         }
 
-        for (int i = 0; i < ejbs.length; i++) {
-            EjbInfo ejb = ejbs[i];
-
+        for (EjbInfo ejb : ejbs) {
             ejb.checkConfiguration(destDirectory);  // Throws EjbcException
 
             if (ejb.mustBeRecompiled(destDirectory)) {
                 log(ejb.getName() + " must be recompiled using ejbc.");
-
-                String[] arguments = buildArgumentList(ejb);
-                callEjbc(arguments);
-
+                callEjbc(buildArgumentList(ejb));
             } else {
                 log(ejb.getName() + " is up to date.");
             }
@@ -406,11 +392,6 @@
      */
     private void callEjbc(String[] arguments) {
 
-        /* Concatenate all of the command line arguments into a single String */
-        StringBuffer args = new StringBuffer();
-        for (int i = 0; i < arguments.length; i++) {
-            args.append(arguments[i]).append(" ");
-        }
 
         /* If an iAS home directory is specified, prepend it to the command */
         String command;
@@ -422,6 +403,9 @@
         }
         command += "ejbc ";
 
+        /* Concatenate all of the command line arguments into a single String */
+        String args = Stream.of(arguments).collect(Collectors.joining(" "));
+
         log(command + args);
 
         /*
@@ -492,18 +476,14 @@
      *                       XML descriptor (it may wrap another exception)
      */
     private EjbInfo[] getEjbs() throws IOException, SAXException {
-        EjbInfo[] ejbs = null;
 
         /*
          * The EJB information is gathered from the standard XML EJB descriptor
          * and the iAS-specific XML EJB descriptor using a SAX parser.
          */
-
         parser.parse(stdDescriptor, handler);
         parser.parse(iasDescriptor, handler);
-        ejbs = handler.getEjbs();
-
-        return ejbs;
+        return handler.getEjbs();
     }
 
     /**
@@ -516,7 +496,7 @@
      */
     private String[] buildArgumentList(EjbInfo ejb) {
 
-        List arguments = new ArrayList();
+        List<String> arguments = new ArrayList<>();
 
         /* OPTIONAL COMMAND LINE PARAMETERS */
 
@@ -560,7 +540,7 @@
         arguments.add(ejb.getImplementation().getQualifiedClassName());
 
         /* Convert the List into an Array and return it */
-        return (String[]) arguments.toArray(new String[arguments.size()]);
+        return arguments.toArray(new String[arguments.size()]);
     }
 
     /**
@@ -585,6 +565,7 @@
      *
      */
     public class EjbcException extends Exception {
+        private static final long serialVersionUID = 1L;
 
         /**
          * Constructs an exception with the given descriptive message.
@@ -625,10 +606,10 @@
          * remote copies of these DTDs cannot be accessed.  The key for the Map
          * is the DTDs public ID and the value is the local location for the DTD
          */
-        private Map       resourceDtds = new HashMap();
-        private Map       fileDtds = new HashMap();
+        private Map<String, String>       resourceDtds = new HashMap<>();
+        private Map<String, String>       fileDtds = new HashMap<>();
 
-        private Map       ejbs = new HashMap();      // List of EJBs found in XML
+        private Map<String, EjbInfo>       ejbs = new HashMap<>();      // List of EJBs found in XML
         private EjbInfo   currentEjb;             // One item within the Map
         private boolean   iasDescriptor = false;  // Is doc iAS or EJB descriptor
 
@@ -654,7 +635,7 @@
          *         parsing.
          */
         public EjbInfo[] getEjbs() {
-            return (EjbInfo[]) ejbs.values().toArray(new EjbInfo[ejbs.size()]);
+            return ejbs.values().toArray(new EjbInfo[ejbs.size()]);
         }
 
         /**
@@ -707,35 +688,30 @@
          * @param publicId The DTD's public identifier.
          * @param systemId The location of the DTD, as found in the XML document.
          */
+        @Override
         public InputSource resolveEntity(String publicId, String systemId)
                 throws SAXException {
             InputStream inputStream = null;
 
-
             try {
-
                 /* Search the resource Map and (if not found) file Map */
-
-                String location = (String) resourceDtds.get(publicId);
+                String location = resourceDtds.get(publicId);
                 if (location != null) {
                     inputStream
                         = ClassLoader.getSystemResource(location).openStream();
                 } else {
-                    location = (String) fileDtds.get(publicId);
+                    location = fileDtds.get(publicId);
                     if (location != null) {
                         // closed when the InputSource is closed
-                        inputStream = new FileInputStream(location); //NOSONAR
+                        inputStream = Files.newInputStream(Paths.get(location)); //NOSONAR
                     }
                 }
-            } catch (IOException e) {
-                return super.resolveEntity(publicId, systemId);
+            } catch (IOException ignored) {
             }
-
             if (inputStream == null) {
                 return super.resolveEntity(publicId, systemId);
-            } else {
-                return new InputSource(inputStream);
             }
+            return new InputSource(inputStream);
         }
 
         /**
@@ -746,6 +722,7 @@
          *             (if any).
          * @throws SAXException If the parser cannot process the document.
          */
+        @Override
         public void startElement(String name, AttributeList atts)
                 throws SAXException {
 
@@ -758,13 +735,13 @@
             /* A new element has started, so reset the text being captured */
             currentText = "";
 
-            if (currentLoc.equals("\\ejb-jar")) {
+            if ("\\ejb-jar".equals(currentLoc)) {
                 iasDescriptor = false;
-            } else if (currentLoc.equals("\\ias-ejb-jar")) {
+            } else if ("\\ias-ejb-jar".equals(currentLoc)) {
                 iasDescriptor = true;
             }
 
-            if ((name.equals("session")) || (name.equals("entity"))) {
+            if (("session".equals(name)) || ("entity".equals(name))) {
                 ejbType = name;
             }
         }
@@ -778,9 +755,9 @@
          * @param len The number of characters found in the document.
          * @throws SAXException If the parser cannot process the document.
          */
+        @Override
         public void characters(char[] ch, int start, int len)
                 throws SAXException {
-
             currentText += new String(ch).substring(start, start + len);
         }
 
@@ -790,6 +767,7 @@
          * @param name String name of the element.
          * @throws SAXException If the parser cannot process the document.
          */
+        @Override
         public void endElement(String name) throws SAXException {
 
             /*
@@ -825,30 +803,30 @@
          */
         private void stdCharacters(String value) {
 
-            if (currentLoc.equals("\\ejb-jar\\display-name")) {
+            if ("\\ejb-jar\\display-name".equals(currentLoc)) {
                 displayName = value;
                 return;
             }
 
             String base = "\\ejb-jar\\enterprise-beans\\" + ejbType;
 
-            if (currentLoc.equals(base + "\\ejb-name")) {
-                currentEjb = (EjbInfo) ejbs.get(value);
+            if ((base + "\\ejb-name").equals(currentLoc)) {
+                currentEjb = ejbs.get(value);
                 if (currentEjb == null) {
                     currentEjb = new EjbInfo(value);
                     ejbs.put(value, currentEjb);
                 }
-            } else if (currentLoc.equals(base + "\\home")) {
+            } else if ((base + "\\home").equals(currentLoc)) {
                 currentEjb.setHome(value);
-            } else if (currentLoc.equals(base + "\\remote")) {
+            } else if ((base + "\\remote").equals(currentLoc)) {
                 currentEjb.setRemote(value);
-            } else if (currentLoc.equals(base + "\\ejb-class")) {
+            } else if ((base + "\\ejb-class").equals(currentLoc)) {
                 currentEjb.setImplementation(value);
-            } else if (currentLoc.equals(base + "\\prim-key-class")) {
+            } else if ((base + "\\prim-key-class").equals(currentLoc)) {
                 currentEjb.setPrimaryKey(value);
-            } else if (currentLoc.equals(base + "\\session-type")) {
+            } else if ((base + "\\session-type").equals(currentLoc)) {
                 currentEjb.setBeantype(value);
-            } else if (currentLoc.equals(base + "\\persistence-type")) {
+            } else if ((base + "\\persistence-type").equals(currentLoc)) {
                 currentEjb.setCmp(value);
             }
         }
@@ -866,18 +844,19 @@
         private void iasCharacters(String value) {
             String base = "\\ias-ejb-jar\\enterprise-beans\\" + ejbType;
 
-            if (currentLoc.equals(base + "\\ejb-name")) {
-                currentEjb = (EjbInfo) ejbs.get(value);
+            if ((base + "\\ejb-name").equals(currentLoc)) {
+                currentEjb = ejbs.get(value);
                 if (currentEjb == null) {
                     currentEjb = new EjbInfo(value);
                     ejbs.put(value, currentEjb);
                 }
-            } else if (currentLoc.equals(base + "\\iiop")) {
+            } else if ((base + "\\iiop").equals(currentLoc)) {
                 currentEjb.setIiop(value);
-            } else if (currentLoc.equals(base + "\\failover-required")) {
+            } else if ((base + "\\failover-required").equals(currentLoc)) {
                 currentEjb.setHasession(value);
-            } else if (currentLoc.equals(base + "\\persistence-manager"
-                                              + "\\properties-file-location")) {
+            } else if ((base
+                + "\\persistence-manager\\properties-file-location")
+                    .equals(currentLoc)) {
                 currentEjb.addCmpDescriptor(value);
             }
         }
@@ -898,7 +877,7 @@
         private boolean cmp       = false;      // Does this EJB support CMP?
         private boolean iiop      = false;      // Does this EJB support IIOP?
         private boolean hasession = false;      // Does this EJB require failover?
-        private List cmpDescriptors = new ArrayList();  // CMP descriptor list
+        private List<String> cmpDescriptors = new ArrayList<>();  // CMP descriptor list
 
         /**
          * Construct a new EJBInfo object with the given name.
@@ -920,9 +899,8 @@
             if (name == null) {
                 if (implementation == null) {
                     return "[unnamed]";
-                } else {
-                    return implementation.getClassName();
                 }
+                return implementation.getClassName();
             }
             return name;
         }
@@ -996,7 +974,7 @@
         }
 
         public void setCmp(String cmp) {
-            setCmp(cmp.equals("Container"));
+            setCmp("Container".equals(cmp));
         }
 
         public boolean getCmp() {
@@ -1008,7 +986,7 @@
         }
 
         public void setIiop(String iiop) {
-            setIiop(iiop.equals("true"));
+            setIiop(Boolean.parseBoolean(iiop));
         }
 
         public boolean getIiop() {
@@ -1020,7 +998,7 @@
         }
 
         public void setHasession(String hasession) {
-            setHasession(hasession.equals("true"));
+            setHasession(Boolean.parseBoolean(hasession));
         }
 
         public boolean getHasession() {
@@ -1031,7 +1009,7 @@
             cmpDescriptors.add(descriptor);
         }
 
-        public List getCmpDescriptors() {
+        public List<String> getCmpDescriptors() {
             return cmpDescriptors;
         }
 
@@ -1048,53 +1026,53 @@
 
             /* Check that the specified instance variables are valid */
             if (home == null) {
-                throw new EjbcException("A home interface was not found "
-                            + "for the " + name + " EJB.");
+                throw new EjbcException(
+                    "A home interface was not found for the " + name + " EJB.");
             }
             if (remote == null) {
-                throw new EjbcException("A remote interface was not found "
-                            + "for the " + name + " EJB.");
+                throw new EjbcException(
+                    "A remote interface was not found for the " + name
+                        + " EJB.");
             }
             if (implementation == null) {
-                throw new EjbcException("An EJB implementation class was not "
-                            + "found for the " + name + " EJB.");
+                throw new EjbcException(
+                    "An EJB implementation class was not found for the " + name
+                        + " EJB.");
             }
 
             if ((!beantype.equals(ENTITY_BEAN))
-                        && (!beantype.equals(STATELESS_SESSION))
-                        && (!beantype.equals(STATEFUL_SESSION))) {
-                throw new EjbcException("The beantype found (" + beantype + ") "
-                            + "isn't valid in the " + name + " EJB.");
+                && (!beantype.equals(STATELESS_SESSION))
+                && (!beantype.equals(STATEFUL_SESSION))) {
+                throw new EjbcException("The beantype found (" + beantype
+                    + ") isn't valid in the " + name + " EJB.");
             }
 
             if (cmp && (!beantype.equals(ENTITY_BEAN))) {
-                System.out.println("CMP stubs and skeletons may not be generated"
-                    + " for a Session Bean -- the \"cmp\" attribute will be"
-                    + " ignoredfor the " + name + " EJB.");
+                System.out.println(
+                    "CMP stubs and skeletons may not be generated for a Session Bean -- the \"cmp\" attribute will be ignoredfor the "
+                        + name + " EJB.");
             }
 
             if (hasession && (!beantype.equals(STATEFUL_SESSION))) {
-                System.out.println("Highly available stubs and skeletons may "
-                    + "only be generated for a Stateful Session Bean -- the "
-                    + "\"hasession\" attribute will be ignored for the "
-                    + name + " EJB.");
+                System.out.println(
+                    "Highly available stubs and skeletons may only be generated for a Stateful Session Bean"
+                        + "-- the \"hasession\" attribute will be ignored for the "
+                        + name + " EJB.");
             }
 
             /* Check that the EJB "source" classes all exist */
             if (!remote.getClassFile(buildDir).exists()) {
                 throw new EjbcException("The remote interface "
-                            + remote.getQualifiedClassName() + " could not be "
-                            + "found.");
+                    + remote.getQualifiedClassName() + " could not be found.");
             }
             if (!home.getClassFile(buildDir).exists()) {
                 throw new EjbcException("The home interface "
-                            + home.getQualifiedClassName() + " could not be "
-                            + "found.");
+                    + home.getQualifiedClassName() + " could not be found.");
             }
             if (!implementation.getClassFile(buildDir).exists()) {
                 throw new EjbcException("The EJB implementation class "
-                            + implementation.getQualifiedClassName() + " could "
-                            + "not be found.");
+                    + implementation.getQualifiedClassName()
+                    + " could not be found.");
             }
         }
 
@@ -1140,9 +1118,8 @@
             remoteFile = remote.getClassFile(buildDir);
             modified = remoteFile.lastModified();
             if (modified == -1) {
-                System.out.println("The class "
-                                + remote.getQualifiedClassName() + " couldn't "
-                                + "be found on the classpath");
+                System.out.println("The class " + remote.getQualifiedClassName()
+                    + " couldn't be found on the classpath");
                 return -1;
             }
             latestModified = modified;
@@ -1151,9 +1128,8 @@
             homeFile = home.getClassFile(buildDir);
             modified = homeFile.lastModified();
             if (modified == -1) {
-                System.out.println("The class "
-                                + home.getQualifiedClassName() + " couldn't be "
-                                + "found on the classpath");
+                System.out.println("The class " + home.getQualifiedClassName()
+                    + " couldn't be found on the classpath");
                 return -1;
             }
             latestModified = Math.max(latestModified, modified);
@@ -1163,9 +1139,9 @@
                 pkFile = primaryKey.getClassFile(buildDir);
                 modified = pkFile.lastModified();
                 if (modified == -1) {
-                    System.out.println("The class "
-                                    + primaryKey.getQualifiedClassName() + "couldn't be "
-                                    + "found on the classpath");
+                    System.out.println(
+                        "The class " + primaryKey.getQualifiedClassName()
+                            + "couldn't be found on the classpath");
                     return -1;
                 }
                 latestModified = Math.max(latestModified, modified);
@@ -1226,7 +1202,7 @@
          */
         private long destClassesModified(File destDir) {
             String[] classnames = classesToGenerate(); // List of all stubs & skels
-            long destClassesModified = new Date().getTime(); // Earliest mod time
+            long destClassesModified = Instant.now().toEpochMilli(); // Earliest mod time
             boolean allClassesFound  = true;           // Has each been found?
 
             /*
@@ -1234,7 +1210,6 @@
              * determine (if all exist) which file has the most recent timestamp
              */
             for (int i = 0; i < classnames.length; i++) {
-
                 String pathToClass =
                         classnames[i].replace('.', File.separatorChar) + ".class";
                 File classFile = new File(destDir, pathToClass);
@@ -1255,7 +1230,7 @@
                 }
             }
 
-            return (allClassesFound) ? destClassesModified : -1;
+            return allClassesFound ? destClassesModified : -1;
         }
 
         /**
@@ -1319,6 +1294,7 @@
          *
          * @return A String representing the EjbInfo instance.
          */
+        @Override
         public String toString() {
             String s = "EJB name: " + name
                         + "\n\r              home:      " + home
@@ -1330,7 +1306,7 @@
                         + "\n\r              iiop:      " + iiop
                         + "\n\r              hasession: " + hasession;
 
-            Iterator i = cmpDescriptors.iterator();
+            Iterator<String> i = cmpDescriptors.iterator();
             while (i.hasNext()) {
                 s += "\n\r              CMP Descriptor: " + i.next();
             }
@@ -1435,6 +1411,7 @@
          *
          * @return String representing the fully qualified class name.
          */
+        @Override
         public String toString() {
             return getQualifiedClassName();
         }
@@ -1466,18 +1443,16 @@
          * Reads text from the input stream and redirects it to standard output
          * using a separate thread.
          */
+        @Override
         public void run() {
-            BufferedReader reader = new BufferedReader(
-                                            new InputStreamReader(stream));
-            String text;
-            try {
+            try (BufferedReader reader =
+                new BufferedReader(new InputStreamReader(stream))) {
+                String text;
                 while ((text = reader.readLine()) != null) {
                     System.out.println(text);
                 }
             } catch (IOException e) {
                 e.printStackTrace(); //NOSONAR
-            } finally {
-                FileUtils.close(reader);
             }
         }
     }  // End of RedirectOutput inner class
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -188,6 +188,7 @@
      * Does the work.
      * @throws BuildException if there is a problem.
      */
+    @Override
     public void execute() throws BuildException {
         checkConfiguration();
 
@@ -202,41 +203,42 @@
     private void checkConfiguration() throws BuildException {
 
         if (ejbdescriptor == null) {
-            String msg = "The standard EJB descriptor must be specified using "
-                            + "the \"ejbdescriptor\" attribute.";
+            String msg =
+                "The standard EJB descriptor must be specified using the \"ejbdescriptor\" attribute.";
             throw new BuildException(msg, getLocation());
         }
         if ((!ejbdescriptor.exists()) || (!ejbdescriptor.isFile())) {
             String msg = "The standard EJB descriptor (" + ejbdescriptor
-                            + ") was not found or isn't a file.";
+                + ") was not found or isn't a file.";
             throw new BuildException(msg, getLocation());
         }
 
         if (iasdescriptor == null) {
-            String msg = "The iAS-speific XML descriptor must be specified using"
-                            + " the \"iasdescriptor\" attribute.";
+            String msg =
+                "The iAS-speific XML descriptor must be specified using the \"iasdescriptor\" attribute.";
             throw new BuildException(msg, getLocation());
         }
         if ((!iasdescriptor.exists()) || (!iasdescriptor.isFile())) {
             String msg = "The iAS-specific XML descriptor (" + iasdescriptor
-                            + ") was not found or isn't a file.";
+                + ") was not found or isn't a file.";
             throw new BuildException(msg, getLocation());
         }
 
         if (dest == null) {
-            String msg = "The destination directory must be specified using "
-                            + "the \"dest\" attribute.";
+            String msg =
+                "The destination directory must be specified using the \"dest\" attribute.";
             throw new BuildException(msg, getLocation());
         }
         if ((!dest.exists()) || (!dest.isDirectory())) {
-            String msg = "The destination directory (" + dest + ") was not "
-                            + "found or isn't a directory.";
+            String msg = "The destination directory (" + dest
+                + ") was not found or isn't a directory.";
             throw new BuildException(msg, getLocation());
         }
 
         if ((iashome != null) && (!iashome.isDirectory())) {
-            String msg = "If \"iashome\" is specified, it must be a valid "
-                            + "directory (it was set to " + iashome + ").";
+            String msg =
+                "If \"iashome\" is specified, it must be a valid directory (it was set to "
+                    + iashome + ").";
             throw new BuildException(msg, getLocation());
         }
     }
@@ -248,21 +250,13 @@
      * @throws BuildException If the parser cannot be created or configured.
      */
     private SAXParser getParser() throws BuildException {
-
-        SAXParser saxParser = null;
         try {
             SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
             saxParserFactory.setValidating(true);
-            saxParser = saxParserFactory.newSAXParser();
-        } catch (SAXException e) {
-            String msg = "Unable to create a SAXParser: " + e.getMessage();
-            throw new BuildException(msg, e, getLocation());
-        } catch (ParserConfigurationException e) {
-            String msg = "Unable to create a SAXParser: " + e.getMessage();
-            throw new BuildException(msg, e, getLocation());
+            return saxParserFactory.newSAXParser();
+        } catch (SAXException | ParserConfigurationException e) {
+            throw new BuildException("Unable to create a SAXParser: " + e.getMessage(), e, getLocation());
         }
-
-        return saxParser;
     }
 
     /**
@@ -284,21 +278,23 @@
         if (iashome != null) {
             ejbc.setIasHomeDir(iashome);
         }
-
         try {
             ejbc.execute();
         } catch (IOException e) {
-            String msg = "An IOException occurred while trying to read the XML "
-                            + "descriptor file: " + e.getMessage();
-            throw new BuildException(msg, e, getLocation());
+            throw new BuildException(
+                "An IOException occurred while trying to read the XML descriptor file: "
+                    + e.getMessage(),
+                e, getLocation());
         } catch (SAXException e) {
-            String msg = "A SAXException occurred while trying to read the XML "
-                            + "descriptor file: " + e.getMessage();
-            throw new BuildException(msg, e, getLocation());
+            throw new BuildException(
+                "A SAXException occurred while trying to read the XML descriptor file: "
+                    + e.getMessage(),
+                e, getLocation());
         } catch (IPlanetEjbc.EjbcException e) {
-            String msg = "An exception occurred while trying to run the ejbc "
-                            + "utility: " + e.getMessage();
-            throw new BuildException(msg, e, getLocation());
+            throw new BuildException(
+                "An exception occurred while trying to run the ejbc utility: "
+                    + e.getMessage(),
+                e, getLocation());
         }
     }
 
@@ -309,13 +305,9 @@
      * @return Path The classpath to be used for EJBc.
      */
     private Path getClasspath() {
-        Path cp = null;
         if (classpath == null) {
-            cp = (new Path(getProject())).concatSystemClasspath("last");
-        } else {
-            cp = classpath.concatSystemClasspath("ignore");
+            return new Path(getProject()).concatSystemClasspath("last");
         }
-
-        return cp;
+        return classpath.concatSystemClasspath("ignore");
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java	2018-03-24 12:37:12.000000000 +0000
@@ -53,14 +53,14 @@
      * @param ejbFiles the hashtable of files to populate.
      * @param ddPrefix the prefix to use.
      */
-    protected void addVendorFiles(Hashtable ejbFiles, String ddPrefix) {
+    @Override
+    protected void addVendorFiles(Hashtable<String, File> ejbFiles, String ddPrefix) {
         File jbossDD = new File(getConfig().descriptorDir, ddPrefix + JBOSS_DD);
         if (jbossDD.exists()) {
             ejbFiles.put(META_DIR + JBOSS_DD, jbossDD);
         } else {
-            log("Unable to locate jboss deployment descriptor. "
-                + "It was expected to be in " + jbossDD.getPath(),
-                Project.MSG_WARN);
+            log("Unable to locate jboss deployment descriptor. It was expected to be in "
+                + jbossDD.getPath(), Project.MSG_WARN);
             return;
         }
         String descriptorFileName = JBOSS_CMP10D;
@@ -73,8 +73,7 @@
         if (jbossCMPD.exists()) {
             ejbFiles.put(META_DIR + descriptorFileName, jbossCMPD);
         } else {
-            log("Unable to locate jboss cmp descriptor. "
-                + "It was expected to be in "
+            log("Unable to locate jboss cmp descriptor. It was expected to be in "
                 + jbossCMPD.getPath(), Project.MSG_VERBOSE);
         }
     }
@@ -83,15 +82,15 @@
      * Get the vendor specific name of the Jar that will be output. The modification date
      * of this jar will be checked against the dependent bean classes.
      */
+    @Override
     File getVendorOutputJarFile(String baseName) {
         if (getDestDir() == null && getParent().getDestdir() == null) {
             throw new BuildException("DestDir not specified");
         }
         if (getDestDir() == null) {
             return new File(getParent().getDestdir(), baseName + jarSuffix);
-        } else {
-            return new File(getDestDir(), baseName + jarSuffix);
         }
+        return new File(getDestDir(), baseName + jarSuffix);
     }
 
     /**
@@ -101,6 +100,7 @@
      *                        valid
      * @since ant 1.6
      */
+    @Override
     public void validateConfigured() throws BuildException {
     }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,9 +19,10 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Enumeration;
+import java.nio.file.Files;
+import java.util.Arrays;
 import java.util.Hashtable;
-
+import java.util.List;
 import javax.xml.parsers.SAXParser;
 
 import org.apache.tools.ant.AntClassLoader;
@@ -329,6 +330,7 @@
     /* ------------- */
 
     /** {@inheritDoc}. */
+    @Override
     public void processDescriptor(String aDescriptorName, SAXParser saxParser) {
 
         descriptorName = aDescriptorName;
@@ -346,7 +348,8 @@
     }
 
     /** {@inheritDoc}. */
-    protected void writeJar(String baseName, File jarfile, Hashtable ejbFiles, String publicId)
+    @Override
+    protected void writeJar(String baseName, File jarfile, Hashtable<String, File> ejbFiles, String publicId)
     throws BuildException {
 
         // create the generic jar first
@@ -366,10 +369,11 @@
     }
 
     /** {@inheritDoc}. */
-    protected void addVendorFiles(Hashtable ejbFiles, String ddPrefix) {
+    @Override
+    protected void addVendorFiles(Hashtable<String, File> ejbFiles, String ddPrefix) {
 
-    // JOnAS-specific descriptor deployment
-    jonasDescriptorName = getJonasDescriptorName();
+        // JOnAS-specific descriptor deployment
+        jonasDescriptorName = getJonasDescriptorName();
         File jonasDD = new File(getConfig().descriptorDir, jonasDescriptorName);
 
         if (jonasDD.exists()) {
@@ -381,6 +385,7 @@
     }
 
     /** {@inheritDoc}. */
+    @Override
     protected File getVendorOutputJarFile(String baseName) {
         return new File(getDestDir(), baseName + suffix);
     }
@@ -458,6 +463,7 @@
     }
 
     /** {@inheritDoc}. */
+    @Override
     protected String getJarBaseName(String descriptorFileName) {
 
         String baseName = null;
@@ -499,6 +505,7 @@
     }
 
     /** {@inheritDoc}. */
+    @Override
     protected void registerKnownDTDs(DescriptorHandler handler) {
         handler.registerDTD(EJB_JAR_1_1_PUBLIC_ID,
                     jonasroot + File.separator + "xml" + File.separator + EJB_JAR_1_1_DTD);
@@ -518,15 +525,12 @@
      * @param ejbFiles the hashtable.
      */
     private void addGenICGeneratedFiles(
-        File genericJarFile, Hashtable ejbFiles) {
-        Java genicTask = null;    // GenIC task
-        String genicClass = null; // GenIC class (3 are supported for various
-                                  // versions
+        File genericJarFile, Hashtable<String, File> ejbFiles) {
         if (nogenic) {
             return;
         }
 
-        genicTask = new Java(getTask());
+        Java genicTask = new Java(getTask()); // GenIC task
         genicTask.setTaskName("genic");
         genicTask.setFork(true);
 
@@ -553,13 +557,8 @@
         genicTask.createArg().setValue("-d");
         genicTask.createArg().setFile(outputdir);
 
-        // work around a bug of GenIC 2.5
-        String key;
-        File f;
-        Enumeration keys = ejbFiles.keys();
-        while (keys.hasMoreElements()) {
-            key = (String) keys.nextElement();
-            f = new File(outputdir + File.separator + key);
+        for (String key : ejbFiles.keySet()) {
+            File f = new File(outputdir + File.separator + key);
             f.getParentFile().mkdirs();
         }
         log("Worked around a bug of GenIC 2.5.", Project.MSG_VERBOSE);
@@ -581,15 +580,18 @@
         log("Using classpath: " + classpath.toString(), Project.MSG_VERBOSE);
         genicTask.setClasspath(classpath);
 
+        String genicClass; // GenIC class (3 are supported for various
+        // versions
+        // work around a bug of GenIC 2.5
+
         // class name (search in the classpath provided for the ejbjar element)
         genicClass = getGenicClassName(classpath);
         if (genicClass == null) {
             log("Cannot find GenIC class in classpath.", Project.MSG_ERR);
             throw new BuildException("GenIC class not found, please check the classpath.");
-        } else {
-            log("Using '" + genicClass + "' GenIC class.", Project.MSG_VERBOSE);
-            genicTask.setClassname(genicClass);
         }
+        log("Using '" + genicClass + "' GenIC class.", Project.MSG_VERBOSE);
+        genicTask.setClassname(genicClass);
 
         // keepgenerated
         if (keepgenerated) {
@@ -613,13 +615,13 @@
         }
 
         // javacopts
-        if (javacopts != null && !javacopts.equals("")) {
+        if (javacopts != null && !javacopts.isEmpty()) {
             genicTask.createArg().setValue("-javacopts");
             genicTask.createArg().setLine(javacopts);
         }
 
         // rmicopts
-        if (rmicopts != null && !rmicopts.equals("")) {
+        if (rmicopts != null && !rmicopts.isEmpty()) {
             genicTask.createArg().setValue("-rmicopts");
             genicTask.createArg().setLine(rmicopts);
         }
@@ -681,10 +683,7 @@
         log("Looking for GenIC class in classpath: "
             + classpath.toString(), Project.MSG_VERBOSE);
 
-        AntClassLoader cl = null;
-
-        try {
-            cl = classpath.getProject().createClassLoader(classpath);
+        try (AntClassLoader cl = classpath.getProject().createClassLoader(classpath)) {
 
             try {
                 cl.loadClass(JonasDeploymentTool.GENIC_CLASS);
@@ -723,10 +722,6 @@
                     + "' not found in classpath.",
                     Project.MSG_VERBOSE);
             }
-        } finally {
-            if (cl != null) {
-                cl.cleanup();
-            }
         }
         return null;
     }
@@ -737,33 +732,38 @@
      * @param saxParser          not used.
      * @throws BuildException if there is an error.
      */
+    @Override
     protected void checkConfiguration(String descriptorFileName,
                       SAXParser saxParser) throws BuildException {
 
         // jonasroot
         if (jonasroot == null) {
-            throw new BuildException("The jonasroot attribut is not set.");
-        } else if (!jonasroot.isDirectory()) {
-            throw new BuildException("The jonasroot attribut '" + jonasroot
-                + "' is not a valid directory.");
+            throw new BuildException("The jonasroot attribute is not set.");
+        }
+        if (!jonasroot.isDirectory()) {
+            throw new BuildException(
+                "The jonasroot attribute '%s' is not a valid directory.",
+                jonasroot);
         }
 
         // orb
-        if (orb != null && !orb.equals(RMI_ORB) && !orb.equals(JEREMIE_ORB)
-            && !orb.equals(DAVID_ORB)) {
-            throw new BuildException("The orb attribut '" + orb
-                + "' is not valid (must be either "
-                + RMI_ORB + ", " + JEREMIE_ORB + " or " + DAVID_ORB + ").");
+        final List<String> validOrbs =
+            Arrays.asList(RMI_ORB, JEREMIE_ORB, DAVID_ORB);
+
+        if (orb != null && !validOrbs.contains(orb)) {
+            throw new BuildException(
+                "The orb attribute '%s' is not valid (must be one of %s.", orb,
+                validOrbs);
         }
 
         // additionalargs
-        if (additionalargs != null && additionalargs.equals("")) {
-            throw new BuildException("Empty additionalargs attribut.");
+        if (additionalargs != null && additionalargs.isEmpty()) {
+            throw new BuildException("Empty additionalargs attribute.");
         }
 
         // javac
-        if (javac != null && javac.equals("")) {
-            throw new BuildException("Empty javac attribut.");
+        if (javac != null && javac.isEmpty()) {
+            throw new BuildException("Empty javac attribute.");
         }
     }
 
@@ -778,26 +778,19 @@
      * @throws BuildException if a temp directory cannot be created.
      */
     private File createTempDir() throws IOException {
-        File tmpDir = File.createTempFile("genic", null, null);
-        tmpDir.delete();
-        if (!tmpDir.mkdir()) {
-            throw new IOException("Cannot create the temporary directory '" + tmpDir + "'.");
-        }
-        return tmpDir;
+        return Files.createTempDirectory("genic").toFile();
     }
 
     /**
-     * Delete a file. If the file is a directory, delete recursivly all the
+     * Delete a file. If the file is a directory, delete recursively all the
      * files inside.
      *
      * @param aFile file to delete.
      */
     private void deleteAllFiles(File aFile) {
         if (aFile.isDirectory()) {
-            File[] someFiles = aFile.listFiles();
-
-            for (int i = 0; i < someFiles.length; i++) {
-                deleteAllFiles(someFiles[i]);
+            for (File child : aFile.listFiles()) {
+                deleteAllFiles(child);
             }
         }
         aFile.delete();
@@ -811,22 +804,19 @@
      * @param rootDir the current sub-directory to scan.
      * @param hashtable the hashtable where to add the files.
      */
-    private void addAllFiles(File file, String rootDir, Hashtable hashtable) {
-
+    private void addAllFiles(File file, String rootDir, Hashtable<String, File> hashtable) {
         if (!file.exists()) {
             throw new IllegalArgumentException();
         }
-
         String newRootDir;
         if (file.isDirectory()) {
-            File[] files = file.listFiles();
-            for (int i = 0; i < files.length; i++) {
-                if (rootDir.length() > 0) {
-                    newRootDir = rootDir + File.separator + files[i].getName();
+            for (File child : file.listFiles()) {
+                if (rootDir.isEmpty()) {
+                    newRootDir = child.getName();
                 } else {
-                    newRootDir = files[i].getName();
+                    newRootDir = rootDir + File.separator + child.getName();
                 }
-                addAllFiles(files[i], newRootDir, hashtable);
+                addAllFiles(child, newRootDir, hashtable);
             }
         } else {
             hashtable.put(rootDir, file);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/OrionDeploymentTool.java	2018-03-24 12:37:12.000000000 +0000
@@ -27,7 +27,7 @@
  * ejb jar file. Orion only requires one additional file orion-ejb-jar.xml
  * and does not require any additional compilation.
  *
- * @since Ant 1.9.10
+ * @since Ant 1.10.2
  * @see EjbJar#createOrion
  */
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,13 +18,12 @@
 package org.apache.tools.ant.taskdefs.optional.ejb;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
 import java.util.Enumeration;
 import java.util.Hashtable;
-import java.util.Iterator;
+import java.util.List;
 import java.util.Vector;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
@@ -37,7 +36,9 @@
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Java;
+import org.apache.tools.ant.taskdefs.optional.ejb.EjbJar.DTDLocation;
 import org.apache.tools.ant.types.Environment;
+import org.apache.tools.ant.types.Environment.Variable;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.util.FileUtils;
 import org.xml.sax.InputSource;
@@ -141,7 +142,7 @@
     private Path wlClasspath = null;
 
     /** System properties for the JVM. */
-    private Vector sysprops = new Vector();
+    private List<Variable> sysprops = new Vector<>();
 
     /**
      * The weblogic.StdoutSeverityLevel to use when running the JVM that
@@ -160,7 +161,6 @@
         sysprops.add(sysp);
     }
 
-
     /**
      * Get the classpath to the weblogic classpaths.
      * @return the classpath to configure.
@@ -182,7 +182,6 @@
         this.outputDir = outputDir;
     }
 
-
     /**
      * Optional classpath to WL6.0.
      * Weblogic 6.0 will give a warning if the home and remote interfaces
@@ -197,7 +196,6 @@
         this.wlClasspath = wlClasspath;
     }
 
-
     /**
      * The compiler (switch <code>-compiler</code>) to use; optional.
      * This allows for the selection of a different compiler
@@ -214,7 +212,6 @@
         this.compiler = compiler;
     }
 
-
     /**
      * Set the rebuild flag to false to only update changes in the jar rather
      * than rerunning ejbc; optional, default true.
@@ -230,7 +227,6 @@
         this.alwaysRebuild = rebuild;
     }
 
-
     /**
      * Sets the weblogic.StdoutSeverityLevel to use when running the JVM that
      * executes ejbc; optional. Set to 16 to avoid the warnings about EJB Home and
@@ -241,7 +237,6 @@
         this.jvmDebugLevel = jvmDebugLevel;
     }
 
-
     /**
      * Get the debug level.
      * @return the jvm debug level (may be null).
@@ -250,8 +245,6 @@
         return jvmDebugLevel;
     }
 
-
-
     /**
      * Setter used to store the suffix for the generated weblogic jar file.
      *
@@ -261,7 +254,6 @@
         this.jarSuffix = inString;
     }
 
-
     /**
      * controls whether the generic file used as input to
      * ejbc is retained; defaults to false
@@ -272,7 +264,6 @@
         this.keepGeneric = inValue;
     }
 
-
     /**
      * Controls whether weblogic will keep the generated Java
      * files used to build the class files added to the
@@ -281,10 +272,9 @@
      * @param inValue either 'true' or 'false'
      */
     public void setKeepgenerated(String inValue) {
-        this.keepgenerated = Boolean.valueOf(inValue).booleanValue();
+        this.keepgenerated = Boolean.parseBoolean(inValue);
     }
 
-
     /**
      * Any optional extra arguments pass to the weblogic.ejbc
      * tool.
@@ -294,7 +284,6 @@
         this.additionalArgs = args;
     }
 
-
     /**
      * Set any additional arguments to pass to the weblogic JVM; optional.
      * @param args the arguments to be passed to the JVM
@@ -316,7 +305,6 @@
         this.ejbcClass = ejbcClass;
     }
 
-
     /**
      * Get the ejbc compiler class.
      * @return the name of the ejbc compiler class.
@@ -325,7 +313,6 @@
         return ejbcClass;
     }
 
-
     /**
      * <b>Deprecated</b>. Defines the location of the ejb-jar DTD in
      *  the weblogic class hierarchy. Should not be needed, and the
@@ -337,7 +324,6 @@
         setEJBdtd(inString);
     }
 
-
     /**
      * <b>Deprecated</b>. Defines the location of weblogic DTD in
      *  the weblogic class hierarchy. Should not be needed, and the
@@ -349,7 +335,6 @@
         this.weblogicDTD = inString;
     }
 
-
     /**
      * <b>Deprecated</b>. Defines the location of Sun's EJB DTD in
      *  the weblogic class hierarchy. Should not be needed, and the
@@ -361,7 +346,6 @@
         this.ejb11DTD = inString;
     }
 
-
     /**
      * Set the value of the oldCMP scheme. This is an antonym for newCMP
      * @ant.attribute ignore="true'
@@ -371,7 +355,6 @@
         this.newCMP = !oldCMP;
     }
 
-
     /**
      * If this is set to true, the new method for locating
      * CMP descriptors will be used; optional, default false.
@@ -388,7 +371,6 @@
         this.newCMP = newCMP;
     }
 
-
     /**
      * Do not EJBC the jar after it has been put together;
      * optional, default false
@@ -398,11 +380,11 @@
         this.noEJBC = noEJBC;
     }
 
-
     /**
      * Register the DTDs.
      * @param handler the handler to use.
      */
+    @Override
     protected void registerKnownDTDs(DescriptorHandler handler) {
         // register all the known DTDs
         handler.registerDTD(PUBLICID_EJB11, DEFAULT_WL51_EJB11_DTD_LOCATION);
@@ -411,7 +393,6 @@
         handler.registerDTD(PUBLICID_EJB20, DEFAULT_WL60_EJB20_DTD_LOCATION);
     }
 
-
     /**
      * Get the weblogic descriptor handler.
      * @param srcDir the source directory.
@@ -420,8 +401,9 @@
     protected DescriptorHandler getWeblogicDescriptorHandler(final File srcDir) {
         DescriptorHandler handler =
             new DescriptorHandler(getTask(), srcDir) {
+                @Override
                 protected void processElement() {
-                    if (currentElement.equals("type-storage")) {
+                    if ("type-storage".equals(currentElement)) {
                         // Get the filename of vendor specific descriptor
                         String fileNameWithMETA = currentText;
                         //trim the META_INF\ off of the file name
@@ -442,44 +424,39 @@
         handler.registerDTD(PUBLICID_WEBLOGIC_EJB510, weblogicDTD);
         handler.registerDTD(PUBLICID_WEBLOGIC_EJB600, weblogicDTD);
 
-        for (Iterator i = getConfig().dtdLocations.iterator(); i.hasNext();) {
-            EjbJar.DTDLocation dtdLocation = (EjbJar.DTDLocation) i.next();
-
+        for (DTDLocation dtdLocation : getConfig().dtdLocations) {
             handler.registerDTD(dtdLocation.getPublicId(), dtdLocation.getLocation());
         }
         return handler;
     }
 
-
     /**
      * Add any vendor specific files which should be included in the EJB Jar.
      * @param ejbFiles the hash table to be populated.
      * @param ddPrefix the prefix to use.
      */
-    protected void addVendorFiles(Hashtable ejbFiles, String ddPrefix) {
+    @Override
+    protected void addVendorFiles(Hashtable<String, File> ejbFiles, String ddPrefix) {
         File weblogicDD = new File(getConfig().descriptorDir, ddPrefix + WL_DD);
 
         if (weblogicDD.exists()) {
             ejbFiles.put(META_DIR + WL_DD,
                 weblogicDD);
         } else {
-            log("Unable to locate weblogic deployment descriptor. "
-                + "It was expected to be in "
+            log("Unable to locate weblogic deployment descriptor. It was expected to be in "
                 + weblogicDD.getPath(), Project.MSG_WARN);
             return;
         }
 
         if (!newCMP) {
             log("The old method for locating CMP files has been DEPRECATED.", Project.MSG_VERBOSE);
-            log("Please adjust your weblogic descriptor and set "
-                + "newCMP=\"true\" to use the new CMP descriptor "
-                + "inclusion mechanism. ", Project.MSG_VERBOSE);
+            log("Please adjust your weblogic descriptor and set newCMP=\"true\" to use the new CMP descriptor inclusion mechanism. ",
+                Project.MSG_VERBOSE);
             // The the weblogic cmp deployment descriptor
             File weblogicCMPDD = new File(getConfig().descriptorDir, ddPrefix + WL_CMP_DD);
 
             if (weblogicCMPDD.exists()) {
-                ejbFiles.put(META_DIR + WL_CMP_DD,
-                    weblogicCMPDD);
+                ejbFiles.put(META_DIR + WL_CMP_DD, weblogicCMPDD);
             }
         } else {
             // now that we have the weblogic descriptor, we parse the file
@@ -487,7 +464,7 @@
             // this could be the weblogic-cmp-rdbms.xml or any other O/R
             // mapping tool descriptors.
             try {
-                File ejbDescriptor = (File) ejbFiles.get(META_DIR + EJB_DD);
+                File ejbDescriptor = ejbFiles.get(META_DIR + EJB_DD);
                 SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
 
                 saxParserFactory.setValidating(true);
@@ -496,37 +473,29 @@
                 DescriptorHandler handler
                     = getWeblogicDescriptorHandler(ejbDescriptor.getParentFile());
 
-                saxParser.parse(new InputSource
-                    (new FileInputStream(weblogicDD)),
-                        handler);
-
-                Hashtable ht = handler.getFiles();
-                Enumeration e = ht.keys();
-
-                while (e.hasMoreElements()) {
-                    String key = (String) e.nextElement();
-
-                    ejbFiles.put(key, ht.get(key));
+                try (InputStream in = Files.newInputStream(weblogicDD.toPath())) {
+                    saxParser.parse(new InputSource(in), handler);
                 }
+                handler.getFiles().forEach(ejbFiles::put);
             } catch (Exception e) {
-                String msg = "Exception while adding Vendor specific files: " + e.toString();
-
-                throw new BuildException(msg, e);
+                throw new BuildException(
+                    "Exception while adding Vendor specific files: "
+                        + e.toString(),
+                    e);
             }
         }
     }
 
-
     /**
      * Get the vendor specific name of the Jar that will be output. The
      * modification date of this jar will be checked against the dependent
      * bean classes.
      */
+    @Override
     File getVendorOutputJarFile(String baseName) {
         return new File(getDestDir(), baseName + jarSuffix);
     }
 
-
     /**
      * Helper method invoked by execute() for each WebLogic jar to be built.
      * Encapsulates the logic of constructing a java task for calling
@@ -537,7 +506,6 @@
      *      jarfile.
      */
     private void buildWeblogicJar(File sourceJar, File destJar, String publicId) {
-        Java javaTask = null;
 
         if (noEJBC) {
             try {
@@ -554,17 +522,11 @@
         String ejbcClassName = ejbcClass;
 
         try {
-            javaTask = new Java(getTask());
+            Java javaTask = new Java(getTask());
             javaTask.setTaskName("ejbc");
 
             javaTask.createJvmarg().setLine(additionalJvmArgs);
-            if (!(sysprops.isEmpty())) {
-                for (Enumeration en = sysprops.elements(); en.hasMoreElements();) {
-                    Environment.Variable entry
-                        = (Environment.Variable) en.nextElement();
-                    javaTask.addSysproperty(entry);
-                }
-            }
+            sysprops.forEach(javaTask::addSysproperty);
 
             if (getJvmDebugLevel() != null) {
                 javaTask.createJvmarg().setLine(" -Dweblogic.StdoutSeverityLevel=" + jvmDebugLevel);
@@ -594,20 +556,18 @@
                 String buildCompiler
                     = getTask().getProject().getProperty("build.compiler");
 
-                if (buildCompiler != null && buildCompiler.equals("jikes")) {
+                if ("jikes".equals(buildCompiler)) {
                     javaTask.createArg().setValue("-compiler");
                     javaTask.createArg().setValue("jikes");
                 }
-            } else {
-                if (!compiler.equals(DEFAULT_COMPILER)) {
-                    javaTask.createArg().setValue("-compiler");
-                    javaTask.createArg().setLine(compiler);
-                }
+            } else if (!DEFAULT_COMPILER.equals(compiler)) {
+                javaTask.createArg().setValue("-compiler");
+                javaTask.createArg().setLine(compiler);
             }
 
             Path combinedClasspath = getCombinedClasspath();
-            if (wlClasspath != null && combinedClasspath != null
-                 && combinedClasspath.toString().trim().length() > 0) {
+            if (!(wlClasspath == null || combinedClasspath == null
+                || combinedClasspath.toString().trim().isEmpty())) {
                 javaTask.createArg().setValue("-classpath");
                 javaTask.createArg().setPath(combinedClasspath);
             }
@@ -638,14 +598,11 @@
             }
         } catch (Exception e) {
             // Have to catch this because of the semantics of calling main()
-            String msg = "Exception while calling " + ejbcClassName
-                + ". Details: " + e.toString();
-
-            throw new BuildException(msg, e);
+            throw new BuildException("Exception while calling " + ejbcClassName
+                + ". Details: " + e.toString(), e);
         }
     }
 
-
     /**
      * Method used to encapsulate the writing of the JAR file. Iterates over
      * the filenames/java.io.Files in the Hashtable stored on the instance
@@ -656,7 +613,8 @@
      * @param publicId the id to use.
      * @throws BuildException if there is a problem.
      */
-    protected void writeJar(String baseName, File jarFile, Hashtable files,
+    @Override
+    protected void writeJar(String baseName, File jarFile, Hashtable<String, File> files,
                             String publicId) throws BuildException {
         // need to create a generic jar first.
         File genericJarFile = super.getVendorOutputJarFile(baseName);
@@ -673,16 +631,15 @@
         }
     }
 
-
     /**
      * Called to validate that the tool parameters have been configured.
      * @throws BuildException if there is an error.
      */
+    @Override
     public void validateConfigured() throws BuildException {
         super.validateConfigured();
     }
 
-
     /**
      * Helper method to check to see if a weblogic EBJ1.1 jar needs to be
      * rebuilt using ejbc. Called from writeJar it sees if the "Bean" classes
@@ -728,35 +685,33 @@
                 genericJar = new JarFile(genericJarFile);
                 wlJar = new JarFile(weblogicJarFile);
 
-                Hashtable genericEntries = new Hashtable();
-                Hashtable wlEntries = new Hashtable();
-                Hashtable replaceEntries = new Hashtable();
+                Hashtable<String, JarEntry> genericEntries = new Hashtable<>();
+                Hashtable<String, JarEntry> wlEntries = new Hashtable<>();
+                Hashtable<String, JarEntry> replaceEntries = new Hashtable<>();
 
                 //get the list of generic jar entries
-                for (Enumeration e = genericJar.entries(); e.hasMoreElements();) {
-                    JarEntry je = (JarEntry) e.nextElement();
-
+                for (Enumeration<JarEntry> e = genericJar.entries(); e.hasMoreElements();) {
+                    JarEntry je = e.nextElement();
                     genericEntries.put(je.getName().replace('\\', '/'), je);
                 }
                 //get the list of weblogic jar entries
-                for (Enumeration e = wlJar.entries(); e.hasMoreElements();) {
-                    JarEntry je = (JarEntry) e.nextElement();
-
+                for (Enumeration<JarEntry> e = wlJar.entries(); e.hasMoreElements();) {
+                    JarEntry je = e.nextElement();
                     wlEntries.put(je.getName(), je);
                 }
 
                 //Cycle Through generic and make sure its in weblogic
                 genericLoader = getClassLoaderFromJar(genericJarFile);
 
-                for (Enumeration e = genericEntries.keys(); e.hasMoreElements();) {
-                    String filepath = (String) e.nextElement();
+                for (Enumeration<String> e = genericEntries.keys(); e.hasMoreElements();) {
+                    String filepath = e.nextElement();
 
                     if (wlEntries.containsKey(filepath)) {
                         // File name/path match
 
                         // Check files see if same
-                        JarEntry genericEntry = (JarEntry) genericEntries.get(filepath);
-                        JarEntry wlEntry = (JarEntry) wlEntries.get(filepath);
+                        JarEntry genericEntry = genericEntries.get(filepath);
+                        JarEntry wlEntry = wlEntries.get(filepath);
 
                         if ((genericEntry.getCrc() != wlEntry.getCrc())
                             || (genericEntry.getSize() != wlEntry.getSize())) {
@@ -770,7 +725,7 @@
 
                                 classname = classname.substring(0, classname.lastIndexOf(".class"));
 
-                                Class genclass = genericLoader.loadClass(classname);
+                                Class<?> genclass = genericLoader.loadClass(classname);
 
                                 if (genclass.isInterface()) {
                                     //Interface changed   rebuild jar.
@@ -778,19 +733,16 @@
                                         + " has changed", Project.MSG_VERBOSE);
                                     rebuild = true;
                                     break;
-                                } else {
-                                    //Object class Changed   update it.
-                                    replaceEntries.put(filepath, genericEntry);
-                                }
-                            } else {
-                                // is it the manifest. If so ignore it
-                                if (!genericEntry.getName().equals("META-INF/MANIFEST.MF")) {
-                                    //File other then class changed   rebuild
-                                    log("Non class file " + genericEntry.getName()
-                                        + " has changed", Project.MSG_VERBOSE);
-                                    rebuild = true;
-                                    break;
                                 }
+                                //Object class Changed   update it.
+                                replaceEntries.put(filepath, genericEntry);
+                            } else if (!"META-INF/MANIFEST.MF".equals(genericEntry.getName())) {
+                                // it is not the manifest, otherwise we'd ignore it
+                                // File other then class changed   rebuild
+                                log("Non class file " + genericEntry.getName()
+                                    + " has changed", Project.MSG_VERBOSE);
+                                rebuild = true;
+                                break;
                             }
                         }
                     } else {
@@ -810,15 +762,12 @@
                         newWLJarFile.delete();
                     }
 
-                    newJarStream = new JarOutputStream(new FileOutputStream(newWLJarFile));
+                    newJarStream = new JarOutputStream(Files.newOutputStream(newWLJarFile.toPath()));
                     newJarStream.setLevel(0);
 
                     //Copy files from old weblogic jar
-                    for (Enumeration e = wlEntries.elements(); e.hasMoreElements();) {
-                        byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
-                        int bytesRead;
-                        InputStream is;
-                        JarEntry je = (JarEntry) e.nextElement();
+                    for (Enumeration<JarEntry> e = wlEntries.elements(); e.hasMoreElements();) {
+                        JarEntry je = e.nextElement();
 
                         if (je.getCompressedSize() == -1
                             || je.getCompressedSize() == je.getSize()) {
@@ -827,12 +776,13 @@
                             newJarStream.setLevel(JAR_COMPRESS_LEVEL);
                         }
 
+                        InputStream is;
                         // Update with changed Bean class
                         if (replaceEntries.containsKey(je.getName())) {
                             log("Updating Bean class from generic Jar "
                                 + je.getName(), Project.MSG_VERBOSE);
                             // Use the entry from the generic jar
-                            je = (JarEntry) replaceEntries.get(je.getName());
+                            je = replaceEntries.get(je.getName());
                             is = genericJar.getInputStream(je);
                         } else {
                             //use fle from original weblogic jar
@@ -841,6 +791,8 @@
                         }
                         newJarStream.putNextEntry(new JarEntry(je.getName()));
 
+                        byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
+                        int bytesRead;
                         while ((bytesRead = is.read(buffer)) != -1) {
                             newJarStream.write(buffer, 0, bytesRead);
                         }
@@ -866,24 +818,10 @@
 
             throw new BuildException(msg, ioe);
         } finally {
-            // need to close files and perhaps rename output
-            if (genericJar != null) {
-                try {
-                    genericJar.close();
-                } catch (IOException closeException) {
-                    // empty
-                }
-            }
-
-            if (wlJar != null) {
-                try {
-                    wlJar.close();
-                } catch (IOException closeException) {
-                    // empty
-                }
-            }
-
+            FileUtils.close(genericJar);
+            FileUtils.close(wlJar);
             FileUtils.close(newJarStream);
+
             if (newJarStream != null) {
                 try {
                     FILE_UTILS.rename(newWLJarFile, weblogicJarFile);
@@ -894,11 +832,11 @@
             }
             if (genericLoader != null
                 && genericLoader instanceof AntClassLoader) {
+                @SuppressWarnings("resource")
                 AntClassLoader loader = (AntClassLoader) genericLoader;
                 loader.cleanup();
             }
         }
-
         return rebuild;
     }
 
@@ -921,7 +859,6 @@
         if (classpath != null) {
             lookupPath.append(classpath);
         }
-
         return getTask().getProject().createClassLoader(lookupPath);
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java	2018-03-24 12:37:12.000000000 +0000
@@ -62,14 +62,17 @@
      * @param srcDir the source file.
      * @return the descriptor handler.
      */
+    @Override
     protected DescriptorHandler getDescriptorHandler(File srcDir) {
         DescriptorHandler handler = super.getDescriptorHandler(srcDir);
         if (toplinkDTD != null) {
-            handler.registerDTD("-//The Object People, Inc.//"
-                + "DTD TOPLink for WebLogic CMP 2.5.1//EN", toplinkDTD);
+            handler.registerDTD(
+                "-//The Object People, Inc.//DTD TOPLink for WebLogic CMP 2.5.1//EN",
+                toplinkDTD);
         } else {
-            handler.registerDTD("-//The Object People, Inc.//"
-                + "DTD TOPLink for WebLogic CMP 2.5.1//EN", TL_DTD_LOC);
+            handler.registerDTD(
+                "-//The Object People, Inc.//DTD TOPLink for WebLogic CMP 2.5.1//EN",
+                TL_DTD_LOC);
         }
         return handler;
     }
@@ -80,21 +83,20 @@
      * @param ejbFiles the hashtable to add files to.
      * @param ddPrefix the prefix to use.
      */
-    protected void addVendorFiles(Hashtable ejbFiles, String ddPrefix) {
+    @Override
+    protected void addVendorFiles(Hashtable<String, File> ejbFiles, String ddPrefix) {
         super.addVendorFiles(ejbFiles, ddPrefix);
         // Then the toplink deployment descriptor
 
         // Setup a naming standard here?.
 
-
         File toplinkDD = new File(getConfig().descriptorDir, ddPrefix + toplinkDescriptor);
 
         if (toplinkDD.exists()) {
             ejbFiles.put(META_DIR + toplinkDescriptor,
                          toplinkDD);
         } else {
-            log("Unable to locate toplink deployment descriptor. "
-                + "It was expected to be in "
+            log("Unable to locate toplink deployment descriptor. It was expected to be in "
                 + toplinkDD.getPath(), Project.MSG_WARN);
         }
     }
@@ -103,11 +105,12 @@
      * Called to validate that the tool parameters have been configured.
      * @throws BuildException if there is an error.
      */
+    @Override
     public void validateConfigured() throws BuildException {
         super.validateConfigured();
         if (toplinkDescriptor == null) {
-            throw new BuildException("The toplinkdescriptor attribute must "
-                + "be specified");
+            throw new BuildException(
+                "The toplinkdescriptor attribute must be specified");
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,12 +18,11 @@
 package org.apache.tools.ant.taskdefs.optional.ejb;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
 import java.util.Enumeration;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
@@ -32,6 +31,7 @@
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Java;
+import org.apache.tools.ant.taskdefs.optional.ejb.EjbJar.DTDLocation;
 import org.apache.tools.ant.types.Environment;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.util.FileUtils;
@@ -148,7 +148,6 @@
         return wasClasspath.createPath();
     }
 
-
     /**
      * Set the websphere classpath.
      * @param wasClasspath the websphere classpath.
@@ -157,7 +156,6 @@
         this.wasClasspath = wasClasspath;
     }
 
-
     /** Sets the DB Vendor for the Entity Bean mapping; optional.
      * <p>
      * Valid options can be obtained by running the following command:
@@ -177,7 +175,6 @@
         this.dbVendor = dbvendor;
     }
 
-
     /**
      * Sets the name of the Database to create; optional.
      *
@@ -187,7 +184,6 @@
         this.dbName = dbName;
     }
 
-
     /**
      * Sets the name of the schema to create; optional.
      *
@@ -197,7 +193,6 @@
         this.dbSchema = dbSchema;
     }
 
-
     /**
      * Flag, default false, to only generate the deployment
      * code, do not run RMIC or Javac
@@ -208,7 +203,6 @@
         this.codegen = codegen;
     }
 
-
     /**
      * Flag, default true, to only output error messages.
      *
@@ -218,7 +212,6 @@
         this.quiet = quiet;
     }
 
-
     /**
      * Flag to disable the validation steps; optional, default false.
      *
@@ -228,7 +221,6 @@
         this.novalidate = novalidate;
     }
 
-
     /**
      * Flag to disable warning and informational messages; optional, default false.
      *
@@ -238,7 +230,6 @@
         this.nowarn = nowarn;
     }
 
-
     /**
      * Flag to disable informational messages; optional, default false.
      *
@@ -248,7 +239,6 @@
         this.noinform = noinform;
     }
 
-
     /**
      * Flag to enable internal tracing when set, optional, default false.
      *
@@ -276,7 +266,6 @@
         use35MappingRules = attr;
     }
 
-
     /**
      * Set the rebuild flag to false to only update changes in the jar rather
      * than rerunning ejbdeploy; optional, default true.
@@ -286,7 +275,6 @@
         this.alwaysRebuild = rebuild;
     }
 
-
     /**
      * String value appended to the basename of the deployment
      * descriptor to create the filename of the WebLogic EJB
@@ -297,7 +285,6 @@
         this.jarSuffix = inString;
     }
 
-
     /**
      * This controls whether the generic file used as input to
      * ejbdeploy is retained; optional, default false.
@@ -307,7 +294,6 @@
         this.keepGeneric = inValue;
     }
 
-
     /**
      * Decide, whether ejbdeploy should be called or not;
      * optional, default true.
@@ -318,7 +304,6 @@
         this.ejbdeploy = ejbdeploy;
     }
 
-
     /**
      * Setter used to store the location of the Sun's Generic EJB DTD. This
      * can be a file on the system or a resource on the classpath.
@@ -329,7 +314,6 @@
         this.ejb11DTD = inString;
     }
 
-
     /**
      * Set the value of the oldCMP scheme. This is an antonym for newCMP
      * @ant.attribute ignore="true"
@@ -339,7 +323,6 @@
         this.newCMP = !oldCMP;
     }
 
-
     /**
      * Set the value of the newCMP scheme. The old CMP scheme locates the
      * websphere CMP descriptor based on the naming convention where the
@@ -353,7 +336,6 @@
         this.newCMP = newCMP;
     }
 
-
     /**
      * The directory, where ejbdeploy will write temporary files;
      * optional, defaults to '_ejbdeploy_temp'.
@@ -363,24 +345,20 @@
         this.tempdir = tempdir;
     }
 
-
     /** {@inheritDoc}. */
+    @Override
     protected DescriptorHandler getDescriptorHandler(File srcDir) {
         DescriptorHandler handler = new DescriptorHandler(getTask(), srcDir);
         // register all the DTDs, both the ones that are known and
         // any supplied by the user
         handler.registerDTD(PUBLICID_EJB11, ejb11DTD);
 
-        for (Iterator i = getConfig().dtdLocations.iterator(); i.hasNext();) {
-            EjbJar.DTDLocation dtdLocation = (EjbJar.DTDLocation) i.next();
-
+        for (DTDLocation dtdLocation : getConfig().dtdLocations) {
             handler.registerDTD(dtdLocation.getPublicId(), dtdLocation.getLocation());
         }
-
         return handler;
     }
 
-
     /**
      * Get a description handler.
      * @param srcDir the source directory.
@@ -389,13 +367,12 @@
     protected DescriptorHandler getWebsphereDescriptorHandler(final File srcDir) {
         DescriptorHandler handler =
             new DescriptorHandler(getTask(), srcDir) {
+                @Override
                 protected void processElement() {
                 }
             };
 
-        for (Iterator i = getConfig().dtdLocations.iterator(); i.hasNext();) {
-            EjbJar.DTDLocation dtdLocation = (EjbJar.DTDLocation) i.next();
-
+        for (DTDLocation dtdLocation : getConfig().dtdLocations) {
             handler.registerDTD(dtdLocation.getPublicId(), dtdLocation.getLocation());
         }
         return handler;
@@ -407,9 +384,10 @@
      * @param ejbFiles a hashtable entryname -&gt; file.
      * @param baseName a prefix to use.
      */
-    protected void addVendorFiles(Hashtable ejbFiles, String baseName) {
+    @Override
+    protected void addVendorFiles(Hashtable<String, File> ejbFiles, String baseName) {
 
-        String ddPrefix = (usingBaseJarName() ? "" : baseName);
+        String ddPrefix = usingBaseJarName() ? "" : baseName;
         String dbPrefix = (dbVendor == null) ? "" : dbVendor + "-";
 
         // Get the Extensions document
@@ -419,8 +397,7 @@
             ejbFiles.put(META_DIR + WAS_EXT,
                 websphereEXT);
         } else {
-            log("Unable to locate websphere extensions. "
-                + "It was expected to be in "
+            log("Unable to locate websphere extensions. It was expected to be in "
                 + websphereEXT.getPath(), Project.MSG_VERBOSE);
         }
 
@@ -430,17 +407,15 @@
             ejbFiles.put(META_DIR + WAS_BND,
                 websphereBND);
         } else {
-            log("Unable to locate websphere bindings. "
-                + "It was expected to be in "
+            log("Unable to locate websphere bindings. It was expected to be in "
                 + websphereBND.getPath(), Project.MSG_VERBOSE);
         }
 
         if (!newCMP) {
             log("The old method for locating CMP files has been DEPRECATED.",
                 Project.MSG_VERBOSE);
-            log("Please adjust your websphere descriptor and set "
-                + "newCMP=\"true\" to use the new CMP descriptor "
-                + "inclusion mechanism. ", Project.MSG_VERBOSE);
+            log("Please adjust your websphere descriptor and set newCMP=\"true\" to use the new CMP descriptor inclusion mechanism. ",
+                Project.MSG_VERBOSE);
         } else {
             // We attempt to put in the MAP and Schema files of CMP beans
             try {
@@ -468,25 +443,24 @@
                 }
                 // There is nothing else to see here...keep moving sonny
             } catch (Exception e) {
-                String msg = "Exception while adding Vendor specific files: "
-                    + e.toString();
-
-                throw new BuildException(msg, e);
+                throw new BuildException(
+                    "Exception while adding Vendor specific files: "
+                        + e.toString(),
+                    e);
             }
         }
     }
 
-
     /**
      * Get the vendor specific name of the Jar that will be output. The
      * modification date of this jar will be checked against the dependent
      * bean classes.
      */
+    @Override
     File getVendorOutputJarFile(String baseName) {
         return new File(getDestDir(), baseName + jarSuffix);
     }
 
-
     /**
      * Gets the options for the EJB Deploy operation
      *
@@ -494,7 +468,7 @@
      */
     protected String getOptions() {
         // Set the options
-        StringBuffer options = new StringBuffer();
+        StringBuilder options = new StringBuilder();
 
         if (dbVendor != null) {
             options.append(" -dbvendor ").append(dbVendor);
@@ -542,7 +516,6 @@
         return options.toString();
     }
 
-
     /**
      * Helper method invoked by execute() for each websphere jar to be built.
      * Encapsulates the logic of constructing a java task for calling
@@ -603,15 +576,16 @@
             }
         } catch (Exception e) {
             // Have to catch this because of the semantics of calling main()
-            String msg = "Exception while calling ejbdeploy. Details: " + e.toString();
-
-            throw new BuildException(msg, e);
+            throw new BuildException(
+                "Exception while calling ejbdeploy. Details: " + e.toString(),
+                e);
         }
     }
 
     /** {@inheritDoc}. */
-    protected void writeJar(String baseName, File jarFile, Hashtable files, String publicId)
-         throws BuildException {
+    @Override
+    protected void writeJar(String baseName, File jarFile,
+        Hashtable<String, File> files, String publicId) throws BuildException {
         if (ejbdeploy) {
             // create the -generic.jar, if required
             File genericJarFile = super.getVendorOutputJarFile(baseName);
@@ -633,24 +607,23 @@
         }
     }
 
-
     /**
      * Called to validate that the tool parameters have been configured.
      * @throws BuildException if there is an error.
      */
+    @Override
     public void validateConfigured() throws BuildException {
         super.validateConfigured();
         if (ejbdeploy) {
             String home = getTask().getProject().getProperty("websphere.home");
             if (home == null) {
-                throw new BuildException("The 'websphere.home' property must "
-                    + "be set when 'ejbdeploy=true'");
+                throw new BuildException(
+                    "The 'websphere.home' property must be set when 'ejbdeploy=true'");
             }
             websphereHome = getTask().getProject().resolveFile(home);
         }
     }
 
-
     /**
      * Helper method to check to see if a websphere EBJ1.1 jar needs to be
      * rebuilt using ejbdeploy. Called from writeJar it sees if the "Bean"
@@ -696,34 +669,32 @@
                 genericJar = new JarFile(genericJarFile);
                 wasJar = new JarFile(websphereJarFile);
 
-                Hashtable genericEntries = new Hashtable();
-                Hashtable wasEntries = new Hashtable();
-                Hashtable replaceEntries = new Hashtable();
+                Hashtable<String, JarEntry> genericEntries = new Hashtable<>();
+                Hashtable<String, JarEntry> wasEntries = new Hashtable<>();
+                Hashtable<String, JarEntry> replaceEntries = new Hashtable<>();
 
                 //get the list of generic jar entries
-                for (Enumeration e = genericJar.entries(); e.hasMoreElements();) {
-                    JarEntry je = (JarEntry) e.nextElement();
-
+                for (Enumeration<JarEntry> e = genericJar.entries(); e.hasMoreElements();) {
+                    JarEntry je = e.nextElement();
                     genericEntries.put(je.getName().replace('\\', '/'), je);
                 }
                 //get the list of websphere jar entries
-                for (Enumeration e = wasJar.entries(); e.hasMoreElements();) {
-                    JarEntry je = (JarEntry) e.nextElement();
-
+                for (Enumeration<JarEntry> e = wasJar.entries(); e.hasMoreElements();) {
+                    JarEntry je = e.nextElement();
                     wasEntries.put(je.getName(), je);
                 }
 
                 //Cycle Through generic and make sure its in websphere
                 genericLoader = getClassLoaderFromJar(genericJarFile);
 
-                for (Enumeration e = genericEntries.keys(); e.hasMoreElements();) {
-                    String filepath = (String) e.nextElement();
+                for (Enumeration<String> e = genericEntries.keys(); e.hasMoreElements();) {
+                    String filepath = e.nextElement();
 
                     if (wasEntries.containsKey(filepath)) {
                         // File name/path match
                         // Check files see if same
-                        JarEntry genericEntry = (JarEntry) genericEntries.get(filepath);
-                        JarEntry wasEntry = (JarEntry) wasEntries.get(filepath);
+                        JarEntry genericEntry = genericEntries.get(filepath);
+                        JarEntry wasEntry = wasEntries.get(filepath);
 
                         if ((genericEntry.getCrc() != wasEntry.getCrc())
                             || (genericEntry.getSize() != wasEntry.getSize())) {
@@ -735,7 +706,7 @@
 
                                 classname = classname.substring(0, classname.lastIndexOf(".class"));
 
-                                Class genclass = genericLoader.loadClass(classname);
+                                Class<?> genclass = genericLoader.loadClass(classname);
 
                                 if (genclass.isInterface()) {
                                     //Interface changed   rebuild jar.
@@ -743,14 +714,13 @@
                                         + " has changed", Project.MSG_VERBOSE);
                                     rebuild = true;
                                     break;
-                                } else {
-                                    //Object class Changed   update it.
-                                    replaceEntries.put(filepath, genericEntry);
                                 }
+                                //Object class Changed   update it.
+                                replaceEntries.put(filepath, genericEntry);
                             } else {
                                 // is it the manifest. If so ignore it
                                 if (!genericEntry.getName().equals("META-INF/MANIFEST.MF")) {
-                                    //File other then class changed   rebuild
+                                    //File other then class changed  rebuild
                                     log("Non class file " + genericEntry.getName()
                                         + " has changed", Project.MSG_VERBOSE);
                                     rebuild = true;
@@ -775,15 +745,12 @@
                         newwasJarFile.delete();
                     }
 
-                    newJarStream = new JarOutputStream(new FileOutputStream(newwasJarFile));
+                    newJarStream = new JarOutputStream(Files.newOutputStream(newwasJarFile.toPath()));
                     newJarStream.setLevel(0);
 
                     //Copy files from old websphere jar
-                    for (Enumeration e = wasEntries.elements(); e.hasMoreElements();) {
-                        byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
-                        int bytesRead;
-                        InputStream is;
-                        JarEntry je = (JarEntry) e.nextElement();
+                    for (Enumeration<JarEntry> e = wasEntries.elements(); e.hasMoreElements();) {
+                        JarEntry je = e.nextElement();
 
                         if (je.getCompressedSize() == -1
                             || je.getCompressedSize() == je.getSize()) {
@@ -792,12 +759,13 @@
                             newJarStream.setLevel(JAR_COMPRESS_LEVEL);
                         }
 
+                        InputStream is;
                         // Update with changed Bean class
                         if (replaceEntries.containsKey(je.getName())) {
                             log("Updating Bean class from generic Jar " + je.getName(),
                                 Project.MSG_VERBOSE);
                             // Use the entry from the generic jar
-                            je = (JarEntry) replaceEntries.get(je.getName());
+                            je = replaceEntries.get(je.getName());
                             is = genericJar.getInputStream(je);
                         } else {
                             //use fle from original websphere jar
@@ -806,6 +774,8 @@
                         }
                         newJarStream.putNextEntry(new JarEntry(je.getName()));
 
+                        byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
+                        int bytesRead;
                         while ((bytesRead = is.read(buffer)) != -1) {
                             newJarStream.write(buffer, 0, bytesRead);
                         }
@@ -819,36 +789,21 @@
                 rebuild = true;
             }
         } catch (ClassNotFoundException cnfe) {
-            String cnfmsg = "ClassNotFoundException while processing ejb-jar file"
-                 + ". Details: "
-                 + cnfe.getMessage();
-
-            throw new BuildException(cnfmsg, cnfe);
+            throw new BuildException(
+                "ClassNotFoundException while processing ejb-jar file. Details: "
+                    + cnfe.getMessage(),
+                cnfe);
         } catch (IOException ioe) {
-            String msg = "IOException while processing ejb-jar file "
-                 + ". Details: "
-                 + ioe.getMessage();
-
-            throw new BuildException(msg, ioe);
+            throw new BuildException(
+                "IOException while processing ejb-jar file . Details: "
+                    + ioe.getMessage(),
+                ioe);
         } finally {
             // need to close files and perhaps rename output
-            if (genericJar != null) {
-                try {
-                    genericJar.close();
-                } catch (IOException closeException) {
-                    // Ignore
-                }
-            }
-
-            if (wasJar != null) {
-                try {
-                    wasJar.close();
-                } catch (IOException closeException) {
-                    // Ignore
-                }
-            }
-
+            FileUtils.close(genericJar);
+            FileUtils.close(wasJar);
             FileUtils.close(newJarStream);
+
             if (newJarStream != null) {
                 try {
                     FILE_UTILS.rename(newwasJarFile, websphereJarFile);
@@ -859,15 +814,14 @@
             }
             if (genericLoader != null
                 && genericLoader instanceof AntClassLoader) {
+                @SuppressWarnings("resource")
                 AntClassLoader loader = (AntClassLoader) genericLoader;
                 loader.cleanup();
             }
         }
-
         return rebuild;
     }
 
-
     /**
      * Helper method invoked by isRebuildRequired to get a ClassLoader for a
      * Jar File passed to it.
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatability.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatability.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatability.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatability.java	2018-03-24 12:37:12.000000000 +0000
@@ -51,6 +51,7 @@
      *
      * @return the name of compatibility level
      */
+    @Override
     public String toString() {
         return name;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.java	2018-03-24 12:37:12.000000000 +0000
@@ -51,6 +51,7 @@
      *
      * @return the name of compatibility level
      */
+    @Override
     public String toString() {
         return name;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.java	2018-03-24 12:37:12.000000000 +0000
@@ -150,6 +150,7 @@
      * @param reference the reference to which this instance is associated
      * @exception BuildException if this instance already has been configured.
      */
+    @Override
     public void setRefid(final Reference reference)
         throws BuildException {
         if (null != extensionName
@@ -183,8 +184,7 @@
         }
         dieOnCircularReference();
         if (null == extensionName) {
-            final String message = "Extension is missing name.";
-            throw new BuildException(message);
+            throw new BuildException("Extension is missing name.");
         }
 
         String specificationVersionString = null;
@@ -209,7 +209,8 @@
      * @return the extension in a string.
      * @see java.lang.Object#toString()
      */
+    @Override
     public String toString() {
-        return "{" + toExtension().toString() + "}";
+        return "{" + toExtension() + "}";
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,11 +18,13 @@
 package org.apache.tools.ant.taskdefs.optional.extension;
 
 import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.StringTokenizer;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.util.DeweyDecimal;
 import org.apache.tools.ant.util.StringUtils;
@@ -187,31 +189,14 @@
      */
     public static Extension[] getAvailable(final Manifest manifest) {
         if (null == manifest) {
-            return new Extension[ 0 ];
+            return new Extension[0];
         }
-
-        final ArrayList results = new ArrayList();
-
-        final Attributes mainAttributes = manifest.getMainAttributes();
-        if (null != mainAttributes) {
-            final Extension extension = getExtension("", mainAttributes);
-            if (null != extension) {
-                results.add(extension);
-            }
-        }
-
-        final Map entries = manifest.getEntries();
-        final Iterator keys = entries.keySet().iterator();
-        while (keys.hasNext()) {
-            final String key = (String) keys.next();
-            final Attributes attributes = (Attributes) entries.get(key);
-            final Extension extension = getExtension("", attributes);
-            if (null != extension) {
-                results.add(extension);
-            }
-        }
-
-        return (Extension[]) results.toArray(new Extension[results.size()]);
+        return Stream
+            .concat(Optional.ofNullable(manifest.getMainAttributes())
+                    .map(Stream::of).orElse(Stream.empty()),
+                manifest.getEntries().values().stream())
+            .map(attrs -> getExtension("", attrs)).filter(Objects::nonNull)
+            .toArray(Extension[]::new);
     }
 
     /**
@@ -491,10 +476,11 @@
      *
      * @return string representation of object.
      */
+    @Override
     public String toString() {
         final String brace = ": ";
 
-        final StringBuffer sb = new StringBuffer(EXTENSION_NAME.toString());
+        final StringBuilder sb = new StringBuilder(EXTENSION_NAME.toString());
         sb.append(brace);
         sb.append(extensionName);
         sb.append(StringUtils.LINE_SEP);
@@ -567,22 +553,17 @@
      */
     private static Extension[] getListed(final Manifest manifest,
                                           final Attributes.Name listKey) {
-        final ArrayList results = new ArrayList();
+        final List<Extension> results = new ArrayList<>();
         final Attributes mainAttributes = manifest.getMainAttributes();
 
         if (null != mainAttributes) {
             getExtension(mainAttributes, results, listKey);
         }
 
-        final Map entries = manifest.getEntries();
-        final Iterator keys = entries.keySet().iterator();
-        while (keys.hasNext()) {
-            final String key = (String) keys.next();
-            final Attributes attributes = (Attributes) entries.get(key);
-            getExtension(attributes, results, listKey);
-        }
+        manifest.getEntries().values()
+            .forEach(attributes -> getExtension(attributes, results, listKey));
 
-        return (Extension[]) results.toArray(new Extension[results.size()]);
+        return results.toArray(new Extension[results.size()]);
     }
 
     /**
@@ -595,18 +576,14 @@
      *    or OPTIONAL_EXTENSION_LIST
      */
     private static void getExtension(final Attributes attributes,
-                                     final ArrayList required,
+                                     final List<Extension> required,
                                      final Attributes.Name listKey) {
         final String names = attributes.getValue(listKey);
         if (null == names) {
             return;
         }
-
-        final String[] extensions = split(names, " ");
-        for (int i = 0; i < extensions.length; i++) {
-            final String prefix = extensions[ i ] + "-";
-            final Extension extension = getExtension(prefix, attributes);
-
+        for (final String prefix : split(names, " ")) {
+            final Extension extension = getExtension(prefix + "-", attributes);
             if (null != extension) {
                 required.add(extension);
             }
@@ -623,10 +600,10 @@
     private static String[] split(final String string,
                                         final String onToken) {
         final StringTokenizer tokenizer = new StringTokenizer(string, onToken);
-        final String[] result = new String[ tokenizer.countTokens() ];
+        final String[] result = new String[tokenizer.countTokens()];
 
         for (int i = 0; i < result.length; i++) {
-            result[ i ] = tokenizer.nextToken();
+            result[i] = tokenizer.nextToken();
         }
 
         return result;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
+import java.util.List;
 import java.util.Stack;
 
 import org.apache.tools.ant.BuildException;
@@ -39,12 +39,12 @@
     /**
      * ExtensionAdapter objects representing extensions.
      */
-    private final ArrayList extensions = new ArrayList();
+    private final List<ExtensionAdapter> extensions = new ArrayList<>();
 
     /**
      * Filesets specifying all the extensions wanted.
      */
-    private final ArrayList extensionsFilesets = new ArrayList();
+    private final List<FileSet> extensionsFilesets = new ArrayList<>();
 
     /**
      * Adds an extension that this library requires.
@@ -98,9 +98,9 @@
             return ((ExtensionSet) getCheckedRef()).toExtensions(proj);
         }
         dieOnCircularReference();
-        final ArrayList extensionsList = ExtensionUtil.toExtensions(extensions);
+        final List<Extension> extensionsList = ExtensionUtil.toExtensions(extensions);
         ExtensionUtil.extractExtensions(proj, extensionsList, extensionsFilesets);
-        return (Extension[]) extensionsList.toArray(new Extension[extensionsList.size()]);
+        return extensionsList.toArray(new Extension[extensionsList.size()]);
     }
 
     /**
@@ -123,7 +123,7 @@
     }
 
     @Override
-    protected synchronized void dieOnCircularReference(Stack stk, Project p)
+    protected synchronized void dieOnCircularReference(Stack<Object> stk, Project p)
         throws BuildException {
         if (isChecked()) {
             return;
@@ -131,12 +131,11 @@
         if (isReference()) {
             super.dieOnCircularReference(stk, p);
         } else {
-            for (Iterator i = extensions.iterator(); i.hasNext();) {
-                pushAndInvokeCircularReferenceCheck((ExtensionAdapter) i.next(),
-                                                    stk, p);
+            for (ExtensionAdapter extensionAdapter : extensions) {
+                pushAndInvokeCircularReferenceCheck(extensionAdapter, stk, p);
             }
-            for (Iterator i = extensionsFilesets.iterator(); i.hasNext();) {
-                pushAndInvokeCircularReferenceCheck((FileSet) i.next(), stk, p);
+            for (FileSet fileSet : extensionsFilesets) {
+                pushAndInvokeCircularReferenceCheck(fileSet, stk, p);
             }
             setChecked(true);
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,10 +20,10 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
+import java.util.stream.Collectors;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
@@ -48,19 +48,10 @@
      * @param adapters the list of ExtensionAdapters to add to convert
      * @throws BuildException if an error occurs
      */
-    static ArrayList toExtensions(final List adapters)
+    static ArrayList<Extension> toExtensions(final List<? extends ExtensionAdapter> adapters)
         throws BuildException {
-        final ArrayList results = new ArrayList();
-
-        final int size = adapters.size();
-        for (int i = 0; i < size; i++) {
-            final ExtensionAdapter adapter =
-                (ExtensionAdapter) adapters.get(i);
-            final Extension extension = adapter.toExtension();
-            results.add(extension);
-        }
-
-        return results;
+        return adapters.stream().map(ExtensionAdapter::toExtension)
+            .collect(Collectors.toCollection(ArrayList::new));
     }
 
     /**
@@ -71,14 +62,12 @@
      * @throws BuildException if an error occurs
      */
     static void extractExtensions(final Project project,
-                                   final List libraries,
-                                   final List fileset)
+                                   final List<Extension> libraries,
+                                   final List<FileSet> fileset)
         throws BuildException {
         if (!fileset.isEmpty()) {
-            final Extension[] extensions = getExtensions(project,
-                                                          fileset);
-            for (int i = 0; i < extensions.length; i++) {
-                libraries.add(extensions[ i ]);
+            for (Extension extension : getExtensions(project, fileset)) {
+                libraries.add(extension);
             }
         }
     }
@@ -91,13 +80,11 @@
      * @throws BuildException if failing to scan libraries
      */
     private static Extension[] getExtensions(final Project project,
-                                              final List libraries)
+                                              final List<FileSet> libraries)
         throws BuildException {
-        final ArrayList extensions = new ArrayList();
-        final Iterator iterator = libraries.iterator();
-        while (iterator.hasNext()) {
-            final FileSet fileSet = (FileSet) iterator.next();
+        final List<Extension> extensions = new ArrayList<>();
 
+        for (FileSet fileSet : libraries) {
             boolean includeImpl = true;
             boolean includeURL = true;
 
@@ -115,7 +102,7 @@
                 loadExtensions(file, extensions, includeImpl, includeURL);
             }
         }
-        return (Extension[]) extensions.toArray(new Extension[extensions.size()]);
+        return extensions.toArray(new Extension[extensions.size()]);
     }
 
     /**
@@ -126,23 +113,17 @@
      * @throws BuildException if there is an error
      */
     private static void loadExtensions(final File file,
-                                        final List extensionList,
+                                        final List<Extension> extensionList,
                                         final boolean includeImpl,
                                         final boolean includeURL)
         throws BuildException {
-        JarFile jarFile = null;
-        try {
-            jarFile = new JarFile(file);
-            final Extension[] extensions =
-                Extension.getAvailable(jarFile.getManifest());
-            for (int i = 0; i < extensions.length; i++) {
-                final Extension extension = extensions[ i ];
+        try (JarFile jarFile = new JarFile(file)) {
+            for (Extension extension : Extension
+                .getAvailable(jarFile.getManifest())) {
                 addExtension(extensionList, extension, includeImpl, includeURL);
             }
         } catch (final Exception e) {
             throw new BuildException(e.getMessage(), e);
-        } finally {
-            close(jarFile);
         }
     }
 
@@ -157,7 +138,7 @@
      * @param includeImpl false to exclude implementation details
      * @param includeURL false to exclude implementation URL
      */
-    private static void addExtension(final List extensionList,
+    private static void addExtension(final List<Extension> extensionList,
                                       final Extension originalExtension,
                                       final boolean includeImpl,
                                       final boolean includeURL) {
@@ -204,28 +185,15 @@
      */
     static Manifest getManifest(final File file)
         throws BuildException {
-        JarFile jarFile = null;
-        try {
-            jarFile = new JarFile(file);
+        try (JarFile jarFile = new JarFile(file)) {
             Manifest m = jarFile.getManifest();
             if (m == null) {
-                throw new BuildException(file + " doesn't have a MANIFEST");
+                throw new BuildException("%s doesn't have a MANIFEST", file);
             }
             return m;
         } catch (final IOException ioe) {
             throw new BuildException(ioe.getMessage(), ioe);
-        } finally {
-            close(jarFile);
         }
     }
 
-    private static void close(JarFile device) {
-        if (null != device) {
-            try {
-                device.close();
-            } catch (IOException e) {
-                //ignore
-            }
-        }
-    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtraAttribute.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtraAttribute.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtraAttribute.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtraAttribute.java	2018-03-24 12:37:12.000000000 +0000
@@ -73,11 +73,11 @@
      */
     public void validate() throws BuildException {
         if (null == name) {
-            final String message = "Missing name from parameter.";
-            throw new BuildException(message);
-        } else if (null == value) {
-            final String message = "Missing value from parameter " + name + ".";
-            throw new BuildException(message);
+            throw new BuildException("Missing name from parameter.");
+        }
+        if (null == value) {
+            throw new BuildException(
+                "Missing value from parameter " + name + ".");
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibAvailableTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibAvailableTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibAvailableTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibAvailableTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,11 +18,12 @@
 package org.apache.tools.ant.taskdefs.optional.extension;
 
 import java.io.File;
-import java.util.Iterator;
+import java.util.List;
 import java.util.Vector;
-import java.util.jar.Manifest;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 
 /**
@@ -40,7 +41,7 @@
      * Filesets specifying all the libraries
      * to display information about.
      */
-    private final Vector extensionFileSets = new Vector();
+    private final List<ExtensionSet> extensionFileSets = new Vector<>();
 
     /**
      * The name of the property to set if extension is available.
@@ -77,9 +78,8 @@
      */
     public void addConfiguredExtension(final ExtensionAdapter extension) {
         if (null != requiredExtension) {
-            final String message = "Can not specify extension to "
-                + "search for multiple times.";
-            throw new BuildException(message);
+            throw new BuildException(
+                "Can not specify extension to search for multiple times.");
         }
         requiredExtension = extension;
     }
@@ -90,7 +90,7 @@
      * @param extensionSet a set of extensions to search in.
      */
     public void addConfiguredExtensionSet(final ExtensionSet extensionSet) {
-        extensionFileSets.addElement(extensionSet);
+        extensionFileSets.add(extensionSet);
     }
 
     /**
@@ -98,35 +98,24 @@
      *
      * @throws BuildException if something goes wrong.
      */
+    @Override
     public void execute() throws BuildException {
         validate();
 
-        final Extension test = requiredExtension.toExtension();
+        final Project prj = getProject();
+        final Stream<Extension> extensions;
 
         // Check if list of files to check has been specified
         if (!extensionFileSets.isEmpty()) {
-            final Iterator iterator = extensionFileSets.iterator();
-            while (iterator.hasNext()) {
-                final ExtensionSet extensionSet
-                    = (ExtensionSet) iterator.next();
-                final Extension[] extensions =
-                    extensionSet.toExtensions(getProject());
-                for (int i = 0; i < extensions.length; i++) {
-                    final Extension extension = extensions[ i ];
-                    if (extension.isCompatibleWith(test)) {
-                        getProject().setNewProperty(propertyName, "true");
-                    }
-                }
-            }
+            extensions = extensionFileSets.stream()
+                .map(xset -> xset.toExtensions(prj)).flatMap(Stream::of);
         } else {
-            final Manifest manifest = ExtensionUtil.getManifest(libraryFile);
-            final Extension[] extensions = Extension.getAvailable(manifest);
-            for (int i = 0; i < extensions.length; i++) {
-                final Extension extension = extensions[ i ];
-                if (extension.isCompatibleWith(test)) {
-                    getProject().setNewProperty(propertyName, "true");
-                }
-            }
+            extensions = Stream.of(
+                Extension.getAvailable(ExtensionUtil.getManifest(libraryFile)));
+        }
+        final Extension test = requiredExtension.toExtension();
+        if (extensions.anyMatch(x -> x.isCompatibleWith(test))) {
+            prj.setNewProperty(propertyName, "true");
         }
     }
 
@@ -137,21 +126,16 @@
      */
     private void validate() throws BuildException {
         if (null == requiredExtension) {
-            final String message = "Extension element must be specified.";
-            throw new BuildException(message);
+            throw new BuildException("Extension element must be specified.");
         }
-
-        if (null == libraryFile && extensionFileSets.isEmpty()) {
-            final String message = "File attribute not specified.";
-            throw new BuildException(message);
-        }
-        if (null != libraryFile && !libraryFile.exists()) {
-            final String message = "File '" + libraryFile + "' does not exist.";
-            throw new BuildException(message);
-        }
-        if (null != libraryFile && !libraryFile.isFile()) {
-            final String message = "\'" + libraryFile + "\' is not a file.";
-            throw new BuildException(message);
+        if (null == libraryFile) {
+            if (extensionFileSets.isEmpty()) {
+                throw new BuildException("File attribute not specified.");
+            }
+        } else if (!libraryFile.exists()) {
+            throw new BuildException("File '%s' does not exist.", libraryFile);
+        } else if (!libraryFile.isFile()) {
+            throw new BuildException("'%s' is not a file.", libraryFile);
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibDisplayTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibDisplayTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibDisplayTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibDisplayTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,7 +18,7 @@
 package org.apache.tools.ant.taskdefs.optional.extension;
 
 import java.io.File;
-import java.util.Iterator;
+import java.util.List;
 import java.util.Vector;
 
 import org.apache.tools.ant.BuildException;
@@ -49,7 +49,7 @@
      * Filesets specifying all the libraries
      * to display information about.
      */
-    private final Vector libraryFileSets = new Vector();
+    private final List<FileSet> libraryFileSets = new Vector<>();
 
     /**
      * The JAR library to display information for.
@@ -66,7 +66,7 @@
      * @param fileSet a set of files about which library data will be displayed.
      */
     public void addFileset(final FileSet fileSet) {
-        libraryFileSets.addElement(fileSet);
+        libraryFileSets.add(fileSet);
     }
 
     /**
@@ -74,26 +74,23 @@
      *
      * @throws BuildException if the task fails.
      */
+    @Override
     public void execute() throws BuildException {
         validate();
 
         final LibraryDisplayer displayer = new LibraryDisplayer();
         // Check if list of files to check has been specified
-        if (!libraryFileSets.isEmpty()) {
-            final Iterator iterator = libraryFileSets.iterator();
-            while (iterator.hasNext()) {
-                final FileSet fileSet = (FileSet) iterator.next();
-                final DirectoryScanner scanner
-                    = fileSet.getDirectoryScanner(getProject());
+        if (libraryFileSets.isEmpty()) {
+            displayer.displayLibrary(libraryFile);
+        } else {
+            for (FileSet fileSet : libraryFileSets) {
+                final DirectoryScanner scanner =
+                    fileSet.getDirectoryScanner(getProject());
                 final File basedir = scanner.getBasedir();
-                final String[] files = scanner.getIncludedFiles();
-                for (int i = 0; i < files.length; i++) {
-                    final File file = new File(basedir, files[ i ]);
-                    displayer.displayLibrary(file);
+                for (String filename : scanner.getIncludedFiles()) {
+                    displayer.displayLibrary(new File(basedir, filename));
                 }
             }
-        } else {
-            displayer.displayLibrary(libraryFile);
         }
     }
 
@@ -103,17 +100,14 @@
      * @throws BuildException if invalid parameters found
      */
     private void validate() throws BuildException {
-        if (null == libraryFile && libraryFileSets.isEmpty()) {
-            final String message = "File attribute not specified.";
-            throw new BuildException(message);
-        }
-        if (null != libraryFile && !libraryFile.exists()) {
-            final String message = "File '" + libraryFile + "' does not exist.";
-            throw new BuildException(message);
-        }
-        if (null != libraryFile && !libraryFile.isFile()) {
-            final String message = "\'" + libraryFile + "\' is not a file.";
-            throw new BuildException(message);
+        if (null == libraryFile) {
+            if (libraryFileSets.isEmpty()) {
+                throw new BuildException("File attribute not specified.");
+            }
+        } else if (!libraryFile.exists()) {
+            throw new BuildException("File '%s' does not exist.", libraryFile);
+        } else if (!libraryFile.isFile()) {
+            throw new BuildException("'%s' is not a file.", libraryFile);
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,18 +18,21 @@
 package org.apache.tools.ant.taskdefs.optional.extension;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.List;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.MagicNames;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
-import org.apache.tools.ant.util.FileUtils;
 
 /**
  * Generates a manifest that declares all the dependencies.
@@ -71,19 +74,19 @@
      * ExtensionAdapter objects representing
      * dependencies required by library.
      */
-    private final ArrayList dependencies = new ArrayList();
+    private final List<ExtensionSet> dependencies = new ArrayList<>();
 
     /**
      * ExtensionAdapter objects representing optional
      * dependencies required by library.
      */
-    private final ArrayList optionals = new ArrayList();
+    private final List<ExtensionSet> optionals = new ArrayList<>();
 
     /**
      * Extra attributes the user specifies for main section
      * in manifest.
      */
-    private final ArrayList extraAttributes = new ArrayList();
+    private final List<ExtraAttribute> extraAttributes = new ArrayList<>();
 
     /**
      * The location where generated manifest is placed.
@@ -105,7 +108,8 @@
     public void addConfiguredExtension(final ExtensionAdapter extensionAdapter)
             throws BuildException {
         if (null != extension) {
-            throw new BuildException("Can not have multiple extensions defined in one library.");
+            throw new BuildException(
+                "Can not have multiple extensions defined in one library.");
         }
         extension = extensionAdapter.toExtension();
     }
@@ -142,6 +146,7 @@
      *
      * @throws BuildException if the task fails.
      */
+    @Override
     public void execute() throws BuildException {
         validate();
 
@@ -159,13 +164,13 @@
         }
 
         //Add all the dependency data to manifest for dependencies
-        final ArrayList depends = toExtensions(dependencies);
+        final List<Extension> depends = toExtensions(dependencies);
         appendExtensionList(attributes, Extension.EXTENSION_LIST, "lib", depends.size());
         appendLibraryList(attributes, "lib", depends);
 
         // Add all the dependency data to manifest for "optional"
         //dependencies
-        final ArrayList option = toExtensions(optionals);
+        final List<Extension> option = toExtensions(optionals);
         appendExtensionList(attributes, Extension.OPTIONAL_EXTENSION_LIST, "opt", option.size());
         appendLibraryList(attributes, "opt", option);
 
@@ -187,7 +192,7 @@
             throw new BuildException("Destfile attribute not specified.");
         }
         if (destFile.exists() && !destFile.isFile()) {
-            throw new BuildException(destFile + " is not a file.");
+            throw new BuildException("%s is not a file.", destFile);
         }
     }
 
@@ -198,12 +203,8 @@
      *        attributes to
      */
     private void appendExtraAttributes(final Attributes attributes) {
-        final Iterator iterator = extraAttributes.iterator();
-        while (iterator.hasNext()) {
-            final ExtraAttribute attribute =
-                (ExtraAttribute) iterator.next();
-            attributes.putValue(attribute.getName(),
-                                 attribute.getValue());
+        for (ExtraAttribute attribute : extraAttributes) {
+            attributes.putValue(attribute.getName(), attribute.getValue());
         }
     }
 
@@ -214,13 +215,9 @@
      * @throws IOException if error writing file
      */
     private void writeManifest(final Manifest manifest) throws IOException {
-        FileOutputStream output = null;
-        try {
-            output = new FileOutputStream(destFile);
+        try (OutputStream output = Files.newOutputStream(destFile.toPath())) {
             manifest.write(output);
             output.flush();
-        } finally {
-            FileUtils.close(output);
         }
     }
 
@@ -236,12 +233,11 @@
      * @throws BuildException if an error occurs
      */
     private void appendLibraryList(final Attributes attributes, final String listPrefix,
-            final ArrayList extensions) throws BuildException {
+            final List<Extension> extensions) throws BuildException {
         final int size = extensions.size();
         for (int i = 0; i < size; i++) {
-            final Extension ext = (Extension) extensions.get(i);
-            final String prefix = listPrefix + i + "-";
-            Extension.addExtension(ext, prefix, attributes);
+            Extension.addExtension(extensions.get(i), listPrefix + i + "-",
+                attributes);
         }
     }
 
@@ -258,15 +254,10 @@
      */
     private void appendExtensionList(final Attributes attributes,
             final Attributes.Name extensionKey, final String listPrefix, final int size) {
-        final StringBuffer sb = new StringBuffer();
-        for (int i = 0; i < size; i++) {
-            sb.append(listPrefix);
-            sb.append(i);
-            sb.append(' ');
-        }
         //add in something like
         //"Extension-List: javahelp java3d"
-        attributes.put(extensionKey, sb.toString());
+        attributes.put(extensionKey, IntStream.range(0, size)
+            .mapToObj(i -> listPrefix + i).collect(Collectors.joining(" ")));
     }
 
     /**
@@ -275,17 +266,10 @@
      * @param extensionSets the list of ExtensionSets to add to list
      * @throws BuildException if an error occurs
      */
-    private ArrayList toExtensions(final ArrayList extensionSets) throws BuildException {
-        final ArrayList results = new ArrayList();
-
-        final int size = extensionSets.size();
-        for (int i = 0; i < size; i++) {
-            final ExtensionSet set = (ExtensionSet) extensionSets.get(i);
-            final Extension[] extensions = set.toExtensions(getProject());
-            for (int j = 0; j < extensions.length; j++) {
-                results.add(extensions[ j ]);
-            }
-        }
-        return results;
+    private List<Extension> toExtensions(final List<ExtensionSet> extensionSets)
+        throws BuildException {
+        final Project prj = getProject();
+        return extensionSets.stream().map(xset -> xset.toExtensions(prj))
+            .flatMap(Stream::of).collect(Collectors.toList());
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,6 +19,7 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.jar.Manifest;
 
 import org.apache.tools.ant.BuildException;
@@ -49,7 +50,7 @@
     /**
      * The set of resolvers to use to attempt to locate library.
      */
-    private final ArrayList resolvers = new ArrayList();
+    private final List<ExtensionResolver> resolvers = new ArrayList<>();
 
     /**
      * Flag to indicate that you should check that
@@ -132,9 +133,8 @@
      */
     public void addConfiguredExtension(final ExtensionAdapter extension) {
         if (null != requiredExtension) {
-            final String message = "Can not specify extension to "
-                + "resolve multiple times.";
-            throw new BuildException(message);
+            throw new BuildException(
+                "Can not specify extension to resolve multiple times.");
         }
         requiredExtension = extension.toExtension();
     }
@@ -144,6 +144,7 @@
      *
      * @throws BuildException if the task fails.
      */
+    @Override
     public void execute() throws BuildException {
         validate();
 
@@ -160,28 +161,26 @@
             return;
         }
 
-        final int size = resolvers.size();
-        for (int i = 0; i < size; i++) {
-            final ExtensionResolver resolver =
-                (ExtensionResolver) resolvers.get(i);
-
+        for (ExtensionResolver resolver : resolvers) {
             getProject().log("Searching for extension using Resolver:" + resolver,
                     Project.MSG_VERBOSE);
-
             try {
-                final File file = resolver.resolve(requiredExtension, getProject());
+                final File file =
+                    resolver.resolve(requiredExtension, getProject());
                 try {
                     checkExtension(file);
                     return;
                 } catch (final BuildException be) {
-                    final String message = "File " + file + " returned by "
-                            + "resolver failed to satisfy extension due to: " + be.getMessage();
-                    getProject().log(message, Project.MSG_WARN);
+                    getProject().log("File " + file + " returned by "
+                        + "resolver failed to satisfy extension due to: "
+                        + be.getMessage(), Project.MSG_WARN);
                 }
             } catch (final BuildException be) {
-                final String message = "Failed to resolve extension to file " + "using resolver "
-                        + resolver + " due to: " + be;
-                getProject().log(message, Project.MSG_WARN);
+                getProject()
+                    .log(
+                        "Failed to resolve extension to file "
+                            + "using resolver " + resolver + " due to: " + be,
+                        Project.MSG_WARN);
             }
         }
         missingExtension();
@@ -210,10 +209,10 @@
      */
     private void checkExtension(final File file) {
         if (!file.exists()) {
-            throw new BuildException("File " + file + " does not exist");
+            throw new BuildException("File %s does not exist", file);
         }
         if (!file.isFile()) {
-            throw new BuildException("File " + file + " is not a file");
+            throw new BuildException("File %s is not a file", file);
         }
         if (!checkExtension) {
             getProject().log("Setting property to " + file
@@ -223,9 +222,7 @@
             getProject().log("Checking file " + file + " to see if it satisfies extension",
                     Project.MSG_VERBOSE);
             final Manifest manifest = ExtensionUtil.getManifest(file);
-            final Extension[] extensions = Extension.getAvailable(manifest);
-            for (int i = 0; i < extensions.length; i++) {
-                final Extension extension = extensions[ i ];
+            for (final Extension extension : Extension.getAvailable(manifest)) {
                 if (extension.isCompatibleWith(requiredExtension)) {
                     setLibraryProperty(file);
                     return;
@@ -256,13 +253,10 @@
      */
     private void validate() throws BuildException {
         if (null == propertyName) {
-            final String message = "Property attribute must be specified.";
-            throw new BuildException(message);
+            throw new BuildException("Property attribute must be specified.");
         }
-
         if (null == requiredExtension) {
-            final String message = "Extension element must be specified.";
-            throw new BuildException(message);
+            throw new BuildException("Extension element must be specified.");
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.java	2018-03-24 12:37:12.000000000 +0000
@@ -25,8 +25,7 @@
  * how they are to be handled when building manifests.
  *
  */
-public class LibFileSet
-    extends FileSet {
+public class LibFileSet extends FileSet {
     /**
      * Flag indicating whether should include the
      * "Implementation-URL" attribute in manifest.
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibraryDisplayer.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibraryDisplayer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibraryDisplayer.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/LibraryDisplayer.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,6 +20,8 @@
 import java.io.File;
 import java.text.ParseException;
 import java.util.jar.Manifest;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.BuildException;
 
@@ -72,32 +74,28 @@
         if (0 != available.length) {
             System.out.println("Extensions Supported By Library:");
             for (int i = 0; i < available.length; i++) {
-                final Extension extension = available[ i ];
-                System.out.println(extension.toString());
+                System.out.println(available[i]);
             }
         }
 
         if (0 != required.length) {
             System.out.println("Extensions Required By Library:");
             for (int i = 0; i < required.length; i++) {
-                final Extension extension = required[ i ];
-                System.out.println(extension.toString());
+                System.out.println(required[i]);
             }
         }
 
         if (0 != options.length) {
             System.out.println("Extensions that will be used by Library if present:");
             for (int i = 0; i < options.length; i++) {
-                final Extension extension = options[ i ];
-                System.out.println(extension.toString());
+                System.out.println(options[i]);
             }
         }
 
         if (0 != specifications.length) {
             System.out.println("Specifications Supported By Library:");
             for (int i = 0; i < specifications.length; i++) {
-                final Specification specification = specifications[ i ];
-                displaySpecification(specification);
+                displaySpecification(specifications[i]);
             }
         }
     }
@@ -138,12 +136,9 @@
     private void displaySpecification(final Specification specification) {
         final String[] sections = specification.getSections();
         if (null != sections) {
-            final StringBuffer sb = new StringBuffer("Sections: ");
-            for (int i = 0; i < sections.length; i++) {
-                sb.append(" ");
-                sb.append(sections[ i ]);
-            }
-            System.out.println(sb);
+            System.out.print("Sections:  ");
+            System.out
+                .println(Stream.of(sections).collect(Collectors.joining(" ")));
         }
         System.out.println(specification.toString());
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java	2018-03-24 12:37:12.000000000 +0000
@@ -66,6 +66,7 @@
      * @return the file resolved
      * @throws BuildException if the file cannot be resolved
      */
+    @Override
     public File resolve(final Extension extension,
                          final Project project) throws BuildException {
         validate();
@@ -111,6 +112,7 @@
      * Returns a string representation
      * @return the string representation
      */
+    @Override
     public String toString() {
         return "Ant[" + antfile + "==>" + destfile + "]";
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.java	2018-03-24 12:37:12.000000000 +0000
@@ -46,19 +46,19 @@
      * @return the file resolved
      * @throws BuildException if no location is set
      */
+    @Override
     public File resolve(final Extension extension,
                         final Project project) throws BuildException {
         if (null == location) {
-            final String message = "No location specified for resolver";
-            throw new BuildException(message);
+            throw new BuildException("No location specified for resolver");
         }
-
         return project.resolveFile(location);
     }
     /**
      * Returns a string representation of the Location
      * @return the string representation
      */
+    @Override
     public String toString() {
         return "Location[" + location + "]";
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java	2018-03-24 12:37:12.000000000 +0000
@@ -66,6 +66,7 @@
      * @return file the file resolved
      * @throws BuildException if the URL is invalid
      */
+    @Override
     public File resolve(final Extension extension,
                          final Project project) throws BuildException {
         validate();
@@ -110,16 +111,15 @@
      */
     private void validate() {
         if (null == url) {
-            final String message = "Must specify URL";
-            throw new BuildException(message);
+            throw new BuildException("Must specify URL");
         }
-
         if (null == destdir && null == destfile) {
-            final String message = "Must specify destination file or directory";
-            throw new BuildException(message);
-        } else if (null != destdir && null != destfile) {
-            final String message = "Must not specify both destination file or directory";
-            throw new BuildException(message);
+            throw new BuildException(
+                "Must specify destination file or directory");
+        }
+        if (null != destdir && null != destfile) {
+            throw new BuildException(
+                "Must not specify both destination file or directory");
         }
     }
 
@@ -127,6 +127,7 @@
      * Returns a string representation of the URL
      * @return the string representation
      */
+    @Override
     public String toString() {
         return "URL[" + url + "]";
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,11 +19,14 @@
 
 import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.util.DeweyDecimal;
 import org.apache.tools.ant.util.StringUtils;
@@ -167,25 +170,17 @@
     public static Specification[] getSpecifications(final Manifest manifest)
         throws ParseException {
         if (null == manifest) {
-            return new Specification[ 0 ];
+            return new Specification[0];
         }
+        final List<Specification> results = new ArrayList<>();
 
-        final ArrayList results = new ArrayList();
-
-        final Map entries = manifest.getEntries();
-        final Iterator keys = entries.keySet().iterator();
-        while (keys.hasNext()) {
-            final String key = (String) keys.next();
-            final Attributes attributes = (Attributes) entries.get(key);
-            final Specification specification
-                = getSpecification(key, attributes);
-            if (null != specification) {
-                results.add(specification);
-            }
+        for (Map.Entry<String, Attributes> e : manifest.getEntries()
+            .entrySet()) {
+            Optional.ofNullable(getSpecification(e.getKey(), e.getValue()))
+                .ifPresent(results::add);
         }
-
-        final ArrayList trimmedResults = removeDuplicates(results);
-        return (Specification[]) trimmedResults.toArray(new Specification[trimmedResults.size()]);
+        return removeDuplicates(results)
+            .toArray(new Specification[removeDuplicates(results).size()]);
     }
 
     /**
@@ -239,10 +234,10 @@
                 this.specificationVersion
                     = new DeweyDecimal(specificationVersion);
             } catch (final NumberFormatException nfe) {
-                final String error = "Bad specification version format '"
-                    + specificationVersion + "' in '" + specificationTitle
-                    + "'. (Reason: " + nfe + ")";
-                throw new IllegalArgumentException(error);
+                throw new IllegalArgumentException(
+                    "Bad specification version format '" + specificationVersion
+                        + "' in '" + specificationTitle + "'. (Reason: " + nfe
+                        + ")");
             }
         }
 
@@ -253,13 +248,7 @@
         if (null == this.specificationTitle) {
             throw new NullPointerException("specificationTitle");
         }
-
-        String[] copy = null;
-        if (null != sections) {
-            copy = new String[ sections.length ];
-            System.arraycopy(sections, 0, copy, 0, sections.length);
-        }
-        this.sections = copy;
+        this.sections = sections == null ? null : sections.clone();
     }
 
     /**
@@ -324,12 +313,7 @@
      *         or null if relevant to no sections.
      */
     public String[] getSections() {
-        if (null == sections) {
-            return null;
-        }
-        final String[] newSections = new String[ sections.length ];
-        System.arraycopy(sections, 0, newSections, 0, sections.length);
-        return newSections;
+        return sections == null ? null : sections.clone();
     }
 
     /**
@@ -390,7 +374,7 @@
      * @return true if the specification is compatible with this specification
      */
     public boolean isCompatibleWith(final Specification other) {
-        return (COMPATIBLE == getCompatibilityWith(other));
+        return COMPATIBLE == getCompatibilityWith(other);
     }
 
     /**
@@ -398,11 +382,12 @@
      *
      * @return string representation of object.
      */
+    @Override
     public String toString() {
         final String brace = ": ";
 
-        final StringBuffer sb
-            = new StringBuffer(SPECIFICATION_TITLE.toString());
+        final StringBuilder sb
+            = new StringBuilder(SPECIFICATION_TITLE.toString());
         sb.append(brace);
         sb.append(specificationTitle);
         sb.append(StringUtils.LINE_SEP);
@@ -441,7 +426,6 @@
             sb.append(implementationVendor);
             sb.append(StringUtils.LINE_SEP);
         }
-
         return sb.toString();
     }
 
@@ -467,30 +451,24 @@
      * @param list the array of results to trim
      * @return an array list with all duplicates removed
      */
-    private static ArrayList removeDuplicates(final ArrayList list) {
-        final ArrayList results = new ArrayList();
-        final ArrayList sections = new ArrayList();
-        while (list.size() > 0) {
-            final Specification specification = (Specification) list.remove(0);
-            final Iterator iterator = list.iterator();
-            while (iterator.hasNext()) {
-                final Specification other = (Specification) iterator.next();
+    private static List<Specification> removeDuplicates(final List<Specification> list) {
+        final List<Specification> results = new ArrayList<>();
+        final List<String> sections = new ArrayList<>();
+        while (!list.isEmpty()) {
+            final Specification specification = list.remove(0);
+            for (final Iterator<Specification> iterator =
+                list.iterator(); iterator.hasNext();) {
+                final Specification other = iterator.next();
                 if (isEqual(specification, other)) {
-                    final String[] otherSections = other.getSections();
-                    if (null != otherSections) {
-                        sections.addAll(Arrays.asList(otherSections));
-                    }
+                    Optional.ofNullable(other.getSections())
+                        .ifPresent(s -> Collections.addAll(sections, s));
                     iterator.remove();
                 }
             }
-
-            final Specification merged =
-                mergeInSections(specification, sections);
-            results.add(merged);
+            results.add(mergeInSections(specification, sections));
             //Reset list of sections
             sections.clear();
         }
-
         return results;
     }
 
@@ -522,22 +500,23 @@
      * @return the merged specification
      */
     private static Specification mergeInSections(final Specification specification,
-                                              final ArrayList sectionsToAdd) {
-        if (0 == sectionsToAdd.size()) {
+                                              final List<String> sectionsToAdd) {
+        if (sectionsToAdd.isEmpty()) {
             return specification;
         }
-        sectionsToAdd.addAll(Arrays.asList(specification.getSections()));
-
-        final String[] sections =
-            (String[]) sectionsToAdd.toArray(new String[sectionsToAdd.size()]);
+        Stream<String> sections =
+            Stream
+                .concat(
+                    Optional.ofNullable(specification.getSections())
+                        .map(Stream::of).orElse(Stream.empty()),
+                    sectionsToAdd.stream());
 
         return new Specification(specification.getSpecificationTitle(),
                 specification.getSpecificationVersion().toString(),
                 specification.getSpecificationVendor(),
                 specification.getImplementationTitle(),
                 specification.getImplementationVersion(),
-                specification.getImplementationVendor(),
-                sections);
+                specification.getImplementationVendor(), sections.toArray(String[]::new));
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,13 +20,15 @@
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.nio.file.Files;
 import java.util.Hashtable;
+import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Vector;
 
 import org.apache.tools.ant.BuildException;
@@ -137,12 +139,12 @@
     /**
      * Vector to hold source file sets.
      */
-    private Vector filesets = new Vector();
+    private List<FileSet> filesets = new Vector<>();
 
     /**
      * Holds key value pairs loaded from resource bundle file
      */
-    private Hashtable resourceMap = new Hashtable();
+    private Map<String, String> resourceMap = new Hashtable<>();
     /**
 
      * Used to resolve file names.
@@ -268,7 +270,7 @@
      * @param set the fileset to be added
      */
     public void addFileset(FileSet set) {
-        filesets.addElement(set);
+        filesets.add(set);
     }
 
     /**
@@ -280,6 +282,7 @@
      *       <li>endtoken</li>
      *            </ul>
      */
+    @Override
     public void execute() throws BuildException {
         if (bundle == null) {
             throw new BuildException("The bundle attribute must be set.",
@@ -318,7 +321,7 @@
         if (!toDir.exists()) {
             toDir.mkdirs();
         } else if (toDir.isFile()) {
-            throw new BuildException(toDir + " is not a directory");
+            throw new BuildException("%s is not a directory", toDir);
         }
 
         if (srcEncoding == null) {
@@ -361,23 +364,18 @@
         Locale locale = new Locale(bundleLanguage,
                                    bundleCountry,
                                    bundleVariant);
+
         String language = locale.getLanguage().length() > 0
             ? "_" + locale.getLanguage() : "";
         String country = locale.getCountry().length() > 0
             ? "_" + locale.getCountry() : "";
         String variant = locale.getVariant().length() > 0
             ? "_" + locale.getVariant() : "";
-        String bundleFile = bundle + language + country + variant;
-        processBundle(bundleFile, BUNDLE_SPECIFIED_LANGUAGE_COUNTRY_VARIANT, false);
-
-        bundleFile = bundle + language + country;
-        processBundle(bundleFile, BUNDLE_SPECIFIED_LANGUAGE_COUNTRY, false);
-
-        bundleFile = bundle + language;
-        processBundle(bundleFile, BUNDLE_SPECIFIED_LANGUAGE, false);
 
-        bundleFile = bundle;
-        processBundle(bundleFile, BUNDLE_NOMATCH, false);
+        processBundle(bundle + language + country + variant, BUNDLE_SPECIFIED_LANGUAGE_COUNTRY_VARIANT, false);
+        processBundle(bundle + language + country, BUNDLE_SPECIFIED_LANGUAGE_COUNTRY, false);
+        processBundle(bundle + language, BUNDLE_SPECIFIED_LANGUAGE, false);
+        processBundle(bundle, BUNDLE_NOMATCH, false);
 
         //Load default locale bundle files
         //using default file encoding scheme.
@@ -391,14 +389,9 @@
             ? "_" + locale.getVariant() : "";
         bundleEncoding = System.getProperty("file.encoding");
 
-        bundleFile = bundle + language + country + variant;
-        processBundle(bundleFile, BUNDLE_DEFAULT_LANGUAGE_COUNTRY_VARIANT, false);
-
-        bundleFile = bundle + language + country;
-        processBundle(bundleFile, BUNDLE_DEFAULT_LANGUAGE_COUNTRY, false);
-
-        bundleFile = bundle + language;
-        processBundle(bundleFile, BUNDLE_DEFAULT_LANGUAGE, true);
+        processBundle(bundle + language + country + variant, BUNDLE_DEFAULT_LANGUAGE_COUNTRY_VARIANT, false);
+        processBundle(bundle + language + country, BUNDLE_DEFAULT_LANGUAGE_COUNTRY, false);
+        processBundle(bundle + language, BUNDLE_DEFAULT_LANGUAGE, true);
     }
 
     /**
@@ -407,9 +400,9 @@
     private void processBundle(final String bundleFile, final int i,
                                final boolean checkLoaded) throws BuildException {
         final File propsFile = getProject().resolveFile(bundleFile + ".properties");
-        FileInputStream ins = null;
+        InputStream ins = null;
         try {
-            ins = new FileInputStream(propsFile);
+            ins = Files.newInputStream(propsFile.toPath());
             loaded = true;
             bundleLastModified[i] = propsFile.lastModified();
             log("Using " + propsFile, Project.MSG_DEBUG);
@@ -429,12 +422,10 @@
      * Load resourceMap with key value pairs.  Values of existing keys
      * are not overwritten.  Bundle's encoding scheme is used.
      */
-    private void loadResourceMap(FileInputStream ins) throws BuildException {
-        try {
-            BufferedReader in = null;
-            InputStreamReader isr = new InputStreamReader(ins, bundleEncoding);
-            in = new BufferedReader(isr);
-            String line = null;
+    private void loadResourceMap(InputStream ins) throws BuildException {
+        try (BufferedReader in =
+            new BufferedReader(new InputStreamReader(ins, bundleEncoding))) {
+            String line;
             while ((line = in.readLine()) != null) {
                 //So long as the line isn't empty and isn't a comment...
                 if (line.trim().length() > 1 && '#' != line.charAt(0) && '!' != line.charAt(0)) {
@@ -474,9 +465,6 @@
                     }
                 }
             }
-            if (in != null) {
-                in.close();
-            }
         } catch (IOException ioe) {
             throw new BuildException(ioe.getMessage(), getLocation());
         }
@@ -496,9 +484,7 @@
      */
     private void translate() throws BuildException {
         int filesProcessed = 0;
-        final int size = filesets.size();
-        for (int i = 0; i < size; i++) {
-            FileSet fs = (FileSet) filesets.elementAt(i);
+        for (FileSet fs : filesets) {
             DirectoryScanner ds = fs.getDirectoryScanner(getProject());
             String[] srcFiles = ds.getIncludedFiles();
             for (int j = 0; j < srcFiles.length; j++) {
@@ -548,18 +534,14 @@
     }
 
     private void translateOneFile(File src, File dest) throws IOException {
-        BufferedWriter out = null;
-        BufferedReader in = null;
-        try {
-            FileOutputStream fos = new FileOutputStream(dest);
-            out = new BufferedWriter(new OutputStreamWriter(fos, destEncoding));
-            FileInputStream fis = new FileInputStream(src);
-            in = new BufferedReader(new InputStreamReader(fis, srcEncoding));
-            String line;
+        try (BufferedWriter out = new BufferedWriter(new OutputStreamWriter(
+            Files.newOutputStream(dest.toPath()), destEncoding));
+                BufferedReader in = new BufferedReader(new InputStreamReader(
+                    Files.newInputStream(src.toPath()), srcEncoding))) {
             LineTokenizer lineTokenizer = new LineTokenizer();
             lineTokenizer.setIncludeDelims(true);
-            line = lineTokenizer.getToken(in);
-            while ((line) != null) {
+            String line = lineTokenizer.getToken(in);
+            while (line != null) {
                 // 2003-02-21 new replace algorithm by tbee (tbee@tbee.org)
                 // because it wasn't able to replace something like "@aaa;@bbb;"
 
@@ -601,7 +583,7 @@
                         } else {
                             // find the replace string
                             if (resourceMap.containsKey(token)) {
-                                replace = (String) resourceMap.get(token);
+                                replace = resourceMap.get(token);
                             } else {
                                 log("Replacement string missing for: " + token,
                                     Project.MSG_VERBOSE);
@@ -624,9 +606,6 @@
                 out.write(line);
                 line = lineTokenizer.getToken(in);
             }
-        } finally {
-            FileUtils.close(in);
-            FileUtils.close(out);
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/image/Image.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,8 +18,9 @@
 package org.apache.tools.ant.taskdefs.optional.image;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.Locale;
 import java.util.Vector;
 
@@ -27,7 +28,6 @@
 import javax.media.jai.PlanarImage;
 
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.MatchingTask;
 import org.apache.tools.ant.types.FileSet;
@@ -38,7 +38,6 @@
 import org.apache.tools.ant.types.optional.image.Scale;
 import org.apache.tools.ant.types.optional.image.TransformOperation;
 import org.apache.tools.ant.util.FileNameMapper;
-import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.IdentityMapper;
 import org.apache.tools.ant.util.StringUtils;
 
@@ -54,14 +53,17 @@
  * href="http://java.sun.com/products/java-media/jai/forDevelopers/jai1_0_1guide-unc/">
  * JAI Programming Guide</a>.
  *
+ * @deprecated JAI is not developed any more. Internal APIs that JAI depends on were
+ * scheduled for removal in Java 7 and finally removed in Java 9.
  * @see org.apache.tools.ant.types.optional.image.ImageOperation
  * @see org.apache.tools.ant.types.DataType
  */
+@Deprecated
 public class Image extends MatchingTask {
     // CheckStyle:VisibilityModifier OFF - bc
-    protected Vector instructions = new Vector();
+    protected Vector<ImageOperation> instructions = new Vector<>();
     protected boolean overwrite = false;
-    protected Vector filesets = new Vector();
+    protected Vector<FileSet> filesets = new Vector<>();
     protected File srcDir = null;
     protected File destDir = null;
 
@@ -84,7 +86,7 @@
      * @param set the FileSet to add.
      */
     public void addFileset(FileSet set) {
-        filesets.addElement(set);
+        filesets.add(set);
     }
 
     /**
@@ -234,9 +236,7 @@
                 continue;
             }
 
-            for (int j = 0; j < dstNames.length; ++j){
-
-                final String dstName = dstNames[j];
+            for (String dstName : dstNames) {
                 final File dstFile = new File(dstDir, dstName).getAbsoluteFile();
 
                 if (dstFile.exists()) {
@@ -275,6 +275,7 @@
      * @param file The file to be processed.
      * @deprecated this method isn't used anymore
      */
+    @Deprecated
     public void processFile(File file) {
         processFile(file, new File(destDir == null
                                    ? srcDir : destDir, file.getName()));
@@ -291,14 +292,10 @@
         try {
             log("Processing File: " + file.getAbsolutePath());
 
-            FileSeekableStream input = null;
             PlanarImage image = null;
-            try {
-                input = new FileSeekableStream(file);
+            try (FileSeekableStream input = new FileSeekableStream(file)) {
                 image = JAI.create("stream", input);
-                final int size = instructions.size();
-                for (int i = 0; i < size; i++) {
-                    Object instr = instructions.elementAt(i);
+                for (ImageOperation instr : instructions) {
                     if (instr instanceof TransformOperation) {
                         image = ((TransformOperation) instr)
                             .executeTransformOperation(image);
@@ -306,33 +303,25 @@
                         log("Not a TransformOperation: " + instr);
                     }
                 }
-            } finally {
-                FileUtils.close(input);
             }
 
             File dstParent = newFile.getParentFile();
             if (!dstParent.isDirectory()
                 && !(dstParent.mkdirs() || dstParent.isDirectory())) {
-                throw new BuildException("Failed to create parent directory "
-                                         + dstParent);
+                throw new BuildException("Failed to create parent directory %s",
+                    dstParent);
             }
 
             if (overwrite && newFile.exists() && !newFile.equals(file)) {
                 newFile.delete();
             }
 
-            FileOutputStream stream = null;
-            try {
-                stream = new FileOutputStream(newFile);
-
+            try (OutputStream stream = Files.newOutputStream(newFile.toPath())) {
                 JAI.create("encode", image, stream,
-                           str_encoding.toUpperCase(Locale.ENGLISH),
-                           null);
+                    str_encoding.toUpperCase(Locale.ENGLISH), null);
                 stream.flush();
-            } finally {
-                FileUtils.close(stream);
             }
-        } catch (IOException err) {
+        } catch (IOException | RuntimeException err) {
             if (!file.equals(newFile)) {
                 newFile.delete();
             }
@@ -341,15 +330,6 @@
             } else {
                 throw new BuildException(err);
             }
-        } catch (java.lang.RuntimeException rerr) {
-            if (!file.equals(newFile)){
-                newFile.delete();
-            }
-            if (!failonerror) {
-                log("Error processing file:  " + rerr);
-            } else {
-                throw new BuildException(rerr);
-            }
         }
     }
 
@@ -357,6 +337,7 @@
      * Executes the Task.
      * @throws BuildException on error.
      */
+    @Override
     public void execute() throws BuildException {
 
         validateAttributes();
@@ -367,29 +348,20 @@
             int writeCount = 0;
 
             // build mapper
-            final FileNameMapper mapper;
-            if (mapperElement==null){
-                mapper = new IdentityMapper();
-            } else {
-                mapper = mapperElement.getImplementation();
-            }
+            final FileNameMapper mapper = mapperElement == null
+                ? new IdentityMapper() : mapperElement.getImplementation();
 
             // deal with specified srcDir
             if (srcDir != null) {
-                final DirectoryScanner ds = super.getDirectoryScanner(srcDir);
-
-                final String[] files = ds.getIncludedFiles();
-                writeCount += processDir(srcDir, files, dest, mapper);
+                writeCount += processDir(srcDir,
+                    super.getDirectoryScanner(srcDir).getIncludedFiles(), dest,
+                    mapper);
             }
             // deal with the filesets
-            final int size = filesets.size();
-            for (int i = 0; i < size; i++) {
-                final FileSet fs = (FileSet) filesets.elementAt(i);
-                final DirectoryScanner ds =
-                    fs.getDirectoryScanner(getProject());
-                final String[] files = ds.getIncludedFiles();
-                final File fromDir = fs.getDir(getProject());
-                writeCount += processDir(fromDir, files, dest, mapper);
+            for (FileSet fs : filesets) {
+                writeCount += processDir(fs.getDir(getProject()),
+                    fs.getDirectoryScanner(getProject()).getIncludedFiles(),
+                    dest, mapper);
             }
 
             if (writeCount > 0) {
@@ -409,16 +381,16 @@
      * @throws BuildException on error.
      */
     protected void validateAttributes() throws BuildException {
-        if (srcDir == null && filesets.size() == 0) {
-            throw new BuildException("Specify at least one source"
-                                     + "--a srcDir or a fileset.");
+        if (srcDir == null && filesets.isEmpty()) {
+            throw new BuildException(
+                "Specify at least one source--a srcDir or a fileset.");
         }
         if (srcDir == null && destDir == null) {
             throw new BuildException("Specify the destDir, or the srcDir.");
         }
-        if (str_encoding.equalsIgnoreCase("jpg")) {
+        if ("jpg".equalsIgnoreCase(str_encoding)) {
             str_encoding = "JPEG";
-        } else if (str_encoding.equalsIgnoreCase("tif")) {
+        } else if ("tif".equalsIgnoreCase(str_encoding)) {
             str_encoding = "TIFF";
         }
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeploymentTool.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeploymentTool.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeploymentTool.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeploymentTool.java	2018-03-24 12:37:12.000000000 +0000
@@ -87,13 +87,14 @@
      *  base class.  Subclasses should check attributes accordingly.
      *  @exception org.apache.tools.ant.BuildException if the attributes are invalid or incomplete.
      */
+    @Override
     public void validateAttributes() throws BuildException {
         if (task.getAction() == null) {
             throw new BuildException("The \"action\" attribute must be set");
         }
 
         if (!isActionValid()) {
-            throw new BuildException("Invalid action \"" + task.getAction() + "\" passed");
+            throw new BuildException("Invalid action \"%s\" passed", task.getAction());
         }
 
         if (classpath == null) {
@@ -102,17 +103,11 @@
     }
 
     /**
-     *  Perform the actual deployment.
-     *  It's up to the subclasses to implement the actual behavior.
-     *  @exception org.apache.tools.ant.BuildException if the attributes are invalid or incomplete.
-     */
-    public abstract void deploy() throws BuildException;
-
-    /**
      *  Sets the parent task.
      *  @param task a ServerDeploy object representing the parent task.
      *  @ant.attribute ignore="true"
      */
+    @Override
     public void setTask(ServerDeploy task) {
         this.task = task;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.java	2018-03-24 12:37:12.000000000 +0000
@@ -70,8 +70,9 @@
      *  For this generic implementation, the only valid action is "deploy"
      *  @return true if the "action" attribute is valid, false if not.
      */
+    @Override
     protected boolean isActionValid() {
-        return (getTask().getAction().equals(VALID_ACTIONS[0]));
+        return getTask().getAction().equals(VALID_ACTIONS[0]);
     }
 
     /**
@@ -79,6 +80,7 @@
      *  @param task An ServerDeploy object representing the parent task.
      *  @ant.attribute ignored="true"
      */
+    @Override
     public void setTask(ServerDeploy task) {
         super.setTask(task);
         java = new Java(task);
@@ -90,6 +92,7 @@
      *  supplied classpath, classname, JVM args, and command line arguments.
      *  @exception org.apache.tools.ant.BuildException if the attributes are invalid or incomplete.
      */
+    @Override
     public void deploy() throws BuildException {
         java.setClassname(className);
         java.setClasspath(getClasspath());
@@ -103,6 +106,7 @@
      *  Ensures the className and arguments attribute have been set.
      *  @exception org.apache.tools.ant.BuildException if the attributes are invalid or incomplete.
      */
+    @Override
     public void validateAttributes() throws BuildException {
         super.validateAttributes();
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.java	2018-03-24 12:37:12.000000000 +0000
@@ -76,7 +76,6 @@
      */
     private int davidPort;
 
-
     /**
      *  Set the host for the David ORB; required if
      *  ORB==david.
@@ -87,7 +86,6 @@
         davidHost = inValue;
     }
 
-
     /**
      *  Set the port for the David ORB; required if
      *  ORB==david.
@@ -98,7 +96,6 @@
         davidPort = inValue;
     }
 
-
     /**
      *  set the jonas root directory (-Dinstall.root=). This
      *  element is required.
@@ -109,7 +106,6 @@
         jonasroot = inValue;
     }
 
-
     /**
      *
      * Choose your ORB : RMI, JEREMIE, DAVID, ...; optional.
@@ -124,14 +120,13 @@
         orb = inValue;
     }
 
-
     /**
      *  gets the classpath field.
      *
      *@return    A Path representing the "classpath" attribute.
      */
+    @Override
     public Path getClasspath() {
-
         Path aClassPath = super.getClasspath();
 
         if (aClassPath == null) {
@@ -147,7 +142,6 @@
         return aClassPath;
     }
 
-
     /**
      * Validates the passed in attributes.
      *
@@ -161,6 +155,7 @@
      *
      * @exception BuildException if something goes wrong
      */
+    @Override
     public void validateAttributes() throws BuildException {
         // super.validateAttributes(); // don't want to call this method
 
@@ -172,7 +167,7 @@
         }
 
         if (!isActionValid()) {
-            throw new BuildException("Invalid action \"" + action + "\" passed");
+            throw new BuildException("Invalid action \"%s\" passed", action);
         }
 
         if (getClassName() == null) {
@@ -213,9 +208,9 @@
             java.createArg().setLine("-n " + getServer());
         }
 
-        if (action.equals(ACTION_DEPLOY)
-            || action.equals(ACTION_UPDATE)
-            || action.equals("redeploy")) {
+        if (ACTION_DEPLOY.equals(action)
+            || ACTION_UPDATE.equals(action)
+            || "redeploy".equals(action)) {
             java.createArg().setLine("-a " + getTask().getSource());
         } else if (action.equals(ACTION_DELETE) || action.equals(ACTION_UNDEPLOY)) {
             java.createArg().setLine("-r " + getTask().getSource());
@@ -224,7 +219,6 @@
         }
     }
 
-
     /**
      *  Determines if the action supplied is valid. <p>
      *
@@ -234,19 +228,17 @@
      *@return    true if the action attribute is valid, false if
      *      not.
      */
+    @Override
     protected boolean isActionValid() {
-        boolean valid = false;
-
         String action = getTask().getAction();
 
-        for (int i = 0; i < VALID_ACTIONS.length; i++) {
-            if (action.equals(VALID_ACTIONS[i])) {
-                valid = true;
-                break;
+        for (String validAction : VALID_ACTIONS) {
+            if (action.equals(validAction)) {
+                return true;
             }
         }
-
-        return valid;
+        // TODO what about redeploy, mentioned in #validateAttribute
+        return false;
     }
 }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,7 @@
 package org.apache.tools.ant.taskdefs.optional.j2ee;
 
 import java.io.File;
-import java.util.Enumeration;
+import java.util.List;
 import java.util.Vector;
 
 import org.apache.tools.ant.BuildException;
@@ -44,7 +44,7 @@
     private File source;
 
     /** The vendor specific tool for deploying the component **/
-    private Vector vendorTools = new Vector();
+    private List<AbstractHotDeploymentTool> vendorTools = new Vector<>();
 
     ///////////////////////////////////////////////////////////////////////////
     //
@@ -60,7 +60,7 @@
      */
     public void addGeneric(GenericHotDeploymentTool tool) {
         tool.setTask(this);
-        vendorTools.addElement(tool);
+        vendorTools.add(tool);
     }
 
     /**
@@ -71,7 +71,7 @@
      */
     public void addWeblogic(WebLogicHotDeploymentTool tool) {
         tool.setTask(this);
-        vendorTools.addElement(tool);
+        vendorTools.add(tool);
     }
 
     /**
@@ -82,7 +82,7 @@
      */
     public void addJonas(JonasHotDeploymentTool tool) {
         tool.setTask(this);
-        vendorTools.addElement(tool);
+        vendorTools.add(tool);
     }
 
 
@@ -100,10 +100,9 @@
      *  @exception org.apache.tools.ant.BuildException if the attributes
      *  are invalid or incomplete, or a failure occurs in the deployment process.
      */
+    @Override
     public void execute() throws BuildException {
-        for (Enumeration e = vendorTools.elements();
-             e.hasMoreElements();) {
-            HotDeploymentTool tool = (HotDeploymentTool) e.nextElement();
+        for (HotDeploymentTool tool : vendorTools) {
             tool.validateAttributes();
             tool.deploy();
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/WebLogicHotDeploymentTool.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/WebLogicHotDeploymentTool.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/WebLogicHotDeploymentTool.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/WebLogicHotDeploymentTool.java	2018-03-24 12:37:12.000000000 +0000
@@ -59,6 +59,7 @@
      *  tools is executed.
      *  @exception BuildException if the attributes are invalid or incomplete.
      */
+    @Override
     public void deploy() {
         Java java = new Java(getTask());
         java.setFork(true);
@@ -80,6 +81,7 @@
      *
      *  @exception BuildException if the attributes are invalid or incomplete
      */
+    @Override
     public void validateAttributes() throws BuildException {
         super.validateAttributes();
 
@@ -93,22 +95,22 @@
         // check for missing application on deploy & update
         if ((action.equals(ACTION_DEPLOY) || action.equals(ACTION_UPDATE))
             && application == null) {
-            throw new BuildException("The application attribute must be set "
-                + "if action = " + action);
+            throw new BuildException(
+                "The application attribute must be set if action = %s", action);
         }
 
         // check for missing source on deploy & update
         if ((action.equals(ACTION_DEPLOY) || action.equals(ACTION_UPDATE))
             && getTask().getSource() == null) {
-            throw new BuildException("The source attribute must be set if "
-                + "action = " + action);
+            throw new BuildException(
+                "The source attribute must be set if action = %s", action);
         }
 
         // check for missing application on delete & undeploy
         if ((action.equals(ACTION_DELETE) || action.equals(ACTION_UNDEPLOY))
             && application == null) {
-            throw new BuildException("The application attribute must be set if "
-                + "action = " + action);
+            throw new BuildException(
+                "The application attribute must be set if action = %s", action);
         }
     }
 
@@ -120,17 +122,17 @@
      */
     public String getArguments() throws BuildException {
         String action = getTask().getAction();
-        String args = null;
 
         if (action.equals(ACTION_DEPLOY) || action.equals(ACTION_UPDATE)) {
-            args = buildDeployArgs();
-        } else if (action.equals(ACTION_DELETE) || action.equals(ACTION_UNDEPLOY)) {
-            args = buildUndeployArgs();
-        } else if (action.equals(ACTION_LIST)) {
-            args = buildListArgs();
+            return buildDeployArgs();
         }
-
-        return args;
+        if (action.equals(ACTION_DELETE) || action.equals(ACTION_UNDEPLOY)) {
+            return buildUndeployArgs();
+        }
+        if (action.equals(ACTION_LIST)) {
+            return buildListArgs();
+        }
+        return null;
     }
 
     /**
@@ -138,19 +140,16 @@
      * <p>Valid actions are contained in the static array VALID_ACTIONS</p>
      * @return true if the action attribute is valid, false if not.
      */
+    @Override
     protected boolean isActionValid() {
-        boolean valid = false;
-
         String action = getTask().getAction();
 
-        for (int i = 0; i < VALID_ACTIONS.length; i++) {
-            if (action.equals(VALID_ACTIONS[i])) {
-                valid = true;
-                break;
+        for (String validAction : VALID_ACTIONS) {
+            if (action.equals(validAction)) {
+                return true;
             }
         }
-
-        return valid;
+        return false;
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,8 +20,8 @@
 
 import java.io.File;
 import java.io.InputStream;
-import java.util.Enumeration;
 import java.util.Hashtable;
+import java.util.Map;
 
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
@@ -64,7 +64,7 @@
     private static final String KEEP_LINE_COLUMN       = "KEEP_LINE_COLUMN";
     private static final String JDK_VERSION            = "JDK_VERSION";
 
-    private final Hashtable optionalAttrs = new Hashtable();
+    private final Map<String, Object> optionalAttrs = new Hashtable<>();
 
     // required attributes
     private File outputDirectory = null;
@@ -79,19 +79,19 @@
 
     protected static final String[] ARCHIVE_LOCATIONS = //NOSONAR
         new String[] {
-        "JavaCC.zip",
-        "bin/lib/JavaCC.zip",
-        "bin/lib/javacc.jar",
-        "javacc.jar", // used by jpackage for JavaCC 3.x
-    };
+            "JavaCC.zip",
+            "bin/lib/JavaCC.zip",
+            "bin/lib/javacc.jar",
+            "javacc.jar", // used by jpackage for JavaCC 3.x
+        };
 
     protected static final int[] ARCHIVE_LOCATIONS_VS_MAJOR_VERSION = //NOSONAR
         new int[] {
-        1,
-        2,
-        3,
-        3,
-    };
+            1,
+            2,
+            3,
+            3,
+        };
 
     protected static final String COM_PACKAGE = "COM.sun.labs.";
     protected static final String COM_JAVACC_CLASS = "javacc.Main";
@@ -331,19 +331,16 @@
      * Run the task.
      * @throws BuildException on error.
      */
+    @Override
     public void execute() throws BuildException {
 
         // load command line with optional attributes
-        Enumeration iter = optionalAttrs.keys();
-        while (iter.hasMoreElements()) {
-            String name  = (String) iter.nextElement();
-            Object value = optionalAttrs.get(name);
-            cmdl.createArgument().setValue("-" + name + ":" + value.toString());
-        }
+        optionalAttrs.forEach((name, value) -> cmdl.createArgument()
+            .setValue("-" + name + ":" + value));
 
         // check the target is a file
         if (targetFile == null || !targetFile.isFile()) {
-            throw new BuildException("Invalid target: " + targetFile);
+            throw new BuildException("Invalid target: %s", targetFile);
         }
 
         // use the directory containing the target as the output directory
@@ -425,12 +422,11 @@
         String packagePrefix = null;
         String mainClass = null;
 
-        AntClassLoader l = null;
-        try {
-            l = AntClassLoader.newAntClassLoader(null, null,
-                                                 path
-                                                 .concatSystemClasspath("ignore"),
-                                                 true);
+        try (AntClassLoader l =
+             AntClassLoader.newAntClassLoader(null, null,
+                                              path
+                                              .concatSystemClasspath("ignore"),
+                                              true)) {
             String javaccClass = COM_PACKAGE + COM_JAVACC_CLASS;
             InputStream is = l.getResourceAsStream(javaccClass.replace('.', '/')
                                                    + ".class");
@@ -498,10 +494,6 @@
                 throw new BuildException("unknown task type " + type);
             }
             return packagePrefix + mainClass;
-        } finally {
-            if (l != null) {
-                l.cleanup();
-            }
         }
     }
 
@@ -528,8 +520,9 @@
             }
         }
 
-        throw new BuildException("Could not find a path to JavaCC.zip "
-                                 + "or javacc.jar from '" + home + "'.");
+        throw new BuildException(
+            "Could not find a path to JavaCC.zip or javacc.jar from '%s'.",
+            home);
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,8 +20,8 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Enumeration;
 import java.util.Hashtable;
+import java.util.Map;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -44,7 +44,7 @@
     private static final String TEXT              = "TEXT";
     private static final String ONE_TABLE         = "ONE_TABLE";
 
-    private final Hashtable optionalAttrs = new Hashtable();
+    private final Map<String, Object> optionalAttrs = new Hashtable<>();
 
     private String outputFile = null;
     private boolean plainText = false;
@@ -65,7 +65,7 @@
      * @param plainText a <code>boolean</code> value.
      */
     public void setText(boolean plainText) {
-        optionalAttrs.put(TEXT, plainText ? Boolean.TRUE : Boolean.FALSE);
+        optionalAttrs.put(TEXT, Boolean.valueOf(plainText));
         this.plainText = plainText;
     }
 
@@ -74,7 +74,7 @@
      * @param oneTable a <code>boolean</code> value.
      */
     public void setOnetable(boolean oneTable) {
-        optionalAttrs.put(ONE_TABLE, oneTable ? Boolean.TRUE : Boolean.FALSE);
+        optionalAttrs.put(ONE_TABLE, Boolean.valueOf(oneTable));
     }
 
     /**
@@ -124,19 +124,15 @@
      * Do the task.
      * @throws BuildException if there is an error.
      */
+    @Override
     public void execute() throws BuildException {
 
         // load command line with optional attributes
-        Enumeration iter = optionalAttrs.keys();
-        while (iter.hasMoreElements()) {
-            String name  = (String) iter.nextElement();
-            Object value = optionalAttrs.get(name);
-            cmdl.createArgument()
-                .setValue("-" + name + ":" + value.toString());
-        }
+        optionalAttrs.forEach((name, value) -> cmdl.createArgument()
+            .setValue("-" + name + ":" + value.toString()));
 
         if (targetFile == null || !targetFile.isFile()) {
-            throw new BuildException("Invalid target: " + targetFile);
+            throw new BuildException("Invalid target: %s", targetFile);
         }
 
         if (outputFile != null) {
@@ -195,8 +191,8 @@
             suffix = DEFAULT_SUFFIX_TEXT;
         }
 
-        if ((optionalOutputFile == null) || optionalOutputFile.equals("")) {
-            int filePos = javaccFile.lastIndexOf("/");
+        if ((optionalOutputFile == null) || optionalOutputFile.isEmpty()) {
+            int filePos = javaccFile.lastIndexOf('/');
 
             if (filePos >= 0) {
                 javaccFile = javaccFile.substring(filePos + 1);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,8 +20,8 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Enumeration;
 import java.util.Hashtable;
+import java.util.Map;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -54,7 +54,7 @@
     private static final String VISITOR_EXCEPTION = "VISITOR_EXCEPTION";
     private static final String NODE_PREFIX       = "NODE_PREFIX";
 
-    private final Hashtable optionalAttrs = new Hashtable();
+    private final Map<String, Object> optionalAttrs = new Hashtable<>();
 
     private String outputFile = null;
 
@@ -74,7 +74,7 @@
      * @param buildNodeFiles a <code>boolean</code> value.
      */
     public void setBuildnodefiles(boolean buildNodeFiles) {
-        optionalAttrs.put(BUILD_NODE_FILES, buildNodeFiles ? Boolean.TRUE : Boolean.FALSE);
+        optionalAttrs.put(BUILD_NODE_FILES, Boolean.valueOf(buildNodeFiles));
     }
 
     /**
@@ -82,7 +82,7 @@
      * @param multi a <code>boolean</code> value.
      */
     public void setMulti(boolean multi) {
-        optionalAttrs.put(MULTI, multi ? Boolean.TRUE : Boolean.FALSE);
+        optionalAttrs.put(MULTI, Boolean.valueOf(multi));
     }
 
     /**
@@ -90,7 +90,7 @@
      * @param nodeDefaultVoid a <code>boolean</code> value.
      */
     public void setNodedefaultvoid(boolean nodeDefaultVoid) {
-        optionalAttrs.put(NODE_DEFAULT_VOID, nodeDefaultVoid ? Boolean.TRUE : Boolean.FALSE);
+        optionalAttrs.put(NODE_DEFAULT_VOID, Boolean.valueOf(nodeDefaultVoid));
     }
 
     /**
@@ -98,7 +98,7 @@
      * @param nodeFactory a <code>boolean</code> value.
      */
     public void setNodefactory(boolean nodeFactory) {
-        optionalAttrs.put(NODE_FACTORY, nodeFactory ? Boolean.TRUE : Boolean.FALSE);
+        optionalAttrs.put(NODE_FACTORY, Boolean.valueOf(nodeFactory));
     }
 
     /**
@@ -106,7 +106,7 @@
      * @param nodeScopeHook a <code>boolean</code> value.
      */
     public void setNodescopehook(boolean nodeScopeHook) {
-        optionalAttrs.put(NODE_SCOPE_HOOK, nodeScopeHook ? Boolean.TRUE : Boolean.FALSE);
+        optionalAttrs.put(NODE_SCOPE_HOOK, Boolean.valueOf(nodeScopeHook));
     }
 
     /**
@@ -114,7 +114,7 @@
      * @param nodeUsesParser a <code>boolean</code> value.
      */
     public void setNodeusesparser(boolean nodeUsesParser) {
-        optionalAttrs.put(NODE_USES_PARSER, nodeUsesParser ? Boolean.TRUE : Boolean.FALSE);
+        optionalAttrs.put(NODE_USES_PARSER, Boolean.valueOf(nodeUsesParser));
     }
 
     /**
@@ -122,7 +122,7 @@
      * @param staticParser a <code>boolean</code> value.
      */
     public void setStatic(boolean staticParser) {
-        optionalAttrs.put(STATIC, staticParser ? Boolean.TRUE : Boolean.FALSE);
+        optionalAttrs.put(STATIC, Boolean.valueOf(staticParser));
     }
 
     /**
@@ -130,7 +130,7 @@
      * @param visitor a <code>boolean</code> value.
      */
     public void setVisitor(boolean visitor) {
-        optionalAttrs.put(VISITOR, visitor ? Boolean.TRUE : Boolean.FALSE);
+        optionalAttrs.put(VISITOR, Boolean.valueOf(visitor));
     }
 
     /**
@@ -214,21 +214,18 @@
      * Run the task.
      * @throws BuildException on error.
      */
+    @Override
     public void execute() throws BuildException {
 
         // load command line with optional attributes
-        Enumeration iter = optionalAttrs.keys();
-        while (iter.hasMoreElements()) {
-            String name  = (String) iter.nextElement();
-            Object value = optionalAttrs.get(name);
-            cmdl.createArgument().setValue("-" + name + ":" + value.toString());
-        }
+        optionalAttrs.forEach((name, value) -> cmdl.createArgument()
+            .setValue("-" + name + ":" + value.toString()));
 
         if (targetFile == null || !targetFile.isFile()) {
-            throw new BuildException("Invalid target: " + targetFile);
+            throw new BuildException("Invalid target: %s", targetFile);
         }
 
-        File javaFile = null;
+        File javaFile;
 
         // use the directory containing the target as the output directory
         if (outputDirectory == null) {
@@ -305,8 +302,8 @@
                                                 outputDir);
         String jjtreeFile = destFile.getAbsolutePath().replace('\\', '/');
 
-        if ((optionalOutputFile == null) || optionalOutputFile.equals("")) {
-            int filePos = jjtreeFile.lastIndexOf("/");
+        if ((optionalOutputFile == null) || optionalOutputFile.isEmpty()) {
+            int filePos = jjtreeFile.lastIndexOf('/');
 
             if (filePos >= 0) {
                 jjtreeFile = jjtreeFile.substring(filePos + 1);
@@ -328,7 +325,7 @@
             }
         }
 
-        if ((outputDir == null) || outputDir.equals("")) {
+        if ((outputDir == null) || outputDir.isEmpty()) {
             outputDir = getDefaultOutputDirectory();
         }
 
@@ -363,17 +360,17 @@
 
         String root = getRoot(new File(destFile)).getAbsolutePath();
 
-        if ((root.length() > 1)
+        if (root.length() > 1
             && destFile.startsWith(root.substring(0, root.length() - 1))) {
-            throw new BuildException("Drive letter in 'outputfile' not "
-                                     + "supported: " + destFile);
+            throw new BuildException(
+                "Drive letter in 'outputfile' not supported: %s", destFile);
         }
 
         return destFile;
     }
 
     private String makeOutputFileRelative(String destFile) {
-        StringBuffer relativePath = new StringBuffer();
+        StringBuilder relativePath = new StringBuilder();
         String defaultOutputDirectory = getDefaultOutputDirectory();
         int nextPos = defaultOutputDirectory.indexOf('/');
         int startPos = nextPos + 1;
@@ -388,10 +385,7 @@
                 startPos = nextPos + 1;
             }
         }
-
-        relativePath.append(destFile);
-
-        return relativePath.toString();
+        return relativePath.append(destFile).toString();
     }
 
     private String getDefaultOutputDirectory() {
@@ -410,7 +404,6 @@
         while (root.getParent() != null) {
             root = root.getParentFile();
         }
-
         return root;
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/javah/ForkingJavah.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/javah/ForkingJavah.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/javah/ForkingJavah.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/javah/ForkingJavah.java	2018-03-24 12:37:12.000000000 +0000
@@ -45,6 +45,7 @@
      * @return true if the compilation was successful.
      * @throws BuildException if there is an error.
      */
+    @Override
     public boolean compile(Javah javah) throws BuildException {
         Commandline cmd = SunJavah.setupJavahCommand(javah);
         Project project = javah.getProject();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java	2018-03-24 12:37:12.000000000 +0000
@@ -42,12 +42,11 @@
     public static String getDefault() {
         if (JavaEnvUtils.isKaffe()) {
             return Kaffeh.IMPLEMENTATION_NAME;
-        } else if (JavaEnvUtils.isGij()) {
+        }
+        if (JavaEnvUtils.isGij()) {
             return Gcjh.IMPLEMENTATION_NAME;
-        } else if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)) {
-            return ForkingJavah.IMPLEMENTATION_NAME;
         }
-        return SunJavah.IMPLEMENTATION_NAME;
+        return ForkingJavah.IMPLEMENTATION_NAME;
     }
 
     /**
@@ -86,29 +85,29 @@
         if ((JavaEnvUtils.isKaffe() && choice == null)
             || Kaffeh.IMPLEMENTATION_NAME.equals(choice)) {
             return new Kaffeh();
-        } else if ((JavaEnvUtils.isGij() && choice == null)
+        }
+        if ((JavaEnvUtils.isGij() && choice == null)
             || Gcjh.IMPLEMENTATION_NAME.equals(choice)) {
             return new Gcjh();
-        } else if (JavaEnvUtils.isAtLeastJavaVersion("10") &&
-                   (choice == null || ForkingJavah.IMPLEMENTATION_NAME.equals(choice))) {
+        }
+        if (JavaEnvUtils.isAtLeastJavaVersion("10") &&
+            (choice == null || ForkingJavah.IMPLEMENTATION_NAME.equals(choice))) {
             throw new BuildException("javah does not exist under Java 10 and higher,"
                 + " use the javac task with nativeHeaderDir instead");
-        } else if ((JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)
-                    && choice == null)
-                   || ForkingJavah.IMPLEMENTATION_NAME.equals(choice)) {
+        }
+        if (ForkingJavah.IMPLEMENTATION_NAME.equals(choice)) {
             return new ForkingJavah();
-        } else if (SunJavah.IMPLEMENTATION_NAME.equals(choice)) {
+        }
+        if (SunJavah.IMPLEMENTATION_NAME.equals(choice)) {
             return new SunJavah();
-        } else if (choice != null) {
+        }
+        if (choice != null) {
             return resolveClassName(choice,
                                     // Memory leak in line below
                                     log.getProject()
                                     .createClassLoader(classpath));
         }
-
-        // This default has been good enough until Ant 1.6.3, so stick
-        // with it
-        return new SunJavah();
+        return new ForkingJavah();
     }
 
     /**
@@ -123,7 +122,7 @@
     private static JavahAdapter resolveClassName(String className,
                                                  ClassLoader loader)
             throws BuildException {
-        return (JavahAdapter) ClasspathUtils.newInstance(className,
+        return ClasspathUtils.newInstance(className,
                 loader != null ? loader :
                 JavahAdapterFactory.class.getClassLoader(), JavahAdapter.class);
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/javah/SunJavah.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/javah/SunJavah.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/javah/SunJavah.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/javah/SunJavah.java	2018-03-24 12:37:12.000000000 +0000
@@ -44,10 +44,11 @@
      * @throws BuildException if there is an error.
      * @since Ant 1.6.3
      */
+    @Override
     public boolean compile(Javah javah) throws BuildException {
         Commandline cmd = setupJavahCommand(javah);
         ExecuteJava ej = new ExecuteJava();
-        Class c = null;
+        Class<?> c;
         try {
             try {
                 // first search for the "old" javah class in 1.4.2 tools.jar
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java	2018-03-24 12:37:13.000000000 +0000
@@ -19,10 +19,11 @@
 package org.apache.tools.ant.taskdefs.optional;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.StringTokenizer;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
 import java.util.Vector;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -70,7 +71,7 @@
 
 public class Javah extends Task {
 
-    private Vector classes = new Vector(2);
+    private List<ClassArgument> classes = new Vector<>(2);
     private String cls;
     private File destDir;
     private Path classpath = null;
@@ -80,9 +81,8 @@
     private boolean old     = false;
     private boolean stubs   = false;
     private Path bootclasspath;
-    //private Path extdirs;
     private FacadeTaskHelper facade = null;
-    private Vector files = new Vector();
+    private Vector<FileSet> files = new Vector<>();
     private JavahAdapter nestedAdapter = null;
 
     /**
@@ -106,7 +106,7 @@
      */
     public ClassArgument createClass() {
         ClassArgument ga = new ClassArgument();
-        classes.addElement(ga);
+        classes.add(ga);
         return ga;
     }
 
@@ -117,10 +117,6 @@
     public class ClassArgument {
         private String name;
 
-        /** Constructor for ClassArgument. */
-        public ClassArgument() {
-        }
-
         /**
          * Set the name attribute.
          * @param name the name attribute.
@@ -152,33 +148,21 @@
      * @since Ant 1.6.3
      */
     public String[] getClasses() {
-        ArrayList al = new ArrayList();
+        Stream<String> stream = Stream.concat(
+            files.stream()
+                .map(fs -> fs.getDirectoryScanner(getProject())
+                    .getIncludedFiles())
+                .flatMap(Stream::of)
+                .map(s -> s.replace('\\', '.').replace('/', '.')
+                    .replaceFirst("\\.class$", "")),
+            classes.stream().map(ClassArgument::getName));
+
         if (cls != null) {
-            StringTokenizer tok = new StringTokenizer(cls, ",", false);
-            while (tok.hasMoreTokens()) {
-                al.add(tok.nextToken().trim());
-            }
+            stream = Stream.concat(Stream.of(cls.split(",")).map(String::trim),
+                stream);
         }
 
-        if (files.size() > 0) {
-            for (Enumeration e = files.elements(); e.hasMoreElements();) {
-                FileSet fs = (FileSet) e.nextElement();
-                String[] includedClasses = fs.getDirectoryScanner(
-                    getProject()).getIncludedFiles();
-                for (int i = 0; i < includedClasses.length; i++) {
-                    String className =
-                        includedClasses[i].replace('\\', '.').replace('/', '.')
-                        .substring(0, includedClasses[i].length() - 6);
-                    al.add(className);
-                }
-            }
-        }
-        Enumeration e = classes.elements();
-        while (e.hasMoreElements()) {
-            ClassArgument arg = (ClassArgument) e.nextElement();
-            al.add(arg.getName());
-        }
-        return (String[]) al.toArray(new String[al.size()]);
+        return stream.toArray(String[]::new);
     }
 
     /**
@@ -426,8 +410,7 @@
      */
     public void add(JavahAdapter adapter) {
         if (nestedAdapter != null) {
-            throw new BuildException("Can't have more than one javah"
-                                     + " adapter");
+            throw new BuildException("Can't have more than one javah adapter");
         }
         nestedAdapter = adapter;
     }
@@ -437,17 +420,22 @@
      *
      * @throws BuildException is there is a problem in the task execution.
      */
+    @Override
     public void execute() throws BuildException {
         // first off, make sure that we've got a srcdir
+        final Set<Settings> settings = EnumSet.noneOf(Settings.class);
 
-        if ((cls == null) && (classes.size() == 0) && (files.size() == 0)) {
-            throw new BuildException("class attribute must be set!",
-                getLocation());
+        if (cls != null) {
+            settings.add(Settings.cls);
         }
-
-        if ((cls != null) && (classes.size() > 0) && (files.size() > 0)) {
-            throw new BuildException("set class attribute OR class element OR fileset, "
-                + "not 2 or more of them.", getLocation());
+        if (!classes.isEmpty()) {
+            settings.add(Settings.classes);
+        }
+        if (!files.isEmpty()) {
+            settings.add(Settings.files);
+        }
+        if (settings.size() > 1) {
+            throw new BuildException("Exactly one of " + Settings.values() + " attributes is required", getLocation());
         }
 
         if (destDir != null) {
@@ -462,7 +450,7 @@
         }
 
         if (classpath == null) {
-            classpath = (new Path(getProject())).concatSystemClasspath("last");
+            classpath = new Path(getProject()).concatSystemClasspath("last");
         } else {
             classpath = classpath.concatSystemClasspath("ignore");
         }
@@ -493,22 +481,21 @@
         log("Compilation " + cmd.describeArguments(),
             Project.MSG_VERBOSE);
 
-        StringBuffer niceClassList = new StringBuffer();
         String[] c = getClasses();
-        for (int i = 0; i < c.length; i++) {
-            cmd.createArgument().setValue(c[i]);
-            niceClassList.append("    ");
-            niceClassList.append(c[i]);
-            niceClassList.append(StringUtils.LINE_SEP);
-        }
-
-        StringBuffer prefix = new StringBuffer("Class");
+        StringBuilder message = new StringBuilder("Class");
         if (c.length > 1) {
-            prefix.append("es");
+            message.append("es");
+        }
+        message.append(" to be compiled:");
+        message.append(StringUtils.LINE_SEP);
+        for (String element : c) {
+            cmd.createArgument().setValue(element);
+            message.append("    ").append(element).append(StringUtils.LINE_SEP);
         }
-        prefix.append(" to be compiled:");
-        prefix.append(StringUtils.LINE_SEP);
+        log(message.toString(), Project.MSG_VERBOSE);
+    }
 
-        log(prefix.toString() + niceClassList.toString(), Project.MSG_VERBOSE);
+    private enum Settings {
+        cls, files, classes
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -24,8 +24,12 @@
 import java.io.PrintWriter;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
-import java.util.Vector;
+import java.util.Optional;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -42,6 +46,8 @@
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.LoaderUtils;
 
+import jdepend.textui.JDepend;
+
 /**
  * Runs JDepend tests.
  *
@@ -53,7 +59,6 @@
  *
  */
 public class JDependTask extends Task {
-    //private CommandlineJava commandline = new CommandlineJava();
 
     // required attributes
     private Path sourcesPath; // Deprecated!
@@ -71,7 +76,7 @@
     private String format = "text";
     private PatternSet defaultPatterns = new PatternSet();
 
-    private static Constructor packageFilterC;
+    private static Constructor<?> packageFilterC;
     private static Method setFilter;
 
     private boolean includeRuntime = false;
@@ -79,13 +84,12 @@
 
     static {
         try {
-            Class packageFilter =
+            Class<?> packageFilter =
                 Class.forName("jdepend.framework.PackageFilter");
             packageFilterC =
-                packageFilter.getConstructor(new Class[] {java.util.Collection.class});
+                packageFilter.getConstructor(Collection.class);
             setFilter =
-                jdepend.textui.JDepend.class.getDeclaredMethod("setFilter",
-                                                               new Class[] {packageFilter});
+                JDepend.class.getDeclaredMethod("setFilter", packageFilter);
         } catch (Throwable t) {
             if (setFilter == null) {
                 packageFilterC = null;
@@ -189,6 +193,7 @@
      * @return a source path
      * @deprecated since 1.6.x.
      */
+    @Deprecated
     public Path createSourcespath() {
         if (sourcesPath == null) {
             sourcesPath = new Path(getProject());
@@ -201,6 +206,7 @@
      * @return the sources path
      * @deprecated since 1.6.x.
      */
+    @Deprecated
     public Path getSourcespath() {
         return sourcesPath;
     }
@@ -325,6 +331,7 @@
         /**
          * @return the enumerated values
          */
+        @Override
         public String[] getValues() {
             return formats;
         }
@@ -368,11 +375,11 @@
 
         File f = LoaderUtils.getResourceSource(getClass().getClassLoader(),
                                                resource);
-        if (f != null) {
+        if (f == null) {
+            log("Couldn\'t find " + resource, Project.MSG_DEBUG);
+        } else {
             log("Found " + f.getAbsolutePath(), Project.MSG_DEBUG);
             runtimeClasses.createPath().setLocation(f);
-        } else {
-            log("Couldn\'t find " + resource, Project.MSG_DEBUG);
         }
     }
 
@@ -381,31 +388,29 @@
      *
      * @exception BuildException if an error occurs
      */
+    @Override
     public void execute() throws BuildException {
 
         CommandlineJava commandline = new CommandlineJava();
 
         if ("text".equals(format)) {
             commandline.setClassname("jdepend.textui.JDepend");
-        } else
-            if ("xml".equals(format)) {
-                commandline.setClassname("jdepend.xmlui.JDepend");
-            }
+        } else if ("xml".equals(format)) {
+            commandline.setClassname("jdepend.xmlui.JDepend");
+        }
 
         if (jvm != null) {
             commandline.setVm(jvm);
         }
         if (getSourcespath() == null && getClassespath() == null) {
             throw new BuildException("Missing classespath required argument");
-        } else if (getClassespath() == null) {
-            String msg =
-                "sourcespath is deprecated in JDepend >= 2.5 "
-                + "- please convert to classespath";
-            log(msg);
+        }
+        if (getClassespath() == null) {
+            log("sourcespath is deprecated in JDepend >= 2.5 - please convert to classespath");
         }
 
         // execute the test and get the return code
-        int exitValue = JDependTask.ERRORS;
+        int exitValue;
         boolean wasKilled = false;
         if (!getFork()) {
             exitValue = executeInVM(commandline);
@@ -426,11 +431,10 @@
             String errorMessage = "JDepend FAILED"
                 + (wasKilled ? " - Timed out" : "");
 
-            if  (getHaltonerror()) {
+            if (getHaltonerror()) {
                 throw new BuildException(errorMessage, getLocation());
-            } else {
-                log(errorMessage, Project.MSG_ERR);
             }
+            log(errorMessage, Project.MSG_ERR);
         }
     }
 
@@ -471,15 +475,10 @@
             log("Output to be stored in " + getOutputFile().getPath());
         }
 
-
         try {
-            if (getClassespath() != null) {
-                // This is the new, better way - use classespath instead
-                // of sourcespath.  The code is currently the same - you
-                // need class files in a directory to use this or jar files.
-                String[] cP = getClassespath().list();
-                for (int i = 0; i < cP.length; i++) {
-                    File f = new File(cP[i]);
+            getWorkingPath().ifPresent(path -> {
+                for (String filepath : path.list()) {
+                    File f = new File(filepath);
                     // not necessary as JDepend would fail, but why loose
                     // some time?
                     if (!f.exists()) {
@@ -500,48 +499,17 @@
                         throw new BuildException(msg);
                     }
                 }
-
-            } else if (getSourcespath() != null) {
-
-                // This is the old way and is deprecated - classespath is
-                // the right way to do this and is above
-                String[] sP = getSourcespath().list();
-                for (int i = 0; i < sP.length; i++) {
-                    File f = new File(sP[i]);
-
-                    // not necessary as JDepend would fail, but why loose
-                    // some time?
-                    if (!f.exists() || !f.isDirectory()) {
-                        String msg = "\""
-                            + f.getPath()
-                            + "\" does not represent a valid"
-                            + " directory. JDepend would fail.";
-                        log(msg);
-                        throw new BuildException(msg);
-                    }
-                    try {
-                        jdepend.addDirectory(f.getPath());
-                    } catch (IOException e) {
-                        String msg =
-                            "JDepend Failed when adding a source directory: "
-                            + e.getMessage();
-                        log(msg);
-                        throw new BuildException(msg);
-                    }
-                }
-            }
+            });
 
             // This bit turns <exclude> child tags into patters to ignore
             String[] patterns = defaultPatterns.getExcludePatterns(getProject());
             if (patterns != null && patterns.length > 0) {
                 if (setFilter != null) {
-                    Vector v = new Vector();
-                    for (int i = 0; i < patterns.length; i++) {
-                        v.addElement(patterns[i]);
-                    }
+                    List<String> v = new ArrayList<>();
+                    Collections.addAll(v, patterns);
                     try {
-                        Object o = packageFilterC.newInstance(new Object[] {v});
-                        setFilter.invoke(jdepend, new Object[] {o});
+                        Object o = packageFilterC.newInstance(v);
+                        setFilter.invoke(jdepend, o);
                     } catch (Throwable e) {
                         log("excludes will be ignored as JDepend doesn't like me: "
                             + e.getMessage(), Project.MSG_WARN);
@@ -554,8 +522,8 @@
 
             jdepend.analyze();
             if (pw != null && pw.checkError()) {
-                throw new IOException("Encountered an error writing JDepend"
-                                      + " output");
+                throw new IOException(
+                    "Encountered an error writing JDepend output");
             }
         } catch (IOException ex) {
             throw new BuildException(ex);
@@ -566,7 +534,6 @@
         return SUCCESS;
     }
 
-
     /**
      * Execute the task by forking a new JVM. The command will block until
      * it finishes. To know if the process was destroyed or not, use the
@@ -594,8 +561,8 @@
         }
 
         if (includeRuntime) {
-            Map/*<String, String>*/ env = Execute.getEnvironmentVariables();
-            String cp = (String) env.get("CLASSPATH");
+            Map<String, String> env = Execute.getEnvironmentVariables();
+            String cp = env.get("CLASSPATH");
             if (cp != null) {
                 commandline.createClasspath(getProject()).createPath()
                     .append(new Path(getProject(), cp));
@@ -615,42 +582,20 @@
             // we have to find a cleaner way to put this output
         }
 
-        if (getSourcespath() != null) {
-            // This is deprecated - use classespath in the future
-            String[] sP = getSourcespath().list();
-            for (int i = 0; i < sP.length; i++) {
-                File f = new File(sP[i]);
+        getWorkingPath().ifPresent(path -> {
+            for (String filepath : path.list()) {
+                File f = new File(filepath);
 
                 // not necessary as JDepend would fail, but why loose
                 // some time?
                 if (!f.exists() || !f.isDirectory()) {
-                    throw new BuildException("\"" + f.getPath()
-                                             + "\" does not represent a valid"
-                                             + " directory. JDepend would"
-                                             + " fail.");
-                }
-                commandline.createArgument().setValue(f.getPath());
-            }
-        }
-
-        if (getClassespath() != null) {
-            // This is the new way - use classespath - code is the
-            // same for now
-            String[] cP = getClassespath().list();
-            for (int i = 0; i < cP.length; i++) {
-                File f = new File(cP[i]);
-                // not necessary as JDepend would fail, but why loose
-                // some time?
-                if (!f.exists()) {
-                    throw new BuildException("\"" + f.getPath()
-                                             + "\" does not represent a valid"
-                                             + " file or directory. JDepend would"
-                                             + " fail.");
+                    throw new BuildException(
+                        "\"%s\" does not represent a valid directory. JDepend would fail.",
+                        f.getPath());
                 }
                 commandline.createArgument().setValue(f.getPath());
             }
-        }
-
+        });
         Execute execute = new Execute(new LogStreamHandler(this,
             Project.MSG_INFO, Project.MSG_WARN), watchdog);
         execute.setCommandline(commandline.getCommandline());
@@ -681,4 +626,15 @@
         }
         return new ExecuteWatchdog(getTimeout().longValue());
     }
+
+    private Optional<Path> getWorkingPath() {
+        Optional<Path> result = Optional.ofNullable(getClassespath());
+        if (result.isPresent()) {
+            return result;
+        }
+        result = Optional.ofNullable(getSourcespath());
+        result.ifPresent(resources -> log("nested sourcespath is deprecated; please use classespath"));
+        return result;
+    }
+
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java	2018-03-24 12:37:12.000000000 +0000
@@ -49,8 +49,8 @@
         super();
 
         int count = data.readUnsignedShort();
-        types = new byte [ count ];
-        values = new Object [ count ];
+        types = new byte[count];
+        values = new Object[count];
         // read in all constant pool entries.
         for (int i = 1; i < count; i++) {
             byte type = data.readByte();
@@ -64,33 +64,33 @@
                 break;
 
             case INTEGER :
-                values[i] = new Integer(data.readInt());
+                values[i] = Integer.valueOf(data.readInt());
                 break;
 
             case FLOAT :
-                values[i] = new Float(data.readFloat());
+                values[i] = Float.valueOf(data.readFloat());
                 break;
 
             case LONG :
-                values[i] = new Long(data.readLong());
+                values[i] = Long.valueOf(data.readLong());
                 ++i;
                 break;
 
             case DOUBLE :
-                values[i] = new Double(data.readDouble());
+                values[i] = Double.valueOf(data.readDouble());
                 ++i;
                 break;
 
             case CLASS :
             case STRING :
-                values[i] = new Integer(data.readUnsignedShort());
+                values[i] = Integer.valueOf(data.readUnsignedShort());
                 break;
 
             case FIELDREF :
             case METHODREF :
             case INTERFACEMETHODREF :
             case NAMEANDTYPE :
-                values[i] = new Integer(data.readInt());
+                values[i] = Integer.valueOf(data.readInt());
                 break;
             default:
                 // Do nothing
@@ -133,7 +133,6 @@
         return className;
     }
 
-
 }
 
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java	2018-03-24 12:37:12.000000000 +0000
@@ -24,11 +24,12 @@
 
 import java.io.BufferedInputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.Enumeration;
+import java.util.List;
 import java.util.Vector;
 import java.util.zip.CRC32;
 import java.util.zip.Deflater;
@@ -37,8 +38,6 @@
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
-import org.apache.tools.ant.util.FileUtils;
-
 // CheckStyle:TypeNameCheck OFF - bc
 /**
  * jlink links together multiple .jar files.
@@ -49,9 +48,9 @@
 
     private String outfile = null;
 
-    private Vector mergefiles = new Vector(VECTOR_INIT_SIZE);
+    private List<String> mergefiles = new Vector<>(VECTOR_INIT_SIZE);
 
-    private Vector addfiles = new Vector(VECTOR_INIT_SIZE);
+    private List<String> addfiles = new Vector<>(VECTOR_INIT_SIZE);
 
     private boolean compression = false;
 
@@ -71,7 +70,6 @@
         this.outfile = outfile;
     }
 
-
     /**
      * Adds a file to be merged into the output.
      * @param fileToMerge the file to merge into the output.
@@ -80,10 +78,9 @@
         if (fileToMerge == null) {
             return;
         }
-        mergefiles.addElement(fileToMerge);
+        mergefiles.add(fileToMerge);
     }
 
-
     /** Adds a file to be added into the output.
      * @param fileToAdd the file to add to the output.
      */
@@ -91,38 +88,35 @@
         if (fileToAdd == null) {
             return;
         }
-        addfiles.addElement(fileToAdd);
+        addfiles.add(fileToAdd);
     }
 
-
     /**
      * Adds several files to be merged into the output.
      * @param filesToMerge an array of files to merge into the output.
      */
-    public void addMergeFiles(String[] filesToMerge) {
+    public void addMergeFiles(String... filesToMerge) {
         if (filesToMerge == null) {
             return;
         }
-        for (int i = 0; i < filesToMerge.length; i++) {
-            addMergeFile(filesToMerge[i]);
+        for (String element : filesToMerge) {
+            addMergeFile(element);
         }
     }
 
-
     /**
-     * Adds several file to be added into the output.
+     * Adds several files to be added into the output.
      * @param filesToAdd an array of files to add to the output.
      */
-    public void addAddFiles(String[] filesToAdd) {
+    public void addAddFiles(String... filesToAdd) {
         if (filesToAdd == null) {
             return;
         }
-        for (int i = 0; i < filesToAdd.length; i++) {
-            addAddFile(filesToAdd[i]);
+        for (String element : filesToAdd) {
+            addAddFile(element);
         }
     }
 
-
     /**
      * Determines whether output will be compressed.
      * @param compress if true use compression.
@@ -131,7 +125,6 @@
         this.compression = compress;
     }
 
-
     /**
      * Performs the linking of files. Addfiles are added to the output as-is.
      * For example, a jar file is added to the output as a jar file. However,
@@ -145,48 +138,40 @@
      * @throws Exception on error.
      */
     public void link() throws Exception { //NOSONAR
-        ZipOutputStream output = new ZipOutputStream(new FileOutputStream(outfile));
-
-        if (compression) {
-            output.setMethod(ZipOutputStream.DEFLATED);
-            output.setLevel(Deflater.DEFAULT_COMPRESSION);
-        } else {
-            output.setMethod(ZipOutputStream.STORED);
-        }
-
-        Enumeration merges = mergefiles.elements();
+        try (ZipOutputStream output =
+            new ZipOutputStream(Files.newOutputStream(Paths.get(outfile)))) {
 
-        while (merges.hasMoreElements()) {
-            String path = (String) merges.nextElement();
-            File f = new File(path);
-
-            if (f.getName().endsWith(".jar") || f.getName().endsWith(".zip")) {
-                //Do the merge
-                mergeZipJarContents(output, f);
+            if (compression) {
+                output.setMethod(ZipOutputStream.DEFLATED);
+                output.setLevel(Deflater.DEFAULT_COMPRESSION);
             } else {
-                //Add this file to the addfiles Vector and add it
-                //later at the top level of the output file.
-                addAddFile(path);
+                output.setMethod(ZipOutputStream.STORED);
             }
-        }
+            for (String path : mergefiles) {
+                File f = new File(path);
 
-        Enumeration adds = addfiles.elements();
+                if (f.getName().endsWith(".jar")
+                    || f.getName().endsWith(".zip")) {
+                    //Do the merge
+                    mergeZipJarContents(output, f);
+                } else {
+                    //Add this file to the addfiles Vector and add it
+                    //later at the top level of the output file.
+                    addAddFile(path);
+                }
+            }
+            for (String name : addfiles) {
+                File f = new File(name);
 
-        while (adds.hasMoreElements()) {
-            String name = (String) adds.nextElement();
-            File f = new File(name);
-
-            if (f.isDirectory()) {
-                //System.out.println("in jlink: adding directory contents of " + f.getPath());
-                addDirContents(output, f, f.getName() + '/', compression);
-            } else {
-                addFile(output, f, "", compression);
+                if (f.isDirectory()) {
+                    addDirContents(output, f, f.getName() + '/', compression);
+                } else {
+                    addFile(output, f, "", compression);
+                }
             }
         }
-        FileUtils.close(output);
     }
 
-
     /**
      * The command line entry point for jlink.
      * @param args an array of arguments
@@ -212,7 +197,6 @@
         }
     }
 
-
     /*
      * Actually performs the merging of f into the output.
      * f should be a zip or jar file.
@@ -222,12 +206,11 @@
         if (!f.exists()) {
             return;
         }
-        ZipFile zipf = new ZipFile(f);
-        try {
-            Enumeration entries = zipf.entries();
+        try (ZipFile zipf = new ZipFile(f)) {
+            Enumeration<? extends ZipEntry> entries = zipf.entries();
 
             while (entries.hasMoreElements()) {
-                ZipEntry inputEntry = (ZipEntry) entries.nextElement();
+                ZipEntry inputEntry = entries.nextElement();
                 //Ignore manifest entries.  They're bound to cause conflicts between
                 //files that are being merged.  User should supply their own
                 //manifest file when doing the merge.
@@ -245,35 +228,29 @@
                         //entry from another mergefile was called "com".
                         //In that case, just ignore the error and go on to the
                         //next entry.
-                        String mess = ex.getMessage();
-
-                        if (mess.indexOf("duplicate") >= 0) {
+                        if (ex.getMessage().indexOf("duplicate") >= 0) {
                             //It was the duplicate entry.
                             continue;
-                        } else {
-                            // I hate to admit it, but we don't know what happened
-                            // here.  Throw the Exception.
-                            throw ex;
                         }
+                        // I hate to admit it, but we don't know what happened
+                        // here.  Throw the Exception.
+                        throw ex;
                     }
 
-                    InputStream in = zipf.getInputStream(inputEntry);
-                    int len = buffer.length;
-                    int count = -1;
+                    try (InputStream in = zipf.getInputStream(inputEntry)) {
+                        int len = buffer.length;
+                        int count = -1;
 
-                    while ((count = in.read(buffer, 0, len)) > 0) {
-                        output.write(buffer, 0, count);
+                        while ((count = in.read(buffer, 0, len)) > 0) {
+                            output.write(buffer, 0, count);
+                        }
+                        output.closeEntry();
                     }
-                    in.close();
-                    output.closeEntry();
                 }
             }
-        } finally {
-            zipf.close();
         }
     }
 
-
     /*
      * Adds contents of a directory to the output.
      */
@@ -293,7 +270,6 @@
         }
     }
 
-
     /*
      * Gets the name of an entry in the file.  This is the real name
      * which for a class is the name of the package with the class
@@ -304,9 +280,7 @@
 
         if (!name.endsWith(".class")) {
             // see if the file is in fact a .class file, and determine its actual name.
-            InputStream input = null;
-            try {
-                input = new FileInputStream(file);
+            try (InputStream input = Files.newInputStream(file.toPath())) {
                 String className = ClassNameReader.getClassName(input);
 
                 if (className != null) {
@@ -314,13 +288,12 @@
                 }
             } catch (IOException ioe) {
                 //do nothing
-            } finally {
-                FileUtils.close(input);
             }
         }
-        System.out.println("From " + file.getPath() + " and prefix " + prefix
-                           + ", creating entry " + prefix + name);
-        return (prefix + name);
+        System.out.printf(
+            "From %1$s and prefix %2$s, creating entry %2$s%3$s%n",
+            file.getPath(), prefix, name);
+        return prefix + name;
     }
 
 
@@ -340,12 +313,9 @@
         if (!compress) {
             entry.setCrc(calcChecksum(file));
         }
-        FileInputStream input = new FileInputStream(file);
-
-        addToOutputStream(output, input, entry);
+        addToOutputStream(output, Files.newInputStream(file.toPath()), entry);
     }
 
-
     /*
      * A convenience method that several other methods might call.
      */
@@ -359,7 +329,7 @@
             return;
         }
 
-        int numBytes = -1;
+        int numBytes;
 
         while ((numBytes = input.read(buffer)) > 0) {
             output.write(buffer, 0, numBytes);
@@ -368,7 +338,6 @@
         input.close();
     }
 
-
     /*
      * A method that does the work on a given entry in a mergefile.
      * The big deal is to set the right parameters in the ZipEntry
@@ -390,11 +359,9 @@
         String name = inputEntry.getName();
 
         if (!(inputEntry.isDirectory() || name.endsWith(".class"))) {
-            try {
-                InputStream input = zip.getInputStream(zip.getEntry(name));
+            try (InputStream input = zip.getInputStream(zip.getEntry(name))) {
                 String className = ClassNameReader.getClassName(input);
 
-                input.close();
                 if (className != null) {
                     name = className.replace('.', '/') + ".class";
                 }
@@ -419,18 +386,15 @@
         return outputEntry;
     }
 
-
     /*
      * Necessary in the case where you add a entry that
      * is not compressed.
      */
     private long calcChecksum(File f) throws IOException {
-        BufferedInputStream in = new BufferedInputStream(new FileInputStream(f));
-
-        return calcChecksum(in);
+        return calcChecksum(
+            new BufferedInputStream(Files.newInputStream(f.toPath())));
     }
 
-
     /*
      * Necessary in the case where you add a entry that
      * is not compressed.
@@ -438,18 +402,15 @@
     private long calcChecksum(InputStream in) throws IOException {
         CRC32 crc = new CRC32();
         int len = buffer.length;
-        int count = -1;
-        int haveRead = 0;
+        int count;
 
         while ((count = in.read(buffer, 0, len)) > 0) {
-            haveRead += count;
             crc.update(buffer, 0, count);
         }
         in.close();
         return crc.getValue();
     }
 
-
 }
 
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -52,11 +52,19 @@
  */
 public class JlinkTask extends MatchingTask {
 
+    private File outfile = null;
+
+    private Path mergefiles = null;
+
+    private Path addfiles = null;
+
+    private boolean compress = false;
+
     /**
      * The output file for this run of jlink. Usually a jar or zip file.
      * @param outfile the output file
      */
-    public  void setOutfile(File outfile) {
+    public void setOutfile(File outfile) {
         this.outfile = outfile;
     }
 
@@ -65,7 +73,7 @@
      * be merged into the output.
      * @return a path to be configured
      */
-    public  Path createMergefiles() {
+    public Path createMergefiles() {
         if (this.mergefiles == null) {
             this.mergefiles = new Path(getProject());
         }
@@ -76,7 +84,7 @@
      * Sets the files to be merged into the output.
      * @param mergefiles a path
      */
-    public  void setMergefiles(Path mergefiles) {
+    public void setMergefiles(Path mergefiles) {
         if (this.mergefiles == null) {
             this.mergefiles = mergefiles;
         } else {
@@ -89,7 +97,7 @@
      * be added to the output.
      * @return a path to be configured
      */
-    public  Path createAddfiles() {
+    public Path createAddfiles() {
         if (this.addfiles == null) {
             this.addfiles = new Path(getProject());
         }
@@ -100,7 +108,7 @@
      * Sets the files to be added into the output.
      * @param addfiles a path
      */
-    public  void setAddfiles(Path addfiles) {
+    public void setAddfiles(Path addfiles) {
         if (this.addfiles == null) {
             this.addfiles = addfiles;
         } else {
@@ -112,7 +120,7 @@
      * Defines whether or not the output should be compacted.
      * @param compress a <code>boolean</code> value
      */
-    public  void setCompress(boolean compress) {
+    public void setCompress(boolean compress) {
         this.compress = compress;
     }
 
@@ -120,15 +128,16 @@
      * Does the adding and merging.
      * @throws BuildException on error
      */
-    public  void execute() throws BuildException {
+    @Override
+    public void execute() throws BuildException {
         //Be sure everything has been set.
         if (outfile == null) {
-            throw new BuildException("outfile attribute is required! "
-                + "Please set.");
+            throw new BuildException(
+                "outfile attribute is required! Please set.");
         }
         if (!haveAddFiles() && !haveMergeFiles()) {
-            throw new BuildException("addfiles or mergefiles required! "
-                + "Please set.");
+            throw new BuildException(
+                "addfiles or mergefiles required! Please set.");
         }
         log("linking:     " + outfile.getPath());
         log("compression: " + compress, Project.MSG_VERBOSE);
@@ -159,23 +168,6 @@
     }
 
     private boolean haveEntries(Path p) {
-        if (p == null) {
-            return false;
-        }
-        if (p.size() > 0) {
-            return true;
-        }
-        return false;
+        return !(p == null || p.isEmpty());
     }
-
-    private  File outfile = null;
-
-    private  Path mergefiles = null;
-
-    private  Path addfiles = null;
-
-    private  boolean compress = false;
-
 }
-
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,8 +19,8 @@
 package org.apache.tools.ant.taskdefs.optional.jsp.compilers;
 
 import java.io.File;
-import java.util.Enumeration;
 import java.util.Vector;
+import java.util.stream.Collectors;
 
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.optional.jsp.JspC;
@@ -35,7 +35,7 @@
 public abstract class DefaultJspCompilerAdapter
     implements JspCompilerAdapter {
 
-    private static String lSep = System.getProperty("line.separator");
+    private static String lSep = System.lineSeparator();
 
     /**
      * Logs the compilation parameters, adds the files to compile and logs the
@@ -45,27 +45,18 @@
      * @param cmd the command line used
      */
     protected void logAndAddFilesToCompile(JspC jspc,
-                                           Vector compileList,
+                                           Vector<String> compileList,
                                            CommandlineJava cmd) {
         jspc.log("Compilation " + cmd.describeJavaCommand(),
                  Project.MSG_VERBOSE);
 
-        StringBuffer niceSourceList = new StringBuffer("File");
-        if (compileList.size() != 1) {
-            niceSourceList.append("s");
-        }
-        niceSourceList.append(" to be compiled:");
-
-        niceSourceList.append(lSep);
-
-        Enumeration e = compileList.elements();
-        while (e.hasMoreElements()) {
-            String arg = (String) e.nextElement();
-            cmd.createArgument().setValue(arg);
-            niceSourceList.append("    ");
-            niceSourceList.append(arg);
-            niceSourceList.append(lSep);
-        }
+        StringBuilder niceSourceList =
+            new StringBuilder(compileList.size() == 1 ? "File" : "Files")
+                .append(" to be compiled:").append(lSep)
+                .append(compileList.stream()
+                    .peek(arg -> cmd.createArgument().setValue(arg))
+                    .map(arg -> "    " + arg)
+                    .collect(Collectors.joining(lSep)));
 
         jspc.log(niceSourceList.toString(), Project.MSG_VERBOSE);
     }
@@ -83,6 +74,7 @@
      * set the owner
      * @param owner the owner JspC compiler
      */
+    @Override
     public void setJspc(JspC owner) {
         this.owner = owner;
     }
@@ -94,7 +86,6 @@
         return owner;
     }
 
-
     /**
      * add a single argument to the argument list, if the value aint null
      * @param cmd the command line
@@ -138,6 +129,7 @@
      * @return true if the compiler wants to do its own
      * depends
      */
+    @Override
     public boolean implementsOwnDependencyChecking() {
         return false;
     }
@@ -150,4 +142,3 @@
         return getJspc().getProject();
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java	2018-03-24 12:37:12.000000000 +0000
@@ -59,6 +59,7 @@
      * @return true if successful
      * @throws BuildException on error
      */
+    @Override
     public boolean execute()
         throws BuildException {
         getJspc().log("Using jasper compiler", Project.MSG_VERBOSE);
@@ -80,9 +81,8 @@
             java.setDir(getProject().getBaseDir());
             java.setClassname("org.apache.jasper.JspC");
             //this is really irritating; we need a way to set stuff
-            String []args = cmd.getJavaCommand().getArguments();
-            for (int i = 0; i < args.length; i++) {
-                java.createArg().setValue(args[i]);
+            for (String arg : cmd.getJavaCommand().getArguments()) {
+                java.createArg().setValue(arg);
             }
             java.setFailonerror(getJspc().getFailonerror());
             //we are forking here to be sure that if JspC calls
@@ -94,17 +94,14 @@
         } catch (Exception ex) {
             if (ex instanceof BuildException) {
                 throw (BuildException) ex;
-            } else {
-                throw new BuildException("Error running jsp compiler: ",
-                                         ex, getJspc().getLocation());
             }
+            throw new BuildException("Error running jsp compiler: ",
+                                         ex, getJspc().getLocation());
         } finally {
             getJspc().deleteEmptyJavaFiles();
         }
     }
 
-
-
     /**
      * build up a command line
      * @return a command line for jasper
@@ -144,7 +141,7 @@
     /**
      * @return an instance of the mangler this compiler uses
      */
-
+    @Override
     public JspMangler createMangler() {
         return mangler;
     }
@@ -157,26 +154,19 @@
         if (p == null) {
             p = new Path(getProject());
             return p.concatSystemClasspath("only");
-        } else {
-            return p.concatSystemClasspath("ignore");
         }
+        return p.concatSystemClasspath("ignore");
     }
 
     /**
      * @since Ant 1.6.2
      */
     private boolean isTomcat5x() {
-        AntClassLoader l = null;
-        try {
-            l = getProject().createClassLoader(getClasspath());
+        try (AntClassLoader l = getProject().createClassLoader(getClasspath())) {
             l.loadClass("org.apache.jasper.tagplugins.jstl.If");
             return true;
         } catch (ClassNotFoundException e) {
             return false;
-        } finally {
-            if (l != null) {
-                l.cleanup();
-            }
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapterFactory.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapterFactory.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapterFactory.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapterFactory.java	2018-03-24 12:37:12.000000000 +0000
@@ -80,11 +80,11 @@
                                                  AntClassLoader loader)
         throws BuildException {
 
-        if (compilerType.equalsIgnoreCase("jasper")) {
+        if ("jasper".equalsIgnoreCase(compilerType)) {
             //tomcat4.0 gets the old mangler
             return new JasperC(new JspNameMangler());
         }
-        if (compilerType.equalsIgnoreCase("jasper41")) {
+        if ("jasper41".equalsIgnoreCase(compilerType)) {
             //tomcat4.1 gets the new one
             return new JasperC(new Jasper41Mangler());
         }
@@ -104,9 +104,8 @@
                                                        AntClassLoader classloader)
         throws BuildException {
         try {
-            Class c = classloader.findClass(className);
-            Object o = c.newInstance();
-            return (JspCompilerAdapter) o;
+            Class<? extends JspCompilerAdapter> c = classloader.findClass(className).asSubclass(JspCompilerAdapter.class);
+            return c.newInstance();
         } catch (ClassNotFoundException cnfe) {
             throw new BuildException(className + " can\'t be found.", cnfe);
         } catch (ClassCastException cce) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java	2018-03-24 12:37:12.000000000 +0000
@@ -27,19 +27,18 @@
  */
 public class Jasper41Mangler implements JspMangler {
 
-
     /**
      * map from a jsp file to a java filename; does not do packages
      *
      * @param jspFile file
      * @return java filename
      */
+    @Override
     public String mapJspToJavaName(File jspFile) {
         String jspUri = jspFile.getAbsolutePath();
         int start = jspUri.lastIndexOf(File.separatorChar) + 1;
         int end = jspUri.length();
-        StringBuffer modifiedClassName;
-        modifiedClassName = new StringBuffer(jspUri.length() - start);
+        StringBuilder modifiedClassName = new StringBuilder(jspUri.length() - start);
         if (!Character.isJavaIdentifierStart(jspUri.charAt(start))
             || jspUri.charAt(start) == '_') {
             // If the first char is not a start of Java identifier or is _
@@ -78,7 +77,6 @@
         // CheckStyle:MagicNumber ON
     }
 
-
     /**
      * taking in the substring representing the path relative to the source dir
      * return a new string representing the destination path
@@ -86,6 +84,7 @@
      * @return null as this is not implemented.
      * @todo
      */
+    @Override
     public String mapPath(String path) {
         return null;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,8 +19,7 @@
 package org.apache.tools.ant.taskdefs.optional.jsp;
 
 import java.io.File;
-import java.util.Date;
-import java.util.Enumeration;
+import java.time.Instant;
 import java.util.Vector;
 
 import org.apache.tools.ant.AntClassLoader;
@@ -80,8 +79,8 @@
     private boolean mapped;
     private int verbose = 0;
     // CheckStyle:VisibilityModifier OFF - bc
-    protected Vector compileList = new Vector();
-    Vector javaFiles = new Vector();
+    protected Vector<String> compileList = new Vector<>();
+    Vector<File> javaFiles = new Vector<>();
 
     /**
      *  flag to control action on execution trouble
@@ -209,6 +208,7 @@
     public String getIeplugin() {
         return iepluginid;
     }
+
     /**
      * Java Plugin CLASSID for Internet Explorer
      * @param iepluginid the id to use.
@@ -272,7 +272,6 @@
         return uriroot;
     }
 
-
     /**
      * Set the classpath to be used for this compilation.
      * @param cp the path to be used.
@@ -413,7 +412,7 @@
      * get the list of files to compile
      * @return the list of files.
      */
-    public Vector getCompileList() {
+    public Vector<String> getCompileList() {
         return compileList;
     }
 
@@ -422,6 +421,7 @@
      * have changed and hand them off to a jsp compiler
      * @throws BuildException on error.
      */
+    @Override
     public void execute()
         throws BuildException {
 
@@ -439,13 +439,10 @@
 
         File dest = getActualDestDir();
 
-        AntClassLoader al = null;
-        try {
+        try (AntClassLoader al = getProject().createClassLoader(compilerClasspath)) {
             //bind to a compiler
             JspCompilerAdapter compiler =
-                JspCompilerAdapterFactory
-                .getCompiler(compilerName, this,
-                             al = getProject().createClassLoader(compilerClasspath));
+                JspCompilerAdapterFactory.getCompiler(compilerName, this, al);
 
             //if we are a webapp, hand off to the compiler, which had
             //better handle it
@@ -499,7 +496,7 @@
             log("compiling " + compileList.size() + " files",
                 Project.MSG_VERBOSE);
 
-            if (compileList.size() > 0) {
+            if (!compileList.isEmpty()) {
 
                 log("Compiling " + compileList.size() + " source file"
                     + (compileList.size() == 1 ? "" : "s")
@@ -507,16 +504,10 @@
                     + dest);
                 doCompilation(compiler);
 
+            } else if (filecount == 0) {
+                log("there were no files to compile", Project.MSG_INFO);
             } else {
-                if (filecount == 0) {
-                    log("there were no files to compile", Project.MSG_INFO);
-                } else {
-                    log("all files are up to date", Project.MSG_VERBOSE);
-                }
-            }
-        } finally {
-            if (al != null) {
-                al.cleanup();
+                log("all files are up to date", Project.MSG_VERBOSE);
             }
         }
     }
@@ -526,15 +517,11 @@
      * this is destDir or it id destDir + the package name
      */
     private File getActualDestDir() {
-        File dest = null;
         if (packageName == null) {
-            dest = destDir;
-        } else {
-            String path = destDir.getPath() + File.separatorChar
-                + packageName.replace('.', File.separatorChar);
-            dest = new File(path);
+            return destDir;
         }
-        return dest;
+        return new File(destDir.getPath() + File.separatorChar
+            + packageName.replace('.', File.separatorChar));
     }
 
     /**
@@ -549,9 +536,8 @@
         if (!compiler.execute()) {
             if (failOnError) {
                 throw new BuildException(FAIL_MSG, getLocation());
-            } else {
-                log(FAIL_MSG, Project.MSG_ERR);
             }
+            log(FAIL_MSG, Project.MSG_ERR);
         }
     }
 
@@ -573,23 +559,19 @@
     protected void scanDir(File srcDir, File dest, JspMangler mangler,
                            String[] files) {
 
-        long now = (new Date()).getTime();
+        long now = Instant.now().toEpochMilli();
 
-        for (int i = 0; i < files.length; i++) {
-            String filename = files[i];
+        for (String filename : files) {
             File srcFile = new File(srcDir, filename);
             File javaFile = mapToJavaFile(mangler, srcFile, srcDir, dest);
             if (javaFile == null) {
                 continue;
             }
-
             if (srcFile.lastModified() > now) {
                 log("Warning: file modified in the future: " + filename,
                     Project.MSG_WARN);
             }
-            boolean shouldCompile = false;
-            shouldCompile = isCompileNeeded(srcFile, javaFile);
-            if (shouldCompile) {
+            if (isCompileNeeded(srcFile, javaFile)) {
                 compileList.addElement(srcFile.getAbsolutePath());
                 javaFiles.addElement(javaFile);
             }
@@ -619,26 +601,21 @@
             log("Compiling " + srcFile.getPath()
                 + " because java file " + javaFile.getPath()
                 + " does not exist", Project.MSG_VERBOSE);
-        } else {
-            if (srcFile.lastModified() > javaFile.lastModified()) {
-                shouldCompile = true;
-                log("Compiling " + srcFile.getPath()
-                    + " because it is out of date with respect to "
-                    + javaFile.getPath(),
-                    Project.MSG_VERBOSE);
-            } else {
-                if (javaFile.length() == 0) {
-                    shouldCompile = true;
-                    log("Compiling " + srcFile.getPath()
-                        + " because java file " + javaFile.getPath()
-                        + " is empty", Project.MSG_VERBOSE);
-                }
-            }
+        } else if (srcFile.lastModified() > javaFile.lastModified()) {
+            shouldCompile = true;
+            log("Compiling " + srcFile.getPath()
+                + " because it is out of date with respect to "
+                + javaFile.getPath(),
+                Project.MSG_VERBOSE);
+        } else if (javaFile.length() == 0) {
+            shouldCompile = true;
+            log("Compiling " + srcFile.getPath()
+                + " because java file " + javaFile.getPath()
+                + " is empty", Project.MSG_VERBOSE);
         }
         return shouldCompile;
     }
 
-
     /**
      * get a filename from our jsp file.
      * @param mangler the jsp filename manager.
@@ -654,7 +631,6 @@
             return null;
         }
         String javaFileName = mangler.mapJspToJavaName(srcFile);
-        //        String srcFileDir=srcFile.getParent();
         return new File(dest, javaFileName);
     }
 
@@ -665,9 +641,7 @@
      */
     public void deleteEmptyJavaFiles() {
         if (javaFiles != null) {
-            Enumeration e = javaFiles.elements();
-            while (e.hasMoreElements()) {
-                File file = (File) e.nextElement();
+            for (File file : javaFiles) {
                 if (file.exists() && file.length() == 0) {
                     log("deleting empty output file " + file);
                     file.delete();
@@ -701,9 +675,6 @@
         public void setBaseDir(File directory) {
             this.directory = directory;
         }
-        //end inner class
     }
 
-
-    //end class
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.java	2018-03-24 12:37:12.000000000 +0000
@@ -58,6 +58,7 @@
      * @param jspFile file
      * @return java filename
      */
+    @Override
     public String mapJspToJavaName(File jspFile) {
         return mapJspToBaseName(jspFile) + ".java";
     }
@@ -70,20 +71,19 @@
      * @return extensionless potentially remapped name
      */
     private String mapJspToBaseName(File jspFile) {
-        String className;
-        className = stripExtension(jspFile);
+        String className = stripExtension(jspFile);
 
         // since we don't mangle extensions like the servlet does,
         // we need to check for keywords as class names
-        for (int i = 0; i < keywords.length; ++i) {
-            if (className.equals(keywords[i])) {
+        for (String keyword : keywords) {
+            if (className.equals(keyword)) {
                 className += "%";
                 break;
             }
         }
 
         // Fix for invalid characters. If you think of more add to the list.
-        StringBuffer modifiedClassName = new StringBuffer(className.length());
+        StringBuilder modifiedClassName = new StringBuilder(className.length());
         // first char is more restrictive than the rest
         char firstChar = className.charAt(0);
         if (Character.isJavaIdentifierStart(firstChar)) {
@@ -148,6 +148,7 @@
      * @param path not used
      * @return null always.
      */
+    @Override
     public String mapPath(String path) {
         return null;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,8 @@
 
 //apache/ant imports
 import java.io.File;
-import java.util.Date;
+import java.time.Instant;
+import java.util.List;
 import java.util.StringTokenizer;
 import java.util.Vector;
 
@@ -98,21 +99,22 @@
     //private String compilerPath; //fully qualified name for the compiler executable
 
     private String pathToPackage = "";
-    private Vector filesToDo = new Vector();
+    private List<String> filesToDo = new Vector<>();
 
     /**
      * Run the task.
      * @throws BuildException if there is an error.
      */
+    @Override
     public void execute() throws BuildException {
         if (!destinationDirectory.isDirectory()) {
-            throw new BuildException("destination directory "
-                + destinationDirectory.getPath() + " is not valid");
+            throw new BuildException("destination directory %s is not valid",
+                destinationDirectory.getPath());
         }
 
         if (!sourceDirectory.isDirectory()) {
-            throw new BuildException("src directory "
-                + sourceDirectory.getPath() + " is not valid");
+            throw new BuildException("src directory %s is not valid",
+                sourceDirectory.getPath());
         }
 
         if (destinationPackage == null) {
@@ -120,7 +122,6 @@
                                      getLocation());
         }
 
-
         pathToPackage
             = this.destinationPackage.replace('.', File.separatorChar);
         // get all the files in the sourceDirectory
@@ -146,8 +147,6 @@
         String[] args = new String[12];
         // CheckStyle:MagicNumber ON
 
-        File jspFile = null;
-        String parents = "";
         int j = 0;
         //TODO  this array stuff is a remnant of prev trials.. gotta remove.
         args[j++] = "-d";
@@ -168,24 +167,21 @@
         this.scanDir(files);
         log("Compiling " + filesToDo.size() + " JSP files");
 
-        final int size = filesToDo.size();
-        for (int i = 0; i < size; i++) {
+        for (String filename : filesToDo) {
             //TODO
             // All this to get package according to weblogic standards
             // Can be written better... this is too hacky!
-            // Careful.. similar code in scanDir , but slightly different!!
-            String filename = (String) filesToDo.elementAt(i);
-            jspFile = new File(filename);
+            // Careful.. similar code in scanDir, but slightly different!!
+            File jspFile = new File(filename);
             args[j] = "-package";
-            parents = jspFile.getParent();
-            if ((parents != null)  && (!("").equals(parents))) {
-                parents =  this.replaceString(parents, File.separator, "_.");
-                args[j + 1] = destinationPackage + "." + "_" + parents;
-            } else {
+            String parents = jspFile.getParent();
+            if (parents == null || "".equals(parents)) {
                 args[j + 1] = destinationPackage;
+            } else {
+                parents = this.replaceString(parents, File.separator, "_.");
+                args[j + 1] = destinationPackage + "." + "_" + parents;
             }
 
-
             args[j + 2] =  sourceDirectory + File.separator + filename;
             helperTask.clearArgs();
 
@@ -202,8 +198,6 @@
         }
     }
 
-
-
     /**
      * Set the classpath to be used for this compilation.
      * @param classpath the classpath to use.
@@ -234,7 +228,6 @@
      * @param dirName the directory containing the source jsp's
      */
     public void setSrc(File dirName) {
-
         sourceDirectory = dirName;
     }
 
@@ -245,7 +238,6 @@
      * @param dirName the directory containing the source jsp's
      */
     public void setDest(File dirName) {
-
         destinationDirectory = dirName;
     }
 
@@ -255,7 +247,6 @@
      * @param packageName the package name for the classes
      */
     public void setPackage(String packageName) {
-
         destinationPackage = packageName;
     }
 
@@ -265,52 +256,48 @@
      * @param files the files to scan.
      */
     protected void scanDir(String[] files) {
-
-        long now = (new Date()).getTime();
-        File jspFile = null;
-        String parents = null;
-        String pack = "";
-        for (int i = 0; i < files.length; i++) {
-            File srcFile = new File(this.sourceDirectory, files[i]);
+        long now = Instant.now().toEpochMilli();
+        for (String file : files) {
+            File srcFile = new File(this.sourceDirectory, file);
             //TODO
             // All this to convert source to destination directory according
             // to weblogic standards Can be written better... this is too hacky!
-            jspFile = new File(files[i]);
-            parents = jspFile.getParent();
+            File jspFile = new File(file);
+            String parents = jspFile.getParent();
 
-            if ((parents != null)  && (!("").equals(parents))) {
+            String pack;
+            if (parents == null || "".equals(parents)) {
+                pack = pathToPackage;
+            } else {
                 parents =  this.replaceString(parents, File.separator, "_/");
                 pack = pathToPackage + File.separator + "_" + parents;
-            } else {
-                pack = pathToPackage;
             }
 
             String filePath = pack + File.separator + "_";
-            int startingIndex = files[i].lastIndexOf(File.separator) != -1
-                    ? files[i].lastIndexOf(File.separator) + 1 : 0;
-            int endingIndex = files[i].indexOf(".jsp");
+            int startingIndex = file.lastIndexOf(File.separator) != -1
+                    ? file.lastIndexOf(File.separator) + 1 : 0;
+            int endingIndex = file.indexOf(".jsp");
             if (endingIndex == -1) {
-                log("Skipping " + files[i] + ". Not a JSP",
+                log("Skipping " + file + ". Not a JSP",
                     Project.MSG_VERBOSE);
                 continue;
             }
 
-            filePath += files[i].substring(startingIndex, endingIndex);
+            filePath += file.substring(startingIndex, endingIndex);
             filePath += ".class";
             File classFile = new File(this.destinationDirectory, filePath);
 
             if (srcFile.lastModified() > now) {
                 log("Warning: file modified in the future: "
-                    + files[i], Project.MSG_WARN);
+                    + file, Project.MSG_WARN);
             }
             if (srcFile.lastModified() > classFile.lastModified()) {
-                filesToDo.addElement(files[i]);
-                log("Recompiling File " + files[i], Project.MSG_VERBOSE);
+                filesToDo.add(file);
+                log("Recompiling File " + file, Project.MSG_VERBOSE);
             }
         }
     }
 
-
     /**
      * Replace occurrences of a string with a replacement string.
      * @param inpString the string to convert.
@@ -321,9 +308,8 @@
     protected String replaceString(String inpString, String escapeChars,
                                    String replaceChars) {
         String localString = "";
-        int numTokens = 0;
         StringTokenizer st = new StringTokenizer(inpString, escapeChars, true);
-        numTokens = st.countTokens();
+        int numTokens = st.countTokens();
         for (int i = 0; i < numTokens; i++) {
             String test = st.nextToken();
             test = (test.equals(escapeChars) ? replaceChars : test);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,15 +18,11 @@
 package org.apache.tools.ant.taskdefs.optional.junit;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
+import java.nio.file.Files;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.TransformerFactory;
@@ -75,12 +71,27 @@
          * list authorized values.
          * @return authorized values.
          */
+        @Override
         public String[] getValues() {
             return new String[]{FRAMES, NOFRAMES};
         }
     }
 
+    private static final String JDK_INTERNAL_FACTORY =
+            "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl";
+
     // CheckStyle:VisibilityModifier OFF - bc
+    /** XML Parser factory */
+    private static DocumentBuilderFactory privateDBFactory;
+
+    /** XML Parser factory accessible to subclasses */
+    protected static DocumentBuilderFactory dbfactory;
+
+    static {
+       privateDBFactory = DocumentBuilderFactory.newInstance();
+       dbfactory = privateDBFactory;
+    }
+
     /** Task */
     protected Task task;
 
@@ -120,16 +131,6 @@
     /** the format to use for the report. Must be <tt>FRAMES</tt> or <tt>NOFRAMES</tt> */
     protected String format = FRAMES;
 
-    /** XML Parser factory */
-    private static DocumentBuilderFactory privateDBFactory;
-
-    /** XML Parser factory accessible to subclasses */
-    protected static DocumentBuilderFactory dbfactory;
-
-    static {
-       privateDBFactory = DocumentBuilderFactory.newInstance();
-       dbfactory = privateDBFactory;
-    }
     // CheckStyle:VisibilityModifier ON
 
     /**
@@ -176,12 +177,9 @@
     protected void setXmlfile(File xmlfile) throws BuildException {
         try {
             DocumentBuilder builder = privateDBFactory.newDocumentBuilder();
-            InputStream in = new FileInputStream(xmlfile);
-            try {
+            try (InputStream in = Files.newInputStream(xmlfile.toPath())) {
                 Document doc = builder.parse(in);
                 setXmlDocument(doc);
-            } finally {
-                in.close();
             }
         } catch (Exception e) {
             throw new BuildException("Error while parsing document: " + xmlfile, e);
@@ -260,8 +258,8 @@
 
         // acrobatic cast.
         xsltTask.setIn(((XMLResultAggregator) task).getDestinationFile());
-        File outputFile = null;
-        if (format.equals(FRAMES)) {
+        File outputFile;
+        if (FRAMES.equals(format)) {
             String tempFileProperty = getClass().getName() + String.valueOf(counter++); //NOSONAR
             File tmp = FILE_UTILS.resolveFile(project.getBaseDir(), project
                     .getProperty("java.io.tmpdir"));
@@ -299,10 +297,7 @@
      * @return stylesheet as a resource
      */
     protected Resource getStylesheet() {
-        String xslname = "junit-frames.xsl";
-        if (NOFRAMES.equals(format)) {
-            xslname = "junit-noframes.xsl";
-        }
+        final String xslname = getXslName();
         if (styleDir == null) {
             // If style dir is not specified we have to retrieve
             // the stylesheet from the classloader
@@ -315,6 +310,32 @@
         return new FileResource(new File(styleDir, xslname));
     }
 
+    /**
+     * Gets the filename of the XSL stylesheet
+     *
+     * Will provide Xalan or Saxon specific
+     * stylesheets.
+     *
+     * @return The filename of the stylesheet
+     */
+    private String getXslName() {
+        final String suffix;
+
+        final String xsltFactoryName = xsltFactory == null ? null :  xsltFactory.getName();
+        if(xsltFactoryName != null && "net.sf.saxon.TransformerFactoryImpl".equals(xsltFactoryName)) {
+            suffix = "-saxon.xsl";
+        } else {
+            suffix = ".xsl";
+        }
+        final String xslname;
+        if (NOFRAMES.equals(format)) {
+            xslname = "junit-noframes" + suffix;
+        } else {
+            xslname = "junit-frames" + suffix;
+        }
+        return xslname;
+    }
+
     /** check for invalid options
      * @throws BuildException if something goes wrong.
      */
@@ -337,10 +358,7 @@
      * not exist.
      */
     protected String getStylesheetSystemId() throws IOException {
-        String xslname = "junit-frames.xsl";
-        if (NOFRAMES.equals(format)) {
-            xslname = "junit-noframes.xsl";
-        }
+        final String xslname = getXslName();
         if (styleDir == null) {
             URL url = getClass().getResource("xsl/" + xslname);
             if (url == null) {
@@ -355,8 +373,6 @@
         return JAXPUtils.getSystemId(file);
     }
 
-    private static final String JDK_INTERNAL_FACTORY = "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl";
-
     /**
      * If we end up using the JDK's own TraX factory on Java 9+, then
      * set the features and attributes necessary to allow redirect
@@ -375,8 +391,9 @@
         }
         if (JDK_INTERNAL_FACTORY.equals(factoryName)
             && JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)) {
-            factory.addFeature(new XSLTProcess.Factory.Feature("http://www.oracle.com/xml/jaxp/properties/enableExtensionFunctions",
-                                                               true));
+            factory.addFeature(new XSLTProcess.Factory.Feature(
+                "http://www.oracle.com/xml/jaxp/properties/enableExtensionFunctions",
+                true));
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -33,7 +33,7 @@
     protected boolean fork = false;
     protected String ifProperty = null;
     protected String unlessProperty = null;
-    protected Vector formatters = new Vector();
+    protected Vector<FormatterElement> formatters = new Vector<>();
     /** destination directory */
     protected File destDir = null;
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -22,6 +22,7 @@
 import java.io.File;
 import java.util.Enumeration;
 import java.util.Vector;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.FileSet;
@@ -79,7 +80,6 @@
         }
     }
 
-
     /**
      * Add a new ResourceCollection instance to this
      * batchtest. Whatever the collection is, only names that are
@@ -98,7 +98,7 @@
      * @return  an enumeration of all elements of this batchtest that are
      * a <tt>JUnitTest</tt> instance.
      */
-    public Enumeration elements() {
+    public Enumeration<JUnitTest> elements() {
         JUnitTest[] tests = createAllJUnitTest();
         return Enumerations.fromArray(tests);
     }
@@ -109,7 +109,7 @@
      * @param v the vector to which should be added all individual tests of this
      * batch test.
      */
-    void addTestsTo(Vector v) {
+    void addTestsTo(Vector<? super JUnitTest> v) {
         JUnitTest[] tests = createAllJUnitTest();
         v.ensureCapacity(v.size() + tests.length);
         for (int i = 0; i < tests.length; i++) {
@@ -123,13 +123,8 @@
      * @return the array of all <tt>JUnitTest</tt>s that belongs to this batch.
      */
     private JUnitTest[] createAllJUnitTest() {
-        String[] filenames = getFilenames();
-        JUnitTest[] tests = new JUnitTest[filenames.length];
-        for (int i = 0; i < tests.length; i++) {
-            String classname = javaToClass(filenames[i]);
-            tests[i] = createJUnitTest(classname);
-        }
-        return tests;
+        return Stream.of(getFilenames()).map(BatchTest::javaToClass)
+            .map(this::createJUnitTest).toArray(JUnitTest[]::new);
     }
 
     /**
@@ -143,21 +138,11 @@
      * For the class <tt>org/apache/Whatever.class</tt> it will return <tt>org/apache/Whatever</tt>.
      */
     private String[] getFilenames() {
-        Vector v = new Vector();
-        for (Resource r : resources) {
-            if (r.isExists()) {
-                String pathname = r.getName();
-                if (pathname.endsWith(".java")) {
-                    v.addElement(pathname.substring(0, pathname.length() - ".java".length()));
-                } else if (pathname.endsWith(".class")) {
-                    v.addElement(pathname.substring(0, pathname.length() - ".class".length()));
-                }
-            }
-        }
-
-        String[] files = new String[v.size()];
-        v.copyInto(files);
-        return files;
+        return resources.stream().filter(Resource::isExists)
+            .map(Resource::getName)
+            .filter(name -> name.endsWith(".java") || name.endsWith(".class"))
+            .map(name -> name.substring(0, name.lastIndexOf('.')))
+            .toArray(String[]::new);
     }
 
     /**
@@ -192,10 +177,7 @@
         test.setFailureProperty(failureProperty);
         test.setErrorProperty(errorProperty);
         test.setSkipNonTests(isSkipNonTests());
-        Enumeration list = this.formatters.elements();
-        while (list.hasMoreElements()) {
-            test.addFormatter((FormatterElement) list.nextElement());
-        }
+        this.formatters.forEach(test::addFormatter);
         return test;
     }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java	2018-03-24 12:37:12.000000000 +0000
@@ -89,6 +89,7 @@
      * Sets the stream the formatter is supposed to write its results to.
      * @param out the output stream to write to
      */
+    @Override
     public void setOutput(OutputStream out) {
         this.out = out;
         output = new BufferedWriter(new java.io.OutputStreamWriter(out));
@@ -98,6 +99,7 @@
      * @see JUnitResultFormatter#setSystemOutput(String)
      * {@inheritDoc}.
      */
+    @Override
     public void setSystemOutput(String out) {
         systemOutput = out;
     }
@@ -106,6 +108,7 @@
      * @see JUnitResultFormatter#setSystemError(String)
      * {@inheritDoc}.
      */
+    @Override
     public void setSystemError(String err) {
         systemError = err;
     }
@@ -115,15 +118,15 @@
      * The whole testsuite started.
      * @param suite the test suite
      */
+    @Override
     public void startTestSuite(JUnitTest suite) {
         if (output == null) {
             return; // Quick return - no output do nothing.
         }
-        StringBuffer sb = new StringBuffer("Testsuite: ");
-        sb.append(suite.getName());
-        sb.append(StringUtils.LINE_SEP);
         try {
-            output.write(sb.toString());
+            output
+                .write(new StringBuilder("Testsuite: ").append(suite.getName())
+                    .append(StringUtils.LINE_SEP).toString());
             output.flush();
         } catch (IOException ex) {
             throw new BuildException(ex);
@@ -134,8 +137,9 @@
      * The whole testsuite ended.
      * @param suite the test suite
      */
+    @Override
     public void endTestSuite(JUnitTest suite) {
-        StringBuffer sb = new StringBuffer("Tests run: ");
+        StringBuilder sb = new StringBuilder("Tests run: ");
         sb.append(suite.runCount());
         sb.append(", Failures: ");
         sb.append(suite.failureCount());
@@ -190,6 +194,7 @@
      * A test started.
      * @param test a test
      */
+    @Override
     public void startTest(Test test) {
     }
 
@@ -197,6 +202,7 @@
      * A test ended.
      * @param test a test
      */
+    @Override
     public void endTest(Test test) {
     }
 
@@ -218,6 +224,7 @@
      * @param test a test
      * @param t    the assertion failed by the test
      */
+    @Override
     public void addFailure(Test test, AssertionFailedError t) {
         addFailure(test, (Throwable) t);
     }
@@ -227,6 +234,7 @@
      * @param test  a test
      * @param error the error thrown by the test
      */
+    @Override
     public void addError(Test test, Throwable error) {
         formatError("\tCaused an ERROR", test, error);
     }
@@ -239,9 +247,8 @@
     protected String formatTest(Test test) {
         if (test == null) {
             return "Null Test: ";
-        } else {
-            return "Testcase: " + test.toString() + ":";
         }
+        return "Testcase: " + test.toString() + ":";
     }
 
     /**
@@ -271,6 +278,7 @@
     }
 
 
+    @Override
     public void testIgnored(Test test) {
         formatSkip(test, JUnitVersionHelper.getIgnoreMessage(test));
     }
@@ -294,6 +302,7 @@
 
     }
 
+    @Override
     public void testAssumptionFailure(Test test, Throwable cause) {
         formatSkip(test, cause.getMessage());
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/CustomJUnit4TestAdapterCache.java	2018-03-24 12:37:12.000000000 +0000
@@ -34,7 +34,7 @@
  *
  */
 public class CustomJUnit4TestAdapterCache extends JUnit4TestAdapterCache {
-
+    private static final long serialVersionUID = 1L;
     private static final CustomJUnit4TestAdapterCache INSTANCE = new CustomJUnit4TestAdapterCache();
 
     public static CustomJUnit4TestAdapterCache getInstance() {
@@ -45,6 +45,7 @@
         super();
     }
 
+    @Override
     public RunNotifier getNotifier(final TestResult result, final JUnit4TestAdapter adapter) {
         return getNotifier(result);
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java	2018-03-24 12:37:12.000000000 +0000
@@ -86,13 +86,14 @@
     }
 
     /** custom implementation of a nodelist */
-    public static class NodeListImpl extends Vector implements NodeList {
+    public static class NodeListImpl extends Vector<Node> implements NodeList {
         private static final long serialVersionUID = 3175749150080946423L;
 
         /**
          * Get the number of nodes in the list.
          * @return the length of the list.
          */
+        @Override
         public int getLength() {
             return size();
         }
@@ -101,9 +102,10 @@
          * @param i the index of the node to get.
          * @return the node if the index is in bounds, null otherwise.
          */
+        @Override
         public Node item(int i) {
             try {
-                return (Node) elementAt(i);
+                return elementAt(i);
             } catch (ArrayIndexOutOfBoundsException e) {
                 return null; // conforming to NodeList interface
             }
@@ -164,9 +166,9 @@
      * @return  the cloned node that is appended to <tt>parent</tt>
      */
     public static Node importNode(Node parent, Node child) {
-        Node copy = null;
         final Document doc = parent.getOwnerDocument();
 
+        Node copy;
         switch (child.getNodeType()) {
         case Node.CDATA_SECTION_NODE:
             copy = doc.createCDATASection(((CDATASection) child).getData());
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,6 +17,8 @@
  */
 package org.apache.tools.ant.taskdefs.optional.junit;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.NoSuchElementException;
 
@@ -28,78 +30,35 @@
  */
 public final class Enumerations {
 
-        private Enumerations() {
-        }
+    private Enumerations() {
+    }
 
-        /**
-         * creates an enumeration from an array of objects.
-         * @param       array   the array of object to enumerate.
-         * @return the enumeration over the array of objects.
-         */
-        public static Enumeration fromArray(Object[] array) {
-                return new ArrayEnumeration(array);
-        }
+    /**
+     * creates an enumeration from an array of objects.
+     * @param <T> object type
+     * @param array the array of object to enumerate.
+     * @return the enumeration over the array of objects.
+     */
+    @SafeVarargs
+    public static <T> Enumeration<T> fromArray(T... array) {
+        return Collections.enumeration(Arrays.asList(array));
+    }
 
-        /**
-        * creates an enumeration from an array of enumeration. The created enumeration
-        * will sequentially enumerate over all elements of each enumeration and skip
-        * <tt>null</tt> enumeration elements in the array.
-        * @param        enums   the array of enumerations.
-        * @return the enumeration over the array of enumerations.
-         */
-        public static Enumeration fromCompound(Enumeration[] enums) {
-                return new CompoundEnumeration(enums);
-        }
+    /**
+     * creates an enumeration from an array of enumeration. The created enumeration
+     * will sequentially enumerate over all elements of each enumeration and skip
+     * <tt>null</tt> enumeration elements in the array.
+     * @param <T> object type
+     * @param enums the array of enumerations.
+     * @return the enumeration over the array of enumerations.
+     */
+    @SafeVarargs
+    public static <T> Enumeration<T> fromCompound(Enumeration<? extends T>... enums) {
+        return new CompoundEnumeration<>(enums);
+    }
 
 }
 
-
-/**
- * Convenient enumeration over an array of objects.
- */
-class ArrayEnumeration implements Enumeration {
-
-        /** object array */
-        private Object[] array;
-
-        /** current index */
-        private int pos;
-
-        /**
-         * Initialize a new enumeration that wraps an array.
-         * @param       array   the array of object to enumerate.
-         */
-        public ArrayEnumeration(Object[] array) {
-                this.array = array;
-                this.pos = 0;
-        }
-        /**
-         * Tests if this enumeration contains more elements.
-         *
-         * @return  <code>true</code> if and only if this enumeration object
-         *           contains at least one more element to provide;
-         *          <code>false</code> otherwise.
-         */
-        public boolean hasMoreElements() {
-                return (pos < array.length);
-        }
-
-        /**
-         * Returns the next element of this enumeration if this enumeration
-         * object has at least one more element to provide.
-         *
-         * @return     the next element of this enumeration.
-         * @throws  NoSuchElementException  if no more elements exist.
-         */
-        public Object nextElement() throws NoSuchElementException {
-                if (hasMoreElements()) {
-                        Object o = array[pos];
-                        pos++;
-                        return o;
-                }
-                throw new NoSuchElementException();
-        }
-}
 /**
  * Convenient enumeration over an array of enumeration. For example:
  * <pre>
@@ -130,48 +89,49 @@
  * }
  * </pre>
  */
- class CompoundEnumeration implements Enumeration {
+ class CompoundEnumeration<T> implements Enumeration<T> {
 
-        /** enumeration array */
-        private Enumeration[] enumArray;
+    /** enumeration array */
+    private Enumeration<? extends T>[] enumArray;
 
-        /** index in the enums array */
-        private int index = 0;
+    /** index in the enums array */
+    private int index = 0;
 
-    public CompoundEnumeration(Enumeration[] enumarray) {
-                this.enumArray = enumarray;
+    @SafeVarargs
+    public CompoundEnumeration(Enumeration<? extends T>... enumarray) {
+        this.enumArray = enumarray;
     }
 
-        /**
-         * Tests if this enumeration contains more elements.
-         *
-         * @return  <code>true</code> if and only if this enumeration object
-         *           contains at least one more element to provide;
-         *          <code>false</code> otherwise.
-         */
+    /**
+     * Tests if this enumeration contains more elements.
+     *
+     * @return  <code>true</code> if and only if this enumeration object
+     *           contains at least one more element to provide;
+     *          <code>false</code> otherwise.
+     */
+    @Override
     public boolean hasMoreElements() {
-                while (index < enumArray.length) {
-                        if (enumArray[index] != null && enumArray[index].hasMoreElements()) {
-                                return true;
-                        }
-                        index++;
-                }
-                return false;
-    }
-
-        /**
-         * Returns the next element of this enumeration if this enumeration
-         * object has at least one more element to provide.
-         *
-         * @return     the next element of this enumeration.
-         * @throws  NoSuchElementException  if no more elements exist.
-         */
-    public Object nextElement() throws NoSuchElementException {
-                if (hasMoreElements()) {
-                        return enumArray[index].nextElement();
-                }
-                throw new NoSuchElementException();
+        while (index < enumArray.length) {
+            if (enumArray[index] != null && enumArray[index].hasMoreElements()) {
+                    return true;
+            }
+            index++;
+        }
+        return false;
     }
-}
-
 
+    /**
+     * Returns the next element of this enumeration if this enumeration
+     * object has at least one more element to provide.
+     *
+     * @return     the next element of this enumeration.
+     * @throws  NoSuchElementException  if no more elements exist.
+     */
+    @Override
+    public T nextElement() throws NoSuchElementException {
+        if (hasMoreElements()) {
+            return enumArray[index].nextElement();
+        }
+        throw new NoSuchElementException();
+    }
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java	2018-03-24 12:37:12.000000000 +0000
@@ -23,12 +23,11 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.text.SimpleDateFormat;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import java.util.Vector;
-
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;
 
@@ -89,7 +88,7 @@
     private static final String LOG_PREFIX = "    [junit]";
 
     /** Class names of failed tests without duplicates. */
-    private static SortedSet/*<TestInfos>*/ failedTests = new TreeSet();
+    private static SortedSet<TestInfos> failedTests = new TreeSet<>();
 
     /** A writer for writing the generated source to. */
     private BufferedWriter writer;
@@ -146,20 +145,13 @@
      * @param project
      *            project reference
      */
+    @Override
     public void setProject(Project project) {
         // store project reference for logging
         super.setProject(project);
         // check if already registered
-        boolean alreadyRegistered = false;
-        Vector allListeners = project.getBuildListeners();
-        final int size = allListeners.size();
-        for (int i = 0; i < size; i++) {
-            Object listener = allListeners.get(i);
-            if (listener instanceof FailureRecorder) {
-                alreadyRegistered = true;
-                break;
-            }
-        }
+        boolean alreadyRegistered = project.getBuildListeners().stream()
+            .anyMatch(FailureRecorder.class::isInstance);
         // register if needed
         if (!alreadyRegistered) {
             verbose("Register FailureRecorder (@" + this.hashCode() + ") as BuildListener");
@@ -173,6 +165,7 @@
      * Not used
      * {@inheritDoc}
      */
+    @Override
     public void endTestSuite(JUnitTest suite) throws BuildException {
     }
 
@@ -182,6 +175,7 @@
      * @param throwable the reason it erred.
      * @see junit.framework.TestListener#addError(junit.framework.Test, java.lang.Throwable)
      */
+    @Override
     public void addError(Test test, Throwable throwable) {
         failedTests.add(new TestInfos(test));
     }
@@ -194,6 +188,7 @@
      * @see junit.framework.TestListener#addFailure(junit.framework.Test, junit.framework.AssertionFailedError)
      */
     // CheckStyle:LineLengthCheck ON
+    @Override
     public void addFailure(Test test, AssertionFailedError error) {
         failedTests.add(new TestInfos(test));
     }
@@ -202,6 +197,7 @@
      * Not used
      * {@inheritDoc}
      */
+    @Override
     public void setOutput(OutputStream out) {
         // unused, close output file so it can be deleted before the VM exits
         if (out != System.out) {
@@ -213,6 +209,7 @@
      * Not used
      * {@inheritDoc}
      */
+    @Override
     public void setSystemError(String err) {
     }
 
@@ -220,6 +217,7 @@
      * Not used
      * {@inheritDoc}
      */
+    @Override
     public void setSystemOutput(String out) {
     }
 
@@ -227,6 +225,7 @@
      * Not used
      * {@inheritDoc}
      */
+    @Override
     public void startTestSuite(JUnitTest suite) throws BuildException {
     }
 
@@ -234,6 +233,7 @@
      * Not used
      * {@inheritDoc}
      */
+    @Override
     public void endTest(Test test) {
     }
 
@@ -241,6 +241,7 @@
      * Not used
      * {@inheritDoc}
      */
+    @Override
     public void startTest(Test test) {
     }
 
@@ -248,7 +249,7 @@
 
     private void writeJavaClass() {
         try {
-            File sourceFile = new File((getLocationName() + ".java"));
+            File sourceFile = new File(getLocationName() + ".java");
             verbose("Write collector class to '" + sourceFile.getAbsolutePath() + "'");
 
             if (sourceFile.exists() && !sourceFile.delete()) {
@@ -299,8 +300,8 @@
         writer.newLine();
         writer.write("        TestSuite suite = new TestSuite();");
         writer.newLine();
-        for (Iterator iter = failedTests.iterator(); iter.hasNext();) {
-            TestInfos testInfos = (TestInfos) iter.next();
+        for (Iterator<TestInfos> iter = failedTests.iterator(); iter.hasNext();) {
+            TestInfos testInfos = iter.next();
             writer.write("        suite.addTest(");
             writer.write(String.valueOf(testInfos));
             writer.write(");");
@@ -323,6 +324,7 @@
      * Logging facade in INFO-mode.
      * @param message Log-message
      */
+    @Override
     public void log(String message) {
         getProject().log(LOG_PREFIX + " " + message, Project.MSG_INFO);
     }
@@ -338,7 +340,7 @@
     /**
      * TestInfos holds information about a given test for later use.
      */
-    public static class TestInfos implements Comparable {
+    public static class TestInfos implements Comparable<TestInfos> {
 
         /** The class name of the test. */
         private final String className;
@@ -363,6 +365,7 @@
          * @see java.lang.Object#toString()
          * @see FailureRecorder#createSuiteMethod()
          */
+        @Override
         public String toString() {
             return "new " + className + "(\"" + methodName + "\")";
         }
@@ -374,17 +377,18 @@
          * @see java.lang.Comparable#compareTo
          * @see SortedSet#comparator()
          */
-        public int compareTo(Object other) {
-            if (other instanceof TestInfos) {
-                TestInfos otherInfos = (TestInfos) other;
-                return toString().compareTo(otherInfos.toString());
-            } else {
-                return -1;
-            }
+        @Override
+        public int compareTo(TestInfos other) {
+            return Comparator.comparing(Object::toString).compare(this, other);
         }
+
+        @Override
         public boolean equals(Object obj) {
-            return obj instanceof TestInfos && toString().equals(obj.toString());
+            return obj == this || obj instanceof TestInfos
+                && toString().equals(obj.toString());
         }
+
+        @Override
         public int hashCode() {
             return toString().hashCode();
         }
@@ -396,6 +400,7 @@
      * Not used
      * {@inheritDoc}
      */
+    @Override
     public void buildFinished(BuildEvent event) {
     }
 
@@ -403,6 +408,7 @@
      * Not used
      * {@inheritDoc}
      */
+    @Override
     public void buildStarted(BuildEvent event) {
     }
 
@@ -410,6 +416,7 @@
      * Not used
      * {@inheritDoc}
      */
+    @Override
     public void messageLogged(BuildEvent event) {
     }
 
@@ -417,6 +424,7 @@
      * Not used
      * {@inheritDoc}
      */
+    @Override
     public void targetFinished(BuildEvent event) {
     }
 
@@ -424,6 +432,7 @@
      * Not used
      * {@inheritDoc}
      */
+    @Override
     public void targetStarted(BuildEvent event) {
     }
 
@@ -433,6 +442,7 @@
      * @param event  not used
      * @see org.apache.tools.ant.BuildListener#taskFinished(org.apache.tools.ant.BuildEvent)
      */
+    @Override
     public void taskFinished(BuildEvent event) {
         if (!failedTests.isEmpty()) {
             writeJavaClass();
@@ -443,6 +453,7 @@
      * Not used
      * {@inheritDoc}
      */
+    @Override
     public void taskStarted(BuildEvent event) {
     }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,17 +20,18 @@
 
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.nio.file.Files;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.PropertyHelper;
 import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.optional.junit.JUnitTaskMirror.JUnitResultFormatterMirror;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.util.KeepAliveOutputStream;
 
@@ -59,6 +60,18 @@
  * @see JUnitResultFormatter
  */
 public class FormatterElement {
+    /** xml formatter class */
+    public static final String XML_FORMATTER_CLASS_NAME =
+        "org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter";
+    /** brief formatter class */
+    public static final String BRIEF_FORMATTER_CLASS_NAME =
+        "org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter";
+    /** plain formatter class */
+    public static final String PLAIN_FORMATTER_CLASS_NAME =
+        "org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter";
+    /** failure recorder class */
+    public static final String FAILURE_RECORDER_CLASS_NAME =
+        "org.apache.tools.ant.taskdefs.optional.junit.FailureRecorder";
 
     private String classname;
     private String extension;
@@ -74,19 +87,6 @@
      */
     private Project project;
 
-    /** xml formatter class */
-    public static final String XML_FORMATTER_CLASS_NAME =
-        "org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter";
-    /** brief formatter class */
-    public static final String BRIEF_FORMATTER_CLASS_NAME =
-        "org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter";
-    /** plain formatter class */
-    public static final String PLAIN_FORMATTER_CLASS_NAME =
-        "org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter";
-    /** failure recorder class */
-    public static final String FAILURE_RECORDER_CLASS_NAME =
-        "org.apache.tools.ant.taskdefs.optional.junit.FailureRecorder";
-
     /**
      * <p>Quick way to use a standard formatter.</p>
      *
@@ -104,18 +104,19 @@
      * @param type the enumerated value to use.
      */
     public void setType(TypeAttribute type) {
-        if ("xml".equals(type.getValue())) {
+        switch (type.getValue()) {
+        case "xml":
             setClassname(XML_FORMATTER_CLASS_NAME);
-        } else {
-            if ("brief".equals(type.getValue())) {
-                setClassname(BRIEF_FORMATTER_CLASS_NAME);
-            } else {
-                if ("failure".equals(type.getValue())) {
-                    setClassname(FAILURE_RECORDER_CLASS_NAME);
-                } else { // must be plain, ensured by TypeAttribute
-                    setClassname(PLAIN_FORMATTER_CLASS_NAME);
-                }
-            }
+            break;
+        case "brief":
+            setClassname(BRIEF_FORMATTER_CLASS_NAME);
+            break;
+        case "failure":
+            setClassname(FAILURE_RECORDER_CLASS_NAME);
+            break;
+        default:
+            setClassname(PLAIN_FORMATTER_CLASS_NAME);
+            break;
         }
     }
 
@@ -127,12 +128,18 @@
      */
     public void setClassname(String classname) {
         this.classname = classname;
-        if (XML_FORMATTER_CLASS_NAME.equals(classname)) {
-           setExtension(".xml");
-        } else if (PLAIN_FORMATTER_CLASS_NAME.equals(classname)) {
-           setExtension(".txt");
-        } else if (BRIEF_FORMATTER_CLASS_NAME.equals(classname)) {
-           setExtension(".txt");
+        if (classname != null) {
+            switch (classname) {
+            case XML_FORMATTER_CLASS_NAME:
+                setExtension(".xml");
+                break;
+            case PLAIN_FORMATTER_CLASS_NAME:
+                setExtension(".txt");
+                break;
+            case BRIEF_FORMATTER_CLASS_NAME:
+                setExtension(".txt");
+                break;
+            }
         }
     }
 
@@ -268,7 +275,6 @@
         this.project = project;
     }
 
-
     /**
      * @since Ant 1.6
      */
@@ -281,7 +287,7 @@
         //although this code appears to duplicate that of ClasspathUtils.newInstance,
         //we cannot use that because this formatter may run in a forked process,
         //without that class.
-        Class f = null;
+        Class<?> f;
         try {
             if (loader == null) {
                 f = Class.forName(classname);
@@ -298,26 +304,21 @@
                 + ": " + e, e);
         }
 
-        Object o = null;
+        JUnitResultFormatterMirror r;
         try {
-            o = f.newInstance();
-        } catch (InstantiationException e) {
-            throw new BuildException(e);
-        } catch (IllegalAccessException e) {
+            r = f.asSubclass(JUnitResultFormatterMirror.class).newInstance();
+        } catch (ClassCastException e) {
+            throw new BuildException("%s is not a JUnitResultFormatter",
+                classname);
+        } catch (InstantiationException | IllegalAccessException e) {
             throw new BuildException(e);
         }
 
-        if (!(o instanceof JUnitTaskMirror.JUnitResultFormatterMirror)) {
-            throw new BuildException(classname + " is not a JUnitResultFormatter");
-        }
-        JUnitTaskMirror.JUnitResultFormatterMirror r =
-            (JUnitTaskMirror.JUnitResultFormatterMirror) o;
         if (useFile && outFile != null) {
             out = new DelayedFileOutputStream(outFile);
         }
         r.setOutput(out);
 
-
         boolean needToSetProjectReference = true;
         try {
             Field field = r.getClass().getField("project");
@@ -335,8 +336,8 @@
         if (needToSetProjectReference) {
             Method setter;
             try {
-                setter = r.getClass().getMethod("setProject", new Class[] {Project.class});
-                setter.invoke(r, new Object[] {project});
+                setter = r.getClass().getMethod("setProject", Project.class);
+                setter.invoke(r, project);
             } catch (NoSuchMethodException e) {
                 // no setProject to invoke; just ignore
             } catch (IllegalAccessException e) {
@@ -356,6 +357,7 @@
      */
     public static class TypeAttribute extends EnumeratedAttribute {
         /** {@inheritDoc}. */
+        @Override
         public String[] getValues() {
             return new String[] {"plain", "xml", "brief", "failure"};
         }
@@ -380,7 +382,7 @@
         public void write(int b) throws IOException {
             synchronized (this) {
                 if (outputStream == null) {
-                    outputStream = new BufferedOutputStream(new FileOutputStream(file));
+                    outputStream = new BufferedOutputStream(Files.newOutputStream(file.toPath()));
                 }
             }
             outputStream.write(b);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestResult.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestResult.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestResult.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/IgnoredTestResult.java	2018-03-24 12:37:12.000000000 +0000
@@ -33,15 +33,15 @@
 public class IgnoredTestResult extends TestResult {
 
 
-    private List<IgnoredTestListener> listeners = new ArrayList<IgnoredTestListener>();
-    private List<TestIgnored> ignored = new ArrayList<TestIgnored>();
-    private List<TestIgnored> skipped = new ArrayList<TestIgnored>();
+    private List<IgnoredTestListener> listeners = new ArrayList<>();
+    private List<TestIgnored> ignored = new ArrayList<>();
+    private List<TestIgnored> skipped = new ArrayList<>();
 
     public IgnoredTestResult() {
         super();
     }
 
-
+    @Override
     public synchronized void addListener(TestListener listener) {
         if (listener instanceof IgnoredTestListener) {
             listeners.add((IgnoredTestListener) listener);
@@ -49,6 +49,7 @@
         super.addListener(listener);
     }
 
+    @Override
     public synchronized  void removeListener(TestListener listener) {
         if (listener instanceof IgnoredTestListener) {
             listeners.remove(listener);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,8 +18,8 @@
 
 package org.apache.tools.ant.taskdefs.optional.junit;
 
-import java.util.Iterator;
 import java.util.List;
+import java.util.function.Predicate;
 
 import junit.framework.Test;
 import junit.framework.TestResult;
@@ -41,7 +41,7 @@
  */
 public class JUnit4TestMethodAdapter implements Test {
 
-    private final Class testClass;
+    private final Class<?> testClass;
     private final String[] methodNames;
     private final Runner runner;
     private final CustomJUnit4TestAdapterCache cache;
@@ -55,7 +55,7 @@
      *             if any of the arguments is {@code null}
      *             or if any of the given method names is {@code null} or empty
      */
-    public JUnit4TestMethodAdapter(final Class testClass,
+    public JUnit4TestMethodAdapter(final Class<?> testClass,
                                    final String[] methodNames) {
         if (testClass == null) {
             throw new IllegalArgumentException("testClass is <null>");
@@ -87,6 +87,7 @@
         runner = request.getRunner();
     }
 
+    @Override
     public int countTestCases() {
         return runner.testCount();
     }
@@ -95,14 +96,15 @@
         return runner.getDescription();
     }
 
-    public List/*<Test>*/ getTests() {
+    public List<Test> getTests() {
         return cache.asTestList(getDescription());
     }
 
-    public Class getTestClass() {
+    public Class<?> getTestClass() {
         return testClass;
     }
 
+    @Override
     public void run(final TestResult result) {
         runner.run(cache.getNotifier(result));
     }
@@ -126,10 +128,10 @@
     private static final class MultipleMethodsFilter extends Filter {
 
         private final Description methodsListDescription;
-        private final Class testClass;
+        private final Class<?> testClass;
         private final String[] methodNames;
 
-        private MultipleMethodsFilter(Class testClass, String[] methodNames) {
+        private MultipleMethodsFilter(Class<?> testClass, String[] methodNames) {
             if (testClass == null) {
                 throw new IllegalArgumentException("testClass is <null>");
             }
@@ -151,23 +153,10 @@
                 return false;
             }
             if (description.isTest()) {
-                Iterator/*<Description>*/ it = methodsListDescription.getChildren().iterator();
-                while (it.hasNext()) {
-                    Description methodDescription = (Description) it.next();
-                    if (methodDescription.equals(description)) {
-                        return true;
-                    }
-                }
-            } else {
-                Iterator/*<Description>*/ it = description.getChildren().iterator();
-                while (it.hasNext()) {
-                    Description each = (Description) it.next();
-                    if (shouldRun(each)) {
-                        return true;
-                    }
-                }
+                return methodsListDescription.getChildren().stream()
+                    .anyMatch(Predicate.isEqual(description));
             }
-            return false;
+            return description.getChildren().stream().anyMatch(this::shouldRun);
         }
 
         @Override
@@ -189,5 +178,4 @@
 
     }
 
-
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,8 +21,6 @@
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FilenameFilter;
-import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -30,10 +28,12 @@
 import java.io.PrintStream;
 import java.lang.reflect.Constructor;
 import java.net.URL;
+import java.nio.file.Files;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -136,10 +136,26 @@
     private static final String LINE_SEP
         = System.getProperty("line.separator");
     private static final String CLASSPATH = "CLASSPATH";
+
+    private static final int STRING_BUFFER_SIZE = 128;
+    /**
+     * @since Ant 1.7
+     */
+    public static final String TESTLISTENER_PREFIX =
+        "junit.framework.TestListener: ";
+
+    /**
+     * Name of magic property that enables test listener events.
+     */
+    public static final String ENABLE_TESTLISTENER_EVENTS =
+        "ant.junit.enabletestlistenerevents";
+
+    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
+
     private CommandlineJava commandline;
-    private final Vector<JUnitTest> tests = new Vector<JUnitTest>();
-    private final Vector<BatchTest> batchTests = new Vector<BatchTest>();
-    private final Vector<FormatterElement> formatters = new Vector<FormatterElement>();
+    private final List<JUnitTest> tests = new Vector<>();
+    private final List<BatchTest> batchTests = new Vector<>();
+    private final Vector<FormatterElement> formatters = new Vector<>();
     private File dir = null;
 
     private Integer timeout = null;
@@ -187,21 +203,6 @@
     private String  failureProperty;
     private String  errorProperty;
 
-    private static final int STRING_BUFFER_SIZE = 128;
-    /**
-     * @since Ant 1.7
-     */
-    public static final String TESTLISTENER_PREFIX =
-        "junit.framework.TestListener: ";
-
-    /**
-     * Name of magic property that enables test listener events.
-     */
-    public static final String ENABLE_TESTLISTENER_EVENTS =
-        "ant.junit.enabletestlistenerevents";
-
-    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
-
     /**
      * If true, force ant to re-classload all classes for each JUnit TestCase
      *
@@ -588,7 +589,7 @@
      * @since Ant 1.2
      */
     public void addTest(final JUnitTest test) {
-        tests.addElement(test);
+        tests.add(test);
         preConfigure(test);
     }
 
@@ -601,7 +602,7 @@
      */
     public BatchTest createBatchTest() {
         final BatchTest test = new BatchTest(getProject());
-        batchTests.addElement(test);
+        batchTests.add(test);
         preConfigure(test);
         return test;
     }
@@ -613,7 +614,7 @@
      * @since Ant 1.2
      */
     public void addFormatter(final FormatterElement fe) {
-        formatters.addElement(fe);
+        formatters.add(fe);
     }
 
     /**
@@ -721,11 +722,9 @@
      * @since Ant 1.6
      */
     public void setTempdir(final File tmpDir) {
-        if (tmpDir != null) {
-            if (!tmpDir.exists() || !tmpDir.isDirectory()) {
-                throw new BuildException(tmpDir.toString()
-                                         + " is not a valid temp directory");
-            }
+        if (tmpDir != null && (!tmpDir.exists() || !tmpDir.isDirectory())) {
+            throw new BuildException("%s is not a valid temp directory",
+                tmpDir);
         }
         this.tmpDir = tmpDir;
     }
@@ -786,12 +785,12 @@
                     e, task.getLocation());
         }
         try {
-            final Class c = loader.loadClass(JUnitTaskMirror.class.getName() + "Impl");
+            final Class<? extends JUnitTaskMirror> c = loader.loadClass(JUnitTaskMirror.class.getName() + "Impl").asSubclass(JUnitTaskMirror.class);
             if (c.getClassLoader() != loader) {
                 throw new BuildException("Overdelegating loader", task.getLocation());
             }
-            final Constructor cons = c.getConstructor(new Class[] {JUnitTask.class});
-            return (JUnitTaskMirror) cons.newInstance(new Object[] {task});
+            final Constructor<? extends JUnitTaskMirror> cons = c.getConstructor(JUnitTask.class);
+            return cons.newInstance(task);
         } catch (final Exception e) {
             throw new BuildException(e, task.getLocation());
         }
@@ -817,18 +816,16 @@
             if (extra != null && !hasJunit(path)) {
                 path.add(expandModulePath(extra));
             }
-            mirrorLoader = (ClassLoader) AccessController.doPrivileged(new PrivilegedAction() {
-                public Object run() {
-                    return new SplitClassLoader(myLoader, path, getProject(),
-                            new String[] {"BriefJUnitResultFormatter", "JUnit4TestMethodAdapter",
-                                    "JUnitResultFormatter", "JUnitTaskMirrorImpl", "JUnitTestRunner",
-                                    "JUnitVersionHelper", "OutErrSummaryJUnitResultFormatter",
-                                    "PlainJUnitResultFormatter", "SummaryJUnitResultFormatter",
-                                    "TearDownOnVmCrash", "XMLJUnitResultFormatter", "IgnoredTestListener",
-                                    "IgnoredTestResult", "CustomJUnit4TestAdapterCache",
-                                    "TestListenerWrapper"});
-                }
-            });
+            mirrorLoader = AccessController.doPrivileged(
+                (PrivilegedAction<ClassLoader>) () -> new SplitClassLoader(
+                    myLoader, path, getProject(),
+                    new String[] {"BriefJUnitResultFormatter", "JUnit4TestMethodAdapter",
+                            "JUnitResultFormatter", "JUnitTaskMirrorImpl", "JUnitTestRunner",
+                            "JUnitVersionHelper", "OutErrSummaryJUnitResultFormatter",
+                            "PlainJUnitResultFormatter", "SummaryJUnitResultFormatter",
+                            "TearDownOnVmCrash", "XMLJUnitResultFormatter", "IgnoredTestListener",
+                            "IgnoredTestResult", "CustomJUnit4TestAdapterCache",
+                            "TestListenerWrapper"}));
         } else {
             mirrorLoader = myLoader;
         }
@@ -847,23 +844,20 @@
         checkModules();
         setupJUnitDelegate();
 
-        final List<List> testLists = new ArrayList<List>();
+        final List<List<JUnitTest>> testLists = new ArrayList<>();
         /* parallel test execution is only supported for multi-process execution */
         final int threads = !fork || forkMode.getValue().equals(ForkMode.ONCE) ? 1 : this.threads;
 
-        final boolean forkPerTest = forkMode.getValue().equals(ForkMode.PER_TEST);
-        if (forkPerTest || forkMode.getValue().equals(ForkMode.ONCE)) {
+        final boolean forkPerTest = ForkMode.PER_TEST.equals(forkMode.getValue());
+        if (forkPerTest || ForkMode.ONCE.equals(forkMode.getValue())) {
             testLists.addAll(executeOrQueue(getIndividualTests(),
                                             forkPerTest));
         } else { /* forkMode.getValue().equals(ForkMode.PER_BATCH) */
-            final int count = batchTests.size();
-            for (int i = 0; i < count; i++) {
-                final BatchTest batchtest = batchTests.elementAt(i);
-                testLists.addAll(executeOrQueue(batchtest.elements(), false));
-            }
-            testLists.addAll(executeOrQueue(tests.elements(), forkPerTest));
+            batchTests.stream().map(b -> executeOrQueue(b.elements(), false))
+                .forEach(testLists::addAll);
+            testLists.addAll(
+                executeOrQueue(Collections.enumeration(tests), forkPerTest));
         }
-
         try {
             /* prior to parallel the code in 'oneJunitThread' used to be here. */
             runTestsInThreads(testLists, threads);
@@ -888,12 +882,13 @@
      */
     private class JunitTestThread implements Runnable {
 
-        JunitTestThread(final JUnitTask master, final Iterator<List> iterator, final int id) {
+        JunitTestThread(final JUnitTask master, final Iterator<List<JUnitTest>> iterator, final int id) {
             this.masterTask = master;
             this.iterator = iterator;
             this.id = id;
         }
 
+        @Override
         public void run() {
             try {
                 masterTask.oneJunitThread(iterator, id);
@@ -904,7 +899,7 @@
         }
 
         private final JUnitTask masterTask;
-        private final Iterator<List> iterator;
+        private final Iterator<List<JUnitTest>> iterator;
         private final int id;
     }
 
@@ -915,8 +910,8 @@
      * threads get the same test, or two threads simultaneously pop the list so that a test
      * gets skipped!
      */
-    private List getNextTest(final Iterator<List> iter) {
-        synchronized(iter) {
+    private List<JUnitTest> getNextTest(final Iterator<List<JUnitTest>> iter) {
+        synchronized (iter) {
             if (iter.hasNext()) {
                 return iter.next();
             }
@@ -935,14 +930,14 @@
      * fatal reason, no new tests/batches will be started but the running threads will be
      * permitted to complete.  Additional tests may start in already-running batch-test threads.
      */
-    private void oneJunitThread(final Iterator<List> iter, final int threadId) {
+    private void oneJunitThread(final Iterator<List<JUnitTest>> iter, final int threadId) {
 
-        List l;
+        List<JUnitTest> l;
         log("Starting test thread " + threadId, Project.MSG_VERBOSE);
         while ((caughtBuildException == null) && ((l = getNextTest(iter)) != null)) {
             log("Running test " + l.get(0).toString() + "(" + l.size() + ") in thread " + threadId, Project.MSG_VERBOSE);
             if (l.size() == 1) {
-                execute((JUnitTest) l.get(0), threadId);
+                execute(l.get(0), threadId);
             } else {
                 execute(l, threadId);
             }
@@ -951,9 +946,9 @@
     }
 
 
-    private void runTestsInThreads(final List<List> testList, final int numThreads) {
+    private void runTestsInThreads(final List<List<JUnitTest>> testList, final int numThreads) {
 
-        Iterator<List> iter = testList.iterator();
+        Iterator<List<JUnitTest>> iter = testList.iterator();
 
         if (numThreads == 1) {
             /* with just one thread just run the test - don't create any threads */
@@ -966,24 +961,25 @@
             /* Need to split apart tests, which are still grouped in batches */
             /* is there a simpler Java mechanism to do this? */
             /* I assume we don't want to do this with "per batch" forking. */
-            List<List> newlist = new ArrayList<List>();
+            List<List<JUnitTest>> newlist = new ArrayList<>();
             if (forkMode.getValue().equals(ForkMode.PER_TEST)) {
-                final Iterator<List> i1 = testList.iterator();
+                final Iterator<List<JUnitTest>> i1 = testList.iterator();
                 while (i1.hasNext()) {
-                    final List l = i1.next();
+                    final List<JUnitTest> l = i1.next();
                     if (l.size() == 1) {
-                         newlist.add(l);
+                        newlist.add(l);
                     } else {
-                         final Iterator i2 = l.iterator();
-                         while (i2.hasNext()) {
-                             final List tmpSingleton = new ArrayList();
-                             tmpSingleton.add(i2.next());
-                             newlist.add(tmpSingleton);
-                         }
+                        final Iterator<JUnitTest> i2 = l.iterator();
+                        while (i2.hasNext()) {
+                            final List<JUnitTest> tmpSingleton =
+                                new ArrayList<>();
+                            tmpSingleton.add(i2.next());
+                            newlist.add(tmpSingleton);
+                        }
                     }
                 }
             } else {
-                 newlist = testList;
+                newlist = testList;
             }
             iter = newlist.iterator();
 
@@ -1040,13 +1036,13 @@
         }
 
         // execute the test and get the return code
-        TestResultHolder result = null;
-        if (!test.getFork()) {
-            result = executeInVM(test);
-        } else {
+        TestResultHolder result;
+        if (test.getFork()) {
             final ExecuteWatchdog watchdog = createWatchdog();
             result = executeAsForked(test, watchdog, null);
             // null watchdog means no timeout, you'd better not check with null
+        } else {
+            result = executeInVM(test);
         }
         actOnTestResult(result, test, "Test " + test.getName());
     }
@@ -1068,8 +1064,8 @@
      * @throws BuildException if <code>testName</code> is not a valid test name
      */
     private void validateTestName(final String testName) throws BuildException {
-        if (testName == null || testName.length() == 0
-            || testName.equals("null")) {
+        if (testName == null || testName.isEmpty()
+            || "null".equals(testName)) {
             throw new BuildException("test name must be specified");
         }
     }
@@ -1080,23 +1076,21 @@
      * @param thread Identifies which thread is test running in (0 for single-threaded runs)
      * @throws BuildException on error.
      */
-    protected void execute(final List testList, final int thread) throws BuildException {
-        JUnitTest test = null;
+    protected void execute(final List<JUnitTest> testList, final int thread) throws BuildException {
         // Create a temporary file to pass the test cases to run to
         // the runner (one test case per line)
         final File casesFile = createTempPropertiesFile("junittestcases");
-        BufferedWriter writer = null;
-        try {
-            writer = new BufferedWriter(new FileWriter(casesFile));
+        try (BufferedWriter writer =
+            new BufferedWriter(new FileWriter(casesFile))) {
 
             log("Creating casesfile '" + casesFile.getAbsolutePath()
                 + "' with content: ", Project.MSG_VERBOSE);
             final PrintStream logWriter =
                 new PrintStream(new LogOutputStream(this, Project.MSG_VERBOSE));
 
-            final Iterator iter = testList.iterator();
-            while (iter.hasNext()) {
-                test = (JUnitTest) iter.next();
+            JUnitTest test = null;
+            for (JUnitTest t : testList) {
+                test = t;
                 test.setThread(thread);
                 printDual(writer, logWriter, test.getName());
                 if (test.getMethods() != null) {
@@ -1117,8 +1111,6 @@
                 }
             }
             writer.flush();
-            writer.close();
-            writer = null;
 
             // execute the test and get the return code
             final ExecuteWatchdog watchdog = createWatchdog();
@@ -1129,8 +1121,6 @@
             log(e.toString(), Project.MSG_ERR);
             throw new BuildException(e);
         } finally {
-            FileUtils.close(writer);
-
             try {
                 FILE_UTILS.tryHardToDelete(casesFile);
             } catch (final Exception e) {
@@ -1144,7 +1134,7 @@
      * @param testList the list of tests to execute.
      * @throws BuildException on error.
      */
-    protected void execute(final List testList) throws BuildException {
+    protected void execute(final List<JUnitTest> testList) throws BuildException {
         execute(testList, 0);
     }
 
@@ -1175,7 +1165,7 @@
 
         CommandlineJava cmd;
         try {
-            cmd = (CommandlineJava) (getCommandline().clone());
+            cmd = (CommandlineJava) getCommandline().clone();
         } catch (final CloneNotSupportedException e) {
             throw new BuildException("This shouldn't happen", e, getLocation());
         }
@@ -1211,7 +1201,7 @@
         cmd.createArgument().setValue(Constants.LOGTESTLISTENEREVENTS
                                       + String.valueOf(getEnableTestListenerEvents()));
 
-        StringBuffer formatterArg = new StringBuffer(STRING_BUFFER_SIZE);
+        StringBuilder formatterArg = new StringBuilder(STRING_BUFFER_SIZE);
         final FormatterElement[] feArray = mergeFormatters(test);
         for (int i = 0; i < feArray.length; i++) {
             final FormatterElement fe = feArray[i];
@@ -1224,7 +1214,7 @@
                     formatterArg.append(outFile);
                 }
                 cmd.createArgument().setValue(formatterArg.toString());
-                formatterArg = new StringBuffer();
+                formatterArg = new StringBuilder();
             }
         }
 
@@ -1234,17 +1224,14 @@
         final File propsFile = createTempPropertiesFile("junit");
         cmd.createArgument().setValue(Constants.PROPSFILE
                                       + propsFile.getAbsolutePath());
-        final Hashtable p = getProject().getProperties();
+        final Hashtable<String, Object> p = getProject().getProperties();
         final Properties props = new Properties();
-        for (final Enumeration e = p.keys(); e.hasMoreElements();) {
-            final Object key = e.nextElement();
-            props.put(key, p.get(key));
-        }
+        p.forEach(props::put);
         try {
-            final FileOutputStream outstream = new FileOutputStream(propsFile);
+            final OutputStream outstream = Files.newOutputStream(propsFile.toPath());
             props.store(outstream, "Ant JUnitTask generated properties file");
             outstream.close();
-        } catch (final java.io.IOException e) {
+        } catch (final IOException e) {
             FILE_UTILS.tryHardToDelete(propsFile);
             throw new BuildException("Error creating temporary properties "
                                      + "file.", e, getLocation());
@@ -1326,9 +1313,9 @@
                     + propsFile.getAbsolutePath() + "'.";
                 if (success) {
                     throw new BuildException(msg); //NOSONAR
-                } else { // don't hide inner exception
-                    log(msg, Project.MSG_ERR);
                 }
+                // don't hide inner exception
+                log(msg, Project.MSG_ERR);
             }
         }
 
@@ -1341,8 +1328,8 @@
      */
     private void checkIncludeAntRuntime(final CommandlineJava cmd) {
         if (includeAntRuntime) {
-            final Map/*<String, String>*/ env = Execute.getEnvironmentVariables();
-            final String cp = (String) env.get(CLASSPATH);
+            final Map<String, String> env = Execute.getEnvironmentVariables();
+            final String cp = env.get(CLASSPATH);
             if (cp != null) {
                 cmd.createClasspath(getProject()).createPath()
                     .append(new Path(getProject(), cp));
@@ -1354,7 +1341,6 @@
         }
     }
 
-
     /**
      * check for the parameter being "withoutanderr" in a locale-independent way.
      * @param summaryOption the summary option -can be null
@@ -1390,19 +1376,17 @@
         if (!cmd.haveClasspath()) {
             return;
         }
-        AntClassLoader loader = null;
-        try {
-            loader =
-                AntClassLoader.newAntClassLoader(null, getProject(),
-                                                 cmd.createClasspath(getProject()),
-                                                 true);
+        try (AntClassLoader loader =
+             AntClassLoader.newAntClassLoader(null, getProject(),
+                                              cmd.createClasspath(getProject()),
+                                              true)) {
             final String projectResourceName =
                 LoaderUtils.classNameToResource(Project.class.getName());
             URL previous = null;
             try {
-                for (final Enumeration e = loader.getResources(projectResourceName);
+                for (final Enumeration<URL> e = loader.getResources(projectResourceName);
                      e.hasMoreElements();) {
-                    final URL current = (URL) e.nextElement();
+                    final URL current = e.nextElement();
                     if (previous != null && !urlEquals(current, previous)) {
                         log("WARNING: multiple versions of ant detected "
                             + "in path for junit "
@@ -1416,10 +1400,6 @@
             } catch (final Exception ex) {
                 // Ignore exception
             }
-        } finally {
-            if (loader != null) {
-                loader.cleanup();
-            }
         }
     }
 
@@ -1505,9 +1485,8 @@
         throws IOException {
         if (runner != null) {
             return runner.handleInput(buffer, offset, length);
-        } else {
-            return super.handleInput(buffer, offset, length);
         }
+        return super.handleInput(buffer, offset, length);
     }
 
 
@@ -1695,12 +1674,14 @@
      */
     protected Enumeration<JUnitTest> getIndividualTests() {
         final int count = batchTests.size();
-        final Enumeration[] enums = new Enumeration[ count + 1];
+        @SuppressWarnings("unchecked")
+        final Enumeration<JUnitTest>[] enums = new Enumeration[ count + 1];
+
         for (int i = 0; i < count; i++) {
-            final BatchTest batchtest = batchTests.elementAt(i);
+            final BatchTest batchtest = batchTests.get(i);
             enums[i] = batchtest.elements();
         }
-        enums[enums.length - 1] = tests.elements();
+        enums[enums.length - 1] = Collections.enumeration(tests);
         return Enumerations.fromCompound(enums);
     }
 
@@ -1717,10 +1698,7 @@
         if (tests.isEmpty()) {
             return;
         }
-
-        final Enumeration<JUnitTest> testsEnum = tests.elements();
-        while (testsEnum.hasMoreElements()) {
-            final JUnitTest test = testsEnum.nextElement();
+        for (JUnitTest test : tests) {
             if (test.hasMethodsSpecified() && test.shouldRun(getProject())) {
                 test.resolveMethods();
             }
@@ -1734,15 +1712,10 @@
     private void checkModules() {
         if (hasPath(getCommandline().getModulepath()) ||
             hasPath(getCommandline().getUpgrademodulepath())) {
-            for (int i = 0, count = batchTests.size(); i < count; i++) {
-                if(!batchTests.elementAt(i).getFork()) {
-                    throw new BuildException("The module path requires fork attribute to be set to true.");
-                }
-            }
-            for (int i = 0, count = tests.size(); i < count; i++) {
-                if (!tests.elementAt(i).getFork()) {
-                    throw new BuildException("The module path requires fork attribute to be set to true.");
-                }
+            if (!(batchTests.stream().allMatch(BaseTest::getFork)
+                && tests.stream().allMatch(BaseTest::getFork))) {
+                throw new BuildException(
+                    "The module path requires fork attribute to be set to true.");
             }
         }
     }
@@ -1754,23 +1727,17 @@
      * @since 1.9.8
      */
     private boolean hasJunit(final Path path) {
-        AntClassLoader loader = null;
-        try {
-            loader = AntClassLoader.newAntClassLoader(
+        try (AntClassLoader loader = AntClassLoader.newAntClassLoader(
                 null,
                 getProject(),
                 path,
-                true);
+                true)) {
             try {
                 loader.loadClass("junit.framework.Test");
                 return true;
             } catch (final Exception ex) {
                 return false;
             }
-        } finally {
-            if (loader != null) {
-                loader.close();
-            }
         }
     }
 
@@ -1785,11 +1752,8 @@
         for (String path : modulePath.list()) {
             final File modulePathEntry = getProject().resolveFile(path);
             if (modulePathEntry.isDirectory() && !hasModuleInfo(modulePathEntry)) {
-                final File[] modules = modulePathEntry.listFiles(new FilenameFilter() {
-                        public boolean accept(File dir, String name) {
-                            return name.toLowerCase(Locale.ENGLISH).endsWith(".jar");
-                        }
-                    });
+                final File[] modules = modulePathEntry.listFiles((dir,
+                    name) -> name.toLowerCase(Locale.ENGLISH).endsWith(".jar"));
                 if (modules != null) {
                     for (File module : modules) {
                         expanded.add(new Path(getProject(), String.format(
@@ -1811,9 +1775,9 @@
      * @return enumeration
      * @since Ant 1.3
      */
-    protected Enumeration<JUnitTest> allTests() {
-        final Enumeration[] enums = {tests.elements(), batchTests.elements()};
-        return Enumerations.fromCompound(enums);
+    protected Enumeration<BaseTest> allTests() {
+        return Enumerations.fromCompound(Collections.enumeration(tests),
+            Collections.enumeration(batchTests));
     }
 
     /**
@@ -1822,6 +1786,7 @@
      * @since Ant 1.3
      */
     private FormatterElement[] mergeFormatters(final JUnitTest test) {
+        @SuppressWarnings("unchecked")
         final Vector<FormatterElement> feVector = (Vector<FormatterElement>) formatters.clone();
         test.addFormattersTo(feVector);
         final FormatterElement[] feArray = new FormatterElement[feVector.size()];
@@ -1967,7 +1932,7 @@
                         final File outFile = getOutput(fe, test);
                         if (outFile != null) {
                             try {
-                                out = new FileOutputStream(outFile);
+                                out = Files.newOutputStream(outFile.toPath());
                             } catch (final IOException e) {
                                 // ignore
                             }
@@ -2209,9 +2174,10 @@
      * @return a list of tasks to be executed.
      * @since 1.6.2
      */
-    protected Collection<List> executeOrQueue(final Enumeration<JUnitTest> testList,
-                                        final boolean runIndividual) {
-        final Map<ForkedTestConfiguration, List> testConfigurations = new HashMap<ForkedTestConfiguration, List>();
+    protected Collection<List<JUnitTest>> executeOrQueue(
+        final Enumeration<JUnitTest> testList, final boolean runIndividual) {
+        final Map<ForkedTestConfiguration, List<JUnitTest>> testConfigurations =
+            new HashMap<>();
         while (testList.hasMoreElements()) {
             final JUnitTest test = testList.nextElement();
             if (test.shouldRun(getProject())) {
@@ -2220,14 +2186,10 @@
                 if ((runIndividual || !test.getFork()) && (threads == 1)) {
                     execute(test, 0);
                 } else {
-                    final ForkedTestConfiguration c =
-                        new ForkedTestConfiguration(test);
-                    List<JUnitTest> l = testConfigurations.get(c);
-                    if (l == null) {
-                        l = new ArrayList<JUnitTest>();
-                        testConfigurations.put(c, l);
-                    }
-                    l.add(test);
+                    testConfigurations
+                        .computeIfAbsent(new ForkedTestConfiguration(test),
+                            k -> new ArrayList<>())
+                        .add(test);
                 }
             }
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirrorImpl.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirrorImpl.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirrorImpl.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirrorImpl.java	2018-03-24 12:37:12.000000000 +0000
@@ -35,6 +35,7 @@
  */
 public final class JUnitTaskMirrorImpl implements JUnitTaskMirror {
 
+    @SuppressWarnings("unused")
     private final JUnitTask task;
 
     /**
@@ -46,6 +47,7 @@
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void addVmExit(JUnitTest test, JUnitTaskMirror.JUnitResultFormatterMirror aFormatter,
             OutputStream out, String message, String testCase) {
         JUnitResultFormatter formatter = (JUnitResultFormatter) aFormatter;
@@ -61,6 +63,7 @@
     }
 
     /** {@inheritDoc}. */
+    @Override
     public JUnitTaskMirror.JUnitTestRunnerMirror newJUnitTestRunner(JUnitTest test,
             String[] methods,
             boolean haltOnError, boolean filterTrace, boolean haltOnFailure,
@@ -70,6 +73,7 @@
     }
 
     /** {@inheritDoc}. */
+    @Override
     public JUnitTaskMirror.SummaryJUnitResultFormatterMirror newSummaryJUnitResultFormatter() {
         return new SummaryJUnitResultFormatter();
     }
@@ -86,14 +90,17 @@
             testCase = aTestCase;
         }
 
+        @Override
         public int countTestCases() {
             return 1;
         }
 
+        @Override
         public void run(TestResult r) {
             throw new AssertionFailedError(message);
         }
 
+        @Override
         public String getName() {
             return testCase;
         }
@@ -102,6 +109,7 @@
             return test.getName();
         }
 
+        @Override
         public String toString() {
             return test.getName() + ":" + testCase;
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,7 +18,6 @@
 
 package org.apache.tools.ant.taskdefs.optional.junit;
 
-import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Properties;
 import java.util.Vector;
@@ -228,7 +227,7 @@
             } else if (methods.length == 1) {
                 methodsList = methods[0];
             } else {
-                StringBuffer buf = new StringBuffer(methods.length * 16);
+                StringBuilder buf = new StringBuilder(methods.length * 16);
                 buf.append(methods[0]);
                 for (int i = 1; i < methods.length; i++) {
                     buf.append(',').append(methods[i]);
@@ -482,12 +481,9 @@
      * @param p the properties.
      *          This is a copy of the projects ant properties.
      */
-    public void setProperties(Hashtable p) {
+    public void setProperties(Hashtable<?, ?> p) {
         props = new Properties();
-        for (Enumeration e = p.keys(); e.hasMoreElements();) {
-            Object key = e.nextElement();
-            props.put(key, p.get(key));
-        }
+        p.forEach(props::put);
     }
 
     /**
@@ -516,7 +512,7 @@
     /**
      * Convenient method to add formatters to a vector
      */
-    void addFormattersTo(Vector v) {
+    void addFormattersTo(Vector<? super FormatterElement> v) {
         final int count = formatters.size();
         for (int i = 0; i < count; i++) {
             v.addElement(formatters.elementAt(i));
@@ -527,12 +523,13 @@
      * @since Ant 1.5
      * @return a clone of this test.
      */
+    @SuppressWarnings("unchecked")
     @Override
     public Object clone() {
         try {
             JUnitTest t = (JUnitTest) super.clone();
             t.props = props == null ? null : (Properties) props.clone();
-            t.formatters = (Vector) formatters.clone();
+            t.formatters = (Vector<FormatterElement>) formatters.clone();
             return t;
         } catch (CloneNotSupportedException e) {
             // plain impossible
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java	2018-03-24 12:37:12.000000000 +0000
@@ -22,18 +22,20 @@
 import java.io.BufferedWriter;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.Enumeration;
-import java.util.Hashtable;
 import java.util.Properties;
 import java.util.StringTokenizer;
 import java.util.Vector;
@@ -72,21 +74,46 @@
  */
 
 public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestRunnerMirror {
+    private static final String JUNIT_4_TEST_ADAPTER = "junit.framework.JUnit4TestAdapter";
+
+    private static final String[] DEFAULT_TRACE_FILTERS = new String[] {"junit.framework.TestCase",
+            "junit.framework.TestResult",
+            "junit.framework.TestSuite",
+            "junit.framework.Assert.", // don't filter AssertionFailure
+            "junit.swingui.TestRunner",
+            "junit.awtui.TestRunner",
+            "junit.textui.TestRunner",
+            "java.lang.reflect.Method.invoke(",
+            "sun.reflect.",
+            "org.apache.tools.ant.",
+            // JUnit 4 support:
+            "org.junit.",
+            "junit.framework.JUnit4TestAdapter",
+            " more"};
 
     /**
-     * Holds the registered formatters.
+     * Do we filter junit.*.* stack frames out of failure and error exceptions.
      */
-    private final Vector<JUnitTaskMirror.JUnitResultFormatterMirror> formatters = new Vector();
+    private static boolean filtertrace = true;
+
+    /** Running more than one test suite? */
+    private static boolean multipleTests = false;
 
     /**
-     * Collects TestResults.
+     * The file used to indicate that the build crashed.
+     * File will be empty in case the build did not crash.
      */
-    private IgnoredTestResult res;
+    private static String crashFile = null;
 
     /**
-     * Do we filter junit.*.* stack frames out of failure and error exceptions.
+     * Holds the registered formatters.
      */
-    private static boolean filtertrace = true;
+    private final Vector<JUnitTaskMirror.JUnitResultFormatterMirror> formatters = new Vector<>();
+
+    /**
+     * Collects TestResults.
+     */
+    private IgnoredTestResult res;
 
     /**
      * Do we send output to System.out/.err in addition to the formatters?
@@ -100,24 +127,6 @@
      */
     private Permissions perm = null;
 
-    private static final String JUNIT_4_TEST_ADAPTER = "junit.framework.JUnit4TestAdapter";
-
-    private static final String[] DEFAULT_TRACE_FILTERS = new String[] {"junit.framework.TestCase",
-            "junit.framework.TestResult",
-            "junit.framework.TestSuite",
-            "junit.framework.Assert.", // don't filter AssertionFailure
-            "junit.swingui.TestRunner",
-            "junit.awtui.TestRunner",
-            "junit.textui.TestRunner",
-            "java.lang.reflect.Method.invoke(",
-            "sun.reflect.",
-            "org.apache.tools.ant.",
-            // JUnit 4 support:
-            "org.junit.",
-            "junit.framework.JUnit4TestAdapter",
-            " more"};
-
-
     /**
      * Do we stop on errors.
      */
@@ -147,9 +156,6 @@
     /** is this runner running in forked mode? */
     private boolean forked = false;
 
-    /** Running more than one test suite? */
-    private static boolean multipleTests = false;
-
     /** ClassLoader passed in in non-forked mode. */
     private final ClassLoader loader;
 
@@ -159,12 +165,6 @@
     /** Turned on if we are using JUnit 4 for this test suite. see #38811 */
     private boolean junit4;
 
-    /**
-     * The file used to indicate that the build crashed.
-     * File will be empty in case the build did not crash.
-     */
-    private static String crashFile = null;
-
     /** Names of test methods to execute */
     private String[] methods = null;
 
@@ -361,6 +361,7 @@
     /**
      * Run the test.
      */
+    @Override
     public void run() {
         res = new IgnoredTestResult();
         res.addListener(wrapListener(this));
@@ -381,7 +382,7 @@
         try {
 
             try {
-                Class testClass = null;
+                Class<?> testClass;
                 if (loader == null) {
                     testClass = Class.forName(junitTest.getName());
                 } else {
@@ -395,24 +396,24 @@
                 // JUnit 4
                 Method suiteMethod = null;
                 if (!testMethodsSpecified) {
-                try {
-                    // check if there is a suite method
-                    suiteMethod = testClass.getMethod("suite", new Class[0]);
-                } catch (final NoSuchMethodException e) {
-                    // no appropriate suite method found. We don't report any
-                    // error here since it might be perfectly normal.
-                }
+                    try {
+                        // check if there is a suite method
+                        suiteMethod = testClass.getMethod("suite");
+                    } catch (final NoSuchMethodException e) {
+                        // no appropriate suite method found. We don't report any
+                        // error here since it might be perfectly normal.
+                    }
                 }
 
                 if (suiteMethod != null) {
                     // if there is a suite method available, then try
                     // to extract the suite from it. If there is an error
                     // here it will be caught below and reported.
-                    suite = (Test) suiteMethod.invoke(null, new Object[0]);
+                    suite = (Test) suiteMethod.invoke(null);
 
                 } else {
-                    Class junit4TestAdapterClass = null;
-                    Class junit4TestAdapterCacheClass = null;
+                    Class<?> junit4TestAdapterClass = null;
+                    Class<?> junit4TestAdapterCacheClass = null;
                     boolean useSingleMethodAdapter = false;
 
                     if (junit.framework.TestCase.class.isAssignableFrom(testClass)) {
@@ -438,50 +439,49 @@
                     // In that case first C.fN will fail with CNFE and we
                     // will avoid UnsupportedClassVersionError.
 
-                    try {
-                        Class.forName("java.lang.annotation.Annotation");
-                        junit4TestAdapterCacheClass = Class.forName("org.apache.tools.ant.taskdefs.optional.junit.CustomJUnit4TestAdapterCache");
-                        if (loader == null) {
-                            junit4TestAdapterClass =
-                                Class.forName(JUNIT_4_TEST_ADAPTER);
-                            if (testMethodsSpecified) {
-                                /*
-                                 * We cannot try to load the JUnit4TestAdapter
-                                 * before trying to load JUnit4TestMethodAdapter
-                                 * because it might fail with
-                                 * NoClassDefFoundException, instead of plain
-                                 * ClassNotFoundException.
-                                 */
-                                junit4TestAdapterClass = Class.forName(
-                                    "org.apache.tools.ant.taskdefs.optional.junit.JUnit4TestMethodAdapter");
-                                useSingleMethodAdapter = true;
-                            }
-                        } else {
-                            junit4TestAdapterClass = Class.forName(JUNIT_4_TEST_ADAPTER,
-                                              true, loader);
-                            if (testMethodsSpecified) {
-                                junit4TestAdapterClass = Class.forName(
-                                        "org.apache.tools.ant.taskdefs.optional.junit.JUnit4TestMethodAdapter",
-                                        true, loader);
-                                useSingleMethodAdapter = true;
+                        try {
+                            Class.forName("java.lang.annotation.Annotation");
+                            junit4TestAdapterCacheClass = Class.forName(
+                                "org.apache.tools.ant.taskdefs.optional.junit.CustomJUnit4TestAdapterCache");
+                            if (loader == null) {
+                                junit4TestAdapterClass = Class.forName(JUNIT_4_TEST_ADAPTER);
+                                if (testMethodsSpecified) {
+                                    /*
+                                     * We cannot try to load the JUnit4TestAdapter
+                                     * before trying to load JUnit4TestMethodAdapter
+                                     * because it might fail with
+                                     * NoClassDefFoundException, instead of plain
+                                     * ClassNotFoundException.
+                                     */
+                                    junit4TestAdapterClass = Class.forName(
+                                        "org.apache.tools.ant.taskdefs.optional.junit.JUnit4TestMethodAdapter");
+                                    useSingleMethodAdapter = true;
+                                }
+                            } else {
+                                junit4TestAdapterClass =
+                                    Class.forName(JUNIT_4_TEST_ADAPTER,
+                                                  true, loader);
+                                if (testMethodsSpecified) {
+                                    junit4TestAdapterClass = Class.forName(
+                                            "org.apache.tools.ant.taskdefs.optional.junit.JUnit4TestMethodAdapter",
+                                            true, loader);
+                                    useSingleMethodAdapter = true;
+                                }
                             }
+                        } catch (final ClassNotFoundException e) {
+                            // OK, fall back to JUnit 3.
                         }
-                    } catch (final ClassNotFoundException e) {
-                        // OK, fall back to JUnit 3.
-                    }
                     }
                     junit4 = junit4TestAdapterClass != null;
 
-                    if (junitTest.isSkipNonTests()) {
-                       if (!containsTests(testClass, junit4)) {
-                           return;
-                       }
+                    if (junitTest.isSkipNonTests()
+                        && !containsTests(testClass, junit4)) {
+                        return;
                     }
 
-
                     if (junit4) {
                         // Let's use it!
-                        Class[] formalParams;
+                        Class<?>[] formalParams;
                         Object[] actualParams;
                         if (useSingleMethodAdapter) {
                             formalParams = new Class[] {Class.class, String[].class};
@@ -492,8 +492,8 @@
                             actualParams = new Object[] {testClass, junit4TestAdapterCacheClass
                                     .getMethod("getInstance").invoke(null)};
                         }
-                        suite = (Test) junit4TestAdapterClass.getConstructor(formalParams)
-                                .newInstance(actualParams);
+                        suite = junit4TestAdapterClass.asSubclass(Test.class)
+                                .getConstructor(formalParams).newInstance(actualParams);
                     } else {
                         // Use JUnit 3.
 
@@ -513,9 +513,7 @@
                             suite = testSuite;
                         }
                     }
-
                 }
-
             } catch (final Throwable e) {
                 retCode = ERRORS;
                 exception = e;
@@ -589,12 +587,13 @@
     }
 
     private static boolean containsTests(final Class<?> testClass, final boolean isJUnit4) {
-        Class testAnnotation = null;
-        Class suiteAnnotation = null;
-        Class runWithAnnotation = null;
+        Class<? extends Annotation> testAnnotation = null;
+        Class<? extends Annotation> suiteAnnotation = null;
+        Class<? extends Annotation> runWithAnnotation = null;
 
         try {
-            testAnnotation = Class.forName("org.junit.Test");
+            testAnnotation =
+                Class.forName("org.junit.Test").asSubclass(Annotation.class);
         } catch (final ClassNotFoundException e) {
             if (isJUnit4) {
                 // odd - we think we're JUnit4 but don't support the test annotation. We therefore can't have any tests!
@@ -604,17 +603,18 @@
         }
 
         try {
-            suiteAnnotation = Class.forName("org.junit.Suite.SuiteClasses");
+            suiteAnnotation = Class.forName("org.junit.Suite.SuiteClasses")
+                .asSubclass(Annotation.class);
         } catch (final ClassNotFoundException ex) {
             // ignore - we don't have this annotation so make sure we don't check for it
         }
         try {
-            runWithAnnotation = Class.forName("org.junit.runner.RunWith");
+            runWithAnnotation = Class.forName("org.junit.runner.RunWith")
+                .asSubclass(Annotation.class);
         } catch (final ClassNotFoundException ex) {
             // also ignore as this annotation doesn't exist so tests can't use it
         }
 
-
         if (!isJUnit4 && !TestCase.class.isAssignableFrom(testClass)) {
             //a test we think is JUnit3 but does not extend TestCase. Can't really be a test.
             return false;
@@ -627,16 +627,17 @@
             }
         }
 
-        if (Modifier.isAbstract(testClass.getModifiers()) || Modifier.isInterface(testClass.getModifiers())) {
+        if (Modifier.isAbstract(testClass.getModifiers())
+                || Modifier.isInterface(testClass.getModifiers())) {
             // can't instantiate class and no inner classes are tests either
             return false;
         }
 
         if (isJUnit4) {
-             if (suiteAnnotation != null && testClass.getAnnotation(suiteAnnotation) != null) {
+            if (suiteAnnotation != null && testClass.getAnnotation(suiteAnnotation) != null) {
                 // class is marked as a suite. Let JUnit try and work its magic on it.
                 return true;
-             }
+            }
             if (runWithAnnotation != null && testClass.getAnnotation(runWithAnnotation) != null) {
                 /* Class is marked with @RunWith. If this class is badly written (no test methods,
                  * multiple constructors, private constructor etc) then the class is automatically
@@ -659,16 +660,19 @@
             } else {
                 // check if JUnit3 class have public or protected no-args methods starting with
                 // names starting with test
-                if (m.getName().startsWith("test") && m.getParameterTypes().length == 0
-                        && (Modifier.isProtected(m.getModifiers()) || Modifier.isPublic(m.getModifiers()))) {
+                if (m.getName().startsWith("test")
+                    && m.getParameterTypes().length == 0
+                    && (Modifier.isProtected(m.getModifiers())
+                        || Modifier.isPublic(m.getModifiers()))) {
                     return true;
                 }
             }
             // check if JUnit3 or JUnit4 test have a public or protected, static,
             // no-args 'suite' method
-            if (m.getName().equals("suite") && m.getParameterTypes().length == 0
-                    && (Modifier.isProtected(m.getModifiers()) || Modifier.isPublic(m.getModifiers()))
-                    && Modifier.isStatic(m.getModifiers())) {
+            if ("suite".equals(m.getName()) && m.getParameterTypes().length == 0
+                && (Modifier.isProtected(m.getModifiers())
+                    || Modifier.isPublic(m.getModifiers()))
+                && Modifier.isStatic(m.getModifiers())) {
                 return true;
             }
         }
@@ -682,6 +686,7 @@
      *
      * @return 2 if errors occurred, 1 if tests failed else 0.
      */
+    @Override
     public int getRetCode() {
         return retCode;
     }
@@ -692,6 +697,7 @@
      * <p>A new Test is started.
      * @param t the test.
      */
+    @Override
     public void startTest(final Test t) {
         final String testName = JUnitVersionHelper.getTestCaseName(t);
         logTestListenerEvent("startTest(" + testName + ")");
@@ -703,6 +709,7 @@
      * <p>A Test is finished.
      * @param test the test.
      */
+    @Override
     public void endTest(final Test test) {
         final String testName = JUnitVersionHelper.getTestCaseName(test);
         logTestListenerEvent("endTest(" + testName + ")");
@@ -713,10 +720,8 @@
             @SuppressWarnings("resource")
             final PrintStream out = savedOut != null ? savedOut : System.out;
             out.flush();
-            if (msg == null) {
-                msg = "null";
-            }
-            final StringTokenizer msgLines = new StringTokenizer(msg, "\r\n", false);
+            final StringTokenizer msgLines =
+                new StringTokenizer(String.valueOf(msg), "\r\n", false);
             while (msgLines.hasMoreTokens()) {
                 out.println(JUnitTask.TESTLISTENER_PREFIX + msgLines.nextToken());
             }
@@ -746,6 +751,7 @@
      * @param test the test.
      * @param t    the assertion thrown by the test.
      */
+    @Override
     public void addFailure(final Test test, final AssertionFailedError t) {
         addFailure(test, (Throwable) t);
     }
@@ -757,6 +763,7 @@
      * @param test the test.
      * @param t    the error thrown by the test.
      */
+    @Override
     public void addError(final Test test, final Throwable t) {
         final String testName = JUnitVersionHelper.getTestCaseName(test);
         logTestListenerEvent("addError(" + testName + ", " + t.getMessage() + ")");
@@ -770,6 +777,7 @@
      * @since Ant 1.6
      * @param permissions the permissions to use.
      */
+    @Override
     public void setPermissions(final Permissions permissions) {
         perm = permissions;
     }
@@ -778,6 +786,7 @@
      * Handle a string destined for standard output.
      * @param output the string to output
      */
+    @Override
     public void handleOutput(final String output) {
         if (!logTestListenerEvents && output.startsWith(JUnitTask.TESTLISTENER_PREFIX)) {
             // ignore
@@ -797,12 +806,14 @@
      *
      * @since Ant 1.6
      */
+    @Override
     public int handleInput(final byte[] buffer, final int offset, final int length)
         throws IOException {
         return -1;
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void handleErrorOutput(final String output) {
         if (systemError != null) {
             systemError.print(output);
@@ -810,6 +821,7 @@
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void handleFlush(final String output) {
         if (systemOut != null) {
             systemOut.print(output);
@@ -817,6 +829,7 @@
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void handleErrorFlush(final String output) {
         if (systemError != null) {
             systemError.print(output);
@@ -827,7 +840,7 @@
         final int size = formatters.size();
         for (int i = 0; i < size; i++) {
             final JUnitResultFormatter formatter =
-                ((JUnitResultFormatter) formatters.elementAt(i));
+                (JUnitResultFormatter) formatters.get(i);
 
             formatter.setSystemOutput(out);
             formatter.setSystemError(err);
@@ -857,6 +870,7 @@
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void addFormatter(final JUnitTaskMirror.JUnitResultFormatterMirror f) {
         formatters.addElement(f);
     }
@@ -949,8 +963,8 @@
                     System.exit(ERRORS);
                 }
             } else if (args[i].startsWith(Constants.PROPSFILE)) {
-                final FileInputStream in = new FileInputStream(args[i]
-                        .substring(Constants.PROPSFILE.length()));
+                final InputStream in = Files.newInputStream(Paths.get(args[i]
+                        .substring(Constants.PROPSFILE.length())));
                 props.load(in);
                 in.close();
             } else if (args[i].startsWith(Constants.SHOWOUTPUT)) {
@@ -973,18 +987,11 @@
         }
 
         // Add/overlay system properties on the properties from the Ant project
-        final Hashtable p = System.getProperties();
-        for (final Enumeration e = p.keys(); e.hasMoreElements();) {
-            final Object key = e.nextElement();
-            props.put(key, p.get(key));
-        }
+        System.getProperties().forEach(props::put);
 
         int returnCode = SUCCESS;
         if (multipleTests) {
-            try {
-                final BufferedReader reader = new BufferedReader(new FileReader(args[0]));
-                String testCaseName;
-                String[] testMethodNames;
+            try (final BufferedReader reader = new BufferedReader(new FileReader(args[0]))) {
                 int code = 0;
                 boolean errorOccurred = false;
                 boolean failureOccurred = false;
@@ -993,6 +1000,8 @@
                     final StringTokenizer st = new StringTokenizer(line, ",");
                     final String testListSpec = st.nextToken();
                     final int colonIndex = testListSpec.indexOf(':');
+                    String testCaseName;
+                    String[] testMethodNames;
                     if (colonIndex == -1) {
                         testCaseName = testListSpec;
                         testMethodNames = null;
@@ -1044,43 +1053,52 @@
         System.exit(returnCode);
     }
 
-    private static Vector fromCmdLine = new Vector();
+    private static Vector<FormatterElement> fromCmdLine = new Vector<>();
 
     private static void transferFormatters(final JUnitTestRunner runner,
                                            final JUnitTest test) {
         runner.addFormatter(new JUnitResultFormatter() {
 
+            @Override
             public void startTestSuite(final JUnitTest suite) throws BuildException {
             }
 
+            @Override
             public void endTestSuite(final JUnitTest suite) throws BuildException {
             }
 
+            @Override
             public void setOutput(final OutputStream out) {
             }
 
+            @Override
             public void setSystemOutput(final String out) {
             }
 
+            @Override
             public void setSystemError(final String err) {
             }
 
+            @Override
             public void addError(final Test arg0, final Throwable arg1) {
             }
 
+            @Override
             public void addFailure(final Test arg0, final AssertionFailedError arg1) {
             }
 
+            @Override
             public void endTest(final Test arg0) {
             }
 
+            @Override
             public void startTest(final Test arg0) {
                 registerTestCase(JUnitVersionHelper.getTestCaseName(arg0));
             }
         });
         final int size = fromCmdLine.size();
         for (int i = 0; i < size; i++) {
-            final FormatterElement fe = (FormatterElement) fromCmdLine.elementAt(i);
+            final FormatterElement fe = fromCmdLine.elementAt(i);
             if (multipleTests && fe.getUseFile()) {
                 final File destFile = new File(test.getTodir(),
                         test.getOutfile() + fe.getExtension());
@@ -1282,14 +1300,19 @@
     private int[] findJUnit4FailureErrorCount(final TestResult result) {
         int failures = 0;
         int errors = 0;
-        Enumeration e = result.failures();
-        while (e.hasMoreElements()) {
-            e.nextElement();
-            failures++;
+        {
+            @SuppressWarnings("unchecked")
+            Enumeration<TestFailure> e = result.failures();
+            while (e.hasMoreElements()) {
+                e.nextElement();
+                failures++;
+            }
         }
-        e = result.errors();
+        @SuppressWarnings("unchecked")
+        Enumeration<TestFailure> e = result.errors();
         while (e.hasMoreElements()) {
-            final Throwable t = ((TestFailure) e.nextElement()).thrownException();
+            final Throwable t =
+                e.nextElement().thrownException();
             if (t instanceof AssertionFailedError
                 || t instanceof AssertionError) {
                 failures++;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java	2018-03-24 12:37:12.000000000 +0000
@@ -82,9 +82,8 @@
             if (name.endsWith(")")) {
                 int paren = name.lastIndexOf('(');
                 return name.substring(0, paren);
-            } else {
-                return name;
             }
+            return name;
         }
         if (t instanceof TestCase && testCaseName != null) {
             try {
@@ -94,17 +93,16 @@
             }
         } else {
             try {
-                Method getNameMethod = null;
+                Method getNameMethod;
                 try {
                     getNameMethod =
-                        t.getClass().getMethod("getName", new Class [0]);
+                        t.getClass().getMethod("getName");
                 } catch (NoSuchMethodException e) {
-                    getNameMethod = t.getClass().getMethod("name",
-                                                           new Class [0]);
+                    getNameMethod = t.getClass().getMethod("name");
                 }
                 if (getNameMethod != null
                     && getNameMethod.getReturnType() == String.class) {
-                    return (String) getNameMethod.invoke(t, new Object[0]);
+                    return (String) getNameMethod.invoke(t);
                 }
             } catch (Throwable ignored) {
                 // ignore
@@ -125,8 +123,7 @@
         String className = test.getClass().getName();
         if (test instanceof JUnitTaskMirrorImpl.VmExitErrorTest) {
             className = ((JUnitTaskMirrorImpl.VmExitErrorTest) test).getClassName();
-        } else
-        if (className.equals(JUNIT_FRAMEWORK_JUNIT4_TEST_CASE_FACADE)) {
+        } else if (className.equals(JUNIT_FRAMEWORK_JUNIT4_TEST_CASE_FACADE)) {
             // JUnit 4 wraps solo tests this way. We can extract
             // the original test name with a little hack.
             String name = test.toString();
@@ -152,28 +149,22 @@
                 Class<?> testClass = Class.forName(JUnitVersionHelper.getTestCaseClassName(test));
 
                 Method testMethod = testClass.getMethod(JUnitVersionHelper.getTestCaseName(test));
-                Class ignoreAnnotation = Class.forName("org.junit.Ignore");
+                Class<? extends Annotation> ignoreAnnotation = Class
+                    .forName("org.junit.Ignore").asSubclass(Annotation.class);
                 Annotation annotation = testMethod.getAnnotation(ignoreAnnotation);
                 if (annotation != null) {
-                    Method valueMethod = annotation.getClass().getMethod("value");
+                    Method valueMethod = annotation.annotationType().getMethod("value");
                     String value = (String) valueMethod.invoke(annotation);
                     if (value != null && value.length() > 0) {
                         message = value;
                     }
                 }
-
             }
-        } catch (NoSuchMethodException e) {
-            // silently ignore - we'll report a skip with no message
-        } catch (ClassNotFoundException e) {
-            // silently ignore - we'll report a skip with no message
-        } catch (InvocationTargetException e) {
-            // silently ignore - we'll report a skip with no message
-        } catch (IllegalAccessException e) {
+        } catch (NoSuchMethodException | ClassNotFoundException
+                | InvocationTargetException | IllegalAccessException e) {
             // silently ignore - we'll report a skip with no message
         }
         return message;
-
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java	2018-03-24 12:37:12.000000000 +0000
@@ -24,6 +24,7 @@
 import java.io.StringWriter;
 import java.text.NumberFormat;
 import java.util.Hashtable;
+import java.util.Map;
 
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;
@@ -37,7 +38,6 @@
  * Prints plain text output of the test to a specified Writer.
  *
  */
-
 public class PlainJUnitResultFormatter implements JUnitResultFormatter, IgnoredTestListener {
 
     private static final double ONE_SECOND = 1000.0;
@@ -49,7 +49,7 @@
     /**
      * Timing helper.
      */
-    private Hashtable testStarts = new Hashtable();
+    private Map<Test, Long> testStarts = new Hashtable<>();
     /**
      * Where to write the log to.
      */
@@ -65,7 +65,7 @@
     /**
      * Suppress endTest if testcase failed.
      */
-    private Hashtable failed = new Hashtable();
+    private Map<Test, Boolean> failed = new Hashtable<>();
 
     private String systemOutput = null;
     private String systemError = null;
@@ -77,16 +77,19 @@
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void setOutput(OutputStream out) {
         this.out = out;
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void setSystemOutput(String out) {
         systemOutput = out;
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void setSystemError(String err) {
         systemError = err;
     }
@@ -96,15 +99,14 @@
      * @param suite the test suite
      * @throws BuildException if unable to write the output
      */
+    @Override
     public void startTestSuite(JUnitTest suite) throws BuildException {
         if (out == null) {
             return; // Quick return - no output do nothing.
         }
-        StringBuffer sb = new StringBuffer("Testsuite: ");
-        sb.append(suite.getName());
-        sb.append(StringUtils.LINE_SEP);
         try {
-            out.write(sb.toString().getBytes());
+            out.write(new StringBuilder("Testsuite: ").append(suite.getName())
+                .append(StringUtils.LINE_SEP).toString().getBytes());
             out.flush();
         } catch (IOException ex) {
             throw new BuildException("Unable to write output", ex);
@@ -116,10 +118,11 @@
      * @param suite the test suite
      * @throws BuildException if unable to write the output
      */
+    @Override
     public void endTestSuite(JUnitTest suite) throws BuildException {
         boolean success = false;
         try {
-            StringBuffer sb = new StringBuffer("Tests run: ");
+            StringBuilder sb = new StringBuilder("Tests run: ");
             sb.append(suite.runCount());
             sb.append(", Failures: ");
             sb.append(suite.failureCount());
@@ -185,6 +188,7 @@
      * <p>A new Test is started.
      * @param t the test.
      */
+    @Override
     public void startTest(Test t) {
         testStarts.put(t, new Long(System.currentTimeMillis()));
         failed.put(t, Boolean.FALSE);
@@ -196,6 +200,7 @@
      * <p>A Test is finished.
      * @param test the test.
      */
+    @Override
     public void endTest(Test test) {
         if (Boolean.TRUE.equals(failed.get(test))) {
             return;
@@ -204,7 +209,7 @@
             try {
                 wri.write("Testcase: "
                           + JUnitVersionHelper.getTestCaseName(test));
-                Long l = (Long) testStarts.get(test);
+                Long l = testStarts.get(test);
                 double seconds = 0;
                 // can be null if an error occurred in setUp
                 if (l != null) {
@@ -238,6 +243,7 @@
      * @param test the test.
      * @param t  the assertion that failed.
      */
+    @Override
     public void addFailure(Test test, AssertionFailedError t) {
         addFailure(test, (Throwable) t);
     }
@@ -249,6 +255,7 @@
      * @param test the test.
      * @param t    the exception.
      */
+    @Override
     public void addError(Test test, Throwable t) {
         formatError("\tCaused an ERROR", test, t);
     }
@@ -274,6 +281,7 @@
         }
     }
 
+    @Override
     public void testIgnored(Test test) {
         formatSkip(test, JUnitVersionHelper.getIgnoreMessage(test));
     }
@@ -297,6 +305,7 @@
 
     }
 
+    @Override
     public void testAssumptionFailure(Test test, Throwable throwable) {
         formatSkip(test, throwable.getMessage());
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java	2018-03-24 12:37:12.000000000 +0000
@@ -52,12 +52,6 @@
     private String systemError = null;
 
     /**
-     * Empty
-     */
-    public SummaryJUnitResultFormatter() {
-    }
-
-    /**
      *  Insures that a line of log output is written and flushed as a single
      *  operation, to prevent lines from being spliced into other lines.
      *  (Hopefully this solves the issue of run on lines -
@@ -81,9 +75,10 @@
      * The testsuite started.
      * @param suite the testsuite.
      */
+    @Override
     public void startTestSuite(JUnitTest suite) {
         String newLine = System.getProperty("line.separator");
-        StringBuffer sb = new StringBuffer("Running ");
+        StringBuilder sb = new StringBuilder("Running ");
         int antThreadID = suite.getThread();
 
         sb.append(suite.getName());
@@ -99,12 +94,14 @@
      * Empty
      * @param t not used.
      */
+    @Override
     public void startTest(Test t) {
     }
     /**
      * Empty
      * @param test not used.
      */
+    @Override
     public void endTest(Test test) {
     }
     /**
@@ -121,6 +118,7 @@
      * @param test not used.
      * @param t not used.
      */
+    @Override
     public void addFailure(Test test, AssertionFailedError t) {
         addFailure(test, (Throwable) t);
     }
@@ -129,20 +127,24 @@
      * @param test not used.
      * @param t not used.
      */
+    @Override
     public void addError(Test test, Throwable t) {
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void setOutput(OutputStream out) {
         this.out = out;
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void setSystemOutput(String out) {
         systemOutput = out;
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void setSystemError(String err) {
         systemError = err;
     }
@@ -152,6 +154,7 @@
      * the summary.
      * @param value if true write System.out and System.err to the summary.
      */
+    @Override
     public void setWithOutAndErr(boolean value) {
         withOutAndErr = value;
     }
@@ -161,9 +164,10 @@
      * @param suite the testsuite.
      * @throws BuildException if there is an error.
      */
+    @Override
     public void endTestSuite(JUnitTest suite) throws BuildException {
         String newLine = System.getProperty("line.separator");
-        StringBuffer sb = new StringBuffer("Tests run: ");
+        StringBuilder sb = new StringBuilder("Tests run: ");
         sb.append(suite.runCount());
         sb.append(", Failures: ");
         sb.append(suite.failureCount());
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/TearDownOnVmCrash.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/TearDownOnVmCrash.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/TearDownOnVmCrash.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/TearDownOnVmCrash.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,6 @@
 package org.apache.tools.ant.taskdefs.optional.junit;
 
 import java.io.OutputStream;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 import junit.framework.AssertionFailedError;
@@ -43,6 +42,7 @@
      * Records the suite's name to later determine the class to invoke
      * tearDown on.
      */
+    @Override
     public void startTestSuite(final JUnitTest suite) {
         suiteName = suite.getName();
         if (suiteName != null && suiteName.endsWith(JUnitTask.NAME_OF_DUMMY_TEST)) {
@@ -56,6 +56,7 @@
      * test we get when a Batch fails and the error is an actual
      * error generated by Ant.
      */
+    @Override
     public void addError(final Test fakeTest, final Throwable t) {
         if (suiteName != null && fakeTest instanceof JUnitTaskMirrorImpl.VmExitErrorTest) {
             tearDown();
@@ -66,24 +67,31 @@
     public void addFailure(Test test, Throwable t) {
     }
 
+    @Override
     public void addFailure(Test test, AssertionFailedError t) {
     }
 
+    @Override
     public void startTest(Test test) {
     }
 
+    @Override
     public void endTest(Test test) {
     }
 
+    @Override
     public void endTestSuite(JUnitTest suite) {
     }
 
+    @Override
     public void setOutput(OutputStream out) {
     }
 
+    @Override
     public void setSystemOutput(String out) {
     }
 
+    @Override
     public void setSystemError(String err) {
     }
 
@@ -91,7 +99,7 @@
         try {
             // first try to load the class and let's hope it is on our
             // classpath
-            Class testClass = null;
+            Class<?> testClass = null;
             if (Thread.currentThread().getContextClassLoader() != null) {
                 try {
                     testClass = Thread.currentThread().getContextClassLoader()
@@ -116,7 +124,7 @@
             // which test of the executed suite timed out, ignore it
             try {
                 // check if there is a suite method
-                testClass.getMethod("suite", new Class[0]);
+                testClass.getMethod("suite");
                 return;
             } catch (NoSuchMethodException e) {
                 // no suite method
@@ -127,9 +135,9 @@
             // doesn't have any tearDown method.
 
             try {
-                Method td = testClass.getMethod("tearDown", new Class[0]);
+                Method td = testClass.getMethod("tearDown");
                 if (td.getReturnType() == Void.TYPE) {
-                    td.invoke(testClass.newInstance(), new Object[0]);
+                    td.invoke(testClass.newInstance());
                 }
             } catch (NoSuchMethodException nsme) {
                 // no tearDown, fine
@@ -138,9 +146,6 @@
         } catch (ClassNotFoundException cnfe) {
             // class probably is not in our classpath, there is
             // nothing we can do
-        } catch (InvocationTargetException ite) {
-            System.err.println("Caught an exception while trying to invoke"
-                               + " tearDown: " + ite.getMessage());
         } catch (Throwable t) {
             System.err.println("Caught an exception while trying to invoke"
                                + " tearDown: " + t.getMessage());
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/TestListenerWrapper.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/TestListenerWrapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/TestListenerWrapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/TestListenerWrapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -32,31 +32,38 @@
         wrapped = listener;
     }
 
+    @Override
     public void addError(Test test, Throwable throwable) {
         wrapped.addError(test, throwable);
     }
 
+    @Override
     public void addFailure(Test test, AssertionFailedError assertionFailedError) {
         wrapped.addFailure(test, assertionFailedError);
     }
 
+    @Override
     public void endTest(Test test) {
         wrapped.endTest(test);
     }
 
+    @Override
     public void startTest(Test test) {
         wrapped.startTest(test);
     }
 
+    @Override
     public void testIgnored(Test test) {
         if (wrapped instanceof IgnoredTestListener) {
-            ((IgnoredTestListener)wrapped).testIgnored(test);
+            ((IgnoredTestListener) wrapped).testIgnored(test);
         }
     }
 
+    @Override
     public void testAssumptionFailure(Test test, Throwable throwable) {
         if (wrapped instanceof IgnoredTestListener) {
-            ((IgnoredTestListener)wrapped).testAssumptionFailure(test, throwable);
+            ((IgnoredTestListener) wrapped).testAssumptionFailure(test,
+                throwable);
         }
     }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java	2018-03-24 12:37:12.000000000 +0000
@@ -26,8 +26,8 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Date;
-import java.util.Enumeration;
 import java.util.Hashtable;
+import java.util.Map;
 import java.util.Properties;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -50,7 +50,6 @@
  *
  * @see FormatterElement
  */
-
 public class XMLJUnitResultFormatter implements JUnitResultFormatter, XMLConstants, IgnoredTestListener {
 
     private static final double ONE_SECOND = 1000.0;
@@ -84,45 +83,44 @@
      * so we can't easily match Test objects without manually iterating over all keys and checking
      * individual fields.
      */
-    private final Hashtable<String, Element> testElements = new Hashtable<String, Element>();
+    private final Hashtable<String, Element> testElements = new Hashtable<>();
 
     /**
      * tests that failed.
      */
-    private final Hashtable failedTests = new Hashtable();
+    private final Map<Test, Test> failedTests = new Hashtable<>();
 
     /**
      * Tests that were skipped.
      */
-    private final Hashtable<String, Test> skippedTests = new Hashtable<String, Test>();
+    private final Map<String, Test> skippedTests = new Hashtable<>();
     /**
      * Tests that were ignored. See the note above about the key being a bit of a hack.
      */
-    private final Hashtable<String, Test> ignoredTests = new Hashtable<String, Test>();
+    private final Map<String, Test> ignoredTests = new Hashtable<>();
     /**
      * Timing helper.
      */
-    private final Hashtable<String, Long> testStarts = new Hashtable<String, Long>();
+    private final Map<String, Long> testStarts = new Hashtable<>();
     /**
      * Where to write the log to.
      */
     private OutputStream out;
 
-    /** No arg constructor. */
-    public XMLJUnitResultFormatter() {
-    }
-
     /** {@inheritDoc}. */
+    @Override
     public void setOutput(final OutputStream out) {
         this.out = out;
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void setSystemOutput(final String out) {
         formatOutput(SYSTEM_OUT, out);
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void setSystemError(final String out) {
         formatOutput(SYSTEM_ERR, out);
     }
@@ -131,6 +129,7 @@
      * The whole testsuite started.
      * @param suite the testsuite.
      */
+    @Override
     public void startTestSuite(final JUnitTest suite) {
         doc = getDocumentBuilder().newDocument();
         rootElement = doc.createElement(TESTSUITE);
@@ -149,9 +148,7 @@
         rootElement.appendChild(propsElement);
         final Properties props = suite.getProperties();
         if (props != null) {
-            final Enumeration e = props.propertyNames();
-            while (e.hasMoreElements()) {
-                final String name = (String) e.nextElement();
+            for (String name : props.stringPropertyNames()) {
                 final Element propElement = doc.createElement(PROPERTY);
                 propElement.setAttribute(ATTR_NAME, name);
                 propElement.setAttribute(ATTR_VALUE, props.getProperty(name));
@@ -182,19 +179,20 @@
      * @param suite the testsuite.
      * @throws BuildException on error.
      */
+    @Override
     public void endTestSuite(final JUnitTest suite) throws BuildException {
-        rootElement.setAttribute(ATTR_TESTS, "" + suite.runCount());
-        rootElement.setAttribute(ATTR_FAILURES, "" + suite.failureCount());
-        rootElement.setAttribute(ATTR_ERRORS, "" + suite.errorCount());
-        rootElement.setAttribute(ATTR_SKIPPED, "" + suite.skipCount());
+        rootElement.setAttribute(ATTR_TESTS, Long.toString(suite.runCount()));
+        rootElement.setAttribute(ATTR_FAILURES, Long.toString(suite.failureCount()));
+        rootElement.setAttribute(ATTR_ERRORS, Long.toString(suite.errorCount()));
+        rootElement.setAttribute(ATTR_SKIPPED, Long.toString(suite.skipCount()));
         rootElement.setAttribute(
-            ATTR_TIME, "" + (suite.getRunTime() / ONE_SECOND));
+            ATTR_TIME, Double.toString(suite.getRunTime() / ONE_SECOND));
         if (out != null) {
             Writer wri = null;
             try {
                 wri = new BufferedWriter(new OutputStreamWriter(out, "UTF8"));
                 wri.write("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
-                (new DOMElementWriter()).write(rootElement, wri, 0, "  ");
+                new DOMElementWriter().write(rootElement, wri, 0, "  ");
             } catch (final IOException exc) {
                 throw new BuildException("Unable to write log file", exc);
             } finally {
@@ -218,12 +216,14 @@
      * <p>A new Test is started.
      * @param t the test.
      */
+    @Override
     public void startTest(final Test t) {
         testStarts.put(createDescription(t), System.currentTimeMillis());
     }
 
     private static String createDescription(final Test test) throws BuildException {
-        return JUnitVersionHelper.getTestCaseName(test) + "(" + JUnitVersionHelper.getTestCaseClassName(test) + ")";
+        return JUnitVersionHelper.getTestCaseName(test) + "("
+            + JUnitVersionHelper.getTestCaseClassName(test) + ")";
     }
 
     /**
@@ -232,6 +232,7 @@
      * <p>A Test is finished.
      * @param test the test.
      */
+    @Override
     public void endTest(final Test test) {
         final String testDescription = createDescription(test);
 
@@ -242,7 +243,9 @@
             startTest(test);
         }
         Element currentTest;
-        if (!failedTests.containsKey(test) && !skippedTests.containsKey(testDescription) && !ignoredTests.containsKey(testDescription)) {
+        if (!failedTests.containsKey(test)
+            && !skippedTests.containsKey(testDescription)
+            && !ignoredTests.containsKey(testDescription)) {
             currentTest = doc.createElement(TESTCASE);
             final String n = JUnitVersionHelper.getTestCaseName(test);
             currentTest.setAttribute(ATTR_NAME,
@@ -259,7 +262,7 @@
 
         final Long l = testStarts.get(createDescription(test));
         currentTest.setAttribute(ATTR_TIME,
-            "" + ((System.currentTimeMillis() - l) / ONE_SECOND));
+            Double.toString((System.currentTimeMillis() - l) / ONE_SECOND));
     }
 
     /**
@@ -280,6 +283,7 @@
      * @param test the test.
      * @param t the assertion.
      */
+    @Override
     public void addFailure(final Test test, final AssertionFailedError t) {
         addFailure(test, (Throwable) t);
     }
@@ -291,6 +295,7 @@
      * @param test the test.
      * @param t the error.
      */
+    @Override
     public void addError(final Test test, final Throwable t) {
         formatError(ERROR, test, t);
     }
@@ -302,12 +307,8 @@
         }
 
         final Element nested = doc.createElement(type);
-        Element currentTest;
-        if (test != null) {
-            currentTest = testElements.get(createDescription(test));
-        } else {
-            currentTest = rootElement;
-        }
+        Element currentTest = test == null ? rootElement
+            : testElements.get(createDescription(test));
 
         currentTest.appendChild(nested);
 
@@ -328,6 +329,7 @@
         nested.appendChild(doc.createCDATASection(output));
     }
 
+    @Override
     public void testIgnored(final Test test) {
         formatSkip(test, JUnitVersionHelper.getIgnoreMessage(test));
         if (test != null) {
@@ -335,7 +337,6 @@
         }
     }
 
-
     public void formatSkip(final Test test, final String message) {
         if (test != null) {
             endTest(test);
@@ -347,17 +348,14 @@
             nested.setAttribute("message", message);
         }
 
-        Element currentTest;
-        if (test != null) {
-            currentTest = testElements.get(createDescription(test));
-        } else {
-            currentTest = rootElement;
-        }
+        Element currentTest = test == null ? rootElement
+            : testElements.get(createDescription(test));
 
         currentTest.appendChild(nested);
 
     }
 
+    @Override
     public void testAssumptionFailure(final Test test, final Throwable failure) {
         formatSkip(test, failure.getMessage());
         skippedTests.put(createDescription(test), test);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,13 +19,13 @@
 
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.util.Enumeration;
+import java.nio.file.Files;
 import java.util.Vector;
+import java.util.stream.Stream;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -61,7 +61,7 @@
 
     // CheckStyle:VisibilityModifier OFF - bc
     /** the list of all filesets, that should contains the xml to aggregate */
-    protected Vector filesets = new Vector();
+    protected Vector<FileSet> filesets = new Vector<>();
 
     /** the name of the result file */
     protected String toFile;
@@ -69,7 +69,7 @@
     /** the directory to write the file to */
     protected File toDir;
 
-    protected Vector transformers = new Vector();
+    protected Vector<AggregateTransformer> transformers = new Vector<>();
 
     /** The default directory: <tt>&#046;</tt>. It is resolved from the project directory */
     public static final String DEFAULT_DIR = ".";
@@ -103,7 +103,7 @@
      */
     public AggregateTransformer createReport() {
         AggregateTransformer transformer = new AggregateTransformer(this);
-        transformers.addElement(transformer);
+        transformers.add(transformer);
         return transformer;
     }
 
@@ -133,7 +133,7 @@
      * @param    fs      the new fileset of xml results.
      */
     public void addFileSet(FileSet fs) {
-        filesets.addElement(fs);
+        filesets.add(fs);
     }
 
     /**
@@ -142,6 +142,7 @@
      * @throws  BuildException  thrown if there is a serious error while writing
      *          the document.
      */
+    @Override
     public void execute() throws BuildException {
         Element rootElement = createDocument();
         File destFile = getDestinationFile();
@@ -152,10 +153,7 @@
             throw new BuildException("Unable to write test aggregate to '" + destFile + "'", e);
         }
         // apply transformation
-        Enumeration e = transformers.elements();
-        while (e.hasMoreElements()) {
-            AggregateTransformer transformer =
-                (AggregateTransformer) e.nextElement();
+        for (AggregateTransformer transformer : transformers) {
             transformer.setXmlDocument(rootElement.getOwnerDocument());
             transformer.transform();
         }
@@ -182,26 +180,16 @@
      * @return all files in the fileset that end with a '.xml'.
      */
     protected File[] getFiles() {
-        Vector v = new Vector();
-        final int size = filesets.size();
-        for (int i = 0; i < size; i++) {
-            FileSet fs = (FileSet) filesets.elementAt(i);
-            DirectoryScanner ds = fs.getDirectoryScanner(getProject());
+        Project p = getProject();
+        return filesets.stream().flatMap(fs -> {
+            DirectoryScanner ds = fs.getDirectoryScanner(p);
             ds.scan();
-            String[] f = ds.getIncludedFiles();
-            for (int j = 0; j < f.length; j++) {
-                String pathname = f[j];
-                if (pathname.endsWith(".xml")) {
-                    File file = new File(ds.getBasedir(), pathname);
-                    file = getProject().resolveFile(file.getPath());
-                    v.addElement(file);
-                }
-            }
-        }
-
-        File[] files = new File[v.size()];
-        v.copyInto(files);
-        return files;
+            return Stream.of(ds.getIncludedFiles())
+                .filter(pathname -> pathname.endsWith(".xml")).map(pathname -> {
+                    return p.resolveFile(
+                        new File(ds.getBasedir(), pathname).getPath());
+                });
+        }).toArray(File[]::new);
     }
 
     //----- from now, the methods are all related to DOM tree manipulation
@@ -213,18 +201,16 @@
      * @throws IOException thrown if there is an error while writing the content.
      */
     protected void writeDOMTree(Document doc, File file) throws IOException {
-        OutputStream os = new FileOutputStream(file);
-        try {
-            PrintWriter wri = new PrintWriter(new OutputStreamWriter(new BufferedOutputStream(os), "UTF8"));
+        try (OutputStream os = Files.newOutputStream(file.toPath());
+             PrintWriter wri = new PrintWriter(new OutputStreamWriter(new BufferedOutputStream(os), "UTF8"))) {
             wri.write("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
-            (new DOMElementWriter()).write(doc.getDocumentElement(), wri, 0, "  ");
+            new DOMElementWriter().write(doc.getDocumentElement(), wri, 0,
+                "  ");
             wri.flush();
             // writers do not throw exceptions, so check for them.
             if (wri.checkError()) {
                 throw new IOException("Error while writing DOM content");
             }
-        } finally {
-            os.close();
         }
     }
 
@@ -250,9 +236,8 @@
             try {
                 log("Parsing file: '" + file + "'", Project.MSG_VERBOSE);
                 if (file.length() > 0) {
-                    Document testsuiteDoc
-                            = builder.parse(
-                                FileUtils.getFileUtils().toURI(files[i].getAbsolutePath()));
+                    Document testsuiteDoc = builder.parse(FileUtils
+                        .getFileUtils().toURI(files[i].getAbsolutePath()));
                     Element elem = testsuiteDoc.getDocumentElement();
                     // make sure that this is REALLY a testsuite.
                     if (TESTSUITE.equals(elem.getNodeName())) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/AbstractJUnitResultFormatter.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/AbstractJUnitResultFormatter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/AbstractJUnitResultFormatter.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/AbstractJUnitResultFormatter.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,295 @@
+package org.apache.tools.ant.taskdefs.optional.junitlauncher;
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.FileUtils;
+import org.junit.platform.engine.TestSource;
+import org.junit.platform.engine.support.descriptor.ClassSource;
+import org.junit.platform.launcher.TestIdentifier;
+import org.junit.platform.launcher.TestPlan;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.Closeable;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.Writer;
+import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * Contains some common behaviour that's used by our internal {@link TestResultFormatter}s
+ */
+abstract class AbstractJUnitResultFormatter implements TestResultFormatter {
+
+
+    protected static String NEW_LINE = System.getProperty("line.separator");
+    protected TestExecutionContext context;
+
+    private SysOutErrContentStore sysOutStore;
+    private SysOutErrContentStore sysErrStore;
+
+    @Override
+    public void sysOutAvailable(final byte[] data) {
+        if (this.sysOutStore == null) {
+            this.sysOutStore = new SysOutErrContentStore(true);
+        }
+        try {
+            this.sysOutStore.store(data);
+        } catch (IOException e) {
+            handleException(e);
+            return;
+        }
+    }
+
+    @Override
+    public void sysErrAvailable(final byte[] data) {
+        if (this.sysErrStore == null) {
+            this.sysErrStore = new SysOutErrContentStore(false);
+        }
+        try {
+            this.sysErrStore.store(data);
+        } catch (IOException e) {
+            handleException(e);
+            return;
+        }
+    }
+
+    @Override
+    public void setContext(final TestExecutionContext context) {
+        this.context = context;
+    }
+
+    /**
+     * @return Returns true if there's any stdout data, that was generated during the
+     * tests, is available for use. Else returns false.
+     */
+    boolean hasSysOut() {
+        return this.sysOutStore != null && this.sysOutStore.hasData();
+    }
+
+    /**
+     * @return Returns true if there's any stderr data, that was generated during the
+     * tests, is available for use. Else returns false.
+     */
+    boolean hasSysErr() {
+        return this.sysErrStore != null && this.sysErrStore.hasData();
+    }
+
+    /**
+     * @return Returns a {@link Reader} for reading any stdout data that was generated
+     * during the test execution. It is expected that the {@link #hasSysOut()} be first
+     * called to see if any such data is available and only if there is, then this method
+     * be called
+     * @throws IOException If there's any I/O problem while creating the {@link Reader}
+     */
+    Reader getSysOutReader() throws IOException {
+        return this.sysOutStore.getReader();
+    }
+
+    /**
+     * @return Returns a {@link Reader} for reading any stderr data that was generated
+     * during the test execution. It is expected that the {@link #hasSysErr()} be first
+     * called to see if any such data is available and only if there is, then this method
+     * be called
+     * @throws IOException If there's any I/O problem while creating the {@link Reader}
+     */
+    Reader getSysErrReader() throws IOException {
+        return this.sysErrStore.getReader();
+    }
+
+    /**
+     * Writes out any stdout data that was generated during the
+     * test execution. If there was no such data then this method just returns.
+     *
+     * @param writer The {@link Writer} to use. Cannot be null.
+     * @throws IOException If any I/O problem occurs during writing the data
+     */
+    void writeSysOut(final Writer writer) throws IOException {
+        Objects.requireNonNull(writer, "Writer cannot be null");
+        this.writeFrom(this.sysOutStore, writer);
+    }
+
+    /**
+     * Writes out any stderr data that was generated during the
+     * test execution. If there was no such data then this method just returns.
+     *
+     * @param writer The {@link Writer} to use. Cannot be null.
+     * @throws IOException If any I/O problem occurs during writing the data
+     */
+    void writeSysErr(final Writer writer) throws IOException {
+        Objects.requireNonNull(writer, "Writer cannot be null");
+        this.writeFrom(this.sysErrStore, writer);
+    }
+
+    static Optional<TestIdentifier> traverseAndFindTestClass(final TestPlan testPlan, final TestIdentifier testIdentifier) {
+        if (isTestClass(testIdentifier).isPresent()) {
+            return Optional.of(testIdentifier);
+        }
+        final Optional<TestIdentifier> parent = testPlan.getParent(testIdentifier);
+        return parent.isPresent() ? traverseAndFindTestClass(testPlan, parent.get()) : Optional.empty();
+    }
+
+    static Optional<ClassSource> isTestClass(final TestIdentifier testIdentifier) {
+        if (testIdentifier == null) {
+            return Optional.empty();
+        }
+        final Optional<TestSource> source = testIdentifier.getSource();
+        if (!source.isPresent()) {
+            return Optional.empty();
+        }
+        final TestSource testSource = source.get();
+        if (testSource instanceof ClassSource) {
+            return Optional.of((ClassSource) testSource);
+        }
+        return Optional.empty();
+    }
+
+    private void writeFrom(final SysOutErrContentStore store, final Writer writer) throws IOException {
+        final char[] chars = new char[1024];
+        int numRead = -1;
+        try (final Reader reader = store.getReader()) {
+            while ((numRead = reader.read(chars)) != -1) {
+                writer.write(chars, 0, numRead);
+            }
+        }
+    }
+
+    @Override
+    public void close() throws IOException {
+        FileUtils.close(this.sysOutStore);
+        FileUtils.close(this.sysErrStore);
+    }
+
+    protected void handleException(final Throwable t) {
+        // we currently just log it and move on.
+        this.context.getProject().ifPresent((p) -> p.log("Exception in listener "
+                + AbstractJUnitResultFormatter.this.getClass().getName(), t, Project.MSG_DEBUG));
+    }
+
+
+    /*
+    A "store" for sysout/syserr content that gets sent to the AbstractJUnitResultFormatter.
+    This store first uses a relatively decent sized in-memory buffer for storing the sysout/syserr
+    content. This in-memory buffer will be used as long as it can fit in the new content that
+    keeps coming in. When the size limit is reached, this store switches to a file based store
+    by creating a temporarily file and writing out the already in-memory held buffer content
+    and any new content that keeps arriving to this store. Once the file has been created,
+    the in-memory buffer will never be used any more and in fact is destroyed as soon as the
+    file is created.
+    Instances of this class are not thread-safe and users of this class are expected to use necessary thread
+    safety guarantees, if they want to use an instance of this class by multiple threads.
+    */
+    private static final class SysOutErrContentStore implements Closeable {
+        private static final int DEFAULT_CAPACITY_IN_BYTES = 50 * 1024; // 50 KB
+        private static final Reader EMPTY_READER = new Reader() {
+            @Override
+            public int read(final char[] cbuf, final int off, final int len) throws IOException {
+                return -1;
+            }
+
+            @Override
+            public void close() throws IOException {
+            }
+        };
+
+        private final String tmpFileSuffix;
+        private ByteBuffer inMemoryStore = ByteBuffer.allocate(DEFAULT_CAPACITY_IN_BYTES);
+        private boolean usingFileStore = false;
+        private Path filePath;
+        private FileOutputStream fileOutputStream;
+
+        private SysOutErrContentStore(final boolean isSysOut) {
+            this.tmpFileSuffix = isSysOut ? ".sysout" : ".syserr";
+        }
+
+        private void store(final byte[] data) throws IOException {
+            if (this.usingFileStore) {
+                this.storeToFile(data, 0, data.length);
+                return;
+            }
+            // we haven't yet created a file store and the data can fit in memory,
+            // so we write it in our buffer
+            try {
+                this.inMemoryStore.put(data);
+                return;
+            } catch (BufferOverflowException boe) {
+                // the buffer capacity can't hold this incoming data, so this
+                // incoming data hasn't been transferred to the buffer. let's
+                // now fall back to a file store
+                this.usingFileStore = true;
+            }
+            // since the content couldn't be transferred into in-memory buffer,
+            // we now create a file and transfer already (previously) stored in-memory
+            // content into that file, before finally transferring this new content
+            // into the file too. We then finally discard this in-memory buffer and
+            // just keep using the file store instead
+            this.fileOutputStream = createFileStore();
+            // first the existing in-memory content
+            storeToFile(this.inMemoryStore.array(), 0, this.inMemoryStore.position());
+            storeToFile(data, 0, data.length);
+            // discard the in-memory store
+            this.inMemoryStore = null;
+        }
+
+        private void storeToFile(final byte[] data, final int offset, final int length) throws IOException {
+            if (this.fileOutputStream == null) {
+                // no backing file was created so we can't do anything
+                return;
+            }
+            this.fileOutputStream.write(data, offset, length);
+        }
+
+        private FileOutputStream createFileStore() throws IOException {
+            this.filePath = Files.createTempFile(null, this.tmpFileSuffix);
+            this.filePath.toFile().deleteOnExit();
+            return new FileOutputStream(this.filePath.toFile());
+        }
+
+        /*
+         * Returns a Reader for reading the sysout/syserr content. If there's no data
+         * available in this store, then this returns a Reader which when used for read operations,
+         * will immediately indicate an EOF.
+         */
+        private Reader getReader() throws IOException {
+            if (this.usingFileStore && this.filePath != null) {
+                // we use a FileReader here so that we can use the system default character
+                // encoding for reading the contents on sysout/syserr stream, since that's the
+                // encoding that System.out/System.err uses to write out the messages
+                return new BufferedReader(new FileReader(this.filePath.toFile()));
+            }
+            if (this.inMemoryStore != null) {
+                return new InputStreamReader(new ByteArrayInputStream(this.inMemoryStore.array(), 0, this.inMemoryStore.position()));
+            }
+            // no data to read, so we return an "empty" reader
+            return EMPTY_READER;
+        }
+
+        /*
+         *  Returns true if this store has any data (either in-memory or in a file). Else
+         *  returns false.
+         */
+        private boolean hasData() {
+            if (this.inMemoryStore != null && this.inMemoryStore.position() > 0) {
+                return true;
+            }
+            if (this.usingFileStore && this.filePath != null) {
+                return true;
+            }
+            return false;
+        }
+
+        @Override
+        public void close() throws IOException {
+            this.inMemoryStore = null;
+            FileUtils.close(this.fileOutputStream);
+            FileUtils.delete(this.filePath.toFile());
+        }
+    }
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTask.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,537 @@
+package org.apache.tools.ant.taskdefs.optional.junitlauncher;
+
+import org.apache.tools.ant.AntClassLoader;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.ant.util.KeepAliveOutputStream;
+import org.junit.platform.launcher.Launcher;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestPlan;
+import org.junit.platform.launcher.core.LauncherFactory;
+import org.junit.platform.launcher.listeners.SummaryGeneratingListener;
+import org.junit.platform.launcher.listeners.TestExecutionSummary;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.io.PrintStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * An Ant {@link Task} responsible for launching the JUnit platform for running tests.
+ * This requires a minimum of JUnit 5, since that's the version in which the JUnit platform launcher
+ * APIs were introduced.
+ * <p>
+ * This task in itself doesn't run the JUnit tests, instead the sole responsibility of
+ * this task is to setup the JUnit platform launcher, build requests, launch those requests and then parse the
+ * result of the execution to present in a way that's been configured on this Ant task.
+ * </p>
+ * <p>
+ * Furthermore, this task allows users control over which classes to select for passing on to the JUnit 5
+ * platform for test execution. It however, is solely the JUnit 5 platform, backed by test engines that
+ * decide and execute the tests.
+ *
+ * @see <a href="https://junit.org/junit5/">JUnit 5 documentation</a> for more details
+ * on how JUnit manages the platform and the test engines.
+ */
+public class JUnitLauncherTask extends Task {
+
+    private Path classPath;
+    private boolean haltOnFailure;
+    private String failureProperty;
+    private final List<TestDefinition> tests = new ArrayList<>();
+    private final List<ListenerDefinition> listeners = new ArrayList<>();
+
+    public JUnitLauncherTask() {
+    }
+
+    @Override
+    public void execute() throws BuildException {
+        final ClassLoader previousClassLoader = Thread.currentThread().getContextClassLoader();
+        try {
+            final ClassLoader executionCL = createClassLoaderForTestExecution();
+            Thread.currentThread().setContextClassLoader(executionCL);
+            final Launcher launcher = LauncherFactory.create();
+            final List<TestRequest> requests = buildTestRequests();
+            for (final TestRequest testRequest : requests) {
+                try {
+                    final TestDefinition test = testRequest.getOwner();
+                    final LauncherDiscoveryRequest request = testRequest.getDiscoveryRequest().build();
+                    final List<TestExecutionListener> testExecutionListeners = new ArrayList<>();
+                    // a listener that we always put at the front of list of listeners
+                    // for this request.
+                    final Listener firstListener = new Listener();
+                    // we always enroll the summary generating listener, to the request, so that we
+                    // get to use some of the details of the summary for our further decision making
+                    testExecutionListeners.add(firstListener);
+                    testExecutionListeners.addAll(getListeners(testRequest, executionCL));
+                    final PrintStream originalSysOut = System.out;
+                    final PrintStream originalSysErr = System.err;
+                    try {
+                        firstListener.switchedSysOutHandle = trySwitchSysOutErr(testRequest, StreamType.SYS_OUT);
+                        firstListener.switchedSysErrHandle = trySwitchSysOutErr(testRequest, StreamType.SYS_ERR);
+                        launcher.execute(request, testExecutionListeners.toArray(new TestExecutionListener[testExecutionListeners.size()]));
+                    } finally {
+                        // switch back sysout/syserr to the original
+                        try {
+                            System.setOut(originalSysOut);
+                        } catch (Exception e) {
+                            // ignore
+                        }
+                        try {
+                            System.setErr(originalSysErr);
+                        } catch (Exception e) {
+                            // ignore
+                        }
+                    }
+                    handleTestExecutionCompletion(test, firstListener.getSummary());
+                } finally {
+                    try {
+                        testRequest.close();
+                    } catch (Exception e) {
+                        // log and move on
+                        log("Failed to cleanly close test request", e, Project.MSG_DEBUG);
+                    }
+                }
+            }
+        } finally {
+            Thread.currentThread().setContextClassLoader(previousClassLoader);
+        }
+    }
+
+    /**
+     * Adds the {@link Path} to the classpath which will be used for execution of the tests
+     *
+     * @param path The classpath
+     */
+    public void addConfiguredClassPath(final Path path) {
+        if (this.classPath == null) {
+            // create a "wrapper" path which can hold on to multiple
+            // paths that get passed to this method (if at all the task in the build is
+            // configured with multiple classpaht elements)
+            this.classPath = new Path(getProject());
+        }
+        this.classPath.add(path);
+    }
+
+    /**
+     * Adds a {@link SingleTestClass} that will be passed on to the underlying JUnit platform
+     * for possible execution of the test
+     *
+     * @param test The test
+     */
+    public void addConfiguredTest(final SingleTestClass test) {
+        this.preConfigure(test);
+        this.tests.add(test);
+    }
+
+    /**
+     * Adds {@link TestClasses} that will be passed on to the underlying JUnit platform for
+     * possible execution of the tests
+     *
+     * @param testClasses The test classes
+     */
+    public void addConfiguredTestClasses(final TestClasses testClasses) {
+        this.preConfigure(testClasses);
+        this.tests.add(testClasses);
+    }
+
+    /**
+     * Adds a {@link ListenerDefinition listener} which will be enrolled for listening to test
+     * execution events
+     *
+     * @param listener The listener
+     */
+    public void addConfiguredListener(final ListenerDefinition listener) {
+        this.listeners.add(listener);
+    }
+
+    public void setHaltonfailure(final boolean haltonfailure) {
+        this.haltOnFailure = haltonfailure;
+    }
+
+    public void setFailureProperty(final String failureProperty) {
+        this.failureProperty = failureProperty;
+    }
+
+    private void preConfigure(final TestDefinition test) {
+        if (test.getHaltOnFailure() == null) {
+            test.setHaltOnFailure(this.haltOnFailure);
+        }
+        if (test.getFailureProperty() == null) {
+            test.setFailureProperty(this.failureProperty);
+        }
+    }
+
+    private List<TestRequest> buildTestRequests() {
+        if (this.tests.isEmpty()) {
+            return Collections.emptyList();
+        }
+        final List<TestRequest> requests = new ArrayList<>();
+        for (final TestDefinition test : this.tests) {
+            final List<TestRequest> testRequests = test.createTestRequests(this);
+            if (testRequests == null || testRequests.isEmpty()) {
+                continue;
+            }
+            requests.addAll(testRequests);
+        }
+        return requests;
+    }
+
+    private List<TestExecutionListener> getListeners(final TestRequest testRequest, final ClassLoader classLoader) {
+        final TestDefinition test = testRequest.getOwner();
+        final List<ListenerDefinition> applicableListenerElements = test.getListeners().isEmpty() ? this.listeners : test.getListeners();
+        final List<TestExecutionListener> listeners = new ArrayList<>();
+        final Project project = getProject();
+        for (final ListenerDefinition applicableListener : applicableListenerElements) {
+            if (!applicableListener.shouldUse(project)) {
+                log("Excluding listener " + applicableListener.getClassName() + " since it's not applicable" +
+                        " in the context of project " + project, Project.MSG_DEBUG);
+                continue;
+            }
+            final TestExecutionListener listener = requireTestExecutionListener(applicableListener, classLoader);
+            if (listener instanceof TestResultFormatter) {
+                // setup/configure the result formatter
+                setupResultFormatter(testRequest, applicableListener, (TestResultFormatter) listener);
+            }
+            listeners.add(listener);
+        }
+        return listeners;
+    }
+
+    private void setupResultFormatter(final TestRequest testRequest, final ListenerDefinition formatterDefinition,
+                                      final TestResultFormatter resultFormatter) {
+
+        testRequest.closeUponCompletion(resultFormatter);
+        // set the execution context
+        resultFormatter.setContext(new InVMExecution());
+        // set the destination output stream for writing out the formatted result
+        final TestDefinition test = testRequest.getOwner();
+        final java.nio.file.Path outputDir = test.getOutputDir() != null ? Paths.get(test.getOutputDir()) : getProject().getBaseDir().toPath();
+        final String filename = formatterDefinition.requireResultFile(test);
+        final java.nio.file.Path resultOutputFile = Paths.get(outputDir.toString(), filename);
+        try {
+            final OutputStream resultOutputStream = Files.newOutputStream(resultOutputFile);
+            // enroll the output stream to be closed when the execution of the TestRequest completes
+            testRequest.closeUponCompletion(resultOutputStream);
+            resultFormatter.setDestination(new KeepAliveOutputStream(resultOutputStream));
+        } catch (IOException e) {
+            throw new BuildException(e);
+        }
+        // check if system.out/system.err content needs to be passed on to the listener
+        if (formatterDefinition.shouldSendSysOut()) {
+            testRequest.addSysOutInterest(resultFormatter);
+        }
+        if (formatterDefinition.shouldSendSysErr()) {
+            testRequest.addSysErrInterest(resultFormatter);
+        }
+    }
+
+    private TestExecutionListener requireTestExecutionListener(final ListenerDefinition listener, final ClassLoader classLoader) {
+        final String className = listener.getClassName();
+        if (className == null || className.trim().isEmpty()) {
+            throw new BuildException("classname attribute value is missing on listener element");
+        }
+        final Class<?> klass;
+        try {
+            klass = Class.forName(className, false, classLoader);
+        } catch (ClassNotFoundException e) {
+            throw new BuildException("Failed to load listener class " + className, e);
+        }
+        if (!TestExecutionListener.class.isAssignableFrom(klass)) {
+            throw new BuildException("Listener class " + className + " is not of type " + TestExecutionListener.class.getName());
+        }
+        try {
+            return TestExecutionListener.class.cast(klass.newInstance());
+        } catch (Exception e) {
+            throw new BuildException("Failed to create an instance of listener " + className, e);
+        }
+    }
+
+    private void handleTestExecutionCompletion(final TestDefinition test, final TestExecutionSummary summary) {
+        final boolean hasTestFailures = summary.getTestsFailedCount() != 0;
+        try {
+            if (hasTestFailures && test.getFailureProperty() != null) {
+                // if there are test failures and the test is configured to set a property in case
+                // of failure, then set the property to true
+                getProject().setNewProperty(test.getFailureProperty(), "true");
+            }
+        } finally {
+            if (hasTestFailures && test.isHaltOnFailure()) {
+                // if the test is configured to halt on test failures, throw a build error
+                final String errorMessage;
+                if (test instanceof NamedTest) {
+                    errorMessage = "Test " + ((NamedTest) test).getName() + " has " + summary.getTestsFailedCount() + " failure(s)";
+                } else {
+                    errorMessage = "Some test(s) have failure(s)";
+                }
+                throw new BuildException(errorMessage);
+            }
+        }
+    }
+
+    private ClassLoader createClassLoaderForTestExecution() {
+        if (this.classPath == null) {
+            return this.getClass().getClassLoader();
+        }
+        return new AntClassLoader(this.getClass().getClassLoader(), getProject(), this.classPath, true);
+    }
+
+    private Optional<SwitchedStreamHandle> trySwitchSysOutErr(final TestRequest testRequest, final StreamType streamType) {
+        switch (streamType) {
+            case SYS_OUT: {
+                if (!testRequest.interestedInSysOut()) {
+                    return Optional.empty();
+                }
+                break;
+            }
+            case SYS_ERR: {
+                if (!testRequest.interestedInSysErr()) {
+                    return Optional.empty();
+                }
+                break;
+            }
+            default: {
+                // unknown, but no need to error out, just be lenient
+                // and return back
+                return Optional.empty();
+            }
+        }
+        final PipedOutputStream pipedOutputStream = new PipedOutputStream();
+        final PipedInputStream pipedInputStream;
+        try {
+            pipedInputStream = new PipedInputStream(pipedOutputStream);
+        } catch (IOException ioe) {
+            // log and return
+            return Optional.empty();
+        }
+        final PrintStream printStream = new PrintStream(pipedOutputStream, true);
+        final SysOutErrStreamReader streamer;
+        switch (streamType) {
+            case SYS_OUT: {
+                System.setOut(new PrintStream(printStream));
+                streamer = new SysOutErrStreamReader(this, pipedInputStream,
+                        StreamType.SYS_OUT, testRequest.getSysOutInterests());
+                final Thread sysOutStreamer = new Thread(streamer);
+                sysOutStreamer.setDaemon(true);
+                sysOutStreamer.setName("junitlauncher-sysout-stream-reader");
+                sysOutStreamer.setUncaughtExceptionHandler((t, e) -> this.log("Failed in sysout streaming", e, Project.MSG_INFO));
+                sysOutStreamer.start();
+                break;
+            }
+            case SYS_ERR: {
+                System.setErr(new PrintStream(printStream));
+                streamer = new SysOutErrStreamReader(this, pipedInputStream,
+                        StreamType.SYS_ERR, testRequest.getSysErrInterests());
+                final Thread sysErrStreamer = new Thread(streamer);
+                sysErrStreamer.setDaemon(true);
+                sysErrStreamer.setName("junitlauncher-syserr-stream-reader");
+                sysErrStreamer.setUncaughtExceptionHandler((t, e) -> this.log("Failed in syserr streaming", e, Project.MSG_INFO));
+                sysErrStreamer.start();
+                break;
+            }
+            default: {
+                return Optional.empty();
+            }
+        }
+        return Optional.of(new SwitchedStreamHandle(pipedOutputStream, streamer));
+    }
+
+    private enum StreamType {
+        SYS_OUT,
+        SYS_ERR
+    }
+
+    private static final class SysOutErrStreamReader implements Runnable {
+        private static final byte[] EMPTY = new byte[0];
+
+        private final JUnitLauncherTask task;
+        private final InputStream sourceStream;
+        private final StreamType streamType;
+        private final Collection<TestResultFormatter> resultFormatters;
+        private volatile SysOutErrContentDeliverer contentDeliverer;
+
+        SysOutErrStreamReader(final JUnitLauncherTask task, final InputStream source, final StreamType streamType, final Collection<TestResultFormatter> resultFormatters) {
+            this.task = task;
+            this.sourceStream = source;
+            this.streamType = streamType;
+            this.resultFormatters = resultFormatters;
+        }
+
+        @Override
+        public void run() {
+            final SysOutErrContentDeliverer streamContentDeliver = new SysOutErrContentDeliverer(this.streamType, this.resultFormatters);
+            final Thread deliveryThread = new Thread(streamContentDeliver);
+            deliveryThread.setName("junitlauncher-" + (this.streamType == StreamType.SYS_OUT ? "sysout" : "syserr") + "-stream-deliverer");
+            deliveryThread.setDaemon(true);
+            deliveryThread.start();
+            this.contentDeliverer = streamContentDeliver;
+            int numRead = -1;
+            final byte[] data = new byte[1024];
+            try {
+                while ((numRead = this.sourceStream.read(data)) != -1) {
+                    final byte[] copy = Arrays.copyOf(data, numRead);
+                    streamContentDeliver.availableData.offer(copy);
+                }
+            } catch (IOException e) {
+                task.log("Failed while streaming " + (this.streamType == StreamType.SYS_OUT ? "sysout" : "syserr") + " data",
+                        e, Project.MSG_INFO);
+                return;
+            } finally {
+                streamContentDeliver.stop = true;
+                // just "wakeup" the delivery thread, to take into account
+                // those race conditions, where that other thread didn't yet
+                // notice that it was asked to stop and has now gone into a
+                // X amount of wait, waiting for any new data
+                streamContentDeliver.availableData.offer(EMPTY);
+            }
+        }
+    }
+
+    private static final class SysOutErrContentDeliverer implements Runnable {
+        private volatile boolean stop;
+        private final Collection<TestResultFormatter> resultFormatters;
+        private final StreamType streamType;
+        private final BlockingQueue<byte[]> availableData = new LinkedBlockingQueue<>();
+        private final CountDownLatch completionLatch = new CountDownLatch(1);
+
+        SysOutErrContentDeliverer(final StreamType streamType, final Collection<TestResultFormatter> resultFormatters) {
+            this.streamType = streamType;
+            this.resultFormatters = resultFormatters;
+        }
+
+        @Override
+        public void run() {
+            try {
+                while (!this.stop) {
+                    final byte[] streamData;
+                    try {
+                        streamData = this.availableData.poll(2, TimeUnit.SECONDS);
+                    } catch (InterruptedException e) {
+                        Thread.currentThread().interrupt();
+                        return;
+                    }
+                    if (streamData != null) {
+                        deliver(streamData);
+                    }
+                }
+                // drain it
+                final List<byte[]> remaining = new ArrayList<>();
+                this.availableData.drainTo(remaining);
+                if (!remaining.isEmpty()) {
+                    for (final byte[] data : remaining) {
+                        deliver(data);
+                    }
+                }
+            } finally {
+                this.completionLatch.countDown();
+            }
+        }
+
+        private void deliver(final byte[] data) {
+            if (data == null || data.length == 0) {
+                return;
+            }
+            for (final TestResultFormatter resultFormatter : this.resultFormatters) {
+                // send it to the formatter
+                switch (streamType) {
+                    case SYS_OUT: {
+                        resultFormatter.sysOutAvailable(data);
+                        break;
+                    }
+                    case SYS_ERR: {
+                        resultFormatter.sysErrAvailable(data);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    private final class SwitchedStreamHandle {
+        private final PipedOutputStream outputStream;
+        private final SysOutErrStreamReader streamReader;
+
+        SwitchedStreamHandle(final PipedOutputStream outputStream, final SysOutErrStreamReader streamReader) {
+            this.streamReader = streamReader;
+            this.outputStream = outputStream;
+        }
+    }
+
+    private final class Listener extends SummaryGeneratingListener {
+        private Optional<SwitchedStreamHandle> switchedSysOutHandle;
+        private Optional<SwitchedStreamHandle> switchedSysErrHandle;
+
+        @Override
+        public void testPlanExecutionFinished(final TestPlan testPlan) {
+            super.testPlanExecutionFinished(testPlan);
+            // now that the test plan execution is finished, close the switched sysout/syserr output streams
+            // and wait for the sysout and syserr content delivery, to result formatters, to finish
+            if (this.switchedSysOutHandle.isPresent()) {
+                final SwitchedStreamHandle sysOut = this.switchedSysOutHandle.get();
+                try {
+                    closeAndWait(sysOut);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    return;
+                }
+            }
+            if (this.switchedSysErrHandle.isPresent()) {
+                final SwitchedStreamHandle sysErr = this.switchedSysErrHandle.get();
+                try {
+                    closeAndWait(sysErr);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    return;
+                }
+            }
+        }
+
+        private void closeAndWait(final SwitchedStreamHandle handle) throws InterruptedException {
+            FileUtils.close(handle.outputStream);
+            if (handle.streamReader.contentDeliverer == null) {
+                return;
+            }
+            // wait for a few seconds
+            handle.streamReader.contentDeliverer.completionLatch.await(2, TimeUnit.SECONDS);
+        }
+    }
+
+    private final class InVMExecution implements TestExecutionContext {
+
+        private final Properties props;
+
+        InVMExecution() {
+            this.props = new Properties();
+            this.props.putAll(JUnitLauncherTask.this.getProject().getProperties());
+        }
+
+        @Override
+        public Properties getProperties() {
+            return this.props;
+        }
+
+        @Override
+        public Optional<Project> getProject() {
+            return Optional.of(JUnitLauncherTask.this.getProject());
+        }
+    }
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyBriefResultFormatter.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyBriefResultFormatter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyBriefResultFormatter.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyBriefResultFormatter.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,17 @@
+package org.apache.tools.ant.taskdefs.optional.junitlauncher;
+
+import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.launcher.TestIdentifier;
+
+/**
+ * A {@link TestResultFormatter} which prints a brief statistic for tests that have
+ * failed, aborted or skipped
+ */
+class LegacyBriefResultFormatter extends LegacyPlainResultFormatter implements TestResultFormatter {
+
+    @Override
+    protected boolean shouldReportExecutionFinished(final TestIdentifier testIdentifier, final TestExecutionResult testExecutionResult) {
+        final TestExecutionResult.Status resultStatus = testExecutionResult.getStatus();
+        return resultStatus == TestExecutionResult.Status.ABORTED || resultStatus == TestExecutionResult.Status.FAILED;
+    }
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyPlainResultFormatter.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyPlainResultFormatter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyPlainResultFormatter.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyPlainResultFormatter.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,294 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package org.apache.tools.ant.taskdefs.optional.junitlauncher;
+
+import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.engine.reporting.ReportEntry;
+import org.junit.platform.engine.support.descriptor.ClassSource;
+import org.junit.platform.launcher.TestIdentifier;
+import org.junit.platform.launcher.TestPlan;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+
+/**
+ * A {@link TestResultFormatter} which prints a short statistic for each of the tests
+ */
+class LegacyPlainResultFormatter extends AbstractJUnitResultFormatter implements TestResultFormatter {
+
+    private OutputStream outputStream;
+    private final Map<TestIdentifier, Stats> testIds = new ConcurrentHashMap<>();
+    private TestPlan testPlan;
+    private BufferedWriter writer;
+
+    @Override
+    public void testPlanExecutionStarted(final TestPlan testPlan) {
+        this.testPlan = testPlan;
+    }
+
+    @Override
+    public void testPlanExecutionFinished(final TestPlan testPlan) {
+        for (final Map.Entry<TestIdentifier, Stats> entry : this.testIds.entrySet()) {
+            final TestIdentifier testIdentifier = entry.getKey();
+            if (!isTestClass(testIdentifier).isPresent()) {
+                // we are not interested in anything other than a test "class" in this section
+                continue;
+            }
+            final Stats stats = entry.getValue();
+            final StringBuilder sb = new StringBuilder("Tests run: ").append(stats.numTestsRun.get());
+            sb.append(", Failures: ").append(stats.numTestsFailed.get());
+            sb.append(", Skipped: ").append(stats.numTestsSkipped.get());
+            sb.append(", Aborted: ").append(stats.numTestsAborted.get());
+            final long timeElapsed = stats.endedAt - stats.startedAt;
+            sb.append(", Time elapsed: ");
+            if (timeElapsed < 1000) {
+                sb.append(timeElapsed).append(" milli sec(s)");
+            } else {
+                sb.append(TimeUnit.SECONDS.convert(timeElapsed, TimeUnit.MILLISECONDS)).append(" sec(s)");
+            }
+            try {
+                this.writer.write(sb.toString());
+                this.writer.newLine();
+            } catch (IOException ioe) {
+                handleException(ioe);
+                return;
+            }
+        }
+        // write out sysout and syserr content if any
+        try {
+            if (this.hasSysOut()) {
+                this.writer.write("------------- Standard Output ---------------");
+                this.writer.newLine();
+                writeSysOut(writer);
+                this.writer.write("------------- ---------------- ---------------");
+                this.writer.newLine();
+            }
+            if (this.hasSysErr()) {
+                this.writer.write("------------- Standard Error ---------------");
+                this.writer.newLine();
+                writeSysErr(writer);
+                this.writer.write("------------- ---------------- ---------------");
+                this.writer.newLine();
+            }
+        } catch (IOException ioe) {
+            handleException(ioe);
+            return;
+        }
+    }
+
+    @Override
+    public void dynamicTestRegistered(final TestIdentifier testIdentifier) {
+        // nothing to do
+    }
+
+    @Override
+    public void executionSkipped(final TestIdentifier testIdentifier, final String reason) {
+        final long currentTime = System.currentTimeMillis();
+        this.testIds.putIfAbsent(testIdentifier, new Stats(testIdentifier, currentTime));
+        final Stats stats = this.testIds.get(testIdentifier);
+        stats.setEndedAt(currentTime);
+        if (testIdentifier.isTest()) {
+            final StringBuilder sb = new StringBuilder();
+            sb.append("Test: ");
+            sb.append(testIdentifier.getLegacyReportingName());
+            final long timeElapsed = stats.endedAt - stats.startedAt;
+            sb.append(" took ");
+            if (timeElapsed < 1000) {
+                sb.append(timeElapsed).append(" milli sec(s)");
+            } else {
+                sb.append(TimeUnit.SECONDS.convert(timeElapsed, TimeUnit.MILLISECONDS)).append(" sec(s)");
+            }
+            sb.append(" SKIPPED");
+            if (reason != null && !reason.isEmpty()) {
+                sb.append(": ").append(reason);
+            }
+            try {
+                this.writer.write(sb.toString());
+                this.writer.newLine();
+            } catch (IOException ioe) {
+                handleException(ioe);
+                return;
+            }
+        }
+        // get the parent test class to which this skipped test belongs to
+        final Optional<TestIdentifier> parentTestClass = traverseAndFindTestClass(this.testPlan, testIdentifier);
+        if (!parentTestClass.isPresent()) {
+            return;
+        }
+        final Stats parentClassStats = this.testIds.get(parentTestClass.get());
+        parentClassStats.numTestsSkipped.incrementAndGet();
+    }
+
+    @Override
+    public void executionStarted(final TestIdentifier testIdentifier) {
+        final long currentTime = System.currentTimeMillis();
+        // record this testidentifier's start
+        this.testIds.putIfAbsent(testIdentifier, new Stats(testIdentifier, currentTime));
+        final Optional<ClassSource> testClass = isTestClass(testIdentifier);
+        if (testClass.isPresent()) {
+            // if this is a test class, then print it out
+            try {
+                this.writer.write("Testcase: " + testClass.get().getClassName());
+                this.writer.newLine();
+            } catch (IOException ioe) {
+                handleException(ioe);
+                return;
+            }
+        }
+        // if this is a test (method) then increment the tests run for the test class to which
+        // this test belongs to
+        if (testIdentifier.isTest()) {
+            final Optional<TestIdentifier> parentTestClass = traverseAndFindTestClass(this.testPlan, testIdentifier);
+            if (parentTestClass.isPresent()) {
+                final Stats parentClassStats = this.testIds.get(parentTestClass.get());
+                if (parentClassStats != null) {
+                    parentClassStats.numTestsRun.incrementAndGet();
+                }
+            }
+        }
+    }
+
+    @Override
+    public void executionFinished(final TestIdentifier testIdentifier, final TestExecutionResult testExecutionResult) {
+        final long currentTime = System.currentTimeMillis();
+        final Stats stats = this.testIds.get(testIdentifier);
+        if (stats != null) {
+            stats.setEndedAt(currentTime);
+        }
+        if (testIdentifier.isTest() && shouldReportExecutionFinished(testIdentifier, testExecutionResult)) {
+            final StringBuilder sb = new StringBuilder();
+            sb.append("Test: ");
+            sb.append(testIdentifier.getLegacyReportingName());
+            if (stats != null) {
+                final long timeElapsed = stats.endedAt - stats.startedAt;
+                sb.append(" took ");
+                if (timeElapsed < 1000) {
+                    sb.append(timeElapsed).append(" milli sec(s)");
+                } else {
+                    sb.append(TimeUnit.SECONDS.convert(timeElapsed, TimeUnit.MILLISECONDS)).append(" sec(s)");
+                }
+            }
+            switch (testExecutionResult.getStatus()) {
+                case ABORTED: {
+                    sb.append(" ABORTED");
+                    appendThrowable(sb, testExecutionResult);
+                    break;
+                }
+                case FAILED: {
+                    sb.append(" FAILED");
+                    appendThrowable(sb, testExecutionResult);
+                    break;
+                }
+            }
+            try {
+                this.writer.write(sb.toString());
+                this.writer.newLine();
+            } catch (IOException ioe) {
+                handleException(ioe);
+                return;
+            }
+        }
+        // get the parent test class in which this test completed
+        final Optional<TestIdentifier> parentTestClass = traverseAndFindTestClass(this.testPlan, testIdentifier);
+        if (!parentTestClass.isPresent()) {
+            return;
+        }
+        // update the stats of the parent test class
+        final Stats parentClassStats = this.testIds.get(parentTestClass.get());
+        switch (testExecutionResult.getStatus()) {
+            case ABORTED: {
+                parentClassStats.numTestsAborted.incrementAndGet();
+                break;
+            }
+            case FAILED: {
+                parentClassStats.numTestsFailed.incrementAndGet();
+                break;
+            }
+        }
+    }
+
+    @Override
+    public void reportingEntryPublished(final TestIdentifier testIdentifier, final ReportEntry entry) {
+        // nothing to do
+    }
+
+    @Override
+    public void setDestination(final OutputStream os) {
+        this.outputStream = os;
+        try {
+            this.writer = new BufferedWriter(new OutputStreamWriter(this.outputStream, "UTF-8"));
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException("Failed to create a writer", e);
+        }
+    }
+
+    protected boolean shouldReportExecutionFinished(final TestIdentifier testIdentifier, final TestExecutionResult testExecutionResult) {
+        return true;
+    }
+
+    private static void appendThrowable(final StringBuilder sb, TestExecutionResult result) {
+        if (!result.getThrowable().isPresent()) {
+            return;
+        }
+        final Throwable throwable = result.getThrowable().get();
+        sb.append(": ").append(throwable.getMessage());
+        sb.append(NEW_LINE);
+        final StringWriter stacktrace = new StringWriter();
+        throwable.printStackTrace(new PrintWriter(stacktrace));
+        sb.append(stacktrace.toString());
+    }
+
+    @Override
+    public void close() throws IOException {
+        if (this.writer != null) {
+            this.writer.close();
+        }
+        super.close();
+    }
+
+    private final class Stats {
+        private final TestIdentifier testIdentifier;
+        private final AtomicLong numTestsRun = new AtomicLong(0);
+        private final AtomicLong numTestsFailed = new AtomicLong(0);
+        private final AtomicLong numTestsSkipped = new AtomicLong(0);
+        private final AtomicLong numTestsAborted = new AtomicLong(0);
+        private final long startedAt;
+        private long endedAt;
+
+        private Stats(final TestIdentifier testIdentifier, final long startedAt) {
+            this.testIdentifier = testIdentifier;
+            this.startedAt = startedAt;
+        }
+
+        private void setEndedAt(final long endedAt) {
+            this.endedAt = endedAt;
+        }
+    }
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyXmlResultFormatter.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyXmlResultFormatter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyXmlResultFormatter.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyXmlResultFormatter.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,363 @@
+package org.apache.tools.ant.taskdefs.optional.junitlauncher;
+
+import org.apache.tools.ant.util.DOMElementWriter;
+import org.apache.tools.ant.util.DateUtils;
+import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.engine.TestSource;
+import org.junit.platform.engine.reporting.ReportEntry;
+import org.junit.platform.engine.support.descriptor.ClassSource;
+import org.junit.platform.launcher.TestIdentifier;
+import org.junit.platform.launcher.TestPlan;
+
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.util.Date;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * A {@link TestResultFormatter} which generates an XML report of the tests. The generated XML reports
+ * conforms to the schema of the XML that was generated by the {@code junit} task's XML
+ * report formatter and can be used by the {@code junitreport} task
+ */
+class LegacyXmlResultFormatter extends AbstractJUnitResultFormatter implements TestResultFormatter {
+
+    private static final double ONE_SECOND = 1000.0;
+
+    private OutputStream outputStream;
+    private final Map<TestIdentifier, Stats> testIds = new ConcurrentHashMap<>();
+    private final Map<TestIdentifier, Optional<String>> skipped = new ConcurrentHashMap<>();
+    private final Map<TestIdentifier, Optional<Throwable>> failed = new ConcurrentHashMap<>();
+    private final Map<TestIdentifier, Optional<Throwable>> aborted = new ConcurrentHashMap<>();
+
+    private TestPlan testPlan;
+    private long testPlanStartedAt = -1;
+    private long testPlanEndedAt = -1;
+    private final AtomicLong numTestsRun = new AtomicLong(0);
+    private final AtomicLong numTestsFailed = new AtomicLong(0);
+    private final AtomicLong numTestsSkipped = new AtomicLong(0);
+    private final AtomicLong numTestsAborted = new AtomicLong(0);
+
+
+    @Override
+    public void testPlanExecutionStarted(final TestPlan testPlan) {
+        this.testPlan = testPlan;
+        this.testPlanStartedAt = System.currentTimeMillis();
+    }
+
+    @Override
+    public void testPlanExecutionFinished(final TestPlan testPlan) {
+        this.testPlanEndedAt = System.currentTimeMillis();
+        // format and print out the result
+        try {
+            new XMLReportWriter().write();
+        } catch (IOException | XMLStreamException e) {
+            handleException(e);
+            return;
+        }
+    }
+
+    @Override
+    public void dynamicTestRegistered(final TestIdentifier testIdentifier) {
+        // nothing to do
+    }
+
+    @Override
+    public void executionSkipped(final TestIdentifier testIdentifier, final String reason) {
+        final long currentTime = System.currentTimeMillis();
+        this.numTestsSkipped.incrementAndGet();
+        this.skipped.put(testIdentifier, Optional.ofNullable(reason));
+        // a skipped test is considered started and ended now
+        final Stats stats = new Stats(testIdentifier, currentTime);
+        stats.endedAt = currentTime;
+        this.testIds.put(testIdentifier, stats);
+    }
+
+    @Override
+    public void executionStarted(final TestIdentifier testIdentifier) {
+        final long currentTime = System.currentTimeMillis();
+        this.testIds.putIfAbsent(testIdentifier, new Stats(testIdentifier, currentTime));
+        if (testIdentifier.isTest()) {
+            this.numTestsRun.incrementAndGet();
+        }
+    }
+
+    @Override
+    public void executionFinished(final TestIdentifier testIdentifier, final TestExecutionResult testExecutionResult) {
+        final long currentTime = System.currentTimeMillis();
+        final Stats stats = this.testIds.get(testIdentifier);
+        if (stats != null) {
+            stats.endedAt = currentTime;
+        }
+        switch (testExecutionResult.getStatus()) {
+            case SUCCESSFUL: {
+                break;
+            }
+            case ABORTED: {
+                this.numTestsAborted.incrementAndGet();
+                this.aborted.put(testIdentifier, testExecutionResult.getThrowable());
+                break;
+            }
+            case FAILED: {
+                this.numTestsFailed.incrementAndGet();
+                this.failed.put(testIdentifier, testExecutionResult.getThrowable());
+                break;
+            }
+        }
+    }
+
+    @Override
+    public void reportingEntryPublished(final TestIdentifier testIdentifier, final ReportEntry entry) {
+        // nothing to do
+    }
+
+    @Override
+    public void setDestination(final OutputStream os) {
+        this.outputStream = os;
+    }
+
+    private final class Stats {
+        private final TestIdentifier testIdentifier;
+        private final long startedAt;
+        private long endedAt;
+
+        private Stats(final TestIdentifier testIdentifier, final long startedAt) {
+            this.testIdentifier = testIdentifier;
+            this.startedAt = startedAt;
+        }
+    }
+
+    private final class XMLReportWriter {
+
+        private static final String ELEM_TESTSUITE = "testsuite";
+        private static final String ELEM_PROPERTIES = "properties";
+        private static final String ELEM_PROPERTY = "property";
+        private static final String ELEM_TESTCASE = "testcase";
+        private static final String ELEM_SKIPPED = "skipped";
+        private static final String ELEM_FAILURE = "failure";
+        private static final String ELEM_ABORTED = "aborted";
+        private static final String ELEM_SYSTEM_OUT = "system-out";
+        private static final String ELEM_SYSTEM_ERR = "system-err";
+
+
+        private static final String ATTR_CLASSNAME = "classname";
+        private static final String ATTR_NAME = "name";
+        private static final String ATTR_VALUE = "value";
+        private static final String ATTR_TIME = "time";
+        private static final String ATTR_TIMESTAMP = "timestamp";
+        private static final String ATTR_NUM_ABORTED = "aborted";
+        private static final String ATTR_NUM_FAILURES = "failures";
+        private static final String ATTR_NUM_TESTS = "tests";
+        private static final String ATTR_NUM_SKIPPED = "skipped";
+        private static final String ATTR_MESSAGE = "message";
+        private static final String ATTR_TYPE = "type";
+
+        void write() throws XMLStreamException, IOException {
+            final XMLStreamWriter writer = XMLOutputFactory.newFactory().createXMLStreamWriter(outputStream, "UTF-8");
+            try {
+                writer.writeStartDocument();
+                writeTestSuite(writer);
+                writer.writeEndDocument();
+            } finally {
+                writer.close();
+            }
+        }
+
+        void writeTestSuite(final XMLStreamWriter writer) throws XMLStreamException, IOException {
+            // write the testsuite element
+            writer.writeStartElement(ELEM_TESTSUITE);
+            final String testsuiteName = determineTestSuiteName();
+            writer.writeAttribute(ATTR_NAME, testsuiteName);
+            // time taken for the tests execution
+            writer.writeAttribute(ATTR_TIME, String.valueOf((testPlanEndedAt - testPlanStartedAt) / ONE_SECOND));
+            // add the timestamp of report generation
+            final String timestamp = DateUtils.format(new Date(), DateUtils.ISO8601_DATETIME_PATTERN);
+            writer.writeAttribute(ATTR_TIMESTAMP, timestamp);
+            writer.writeAttribute(ATTR_NUM_TESTS, String.valueOf(numTestsRun.longValue()));
+            writer.writeAttribute(ATTR_NUM_FAILURES, String.valueOf(numTestsFailed.longValue()));
+            writer.writeAttribute(ATTR_NUM_SKIPPED, String.valueOf(numTestsSkipped.longValue()));
+            writer.writeAttribute(ATTR_NUM_ABORTED, String.valueOf(numTestsAborted.longValue()));
+
+            // write the properties
+            writeProperties(writer);
+            // write the tests
+            writeTestCase(writer);
+            writeSysOut(writer);
+            writeSysErr(writer);
+            // end the testsuite
+            writer.writeEndElement();
+        }
+
+        void writeProperties(final XMLStreamWriter writer) throws XMLStreamException {
+            final Properties properties = LegacyXmlResultFormatter.this.context.getProperties();
+            if (properties == null || properties.isEmpty()) {
+                return;
+            }
+            writer.writeStartElement(ELEM_PROPERTIES);
+            for (final String prop : properties.stringPropertyNames()) {
+                writer.writeStartElement(ELEM_PROPERTY);
+                writer.writeAttribute(ATTR_NAME, prop);
+                writer.writeAttribute(ATTR_VALUE, properties.getProperty(prop));
+                writer.writeEndElement();
+            }
+            writer.writeEndElement();
+        }
+
+        void writeTestCase(final XMLStreamWriter writer) throws XMLStreamException {
+            for (final Map.Entry<TestIdentifier, Stats> entry : testIds.entrySet()) {
+                final TestIdentifier testId = entry.getKey();
+                if (!testId.isTest()) {
+                    // only interested in test methods
+                    continue;
+                }
+                // find the parent class of this test method
+                final Optional<TestIdentifier> parent = testPlan.getParent(testId);
+                if (!parent.isPresent() || !parent.get().getSource().isPresent()) {
+                    // we need to know the parent test class, else we aren't interested
+                    continue;
+                }
+                final TestSource parentSource = parent.get().getSource().get();
+                if (!(parentSource instanceof ClassSource)) {
+                    continue;
+                }
+                final String classname = ((ClassSource) parentSource).getClassName();
+                writer.writeStartElement(ELEM_TESTCASE);
+                writer.writeAttribute(ATTR_CLASSNAME, classname);
+                writer.writeAttribute(ATTR_NAME, testId.getDisplayName());
+                final Stats stats = entry.getValue();
+                writer.writeAttribute(ATTR_TIME, String.valueOf((stats.endedAt - stats.startedAt) / ONE_SECOND));
+                // skipped element if the test was skipped
+                writeSkipped(writer, testId);
+                // failed element if the test failed
+                writeFailed(writer, testId);
+                // aborted element if the test was aborted
+                writeAborted(writer, testId);
+
+                writer.writeEndElement();
+            }
+        }
+
+        private void writeSkipped(final XMLStreamWriter writer, final TestIdentifier testIdentifier) throws XMLStreamException {
+            if (!skipped.containsKey(testIdentifier)) {
+                return;
+            }
+            writer.writeStartElement(ELEM_SKIPPED);
+            final Optional<String> reason = skipped.get(testIdentifier);
+            if (reason.isPresent()) {
+                writer.writeAttribute(ATTR_MESSAGE, reason.get());
+            }
+            writer.writeEndElement();
+        }
+
+        private void writeFailed(final XMLStreamWriter writer, final TestIdentifier testIdentifier) throws XMLStreamException {
+            if (!failed.containsKey(testIdentifier)) {
+                return;
+            }
+            writer.writeStartElement(ELEM_FAILURE);
+            final Optional<Throwable> cause = failed.get(testIdentifier);
+            if (cause.isPresent()) {
+                final Throwable t = cause.get();
+                final String message = t.getMessage();
+                if (message != null && !message.trim().isEmpty()) {
+                    writer.writeAttribute(ATTR_MESSAGE, message);
+                }
+                writer.writeAttribute(ATTR_TYPE, t.getClass().getName());
+            }
+            writer.writeEndElement();
+        }
+
+        private void writeAborted(final XMLStreamWriter writer, final TestIdentifier testIdentifier) throws XMLStreamException {
+            if (!aborted.containsKey(testIdentifier)) {
+                return;
+            }
+            writer.writeStartElement(ELEM_ABORTED);
+            final Optional<Throwable> cause = aborted.get(testIdentifier);
+            if (cause.isPresent()) {
+                final Throwable t = cause.get();
+                final String message = t.getMessage();
+                if (message != null && !message.trim().isEmpty()) {
+                    writer.writeAttribute(ATTR_MESSAGE, message);
+                }
+                writer.writeAttribute(ATTR_TYPE, t.getClass().getName());
+            }
+            writer.writeEndElement();
+        }
+
+        private void writeSysOut(final XMLStreamWriter writer) throws XMLStreamException, IOException {
+            if (!LegacyXmlResultFormatter.this.hasSysOut()) {
+                return;
+            }
+            writer.writeStartElement(ELEM_SYSTEM_OUT);
+            try (final Reader reader = LegacyXmlResultFormatter.this.getSysOutReader()) {
+                writeCharactersFrom(reader, writer);
+            }
+            writer.writeEndElement();
+        }
+
+        private void writeSysErr(final XMLStreamWriter writer) throws XMLStreamException, IOException {
+            if (!LegacyXmlResultFormatter.this.hasSysErr()) {
+                return;
+            }
+            writer.writeStartElement(ELEM_SYSTEM_ERR);
+            try (final Reader reader = LegacyXmlResultFormatter.this.getSysErrReader()) {
+                writeCharactersFrom(reader, writer);
+            }
+            writer.writeEndElement();
+        }
+
+        private void writeCharactersFrom(final Reader reader, final XMLStreamWriter writer) throws IOException, XMLStreamException {
+            final char[] chars = new char[1024];
+            int numRead = -1;
+            while ((numRead = reader.read(chars)) != -1) {
+                // although it's called a DOMElementWriter, the encode method is just a
+                // straight forward XML util method which doesn't concern about whether
+                // DOM, SAX, StAX semantics.
+                // TODO: Perhaps make it a static method
+                final String encoded = new DOMElementWriter().encode(new String(chars, 0, numRead));
+                writer.writeCharacters(encoded);
+            }
+        }
+
+        private String determineTestSuiteName() {
+            // this is really a hack to try and match the expectations of the XML report in JUnit4.x
+            // world. In JUnit5, the TestPlan doesn't have a name and a TestPlan (for which this is a
+            // listener) can have numerous tests within it
+            final Set<TestIdentifier> roots = testPlan.getRoots();
+            if (roots.isEmpty()) {
+                return "UNKNOWN";
+            }
+            for (final TestIdentifier root : roots) {
+                final Optional<ClassSource> classSource = findFirstClassSource(root);
+                if (classSource.isPresent()) {
+                    return classSource.get().getClassName();
+                }
+            }
+            return "UNKNOWN";
+        }
+
+        private Optional<ClassSource> findFirstClassSource(final TestIdentifier root) {
+            if (root.getSource().isPresent()) {
+                final TestSource source = root.getSource().get();
+                if (source instanceof ClassSource) {
+                    return Optional.of((ClassSource) source);
+                }
+            }
+            for (final TestIdentifier child : testPlan.getChildren(root)) {
+                final Optional<ClassSource> classSource = findFirstClassSource(child);
+                if (classSource.isPresent()) {
+                    return classSource;
+                }
+            }
+            return Optional.empty();
+        }
+    }
+
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/ListenerDefinition.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/ListenerDefinition.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/ListenerDefinition.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/ListenerDefinition.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,121 @@
+package org.apache.tools.ant.taskdefs.optional.junitlauncher;
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.PropertyHelper;
+import org.apache.tools.ant.types.EnumeratedAttribute;
+
+/**
+ * Represents the {@code &lt;listener&gt;} element within the {@code &lt;junitlauncher&gt;}
+ * task
+ */
+public class ListenerDefinition {
+
+    private static final String LEGACY_PLAIN = "legacy-plain";
+    private static final String LEGACY_BRIEF = "legacy-brief";
+    private static final String LEGACY_XML = "legacy-xml";
+
+    private String ifProperty;
+    private String unlessProperty;
+    private String className;
+    private String resultFile;
+    private boolean sendSysOut;
+    private boolean sendSysErr;
+
+    private String defaultResultFileSuffix = "txt";
+
+    public ListenerDefinition() {
+
+    }
+
+    public void setClassName(final String className) {
+        this.className = className;
+    }
+
+    String getClassName() {
+        return this.className;
+    }
+
+    String getIfProperty() {
+        return ifProperty;
+    }
+
+    public void setIf(final String ifProperty) {
+        this.ifProperty = ifProperty;
+    }
+
+    String getUnlessProperty() {
+        return unlessProperty;
+    }
+
+    public void setUnless(final String unlessProperty) {
+        this.unlessProperty = unlessProperty;
+    }
+
+    public void setType(final ListenerType type) {
+        switch (type.getValue()) {
+            case LEGACY_PLAIN: {
+                this.setClassName("org.apache.tools.ant.taskdefs.optional.junitlauncher.LegacyPlainResultFormatter");
+                this.defaultResultFileSuffix = "txt";
+                break;
+            }
+            case LEGACY_BRIEF: {
+                this.setClassName("org.apache.tools.ant.taskdefs.optional.junitlauncher.LegacyBriefResultFormatter");
+                this.defaultResultFileSuffix = "txt";
+                break;
+            }
+            case LEGACY_XML: {
+                this.setClassName("org.apache.tools.ant.taskdefs.optional.junitlauncher.LegacyXmlResultFormatter");
+                this.defaultResultFileSuffix = "xml";
+                break;
+            }
+        }
+    }
+
+    public void setResultFile(final String filename) {
+        this.resultFile = filename;
+    }
+
+    String requireResultFile(final TestDefinition test) {
+        if (this.resultFile != null) {
+            return this.resultFile;
+        }
+        final StringBuilder sb = new StringBuilder("TEST-");
+        if (test instanceof NamedTest) {
+            sb.append(((NamedTest) test).getName());
+        } else {
+            sb.append("unknown");
+        }
+        sb.append(".").append(this.defaultResultFileSuffix);
+        return sb.toString();
+    }
+
+    public void setSendSysOut(final boolean sendSysOut) {
+        this.sendSysOut = sendSysOut;
+    }
+
+    boolean shouldSendSysOut() {
+        return this.sendSysOut;
+    }
+
+    public void setSendSysErr(final boolean sendSysErr) {
+        this.sendSysErr = sendSysErr;
+    }
+
+    boolean shouldSendSysErr() {
+        return this.sendSysErr;
+    }
+
+    protected boolean shouldUse(final Project project) {
+        final PropertyHelper propertyHelper = PropertyHelper.getPropertyHelper(project);
+        return propertyHelper.testIfCondition(this.ifProperty) && propertyHelper.testUnlessCondition(this.unlessProperty);
+    }
+
+    public static class ListenerType extends EnumeratedAttribute {
+
+        @Override
+        public String[] getValues() {
+            return new String[]{LEGACY_PLAIN, LEGACY_BRIEF, LEGACY_XML};
+        }
+    }
+
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/NamedTest.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/NamedTest.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/NamedTest.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/NamedTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,13 @@
+package org.apache.tools.ant.taskdefs.optional.junitlauncher;
+
+/**
+ * A test that has a name associated with it
+ */
+public interface NamedTest {
+
+    /**
+     *
+     * @return Returns the name of the test
+     */
+    String getName();
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/SingleTestClass.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/SingleTestClass.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/SingleTestClass.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/SingleTestClass.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,99 @@
+package org.apache.tools.ant.taskdefs.optional.junitlauncher;
+
+import org.apache.tools.ant.Project;
+import org.junit.platform.engine.discovery.DiscoverySelectors;
+import org.junit.platform.launcher.EngineFilter;
+import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
+
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+/**
+ * Represents the single {@code test} (class) that's configured to be launched by the {@link JUnitLauncherTask}
+ */
+public class SingleTestClass extends TestDefinition implements NamedTest {
+
+    private String testClass;
+    private Set<String> testMethods;
+
+    public SingleTestClass() {
+
+    }
+
+    public void setName(final String test) {
+        if (test == null || test.trim().isEmpty()) {
+            throw new IllegalArgumentException("Test name cannot be null or empty string");
+        }
+        this.testClass = test;
+    }
+
+    public String getName() {
+        return this.testClass;
+    }
+
+    public void setMethods(final String methods) {
+        // parse the comma separated set of methods
+        if (methods == null || methods.trim().isEmpty()) {
+            this.testMethods = Collections.emptySet();
+            return;
+        }
+        final StringTokenizer tokenizer = new StringTokenizer(methods, ",");
+        if (!tokenizer.hasMoreTokens()) {
+            this.testMethods = Collections.emptySet();
+            return;
+        }
+        // maintain specified ordering
+        this.testMethods = new LinkedHashSet<>();
+        while (tokenizer.hasMoreTokens()) {
+            final String method = tokenizer.nextToken().trim();
+            if (method.isEmpty()) {
+                continue;
+            }
+            this.testMethods.add(method);
+        }
+    }
+
+    boolean hasMethodsSpecified() {
+        return this.testMethods != null && !this.testMethods.isEmpty();
+    }
+
+    String[] getMethods() {
+        if (!hasMethodsSpecified()) {
+            return null;
+        }
+        return this.testMethods.toArray(new String[this.testMethods.size()]);
+    }
+
+    @Override
+    List<TestRequest> createTestRequests(final JUnitLauncherTask launcherTask) {
+        final Project project = launcherTask.getProject();
+        if (!shouldRun(project)) {
+            launcherTask.log("Excluding test " + this.testClass + " since it's considered not to run " +
+                    "in context of project " + project, Project.MSG_DEBUG);
+            return Collections.emptyList();
+        }
+        final LauncherDiscoveryRequestBuilder requestBuilder = LauncherDiscoveryRequestBuilder.request();
+        if (!this.hasMethodsSpecified()) {
+            requestBuilder.selectors(DiscoverySelectors.selectClass(this.testClass));
+        } else {
+            // add specific methods
+            final String[] methods = this.getMethods();
+            for (final String method : methods) {
+                requestBuilder.selectors(DiscoverySelectors.selectMethod(this.testClass, method));
+            }
+        }
+        // add any engine filters
+        final String[] enginesToInclude = this.getIncludeEngines();
+        if (enginesToInclude != null && enginesToInclude.length > 0) {
+            requestBuilder.filters(EngineFilter.includeEngines(enginesToInclude));
+        }
+        final String[] enginesToExclude = this.getExcludeEngines();
+        if (enginesToExclude != null && enginesToExclude.length > 0) {
+            requestBuilder.filters(EngineFilter.excludeEngines(enginesToExclude));
+        }
+        return Collections.singletonList(new TestRequest(this, requestBuilder));
+    }
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestClasses.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestClasses.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestClasses.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestClasses.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,112 @@
+package org.apache.tools.ant.taskdefs.optional.junitlauncher;
+
+import org.apache.tools.ant.types.Resource;
+import org.apache.tools.ant.types.ResourceCollection;
+import org.apache.tools.ant.types.resources.Resources;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Represents a {@code testclasses} that's configured to be launched by the {@link JUnitLauncherTask}
+ */
+public class TestClasses extends TestDefinition {
+
+    private final Resources resources = new Resources();
+
+    public TestClasses() {
+
+    }
+
+    public void add(final ResourceCollection resourceCollection) {
+        this.resources.add(resourceCollection);
+    }
+
+    @Override
+    List<TestRequest> createTestRequests(final JUnitLauncherTask launcherTask) {
+        final List<SingleTestClass> tests = this.getTests();
+        if (tests.isEmpty()) {
+            return Collections.emptyList();
+        }
+        final List<TestRequest> requests = new ArrayList<>();
+        for (final SingleTestClass test : tests) {
+            requests.addAll(test.createTestRequests(launcherTask));
+        }
+        return requests;
+    }
+
+    private List<SingleTestClass> getTests() {
+        if (this.resources.isEmpty()) {
+            return Collections.emptyList();
+        }
+        final List<SingleTestClass> tests = new ArrayList<>();
+        for (final Resource resource : resources) {
+            if (!resource.isExists()) {
+                continue;
+            }
+            final String name = resource.getName();
+            // we only consider .class files
+            if (!name.endsWith(".class")) {
+                continue;
+            }
+            final String className = name.substring(0, name.lastIndexOf('.'));
+            final BatchSourcedSingleTest test = new BatchSourcedSingleTest(className.replace(File.separatorChar, '.').replace('/', '.').replace('\\', '.'));
+            tests.add(test);
+        }
+        return tests;
+    }
+
+    /**
+     * A {@link BatchSourcedSingleTest} is similar to a {@link SingleTestClass} except that
+     * some of the characteristics of the test (like whether to halt on failure) are borrowed
+     * from the {@link TestClasses batch} to which this test belongs to
+     */
+    private final class BatchSourcedSingleTest extends SingleTestClass {
+
+        private BatchSourcedSingleTest(final String testClassName) {
+            this.setName(testClassName);
+        }
+
+        @Override
+        String getIfProperty() {
+            return TestClasses.this.getIfProperty();
+        }
+
+        @Override
+        String getUnlessProperty() {
+            return TestClasses.this.getUnlessProperty();
+        }
+
+        @Override
+        boolean isHaltOnFailure() {
+            return TestClasses.this.isHaltOnFailure();
+        }
+
+        @Override
+        String getFailureProperty() {
+            return TestClasses.this.getFailureProperty();
+        }
+
+        @Override
+        List<ListenerDefinition> getListeners() {
+            return TestClasses.this.getListeners();
+        }
+
+        @Override
+        String getOutputDir() {
+            return TestClasses.this.getOutputDir();
+        }
+
+        @Override
+        String[] getIncludeEngines() {
+            return TestClasses.this.getIncludeEngines();
+        }
+
+        @Override
+        String[] getExcludeEngines() {
+            return TestClasses.this.getExcludeEngines();
+        }
+    }
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestDefinition.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestDefinition.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestDefinition.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestDefinition.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,113 @@
+package org.apache.tools.ant.taskdefs.optional.junitlauncher;
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.PropertyHelper;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Represents the configuration details of a test that needs to be launched by the {@link JUnitLauncherTask}
+ */
+abstract class TestDefinition {
+    protected String ifProperty;
+    protected String unlessProperty;
+    protected Boolean haltOnFailure;
+    protected String failureProperty;
+    protected String outputDir;
+    protected String includeEngines;
+    protected String excludeEngines;
+
+    protected List<ListenerDefinition> listeners = new ArrayList<>();
+
+    String getIfProperty() {
+        return ifProperty;
+    }
+
+    public void setIf(final String ifProperty) {
+        this.ifProperty = ifProperty;
+    }
+
+    String getUnlessProperty() {
+        return unlessProperty;
+    }
+
+    public void setUnless(final String unlessProperty) {
+        this.unlessProperty = unlessProperty;
+    }
+
+    boolean isHaltOnFailure() {
+        return this.haltOnFailure == null ? false : this.haltOnFailure;
+    }
+
+    Boolean getHaltOnFailure() {
+        return this.haltOnFailure;
+    }
+
+    public void setHaltOnFailure(final boolean haltonfailure) {
+        this.haltOnFailure = haltonfailure;
+    }
+
+    String getFailureProperty() {
+        return failureProperty;
+    }
+
+    public void setFailureProperty(final String failureProperty) {
+        this.failureProperty = failureProperty;
+    }
+
+    public void addConfiguredListener(final ListenerDefinition listener) {
+        this.listeners.add(listener);
+    }
+
+    List<ListenerDefinition> getListeners() {
+        return Collections.unmodifiableList(this.listeners);
+    }
+
+    public void setOutputDir(final String dir) {
+        this.outputDir = dir;
+    }
+
+    String getOutputDir() {
+        return this.outputDir;
+    }
+
+    abstract List<TestRequest> createTestRequests(final JUnitLauncherTask launcherTask);
+
+    protected boolean shouldRun(final Project project) {
+        final PropertyHelper propertyHelper = PropertyHelper.getPropertyHelper(project);
+        return propertyHelper.testIfCondition(this.ifProperty) && propertyHelper.testUnlessCondition(this.unlessProperty);
+    }
+
+    String[] getIncludeEngines() {
+        return includeEngines == null ? new String[0] : split(this.includeEngines, ",");
+    }
+
+    public void setIncludeEngines(final String includeEngines) {
+        this.includeEngines = includeEngines;
+    }
+
+    String[] getExcludeEngines() {
+        return excludeEngines == null ? new String[0] : split(this.excludeEngines, ",");
+    }
+
+    public void setExcludeEngines(final String excludeEngines) {
+        this.excludeEngines = excludeEngines;
+    }
+
+    private static String[] split(final String value, final String delimiter) {
+        if (value == null) {
+            return new String[0];
+        }
+        final List<String> parts = new ArrayList<>();
+        for (final String part : value.split(delimiter)) {
+            if (part.trim().isEmpty()) {
+                // skip it
+                continue;
+            }
+            parts.add(part);
+        }
+        return parts.toArray(new String[parts.size()]);
+    }
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestExecutionContext.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestExecutionContext.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestExecutionContext.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestExecutionContext.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,28 @@
+package org.apache.tools.ant.taskdefs.optional.junitlauncher;
+
+import org.apache.tools.ant.Project;
+
+import java.util.Optional;
+import java.util.Properties;
+
+/**
+ * A {@link TestExecutionContext} represents the execution context for a test
+ * that has been launched by the {@link JUnitLauncherTask} and provides any necessary
+ * contextual information about such tests.
+ */
+public interface TestExecutionContext {
+
+    /**
+     * @return Returns the properties that were used for the execution of the test
+     */
+    Properties getProperties();
+
+
+    /**
+     * @return Returns the {@link Project} in whose context the test is being executed.
+     * The {@code Project} is sometimes not available, like in the case where
+     * the test is being run in a forked mode, in such cases this method returns
+     * {@link Optional#empty() an empty value}
+     */
+    Optional<Project> getProject();
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestRequest.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestRequest.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestRequest.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestRequest.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,74 @@
+package org.apache.tools.ant.taskdefs.optional.junitlauncher;
+
+import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
+
+import java.io.Closeable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Holds together the necessary details about a request that will be launched by the {@link JUnitLauncherTask}
+ */
+final class TestRequest implements AutoCloseable {
+    private final TestDefinition ownerTest;
+    private final LauncherDiscoveryRequestBuilder discoveryRequest;
+    private final List<Closeable> closables = new ArrayList<>();
+    private final List<TestResultFormatter> interestedInSysOut = new ArrayList<>();
+    private final List<TestResultFormatter> interestedInSysErr = new ArrayList<>();
+
+
+    TestRequest(final TestDefinition ownerTest, final LauncherDiscoveryRequestBuilder discoveryRequest) {
+        this.ownerTest = ownerTest;
+        this.discoveryRequest = discoveryRequest;
+    }
+
+    TestDefinition getOwner() {
+        return ownerTest;
+    }
+
+    LauncherDiscoveryRequestBuilder getDiscoveryRequest() {
+        return discoveryRequest;
+    }
+
+    void closeUponCompletion(final Closeable closeable) {
+        if (closeable == null) {
+            return;
+        }
+        this.closables.add(closeable);
+    }
+
+    void addSysOutInterest(final TestResultFormatter out) {
+        this.interestedInSysOut.add(out);
+    }
+
+    boolean interestedInSysOut() {
+        return !this.interestedInSysOut.isEmpty();
+    }
+
+    Collection<TestResultFormatter> getSysOutInterests() {
+        return Collections.unmodifiableList(this.interestedInSysOut);
+    }
+
+    void addSysErrInterest(final TestResultFormatter err) {
+        this.interestedInSysErr.add(err);
+    }
+
+    boolean interestedInSysErr() {
+        return !this.interestedInSysErr.isEmpty();
+    }
+
+    Collection<TestResultFormatter> getSysErrInterests() {
+        return Collections.unmodifiableList(this.interestedInSysErr);
+    }
+
+    public void close() throws Exception {
+        if (this.closables.isEmpty()) {
+            return;
+        }
+        for (final Closeable closeable : closables) {
+            closeable.close();
+        }
+    }
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestResultFormatter.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestResultFormatter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestResultFormatter.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/TestResultFormatter.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,58 @@
+package org.apache.tools.ant.taskdefs.optional.junitlauncher;
+
+import org.junit.platform.launcher.TestExecutionListener;
+
+import java.io.Closeable;
+import java.io.OutputStream;
+
+/**
+ * A {@link TestExecutionListener} which lets implementing classes format and write out
+ * the test execution results.
+ */
+public interface TestResultFormatter extends TestExecutionListener, Closeable {
+
+    /**
+     * This method will be invoked by the <code>junitlauncher</code> and will be passed the
+     * {@link OutputStream} to a file, to which the formatted result is expected to be written
+     * to.
+     * <p>
+     * This method will be called once, early on, during the initialization of this
+     * {@link TestResultFormatter}, typically before the test execution itself has started.
+     * </p>
+     *
+     * @param os The output stream to which to write out the result
+     */
+    void setDestination(OutputStream os);
+
+    /**
+     * This method will be invoked by the <code>junitlauncher</code> and will be passed a
+     * {@link TestExecutionContext}. This allows the {@link TestResultFormatter} to have access
+     * to any additional contextual information to use in the test reports.
+     *
+     * @param context The context of the execution of the test
+     */
+    void setContext(TestExecutionContext context);
+
+    /**
+     * This method will be invoked by the <code>junitlauncher</code>, <strong>regularly/multiple times</strong>,
+     * as and when any content is generated on the standard output stream during the test execution.
+     * This method will be only be called if the <code>sendSysOut</code> attribute of the <code>listener</code>,
+     * to which this {@link TestResultFormatter} is configured for, is enabled
+     *
+     * @param data The content generated on standard output stream
+     */
+    default void sysOutAvailable(byte[] data) {
+    }
+
+    /**
+     * This method will be invoked by the <code>junitlauncher</code>, <strong>regularly/multiple times</strong>,
+     * as and when any content is generated on the standard error stream during the test execution.
+     * This method will be only be called if the <code>sendSysErr</code> attribute of the <code>listener</code>,
+     * to which this {@link TestResultFormatter} is configured for, is enabled
+     *
+     * @param data The content generated on standard error stream
+     */
+    default void sysErrAvailable(byte[] data) {
+    }
+
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/BuiltinNative2Ascii.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/BuiltinNative2Ascii.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/BuiltinNative2Ascii.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/BuiltinNative2Ascii.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,18 +20,17 @@
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.nio.file.Files;
+import java.util.function.UnaryOperator;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.taskdefs.optional.Native2Ascii;
-import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.Native2AsciiUtils;
 import org.apache.tools.ant.util.StringUtils;
 
@@ -44,23 +43,16 @@
 
     static final String IMPLEMENTATION_NAME = "builtin";
 
+    @Override
     public final boolean convert(Native2Ascii args, File srcFile,
                                  File destFile) throws BuildException {
         boolean reverse = args.getReverse();
         String encoding = args.getEncoding();
-        BufferedReader input = null;
-        try {
-            input = getReader(srcFile, encoding, reverse);
-            try {
-                Writer output = getWriter(destFile, encoding, reverse);
-                try {
-                    translate(input, output, reverse);
-                } finally {
-                    FileUtils.close(output);
-                }
-            } finally {
-                FileUtils.close(input);
-            }
+        try (BufferedReader input = getReader(srcFile, encoding, reverse);
+                Writer output = getWriter(destFile, encoding, reverse)) {
+
+            translate(input, output, reverse ? Native2AsciiUtils::ascii2native
+                : Native2AsciiUtils::native2ascii);
             return true;
         } catch (IOException ex) {
             throw new BuildException("Exception trying to translate data", ex);
@@ -71,7 +63,7 @@
                                      boolean reverse) throws IOException {
         if (!reverse && encoding != null) {
             return new BufferedReader(new InputStreamReader(
-                new FileInputStream(srcFile), encoding));
+                Files.newInputStream(srcFile.toPath()), encoding));
         }
         return new BufferedReader(new FileReader(srcFile));
     }
@@ -83,21 +75,17 @@
         }
         if (encoding != null) {
             return new BufferedWriter(
-                new OutputStreamWriter(new FileOutputStream(destFile),
+                new OutputStreamWriter(Files.newOutputStream(destFile.toPath()),
                                        encoding));
         }
         return new BufferedWriter(new FileWriter(destFile));
     }
 
     private void translate(BufferedReader input, Writer output,
-                           boolean reverse) throws IOException {
-        String line = null;
-        while ((line = input.readLine()) != null) {
-            if (!reverse) {
-                output.write(Native2AsciiUtils.native2ascii(line));
-            } else {
-                output.write(Native2AsciiUtils.ascii2native(line));
-            }
+        UnaryOperator<String> translation) throws IOException {
+        for (String line : (Iterable<String>) () -> input.lines()
+            .map(translation).iterator()) {
+            output.write(line);
             output.write(StringUtils.LINE_SEP);
         }
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.java	2018-03-24 12:37:12.000000000 +0000
@@ -47,6 +47,7 @@
      * (delegated to {@link #addFiles addFiles}) and running the tool
      * (delegated to {@link #run run}).
      */
+    @Override
     public final boolean convert(Native2Ascii args, File srcFile,
                                  File destFile) throws BuildException {
         Commandline cmd = new Commandline();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java	2018-03-24 12:37:12.000000000 +0000
@@ -43,6 +43,7 @@
     public static final String IMPLEMENTATION_NAME = "kaffe";
 
     /** {@inheritDoc} */
+    @Override
     protected void setup(Commandline cmd, Native2Ascii args)
         throws BuildException {
         if (args.getReverse()) {
@@ -52,13 +53,14 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     protected boolean run(Commandline cmd, ProjectComponent log)
         throws BuildException {
         ExecuteJava ej = new ExecuteJava();
-        Class c = getN2aClass();
+        Class<?> c = getN2aClass();
         if (c == null) {
-            throw new BuildException("Couldn't load Kaffe's Native2Ascii"
-                                     + " class");
+            throw new BuildException(
+                "Couldn't load Kaffe's Native2Ascii class");
         }
 
         cmd.setExecutable(c.getName());
@@ -74,7 +76,7 @@
      *
      * @return null if neither class can get loaded.
      */
-    private static Class getN2aClass() {
+    private static Class<?> getN2aClass() {
         for (int i = 0; i < N2A_CLASSNAMES.length; i++) {
             try {
                 return Class.forName(N2A_CLASSNAMES[i]);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java	2018-03-24 12:37:12.000000000 +0000
@@ -43,9 +43,6 @@
         if (shouldUseKaffee()) {
             return KaffeNative2Ascii.IMPLEMENTATION_NAME;
         }
-        if (shouldUseSun()) {
-            return SunNative2Ascii.IMPLEMENTATION_NAME;
-        }
         return BuiltinNative2Ascii.IMPLEMENTATION_NAME;
     }
 
@@ -85,8 +82,7 @@
         if ((shouldUseKaffee() && choice == null)
             || KaffeNative2Ascii.IMPLEMENTATION_NAME.equals(choice)) {
             return new KaffeNative2Ascii();
-        } else if ((shouldUseSun() && choice == null)
-                   || SunNative2Ascii.IMPLEMENTATION_NAME.equals(choice)) {
+        } else if (SunNative2Ascii.IMPLEMENTATION_NAME.equals(choice)) {
             return new SunNative2Ascii();
         } else if (BuiltinNative2Ascii.IMPLEMENTATION_NAME.equals(choice)) {
             return new BuiltinNative2Ascii();
@@ -121,11 +117,4 @@
     private static final boolean shouldUseKaffee() {
         return JavaEnvUtils.isKaffe() || JavaEnvUtils.isClasspathBased();
     }
-
-    private static final boolean shouldUseSun() {
-        return JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_5)
-            || JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_6)
-            || JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_7)
-            || JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_8);
-    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.java	2018-03-24 12:37:12.000000000 +0000
@@ -36,7 +36,10 @@
      */
     public static final String IMPLEMENTATION_NAME = "sun";
 
+    private static final String SUN_TOOLS_NATIVE2ASCII_MAIN = "sun.tools.native2ascii.Main";
+
     /** {@inheritDoc} */
+    @Override
     protected void setup(Commandline cmd, Native2Ascii args)
         throws BuildException {
         if (args.getReverse()) {
@@ -46,23 +49,20 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     protected boolean run(Commandline cmd, ProjectComponent log)
         throws BuildException {
         try {
-            Class n2aMain = Class.forName("sun.tools.native2ascii.Main");
-            Class[] param = new Class[] {String[].class};
-            Method convert = n2aMain.getMethod("convert", param);
-            if (convert == null) {
-                throw new BuildException("Could not find convert() method in "
-                                         + "sun.tools.native2ascii.Main");
-            }
-            Object o = n2aMain.newInstance();
-            return ((Boolean) convert.invoke(o,
-                                             new Object[] {cmd.getArguments()})
-                    ).booleanValue();
+            Class<?> n2aMain = Class.forName(SUN_TOOLS_NATIVE2ASCII_MAIN);
+            Method convert = n2aMain.getMethod("convert", String[].class);
+            return Boolean.TRUE.equals(convert.invoke(n2aMain.newInstance(),
+                (Object) cmd.getArguments()));
         } catch (BuildException ex) {
             //rethrow
             throw ex;
+        } catch (NoSuchMethodException ex) {
+            throw new BuildException("Could not find convert() method in %s",
+                SUN_TOOLS_NATIVE2ASCII_MAIN);
         } catch (Exception ex) {
             //wrap
            throw new BuildException("Error starting Sun's native2ascii: ", ex);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java	2018-03-24 12:37:12.000000000 +0000
@@ -198,8 +198,8 @@
      */
     public void add(Native2AsciiAdapter adapter) {
         if (nestedAdapter != null) {
-            throw new BuildException("Can't have more than one native2ascii"
-                                     + " adapter");
+            throw new BuildException(
+                "Can't have more than one native2ascii adapter");
         }
         nestedAdapter = adapter;
     }
@@ -209,6 +209,7 @@
      *
      * @throws BuildException is there is a problem in the task execution.
      */
+    @Override
     public void execute() throws BuildException {
 
         DirectoryScanner scanner = null; // Scanner to find our inputs
@@ -228,11 +229,11 @@
         // to be set, so we don't stomp every file.  One could still
         // include a file with the same extension, but ....
         if (srcDir.equals(destDir) && extension == null && mapper == null) {
-            throw new BuildException("The ext attribute or a mapper must be set if"
-                                     + " src and dest dirs are the same.");
+            throw new BuildException(
+                "The ext attribute or a mapper must be set if src and dest dirs are the same.");
         }
 
-        FileNameMapper m = null;
+        FileNameMapper m;
         if (mapper == null) {
             if (extension == null) {
                 m = new IdentityMapper();
@@ -255,7 +256,10 @@
             + (count != 1 ? "s" : "") + " from ";
         log(message + srcDir + " to " + destDir);
         for (int i = 0; i < files.length; i++) {
-            convert(files[i], m.mapFileName(files[i])[0]);
+            String[] dest = m.mapFileName(files[i]);
+            if (dest != null && dest.length > 0) {
+                convert(files[i], dest[0]);
+            }
         }
     }
 
@@ -276,8 +280,7 @@
 
         // Make sure we're not about to clobber something
         if (srcFile.equals(destFile)) {
-            throw new BuildException("file " + srcFile
-                                     + " would overwrite its self");
+            throw new BuildException("file %s would overwrite itself", srcFile);
         }
 
         // Make intermediate directories if needed
@@ -288,8 +291,8 @@
 
             if (!parentFile.exists()
                 && !(parentFile.mkdirs() || parentFile.isDirectory())) {
-                throw new BuildException("cannot create parent directory "
-                                         + parentName);
+                throw new BuildException("cannot create parent directory %s",
+                    parentName);
             }
         }
 
@@ -314,18 +317,21 @@
 
     private class ExtMapper implements FileNameMapper {
 
+        @Override
         public void setFrom(String s) {
         }
+
+        @Override
         public void setTo(String s) {
         }
 
+        @Override
         public String[] mapFileName(String fileName) {
             int lastDot = fileName.lastIndexOf('.');
             if (lastDot >= 0) {
                 return new String[] {fileName.substring(0, lastDot) + extension};
-            } else {
-                return new String[] {fileName + extension};
             }
+            return new String[] {fileName + extension};
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,25 +21,25 @@
 import java.io.BufferedOutputStream;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Files;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Date;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.Vector;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPClientConfig;
@@ -120,8 +120,8 @@
     private long granularityMillis = 0L;
     private boolean timeDiffAuto = false;
     private int action = SEND_FILES;
-    private Vector filesets = new Vector();
-    private Set dirCache = new HashSet();
+    private Vector<FileSet> filesets = new Vector<>();
+    private Set<File> dirCache = new HashSet<>();
     private int transferred = 0;
     private String remoteFileSep = "/";
     private int port = DEFAULT_FTP_PORT;
@@ -183,6 +183,7 @@
      *
      */
     protected static class FTPFileProxy extends File {
+        private static final long serialVersionUID = 1L;
 
         private final FTPFile file;
         private final String[] parts;
@@ -214,6 +215,7 @@
         /* (non-Javadoc)
          * @see java.io.File#exists()
          */
+        @Override
         public boolean exists() {
             return true;
         }
@@ -222,6 +224,7 @@
         /* (non-Javadoc)
          * @see java.io.File#getAbsolutePath()
          */
+        @Override
         public String getAbsolutePath() {
             return name;
         }
@@ -230,6 +233,7 @@
         /* (non-Javadoc)
          * @see java.io.File#getName()
          */
+        @Override
         public String getName() {
             return parts.length > 0 ? parts[parts.length - 1] : name;
         }
@@ -238,6 +242,7 @@
         /* (non-Javadoc)
          * @see java.io.File#getParent()
          */
+        @Override
         public String getParent() {
             String result = "";
             for(int i = 0; i < parts.length - 1; i++){
@@ -250,6 +255,7 @@
         /* (non-Javadoc)
          * @see java.io.File#getPath()
          */
+        @Override
         public String getPath() {
             return name;
         }
@@ -259,6 +265,7 @@
          * FTP files are stored as absolute paths
          * @return true
          */
+        @Override
         public boolean isAbsolute() {
             return true;
         }
@@ -267,6 +274,7 @@
         /* (non-Javadoc)
          * @see java.io.File#isDirectory()
          */
+        @Override
         public boolean isDirectory() {
             return file == null;
         }
@@ -275,6 +283,7 @@
         /* (non-Javadoc)
          * @see java.io.File#isFile()
          */
+        @Override
         public boolean isFile() {
             return file != null;
         }
@@ -285,6 +294,7 @@
          *
          * @return  false
          */
+        @Override
         public boolean isHidden() {
             return false;
         }
@@ -293,6 +303,7 @@
         /* (non-Javadoc)
          * @see java.io.File#lastModified()
          */
+        @Override
         public long lastModified() {
             if (file != null) {
                 return file.getTimestamp().getTimeInMillis();
@@ -304,6 +315,7 @@
         /* (non-Javadoc)
          * @see java.io.File#length()
          */
+        @Override
         public long length() {
             if (file != null) {
                 return file.getSize();
@@ -349,6 +361,7 @@
          * scans the remote directory,
          * storing internally the included files, directories, ...
          */
+        @Override
         public void scan() {
             if (includes == null) {
                 // No includes supplied, so set it to 'matches all'
@@ -359,12 +372,12 @@
                 excludes = new String[0];
             }
 
-            filesIncluded = new VectorSet();
-            filesNotIncluded = new Vector();
-            filesExcluded = new VectorSet();
-            dirsIncluded = new VectorSet();
-            dirsNotIncluded = new Vector();
-            dirsExcluded = new VectorSet();
+            filesIncluded = new VectorSet<>();
+            filesNotIncluded = new Vector<>();
+            filesExcluded = new VectorSet<>();
+            dirsIncluded = new VectorSet<>();
+            dirsNotIncluded = new Vector<>();
+            dirsExcluded = new VectorSet<>();
 
             try {
                 String cwd = ftp.printWorkingDirectory();
@@ -387,7 +400,7 @@
          */
         private void checkIncludePatterns() {
 
-            Hashtable newroots = new Hashtable();
+            Map<String, String> newroots = new HashMap<>();
             // put in the newroots vector the include patterns without
             // wildcard tokens
             for (int icounter = 0; icounter < includes.length; icounter++) {
@@ -412,69 +425,70 @@
             } else {
                 // only scan directories that can include matched files or
                 // directories
-                Enumeration enum2 = newroots.keys();
+                newroots.forEach((k, v) -> scanRoots(baseFTPFile, k, v));
+            }
+        }
 
-                while (enum2.hasMoreElements()) {
-                    String currentelement = (String) enum2.nextElement();
-                    String originalpattern = (String) newroots.get(currentelement);
-                    AntFTPFile myfile = new AntFTPFile(baseFTPFile, currentelement);
-                    boolean isOK = true;
-                    boolean traversesSymlinks = false;
-                    String path = null;
-
-                    if (myfile.exists()) {
-                        forceRemoteSensitivityCheck();
-                        if (remoteSensitivityChecked
-                            && remoteSystemCaseSensitive && isFollowSymlinks()) {
-                            // cool case,
-                            //we do not need to scan all the subdirs in the relative path
-                            path = myfile.getFastRelativePath();
-                        } else {
-                            // may be on a case insensitive file system.  We want
-                            // the results to show what's really on the disk, so
-                            // we need to double check.
-                            try {
-                                path = myfile.getRelativePath();
-                                traversesSymlinks = myfile.isTraverseSymlinks();
-                            }  catch (IOException be) {
-                                throw new BuildException(be, getLocation());
-                            } catch (BuildException be) {
-                                isOK = false;
-                            }
-                        }
-                    } else {
+        private void scanRoots(AntFTPFile baseFTPFile, String currentelement, String originalpattern) {
+            AntFTPFile myfile = new AntFTPFile(baseFTPFile, currentelement);
+            boolean isOK = true;
+            boolean traversesSymlinks = false;
+            String path = null;
+
+            if (myfile.exists()) {
+                forceRemoteSensitivityCheck();
+                if (remoteSensitivityChecked
+                    && remoteSystemCaseSensitive && isFollowSymlinks()) {
+                    // cool case,
+                    //we do not need to scan all the subdirs in the relative path
+                    path = myfile.getFastRelativePath();
+                } else {
+                    // may be on a case insensitive file system.  We want
+                    // the results to show what's really on the disk, so
+                    // we need to double check.
+                    try {
+                        path = myfile.getRelativePath();
+                        traversesSymlinks = myfile.isTraverseSymlinks();
+                    } catch (IOException be) {
+                        throw new BuildException(be, getLocation());
+                    } catch (BuildException be) {
                         isOK = false;
                     }
-                    if (isOK) {
-                        currentelement = path.replace(remoteFileSep.charAt(0), File.separatorChar);
-                        if (!isFollowSymlinks() && traversesSymlinks) {
-                            continue;
-                        }
+                }
+            } else {
+                isOK = false;
+            }
+            if (isOK) {
+                currentelement = path.replace(remoteFileSep.charAt(0), File.separatorChar);
+                if (!isFollowSymlinks() && traversesSymlinks) {
+                    return;
+                }
 
-                        if (myfile.isDirectory()) {
-                            if (isIncluded(currentelement) && currentelement.length() > 0) {
-                                accountForIncludedDir(currentelement, myfile, true);
-                            }  else {
-                                if (currentelement.length() > 0) {
-                                    if (currentelement.charAt(currentelement.length() - 1)
-                                        != File.separatorChar) {
-                                        currentelement = currentelement + File.separatorChar;
-                                    }
-                                }
-                                scandir(myfile.getAbsolutePath(), currentelement, true);
-                            }
-                        } else {
-                            if (isCaseSensitive && originalpattern.equals(currentelement)) {
-                                accountForIncludedFile(currentelement);
-                            } else if (!isCaseSensitive
-                                       && originalpattern.equalsIgnoreCase(currentelement)) {
-                                accountForIncludedFile(currentelement);
+                if (myfile.isDirectory()) {
+                    if (isIncluded(currentelement)
+                        && currentelement.length() > 0) {
+                        accountForIncludedDir(currentelement, myfile, true);
+                    }  else {
+                        if (currentelement.length() > 0) {
+                            if (currentelement.charAt(currentelement
+                                                      .length() - 1)
+                                != File.separatorChar) {
+                                currentelement =
+                                    currentelement + File.separatorChar;
                             }
                         }
+                        scandir(myfile.getAbsolutePath(), currentelement, true);
                     }
+                } else if (isCaseSensitive
+                    && originalpattern.equals(currentelement)) {
+                    accountForIncludedFile(currentelement);
+                } else if (!isCaseSensitive && originalpattern
+                    .equalsIgnoreCase(currentelement)) {
+                    accountForIncludedFile(currentelement);
                 }
             }
         }
+
         /**
          * scans a particular directory. populates the scannedDirs cache.
          *
@@ -493,7 +507,7 @@
                     return;
                 }
                 String completePath = null;
-                if (!vpath.equals("")) {
+                if (!vpath.isEmpty()) {
                     completePath = rootPath + remoteFileSep
                         + vpath.replace(File.separatorChar, remoteFileSep.charAt(0));
                 } else {
@@ -556,7 +570,7 @@
 
                 if (isIncluded(name)) {
                     if (!isExcluded(name)
-                        && isSelected(name, (File) scannedDirs.get(name))) {
+                        && isSelected(name, scannedDirs.get(name))) {
                         filesIncluded.addElement(name);
                     } else {
                         filesExcluded.addElement(name);
@@ -618,14 +632,14 @@
          *
          * @since Ant 1.6
          */
-        private Map fileListMap = new HashMap();
+        private Map<String, FTPFile[]> fileListMap = new HashMap<>();
         /**
          * List of all scanned directories.
          *
          * @since Ant 1.6
          */
 
-        private Map scannedDirs = new HashMap();
+        private Map<String, FTPFileProxy> scannedDirs = new HashMap<>();
 
         /**
          * Has the directory with the given path relative to the base
@@ -653,12 +667,10 @@
          * @return array of FTPFile
          */
         public FTPFile[] listFiles(String directory, boolean changedir) {
-            //getProject().log("listing files in directory " + directory, Project.MSG_DEBUG);
             String currentPath = directory;
             if (changedir) {
                 try {
-                    boolean result = ftp.changeWorkingDirectory(directory);
-                    if (!result) {
+                    if (!ftp.changeWorkingDirectory(directory)) {
                         return null;
                     }
                     currentPath = ftp.printWorkingDirectory();
@@ -668,9 +680,9 @@
             }
             if (fileListMap.containsKey(currentPath)) {
                 getProject().log("filelist map used in listing files", Project.MSG_DEBUG);
-                return ((FTPFile[]) fileListMap.get(currentPath));
+                return fileListMap.get(currentPath);
             }
-            FTPFile[] result = null;
+            FTPFile[] result;
             try {
                 result = ftp.listFiles();
             } catch (IOException ioe) {
@@ -701,6 +713,7 @@
         public FTPFile[] listFiles(String directory) {
             return listFiles(directory, true);
         }
+
         private void checkRemoteSensitivity(FTPFile[] array, String directory) {
             if (array == null) {
                 return;
@@ -709,8 +722,8 @@
             String target = null;
             for (int icounter = 0; icounter < array.length; icounter++) {
                 if (array[icounter] != null && array[icounter].isDirectory()) {
-                    if (!array[icounter].getName().equals(".")
-                        && !array[icounter].getName().equals("..")) {
+                    if (!".".equals(array[icounter].getName())
+                        && !"..".equals(array[icounter].getName())) {
                         candidateFound = true;
                         target = fiddleName(array[icounter].getName());
                         getProject().log("will try to cd to "
@@ -749,8 +762,9 @@
                 remoteSensitivityChecked = true;
             }
         }
+
         private String fiddleName(String origin) {
-            StringBuffer result = new StringBuffer();
+            StringBuilder result = new StringBuilder();
             for (int icounter = 0; icounter < origin.length(); icounter++) {
                 if (Character.isLowerCase(origin.charAt(icounter))) {
                     result.append(Character.toUpperCase(origin.charAt(icounter)));
@@ -762,6 +776,7 @@
             }
             return result.toString();
         }
+
         /**
          * an AntFTPFile is a representation of a remote file
          * @since Ant 1.6
@@ -805,46 +820,47 @@
             public AntFTPFile(AntFTPFile parent, String path) {
                 this.parent = parent;
                 this.client = parent.client;
-                Vector pathElements = SelectorUtils.tokenizePath(path);
+                List<String> pathElements = SelectorUtils.tokenizePath(path);
                 try {
-                    boolean result = this.client.changeWorkingDirectory(parent.getAbsolutePath());
                     //this should not happen, except if parent has been deleted by another process
-                    if (!result) {
+                    if (!this.client.changeWorkingDirectory(parent.getAbsolutePath())) {
                         return;
                     }
                     this.curpwd = parent.getAbsolutePath();
                 } catch (IOException ioe) {
-                    throw new BuildException("could not change working dir to "
-                                             + parent.curpwd);
+                    throw new BuildException(
+                        "could not change working dir to %s", parent.curpwd);
                 }
                 final int size = pathElements.size();
                 for (int fcount = 0; fcount < size - 1; fcount++) {
-                    String currentPathElement = (String) pathElements.elementAt(fcount);
+                    String currentPathElement = pathElements.get(fcount);
                     try {
-                        boolean result = this.client.changeWorkingDirectory(currentPathElement);
-                        if (!result && !isCaseSensitive()
-                            && (remoteSystemCaseSensitive || !remoteSensitivityChecked)) {
-                            currentPathElement = findPathElementCaseUnsensitive(this.curpwd,
-                                                                                currentPathElement);
-                            if (currentPathElement == null) {
-                                return;
+                        if (!this.client
+                            .changeWorkingDirectory(currentPathElement)) {
+                            if (!isCaseSensitive() && (remoteSystemCaseSensitive
+                                || !remoteSensitivityChecked)) {
+                                currentPathElement =
+                                    findPathElementCaseUnsensitive(this.curpwd,
+                                        currentPathElement);
+                                if (currentPathElement == null) {
+                                    return;
+                                }
                             }
-                        } else if (!result) {
                             return;
                         }
-                        this.curpwd = getCurpwdPlusFileSep()
-                            + currentPathElement;
+                        this.curpwd =
+                            getCurpwdPlusFileSep() + currentPathElement;
                     } catch (IOException ioe) {
-                        throw new BuildException("could not change working dir to "
-                                                 + (String) pathElements.elementAt(fcount)
-                                                 + " from " + this.curpwd);
+                        throw new BuildException(
+                            "could not change working dir to %s from %s",
+                            currentPathElement, curpwd);
                     }
-
                 }
-                String lastpathelement = (String) pathElements.elementAt(size - 1);
-                FTPFile [] theFiles = listFiles(this.curpwd);
+                String lastpathelement = pathElements.get(pathElements.size() - 1);
+                FTPFile[] theFiles = listFiles(this.curpwd);
                 this.ftpFile = getFile(theFiles, lastpathelement);
             }
+
             /**
              * find a file in a directory in case insensitive way
              * @param parentPath        where we are
@@ -859,14 +875,15 @@
                 if (theFiles == null) {
                     return null;
                 }
-                for (int icounter = 0; icounter < theFiles.length; icounter++) {
-                    if (theFiles[icounter] != null
-                        && theFiles[icounter].getName().equalsIgnoreCase(soughtPathElement)) {
-                        return theFiles[icounter].getName();
+                for (FTPFile f : theFiles) {
+                    if (f != null
+                        && f.getName().equalsIgnoreCase(soughtPathElement)) {
+                        return f.getName();
                     }
                 }
                 return null;
             }
+
             /**
              * find out if the file exists
              * @return  true if the file exists
@@ -874,6 +891,7 @@
             public boolean exists() {
                 return (ftpFile != null);
             }
+
             /**
              * if the file is a symbolic link, find out to what it is pointing
              * @return the target of the symbolic link
@@ -881,6 +899,7 @@
             public String getLink() {
                 return ftpFile.getLink();
             }
+
             /**
              * get the name of the file
              * @return the name of the file
@@ -888,6 +907,7 @@
             public String getName() {
                 return ftpFile.getName();
             }
+
             /**
              * find out the absolute path of the file
              * @return absolute path as string
@@ -895,6 +915,7 @@
             public String getAbsolutePath() {
                 return getCurpwdPlusFileSep() + ftpFile.getName();
             }
+
             /**
              * find out the relative path assuming that the path used to construct
              * this AntFTPFile was spelled properly with regards to case.
@@ -908,6 +929,7 @@
                 }
                 return null;
             }
+
             /**
              * find out the relative path to the rootPath of the enclosing scanner.
              * this relative path is spelled exactly like on disk,
@@ -934,6 +956,7 @@
                 }
                 return relativePath;
             }
+
             /**
              * get the relative path of this file
              * @param currentPath          base path
@@ -941,18 +964,18 @@
              * @return relative path
              */
             private String getRelativePath(String currentPath, String currentRelativePath) {
-                Vector pathElements = SelectorUtils.tokenizePath(getAbsolutePath(), remoteFileSep);
-                Vector pathElements2 = SelectorUtils.tokenizePath(currentPath, remoteFileSep);
+                List<String> pathElements = SelectorUtils.tokenizePath(getAbsolutePath(), remoteFileSep);
+                List<String> pathElements2 = SelectorUtils.tokenizePath(currentPath, remoteFileSep);
                 String relPath = currentRelativePath;
                 final int size = pathElements.size();
                 for (int pcount = pathElements2.size(); pcount < size; pcount++) {
-                    String currentElement = (String) pathElements.elementAt(pcount);
+                    String currentElement = pathElements.get(pcount);
                     FTPFile[] theFiles = listFiles(currentPath);
                     FTPFile theFile = null;
                     if (theFiles != null) {
                         theFile = getFile(theFiles, currentElement);
                     }
-                    if (!relPath.equals("")) {
+                    if (!"".equals(relPath)) {
                         relPath = relPath + remoteFileSep;
                     }
                     if (theFile == null) {
@@ -970,6 +993,7 @@
                 }
                 return relPath;
             }
+
             /**
              * find a file matching a string in an array of FTPFile.
              * This method will find "alpha" when requested for "ALPHA"
@@ -983,19 +1007,15 @@
                 if (theFiles == null) {
                     return null;
                 }
-                for (int fcount = 0; fcount < theFiles.length; fcount++) {
-                    if (theFiles[fcount] != null) {
-                        if (theFiles[fcount].getName().equals(lastpathelement)) {
-                            return theFiles[fcount];
-                        } else if (!isCaseSensitive()
-                                   && theFiles[fcount].getName().equalsIgnoreCase(
-                                                                                  lastpathelement)) {
-                            return theFiles[fcount];
-                        }
-                    }
-                }
-                return null;
+                Predicate<String> test =
+                    isCaseSensitive() ? lastpathelement::equals
+                        : lastpathelement::equalsIgnoreCase;
+                return Stream.of(theFiles)
+                    .filter(Objects::nonNull)
+                    .filter(f -> test.test(f.getName()))
+                    .findFirst().orElse(null);
             }
+
             /**
              * tell if a file is a directory.
              * note that it will return false for symbolic links pointing to directories.
@@ -1004,6 +1024,7 @@
             public boolean isDirectory() {
                 return ftpFile.isDirectory();
             }
+
             /**
              * tell if a file is a symbolic link
              * @return <code>true</code> for symbolic links
@@ -1011,6 +1032,7 @@
             public boolean isSymbolicLink() {
                 return ftpFile.isSymbolicLink();
             }
+
             /**
              * return the attached FTP client object.
              * Warning : this instance is really shared with the enclosing class.
@@ -1027,6 +1049,7 @@
             protected void setCurpwd(String curpwd) {
                 this.curpwd = curpwd;
             }
+
             /**
              * returns the path of the directory containing the AntFTPFile.
              * of the full path of the file itself in case of AntFTPRootFile
@@ -1035,6 +1058,7 @@
             public String getCurpwd() {
                 return curpwd;
             }
+
             /**
              * returns the path of the directory containing the AntFTPFile.
              * of the full path of the file itself in case of AntFTPRootFile
@@ -1046,6 +1070,7 @@
                 return curpwd.endsWith(remoteFileSep) ? curpwd
                     : curpwd + remoteFileSep;
             }
+
             /**
              * find out if a symbolic link is encountered in the relative path of this file
              * from rootPath.
@@ -1066,16 +1091,19 @@
              * Get a string rep of this object.
              * @return a string containing the pwd and the file.
              */
+            @Override
             public String toString() {
                 return "AntFtpFile: " + curpwd + "%" + ftpFile;
             }
         }
+
         /**
          * special class to represent the remote directory itself
          * @since Ant 1.6
          */
         protected class AntFTPRootFile extends AntFTPFile {
             private String remotedir;
+
             /**
              * constructor
              * @param aclient FTP client
@@ -1091,24 +1119,29 @@
                     throw new BuildException(ioe, getLocation());
                 }
             }
+
             /**
              * find the absolute path
              * @return absolute path
              */
+            @Override
             public String getAbsolutePath() {
                 return this.getCurpwd();
             }
+
             /**
              * find out the relative path to root
              * @return empty string
              * @throws BuildException actually never
              * @throws IOException  actually never
              */
+            @Override
             public String getRelativePath() throws BuildException, IOException {
                 return "";
             }
         }
     }
+
     /**
      * check FTPFiles to check whether they function as directories too
      * the FTPFile API seem to make directory and symbolic links incompatible
@@ -1119,13 +1152,13 @@
      * @since ant 1.6
      */
     private boolean isFunctioningAsDirectory(FTPClient ftp, String dir, FTPFile file) {
-        boolean result = false;
-        String currentWorkingDir = null;
         if (file.isDirectory()) {
             return true;
-        } else if (file.isFile()) {
+        }
+        if (file.isFile()) {
             return false;
         }
+        String currentWorkingDir = null;
         try {
             currentWorkingDir = ftp.printWorkingDirectory();
         } catch (IOException ioe) {
@@ -1133,6 +1166,7 @@
                              + " while checking a symlink",
                              Project.MSG_DEBUG);
         }
+        boolean result = false;
         if (currentWorkingDir != null) {
             try {
                 result = ftp.changeWorkingDirectory(file.getLink());
@@ -1149,14 +1183,16 @@
                                      Project.MSG_ERR);
                 } finally {
                     if (!comeback) {
-                        throw new BuildException("could not cd back to " + dir //NOSONAR
-                                                 + " while checking a symlink");
+                        throw new BuildException(
+                            "could not cd back to %s while checking a symlink",
+                            dir);
                     }
                 }
             }
         }
         return result;
     }
+
     /**
      * check FTPFiles to check whether they function as directories too
      * the FTPFile API seem to make directory and symbolic links incompatible
@@ -1169,11 +1205,13 @@
     private boolean isFunctioningAsFile(FTPClient ftp, String dir, FTPFile file) {
         if (file.isDirectory()) {
             return false;
-        } else if (file.isFile()) {
+        }
+        if (file.isFile()) {
             return true;
         }
         return !isFunctioningAsDirectory(ftp, dir, file);
     }
+
     /**
      * Sets the remote directory where files will be placed. This may be a
      * relative or absolute path, and must be in the path syntax expected by
@@ -1185,7 +1223,6 @@
         this.remotedir = dir;
     }
 
-
     /**
      * Sets the FTP server to send files to.
      *
@@ -1392,9 +1429,9 @@
      *
      * @throws BuildException if the action is not a valid action.
      */
+    @Deprecated
     public void setAction(String action) throws BuildException {
-        log("DEPRECATED - The setAction(String) method has been deprecated."
-            + " Use setAction(FTP.Action) instead.");
+        log("DEPRECATED - The setAction(String) method has been deprecated. Use setAction(FTP.Action) instead.");
 
         Action a = new Action();
 
@@ -1463,7 +1500,7 @@
      * @see org.apache.commons.net.ftp.FTPClientConfig
      */
     public void setSystemTypeKey(FTPSystemType systemKey) {
-        if (systemKey != null && !systemKey.getValue().equals("")) {
+        if (systemKey != null && !"".equals(systemKey.getValue())) {
             this.systemTypeKey = systemKey;
             configurationHasBeenSet();
         }
@@ -1476,7 +1513,7 @@
      * @see org.apache.commons.net.ftp.FTPClientConfig
      */
     public void setDefaultDateFormatConfig(String defaultDateFormat) {
-        if (defaultDateFormat != null && !defaultDateFormat.equals("")) {
+        if (defaultDateFormat != null && !"".equals(defaultDateFormat)) {
             this.defaultDateFormatConfig = defaultDateFormat;
             configurationHasBeenSet();
         }
@@ -1489,7 +1526,7 @@
      * @see org.apache.commons.net.ftp.FTPClientConfig
      */
     public void setRecentDateFormatConfig(String recentDateFormat) {
-        if (recentDateFormat != null && !recentDateFormat.equals("")) {
+        if (recentDateFormat != null && !"".equals(recentDateFormat)) {
             this.recentDateFormatConfig = recentDateFormat;
             configurationHasBeenSet();
         }
@@ -1502,7 +1539,7 @@
      * @see org.apache.commons.net.ftp.FTPClientConfig
      */
     public void setServerLanguageCodeConfig(LanguageCode serverLanguageCode) {
-        if (serverLanguageCode != null && !"".equals(serverLanguageCode.getValue())) {
+        if (serverLanguageCode != null && !serverLanguageCode.getValue().isEmpty()) {
             this.serverLanguageCodeConfig = serverLanguageCode;
             configurationHasBeenSet();
         }
@@ -1515,7 +1552,7 @@
      * @see org.apache.commons.net.ftp.FTPClientConfig
      */
     public void setServerTimeZoneConfig(String serverTimeZoneId) {
-        if (serverTimeZoneId != null && !serverTimeZoneId.equals("")) {
+        if (serverTimeZoneId != null && !"".equals(serverTimeZoneId)) {
             this.serverTimeZoneConfig = serverTimeZoneId;
             configurationHasBeenSet();
         }
@@ -1529,7 +1566,7 @@
      * @see org.apache.commons.net.ftp.FTPClientConfig
      */
     public void setShortMonthNamesConfig(String shortMonthNames) {
-        if (shortMonthNames != null && !shortMonthNames.equals("")) {
+        if (shortMonthNames != null && !"".equals(shortMonthNames)) {
             this.shortMonthNamesConfig = shortMonthNames;
             configurationHasBeenSet();
         }
@@ -1553,62 +1590,73 @@
                 int retries = Integer.parseInt(retriesAllowed);
                 if (retries < Retryable.RETRY_FOREVER) {
                     throw new BuildException(
-                                             "Invalid value for retriesAllowed attribute: "
-                                             + retriesAllowed);
-
+                        "Invalid value for retriesAllowed attribute: %s",
+                        retriesAllowed);
                 }
                 this.retriesAllowed = retries;
             } catch (NumberFormatException px) {
                 throw new BuildException(
-                                         "Invalid value for retriesAllowed attribute: "
-                                         + retriesAllowed);
-
+                    "Invalid value for retriesAllowed attribute: %s",
+                    retriesAllowed);
             }
-
         }
     }
+
     /**
      * @return Returns the systemTypeKey.
      */
+    @Override
     public String getSystemTypeKey() {
         return systemTypeKey.getValue();
     }
+
     /**
      * @return Returns the defaultDateFormatConfig.
      */
+    @Override
     public String getDefaultDateFormatConfig() {
         return defaultDateFormatConfig;
     }
+
     /**
      * @return Returns the recentDateFormatConfig.
      */
+    @Override
     public String getRecentDateFormatConfig() {
         return recentDateFormatConfig;
     }
+
     /**
      * @return Returns the serverLanguageCodeConfig.
      */
+    @Override
     public String getServerLanguageCodeConfig() {
         return serverLanguageCodeConfig.getValue();
     }
+
     /**
      * @return Returns the serverTimeZoneConfig.
      */
+    @Override
     public String getServerTimeZoneConfig() {
         return serverTimeZoneConfig;
     }
+
     /**
      * @return Returns the shortMonthNamesConfig.
      */
+    @Override
     public String getShortMonthNamesConfig() {
         return shortMonthNamesConfig;
     }
+
     /**
      * @return Returns the timestampGranularity.
      */
     Granularity getTimestampGranularity() {
         return timestampGranularity;
     }
+
     /**
      * Sets the timestampGranularity attribute
      * @param timestampGranularity The timestampGranularity to set.
@@ -1619,6 +1667,7 @@
         }
         this.timestampGranularity = timestampGranularity;
     }
+
     /**
      * Sets the siteCommand attribute.  This attribute
      * names the command that will be executed if the action
@@ -1628,6 +1677,7 @@
     public void setSiteCommand(String siteCommand) {
         this.siteCommand = siteCommand;
     }
+
     /**
      * Sets the initialSiteCommand attribute.  This attribute
      * names a site command that will be executed immediately
@@ -1666,32 +1716,30 @@
         }
 
         if ((action == LIST_FILES) && (listing == null)) {
-            throw new BuildException("listing attribute must be set for list "
-                                     + "action!");
+            throw new BuildException(
+                "listing attribute must be set for list action!");
         }
 
         if (action == MK_DIR && remotedir == null) {
-            throw new BuildException("remotedir attribute must be set for "
-                                     + "mkdir action!");
+            throw new BuildException(
+                "remotedir attribute must be set for mkdir action!");
         }
 
         if (action == CHMOD && chmod == null) {
-            throw new BuildException("chmod attribute must be set for chmod "
-                                     + "action!");
+            throw new BuildException(
+                "chmod attribute must be set for chmod action!");
         }
         if (action == SITE_CMD && siteCommand == null) {
-            throw new BuildException("sitecommand attribute must be set for site "
-                                     + "action!");
+            throw new BuildException(
+                "sitecommand attribute must be set for site action!");
         }
 
-
         if (this.isConfigurationSet) {
             try {
                 Class.forName("org.apache.commons.net.ftp.FTPClientConfig");
             } catch (ClassNotFoundException e) {
                 throw new BuildException(
-                                         "commons-net.jar >= 1.4.0 is required for at least one"
-                                         + " of the attributes specified.");
+                    "commons-net.jar >= 1.4.0 is required for at least one of the attributes specified.");
             }
         }
     }
@@ -1734,7 +1782,7 @@
             ds.scan();
         }
 
-        String[] dsfiles = null;
+        String[] dsfiles;
         if (action == RM_DIR) {
             dsfiles = ds.getIncludedDirectories();
         } else {
@@ -1744,12 +1792,11 @@
 
         if ((ds.getBasedir() == null)
             && ((action == SEND_FILES) || (action == GET_FILES))) {
-            throw new BuildException("the dir attribute must be set for send "
-                                     + "and get actions");
-        } else {
-            if ((action == SEND_FILES) || (action == GET_FILES)) {
-                dir = ds.getBasedir().getAbsolutePath();
-            }
+            throw new BuildException(
+                "the dir attribute must be set for send and get actions");
+        }
+        if ((action == SEND_FILES) || (action == GET_FILES)) {
+            dir = ds.getBasedir().getAbsolutePath();
         }
 
         // If we are doing a listing, we need the output stream created now.
@@ -1770,11 +1817,7 @@
                 // the trunk does not let itself be removed before the leaves
                 for (int i = dsfiles.length - 1; i >= 0; i--) {
                     final String dsfile = dsfiles[i];
-                    executeRetryable(h, new Retryable() {
-                            public void execute() throws IOException {
-                                rmDir(ftp, dsfile);
-                            }
-                        }, dsfile);
+                    executeRetryable(h, () -> rmDir(ftp, dsfile), dsfile);
                 }
             } else {
                 final BufferedWriter fbw = bw;
@@ -1785,31 +1828,29 @@
                 }
                 for (int i = 0; i < dsfiles.length; i++) {
                     final String dsfile = dsfiles[i];
-                    executeRetryable(h, new Retryable() {
-                            public void execute() throws IOException {
-                                switch (action) {
-                                case SEND_FILES:
-                                    sendFile(ftp, fdir, dsfile);
-                                    break;
-                                case GET_FILES:
-                                    getFile(ftp, fdir, dsfile);
-                                    break;
-                                case DEL_FILES:
-                                    delFile(ftp, dsfile);
-                                    break;
-                                case LIST_FILES:
-                                    listFile(ftp, fbw, dsfile);
-                                    break;
-                                case CHMOD:
-                                    doSiteCommand(ftp, "chmod " + chmod
-                                                  + " " + resolveFile(dsfile));
-                                    transferred++;
-                                    break;
-                                default:
-                                    throw new BuildException("unknown ftp action " + action);
-                                }
-                            }
-                        }, dsfile);
+                    executeRetryable(h, () -> {
+                        switch (action) {
+                            case SEND_FILES:
+                                sendFile(ftp, fdir, dsfile);
+                                break;
+                            case GET_FILES:
+                                getFile(ftp, fdir, dsfile);
+                                break;
+                            case DEL_FILES:
+                                delFile(ftp, dsfile);
+                                break;
+                            case LIST_FILES:
+                                listFile(ftp, fbw, dsfile);
+                                break;
+                            case CHMOD:
+                                doSiteCommand(ftp, "chmod " + chmod
+                                        + " " + resolveFile(dsfile));
+                                transferred++;
+                                break;
+                            default:
+                                throw new BuildException("unknown ftp action " + action);
+                        }
+                    }, dsfile);
                 }
             }
         } finally {
@@ -1819,7 +1860,6 @@
         return dsfiles.length;
     }
 
-
     /**
      * Sends all files specified by the configured filesets to the remote
      * server.
@@ -1834,17 +1874,12 @@
         transferred = 0;
         skipped = 0;
 
-        if (filesets.size() == 0) {
+        if (filesets.isEmpty()) {
             throw new BuildException("at least one fileset must be specified.");
-        } else {
-            // get files from filesets
-            final int size = filesets.size();
-            for (int i = 0; i < size; i++) {
-                FileSet fs = (FileSet) filesets.elementAt(i);
-
-                if (fs != null) {
-                    transferFiles(ftp, fs);
-                }
+        }
+        for (FileSet fs : filesets) {
+            if (fs != null) {
+                transferFiles(ftp, fs);
             }
         }
 
@@ -1856,7 +1891,6 @@
         }
     }
 
-
     /**
      * Correct a file path to correspond to the remote host requirements. This
      * implementation currently assumes that the remote end can handle
@@ -1873,7 +1907,6 @@
                             remoteFileSep.charAt(0));
     }
 
-
     /**
      * Creates all parent directories specified in a complete relative
      * pathname. Attempts to create existing directories will not cause
@@ -1894,7 +1927,7 @@
             return;
         }
 
-        Vector parents = new Vector();
+        List<File> parents = new Vector<>();
         String dirname;
 
         while ((dirname = dir.getParent()) != null) {
@@ -1903,7 +1936,7 @@
                 break;
             }
             dir = checkDir;
-            parents.addElement(dir);
+            parents.add(dir);
         }
 
         // find first non cached dir
@@ -1912,15 +1945,14 @@
         if (i >= 0) {
             String cwd = ftp.printWorkingDirectory();
             String parent = dir.getParent();
-            if (parent != null) {
-                if (!ftp.changeWorkingDirectory(resolveFile(parent))) {
-                    throw new BuildException("could not change to "
-                                             + "directory: " + ftp.getReplyString());
-                }
+            if (parent != null
+                && !ftp.changeWorkingDirectory(resolveFile(parent))) {
+                throw new BuildException("could not change to directory: %s",
+                    ftp.getReplyString());
             }
 
             while (i >= 0) {
-                dir = (File) parents.elementAt(i--);
+                dir = parents.get(i--);
                 // check if dir exists by trying to change into it.
                 if (!ftp.changeWorkingDirectory(dir.getName())) {
                     // could not change to it - try to create it
@@ -1930,8 +1962,9 @@
                         handleMkDirFailure(ftp);
                     }
                     if (!ftp.changeWorkingDirectory(dir.getName())) {
-                        throw new BuildException("could not change to "
-                                                 + "directory: " + ftp.getReplyString());
+                        throw new BuildException(
+                            "could not change to directory: %s",
+                            ftp.getReplyString());
                     }
                 }
                 dirCache.add(dir);
@@ -1952,7 +1985,7 @@
             // create a local temporary file
             FILE_UTILS.createNewFile(tempFile);
             long localTimeStamp = tempFile.lastModified();
-            BufferedInputStream instream = new BufferedInputStream(new FileInputStream(tempFile));
+            BufferedInputStream instream = new BufferedInputStream(Files.newInputStream(tempFile.toPath()));
             ftp.storeFile(tempFile.getName(), instream);
             instream.close();
             boolean success = FTPReply.isPositiveCompletion(ftp.getReplyCode());
@@ -1975,11 +2008,12 @@
         }
         return returnValue;
     }
+
     /**
      *  find a suitable name for local and remote temporary file
      */
     private File findFileName(FTPClient ftp) {
-        FTPFile [] theFiles = null;
+        FTPFile[] theFiles = null;
         final int maxIterations = 1000;
         for (int counter = 1; counter < maxIterations; counter++) {
             File localFile = FILE_UTILS.createTempFile(
@@ -2037,10 +2071,9 @@
                 log("Could not date test remote file: " + remoteFile
                     + "assuming out of date.", Project.MSG_VERBOSE);
                 return false;
-            } else {
-                throw new BuildException("could not date test remote file: "
-                                         + ftp.getReplyString());
             }
+            throw new BuildException("could not date test remote file: %s",
+                ftp.getReplyString());
         }
 
         long remoteTimestamp = files[0].getTimestamp().getTime().getTime();
@@ -2048,38 +2081,36 @@
         long adjustedRemoteTimestamp =
             remoteTimestamp + this.timeDiffMillis + this.granularityMillis;
 
-        StringBuffer msg;
-        synchronized(TIMESTAMP_LOGGING_SDF) {
-            msg = new StringBuffer("   [")
+        StringBuilder msg;
+        synchronized (TIMESTAMP_LOGGING_SDF) {
+            msg = new StringBuilder("   [")
                 .append(TIMESTAMP_LOGGING_SDF.format(new Date(localTimestamp)))
                 .append("] local");
         }
         log(msg.toString(), Project.MSG_VERBOSE);
 
-        synchronized(TIMESTAMP_LOGGING_SDF) {
-            msg = new StringBuffer("   [")
-                .append(TIMESTAMP_LOGGING_SDF.format(new Date(adjustedRemoteTimestamp)))
+        synchronized (TIMESTAMP_LOGGING_SDF) {
+            msg = new StringBuilder("   [")
+                .append(TIMESTAMP_LOGGING_SDF
+                    .format(new Date(adjustedRemoteTimestamp)))
                 .append("] remote");
         }
         if (remoteTimestamp != adjustedRemoteTimestamp) {
-            synchronized(TIMESTAMP_LOGGING_SDF) {
+            synchronized (TIMESTAMP_LOGGING_SDF) {
                 msg.append(" - (raw: ")
-                    .append(TIMESTAMP_LOGGING_SDF.format(new Date(remoteTimestamp)))
+                    .append(
+                        TIMESTAMP_LOGGING_SDF.format(new Date(remoteTimestamp)))
                     .append(")");
             }
         }
         log(msg.toString(), Project.MSG_VERBOSE);
 
-
-
         if (this.action == SEND_FILES) {
             return adjustedRemoteTimestamp >= localTimestamp;
-        } else {
-            return localTimestamp >= adjustedRemoteTimestamp;
         }
+        return localTimestamp >= adjustedRemoteTimestamp;
     }
 
-
     /**
      * Sends a site command to the ftp server
      * @param ftp ftp client
@@ -2089,28 +2120,20 @@
      */
     protected void doSiteCommand(FTPClient ftp, String theCMD)
         throws IOException, BuildException {
-        boolean rc;
-        String[] myReply = null;
 
         log("Doing Site Command: " + theCMD, Project.MSG_VERBOSE);
 
-        rc = ftp.sendSiteCommand(theCMD);
-
-        if (!rc) {
+        if (!ftp.sendSiteCommand(theCMD)) {
             log("Failed to issue Site Command: " + theCMD, Project.MSG_WARN);
         } else {
-
-            myReply = ftp.getReplyStrings();
-
-            for (int x = 0; x < myReply.length; x++) {
-                if (myReply[x] != null && myReply[x].indexOf("200") == -1) {
-                    log(myReply[x], Project.MSG_WARN);
+            for (String reply : ftp.getReplyStrings()) {
+                if (reply != null && reply.indexOf("200") == -1) {
+                    log(reply, Project.MSG_WARN);
                 }
             }
         }
     }
 
-
     /**
      * Sends a single file to the remote host. <code>filename</code> may
      * contain a relative path specification. When this is the case, <code>sendFile</code>
@@ -2143,7 +2166,7 @@
                 log("transferring " + file.getAbsolutePath());
             }
 
-            instream = new BufferedInputStream(new FileInputStream(file));
+            instream = new BufferedInputStream(Files.newInputStream(file.toPath()));
 
             createParents(ftp, filename);
 
@@ -2175,7 +2198,6 @@
         }
     }
 
-
     /**
      * Delete a file from the remote host.
      * @param ftp ftp client
@@ -2255,10 +2277,9 @@
      */
     protected void getFile(FTPClient ftp, String dir, String filename)
         throws IOException, BuildException {
+        File file = getProject().resolveFile(new File(dir, filename).getPath());
         OutputStream outstream = null;
         try {
-            File file = getProject().resolveFile(new File(dir, filename).getPath());
-
             if (newerOnly && isUpToDate(ftp, file, resolveFile(filename))) {
                 return;
             }
@@ -2273,7 +2294,7 @@
             if (!pdir.exists()) {
                 pdir.mkdirs();
             }
-            outstream = new BufferedOutputStream(new FileOutputStream(file));
+            outstream = new BufferedOutputStream(Files.newOutputStream(file.toPath()));
             ftp.retrieveFile(resolveFile(filename), outstream);
 
             if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
@@ -2306,7 +2327,6 @@
         }
     }
 
-
     /**
      * List information about a single file from the remote host. <code>filename</code>
      * may contain a relative path specification. <p>
@@ -2351,41 +2371,41 @@
     protected void makeRemoteDir(FTPClient ftp, String dir)
         throws IOException, BuildException {
         String workingDirectory = ftp.printWorkingDirectory();
+        boolean absolute = dir.startsWith("/");
         if (verbose) {
-            if (dir.startsWith("/") || workingDirectory == null) {
+            if (absolute || workingDirectory == null) {
                 log("Creating directory: " + dir + " in /");
             } else {
                 log("Creating directory: " + dir + " in " + workingDirectory);
             }
         }
-        if (dir.startsWith("/")) {
+        if (absolute) {
             ftp.changeWorkingDirectory("/");
         }
-        String subdir = "";
         StringTokenizer st = new StringTokenizer(dir, "/");
         while (st.hasMoreTokens()) {
-            subdir = st.nextToken();
+            String subdir = st.nextToken();
             log("Checking " + subdir, Project.MSG_DEBUG);
             if (!ftp.changeWorkingDirectory(subdir)) {
-                if (!ftp.makeDirectory(subdir)) {
+                if (ftp.makeDirectory(subdir)) {
+                    if (verbose) {
+                        log("Directory created OK");
+                    }
+                    ftp.changeWorkingDirectory(subdir);
+                } else {
                     // codes 521, 550 and 553 can be produced by FTP Servers
                     //  to indicate that an attempt to create a directory has
                     //  failed because the directory already exists.
                     int rc = ftp.getReplyCode();
-                    if (!(ignoreNoncriticalErrors
-                          && (rc == CODE_550 || rc == CODE_553
-                              || rc == CODE_521))) {
-                        throw new BuildException("could not create directory: "
-                                                 + ftp.getReplyString());
+                    if (!(ignoreNoncriticalErrors && (rc == CODE_550
+                        || rc == CODE_553 || rc == CODE_521))) {
+                        throw new BuildException(
+                            "could not create directory: %s",
+                            ftp.getReplyString());
                     }
                     if (verbose) {
                         log("Directory already exists");
                     }
-                } else {
-                    if (verbose) {
-                        log("Directory created OK");
-                    }
-                    ftp.changeWorkingDirectory(subdir);
                 }
             }
         }
@@ -2405,8 +2425,8 @@
         int rc = ftp.getReplyCode();
         if (!(ignoreNoncriticalErrors
               && (rc == CODE_550 || rc == CODE_553 || rc == CODE_521))) {
-            throw new BuildException("could not create directory: "
-                                     + ftp.getReplyString());
+            throw new BuildException("could not create directory: %s",
+                ftp.getReplyString());
         }
     }
 
@@ -2416,6 +2436,7 @@
      * @throws BuildException if the task fails or is not configured
      *         correctly.
      */
+    @Override
     public void execute() throws BuildException {
         checkAttributes();
 
@@ -2432,8 +2453,8 @@
             ftp.setRemoteVerificationEnabled(enableRemoteVerification);
             ftp.connect(server, port);
             if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
-                throw new BuildException("FTP connection failed: "
-                                         + ftp.getReplyString());
+                throw new BuildException("FTP connection failed: %s",
+                    ftp.getReplyString());
             }
 
             log("connected", Project.MSG_VERBOSE);
@@ -2449,14 +2470,14 @@
             if (binary) {
                 ftp.setFileType(org.apache.commons.net.ftp.FTP.BINARY_FILE_TYPE);
                 if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
-                    throw new BuildException("could not set transfer type: "
-                                             + ftp.getReplyString());
+                    throw new BuildException("could not set transfer type: %s",
+                        ftp.getReplyString());
                 }
             } else {
                 ftp.setFileType(org.apache.commons.net.ftp.FTP.ASCII_FILE_TYPE);
                 if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
-                    throw new BuildException("could not set transfer type: "
-                                             + ftp.getReplyString());
+                    throw new BuildException("could not set transfer type: %s",
+                        ftp.getReplyString());
                 }
             }
 
@@ -2464,8 +2485,9 @@
                 log("entering passive mode", Project.MSG_VERBOSE);
                 ftp.enterLocalPassiveMode();
                 if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
-                    throw new BuildException("could not enter into passive "
-                                             + "mode: " + ftp.getReplyString());
+                    throw new BuildException(
+                        "could not enter into passive mode: %s",
+                        ftp.getReplyString());
                 }
             }
 
@@ -2474,56 +2496,43 @@
             // E.G. switching between a UNIX file system mode and
             // a legacy file system.
             if (this.initialSiteCommand != null) {
-                RetryHandler h = new RetryHandler(this.retriesAllowed, this);
                 final FTPClient lftp = ftp;
-                executeRetryable(h, new Retryable() {
-                        public void execute() throws IOException {
-                            doSiteCommand(lftp, FTP.this.initialSiteCommand);
-                        }
-                    }, "initial site command: " + this.initialSiteCommand);
+                executeRetryable(new RetryHandler(this.retriesAllowed, this),
+                    () -> doSiteCommand(lftp, FTP.this.initialSiteCommand),
+                    "initial site command: " + this.initialSiteCommand);
             }
 
-
             // For a unix ftp server you can set the default mask for all files
             // created.
 
             if (umask != null) {
-                RetryHandler h = new RetryHandler(this.retriesAllowed, this);
                 final FTPClient lftp = ftp;
-                executeRetryable(h, new Retryable() {
-                        public void execute() throws IOException {
-                            doSiteCommand(lftp, "umask " + umask);
-                        }
-                    }, "umask " + umask);
+                executeRetryable(new RetryHandler(this.retriesAllowed, this),
+                    () -> doSiteCommand(lftp, "umask " + umask),
+                    "umask " + umask);
             }
 
             // If the action is MK_DIR, then the specified remote
             // directory is the directory to create.
 
             if (action == MK_DIR) {
-                RetryHandler h = new RetryHandler(this.retriesAllowed, this);
                 final FTPClient lftp = ftp;
-                executeRetryable(h, new Retryable() {
-                        public void execute() throws IOException {
-                            makeRemoteDir(lftp, remotedir);
-                        }
-                    }, remotedir);
+                executeRetryable(new RetryHandler(this.retriesAllowed, this),
+                    () -> makeRemoteDir(lftp, remotedir), remotedir);
             } else if (action == SITE_CMD) {
-                RetryHandler h = new RetryHandler(this.retriesAllowed, this);
                 final FTPClient lftp = ftp;
-                executeRetryable(h, new Retryable() {
-                        public void execute() throws IOException {
-                            doSiteCommand(lftp, FTP.this.siteCommand);
-                        }
-                    }, "Site Command: " + this.siteCommand);
+                executeRetryable(new RetryHandler(this.retriesAllowed, this),
+                    () -> doSiteCommand(lftp, FTP.this.siteCommand),
+                    "Site Command: " + this.siteCommand);
             } else {
                 if (remotedir != null) {
                     log("changing the remote directory to " + remotedir,
                         Project.MSG_VERBOSE);
                     ftp.changeWorkingDirectory(remotedir);
                     if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
-                        throw new BuildException("could not change remote "
-                                                 + "directory: " + ftp.getReplyString());
+                        throw new BuildException(
+                            "could not change remote directory: %s",
+                            ftp.getReplyString());
                     }
                 }
                 if (newerOnly && timeDiffAuto) {
@@ -2550,7 +2559,6 @@
         }
     }
 
-
     /**
      * an action to perform, one of
      * "send", "put", "recv", "get", "del", "delete", "list", "mkdir", "chmod",
@@ -2563,44 +2571,47 @@
             "chmod", "rmdir", "site"
         };
 
-
         /**
          * Get the valid values
          *
          * @return an array of the valid FTP actions.
          */
+        @Override
         public String[] getValues() {
             return VALID_ACTIONS;
         }
 
-
         /**
          * Get the symbolic equivalent of the action value.
          *
          * @return the SYMBOL representing the given action.
          */
         public int getAction() {
-            String actionL = getValue().toLowerCase(Locale.ENGLISH);
-            if (actionL.equals("send") || actionL.equals("put")) {
+            switch (getValue().toLowerCase(Locale.ENGLISH)) {
+            case "send":
+            case "put":
                 return SEND_FILES;
-            } else if (actionL.equals("recv") || actionL.equals("get")) {
+            case "recv":
+            case "get":
                 return GET_FILES;
-            } else if (actionL.equals("del") || actionL.equals("delete")) {
+            case "del":
+            case "delete":
                 return DEL_FILES;
-            } else if (actionL.equals("list")) {
+            case "list":
                 return LIST_FILES;
-            } else if (actionL.equals("chmod")) {
+            case "chmod":
                 return CHMOD;
-            } else if (actionL.equals("mkdir")) {
+            case "mkdir":
                 return MK_DIR;
-            } else if (actionL.equals("rmdir")) {
+            case "rmdir":
                 return RM_DIR;
-            } else if (actionL.equals("site")) {
+            case "site":
                 return SITE_CMD;
             }
             return SEND_FILES;
         }
     }
+
     /**
      * represents one of the valid timestamp adjustment values
      * recognized by the <code>timestampGranularity</code> attribute.<p>
@@ -2626,9 +2637,11 @@
          * Get the valid values.
          * @return the list of valid Granularity values
          */
+        @Override
         public String[] getValues() {
             return VALID_GRANULARITIES;
         }
+
         /**
          * returns the number of milliseconds associated with
          * the attribute, which can vary in some cases depending
@@ -2648,13 +2661,14 @@
             }
             return 0L;
         }
+
         static final Granularity getDefault() {
             Granularity g = new Granularity();
             g.setValue("");
             return g;
         }
-
     }
+
     /**
      * one of the valid system type keys recognized by the systemTypeKey
      * attribute.
@@ -2671,6 +2685,7 @@
          * Get the valid values.
          * @return the list of valid system types.
          */
+        @Override
         public String[] getValues() {
             return VALID_SYSTEM_TYPES;
         }
@@ -2681,31 +2696,32 @@
             return ftpst;
         }
     }
+
     /**
      * Enumerated class for languages.
      */
     public static class LanguageCode extends EnumeratedAttribute {
 
-
         private static final String[] VALID_LANGUAGE_CODES =
             getValidLanguageCodes();
 
         private static String[] getValidLanguageCodes() {
-            Collection c = FTPClientConfig.getSupportedLanguageCodes();
+            @SuppressWarnings("unchecked")
+            Collection<String> c = FTPClientConfig.getSupportedLanguageCodes();
             String[] ret = new String[c.size() + 1];
             int i = 0;
             ret[i++] = "";
-            for (Iterator it = c.iterator(); it.hasNext(); i++) {
-                ret[i] = (String) it.next();
+            for (String element : c) {
+                ret[i++] = element;
             }
             return ret;
         }
 
-
         /**
          * Return the value values.
          * @return the list of valid language types.
          */
+        @Override
         public String[] getValues() {
             return VALID_LANGUAGE_CODES;
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -83,7 +83,7 @@
     private long granularityMillis = 0L;
     private boolean timeDiffAuto = false;
     private int action = SEND_FILES;
-    private Vector filesets = new Vector();
+    private Vector<FileSet> filesets = new Vector<>();
     private String remoteFileSep = "/";
     private int port = DEFAULT_FTP_PORT;
     private boolean skipFailedTransfers = false;
@@ -396,7 +396,7 @@
         filesets.addElement(set);
     }
 
-    public Vector getFilesets() {
+    public Vector<FileSet> getFilesets() {
         return filesets;
     }
 
@@ -415,6 +415,7 @@
      *
      * @throws BuildException if the action is not a valid action.
      */
+    @Deprecated
     public void setAction(String action) throws BuildException {
         log("DEPRECATED - The setAction(String) method has been deprecated."
             + " Use setAction(FTP.Action) instead.");
@@ -503,7 +504,7 @@
      * @see org.apache.commons.net.ftp.FTPClientConfig
      */
     public void setSystemTypeKey(FTPSystemType systemKey) {
-        if (systemKey != null && !systemKey.getValue().equals("")) {
+        if (systemKey != null && !"".equals(systemKey.getValue())) {
             this.systemTypeKey = systemKey;
             configurationHasBeenSet();
         }
@@ -516,7 +517,7 @@
      * @see org.apache.commons.net.ftp.FTPClientConfig
      */
     public void setDefaultDateFormatConfig(String defaultDateFormat) {
-        if (defaultDateFormat != null && !defaultDateFormat.equals("")) {
+        if (defaultDateFormat != null && !"".equals(defaultDateFormat)) {
             this.defaultDateFormatConfig = defaultDateFormat;
             configurationHasBeenSet();
         }
@@ -529,7 +530,7 @@
      * @see org.apache.commons.net.ftp.FTPClientConfig
      */
     public void setRecentDateFormatConfig(String recentDateFormat) {
-        if (recentDateFormat != null && !recentDateFormat.equals("")) {
+        if (recentDateFormat != null && !"".equals(recentDateFormat)) {
             this.recentDateFormatConfig = recentDateFormat;
             configurationHasBeenSet();
         }
@@ -542,7 +543,7 @@
      * @see org.apache.commons.net.ftp.FTPClientConfig
      */
     public void setServerLanguageCodeConfig(String serverLanguageCode) {
-        if (serverLanguageCode != null && !"".equals(serverLanguageCode)) {
+        if (serverLanguageCode != null && !serverLanguageCode.equals("")) {
             this.serverLanguageCodeConfig = serverLanguageCode;
             configurationHasBeenSet();
         }
@@ -555,7 +556,7 @@
      * @see org.apache.commons.net.ftp.FTPClientConfig
      */
     public void setServerTimeZoneConfig(String serverTimeZoneId) {
-        if (serverTimeZoneId != null && !serverTimeZoneId.equals("")) {
+        if (serverTimeZoneId != null && !"".equals(serverTimeZoneId)) {
             this.serverTimeZoneConfig = serverTimeZoneId;
             configurationHasBeenSet();
         }
@@ -569,7 +570,7 @@
      * @see org.apache.commons.net.ftp.FTPClientConfig
      */
     public void setShortMonthNamesConfig(String shortMonthNames) {
-        if (shortMonthNames != null && !shortMonthNames.equals("")) {
+        if (shortMonthNames != null && !"".equals(shortMonthNames)) {
             this.shortMonthNamesConfig = shortMonthNames;
             configurationHasBeenSet();
         }
@@ -593,16 +594,14 @@
                 int retries = Integer.parseInt(retriesAllowed);
                 if (retries < Retryable.RETRY_FOREVER) {
                     throw new BuildException(
-                                             "Invalid value for retriesAllowed attribute: "
-                                             + retriesAllowed);
-
+                        "Invalid value for retriesAllowed attribute: %s",
+                        retriesAllowed);
                 }
                 this.retriesAllowed = retries;
             } catch (NumberFormatException px) {
                 throw new BuildException(
-                                         "Invalid value for retriesAllowed attribute: "
-                                         + retriesAllowed);
-
+                    "Invalid value for retriesAllowed attribute: %s",
+                    retriesAllowed);
             }
 
         }
@@ -615,45 +614,58 @@
     /**
      * @return Returns the systemTypeKey.
      */
+    @Override
     public String getSystemTypeKey() {
         return systemTypeKey.getValue();
     }
+
     /**
      * @return Returns the defaultDateFormatConfig.
      */
+    @Override
     public String getDefaultDateFormatConfig() {
         return defaultDateFormatConfig;
     }
+
     /**
      * @return Returns the recentDateFormatConfig.
      */
+    @Override
     public String getRecentDateFormatConfig() {
         return recentDateFormatConfig;
     }
+
     /**
      * @return Returns the serverLanguageCodeConfig.
      */
+    @Override
     public String getServerLanguageCodeConfig() {
         return serverLanguageCodeConfig;
     }
+
     /**
      * @return Returns the serverTimeZoneConfig.
      */
+    @Override
     public String getServerTimeZoneConfig() {
         return serverTimeZoneConfig;
     }
+
     /**
      * @return Returns the shortMonthNamesConfig.
      */
+    @Override
     public String getShortMonthNamesConfig() {
         return shortMonthNamesConfig;
     }
+
     /**
      * @return Returns the timestampGranularity.
      */
     public Granularity getTimestampGranularity() {
         return timestampGranularity;
     }
+
     /**
      * Sets the timestampGranularity attribute
      * @param timestampGranularity The timestampGranularity to set.
@@ -664,6 +676,7 @@
         }
         this.timestampGranularity = timestampGranularity;
     }
+
     /**
      * Sets the siteCommand attribute.  This attribute
      * names the command that will be executed if the action
@@ -732,32 +745,30 @@
         }
 
         if ((action == LIST_FILES) && (listing == null)) {
-            throw new BuildException("listing attribute must be set for list "
-                                     + "action!");
+            throw new BuildException(
+                "listing attribute must be set for list action!");
         }
 
         if (action == MK_DIR && remotedir == null) {
-            throw new BuildException("remotedir attribute must be set for "
-                                     + "mkdir action!");
+            throw new BuildException(
+                "remotedir attribute must be set for mkdir action!");
         }
 
         if (action == CHMOD && chmod == null) {
-            throw new BuildException("chmod attribute must be set for chmod "
-                                     + "action!");
+            throw new BuildException(
+                "chmod attribute must be set for chmod action!");
         }
         if (action == SITE_CMD && siteCommand == null) {
-            throw new BuildException("sitecommand attribute must be set for site "
-                                     + "action!");
+            throw new BuildException(
+                "sitecommand attribute must be set for site action!");
         }
 
-
         if (this.isConfigurationSet) {
             try {
                 Class.forName("org.apache.commons.net.ftp.FTPClientConfig");
             } catch (ClassNotFoundException e) {
                 throw new BuildException(
-                                         "commons-net.jar >= 1.4.0 is required for at least one"
-                                         + " of the attributes specified.");
+                    "commons-net.jar >= 1.4.0 is required for at least one of the attributes specified.");
             }
         }
     }
@@ -768,6 +779,7 @@
      * @throws BuildException if the task fails or is not configured
      *         correctly.
      */
+    @Override
     public void execute() throws BuildException {
         checkAttributes();
         try {
@@ -815,18 +827,21 @@
         try {
             loader.loadClass("org.apache.commons.net.ftp.FTP"); // sanity check
         } catch (ClassNotFoundException e) {
-            throw new BuildException("The <classpath> for <ftp> must include"
-                                     + " commons-net.jar if not in Ant's own "
-                                     + " classpath", e, task.getLocation());
+            throw new BuildException(
+                "The <classpath> for <ftp> must include commons-net.jar if not in Ant's own classpath",
+                e, task.getLocation());
         }
         try {
-            Class c = loader.loadClass(FTPTaskMirror.class.getName() + "Impl");
+            Class<? extends FTPTaskMirror> c =
+                loader.loadClass(FTPTaskMirror.class.getName() + "Impl")
+                    .asSubclass(FTPTaskMirror.class);
             if (c.getClassLoader() != loader) {
                 throw new BuildException("Overdelegating loader",
-                                         task.getLocation());
+                    task.getLocation());
             }
-            Constructor cons = c.getConstructor(new Class[] {FTPTask.class});
-            return (FTPTaskMirror) cons.newInstance(new Object[] {task});
+            Constructor<? extends FTPTaskMirror> cons =
+                c.getConstructor(FTPTask.class);
+            return cons.newInstance(task);
         } catch (Exception e) {
             throw new BuildException(e, task.getLocation());
         }
@@ -844,17 +859,16 @@
             "chmod", "rmdir", "site"
         };
 
-
         /**
          * Get the valid values
          *
          * @return an array of the valid FTP actions.
          */
+        @Override
         public String[] getValues() {
             return VALID_ACTIONS;
         }
 
-
         /**
          * Get the symbolic equivalent of the action value.
          *
@@ -862,26 +876,31 @@
          */
         public int getAction() {
             String actionL = getValue().toLowerCase(Locale.ENGLISH);
-            if (actionL.equals("send") || actionL.equals("put")) {
+            switch (actionL) {
+            case "send":
+            case "put":
                 return SEND_FILES;
-            } else if (actionL.equals("recv") || actionL.equals("get")) {
+            case "recv":
+            case "get":
                 return GET_FILES;
-            } else if (actionL.equals("del") || actionL.equals("delete")) {
+            case "del":
+            case "delete":
                 return DEL_FILES;
-            } else if (actionL.equals("list")) {
+            case "list":
                 return LIST_FILES;
-            } else if (actionL.equals("chmod")) {
+            case "chmod":
                 return CHMOD;
-            } else if (actionL.equals("mkdir")) {
+            case "mkdir":
                 return MK_DIR;
-            } else if (actionL.equals("rmdir")) {
+            case "rmdir":
                 return RM_DIR;
-            } else if (actionL.equals("site")) {
+            case "site":
                 return SITE_CMD;
             }
             return SEND_FILES;
         }
     }
+
     /**
      * represents one of the valid timestamp adjustment values
      * recognized by the <code>timestampGranularity</code> attribute.<p>
@@ -907,9 +926,11 @@
          * Get the valid values.
          * @return the list of valid Granularity values
          */
+        @Override
         public String[] getValues() {
             return VALID_GRANULARITIES;
         }
+
         /**
          * returns the number of milliseconds associated with
          * the attribute, which can vary in some cases depending
@@ -929,13 +950,14 @@
             }
             return 0L;
         }
+
         static final Granularity getDefault() {
             Granularity g = new Granularity();
             g.setValue("");
             return g;
         }
-
     }
+
     /**
      * one of the valid system type keys recognized by the systemTypeKey
      * attribute.
@@ -947,11 +969,11 @@
             "MVS"
         };
 
-
         /**
          * Get the valid values.
          * @return the list of valid system types.
          */
+        @Override
         public String[] getValues() {
             return VALID_SYSTEM_TYPES;
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,22 +21,24 @@
 import java.io.BufferedOutputStream;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Files;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Hashtable;
+import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.Vector;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPFile;
@@ -66,7 +68,7 @@
     private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
 
     private final FTPTask task;
-    private Set dirCache = new HashSet();
+    private Set<File> dirCache = new HashSet<>();
     private int transferred = 0;
     private int skipped = 0;
 
@@ -84,6 +86,7 @@
      *
      */
     protected static class FTPFileProxy extends File {
+        private static final long serialVersionUID = 1L;
 
         private final FTPFile file;
         private final String[] parts;
@@ -111,34 +114,34 @@
             parts = FileUtils.getPathStack(completePath);
         }
 
-
         /* (non-Javadoc)
          * @see java.io.File#exists()
          */
+        @Override
         public boolean exists() {
             return true;
         }
 
-
         /* (non-Javadoc)
          * @see java.io.File#getAbsolutePath()
          */
+        @Override
         public String getAbsolutePath() {
             return name;
         }
 
-
         /* (non-Javadoc)
          * @see java.io.File#getName()
          */
+        @Override
         public String getName() {
             return parts.length > 0 ? parts[parts.length - 1] : name;
         }
 
-
         /* (non-Javadoc)
          * @see java.io.File#getParent()
          */
+        @Override
         public String getParent() {
             String result = "";
             for(int i = 0; i < parts.length - 1; i++){
@@ -147,53 +150,53 @@
             return result;
         }
 
-
         /* (non-Javadoc)
          * @see java.io.File#getPath()
          */
+        @Override
         public String getPath() {
             return name;
         }
 
-
         /**
          * FTP files are stored as absolute paths
          * @return true
          */
+        @Override
         public boolean isAbsolute() {
             return true;
         }
 
-
         /* (non-Javadoc)
          * @see java.io.File#isDirectory()
          */
+        @Override
         public boolean isDirectory() {
             return file == null;
         }
 
-
         /* (non-Javadoc)
          * @see java.io.File#isFile()
          */
+        @Override
         public boolean isFile() {
             return file != null;
         }
 
-
         /**
          * FTP files cannot be hidden
          *
          * @return  false
          */
+        @Override
         public boolean isHidden() {
             return false;
         }
 
-
         /* (non-Javadoc)
          * @see java.io.File#lastModified()
          */
+        @Override
         public long lastModified() {
             if (file != null) {
                 return file.getTimestamp().getTimeInMillis();
@@ -201,10 +204,10 @@
             return 0;
         }
 
-
         /* (non-Javadoc)
          * @see java.io.File#length()
          */
+        @Override
         public long length() {
             if (file != null) {
                 return file.getSize();
@@ -245,11 +248,11 @@
             this.setFollowSymlinks(false);
         }
 
-
         /**
          * scans the remote directory,
          * storing internally the included files, directories, ...
          */
+        @Override
         public void scan() {
             if (includes == null) {
                 // No includes supplied, so set it to 'matches all'
@@ -260,12 +263,12 @@
                 excludes = new String[0];
             }
 
-            filesIncluded = new VectorSet();
-            filesNotIncluded = new Vector();
-            filesExcluded = new VectorSet();
-            dirsIncluded = new VectorSet();
-            dirsNotIncluded = new Vector();
-            dirsExcluded = new VectorSet();
+            filesIncluded = new VectorSet<>();
+            filesNotIncluded = new Vector<>();
+            filesExcluded = new VectorSet<>();
+            dirsIncluded = new VectorSet<>();
+            dirsNotIncluded = new Vector<>();
+            dirsExcluded = new VectorSet<>();
 
             try {
                 String cwd = ftp.printWorkingDirectory();
@@ -280,7 +283,6 @@
             }
         }
 
-
         /**
          * this routine is actually checking all the include patterns in
          * order to avoid scanning everything under base dir
@@ -288,7 +290,7 @@
          */
         private void checkIncludePatterns() {
 
-            Hashtable newroots = new Hashtable();
+            Map<String, String> newroots = new Hashtable<>();
             // put in the newroots vector the include patterns without
             // wildcard tokens
             for (int icounter = 0; icounter < includes.length; icounter++) {
@@ -313,75 +315,73 @@
             } else {
                 // only scan directories that can include matched files or
                 // directories
-                Enumeration enum2 = newroots.keys();
+                newroots.forEach(
+                    (k, v) -> scanRoot(new AntFTPFile(baseFTPFile, k), v));
+            }
+        }
 
-                while (enum2.hasMoreElements()) {
-                    String currentelement = (String) enum2.nextElement();
-                    String originalpattern = (String) newroots.get(currentelement);
-                    AntFTPFile myfile = new AntFTPFile(baseFTPFile, currentelement);
-                    boolean isOK = true;
-                    boolean traversesSymlinks = false;
-                    String path = null;
-
-                    if (myfile.exists()) {
-                        forceRemoteSensitivityCheck();
-                        if (remoteSensitivityChecked
-                            && remoteSystemCaseSensitive && isFollowSymlinks()) {
-                            // cool case,
-                            //we do not need to scan all the subdirs in the relative path
-                            path = myfile.getFastRelativePath();
-                        } else {
-                            // may be on a case insensitive file system.  We want
-                            // the results to show what's really on the disk, so
-                            // we need to double check.
-                            try {
-                                path = myfile.getRelativePath();
-                                traversesSymlinks = myfile.isTraverseSymlinks();
-                            } catch (IOException be) {
-                                throw new BuildException(be, task.getLocation());
-                            } catch (BuildException be) {
-                                isOK = false;
-                            }
-                        }
-                    } else {
+        private void scanRoot(AntFTPFile myfile, String originalpattern) {
+            String currentelement;
+            boolean isOK = true;
+            boolean traversesSymlinks = false;
+            String path = null;
+
+            if (myfile.exists()) {
+                forceRemoteSensitivityCheck();
+                if (remoteSensitivityChecked
+                    && remoteSystemCaseSensitive && isFollowSymlinks()) {
+                    // cool case,
+                    //we do not need to scan all the subdirs in the relative path
+                    path = myfile.getFastRelativePath();
+                } else {
+                    // may be on a case insensitive file system.  We want
+                    // the results to show what's really on the disk, so
+                    // we need to double check.
+                    try {
+                        path = myfile.getRelativePath();
+                        traversesSymlinks = myfile.isTraverseSymlinks();
+                    } catch (IOException be) {
+                        throw new BuildException(be, task.getLocation());
+                    } catch (BuildException be) {
                         isOK = false;
                     }
-                    if (isOK) {
-                        currentelement = path.replace(task.getSeparator().charAt(0), File.separatorChar);
-                        if (!isFollowSymlinks()
-                            && traversesSymlinks) {
-                            continue;
-                        }
+                }
+            } else {
+                isOK = false;
+            }
+            if (isOK) {
+                currentelement = path.replace(task.getSeparator().charAt(0), File.separatorChar);
+                if (!isFollowSymlinks()
+                    && traversesSymlinks) {
+                    return;
+                }
 
-                        if (myfile.isDirectory()) {
-                            if (isIncluded(currentelement)
-                                && currentelement.length() > 0) {
-                                accountForIncludedDir(currentelement, myfile, true);
-                            }  else {
-                                if (currentelement.length() > 0) {
-                                    if (currentelement.charAt(currentelement
-                                                              .length() - 1)
-                                        != File.separatorChar) {
-                                        currentelement =
-                                            currentelement + File.separatorChar;
-                                    }
-                                }
-                                scandir(myfile.getAbsolutePath(), currentelement, true);
-                            }
-                        } else {
-                            if (isCaseSensitive
-                                && originalpattern.equals(currentelement)) {
-                                accountForIncludedFile(currentelement);
-                            } else if (!isCaseSensitive
-                                       && originalpattern
-                                       .equalsIgnoreCase(currentelement)) {
-                                accountForIncludedFile(currentelement);
+                if (myfile.isDirectory()) {
+                    if (isIncluded(currentelement)
+                        && currentelement.length() > 0) {
+                        accountForIncludedDir(currentelement, myfile, true);
+                    }  else {
+                        if (currentelement.length() > 0) {
+                            if (currentelement.charAt(currentelement
+                                                      .length() - 1)
+                                != File.separatorChar) {
+                                currentelement =
+                                    currentelement + File.separatorChar;
                             }
                         }
+                        scandir(myfile.getAbsolutePath(), currentelement, true);
                     }
+                } else if (isCaseSensitive
+                    && originalpattern.equals(currentelement)) {
+                    accountForIncludedFile(currentelement);
+                } else if (!isCaseSensitive
+                           && originalpattern
+                           .equalsIgnoreCase(currentelement)) {
+                    accountForIncludedFile(currentelement);
                 }
             }
         }
+
         /**
          * scans a particular directory. populates the scannedDirs cache.
          *
@@ -399,8 +399,8 @@
                 if (!ftp.changeWorkingDirectory(dir)) {
                     return;
                 }
-                String completePath = null;
-                if (!vpath.equals("")) {
+                String completePath;
+                if (!"".equals(vpath)) {
                     completePath = rootPath + task.getSeparator()
                         + vpath.replace(File.separatorChar, task.getSeparator().charAt(0));
                 } else {
@@ -415,8 +415,8 @@
                 for (int i = 0; i < newfiles.length; i++) {
                     FTPFile file = newfiles[i];
                     if (file != null
-                        && !file.getName().equals(".")
-                        && !file.getName().equals("..")) {
+                        && !".".equals(file.getName())
+                        && !"..".equals(file.getName())) {
                         String name = vpath + file.getName();
                         scannedDirs.put(name, new FTPFileProxy(file));
                         if (isFunctioningAsDirectory(ftp, dir, file)) {
@@ -463,7 +463,7 @@
 
                 if (isIncluded(name)) {
                     if (!isExcluded(name)
-                        && isSelected(name, (File) scannedDirs.get(name))) {
+                        && isSelected(name, scannedDirs.get(name))) {
                         filesIncluded.addElement(name);
                     } else {
                         filesExcluded.addElement(name);
@@ -520,19 +520,21 @@
                 }
             }
         }
+
         /**
          * temporary table to speed up the various scanning methods below
          *
          * @since Ant 1.6
          */
-        private Map fileListMap = new HashMap();
+        private Map<String, FTPFile[]> fileListMap = new HashMap<>();
+
         /**
          * List of all scanned directories.
          *
          * @since Ant 1.6
          */
 
-        private Map scannedDirs = new HashMap();
+        private Map<String, FTPFileProxy> scannedDirs = new HashMap<>();
 
         /**
          * Has the directory with the given path relative to the base
@@ -553,6 +555,7 @@
             fileListMap.clear();
             scannedDirs.clear();
         }
+
         /**
          * list the files present in one directory.
          * @param directory full path on the remote side
@@ -564,8 +567,7 @@
             String currentPath = directory;
             if (changedir) {
                 try {
-                    boolean result = ftp.changeWorkingDirectory(directory);
-                    if (!result) {
+                    if (!ftp.changeWorkingDirectory(directory)) {
                         return null;
                     }
                     currentPath = ftp.printWorkingDirectory();
@@ -575,9 +577,9 @@
             }
             if (fileListMap.containsKey(currentPath)) {
                 task.log("filelist map used in listing files", Project.MSG_DEBUG);
-                return ((FTPFile[]) fileListMap.get(currentPath));
+                return fileListMap.get(currentPath);
             }
-            FTPFile[] result = null;
+            FTPFile[] result;
             try {
                 result = ftp.listFiles();
             } catch (IOException ioe) {
@@ -599,6 +601,7 @@
                 }
             }
         }
+
         /**
          * cd into one directory and
          * list the files present in one directory.
@@ -608,6 +611,7 @@
         public FTPFile[] listFiles(String directory) {
             return listFiles(directory, true);
         }
+
         private void checkRemoteSensitivity(FTPFile[] array, String directory) {
             if (array == null) {
                 return;
@@ -616,8 +620,8 @@
             String target = null;
             for (int icounter = 0; icounter < array.length; icounter++) {
                 if (array[icounter] != null && array[icounter].isDirectory()) {
-                    if (!array[icounter].getName().equals(".")
-                        && !array[icounter].getName().equals("..")) {
+                    if (!".".equals(array[icounter].getName())
+                        && !"..".equals(array[icounter].getName())) {
                         candidateFound = true;
                         target = fiddleName(array[icounter].getName());
                         task.log("will try to cd to "
@@ -657,8 +661,9 @@
                 remoteSensitivityChecked = true;
             }
         }
+
         private String fiddleName(String origin) {
-            StringBuffer result = new StringBuffer();
+            StringBuilder result = new StringBuilder();
             for (int icounter = 0; icounter < origin.length(); icounter++) {
                 if (Character.isLowerCase(origin.charAt(icounter))) {
                     result.append(Character.toUpperCase(origin.charAt(icounter)));
@@ -670,6 +675,7 @@
             }
             return result.toString();
         }
+
         /**
          * an AntFTPFile is a representation of a remote file
          * @since Ant 1.6
@@ -694,6 +700,7 @@
             private boolean relativePathCalculated = false;
             private boolean traversesSymlinks = false;
             private String relativePath = "";
+
             /**
              * constructor
              * @param client ftp client variable
@@ -705,6 +712,7 @@
                 this.ftpFile = ftpFile;
                 this.curpwd = curpwd;
             }
+
             /**
              * other constructor
              * @param parent the parent file
@@ -713,7 +721,7 @@
             public AntFTPFile(AntFTPFile parent, String path) {
                 this.parent = parent;
                 this.client = parent.client;
-                Vector pathElements = SelectorUtils.tokenizePath(path);
+                List<String> pathElements = SelectorUtils.tokenizePath(path);
                 try {
                     boolean result = this.client.changeWorkingDirectory(parent.getAbsolutePath());
                     //this should not happen, except if parent has been deleted by another process
@@ -722,35 +730,35 @@
                     }
                     this.curpwd = parent.getAbsolutePath();
                 } catch (IOException ioe) {
-                    throw new BuildException("could not change working dir to "
-                                             + parent.curpwd);
+                    throw new BuildException(
+                        "could not change working dir to %s", parent.curpwd);
                 }
                 final int size = pathElements.size();
                 for (int fcount = 0; fcount < size - 1; fcount++) {
-                    String currentPathElement = (String) pathElements.elementAt(fcount);
+                    String currentPathElement = pathElements.get(fcount);
                     try {
-                        boolean result = this.client.changeWorkingDirectory(currentPathElement);
-                        if (!result && !isCaseSensitive()
-                            && (remoteSystemCaseSensitive || !remoteSensitivityChecked)) {
-                            currentPathElement = findPathElementCaseUnsensitive(this.curpwd,
-                                                                                currentPathElement);
-                            if (currentPathElement == null) {
-                                return;
+                        if (!this.client.changeWorkingDirectory(currentPathElement)) {
+                            if (!isCaseSensitive() && (remoteSystemCaseSensitive
+                                || !remoteSensitivityChecked)) {
+                                currentPathElement =
+                                    findPathElementCaseUnsensitive(this.curpwd,
+                                        currentPathElement);
+                                if (currentPathElement == null) {
+                                    return;
+                                }
                             }
-                        } else if (!result) {
                             return;
                         }
-                        this.curpwd = getCurpwdPlusFileSep()
-                            + currentPathElement;
+                        this.curpwd =
+                            getCurpwdPlusFileSep() + currentPathElement;
                     } catch (IOException ioe) {
-                        throw new BuildException("could not change working dir to "
-                                                 + (String) pathElements.elementAt(fcount)
-                                                 + " from " + this.curpwd);
+                        throw new BuildException(
+                            "could not change working dir to %s from %s",
+                            currentPathElement, this.curpwd);
                     }
-
                 }
-                String lastpathelement = (String) pathElements.elementAt(size - 1);
-                FTPFile [] theFiles = listFiles(this.curpwd);
+                String lastpathelement = pathElements.get(size - 1);
+                FTPFile[] theFiles = listFiles(this.curpwd);
                 this.ftpFile = getFile(theFiles, lastpathelement);
             }
             /**
@@ -767,10 +775,10 @@
                 if (theFiles == null) {
                     return null;
                 }
-                for (int icounter = 0; icounter < theFiles.length; icounter++) {
-                    if (theFiles[icounter] != null
-                        && theFiles[icounter].getName().equalsIgnoreCase(soughtPathElement)) {
-                        return theFiles[icounter].getName();
+                for (FTPFile f : theFiles) {
+                    if (f != null
+                        && f.getName().equalsIgnoreCase(soughtPathElement)) {
+                        return f.getName();
                     }
                 }
                 return null;
@@ -780,8 +788,9 @@
              * @return  true if the file exists
              */
             public boolean exists() {
-                return (ftpFile != null);
+                return ftpFile != null;
             }
+
             /**
              * if the file is a symbolic link, find out to what it is pointing
              * @return the target of the symbolic link
@@ -789,6 +798,7 @@
             public String getLink() {
                 return ftpFile.getLink();
             }
+
             /**
              * get the name of the file
              * @return the name of the file
@@ -796,6 +806,7 @@
             public String getName() {
                 return ftpFile.getName();
             }
+
             /**
              * find out the absolute path of the file
              * @return absolute path as string
@@ -803,6 +814,7 @@
             public String getAbsolutePath() {
                 return getCurpwdPlusFileSep() + ftpFile.getName();
             }
+
             /**
              * find out the relative path assuming that the path used to construct
              * this AntFTPFile was spelled properly with regards to case.
@@ -817,6 +829,7 @@
                 }
                 return null;
             }
+
             /**
              * find out the relative path to the rootPath of the enclosing scanner.
              * this relative path is spelled exactly like on disk,
@@ -843,6 +856,7 @@
                 }
                 return relativePath;
             }
+
             /**
              * get the relative path of this file
              * @param currentPath          base path
@@ -850,19 +864,20 @@
              * @return relative path
              */
             private String getRelativePath(String currentPath, String currentRelativePath) {
-                Vector pathElements = SelectorUtils.tokenizePath(getAbsolutePath(), task.getSeparator());
-                Vector pathElements2 = SelectorUtils.tokenizePath(currentPath,
-                                                                  task.getSeparator());
+                List<String> pathElements = SelectorUtils
+                    .tokenizePath(getAbsolutePath(), task.getSeparator());
+                List<String> pathElements2 = SelectorUtils
+                    .tokenizePath(currentPath, task.getSeparator());
                 String relPath = currentRelativePath;
                 final int size = pathElements.size();
                 for (int pcount = pathElements2.size(); pcount < size; pcount++) {
-                    String currentElement = (String) pathElements.elementAt(pcount);
+                    String currentElement = pathElements.get(pcount);
                     FTPFile[] theFiles = listFiles(currentPath);
                     FTPFile theFile = null;
                     if (theFiles != null) {
                         theFile = getFile(theFiles, currentElement);
                     }
-                    if (!relPath.equals("")) {
+                    if (!"".equals(relPath)) {
                         relPath = relPath + task.getSeparator();
                     }
                     if (theFile == null) {
@@ -882,6 +897,7 @@
                 }
                 return relPath;
             }
+
             /**
              * find a file matching a string in an array of FTPFile.
              * This method will find "alpha" when requested for "ALPHA"
@@ -895,19 +911,15 @@
                 if (theFiles == null) {
                     return null;
                 }
-                for (int fcount = 0; fcount < theFiles.length; fcount++) {
-                    if (theFiles[fcount] != null) {
-                        if (theFiles[fcount].getName().equals(lastpathelement)) {
-                            return theFiles[fcount];
-                        } else if (!isCaseSensitive()
-                                   && theFiles[fcount].getName().equalsIgnoreCase(
-                                                                                  lastpathelement)) {
-                            return theFiles[fcount];
-                        }
-                    }
-                }
-                return null;
+                Predicate<String> test =
+                    isCaseSensitive() ? lastpathelement::equals
+                        : lastpathelement::equalsIgnoreCase;
+                return Stream.of(theFiles)
+                    .filter(Objects::nonNull)
+                    .filter(f -> test.test(f.getName()))
+                    .findFirst().orElse(null);
             }
+
             /**
              * tell if a file is a directory.
              * note that it will return false for symbolic links pointing to directories.
@@ -916,6 +928,7 @@
             public boolean isDirectory() {
                 return ftpFile.isDirectory();
             }
+
             /**
              * tell if a file is a symbolic link
              * @return <code>true</code> for symbolic links
@@ -923,6 +936,7 @@
             public boolean isSymbolicLink() {
                 return ftpFile.isSymbolicLink();
             }
+
             /**
              * return the attached FTP client object.
              * Warning : this instance is really shared with the enclosing class.
@@ -939,6 +953,7 @@
             protected void setCurpwd(String curpwd) {
                 this.curpwd = curpwd;
             }
+
             /**
              * returns the path of the directory containing the AntFTPFile.
              * of the full path of the file itself in case of AntFTPRootFile
@@ -947,6 +962,7 @@
             public String getCurpwd() {
                 return curpwd;
             }
+
             /**
              * returns the path of the directory containing the AntFTPFile.
              * of the full path of the file itself in case of AntFTPRootFile
@@ -958,6 +974,7 @@
                 String sep = task.getSeparator();
                 return curpwd.endsWith(sep) ? curpwd : curpwd + sep;
             }
+
             /**
              * find out if a symbolic link is encountered in the relative path of this file
              * from rootPath.
@@ -978,16 +995,19 @@
              * Get a string rep of this object.
              * @return a string containing the pwd and the file.
              */
+            @Override
             public String toString() {
                 return "AntFtpFile: " + curpwd + "%" + ftpFile;
             }
         }
+
         /**
          * special class to represent the remote directory itself
          * @since Ant 1.6
          */
         protected class AntFTPRootFile extends AntFTPFile {
             private String remotedir;
+
             /**
              * constructor
              * @param aclient FTP client
@@ -1003,24 +1023,29 @@
                     throw new BuildException(ioe, task.getLocation());
                 }
             }
+
             /**
              * find the absolute path
              * @return absolute path
              */
+            @Override
             public String getAbsolutePath() {
                 return this.getCurpwd();
             }
+
             /**
              * find out the relative path to root
              * @return empty string
              * @throws BuildException actually never
              * @throws IOException  actually never
              */
+            @Override
             public String getRelativePath() throws BuildException, IOException {
                 return "";
             }
         }
     }
+
     /**
      * check FTPFiles to check whether they function as directories too
      * the FTPFile API seem to make directory and symbolic links incompatible
@@ -1035,7 +1060,8 @@
         String currentWorkingDir = null;
         if (file.isDirectory()) {
             return true;
-        } else if (file.isFile()) {
+        }
+        if (file.isFile()) {
             return false;
         }
         try {
@@ -1061,14 +1087,16 @@
                                           Project.MSG_ERR);
                 } finally {
                     if (!comeback) {
-                        throw new BuildException("could not cd back to " + dir //NOSONAR
-                                                 + " while checking a symlink");
+                        throw new BuildException(
+                            "could not cd back to %s while checking a symlink",
+                            dir);
                     }
                 }
             }
         }
         return result;
     }
+
     /**
      * check FTPFiles to check whether they function as directories too
      * the FTPFile API seem to make directory and symbolic links incompatible
@@ -1081,7 +1109,8 @@
     private boolean isFunctioningAsFile(FTPClient ftp, String dir, FTPFile file) {
         if (file.isDirectory()) {
             return false;
-        } else if (file.isFile()) {
+        }
+        if (file.isFile()) {
             return true;
         }
         return !isFunctioningAsDirectory(ftp, dir, file);
@@ -1100,7 +1129,6 @@
         h.execute(r, descr);
     }
 
-
     /**
      * For each file in the fileset, do the appropriate action: send, get,
      * delete, or list.
@@ -1131,16 +1159,17 @@
         } else {
             dsfiles = ds.getIncludedFiles();
         }
-        String dir = null;
 
         if ((ds.getBasedir() == null)
-            && ((task.getAction() == FTPTask.SEND_FILES) || (task.getAction() == FTPTask.GET_FILES))) {
-            throw new BuildException("the dir attribute must be set for send "
-                                     + "and get actions");
-        } else {
-            if ((task.getAction() == FTPTask.SEND_FILES) || (task.getAction() == FTPTask.GET_FILES)) {
-                dir = ds.getBasedir().getAbsolutePath();
-            }
+            && ((task.getAction() == FTPTask.SEND_FILES)
+                || (task.getAction() == FTPTask.GET_FILES))) {
+            throw new BuildException(
+                "the dir attribute must be set for send and get actions");
+        }
+        String dir = null;
+        if ((task.getAction() == FTPTask.SEND_FILES)
+            || (task.getAction() == FTPTask.GET_FILES)) {
+            dir = ds.getBasedir().getAbsolutePath();
         }
 
         // If we are doing a listing, we need the output stream created now.
@@ -1161,11 +1190,7 @@
                 // the trunk does not let itself be removed before the leaves
                 for (int i = dsfiles.length - 1; i >= 0; i--) {
                     final String dsfile = dsfiles[i];
-                    executeRetryable(h, new Retryable() {
-                            public void execute() throws IOException {
-                                rmDir(ftp, dsfile);
-                            }
-                        }, dsfile);
+                    executeRetryable(h, () -> rmDir(ftp, dsfile), dsfile);
                 }
             } else {
                 final BufferedWriter fbw = bw;
@@ -1176,30 +1201,28 @@
                 }
                 for (int i = 0; i < dsfiles.length; i++) {
                     final String dsfile = dsfiles[i];
-                    executeRetryable(h, new Retryable() {
-                        public void execute() throws IOException {
-                            switch (task.getAction()) {
-                                case FTPTask.SEND_FILES:
-                                    sendFile(ftp, fdir, dsfile);
-                                    break;
-                                case FTPTask.GET_FILES:
-                                    getFile(ftp, fdir, dsfile);
-                                    break;
-                                case FTPTask.DEL_FILES:
-                                    delFile(ftp, dsfile);
-                                    break;
-                                case FTPTask.LIST_FILES:
-                                    listFile(ftp, fbw, dsfile);
-                                    break;
-                                case FTPTask.CHMOD:
-                                    doSiteCommand(ftp, "chmod " + task.getChmod() + " "
-                                                  + resolveFile(dsfile));
-                                    transferred++;
-                                    break;
-                                default:
-                                    throw new BuildException("unknown ftp action "
-                                                             + task.getAction());
-                            }
+                    executeRetryable(h, () -> {
+                        switch (task.getAction()) {
+                            case FTPTask.SEND_FILES:
+                                sendFile(ftp, fdir, dsfile);
+                                break;
+                            case FTPTask.GET_FILES:
+                                getFile(ftp, fdir, dsfile);
+                                break;
+                            case FTPTask.DEL_FILES:
+                                delFile(ftp, dsfile);
+                                break;
+                            case FTPTask.LIST_FILES:
+                                listFile(ftp, fbw, dsfile);
+                                break;
+                            case FTPTask.CHMOD:
+                                doSiteCommand(ftp, "chmod " + task.getChmod() + " "
+                                        + resolveFile(dsfile));
+                                transferred++;
+                                break;
+                            default:
+                                throw new BuildException("unknown ftp action %s",
+                                        task.getAction());
                         }
                     }, dsfile);
                 }
@@ -1228,29 +1251,26 @@
         transferred = 0;
         skipped = 0;
 
-        if (task.getFilesets().size() == 0) {
+        if (task.getFilesets().isEmpty()) {
             throw new BuildException("at least one fileset must be specified.");
-        } else {
-            // get files from filesets
-            final int size = task.getFilesets().size();
-            for (int i = 0; i < size; i++) {
-                FileSet fs = (FileSet) task.getFilesets().elementAt(i);
-
-                if (fs != null) {
-                    transferFiles(ftp, fs);
-                }
+        }
+        // get files from filesets
+        for (FileSet fs : task.getFilesets()) {
+            if (fs != null) {
+                transferFiles(ftp, fs);
             }
         }
-
-        task.log(transferred + " " + FTPTask.ACTION_TARGET_STRS[task.getAction()] + " "
-                 + FTPTask.COMPLETED_ACTION_STRS[task.getAction()]);
+        task.log(
+            transferred + " " + FTPTask.ACTION_TARGET_STRS[task.getAction()]
+                + " " + FTPTask.COMPLETED_ACTION_STRS[task.getAction()]);
         if (skipped != 0) {
-            task.log(skipped + " " + FTPTask.ACTION_TARGET_STRS[task.getAction()]
-                     + " were not successfully " + FTPTask.COMPLETED_ACTION_STRS[task.getAction()]);
+            task.log(
+                skipped + " " + FTPTask.ACTION_TARGET_STRS[task.getAction()]
+                    + " were not successfully "
+                    + FTPTask.COMPLETED_ACTION_STRS[task.getAction()]);
         }
     }
 
-
     /**
      * Correct a file path to correspond to the remote host requirements. This
      * implementation currently assumes that the remote end can handle
@@ -1267,7 +1287,6 @@
                             task.getSeparator().charAt(0));
     }
 
-
     /**
      * Creates all parent directories specified in a complete relative
      * pathname. Attempts to create existing directories will not cause
@@ -1288,7 +1307,7 @@
             return;
         }
 
-        Vector parents = new Vector();
+        Vector<File> parents = new Vector<>();
         String dirname;
 
         while ((dirname = dir.getParent()) != null) {
@@ -1308,13 +1327,14 @@
             String parent = dir.getParent();
             if (parent != null) {
                 if (!ftp.changeWorkingDirectory(resolveFile(parent))) {
-                    throw new BuildException("could not change to "
-                                             + "directory: " + ftp.getReplyString());
+                    throw new BuildException(
+                        "could not change to directory: %s",
+                        ftp.getReplyString());
                 }
             }
 
             while (i >= 0) {
-                dir = (File) parents.elementAt(i--);
+                dir = parents.elementAt(i--);
                 // check if dir exists by trying to change into it.
                 if (!ftp.changeWorkingDirectory(dir.getName())) {
                     // could not change to it - try to create it
@@ -1324,8 +1344,9 @@
                         handleMkDirFailure(ftp);
                     }
                     if (!ftp.changeWorkingDirectory(dir.getName())) {
-                        throw new BuildException("could not change to "
-                                                 + "directory: " + ftp.getReplyString());
+                        throw new BuildException(
+                            "could not change to directory: %s",
+                            ftp.getReplyString());
                     }
                 }
                 dirCache.add(dir);
@@ -1333,6 +1354,7 @@
             ftp.changeWorkingDirectory(cwd);
         }
     }
+
     /**
      * auto find the time difference between local and remote
      * @param ftp handle to ftp client
@@ -1346,11 +1368,10 @@
             // create a local temporary file
             FILE_UTILS.createNewFile(tempFile);
             long localTimeStamp = tempFile.lastModified();
-            BufferedInputStream instream = new BufferedInputStream(new FileInputStream(tempFile));
+            BufferedInputStream instream = new BufferedInputStream(Files.newInputStream(tempFile.toPath()));
             ftp.storeFile(tempFile.getName(), instream);
             instream.close();
-            boolean success = FTPReply.isPositiveCompletion(ftp.getReplyCode());
-            if (success) {
+            if (FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
                 FTPFile [] ftpFiles = ftp.listFiles(tempFile.getName());
                 if (ftpFiles.length == 1) {
                     long remoteTimeStamp = ftpFiles[0].getTimestamp().getTime().getTime();
@@ -1369,11 +1390,12 @@
         }
         return returnValue;
     }
+
     /**
      *  find a suitable name for local and remote temporary file
      */
     private File findFileName(FTPClient ftp) {
-        FTPFile [] theFiles = null;
+        FTPFile[] theFiles = null;
         final int maxIterations = 1000;
         for (int counter = 1; counter < maxIterations; counter++) {
             File localFile = FILE_UTILS.createTempFile(
@@ -1431,10 +1453,9 @@
                 task.log("Could not date test remote file: " + remoteFile
                          + "assuming out of date.", Project.MSG_VERBOSE);
                 return false;
-            } else {
-                throw new BuildException("could not date test remote file: "
-                                         + ftp.getReplyString());
             }
+            throw new BuildException("could not date test remote file: %s",
+                ftp.getReplyString());
         }
 
         long remoteTimestamp = files[0].getTimestamp().getTime().getTime();
@@ -1442,16 +1463,16 @@
         long adjustedRemoteTimestamp = remoteTimestamp + task.getTimeDiffMillis()
             + task.getGranularityMillis();
 
-        StringBuffer msg;
+        StringBuilder msg;
         synchronized (TIMESTAMP_LOGGING_SDF) {
-            msg = new StringBuffer("   [")
+            msg = new StringBuilder("   [")
                 .append(TIMESTAMP_LOGGING_SDF.format(new Date(localTimestamp)))
                 .append("] local");
         }
         task.log(msg.toString(), Project.MSG_VERBOSE);
 
         synchronized (TIMESTAMP_LOGGING_SDF) {
-            msg = new StringBuffer("   [")
+            msg = new StringBuilder("   [")
                 .append(TIMESTAMP_LOGGING_SDF.format(new Date(adjustedRemoteTimestamp)))
                 .append("] remote");
         }
@@ -1466,9 +1487,8 @@
 
         if (task.getAction() == FTPTask.SEND_FILES) {
             return adjustedRemoteTimestamp >= localTimestamp;
-        } else {
-            return localTimestamp >= adjustedRemoteTimestamp;
         }
+        return localTimestamp >= adjustedRemoteTimestamp;
     }
 
 
@@ -1481,28 +1501,21 @@
      */
     protected void doSiteCommand(FTPClient ftp, String theCMD)
         throws IOException, BuildException {
-        boolean rc;
-        String[] myReply = null;
 
         task.log("Doing Site Command: " + theCMD, Project.MSG_VERBOSE);
 
-        rc = ftp.sendSiteCommand(theCMD);
-
-        if (!rc) {
-            task.log("Failed to issue Site Command: " + theCMD, Project.MSG_WARN);
+        if (!ftp.sendSiteCommand(theCMD)) {
+            task.log("Failed to issue Site Command: " + theCMD,
+                Project.MSG_WARN);
         } else {
-
-            myReply = ftp.getReplyStrings();
-
-            for (int x = 0; x < myReply.length; x++) {
-                if (myReply[x].indexOf("200") == -1) {
-                    task.log(myReply[x], Project.MSG_WARN);
+            for (String reply : ftp.getReplyStrings()) {
+                if (reply.indexOf("200") == -1) {
+                    task.log(reply, Project.MSG_WARN);
                 }
             }
         }
     }
 
-
     /**
      * Sends a single file to the remote host. <code>filename</code> may
      * contain a relative path specification. When this is the case, <code>sendFile</code>
@@ -1535,15 +1548,13 @@
                 task.log("transferring " + file.getAbsolutePath());
             }
 
-            instream = new BufferedInputStream(new FileInputStream(file));
+            instream = new BufferedInputStream(Files.newInputStream(file.toPath()));
 
             createParents(ftp, filename);
 
             ftp.storeFile(resolveFile(filename), instream);
 
-            boolean success = FTPReply.isPositiveCompletion(ftp.getReplyCode());
-
-            if (!success) {
+            if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
                 String s = "could not put file: " + ftp.getReplyString();
 
                 if (task.isSkipFailedTransfers()) {
@@ -1568,7 +1579,6 @@
         }
     }
 
-
     /**
      * Delete a file from the remote host.
      * @param ftp ftp client
@@ -1629,7 +1639,6 @@
         }
     }
 
-
     /**
      * Retrieve a single file from the remote host. <code>filename</code> may
      * contain a relative path specification. <p>
@@ -1666,7 +1675,7 @@
             if (!pdir.exists()) {
                 pdir.mkdirs();
             }
-            outstream = new BufferedOutputStream(new FileOutputStream(file));
+            outstream = new BufferedOutputStream(Files.newOutputStream(file.toPath()));
             ftp.retrieveFile(resolveFile(filename), outstream);
 
             if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
@@ -1700,7 +1709,6 @@
         }
     }
 
-
     /**
      * List information about a single file from the remote host. <code>filename</code>
      * may contain a relative path specification. <p>
@@ -1729,7 +1737,6 @@
         }
     }
 
-
     /**
      * Create the specified directory on the remote host.
      *
@@ -1755,10 +1762,9 @@
         if (dir.startsWith("/")) {
             ftp.changeWorkingDirectory("/");
         }
-        String subdir = "";
         StringTokenizer st = new StringTokenizer(dir, "/");
         while (st.hasMoreTokens()) {
-            subdir = st.nextToken();
+            String subdir = st.nextToken();
             task.log("Checking " + subdir, Project.MSG_DEBUG);
             if (!ftp.changeWorkingDirectory(subdir)) {
                 if (!ftp.makeDirectory(subdir)) {
@@ -1805,6 +1811,7 @@
         }
     }
 
+    @Override
     public void doFTP() throws BuildException {
         FTPClient ftp = null;
 
@@ -1819,8 +1826,8 @@
             ftp.setRemoteVerificationEnabled(task.getEnableRemoteVerification());
             ftp.connect(task.getServer(), task.getPort());
             if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
-                throw new BuildException("FTP connection failed: "
-                                         + ftp.getReplyString());
+                throw new BuildException("FTP connection failed: %s",
+                    ftp.getReplyString());
             }
 
             task.log("connected", Project.MSG_VERBOSE);
@@ -1836,14 +1843,14 @@
             if (task.isBinary()) {
                 ftp.setFileType(org.apache.commons.net.ftp.FTP.BINARY_FILE_TYPE);
                 if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
-                    throw new BuildException("could not set transfer type: "
-                                             + ftp.getReplyString());
+                    throw new BuildException("could not set transfer type: %s",
+                        ftp.getReplyString());
                 }
             } else {
                 ftp.setFileType(org.apache.commons.net.ftp.FTP.ASCII_FILE_TYPE);
                 if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
-                    throw new BuildException("could not set transfer type: "
-                                             + ftp.getReplyString());
+                    throw new BuildException("could not set transfer type: %s",
+                        ftp.getReplyString());
                 }
             }
 
@@ -1851,8 +1858,9 @@
                 task.log("entering passive mode", Project.MSG_VERBOSE);
                 ftp.enterLocalPassiveMode();
                 if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
-                    throw new BuildException("could not enter into passive "
-                                             + "mode: " + ftp.getReplyString());
+                    throw new BuildException(
+                        "could not enter into passive mode: %s",
+                        ftp.getReplyString());
                 }
             }
 
@@ -1861,55 +1869,46 @@
             // E.G. switching between a UNIX file system mode and
             // a legacy file system.
             if (task.getInitialSiteCommand() != null) {
-                RetryHandler h = new RetryHandler(task.getRetriesAllowed(), task);
                 final FTPClient lftp = ftp;
-                executeRetryable(h, new Retryable() {
-                        public void execute() throws IOException {
-                            doSiteCommand(lftp, task.getInitialSiteCommand());
-                        }
-                    }, "initial site command: " + task.getInitialSiteCommand());
+                executeRetryable(new RetryHandler(task.getRetriesAllowed(), task),
+                    () -> doSiteCommand(lftp, task.getInitialSiteCommand()),
+                    "initial site command: " + task.getInitialSiteCommand());
             }
 
-
             // For a unix ftp server you can set the default mask for all files
             // created.
 
             if (task.getUmask() != null) {
-                RetryHandler h = new RetryHandler(task.getRetriesAllowed(), task);
                 final FTPClient lftp = ftp;
-                executeRetryable(h, new Retryable() {
-                        public void execute() throws IOException {
-                            doSiteCommand(lftp, "umask " + task.getUmask());
-                        }
-                    }, "umask " + task.getUmask());
+                executeRetryable(
+                    new RetryHandler(task.getRetriesAllowed(), task),
+                    () -> doSiteCommand(lftp, "umask " + task.getUmask()),
+                    "umask " + task.getUmask());
             }
 
             // If the action is MK_DIR, then the specified remote
             // directory is the directory to create.
 
             if (task.getAction() == FTPTask.MK_DIR) {
-                RetryHandler h = new RetryHandler(task.getRetriesAllowed(), task);
                 final FTPClient lftp = ftp;
-                executeRetryable(h, new Retryable() {
-                        public void execute() throws IOException {
-                            makeRemoteDir(lftp, task.getRemotedir());
-                        }
-                    }, task.getRemotedir());
+                executeRetryable(
+                    new RetryHandler(task.getRetriesAllowed(), task),
+                    () -> makeRemoteDir(lftp, task.getRemotedir()),
+                    task.getRemotedir());
             } else if (task.getAction() == FTPTask.SITE_CMD) {
-                RetryHandler h = new RetryHandler(task.getRetriesAllowed(), task);
                 final FTPClient lftp = ftp;
-                executeRetryable(h, new Retryable() {
-                        public void execute() throws IOException {
-                            doSiteCommand(lftp, task.getSiteCommand());
-                        }
-                    }, "Site Command: " + task.getSiteCommand());
+                executeRetryable(
+                    new RetryHandler(task.getRetriesAllowed(), task),
+                    () -> doSiteCommand(lftp, task.getSiteCommand()),
+                    "Site Command: " + task.getSiteCommand());
             } else {
                 if (task.getRemotedir() != null) {
                     task.log("changing the remote directory", Project.MSG_VERBOSE);
                     ftp.changeWorkingDirectory(task.getRemotedir());
                     if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
-                        throw new BuildException("could not change remote "
-                                                 + "directory: " + ftp.getReplyString());
+                        throw new BuildException(
+                            "could not change remote directory: %s",
+                            ftp.getReplyString());
                     }
                 }
                 if (task.isNewer() && task.isTimeDiffAuto()) {
@@ -1920,7 +1919,6 @@
                 task.log(FTPTask.ACTION_STRS[task.getAction()] + " " + FTPTask.ACTION_TARGET_STRS[task.getAction()]);
                 transferFiles(ftp);
             }
-
         } catch (IOException ex) {
             throw new BuildException("error during FTP transfer: " + ex, ex);
         } finally {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java	2018-03-24 12:37:12.000000000 +0000
@@ -28,12 +28,14 @@
  *
  * @since Ant1.4
  */
+@Deprecated
 public class MimeMail extends EmailTask {
     /**
      * Executes this build task.
      *
      * @exception BuildException On error.
      */
+    @Override
     public void execute()
         throws BuildException {
         log("DEPRECATED - The " + getTaskName() + " task is deprecated. "
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -22,7 +22,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Calendar;
-import java.util.Enumeration;
+import java.util.List;
 import java.util.Vector;
 
 import org.apache.commons.net.bsd.RExecClient;
@@ -68,7 +68,7 @@
     /**
      *  The list of read/write commands for this session
      */
-    private Vector rexecTasks = new Vector();
+    private List<RExecSubTask> rexecTasks = new Vector<>();
 
     /**
      *  If true, adds a CR to beginning of login script
@@ -97,7 +97,7 @@
          */
         public void execute(AntRExecClient rexec)
                 throws BuildException {
-            throw new BuildException("Shouldn't be able instantiate a SubTask directly");
+            throw new BuildException("Shouldn't be able to instantiate a SubTask directly");
         }
 
         /**
@@ -127,6 +127,7 @@
          * @param rexec the task to use
          * @throws BuildException on error
          */
+        @Override
         public void execute(AntRExecClient rexec)
                throws BuildException {
            rexec.sendString(taskString, echoString);
@@ -153,6 +154,7 @@
          * @param rexec the task to use
          * @throws BuildException on error
          */
+        @Override
         public void execute(AntRExecClient rexec)
                throws BuildException {
             rexec.waitForString(taskString, timeout);
@@ -202,7 +204,7 @@
         public void waitForString(String s, Integer timeout) {
             InputStream is = this.getInputStream();
             try {
-                StringBuffer sb = new StringBuffer();
+                StringBuilder sb = new StringBuilder();
                 int windowStart = -s.length();
                 if (timeout == null || timeout.intValue() == 0) {
                     while (windowStart < 0
@@ -253,6 +255,7 @@
                 throw new BuildException(e, getLocation());
             }
         }
+
         /**
          * Read from the rexec session until the EOF is found or
          * the timeout has been reached
@@ -261,15 +264,15 @@
         public void waitForEOF(Integer timeout) {
             InputStream is = this.getInputStream();
             try {
-                StringBuffer sb = new StringBuffer();
+                StringBuilder sb = new StringBuilder();
                 if (timeout == null || timeout.intValue() == 0) {
                 int read;
                     while ((read = is.read()) != -1) {
                         char c = (char) read;
                         sb.append(c);
                         if (c == '\n') {
-                        log(sb.toString(), Project.MSG_INFO);
-                        sb.delete(0, sb.length());
+                            log(sb.toString(), Project.MSG_INFO);
+                            sb.delete(0, sb.length());
                         }
                     }
                 } else {
@@ -281,24 +284,24 @@
                             Thread.sleep(PAUSE_TIME);
                         }
                         if (is.available() == 0) {
-                        log(sb.toString(), Project.MSG_INFO);
-                            throw new BuildException(
-                                                     "Response timed-out waiting for EOF",
-                                                     getLocation());
+                            log(sb.toString(), Project.MSG_INFO);
+                                throw new BuildException(
+                                                         "Response timed-out waiting for EOF",
+                                                         getLocation());
                         }
                         read =  is.read();
                         if (read != -1) {
-                        char c = (char) read;
-                        sb.append(c);
-                        if (c == '\n') {
+                            char c = (char) read;
+                            sb.append(c);
+                            if (c == '\n') {
                                 log(sb.toString(), Project.MSG_INFO);
                                 sb.delete(0, sb.length());
-                        }
+                            }
                         }
                     }
                 }
                 if (sb.length() > 0) {
-                log(sb.toString(), Project.MSG_INFO);
+                    log(sb.toString(), Project.MSG_INFO);
                 }
             } catch (BuildException be) {
                 throw be;
@@ -306,8 +309,8 @@
                 throw new BuildException(e, getLocation());
             }
         }
-
     }
+
     /**
      *  A string to wait for from the server.
      *  A subTask &lt;read&gt; tag was found.  Create the object,
@@ -316,10 +319,11 @@
      */
 
     public RExecSubTask createRead() {
-        RExecSubTask task = (RExecSubTask) new RExecRead();
-        rexecTasks.addElement(task);
+        RExecSubTask task = new RExecRead();
+        rexecTasks.add(task);
         return task;
     }
+
     /**
      *  Add text to send to the server
      *  A subTask &lt;write&gt; tag was found.  Create the object,
@@ -327,16 +331,18 @@
      * @return a write sub task
      */
     public RExecSubTask createWrite() {
-        RExecSubTask task = (RExecSubTask) new RExecWrite();
-        rexecTasks.addElement(task);
+        RExecSubTask task = new RExecWrite();
+        rexecTasks.add(task);
         return task;
     }
+
     /**
      *  Verify that all parameters are included.
      *  Connect and possibly login.
      *  Iterate through the list of Reads and writes.
      * @throws BuildException on error
      */
+    @Override
     public void execute() throws BuildException {
         /**  A server name is required to continue */
         if (server == null) {
@@ -363,7 +369,7 @@
                 throw new BuildException("Can't connect to " + server);
             }
             if (userid != null && password != null && command != null //NOSONAR
-                && rexecTasks.size() == 0) {
+                && rexecTasks.isEmpty()) {
                 // simple one-shot execution
                 rexec.rexec(userid, password, command);
             } else {
@@ -384,13 +390,14 @@
                     String msg = "Error disconnecting from " + server;
                     if (success) {
                         throw new BuildException(msg); //NOSONAR
-                    } else { // don't hide inner exception
-                        log(msg, Project.MSG_ERR);
                     }
+                    // don't hide inner exception
+                    log(msg, Project.MSG_ERR);
                 }
             }
         }
     }
+
     /**
      *  Process a 'typical' login.  If it differs, use the read
      *  and write tasks explicitly
@@ -404,6 +411,7 @@
         rexec.waitForString("assword:");
         rexec.sendString(password, false);
     }
+
     /**
      * Set the the command to execute on the server;
      * @param c a <code>String</code> value
@@ -419,6 +427,7 @@
     public void setInitialCR(boolean b) {
         this.addCarriageReturn = b;
     }
+
     /**
      *  Set the the login password to use
      * required if <tt>userid</tt> is set.
@@ -452,6 +461,7 @@
     public void setTimeout(Integer i) {
         this.defaultTimeout = i;
     }
+
     /**
      * Set the the login id to use on the server;
      * required if <tt>password</tt> is set.
@@ -473,9 +483,7 @@
             login(rexec);
         }
         /**  Process each sub command */
-        Enumeration tasksToRun = rexecTasks.elements();
-        while (tasksToRun != null && tasksToRun.hasMoreElements()) {
-            RExecSubTask task = (RExecSubTask) tasksToRun.nextElement();
+        for (RExecSubTask task : rexecTasks) {
             if (task instanceof RExecRead && defaultTimeout != null) {
                 ((RExecRead) task).setDefaultTimeout(defaultTimeout);
             }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java	2018-03-24 12:37:12.000000000 +0000
@@ -175,7 +175,6 @@
      * apply to all network connections
      * Relevant docs: buglist #4183340
      */
-
     public void applyWebProxySettings() {
         boolean settingsChanged = false;
         boolean enablingProxy = false;
@@ -261,6 +260,7 @@
      *
      * @exception BuildException thrown in unrecoverable error.
      */
+    @Override
     public void execute() throws BuildException {
         applyWebProxySettings();
     }
@@ -275,6 +275,7 @@
             auth = new PasswordAuthentication(user, pass.toCharArray());
         }
 
+        @Override
         protected PasswordAuthentication getPasswordAuthentication() {
             return auth;
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -22,7 +22,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Calendar;
-import java.util.Enumeration;
+import java.util.List;
 import java.util.Vector;
 
 import org.apache.commons.net.telnet.TelnetClient;
@@ -34,7 +34,6 @@
  * Automates the telnet protocol.
  *
  */
-
 public class TelnetTask extends Task {
     private static final int WAIT_INTERVAL = 250;
     private static final int TELNET_PORT = 23;
@@ -62,7 +61,7 @@
     /**
      *  The list of read/write commands for this session
      */
-    private Vector telnetTasks = new Vector();
+    private List<TelnetSubTask> telnetTasks = new Vector<>();
 
     /**
      *  If true, adds a CR to beginning of login script
@@ -81,6 +80,7 @@
      *  Iterate through the list of Reads and writes
      * @throws BuildException on error
      */
+    @Override
     public void execute() throws BuildException {
        /**  A server name is required to continue */
        if (server == null) {
@@ -111,9 +111,7 @@
                login(telnet);
            }
            /**  Process each sub command */
-           Enumeration tasksToRun = telnetTasks.elements();
-           while (tasksToRun != null && tasksToRun.hasMoreElements()) {
-               TelnetSubTask task = (TelnetSubTask) tasksToRun.nextElement();
+           for (TelnetSubTask task : telnetTasks) {
                if (task instanceof TelnetRead && defaultTimeout != null) {
                    ((TelnetRead) task).setDefaultTimeout(defaultTimeout);
                }
@@ -209,8 +207,8 @@
      */
 
     public TelnetSubTask createRead() {
-        TelnetSubTask task = (TelnetSubTask) new TelnetRead();
-        telnetTasks.addElement(task);
+        TelnetSubTask task = new TelnetRead();
+        telnetTasks.add(task);
         return task;
     }
 
@@ -221,8 +219,8 @@
      * @return a write telnet sub task
      */
     public TelnetSubTask createWrite() {
-        TelnetSubTask task = (TelnetSubTask) new TelnetWrite();
-        telnetTasks.addElement(task);
+        TelnetSubTask task = new TelnetWrite();
+        telnetTasks.add(task);
         return task;
     }
 
@@ -271,6 +269,7 @@
          * @param telnet the task to use
          * @throws BuildException on error
          */
+        @Override
         public void execute(AntTelnetClient telnet)
                throws BuildException {
            telnet.sendString(taskString, echoString);
@@ -297,6 +296,7 @@
          * @param telnet the task to use
          * @throws BuildException on error
          */
+        @Override
         public void execute(AntTelnetClient telnet)
                throws BuildException {
             telnet.waitForString(taskString, timeout);
@@ -346,7 +346,7 @@
         public void waitForString(String s, Integer timeout) {
             InputStream is = this.getInputStream();
             try {
-                StringBuffer sb = new StringBuffer();
+                StringBuilder sb = new StringBuilder();
                 int windowStart = -s.length();
                 if (timeout == null || timeout.intValue() == 0) {
                     while (windowStart < 0
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java	2018-03-24 12:37:12.000000000 +0000
@@ -23,11 +23,14 @@
 import java.io.PrintWriter;
 import java.io.StringReader;
 import java.io.StringWriter;
-import java.util.Enumeration;
+import java.util.ArrayList;
 import java.util.Hashtable;
+import java.util.List;
 import java.util.Properties;
 import java.util.StringTokenizer;
 import java.util.Vector;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import netrexx.lang.Rexx;
 
@@ -142,8 +145,8 @@
     static final String MSG_DEPRECATION = "has been deprecated";
 
     // other implementation variables
-    private Vector compileList = new Vector();
-    private Hashtable filecopyList = new Hashtable();
+    private Vector<String> compileList = new Vector<>();
+    private Hashtable<String, String> filecopyList = new Hashtable<>();
 
     /**
      * Set whether literals are treated as binary, rather than NetRexx types.
@@ -155,7 +158,6 @@
         this.binary = binary;
     }
 
-
     /**
      * Set the classpath used for NetRexx compilation.
      * @param classpath the classpath to use.
@@ -164,7 +166,6 @@
         this.classpath = classpath;
     }
 
-
     /**
      * Set whether comments are passed through to the generated java source.
      * Valid true values are "yes", "on" or "true". Anything else sets the flag to false.
@@ -175,7 +176,6 @@
         this.comments = comments;
     }
 
-
     /**
      * Set whether error messages come out in compact or verbose format.
      * Valid true values are "yes", "on" or "true". Anything else sets the flag to false.
@@ -186,7 +186,6 @@
         this.compact = compact;
     }
 
-
     /**
      * Set whether the NetRexx compiler should compile the generated java code.
      * Valid true values are "yes", "on" or "true". Anything else sets the flag to false.
@@ -201,7 +200,6 @@
         }
     }
 
-
     /**
      * Set whether or not compiler messages should be displayed on the 'console'.
      * Note that this task will rely on the default value for filtering compile messages.
@@ -213,7 +211,6 @@
         this.console = console;
     }
 
-
     /**
      * Whether variable cross references are generated.
      * Valid true values are "yes", "on" or "true". Anything else sets the flag to false.
@@ -224,7 +221,6 @@
         this.crossref = crossref;
     }
 
-
     /**
      * Set whether decimal arithmetic should be used for the netrexx code.
      * Setting this to off will report decimal arithmetic as an error, for
@@ -237,7 +233,6 @@
         this.decimal = decimal;
     }
 
-
     /**
      * Set the destination directory into which the NetRexx source files
      * should be copied and then compiled.
@@ -247,7 +242,6 @@
         destDir = destDirName;
     }
 
-
     /**
      * Whether diagnostic information about the compile is generated
      * @param diag a <code>boolean</code> value.
@@ -256,7 +250,6 @@
         this.diag = diag;
     }
 
-
     /**
      * Sets whether variables must be declared explicitly before use.
      * Valid true values are "yes", "on" or "true". Anything else sets the flag to false.
@@ -267,7 +260,6 @@
         this.explicit = explicit;
     }
 
-
     /**
      * Whether the generated java code is formatted nicely or left to match
      * NetRexx line numbers for call stack debugging.
@@ -279,7 +271,6 @@
         this.format = format;
     }
 
-
     /**
      * Whether the generated java code is produced.
      * This is not implemented yet.
@@ -289,7 +280,6 @@
         log("The attribute java is currently unused.", Project.MSG_WARN);
     }
 
-
     /**
      * Sets whether the generated java source file should be kept after
      * compilation. The generated files will have an extension of .java.keep,
@@ -303,7 +293,6 @@
         this.keep = keep;
     }
 
-
     /**
      * Whether the compiler text logo is displayed when compiling.
      * Valid true values are "yes", "on" or "true". Anything else sets the flag to false.
@@ -314,7 +303,6 @@
         this.logo = logo;
     }
 
-
     /**
      * Whether the generated .java file should be replaced when compiling.
      * Valid true values are "yes", "on" or "true". Anything else sets the flag to false.
@@ -325,7 +313,6 @@
         this.replace = replace;
     }
 
-
     /**
      * Sets whether the compiler messages will be written to NetRexxC.log as
      * well as to the console.
@@ -337,7 +324,6 @@
         this.savelog = savelog;
     }
 
-
     /**
      * Tells the NetRexx compiler to store the class files in the same
      * directory as the source files. The alternative is the working directory.
@@ -349,7 +335,6 @@
         this.sourcedir = sourcedir;
     }
 
-
     /**
      * Set the source dir to find the source Java files.
      * @param srcDirName the source directory.
@@ -358,7 +343,6 @@
         srcDir = srcDirName;
     }
 
-
     /**
      * Tells the NetRexx compiler that method calls always need parentheses,
      * even if no arguments are needed, e.g. <code>aStringVar.getBytes</code>
@@ -371,7 +355,6 @@
         this.strictargs = strictargs;
     }
 
-
     /**
      * Tells the NetRexx compile that assignments must match exactly on type.
      * Valid true values are "yes", "on" or "true". Anything else sets the flag to false.
@@ -382,7 +365,6 @@
         this.strictassign = strictassign;
     }
 
-
     /**
      * Specifies whether the NetRexx compiler should be case sensitive or not.
      * Valid true values are "yes", "on" or "true". Anything else sets the flag to false.
@@ -393,7 +375,6 @@
         this.strictcase = strictcase;
     }
 
-
     /**
      * Sets whether classes need to be imported explicitly using an <code>import</code>
      * statement. By default the NetRexx compiler will import certain packages
@@ -406,7 +387,6 @@
         this.strictimport = strictimport;
     }
 
-
     /**
      * Sets whether local properties need to be qualified explicitly using
      * <code>this</code>.
@@ -418,7 +398,6 @@
         this.strictprops = strictprops;
     }
 
-
     /**
      * Whether the compiler should force catching of exceptions by explicitly
      * named types.
@@ -430,7 +409,6 @@
         this.strictsignal = strictsignal;
     }
 
-
     /**
      * Sets whether debug symbols should be generated into the class file.
      * Valid true values are "yes", "on" or "true". Anything else sets the flag to false.
@@ -441,7 +419,6 @@
         this.symbols = symbols;
     }
 
-
     /**
      * Asks the NetRexx compiler to print compilation times to the console
      * Valid true values are "yes", "on" or "true". Anything else sets the flag to false.
@@ -470,12 +447,10 @@
      */
     public void setTrace(String trace) {
         TraceAttr t = new TraceAttr();
-
         t.setValue(trace);
         setTrace(t);
     }
 
-
     /**
      * Tells the NetRexx compiler that the source is in UTF8.
      * Valid true values are "yes", "on" or "true". Anything else sets the flag to false.
@@ -486,7 +461,6 @@
         this.utf8 = utf8;
     }
 
-
     /**
      * Whether lots of warnings and error messages should be generated
      * @param verbose the value to set - verbose&lt;level&gt; or noverbose.
@@ -495,14 +469,12 @@
         this.verbose = verbose.getValue();
     }
 
-
     /**
      * Whether lots of warnings and error messages should be generated
      * @param verbose the value to set - verbose&lt;level&gt; or noverbose.
      */
     public void setVerbose(String verbose) {
         VerboseAttr v = new VerboseAttr();
-
         v.setValue(verbose);
         setVerbose(v);
     }
@@ -517,7 +489,6 @@
         this.suppressMethodArgumentNotUsed = suppressMethodArgumentNotUsed;
     }
 
-
     /**
      * Whether the task should suppress the "Private property is defined but
      * not used" in strictargs-Mode, which can be quite annoying while
@@ -528,7 +499,6 @@
         this.suppressPrivatePropertyNotUsed = suppressPrivatePropertyNotUsed;
     }
 
-
     /**
      * Whether the task should suppress the "Variable is set but not used" in
      * strictargs-Mode. Be careful with this one! The warning is logged as
@@ -539,7 +509,6 @@
         this.suppressVariableNotUsed = suppressVariableNotUsed;
     }
 
-
     /**
      * Whether the task should suppress the "FooException is in SIGNALS list
      * but is not signalled within the method", which is sometimes rather
@@ -550,7 +519,6 @@
         this.suppressExceptionNotSignalled = suppressExceptionNotSignalled;
     }
 
-
     /**
      * Tells whether we should filter out any deprecation-messages
      * of the compiler out.
@@ -560,7 +528,6 @@
         this.suppressDeprecation = suppressDeprecation;
     }
 
-
     /**
      * Tells whether the trailing .keep in nocompile-mode should be removed
      * so that the resulting java source really ends on .java.
@@ -571,12 +538,12 @@
         this.removeKeepExtension = removeKeepExtension;
     }
 
-
     /**
      * init-Method sets defaults from Properties. That way, when ant is called
      * with arguments like -Dant.netrexxc.verbose=verbose5 one can easily take
      * control of all netrexxc-tasks.
      */
+    @Override
     public void init() {
         String p;
 
@@ -681,11 +648,11 @@
         }
     }
 
-
     /**
      * Executes the task - performs the actual compiler call.
      * @throws BuildException on error.
      */
+    @Override
     public void execute() throws BuildException {
 
         // first off, make sure that we've got a srcdir and destdir
@@ -695,7 +662,6 @@
 
         // scan source and dest dirs to build up both copy lists and
         // compile lists
-        //        scanDir(srcDir, destDir);
         DirectoryScanner ds = getDirectoryScanner(srcDir);
 
         String[] files = ds.getIncludedFiles();
@@ -706,7 +672,7 @@
         copyFilesToDestination();
 
         // compile the source files
-        if (compileList.size() > 0) {
+        if (!compileList.isEmpty()) {
             log("Compiling " + compileList.size() + " source file"
                  + (compileList.size() == 1 ? "" : "s")
                  + " to " + destDir);
@@ -717,16 +683,14 @@
         }
     }
 
-
     /**
      * Scans the directory looking for source files to be compiled and support
      * files to be copied.
      */
     private void scanDir(File srcDir, File destDir, String[] files) {
-        for (int i = 0; i < files.length; i++) {
-            File srcFile = new File(srcDir, files[i]);
-            File destFile = new File(destDir, files[i]);
-            String filename = files[i];
+        for (String filename : files) {
+            File srcFile = new File(srcDir, filename);
+            File destFile = new File(destDir, filename);
             // if it's a non source file, copy it if a later date than the
             // dest
             // if it's a source file, see if the destination class file
@@ -749,112 +713,79 @@
                     filecopyList.put(srcFile.getAbsolutePath(), destFile.getAbsolutePath());
                     compileList.addElement(destFile.getAbsolutePath());
                 }
-            } else {
-                if (srcFile.lastModified() > destFile.lastModified()) {
-                    filecopyList.put(srcFile.getAbsolutePath(), destFile.getAbsolutePath());
-                }
+            } else if (srcFile.lastModified() > destFile.lastModified()) {
+                filecopyList.put(srcFile.getAbsolutePath(), destFile.getAbsolutePath());
             }
         }
     }
 
-
     /** Copy eligible files from the srcDir to destDir  */
     private void copyFilesToDestination() {
-        if (filecopyList.size() > 0) {
+        if (!filecopyList.isEmpty()) {
             log("Copying " + filecopyList.size() + " file"
                  + (filecopyList.size() == 1 ? "" : "s")
                  + " to " + destDir.getAbsolutePath());
 
-            Enumeration e = filecopyList.keys();
-
-            while (e.hasMoreElements()) {
-                String fromFile = (String) e.nextElement();
-                String toFile = (String) filecopyList.get(fromFile);
-
+            filecopyList.forEach((fromFile, toFile) -> {
                 try {
                     FileUtils.getFileUtils().copyFile(fromFile, toFile);
                 } catch (IOException ioe) {
-                    String msg = "Failed to copy " + fromFile + " to " + toFile
-                         + " due to " + ioe.getMessage();
-
-                    throw new BuildException(msg, ioe);
+                    throw new BuildException("Failed to copy " + fromFile
+                        + " to " + toFile + " due to " + ioe.getMessage(), ioe);
                 }
-            }
+            });
         }
     }
 
-
     /**
      * Rename .java.keep files (back) to .java. The netrexxc renames all
      * .java files to .java.keep if either -keep or -nocompile option is set.
      */
     private void removeKeepExtensions() {
-        if (compileList.size() > 0) {
+        if (!compileList.isEmpty()) {
             log("Removing .keep extension on " + compileList.size() + " file"
                  + (compileList.size() == 1 ? "" : "s"));
-            Enumeration e = compileList.elements();
-            while (e.hasMoreElements()) {
-                String nrxName = (String) e.nextElement();
-                String baseName = nrxName.substring(0, nrxName.lastIndexOf('.'));
+            compileList.forEach(nrxName -> {
+                String baseName =
+                    nrxName.substring(0, nrxName.lastIndexOf('.'));
                 File fromFile = new File(baseName + ".java.keep");
                 File toFile = new File(baseName + ".java");
                 if (fromFile.renameTo(toFile)) {
-                    log("Successfully renamed " + fromFile + " to " + toFile, Project.MSG_VERBOSE);
+                    log("Successfully renamed " + fromFile + " to " + toFile,
+                        Project.MSG_VERBOSE);
                 } else {
                     log("Failed to rename " + fromFile + " to " + toFile);
                 }
-            }
+            });
         }
     }
 
-
     /** Performs a compile using the NetRexx 1.1.x compiler  */
     private void doNetRexxCompile() throws BuildException {
         log("Using NetRexx compiler", Project.MSG_VERBOSE);
 
         String classpath = getCompileClasspath();
-        StringBuffer compileOptions = new StringBuffer();
 
         // create an array of strings for input to the compiler: one array
         // comes from the compile options, the other from the compileList
         String[] compileOptionsArray = getCompileOptionsAsArray();
-        String[] fileListArray = new String[compileList.size()];
-        Enumeration e = compileList.elements();
-        int j = 0;
-
-        while (e.hasMoreElements()) {
-            fileListArray[j] = (String) e.nextElement();
-            j++;
-        }
-        // create a single array of arguments for the compiler
-        String[] compileArgs = new String[compileOptionsArray.length + fileListArray.length];
-
-        for (int i = 0; i < compileOptionsArray.length; i++) {
-            compileArgs[i] = compileOptionsArray[i];
-        }
-        for (int i = 0; i < fileListArray.length; i++) {
-            compileArgs[i + compileOptionsArray.length] = fileListArray[i];
-        }
 
         // print nice output about what we are doing for the log
-        compileOptions.append("Compilation args: ");
-        for (int i = 0; i < compileOptionsArray.length; i++) {
-            compileOptions.append(compileOptionsArray[i]);
-            compileOptions.append(" ");
-        }
-        log(compileOptions.toString(), Project.MSG_VERBOSE);
+        log(Stream.of(compileOptionsArray)
+            .collect(Collectors.joining(" ", "Compilation args: ", "")),
+            Project.MSG_VERBOSE);
+
+        log("Files to be compiled:", Project.MSG_VERBOSE);
+
+        final String eol = System.getProperty("line.separator");
+        log(
+            compileList.stream().map(s -> "    " + s).collect(Collectors.joining(eol))
+            , Project.MSG_VERBOSE);
 
-        String eol = System.getProperty("line.separator");
-        StringBuffer niceSourceList = new StringBuffer("Files to be compiled:" + eol);
-
-        final int size = compileList.size();
-        for (int i = 0; i < size; i++) {
-            niceSourceList.append("    ");
-            niceSourceList.append(compileList.elementAt(i).toString());
-            niceSourceList.append(eol);
-        }
-
-        log(niceSourceList.toString(), Project.MSG_VERBOSE);
+        // create a single array of arguments for the compiler
+        String[] compileArgs =
+                Stream.concat(Stream.of(compileOptionsArray), compileList.stream())
+                .toArray(String[]::new);
 
         // need to set java.class.path property and restore it later
         // since the NetRexx compiler has no option for the classpath
@@ -865,7 +796,7 @@
 
         try {
             StringWriter out = new StringWriter();
-            PrintWriter w = null;
+            PrintWriter w;
             int rc =
                 COM.ibm.netrexx.process.NetRexxC.main(new Rexx(compileArgs),
                                                       w = new PrintWriter(out)); //NOSONAR
@@ -873,17 +804,18 @@
             String ddir = destDir.getAbsolutePath();
             boolean doReplace = !(sdir.equals(ddir));
             int dlen = ddir.length();
-            String l;
             BufferedReader in = new BufferedReader(new StringReader(out.toString()));
 
             log("replacing destdir '" + ddir + "' through sourcedir '"
                 + sdir + "'", Project.MSG_VERBOSE);
+
+            String l;
             while ((l = in.readLine()) != null) {
                 int idx;
 
                 while (doReplace && ((idx = l.indexOf(ddir)) != -1)) {
                     // path is mentioned in the message
-                    l = (new StringBuffer(l)).replace(idx, idx + dlen, sdir).toString();
+                    l = new StringBuilder(l).replace(idx, idx + dlen, sdir).toString();
                 }
                 // verbose level logging for suppressed messages
                 if (suppressMethodArgumentNotUsed
@@ -912,28 +844,26 @@
                 }
             }
             if (rc > 1) {
-                throw new BuildException("Compile failed, messages should "
-                    + "have been provided.");
+                throw new BuildException(
+                    "Compile failed, messages should have been provided.");
             }
             if (w.checkError()) {
                 throw new IOException("Encountered an error");
             }
         } catch (IOException ioe) {
-            throw new BuildException("Unexpected IOException while "
-                + "playing with Strings", ioe);
+            throw new BuildException(
+                "Unexpected IOException while playing with Strings", ioe);
         } finally {
             // need to reset java.class.path property
             // since the NetRexx compiler has no option for the classpath
             currentProperties = System.getProperties();
             currentProperties.put("java.class.path", currentClassPath);
         }
-
     }
 
-
     /** Builds the compilation classpath.  */
     private String getCompileClasspath() {
-        StringBuffer classpath = new StringBuffer();
+        StringBuilder classpath = new StringBuilder();
 
         // add dest dir to classpath so that previously compiled and
         // untouched classes are on classpath
@@ -945,49 +875,43 @@
         }
 
         // add the system classpath
-        // addExistingToClasspath(classpath,System.getProperty("java.class.path"));
         return classpath.toString();
     }
 
-
     /** This  */
     private String[] getCompileOptionsAsArray() {
-        Vector options = new Vector();
+        List<String> options = new ArrayList<>();
 
-        options.addElement(binary ? "-binary" : "-nobinary");
-        options.addElement(comments ? "-comments" : "-nocomments");
-        options.addElement(compile ? "-compile" : "-nocompile");
-        options.addElement(compact ? "-compact" : "-nocompact");
-        options.addElement(console ? "-console" : "-noconsole");
-        options.addElement(crossref ? "-crossref" : "-nocrossref");
-        options.addElement(decimal ? "-decimal" : "-nodecimal");
-        options.addElement(diag ? "-diag" : "-nodiag");
-        options.addElement(explicit ? "-explicit" : "-noexplicit");
-        options.addElement(format ? "-format" : "-noformat");
-        options.addElement(keep ? "-keep" : "-nokeep");
-        options.addElement(logo ? "-logo" : "-nologo");
-        options.addElement(replace ? "-replace" : "-noreplace");
-        options.addElement(savelog ? "-savelog" : "-nosavelog");
-        options.addElement(sourcedir ? "-sourcedir" : "-nosourcedir");
-        options.addElement(strictargs ? "-strictargs" : "-nostrictargs");
-        options.addElement(strictassign ? "-strictassign" : "-nostrictassign");
-        options.addElement(strictcase ? "-strictcase" : "-nostrictcase");
-        options.addElement(strictimport ? "-strictimport" : "-nostrictimport");
-        options.addElement(strictprops ? "-strictprops" : "-nostrictprops");
-        options.addElement(strictsignal ? "-strictsignal" : "-nostrictsignal");
-        options.addElement(symbols ? "-symbols" : "-nosymbols");
-        options.addElement(time ? "-time" : "-notime");
-        options.addElement("-" + trace);
-        options.addElement(utf8 ? "-utf8" : "-noutf8");
-        options.addElement("-" + verbose);
+        options.add(binary ? "-binary" : "-nobinary");
+        options.add(comments ? "-comments" : "-nocomments");
+        options.add(compile ? "-compile" : "-nocompile");
+        options.add(compact ? "-compact" : "-nocompact");
+        options.add(console ? "-console" : "-noconsole");
+        options.add(crossref ? "-crossref" : "-nocrossref");
+        options.add(decimal ? "-decimal" : "-nodecimal");
+        options.add(diag ? "-diag" : "-nodiag");
+        options.add(explicit ? "-explicit" : "-noexplicit");
+        options.add(format ? "-format" : "-noformat");
+        options.add(keep ? "-keep" : "-nokeep");
+        options.add(logo ? "-logo" : "-nologo");
+        options.add(replace ? "-replace" : "-noreplace");
+        options.add(savelog ? "-savelog" : "-nosavelog");
+        options.add(sourcedir ? "-sourcedir" : "-nosourcedir");
+        options.add(strictargs ? "-strictargs" : "-nostrictargs");
+        options.add(strictassign ? "-strictassign" : "-nostrictassign");
+        options.add(strictcase ? "-strictcase" : "-nostrictcase");
+        options.add(strictimport ? "-strictimport" : "-nostrictimport");
+        options.add(strictprops ? "-strictprops" : "-nostrictprops");
+        options.add(strictsignal ? "-strictsignal" : "-nostrictsignal");
+        options.add(symbols ? "-symbols" : "-nosymbols");
+        options.add(time ? "-time" : "-notime");
+        options.add("-" + trace);
+        options.add(utf8 ? "-utf8" : "-noutf8");
+        options.add("-" + verbose);
 
-        String[] results = new String[options.size()];
-
-        options.copyInto(results);
-        return results;
+        return options.toArray(new String[options.size()]);
     }
 
-
     /**
      * Takes a classpath-like string, and adds each element of this string to
      * a new classpath, if the components exist. Components that don't exist,
@@ -998,7 +922,7 @@
      * @param target - target classpath
      * @param source - source classpath to get file objects.
      */
-    private void addExistingToClasspath(StringBuffer target, String source) {
+    private void addExistingToClasspath(StringBuilder target, String source) {
         StringTokenizer tok = new StringTokenizer(source,
             System.getProperty("path.separator"), false);
 
@@ -1013,15 +937,14 @@
                     + f.getAbsolutePath(), Project.MSG_VERBOSE);
             }
         }
-
     }
 
-
     /**
      * Enumerated class corresponding to the trace attribute.
      */
     public static class TraceAttr extends EnumeratedAttribute {
         /** {@inheritDoc}. */
+        @Override
         public String[] getValues() {
             return new String[] {"trace", "trace1", "trace2", "notrace"};
         }
@@ -1032,9 +955,10 @@
      */
     public static class VerboseAttr extends EnumeratedAttribute {
         /** {@inheritDoc}. */
+        @Override
         public String[] getValues() {
             return new String[] {"verbose", "verbose0", "verbose1", "verbose2",
-                    "verbose3", "verbose4", "verbose5", "noverbose"};
+                "verbose3", "verbose4", "verbose5", "noverbose"};
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,17 +21,16 @@
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Files;
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -147,7 +146,7 @@
     private File                propertyfile;
     private boolean             useJDKProperties;
 
-    private Vector entries = new Vector();
+    private Vector<Entry> entries = new Vector<>();
 
     /* ========================================================================
      *
@@ -182,10 +181,7 @@
     }
 
     private void executeOperation() throws BuildException {
-        for (Enumeration e = entries.elements(); e.hasMoreElements();) {
-            Entry entry = (Entry) e.nextElement();
-            entry.executeOn(properties);
-        }
+        entries.forEach(e -> e.executeOn(properties));
     }
 
     private void readFile() throws BuildException {
@@ -200,27 +196,16 @@
             if (propertyfile.exists()) {
                 log("Updating property file: "
                     + propertyfile.getAbsolutePath());
-                FileInputStream fis = null;
-                try {
-                    fis = new FileInputStream(propertyfile);
-                    BufferedInputStream bis = new BufferedInputStream(fis);
+                try (InputStream fis = Files.newInputStream(propertyfile.toPath());
+                     BufferedInputStream bis = new BufferedInputStream(fis)) {
                     properties.load(bis);
-                } finally {
-                    if (fis != null) {
-                        fis.close();
-                    }
                 }
             } else {
                 log("Creating new property file: "
                     + propertyfile.getAbsolutePath());
-                FileOutputStream out = null;
-                try {
-                    out = new FileOutputStream(propertyfile.getAbsolutePath());
+                try (OutputStream out =
+                     Files.newOutputStream(propertyfile.toPath())) {
                     out.flush();
-                } finally {
-                    if (out != null) {
-                        out.close();
-                    }
                 }
             }
         } catch (IOException ioe) {
@@ -269,7 +254,7 @@
             throw new BuildException(x, getLocation());
         }
         try {
-            OutputStream os = new FileOutputStream(propertyfile); //NOSONAR
+            OutputStream os = Files.newOutputStream(propertyfile.toPath()); //NOSONAR
             try {
                 try {
                     os.write(baos.toByteArray());
@@ -286,7 +271,7 @@
     }
 
     private boolean checkParam(File param) {
-        return !(param == null);
+        return param != null;
     }
 
     /**
@@ -404,7 +389,7 @@
                 } else if (type == Type.STRING_TYPE) {
                     executeString(oldValue);
                 } else {
-                    throw new BuildException("Unknown operation type: " + type);
+                    throw new BuildException("Unknown operation type: %d", type);
                 }
             } catch (NullPointerException npe) {
                 // Default to string type
@@ -466,7 +451,6 @@
             newValue = fmt.format(currentValue.getTime());
         }
 
-
         /**
          * Handle operations for type <code>int</code>.
          *
@@ -478,7 +462,6 @@
             int currentValue = DEFAULT_INT_VALUE;
             int newV  = DEFAULT_INT_VALUE;
 
-
             DecimalFormat fmt = (pattern != null) ? new DecimalFormat(pattern)
                 : new DecimalFormat();
             try {
@@ -554,15 +537,17 @@
                                          + "properties (key:" + key + ")");
             }
             if (value == null && defaultValue == null  && operation != Operation.DELETE_OPER) {
-                throw new BuildException("\"value\" and/or \"default\" "
-                                         + "attribute must be specified (key:" + key + ")");
+                throw new BuildException(
+                    "\"value\" and/or \"default\" attribute must be specified (key: %s)",
+                    key);
             }
             if (key == null) {
                 throw new BuildException("key is mandatory");
             }
             if (type == Type.STRING_TYPE && pattern != null) {
-                throw new BuildException("pattern is not supported for string "
-                                         + "properties (key:" + key + ")");
+                throw new BuildException(
+                    "pattern is not supported for string properties (key: %s)",
+                    key);
             }
         }
 
@@ -601,7 +586,7 @@
                     ret = defaultValue;
                 }
             } else {
-                ret = (oldValue == null) ? defaultValue : oldValue;
+                ret = oldValue == null ? defaultValue : oldValue;
             }
 
             return ret;
@@ -636,9 +621,11 @@
             public static int toOperation(String oper) {
                 if ("+".equals(oper)) {
                     return INCREMENT_OPER;
-                } else if ("-".equals(oper)) {
+                }
+                if ("-".equals(oper)) {
                     return DECREMENT_OPER;
-                } else if ("del".equals(oper)) {
+                }
+                if ("del".equals(oper)) {
                     return DELETE_OPER;
                 }
                 return EQUALS_OPER;
@@ -672,7 +659,8 @@
             public static int toType(String type) {
                 if ("int".equals(type)) {
                     return INTEGER_TYPE;
-                } else if ("date".equals(type)) {
+                }
+                if ("date".equals(type)) {
                     return DATE_TYPE;
                 }
                 return STRING_TYPE;
@@ -699,19 +687,19 @@
         private static final String[] UNITS = {MILLISECOND, SECOND, MINUTE, HOUR, DAY, WEEK, MONTH,
                 YEAR};
 
-        private Map calendarFields = new HashMap();
+        private Map<String, Integer> calendarFields = new HashMap<>();
 
         /** no arg constructor */
         public Unit() {
             calendarFields.put(MILLISECOND,
-                               new Integer(Calendar.MILLISECOND));
-            calendarFields.put(SECOND, new Integer(Calendar.SECOND));
-            calendarFields.put(MINUTE, new Integer(Calendar.MINUTE));
-            calendarFields.put(HOUR, new Integer(Calendar.HOUR_OF_DAY));
-            calendarFields.put(DAY, new Integer(Calendar.DATE));
-            calendarFields.put(WEEK, new Integer(Calendar.WEEK_OF_YEAR));
-            calendarFields.put(MONTH, new Integer(Calendar.MONTH));
-            calendarFields.put(YEAR, new Integer(Calendar.YEAR));
+                Integer.valueOf(Calendar.MILLISECOND));
+            calendarFields.put(SECOND, Integer.valueOf(Calendar.SECOND));
+            calendarFields.put(MINUTE, Integer.valueOf(Calendar.MINUTE));
+            calendarFields.put(HOUR, Integer.valueOf(Calendar.HOUR_OF_DAY));
+            calendarFields.put(DAY, Integer.valueOf(Calendar.DATE));
+            calendarFields.put(WEEK, Integer.valueOf(Calendar.WEEK_OF_YEAR));
+            calendarFields.put(MONTH, Integer.valueOf(Calendar.MONTH));
+            calendarFields.put(YEAR, Integer.valueOf(Calendar.YEAR));
         }
 
         /**
@@ -719,9 +707,7 @@
          * @return the calendar value.
          */
         public int getCalendarField() {
-            String key = getValue().toLowerCase();
-            Integer i = (Integer) calendarFields.get(key);
-            return i.intValue();
+            return calendarFields.get(getValue().toLowerCase()).intValue();
         }
 
         /** {@inheritDoc}. */
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,13 +21,13 @@
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.Files;
 import java.text.MessageFormat;
 import java.text.ParseException;
-import java.util.Enumeration;
 import java.util.Random;
 import java.util.Vector;
 
@@ -78,10 +78,20 @@
     private static final int POS_2 = 2;
     private static final int POS_3 = 3;
 
+    /**
+     * Constant for the thing to execute
+     */
+    private static final String PCLI_EXE = "pcli";
+
+    /**
+     * Constant for the thing to execute
+     */
+    private static final String GET_EXE = "get";
+
     private String pvcsbin;
     private String repository;
     private String pvcsProject;
-    private Vector pvcsProjects;
+    private Vector<PvcsProject> pvcsProjects;
     private String workspace;
     private String force;
     private String promotiongroup;
@@ -93,21 +103,25 @@
     private String lineStart;
     private String userId;
     private String config;
-    /**
-     * Constant for the thing to execute
-     */
-    private static final String PCLI_EXE = "pcli";
-
-    /*
-     * Constant for the PCLI listversionedfiles recursive i a format "get" understands
-     */
-    // private static final String PCLI_LVF_ARGS = "lvf -z -aw";
 
     /**
-     * Constant for the thing to execute
+     * Creates a Pvcs object
      */
-    private static final String GET_EXE = "get";
-
+    public Pvcs() {
+        super();
+        pvcsProject = null;
+        pvcsProjects = new Vector<>();
+        workspace = null;
+        repository = null;
+        pvcsbin = null;
+        force = null;
+        promotiongroup = null;
+        label = null;
+        ignorerc = false;
+        updateOnly = false;
+        lineStart = "\"P:";
+        filenameFormat = "{0}-arc({1})";
+    }
 
     /**
      * Run the command.
@@ -123,7 +137,7 @@
             exe.setWorkingDirectory(aProj.getBaseDir());
             exe.setCommandline(cmd.getCommandline());
             return exe.execute();
-        } catch (java.io.IOException e) {
+        } catch (IOException e) {
             String msg = "Failed executing: " + cmd.toString()
                 + ". Exception: " + e.getMessage();
             throw new BuildException(msg, getLocation());
@@ -131,7 +145,7 @@
     }
 
     private String getExecutable(String exe) {
-        StringBuffer correctedExe = new StringBuffer();
+        StringBuilder correctedExe = new StringBuilder();
         if (getPvcsbin() != null) {
             if (pvcsbin.endsWith(File.separator)) {
                 correctedExe.append(pvcsbin);
@@ -145,10 +159,11 @@
     /**
      * @exception org.apache.tools.ant.BuildException Something is stopping the build...
      */
-    public void execute() throws org.apache.tools.ant.BuildException {
+    @Override
+    public void execute() throws BuildException {
         int result = 0;
 
-        if (repository == null || repository.trim().equals("")) {
+        if (repository == null || repository.trim().isEmpty()) {
             throw new BuildException("Required argument repository not specified");
         }
 
@@ -182,12 +197,10 @@
             commandLine.createArgument().setValue(getPvcsproject());
         }
         if (!getPvcsprojects().isEmpty()) {
-            Enumeration e = getPvcsprojects().elements();
-            while (e.hasMoreElements()) {
-                String projectName = ((PvcsProject) e.nextElement()).getName();
-                if (projectName == null || (projectName.trim()).equals("")) {
-                    throw new BuildException("name is a required attribute "
-                        + "of pvcsproject");
+            for (PvcsProject pvcsProject : getPvcsprojects()) {
+                String projectName = pvcsProject.getName();
+                if (projectName == null || projectName.trim().isEmpty()) {
+                    throw new BuildException("name is a required attribute of pvcsproject");
                 }
                 commandLine.createArgument().setValue(projectName);
             }
@@ -198,7 +211,7 @@
         try {
             Random rand = new Random(System.currentTimeMillis());
             tmp = new File("pvcs_ant_" + rand.nextLong() + ".log");
-            FileOutputStream fos = new FileOutputStream(tmp);
+            OutputStream fos = Files.newOutputStream(tmp.toPath());
             tmp2 = new File("pvcs_ant_" + rand.nextLong() + ".log");
             log(commandLine.describeCommand(), Project.MSG_VERBOSE);
             try {
@@ -294,9 +307,7 @@
      * Parses the file and creates the folders specified in the output section
      */
     private void createFolders(File file) throws IOException, ParseException {
-        BufferedReader in = null;
-        try {
-            in = new BufferedReader(new FileReader(file));
+        try (BufferedReader in = new BufferedReader(new FileReader(file))) {
             MessageFormat mf = new MessageFormat(getFilenameFormat());
             String line = in.readLine();
             while (line != null) {
@@ -314,7 +325,10 @@
                     int index = f.lastIndexOf(File.separator);
                     if (index > -1) {
                         File dir = new File(f.substring(0, index));
-                        if (!dir.exists()) {
+                        if (dir.exists()) {
+                            log(dir.getAbsolutePath() + " exists. Skipping",
+                                Project.MSG_VERBOSE);
+                        } else {
                             log("Creating " + dir.getAbsolutePath(),
                                 Project.MSG_VERBOSE);
                             if (dir.mkdirs() || dir.isDirectory()) {
@@ -325,9 +339,6 @@
                                     + dir.getAbsolutePath(),
                                     Project.MSG_INFO);
                             }
-                        } else {
-                            log(dir.getAbsolutePath() + " exists. Skipping",
-                                Project.MSG_VERBOSE);
                         }
                     } else {
                         log("File separator problem with " + line,
@@ -338,8 +349,6 @@
                 }
                 line = in.readLine();
             }
-        } finally {
-            FileUtils.close(in);
         }
     }
 
@@ -351,20 +360,13 @@
      */
     private void massagePCLI(File in, File out)
         throws IOException {
-        BufferedReader inReader = null;
-        BufferedWriter outWriter = null;
-        try {
-            inReader = new BufferedReader(new FileReader(in));
-            outWriter = new BufferedWriter(new FileWriter(out));
-            String s = null;
-            while ((s = inReader.readLine()) != null) {
-                String sNormal = s.replace('\\', '/');
-                outWriter.write(sNormal);
+        try (BufferedReader inReader = new BufferedReader(new FileReader(in));
+                BufferedWriter outWriter = new BufferedWriter(new FileWriter(out))) {
+            for (String line : (Iterable<String>) () -> inReader.lines()
+                    .map(s -> s.replace('\\', '/')).iterator()) {
+                outWriter.write(line);
                 outWriter.newLine();
             }
-        } finally {
-            FileUtils.close(inReader);
-            FileUtils.close(outWriter);
         }
     }
 
@@ -454,7 +456,7 @@
      * Get name of the project in the PVCS repository
      * @return Vector
      */
-    public Vector getPvcsprojects() {
+    public Vector<PvcsProject> getPvcsprojects() {
         return pvcsProjects;
     }
 
@@ -519,11 +521,7 @@
      * @param f String (yes/no)
      */
     public void setForce(String f) {
-        if (f != null && f.equalsIgnoreCase("yes")) {
-            force = "yes";
-        } else {
-            force = "no";
-        }
+        force = "yes".equalsIgnoreCase(f) ? "yes" : "no";
     }
 
     /**
@@ -650,23 +648,5 @@
         userId = u;
     }
 
-    /**
-     * Creates a Pvcs object
-     */
-    public Pvcs() {
-        super();
-        pvcsProject = null;
-        pvcsProjects = new Vector();
-        workspace = null;
-        repository = null;
-        pvcsbin = null;
-        force = null;
-        promotiongroup = null;
-        label = null;
-        ignorerc = false;
-        updateOnly = false;
-        lineStart = "\"P:";
-        filenameFormat = "{0}-arc({1})";
-    }
 }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.java	2018-03-24 12:37:12.000000000 +0000
@@ -26,11 +26,6 @@
 public class PvcsProject {
     private String name;
 
-    /** no arg constructor */
-    public PvcsProject() {
-        super();
-    }
-
     /**
      * Set the name of the project
      * @param name the value to use.
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,8 +20,6 @@
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -29,6 +27,8 @@
 import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.Writer;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -144,7 +144,6 @@
         this.subs = null;
     }
 
-
     /**
      * file for which the regular expression should be replaced;
      * required unless a nested fileset is supplied.
@@ -155,7 +154,6 @@
         this.file = file;
     }
 
-
     /**
      * the regular expression pattern to match in the file(s);
      * required if no nested &lt;regexp&gt; is used
@@ -171,7 +169,6 @@
         regex.setPattern(match);
     }
 
-
     /**
      * The substitution pattern to place in the file(s) in place
      * of the regular expression.
@@ -182,8 +179,8 @@
 
     public void setReplace(String replace) {
         if (subs != null) {
-            throw new BuildException("Only one substitution expression is "
-                                     + "allowed");
+            throw new BuildException(
+                "Only one substitution expression is allowed");
         }
 
         subs = new Substitution();
@@ -210,7 +207,6 @@
         this.flags = flags;
     }
 
-
     /**
      * Process the file(s) one line at a time, executing the replacement
      * on one line at a time.  This is useful if you
@@ -224,12 +220,7 @@
      */
     @Deprecated
     public void setByLine(String byline) {
-        Boolean res = Boolean.valueOf(byline);
-
-        if (res == null) {
-            res = Boolean.FALSE;
-        }
-        this.byline = res.booleanValue();
+        this.byline = Boolean.parseBoolean(byline);
     }
 
     /**
@@ -305,8 +296,8 @@
      */
     public Substitution createSubstitution() {
         if (subs != null) {
-            throw new BuildException("Only one substitution expression is "
-                                     + "allowed");
+            throw new BuildException(
+                "Only one substitution expression is allowed");
         }
 
         subs = new Substitution();
@@ -350,7 +341,6 @@
         return res;
     }
 
-
     /**
      * Perform the replacement on a file
      *
@@ -364,13 +354,14 @@
         try {
             boolean changes = false;
 
-            InputStream is = new FileInputStream(f);
-            try {
-                Reader r = encoding != null ? new InputStreamReader(is, encoding) : new InputStreamReader(is);
-                OutputStream os = new FileOutputStream(temp);
+            final Charset charset = encoding == null ? Charset.defaultCharset() : Charset.forName(encoding);
+            try (InputStream is = Files.newInputStream(f.toPath());
+                 OutputStream os = Files.newOutputStream(temp.toPath())) {
+                Reader r = null;
+                Writer w = null;
                 try {
-                    Writer w = encoding != null ? new OutputStreamWriter(os, encoding) : new OutputStreamWriter(os);
-
+                    r = new InputStreamReader(is, charset);
+                    w = new OutputStreamWriter(os, charset);
                     log("Replacing pattern '" + regex.getPattern(getProject())
                         + "' with '" + subs.getExpression(getProject())
                         + "' in '" + f.getPath() + "'" + (byline ? " by line" : "")
@@ -381,7 +372,7 @@
                         r = new BufferedReader(r);
                         w = new BufferedWriter(w);
 
-                        StringBuffer linebuf = new StringBuffer();
+                        StringBuilder linebuf = new StringBuilder();
                         int c;
                         boolean hasCR = false;
 
@@ -395,7 +386,7 @@
                                                                w, options);
                                     w.write('\r');
 
-                                    linebuf = new StringBuffer();
+                                    linebuf = new StringBuilder();
                                     // hasCR is still true (for the second one)
                                 } else {
                                     // first CR in this line
@@ -411,7 +402,7 @@
                                 }
                                 w.write('\n');
 
-                                linebuf = new StringBuffer();
+                                linebuf = new StringBuilder();
                             } else { // any other char
                                 if ((hasCR) || (c < 0)) {
                                     // Mac-style linebreak or EOF (or both)
@@ -422,7 +413,7 @@
                                         hasCR = false;
                                     }
 
-                                    linebuf = new StringBuffer();
+                                    linebuf = new StringBuilder();
                                 }
 
                                 if (c >= 0) {
@@ -434,15 +425,10 @@
                     } else {
                         changes = multilineReplace(r, w, options);
                     }
-
-                    r.close();
-                    w.close();
-
                 } finally {
-                    os.close();
+                    FileUtils.close(r);
+                    FileUtils.close(w);
                 }
-            } finally {
-                is.close();
             }
             if (changes) {
                 log("File has changed; saving the updated file", Project.MSG_VERBOSE);
@@ -467,7 +453,6 @@
         }
     }
 
-
     /**
      * Execute the task
      *
@@ -483,9 +468,8 @@
         }
 
         if (file != null && resources != null) {
-            throw new BuildException("You cannot supply the 'file' attribute "
-                                     + "and resource collections at the same "
-                                     + "time.");
+            throw new BuildException(
+                "You cannot supply the 'file' attribute and resource collections at the same time.");
         }
 
         int options = RegexpUtil.asOptions(flags);
@@ -505,9 +489,7 @@
 
         if (resources != null) {
             for (Resource r : resources) {
-                FileProvider fp =
-                    r.as(FileProvider.class);
-                File f = fp.getFile();
+                File f = r.as(FileProvider.class).getFile();
 
                 if (f.exists()) {
                     try {
@@ -537,5 +519,3 @@
         return !res.equals(s);
     }
 }
-
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,10 +19,10 @@
 
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
+import java.nio.file.Files;
 import java.util.Map;
 
 import org.apache.tools.ant.BuildException;
@@ -110,6 +110,7 @@
      *
      * @throws BuildException is there is a problem in the task execution.
      */
+    @Override
     public void execute() throws BuildException {
 
         Commandline toExecute = new Commandline();
@@ -148,9 +149,9 @@
             }
         } else {
             if (output != null) {
-                FileOutputStream fos = null;
+                OutputStream fos = null;
                 try {
-                    fos = new FileOutputStream(output); //NOSONAR
+                    fos = Files.newOutputStream(output.toPath()); //NOSONAR
                     BufferedOutputStream bos = new BufferedOutputStream(fos);
                     outputstream = new PrintStream(bos);
                 } catch (IOException e) {
@@ -163,9 +164,9 @@
                 outputstream = new LogOutputStream(this, Project.MSG_DEBUG);
             }
             if (error != null) {
-                FileOutputStream fos = null;
+                OutputStream fos = null;
                 try {
-                    fos = new FileOutputStream(error);
+                    fos = Files.newOutputStream(error.toPath());
                     BufferedOutputStream bos = new BufferedOutputStream(fos);
                     errorstream = new PrintStream(bos);
                 } catch (IOException e) {
@@ -226,7 +227,7 @@
      * @param sf the spec file name to use.
      */
     public void setSpecFile(String sf) {
-        if ((sf == null) || (sf.trim().length() == 0)) {
+        if (sf == null || sf.trim().isEmpty()) {
             throw new BuildException("You must specify a spec file", getLocation());
         }
         this.specFile = sf;
@@ -319,20 +320,20 @@
      * @since 1.6
      */
     protected String guessRpmBuildCommand() {
-        Map/*<String, String>*/ env = Execute.getEnvironmentVariables();
-        String path = (String) env.get(PATH1);
+        Map<String, String> env = Execute.getEnvironmentVariables();
+        String path = env.get(PATH1);
         if (path == null) {
-            path = (String) env.get(PATH2);
+            path = env.get(PATH2);
             if (path == null) {
-                path = (String) env.get(PATH3);
+                path = env.get(PATH3);
             }
         }
 
         if (path != null) {
             Path p = new Path(getProject(), path);
             String[] pElements = p.list();
-            for (int i = 0; i < pElements.length; i++) {
-                File f = new File(pElements[i],
+            for (String pElement : pElements) {
+                File f = new File(pElement,
                                   "rpmbuild"
                                   + (Os.isFamily("dos") ? ".exe" : ""));
                 if (f.canRead()) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/SchemaValidate.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,7 +20,8 @@
 import java.io.File;
 import java.net.MalformedURLException;
 import java.util.HashMap;
-import java.util.Iterator;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
@@ -48,23 +49,6 @@
  */
 
 public class SchemaValidate extends XMLValidateTask {
-
-    /** map of all declared schemas; we catch and complain about redefinitions */
-    private HashMap schemaLocations = new HashMap();
-
-    /** full checking of a schema */
-    private boolean fullChecking = true;
-
-    /**
-     * flag to disable DTD support. Best left enabled.
-     */
-    private boolean disableDTD = false;
-
-    /**
-     * default URL for nonamespace schemas
-     */
-    private SchemaLocation anonymousSchema;
-
     // Error strings
     /** SAX1 not supported */
     public static final String ERROR_SAX_1 = "SAX1 parsers are not supported";
@@ -88,12 +72,29 @@
     public static final String ERROR_DUPLICATE_SCHEMA
         = "Duplicate declaration of schema ";
 
+    /** map of all declared schemas; we catch and complain about redefinitions */
+    private Map<String, SchemaLocation> schemaLocations = new HashMap<>();
+
+    /** full checking of a schema */
+    private boolean fullChecking = true;
+
+    /**
+     * flag to disable DTD support. Best left enabled.
+     */
+    private boolean disableDTD = false;
+
+    /**
+     * default URL for nonamespace schemas
+     */
+    private SchemaLocation anonymousSchema;
+
     /**
      * Called by the project to let the task initialize properly. The default
      * implementation is a no-op.
      *
      * @throws BuildException if something goes wrong with the build
      */
+    @Override
     public void init() throws BuildException {
         super.init();
         //validating
@@ -155,7 +156,7 @@
     public void addConfiguredSchema(SchemaLocation location) {
         log("adding schema " + location, Project.MSG_DEBUG);
         location.validateNamespace();
-        SchemaLocation old = (SchemaLocation) schemaLocations.get(location.getNamespace());
+        SchemaLocation old = schemaLocations.get(location.getNamespace());
         if (old != null && !old.equals(location)) {
             throw new BuildException(ERROR_DUPLICATE_SCHEMA + location);
         }
@@ -213,6 +214,7 @@
      *
      * @throws BuildException if something went wrong
      */
+    @Override
     protected void initValidator() {
         super.initValidator();
         //validate the parser type
@@ -221,7 +223,6 @@
         }
 
         //enable schema
-        //setFeature(XmlConstants.FEATURE_VALIDATION, false);
         setFeature(XmlConstants.FEATURE_NAMESPACES, true);
         if (!enableXercesSchemaValidation() && !enableJAXP12SchemaValidation()) {
             //could not use xerces or jaxp calls
@@ -244,6 +245,7 @@
      * create our own factory with our own options.
      * @return a default XML parser
      */
+    @Override
     protected XMLReader createDefaultReader() {
         SAXParserFactory factory = SAXParserFactory.newInstance();
         factory.setValidating(true);
@@ -252,9 +254,7 @@
         try {
             SAXParser saxParser = factory.newSAXParser();
             reader = saxParser.getXMLReader();
-        } catch (ParserConfigurationException e) {
-            throw new BuildException(ERROR_PARSER_CREATION_FAILURE, e);
-        } catch (SAXException e) {
+        } catch (ParserConfigurationException | SAXException e) {
             throw new BuildException(ERROR_PARSER_CREATION_FAILURE, e);
         }
         return reader;
@@ -265,23 +265,15 @@
      * property.
      */
     protected void addSchemaLocations() {
-        Iterator it = schemaLocations.values().iterator();
-        StringBuffer buffer = new StringBuffer();
-        int count = 0;
-        while (it.hasNext()) {
-            if (count > 0) {
-                buffer.append(' ');
-            }
-            SchemaLocation schemaLocation = (SchemaLocation) it.next();
-            String tuple = schemaLocation.getURIandLocation();
-            buffer.append(tuple);
-            log("Adding schema " + tuple, Project.MSG_VERBOSE);
-            count++;
-        }
-        if (count > 0) {
-            setProperty(XmlConstants.PROPERTY_SCHEMA_LOCATION, buffer.toString());
-        }
+        if (!schemaLocations.isEmpty()) {
+            String joinedValue = schemaLocations.values().stream()
+                .map(SchemaLocation::getURIandLocation)
+                .peek(
+                    tuple -> log("Adding schema " + tuple, Project.MSG_VERBOSE))
+                .collect(Collectors.joining(" "));
 
+            setProperty(XmlConstants.PROPERTY_SCHEMA_LOCATION, joinedValue);
+        }
     }
 
     /**
@@ -289,11 +281,8 @@
      * @return the schema URL
      */
     protected String getNoNamespaceSchemaURL() {
-        if (anonymousSchema == null) {
-            return null;
-        } else {
-            return anonymousSchema.getSchemaLocationURL();
-        }
+        return anonymousSchema == null ? null
+            : anonymousSchema.getSchemaLocationURL();
     }
 
     /**
@@ -317,6 +306,7 @@
      *
      * @param fileProcessed number of files processed.
      */
+    @Override
     protected void onSuccessfulValidation(int fileProcessed) {
         log(fileProcessed + MESSAGE_FILES_VALIDATED, Project.MSG_VERBOSE);
     }
@@ -350,10 +340,6 @@
         public static final String ERROR_NO_LOCATION
             = "No file or URL supplied for the schema ";
 
-        /** No arg constructor */
-        public SchemaLocation() {
-        }
-
         /**
          * Get the namespace.
          * @return the namespace.
@@ -442,11 +428,8 @@
          */
         public String getURIandLocation() throws BuildException {
             validateNamespace();
-            StringBuffer buffer = new StringBuffer();
-            buffer.append(namespace);
-            buffer.append(' ');
-            buffer.append(getSchemaLocationURL());
-            return new String(buffer);
+            return new StringBuilder(namespace).append(' ')
+                .append(getSchemaLocationURL()).toString();
         }
 
         /**
@@ -465,7 +448,7 @@
          * @return true if it is not null or empty
          */
         private boolean isSet(String property) {
-            return property != null && property.length() != 0;
+            return property != null && !property.isEmpty();
         }
 
         /**
@@ -474,6 +457,7 @@
          * @return true iff the objects are considered equal in value
          */
 
+        @Override
         public boolean equals(Object o) {
             if (this == o) {
                 return true;
@@ -502,6 +486,7 @@
          * Generate a hashcode depending on the namespace, url and file name.
          * @return the hashcode.
          */
+        @Override
         public int hashCode() {
             int result;
             // CheckStyle:MagicNumber OFF
@@ -517,8 +502,9 @@
          * and the like
          * @return a string representation of the object.
          */
+        @Override
         public String toString() {
-            StringBuffer buffer = new StringBuffer();
+            StringBuilder buffer = new StringBuilder();
             buffer.append(namespace != null ? namespace : "(anonymous)");
             buffer.append(' ');
             buffer.append(url != null ? (url + " ") : "");
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDefBase.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDefBase.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDefBase.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDefBase.java	2018-03-24 12:37:12.000000000 +0000
@@ -36,10 +36,10 @@
 public class ScriptDefBase extends Task implements DynamicConfigurator {
 
     /** Nested elements */
-    private Map nestedElementMap = new HashMap();
+    private Map<String, List<Object>> nestedElementMap = new HashMap<>();
 
     /** Attributes */
-    private Map attributes = new HashMap();
+    private Map<String, String> attributes = new HashMap<>();
 
     private String text;
 
@@ -47,19 +47,20 @@
      * Locate the script defining task and execute the script by passing
      * control to it
      */
+    @Override
     public void execute() {
         getScript().executeScript(attributes, nestedElementMap, this);
     }
 
     private ScriptDef getScript() {
         String name = getTaskType();
-        Map scriptRepository
-            = (Map) getProject().getReference(MagicNames.SCRIPT_REPOSITORY);
+        Map<String, ScriptDef> scriptRepository =
+            getProject().getReference(MagicNames.SCRIPT_REPOSITORY);
         if (scriptRepository == null) {
             throw new BuildException("Script repository not found for " + name);
         }
 
-        ScriptDef definition = (ScriptDef) scriptRepository.get(getTaskType());
+        ScriptDef definition = scriptRepository.get(getTaskType());
         if (definition == null) {
             throw new BuildException("Script definition not found for " + name);
         }
@@ -72,12 +73,10 @@
      * @param name the nested element name
      * @return the element to be configured
      */
+    @Override
     public Object createDynamicElement(String name)  {
-        List nestedElementList = (List) nestedElementMap.get(name);
-        if (nestedElementList == null) {
-            nestedElementList = new ArrayList();
-            nestedElementMap.put(name, nestedElementList);
-        }
+        List<Object> nestedElementList =
+            nestedElementMap.computeIfAbsent(name, k -> new ArrayList<>());
         Object element = getScript().createNestedElement(name);
         nestedElementList.add(element);
         return element;
@@ -89,13 +88,14 @@
      * @param name the attribute name.
      * @param value the attribute's string value
      */
+    @Override
     public void setDynamicAttribute(String name, String value) {
         ScriptDef definition = getScript();
         if (!definition.isAttributeSupported(name)) {
-                throw new BuildException("<" + getTaskType()
-                    + "> does not support the \"" + name + "\" attribute");
+            throw new BuildException(
+                "<%s> does not support the \"%s\" attribute", getTaskType(),
+                name);
         }
-
         attributes.put(name, value);
     }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,7 +21,6 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -40,7 +39,7 @@
 import org.apache.tools.ant.util.ScriptRunnerHelper;
 
 /**
- * Define a task using a script
+ * Defines a task using a script.
  *
  * @since Ant 1.6
  */
@@ -54,21 +53,22 @@
     private String name;
 
     /** Attributes definitions of this script */
-    private List attributes = new ArrayList();
+    private List<Attribute> attributes = new ArrayList<>();
 
     /** Nested Element definitions of this script */
-    private List nestedElements = new ArrayList();
+    private List<NestedElement> nestedElements = new ArrayList<>();
 
     /** The attribute names as a set */
-    private Set attributeSet;
+    private Set<String> attributeSet;
 
     /** The nested element definitions indexed by their names */
-    private Map nestedElementMap;
+    private Map<String, NestedElement> nestedElementMap;
 
     /**
      * Set the project.
-     * @param project the project that this def belows to.
+     * @param project the project that this definition belongs to.
      */
+    @Override
     public void setProject(Project project) {
         super.setProject(project);
         helper.setProjectComponent(this);
@@ -76,7 +76,7 @@
     }
 
     /**
-     * set the name under which this script will be activated in a build
+     * Sets the name under which this script will be activated in a build
      * file
      *
      * @param name the name of the script
@@ -104,7 +104,7 @@
         private String name;
 
         /**
-         * Set the attribute name
+         * Sets the attribute name
          *
          * @param name the attribute name
          */
@@ -114,7 +114,7 @@
     }
 
     /**
-     * Add an attribute definition to this script.
+     * Adds an attribute definition to this script.
      *
      * @param attribute the attribute definition.
      */
@@ -136,7 +136,7 @@
         private String className;
 
         /**
-         * set the tag name for this nested element
+         * Sets the tag name for this nested element
          *
          * @param name the name of this nested element
          */
@@ -145,7 +145,7 @@
         }
 
         /**
-         * Set the type of this element. This is the name of an
+         * Sets the type of this element. This is the name of an
          * Ant task or type which is to be used when this element is to be
          * created. This is an alternative to specifying the class name directly
          *
@@ -157,7 +157,7 @@
         }
 
         /**
-         * Set the classname of the class to be used for the nested element.
+         * Sets the classname of the class to be used for the nested element.
          * This specifies the class directly and is an alternative to specifying
          * the Ant type name.
          *
@@ -170,7 +170,7 @@
     }
 
     /**
-     * Add a nested element definition.
+     * Adds a nested element definition.
      *
      * @param nestedElement the nested element definition.
      */
@@ -179,17 +179,23 @@
     }
 
     /**
-     * Define the script.
+     * Defines the script.
      */
+    @Override
     public void execute() {
         if (name == null) {
-            throw new BuildException("scriptdef requires a name attribute to "
-                + "name the script");
+            throw new BuildException(
+                "scriptdef requires a name attribute to name the script");
         }
 
         if (helper.getLanguage() == null) {
-            throw new BuildException("<scriptdef> requires a language attribute "
-                + "to specify the script language");
+            throw new BuildException(
+                "scriptdef requires a language attribute to specify the script language");
+        }
+
+        if (helper.getSrc() == null && helper.getEncoding() != null) {
+            throw new BuildException(
+                "scriptdef requires a src attribute if the encoding is set");
         }
 
         // Check if need to set the loader
@@ -197,52 +203,47 @@
             helper.setClassLoader(createLoader());
         }
 
-        attributeSet = new HashSet();
-        for (Iterator i = attributes.iterator(); i.hasNext();) {
-            Attribute attribute = (Attribute) i.next();
+        attributeSet = new HashSet<>();
+        for (Attribute attribute : attributes) {
             if (attribute.name == null) {
-                throw new BuildException("scriptdef <attribute> elements "
-                    + "must specify an attribute name");
+                throw new BuildException(
+                    "scriptdef <attribute> elements must specify an attribute name");
             }
-
             if (attributeSet.contains(attribute.name)) {
-                throw new BuildException("scriptdef <" + name + "> declares "
-                    + "the " + attribute.name + " attribute more than once");
+                throw new BuildException(
+                    "scriptdef <%s> declares the %s attribute more than once",
+                    name, attribute.name);
             }
             attributeSet.add(attribute.name);
         }
 
-        nestedElementMap = new HashMap();
-        for (Iterator i = nestedElements.iterator(); i.hasNext();) {
-            NestedElement nestedElement = (NestedElement) i.next();
+        nestedElementMap = new HashMap<>();
+        for (NestedElement nestedElement : nestedElements) {
             if (nestedElement.name == null) {
-                throw new BuildException("scriptdef <element> elements "
-                    + "must specify an element name");
+                throw new BuildException(
+                    "scriptdef <element> elements must specify an element name");
             }
             if (nestedElementMap.containsKey(nestedElement.name)) {
-                throw new BuildException("scriptdef <" + name + "> declares "
-                    + "the " + nestedElement.name + " nested element more "
-                    + "than once");
+                throw new BuildException(
+                    "scriptdef <%s> declares the %s nested element more than once",
+                    name, nestedElement.name);
             }
 
             if (nestedElement.className == null
                 && nestedElement.type == null) {
-                throw new BuildException("scriptdef <element> elements "
-                    + "must specify either a classname or type attribute");
+                throw new BuildException(
+                    "scriptdef <element> elements must specify either a classname or type attribute");
             }
             if (nestedElement.className != null
                 && nestedElement.type != null) {
-                throw new BuildException("scriptdef <element> elements "
-                    + "must specify only one of the classname and type "
-                    + "attributes");
+                throw new BuildException(
+                    "scriptdef <element> elements must specify only one of the classname and type attributes");
             }
-
-
             nestedElementMap.put(nestedElement.name, nestedElement);
         }
 
         // find the script repository - it is stored in the project
-        Map scriptRepository = lookupScriptRepository();
+        Map<String, ScriptDef> scriptRepository = lookupScriptRepository();
         name = ProjectHelper.genComponentName(getURI(), name);
         scriptRepository.put(name, this);
         AntTypeDefinition def = new AntTypeDefinition();
@@ -253,18 +254,18 @@
     }
 
     /**
-     * Find or create the script repository - it is stored in the project.
+     * Finds or creates the script repository - it is stored in the project.
      * This method is synchronized on the project under {@link MagicNames#SCRIPT_REPOSITORY}
      * @return the current script repository registered as a reference.
      */
-    private Map lookupScriptRepository() {
-        Map scriptRepository = null;
+    private Map<String, ScriptDef> lookupScriptRepository() {
+        Map<String, ScriptDef> scriptRepository;
         Project p = getProject();
         synchronized (p) {
             scriptRepository =
-                    (Map) p.getReference(MagicNames.SCRIPT_REPOSITORY);
+                    p.getReference(MagicNames.SCRIPT_REPOSITORY);
             if (scriptRepository == null) {
-                scriptRepository = new HashMap();
+                scriptRepository = new HashMap<>();
                 p.addReference(MagicNames.SCRIPT_REPOSITORY,
                         scriptRepository);
             }
@@ -273,20 +274,20 @@
     }
 
     /**
-     * Create a nested element to be configured.
+     * Creates a nested element to be configured.
      *
      * @param elementName the name of the nested element.
      * @return object representing the element name.
      */
     public Object createNestedElement(String elementName) {
-        NestedElement definition
-            = (NestedElement) nestedElementMap.get(elementName);
+        NestedElement definition = nestedElementMap.get(elementName);
         if (definition == null) {
-            throw new BuildException("<" + name + "> does not support "
-                + "the <" + elementName + "> nested element");
+            throw new BuildException(
+                "<%s> does not support the <%s> nested element", name,
+                elementName);
         }
 
-        Object instance = null;
+        Object instance;
         String classname = definition.className;
         if (classname == null) {
             instance = getProject().createTask(definition.type);
@@ -294,11 +295,6 @@
                 instance = getProject().createDataType(definition.type);
             }
         } else {
-            /*
-            // try the context classloader
-            ClassLoader loader
-                = Thread.currentThread().getContextClassLoader();
-            */
             ClassLoader loader = createLoader();
 
             try {
@@ -306,31 +302,33 @@
             } catch (BuildException e) {
                 instance = ClasspathUtils.newInstance(classname, ScriptDef.class.getClassLoader());
             }
-
             getProject().setProjectReference(instance);
         }
 
         if (instance == null) {
-            throw new BuildException("<" + name + "> is unable to create "
-                + "the <" + elementName + "> nested element");
+            throw new BuildException(
+                "<%s> is unable to create the <%s> nested element", name,
+                elementName);
         }
         return instance;
     }
 
     /**
-     * Execute the script.
+     * Executes the script.
      *
      * @param attributes collection of attributes
      * @param elements a list of nested element values.
      * @deprecated since 1.7.
      *             Use executeScript(attribute, elements, instance) instead.
      */
-    public void executeScript(Map attributes, Map elements) {
+    @Deprecated
+    public void executeScript(Map<String, String> attributes,
+        Map<String, List<Object>> elements) {
         executeScript(attributes, elements, null);
     }
 
     /**
-     * Execute the script.
+     * Executes the script.
      * This is called by the script instance to execute the script for this
      * definition.
      *
@@ -338,7 +336,8 @@
      * @param elements   a list of nested element values.
      * @param instance   the script instance; can be null
      */
-    public void executeScript(Map attributes, Map elements, ScriptDefBase instance) {
+    public void executeScript(Map<String, String> attributes,
+        Map<String, List<Object>> elements, ScriptDefBase instance) {
         ScriptRunnerBase runner = helper.getScriptRunner();
         runner.addBean("attributes", attributes);
         runner.addBean("elements", elements);
@@ -368,7 +367,17 @@
     }
 
     /**
-     * Load the script from an external file ; optional.
+     * Defines the compilation feature; optional.
+     *
+     * @param compiled enables the script compilation if available.
+     * @since Ant 1.10.2
+     */
+    public void setCompiled(boolean compiled) {
+        helper.setCompiled(compiled);
+    }
+
+    /**
+     * Loads the script from an external file; optional.
      *
      * @param file the file containing the script source.
      */
@@ -377,7 +386,17 @@
     }
 
     /**
-     * Set the script text.
+     * Sets the encoding of the script from an external file; optional.
+     *
+     * @param encoding the encoding of the file containing the script source.
+     * @since Ant 1.10.2
+     */
+    public void setEncoding(String encoding) {
+        helper.setEncoding(encoding);
+    }
+
+    /**
+     * Sets the script text.
      *
      * @param text a component of the script text to be added.
      */
@@ -386,12 +405,11 @@
     }
 
     /**
-     * Add any source resource.
-     * @since Ant1.7.1
+     * Adds any source resource.
+     * @since Ant 1.7.1
      * @param resource source of script
      */
     public void add(ResourceCollection resource) {
         helper.add(resource);
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/Script.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/Script.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/Script.java	2018-03-24 12:37:12.000000000 +0000
@@ -130,4 +130,15 @@
     public void setSetBeans(boolean setBeans) {
         helper.setSetBeans(setBeans);
     }
+
+    /**
+     * Set the encoding of the script from an external file; optional.
+     *
+     * @param encoding the encoding of the file containing the script source.
+     * @since Ant 1.10.2
+     */
+    public void setEncoding(String encoding) {
+        helper.setEncoding(encoding);
+    }
+
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/sos/package.html ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/sos/package.html
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/sos/package.html	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/sos/package.html	2018-03-24 12:37:12.000000000 +0000
@@ -19,11 +19,11 @@
   <p>
     Ant tasks for working with a SourceOffSite source control system.
   </p>
-  <p>
-    The &lt;SOSGet&gt; Retrieves file(s) from a SOS database<br/>
-    The &lt;SOSCheckin&gt; Commits and unlocks file(s) in a SOS database<br/>
-    The &lt;SOSCheckout&gt; Retrieves and lock file(s) in a SOS database<br/>
-    The &lt;SOSLabel&gt; Label a SOS database
-  </p>
+  <dl>
+    <dt>&lt;SOSGet&gt;</dt><dd>Retrieves file(s) from a SOS database</dd>
+    <dt>&lt;SOSCheckin&gt;</dt><dd>Commits and unlocks file(s) in a SOS database</dd>
+    <dt>&lt;SOSCheckout&gt;</dt><dd>Retrieves and lock file(s) in a SOS database</dd>
+    <dt>&lt;SOSLabel&gt;</dt><dd>Label a SOS database</dd>
+  </dl>
 </body>
 </html>
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckin.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckin.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckin.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckin.java	2018-03-24 12:37:12.000000000 +0000
@@ -70,6 +70,7 @@
      *
      * @return    Commandline the generated command to be executed
      */
+    @Override
     protected Commandline buildCmdLine() {
         commandLine = new Commandline();
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckout.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckout.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckout.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckout.java	2018-03-24 12:37:12.000000000 +0000
@@ -59,6 +59,7 @@
      *
      * @return    Commandline the generated command to be executed
      */
+    @Override
     protected Commandline buildCmdLine() {
         commandLine = new Commandline();
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSGet.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSGet.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSGet.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSGet.java	2018-03-24 12:37:12.000000000 +0000
@@ -79,6 +79,7 @@
      *
      * @return    Commandline the generated command to be executed
      */
+    @Override
     protected Commandline buildCmdLine() {
         commandLine = new Commandline();
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOS.java	2018-03-24 12:37:12.000000000 +0000
@@ -388,6 +388,7 @@
      *
      * @throws BuildException on error.
      */
+    @Override
     public void execute()
         throws BuildException {
         int result = 0;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSLabel.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSLabel.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSLabel.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSLabel.java	2018-03-24 12:37:12.000000000 +0000
@@ -65,6 +65,7 @@
      *
      * @return    Commandline the generated command to be executed
      */
+    @Override
     protected Commandline buildCmdLine() {
         commandLine = new Commandline();
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java	2018-03-24 12:37:12.000000000 +0000
@@ -36,7 +36,7 @@
 import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.BuildListener;
 import org.apache.tools.ant.Project;
-
+import org.apache.tools.ant.util.FileUtils;
 
 
 /**
@@ -60,10 +60,6 @@
     private int loopsFail = 0;
     private Long durationFail = null;
 
-    /** Constructor for AntSoundPlayer. */
-    public AntSoundPlayer() {
-    }
-
     /**
      * @param file the location of the audio file to be played when the
      *        build is successful
@@ -102,7 +98,6 @@
 
         AudioInputStream audioInputStream = null;
 
-
         try {
             audioInputStream = AudioSystem.getAudioInputStream(file);
         } catch (UnsupportedAudioFileException uafe) {
@@ -137,9 +132,7 @@
                     audioClip.drain();
                 }
             } finally {
-                if (audioClip != null) {
-                    audioClip.close();
-                }
+                FileUtils.close(audioClip);
             }
         } else {
             project.log("Can't get data from file " + file.getName());
@@ -182,6 +175,7 @@
      * clip if required.
      * @param event the line event to follow
      */
+    @Override
     public void update(LineEvent event) {
         if (event.getType().equals(LineEvent.Type.STOP)) {
             Line line = event.getLine();
@@ -194,6 +188,7 @@
      *  Fired before any targets are started.
      * @param event ignored
      */
+    @Override
     public void buildStarted(BuildEvent event) {
     }
 
@@ -203,6 +198,7 @@
      * @param event the build finished event.
      *  @see BuildEvent#getException()
      */
+    @Override
     public void buildFinished(BuildEvent event) {
         if (event.getException() == null && fileSuccess != null) {
             // build successful!
@@ -217,6 +213,7 @@
      * @param event ignored.
      *  @see BuildEvent#getTarget()
      */
+    @Override
     public void targetStarted(BuildEvent event) {
     }
 
@@ -226,6 +223,7 @@
      * @param event ignored.
      *  @see BuildEvent#getException()
      */
+    @Override
     public void targetFinished(BuildEvent event) {
     }
 
@@ -234,6 +232,7 @@
      * @param event ignored.
      *  @see BuildEvent#getTask()
      */
+    @Override
     public void taskStarted(BuildEvent event) {
     }
 
@@ -243,6 +242,7 @@
      * @param event ignored.
      *  @see BuildEvent#getException()
      */
+    @Override
     public void taskFinished(BuildEvent event) {
     }
 
@@ -252,6 +252,7 @@
      *  @see BuildEvent#getMessage()
      *  @see BuildEvent#getPriority()
      */
+    @Override
     public void messageLogged(BuildEvent event) {
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashScreen.java	2018-03-24 12:37:12.000000000 +0000
@@ -37,8 +37,10 @@
 
 import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.BuildListener;
+import org.apache.tools.ant.Project;
 
 class SplashScreen extends JWindow implements ActionListener, BuildListener {
+    private static final long serialVersionUID = 1L;
     private static final int FONT_SIZE = 12;
     private JLabel text;
     private JProgressBar pb;
@@ -118,6 +120,7 @@
         text.setText(txt);
     }
 
+    @Override
     public void actionPerformed(ActionEvent a) {
         if (!hasProgressPattern()) {
             if (total < MAX) {
@@ -129,31 +132,38 @@
         }
     }
 
+    @Override
     public void buildStarted(BuildEvent event) {
         actionPerformed(null);
     }
 
+    @Override
     public void buildFinished(BuildEvent event) {
         pb.setValue(MAX);
         setVisible(false);
         dispose();
     }
+    @Override
     public void targetStarted(BuildEvent event) {
         actionPerformed(null);
     }
 
+    @Override
     public void targetFinished(BuildEvent event) {
         actionPerformed(null);
     }
 
+    @Override
     public void taskStarted(BuildEvent event) {
         actionPerformed(null);
     }
 
+    @Override
     public void taskFinished(BuildEvent event) {
         actionPerformed(null);
     }
 
+    @Override
     public void messageLogged(BuildEvent event) {
         actionPerformed(null);
         if (hasProgressPattern()) {
@@ -162,12 +172,11 @@
             if (matcher != null && matcher.matches()) {
                 String gr = matcher.group(1);
                 try {
-                    int i = Math.min(new Integer(gr).intValue() * 2, MAX);
-                    pb.setValue(i);
+                    pb.setValue(Math.min(Integer.parseInt(gr) * 2, MAX));
                 } catch (NumberFormatException e) {
-                    //TODO: how to reach logger?!?
-                    //log("Number parsing error in progressRegExp", Project.MSG_VERBOSE);
-
+                    event.getProject().log(
+                        "Number parsing error in progressRegExp",
+                        Project.MSG_VERBOSE);
                 }
             }
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,7 +20,6 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
@@ -237,9 +236,9 @@
 
         boolean success = false;
         if (in != null) {
-            DataInputStream din = new DataInputStream(in);
-            try {
-                ByteArrayOutputStream bout = new ByteArrayOutputStream();
+            try (
+                DataInputStream din = new DataInputStream(in);
+                ByteArrayOutputStream bout = new ByteArrayOutputStream()){
                 int data;
                 while ((data = din.read()) != -1) {
                     bout.write((byte) data);
@@ -257,15 +256,6 @@
             } catch (Exception e) {
                 throw new BuildException(e);
             } finally {
-                try {
-                    din.close();
-                } catch (IOException ioe) {
-                    // swallow if there was an error before so that
-                    // original error will be passed up
-                    if (success) {
-                        throw new BuildException(ioe); //NOSONAR
-                    }
-                }
             }
         } else {
             try {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java	2018-03-24 12:37:12.000000000 +0000
@@ -41,10 +41,8 @@
     private final Session session;
     private final boolean verbose;
     private final boolean compressed;
-    private LogListener listener = new LogListener() {
-        public void log(final String message) {
-            // do nothing;
-        }
+    private LogListener listener = message -> {
+        // do nothing;
     };
 
     /**
@@ -97,9 +95,7 @@
      * @throws JSchException on error
      */
     protected ChannelSftp openSftpChannel() throws JSchException {
-        final ChannelSftp channel = (ChannelSftp) session.openChannel("sftp");
-
-        return channel;
+        return (ChannelSftp) session.openChannel("sftp");
     }
 
     /**
@@ -132,8 +128,9 @@
         if (b == -1) {
             // didn't receive any response
             throw new BuildException("No response from server");
-        } else if (b != 0) {
-            final StringBuffer sb = new StringBuffer();
+        }
+        if (b != 0) {
+            final StringBuilder sb = new StringBuilder();
 
             int c = in.read();
             while (c > 0 && c != '\n') {
@@ -270,12 +267,12 @@
         private long totalLength = 0;
         private int percentTransmitted = 0;
 
+        @Override
         public void init(final int op, final String src, final String dest, final long max) {
             initFileSize = max;
-            totalLength = 0;
-            percentTransmitted = 0;
         }
 
+        @Override
         public boolean count(final long len) {
             totalLength += len;
             percentTransmitted = trackProgress(initFileSize,
@@ -284,6 +281,7 @@
             return true;
         }
 
+        @Override
         public void end() {
         }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Directory.java	2018-03-24 12:37:12.000000000 +0000
@@ -22,6 +22,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.StringTokenizer;
 
@@ -31,8 +32,8 @@
 public class Directory {
 
     private File directory;
-    private Set childDirectories;
-    private ArrayList files;
+    private Set<Directory> childDirectories;
+    private List<File> files;
     private Directory parent;
 
     /**
@@ -50,8 +51,8 @@
      */
     public Directory(File directory, Directory parent) {
         this.parent = parent;
-        this.childDirectories = new LinkedHashSet();
-        this.files = new ArrayList();
+        this.childDirectories = new LinkedHashSet<>();
+        this.files = new ArrayList<>();
         this.directory = directory;
     }
 
@@ -77,7 +78,7 @@
      * Get an iterator over the child Directories.
      * @return an iterator
      */
-    public Iterator directoryIterator() {
+    public Iterator<Directory> directoryIterator() {
         return childDirectories.iterator();
     }
 
@@ -85,7 +86,7 @@
      * Get an iterator over the files.
      * @return an iterator
      */
-    public Iterator filesIterator() {
+    public Iterator<File> filesIterator() {
         return files.iterator();
     }
 
@@ -119,8 +120,7 @@
      * @return the child directory, or null if not found
      */
     public Directory getChild(File dir) {
-        for (Iterator i = childDirectories.iterator(); i.hasNext();) {
-            Directory current = (Directory) i.next();
+        for (Directory current : childDirectories) {
             if (current.getDirectory().equals(dir)) {
                 return current;
             }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,7 +20,7 @@
 
 import java.io.File;
 import java.io.IOException;
-
+import java.util.List;
 import org.apache.tools.ant.util.FileUtils;
 
 import com.jcraft.jsch.ChannelSftp;
@@ -103,6 +103,7 @@
      * @throws IOException on i/o errors
      * @throws JSchException on errors detected by scp
      */
+    @Override
     public void execute() throws IOException, JSchException {
         final ChannelSftp channel = openSftpChannel();
         try {
@@ -117,9 +118,9 @@
             }
             getDir(channel, remoteFile, localFile);
         } catch (final SftpException e) {
-            final JSchException schException = new JSchException("Could not get '"+ remoteFile
-                    +"' to '"+localFile+"' - "
-                    +e.toString());
+            final JSchException schException =
+                new JSchException("Could not get '" + remoteFile + "' to '"
+                    + localFile + "' - " + e.toString());
             schException.initCause(e);
             throw schException;
         } finally {
@@ -143,13 +144,12 @@
         if (!localFile.exists()) {
             localFile.mkdirs();
         }
-        final java.util.Vector files = channel.ls(remoteFile);
-        final int size = files.size();
-        for (int i = 0; i < size; i++) {
-            final ChannelSftp.LsEntry le = (ChannelSftp.LsEntry) files.elementAt(i);
+        @SuppressWarnings("unchecked")
+        final List<ChannelSftp.LsEntry> files = channel.ls(remoteFile);
+        for (ChannelSftp.LsEntry le : files) {
             final String name = le.getFilename();
             if (le.getAttrs().isDir()) {
-                if (name.equals(".") || name.equals("..")) {
+                if (".".equals(name) || "..".equals(name)) {
                     continue;
                 }
                 getDir(channel,
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,10 +21,10 @@
 import java.io.ByteArrayOutputStream;
 import java.io.EOFException;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Files;
 
 import org.apache.tools.ant.util.FileUtils;
 
@@ -149,6 +149,7 @@
      * @throws IOException on i/o errors
      * @throws JSchException on errors detected by scp
      */
+    @Override
     public void execute() throws IOException, JSchException {
         String command = "scp -f ";
         if (isRecursive) {
@@ -220,9 +221,9 @@
 
     private File parseAndCreateDirectory(final String serverResponse,
                                          final File localFile) {
-        int start = serverResponse.indexOf(" ");
+        int start = serverResponse.indexOf(' ');
         // appears that the next token is not used and it's zero.
-        start = serverResponse.indexOf(" ", start + 1);
+        start = serverResponse.indexOf(' ', start + 1);
         final String directoryName = serverResponse.substring(start + 1);
         if (localFile.isDirectory()) {
             final File dir = new File(localFile, directoryName);
@@ -239,13 +240,13 @@
                                    final InputStream in)
         throws IOException, JSchException  {
         int start = 0;
-        int end = serverResponse.indexOf(" ", start + 1);
+        int end = serverResponse.indexOf(' ', start + 1);
         start = end + 1;
-        end = serverResponse.indexOf(" ", start + 1);
+        end = serverResponse.indexOf(' ', start + 1);
         final long filesize = Long.parseLong(serverResponse.substring(start, end));
         final String filename = serverResponse.substring(end + 1);
         log("Receiving: " + filename + " : " + filesize);
-        final File transferFile = (localFile.isDirectory())
+        final File transferFile = localFile.isDirectory()
                 ? new File(localFile, filename)
                 : localFile;
         fetchFile(transferFile, filesize, out, in);
@@ -262,7 +263,7 @@
         sendAck(out);
 
         // read a content of lfile
-        final FileOutputStream fos = new FileOutputStream(localFile);
+        final OutputStream fos = Files.newOutputStream(localFile.toPath());
         int length;
         long totalLength = 0;
         final long startTime = System.currentTimeMillis();
@@ -277,7 +278,7 @@
         try {
             while (true) {
                 length = in.read(buf, 0,
-                                 (BUFFER_SIZE < filesize) ? BUFFER_SIZE
+                                 BUFFER_SIZE < filesize ? BUFFER_SIZE
                                                           : (int) filesize);
                 if (length < 0) {
                     throw new EOFException("Unexpected end of stream.");
@@ -327,10 +328,10 @@
      * returns the directory part of the remote file, if any.
      */
     private static String remoteDir(final String remoteFile) {
-        int index = remoteFile.lastIndexOf("/");
+        int index = remoteFile.lastIndexOf('/');
         if (index < 0) {
-            index = remoteFile.lastIndexOf("\\");
+            index = remoteFile.lastIndexOf('\\');
         }
-        return index > -1 ? remoteFile.substring(0, index + 1) : "";
+        return index < 0 ? "" : remoteFile.substring(0, index + 1);
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,9 +21,10 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
@@ -165,11 +166,9 @@
 
     private static void validateRemoteUri(final String type, final String aToUri) {
         if (!isRemoteUri(aToUri)) {
-            throw new BuildException(type + " '" + aToUri + "' is invalid. "
-                                     + "The 'remoteToDir' attribute must "
-                                     + "have syntax like the "
-                                     + "following: user:password@host:/path"
-                                     + " - the :password part is optional");
+            throw new BuildException(
+                "%s '%s' is invalid. The 'remoteToDir' attribute must have syntax like the following: user:password@host:/path - the :password part is optional",
+                type, aToUri);
         }
     }
 
@@ -240,7 +239,7 @@
      */
     public void add(ResourceCollection res) {
         if (rcs == null) {
-            rcs = new LinkedList<ResourceCollection>();
+            rcs = new LinkedList<>();
         }
         rcs.add(res);
     }
@@ -282,24 +281,21 @@
                 throw new BuildException(
                     "Copying from a remote server to a remote server is not supported.");
             } else {
-                throw new BuildException("'todir' and 'file' attributes "
-                    + "must have syntax like the following: "
-                    + "user:password@host:/path");
+                throw new BuildException(
+                    "'todir' and 'file' attributes must have syntax like the following: user:password@host:/path");
             }
         } catch (final Exception e) {
             if (getFailonerror()) {
-                if(e instanceof BuildException) {
+                if (e instanceof BuildException) {
                     final BuildException be = (BuildException) e;
-                    if(be.getLocation() == null) {
+                    if (be.getLocation() == null) {
                         be.setLocation(getLocation());
                     }
                     throw be;
-                } else {
-                    throw new BuildException(e);
                 }
-            } else {
-                log("Caught exception: " + e.getMessage(), Project.MSG_ERR);
+                throw new BuildException(e);
             }
+            log("Caught exception: " + e.getMessage(), Project.MSG_ERR);
         }
     }
 
@@ -341,9 +337,8 @@
 
         Session session = null;
         try {
-            final List<Directory> list = new ArrayList<Directory>(rcs.size());
-            for (final Iterator<ResourceCollection> i = rcs.iterator(); i.hasNext();) {
-                final ResourceCollection rc = (ResourceCollection) i.next();
+            final List<Directory> list = new ArrayList<>(rcs.size());
+            for (ResourceCollection rc : rcs) {
                 if (rc instanceof FileSet && rc.isFilesystemOnly()) {
                     FileSet fs = (FileSet) rc;
                     final Directory d = createDirectory(fs);
@@ -351,15 +346,15 @@
                         list.add(d);
                     }
                 } else {
-                       List<Directory> ds = createDirectoryCollection(rc);
-                       if (ds !=null) {
-                               list.addAll(ds);
-                       }
+                    List<Directory> ds = createDirectoryCollection(rc);
+                    if (ds != null) {
+                        list.addAll(ds);
+                    }
                 }
             }
             if (!list.isEmpty()) {
                 session = openSession();
-                ScpToMessage message = null;
+                ScpToMessage message;
                 if (!isSftp) {
                     message = new ScpToMessage(getVerbose(), compressed, session,
                                                list, file, preserveLastModified);
@@ -443,19 +438,19 @@
 
         if (getUserInfo().getPassword() == null
             && getUserInfo().getKeyfile() == null) {
-            throw new BuildException("neither password nor keyfile for user "
-                                     + getUserInfo().getName() + " has been "
-                                     + "given.  Can't authenticate.");
+            throw new BuildException(
+                "neither password nor keyfile for user %s has been given.  Can't authenticate.",
+                getUserInfo().getName());
         }
 
         final int indexOfPath = uri.indexOf(':', indexOfAt + 1);
         if (indexOfPath == -1) {
-            throw new BuildException("no remote path in " + uri);
+            throw new BuildException("no remote path in %s", uri);
         }
 
         setHost(uri.substring(indexOfAt + 1, indexOfPath));
         String remotePath = uri.substring(indexOfPath + 1);
-        if (remotePath.equals("")) {
+        if (remotePath.isEmpty()) {
             remotePath = ".";
         }
         return remotePath;
@@ -472,28 +467,26 @@
 
     private Directory createDirectory(final FileSet set) {
         final DirectoryScanner scanner = set.getDirectoryScanner(getProject());
-        Directory root = new Directory(scanner.getBasedir());
         final String[] files = scanner.getIncludedFiles();
-        if (files.length != 0) {
-            for (int j = 0; j < files.length; j++) {
-                final String[] path = Directory.getPath(files[j]);
-                Directory current = root;
-                File currentParent = scanner.getBasedir();
-                for (int i = 0; i < path.length; i++) {
-                    final File file = new File(currentParent, path[i]);
-                    if (file.isDirectory()) {
-                        current.addDirectory(new Directory(file));
-                        current = current.getChild(file);
-                        currentParent = current.getDirectory();
-                    } else if (file.isFile()) {
-                        current.addFile(file);
-                    }
-                }
-            }
-        } else {
+        if (files.length == 0) {
             // skip
-            root = null;
+            return null;
         }
+        Directory root = new Directory(scanner.getBasedir());
+        Stream.of(files).map(Directory::getPath).forEach(path -> {
+            Directory current = root;
+            File currentParent = scanner.getBasedir();
+            for (String element : path) {
+                final File file = new File(currentParent, element);
+                if (file.isDirectory()) {
+                    current.addDirectory(new Directory(file));
+                    current = current.getChild(file);
+                    currentParent = current.getDirectory();
+                } else if (file.isFile()) {
+                    current.addFile(file);
+                }
+            }
+        });
         return root;
     }
 
@@ -503,21 +496,24 @@
             throw new BuildException("Only FileSystem resources are supported.");
         }
 
-        List<Directory> ds = new ArrayList<Directory>();
+        List<Directory> ds = new ArrayList<>();
         for (Resource r : rc) {
                if (!r.isExists()) {
-                throw new BuildException("Could not find resource " + r.toLongString() + " to scp.");
+                throw new BuildException("Could not find resource %s to scp.",
+                    r.toLongString());
             }
 
             FileProvider fp = r.as(FileProvider.class);
             if (fp == null) {
-                throw new BuildException("Resource " + r.toLongString() + " is not a file.");
+                throw new BuildException("Resource %s is not a file.",
+                    r.toLongString());
             }
 
             FileResource fr = ResourceUtils.asFileResource(fp);
             File baseDir = fr.getBaseDir();
             if (baseDir == null) {
-                throw new BuildException("basedir for resource " + r.toLongString() + " is undefined.");
+                throw new BuildException(
+                    "basedir for resource %s is undefined.", r.toLongString());
             }
 
             // if the basedir is set, the name will be relative to that
@@ -525,9 +521,8 @@
             Directory root = new Directory(baseDir);
             Directory current = root;
             File currentParent = baseDir;
-            final String[] path = Directory.getPath(name);
-            for (int i = 0; i < path.length; i++) {
-                final File file = new File(currentParent, path[i]);
+            for (String element : Directory.getPath(name)) {
+                final File file = new File(currentParent, element);
                 if (file.isDirectory()) {
                     current.addDirectory(new Directory(file));
                     current = current.getChild(file);
@@ -537,7 +532,7 @@
                 }
             }
             ds.add(root);
-       }
+        }
         return ds;
     }
 
@@ -560,15 +555,8 @@
     }
 
     private BuildException exactlyOne(final String[] attrs, final String alt) {
-        final StringBuffer buf = new StringBuffer("Exactly one of ").append(
-                '[').append(attrs[0]);
-        for (int i = 1; i < attrs.length; i++) {
-            buf.append('|').append(attrs[i]);
-        }
-        buf.append(']');
-        if (alt != null) {
-            buf.append(" or ").append(alt);
-        }
-        return new BuildException(buf.append(" is required.").toString());
+        return new BuildException("Exactly one of [%s]%s is required",
+            Stream.of(attrs).collect(Collectors.joining("|")),
+            alt == null ? "" : " or " + alt);
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java	2018-03-24 12:37:12.000000000 +0000
@@ -38,7 +38,7 @@
 
     private File localFile;
     private final String remotePath;
-    private List directoryList;
+    private List<Directory> directoryList;
     private final boolean preserveLastModified;
 
     /**
@@ -88,7 +88,7 @@
      */
     public ScpToMessageBySftp(final boolean verbose,
                               final Session session,
-                              final List aDirectoryList,
+                              final List<Directory> aDirectoryList,
                               final String aRemotePath) {
         this(verbose, session, aDirectoryList, aRemotePath, false);
     }
@@ -105,7 +105,7 @@
      */
     public ScpToMessageBySftp(final boolean verbose,
                               final Session session,
-                              final List aDirectoryList,
+                              final List<Directory> aDirectoryList,
                               final String aRemotePath,
                               final boolean preserveLastModified) {
         this(verbose, session, aRemotePath, preserveLastModified);
@@ -150,7 +150,7 @@
      * @param aRemotePath the remote path
      */
     public ScpToMessageBySftp(final Session session,
-                              final List aDirectoryList,
+                              final List<Directory> aDirectoryList,
                               final String aRemotePath) {
         this(false, session, aDirectoryList, aRemotePath);
     }
@@ -212,21 +212,19 @@
                 throw new JSchException("Could not CD to '" + remotePath
                                         + "' - " + e.toString(), e);
             }
-            Directory current = null;
-            try {
-                for (final Iterator i = directoryList.iterator(); i.hasNext();) {
-                    current = (Directory) i.next();
+            for (Directory current : directoryList) {
+                try {
                     if (getVerbose()) {
                         log("Sending directory " + current);
                     }
                     sendDirectory(channel, current);
+                } catch (final SftpException e) {
+                    String msg = "Error sending directory";
+                    if (current != null && current.getDirectory() != null) {
+                        msg += " '" + current.getDirectory().getName() + "'";
+                    }
+                    throw new JSchException(msg, e);
                 }
-            } catch (final SftpException e) {
-                String msg = "Error sending directory";
-                if (current != null && current.getDirectory() != null) {
-                    msg += " '" + current.getDirectory().getName() + "'";
-                }
-                throw new JSchException(msg, e);
             }
         } finally {
             if (channel != null) {
@@ -238,12 +236,11 @@
     private void sendDirectory(final ChannelSftp channel,
                                final Directory current)
         throws IOException, SftpException {
-        for (final Iterator fileIt = current.filesIterator(); fileIt.hasNext();) {
-            sendFileToRemote(channel, (File) fileIt.next(), null);
+        for (final Iterator<File> fileIt = current.filesIterator(); fileIt.hasNext();) {
+            sendFileToRemote(channel, fileIt.next(), null);
         }
-        for (final Iterator dirIt = current.directoryIterator(); dirIt.hasNext();) {
-            final Directory dir = (Directory) dirIt.next();
-            sendDirectoryToRemote(channel, dir);
+        for (final Iterator<Directory> dirIt = current.directoryIterator(); dirIt.hasNext();) {
+            sendDirectoryToRemote(channel, dirIt.next());
         }
     }
 
@@ -329,6 +326,7 @@
      * Get the local file.
      * @return the local file.
      */
+    @Override
     public File getLocalFile() {
         return localFile;
     }
@@ -337,6 +335,7 @@
      * Get the remote path.
      * @return the remote path.
      */
+    @Override
     public String getRemotePath() {
         return remotePath;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,10 +19,10 @@
 package org.apache.tools.ant.taskdefs.optional.ssh;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.Iterator;
 import java.util.List;
 
@@ -42,7 +42,7 @@
 
     private File localFile;
     private String remotePath;
-    private List directoryList;
+    private List<Directory> directoryList;
     private Integer fileMode, dirMode;
     private boolean preserveLastModified;
 
@@ -124,7 +124,7 @@
      */
     public ScpToMessage(final boolean verbose,
                         final Session session,
-                        final List aDirectoryList,
+                        final List<Directory> aDirectoryList,
                         final String aRemotePath,
                         final boolean preserveLastModified) {
         this(verbose, false, session, aDirectoryList, aRemotePath, preserveLastModified);
@@ -143,7 +143,7 @@
     public ScpToMessage(final boolean verbose,
                         final boolean compressed,
                         final Session session,
-                        final List aDirectoryList,
+                        final List<Directory> aDirectoryList,
                         final String aRemotePath,
                         final boolean preserveLastModified) {
         this(verbose, compressed, session, aRemotePath);
@@ -176,7 +176,7 @@
      */
     public ScpToMessage(final boolean verbose,
                         final Session session,
-                        final List aDirectoryList,
+                        final List<Directory> aDirectoryList,
                         final String aRemotePath) {
         this(verbose, session, aDirectoryList, aRemotePath, false);
     }
@@ -184,19 +184,6 @@
     /**
      * Constructor for ScpToMessage.
      * @param verbose if true do verbose logging
-     * @param session the scp session to use
-     * @param aRemotePath the remote path
-     * @since Ant 1.6.2
-     */
-    private ScpToMessage(final boolean verbose,
-                         final Session session,
-                         final String aRemotePath) {
-        this(verbose, false, session, aRemotePath);
-    }
-
-    /**
-     * Constructor for ScpToMessage.
-     * @param verbose if true do verbose logging
      * @param compressed if true use compression
      * @param session the scp session to use
      * @param aRemotePath the remote path
@@ -229,7 +216,7 @@
      * @param aRemotePath the remote path
      */
     public ScpToMessage(final Session session,
-                         final List aDirectoryList,
+                         final List<Directory> aDirectoryList,
                          final String aRemotePath) {
         this(false, session, aDirectoryList, aRemotePath);
     }
@@ -262,7 +249,6 @@
         final String cmd = sb.toString();
         final Channel channel = openExecChannel(cmd);
         try {
-
             final OutputStream out = channel.getOutputStream();
             final InputStream in = channel.getInputStream();
 
@@ -294,8 +280,7 @@
             channel.connect();
 
             waitForAck(in);
-            for (final Iterator i = directoryList.iterator(); i.hasNext();) {
-                final Directory current = (Directory) i.next();
+            for (Directory current : directoryList) {
                 sendDirectory(current, in, out);
             }
         } finally {
@@ -308,12 +293,11 @@
     private void sendDirectory(final Directory current,
                                final InputStream in,
                                final OutputStream out) throws IOException {
-        for (final Iterator fileIt = current.filesIterator(); fileIt.hasNext();) {
-            sendFileToRemote((File) fileIt.next(), in, out);
+        for (final Iterator<File> fileIt = current.filesIterator(); fileIt.hasNext();) {
+            sendFileToRemote(fileIt.next(), in, out);
         }
-        for (final Iterator dirIt = current.directoryIterator(); dirIt.hasNext();) {
-            final Directory dir = (Directory) dirIt.next();
-            sendDirectoryToRemote(dir, in, out);
+        for (final Iterator<Directory> dirIt = current.directoryIterator(); dirIt.hasNext();) {
+            sendDirectoryToRemote(dirIt.next(), in, out);
         }
     }
 
@@ -363,7 +347,7 @@
         waitForAck(in);
 
         // send a content of lfile
-        final FileInputStream fis = new FileInputStream(localFile);
+        final InputStream fis = Files.newInputStream(localFile.toPath());
         final byte[] buf = new byte[BUFFER_SIZE];
         final long startTime = System.currentTimeMillis();
         long totalLength = 0;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java	2018-03-24 12:37:12.000000000 +0000
@@ -228,6 +228,7 @@
      * This initializes the known hosts and sets the default port.
      * @throws BuildException on error
      */
+    @Override
     public void init() throws BuildException {
         super.init();
         this.knownHosts = System.getProperty("user.home") + "/.ssh/known_hosts";
@@ -243,14 +244,17 @@
         final JSch jsch = new JSch();
         final SSHBase base = this;
         if (verbose) {
-            JSch.setLogger(new com.jcraft.jsch.Logger(){
-                    public boolean isEnabled(final int level){
-                        return true;
-                    }
-                    public void log(final int level, final String message){
-                        base.log(message, Project.MSG_INFO);
-                    }
-                });
+            JSch.setLogger(new com.jcraft.jsch.Logger() {
+                @Override
+                public boolean isEnabled(final int level) {
+                    return true;
+                }
+
+                @Override
+                public void log(final int level, final String message) {
+                    base.log(message, Project.MSG_INFO);
+                }
+            });
         }
         if (null != userInfo.getKeyfile()) {
             jsch.addIdentity(userInfo.getKeyfile());
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java	2018-03-24 12:37:12.000000000 +0000
@@ -22,13 +22,13 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.StringReader;
+import java.nio.file.Files;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -298,18 +298,16 @@
             + (inputProperty != null ? 1 : 0)
             + (inputString != null ? 1 : 0);
         if (numberOfInputs > 1) {
-            throw new BuildException("You can't specify more than one of"
-                                     + " inputFile, inputProperty and"
-                                     + " inputString.");
+            throw new BuildException(
+                "You can't specify more than one of inputFile, inputProperty and inputString.");
         }
         if (inputFile != null && !inputFile.exists()) {
-            throw new BuildException("The input file "
-                                     + inputFile.getAbsolutePath()
-                                     + " does not exist.");
+            throw new BuildException("The input file %s does not exist.",
+                inputFile.getAbsolutePath());
         }
 
         Session session = null;
-        final StringBuffer output = new StringBuffer();
+        final StringBuilder output = new StringBuilder();
         try {
             session = openSession();
             /* called once */
@@ -317,32 +315,27 @@
                 log("cmd : " + command, Project.MSG_INFO);
                 executeCommand(session, command, output);
             } else { // read command resource and execute for each command
-                try {
-                    final BufferedReader br = new BufferedReader(
-                            new InputStreamReader(commandResource.getInputStream()));
-                    String cmd;
-                    while ((cmd = br.readLine()) != null) {
+                try (final BufferedReader br = new BufferedReader(
+                    new InputStreamReader(commandResource.getInputStream()))) {
+                    final Session s = session;
+                    br.lines().forEach(cmd -> {
                         log("cmd : " + cmd, Project.MSG_INFO);
                         output.append(cmd).append(" : ");
-                        executeCommand(session, cmd, output);
+                        executeCommand(s, cmd, output);
                         output.append("\n");
-                    }
-                    FileUtils.close(br);
+                    });
                 } catch (final IOException e) {
                     if (getFailonerror()) {
                         throw new BuildException(e);
-                    } else {
-                        log("Caught exception: " + e.getMessage(),
-                            Project.MSG_ERR);
                     }
+                    log("Caught exception: " + e.getMessage(), Project.MSG_ERR);
                 }
             }
         } catch (final JSchException e) {
             if (getFailonerror()) {
                 throw new BuildException(e);
-            } else {
-                log("Caught exception: " + e.getMessage(), Project.MSG_ERR);
             }
+            log("Caught exception: " + e.getMessage(), Project.MSG_ERR);
         } finally {
             if (outputProperty != null) {
                 getProject().setNewProperty(outputProperty, output.toString());
@@ -353,7 +346,7 @@
         }
     }
 
-    private void executeCommand(final Session session, final String cmd, final StringBuffer sb)
+    private void executeCommand(final Session session, final String cmd, final StringBuilder sb)
         throws BuildException {
         final ByteArrayOutputStream out = new ByteArrayOutputStream();
         final ByteArrayOutputStream errout = new ByteArrayOutputStream();
@@ -363,7 +356,7 @@
         InputStream istream = null;
         if (inputFile != null) {
             try {
-                istream = new FileInputStream(inputFile);
+                istream = Files.newInputStream(inputFile.toPath());
             } catch (final IOException e) {
                 // because we checked the existence before, this one
                 // shouldn't happen What if the file exists, but there
@@ -426,9 +419,8 @@
                 thread = null;
                 if (getFailonerror()) {
                     throw new BuildException(TIMEOUT_MESSAGE);
-                } else {
-                    log(TIMEOUT_MESSAGE, Project.MSG_ERR);
                 }
+                log(TIMEOUT_MESSAGE, Project.MSG_ERR);
             } else {
                 // stdout to outputFile
                 if (outputFile != null) {
@@ -453,9 +445,8 @@
                     final String msg = "Remote command failed with exit status " + ec;
                     if (getFailonerror()) {
                         throw new BuildException(msg);
-                    } else {
-                        log(msg, Project.MSG_ERR);
                     }
+                    log(msg, Project.MSG_ERR);
                 }
             }
         } catch (final BuildException e) {
@@ -464,23 +455,19 @@
             if (e.getMessage().indexOf("session is down") >= 0) {
                 if (getFailonerror()) {
                     throw new BuildException(TIMEOUT_MESSAGE, e);
-                } else {
-                    log(TIMEOUT_MESSAGE, Project.MSG_ERR);
                 }
+                log(TIMEOUT_MESSAGE, Project.MSG_ERR);
             } else {
                 if (getFailonerror()) {
                     throw new BuildException(e);
-                } else {
-                    log("Caught exception: " + e.getMessage(),
-                        Project.MSG_ERR);
                 }
+                log("Caught exception: " + e.getMessage(), Project.MSG_ERR);
             }
         } catch (final Exception e) {
             if (getFailonerror()) {
                 throw new BuildException(e);
-            } else {
-                log("Caught exception: " + e.getMessage(), Project.MSG_ERR);
             }
+            log("Caught exception: " + e.getMessage(), Project.MSG_ERR);
         } finally {
             sb.append(out.toString());
             FileUtils.close(istream);
@@ -497,24 +484,17 @@
      */
     private void writeToFile(final String from, final boolean append, final File to)
         throws IOException {
-        FileWriter out = null;
-        try {
-            out = new FileWriter(to.getAbsolutePath(), append);
+        try (FileWriter out = new FileWriter(to.getAbsolutePath(), append)) {
             final StringReader in = new StringReader(from);
             final char[] buffer = new char[BUFFER_SIZE];
-            int bytesRead;
             while (true) {
-                bytesRead = in.read(buffer);
+                int bytesRead = in.read(buffer);
                 if (bytesRead == -1) {
                     break;
                 }
                 out.write(buffer, 0, bytesRead);
             }
             out.flush();
-        } finally {
-            if (out != null) {
-                out.close();
-            }
         }
     }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHSession.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,6 @@
 package org.apache.tools.ant.taskdefs.optional.ssh;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
@@ -29,7 +28,6 @@
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.TaskContainer;
-
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
 
@@ -45,10 +43,10 @@
     /** units are milliseconds, default is 0=infinite */
     private long maxwait = 0;
 
-    private final Vector localTunnels = new Vector();
-    private final Set localPortsUsed = new TreeSet();
-    private final Vector remoteTunnels = new Vector();
-    private final Set remotePortsUsed = new TreeSet();
+    private final List<LocalTunnel> localTunnels = new Vector<>();
+    private final Set<Integer> localPortsUsed = new TreeSet<>();
+    private final List<RemoteTunnel> remoteTunnels = new Vector<>();
+    private final Set<Integer> remotePortsUsed = new TreeSet<>();
     private NestedSequential nestedSequential = null;
 
     private static final String TIMEOUT_MESSAGE =
@@ -56,7 +54,7 @@
 
 
     /** Optional Vector holding the nested tasks */
-    private final Vector nestedTasks = new Vector();
+    private final List<Task> nestedTasks = new Vector<>();
 
     /**
      * Add a nested task to Sequential.
@@ -64,7 +62,7 @@
      * @param nestedTask Nested task to execute sequentially
      */
     public void addTask(final Task nestedTask) {
-        nestedTasks.addElement(nestedTask);
+        nestedTasks.add(nestedTask);
     }
 
     /**
@@ -147,48 +145,38 @@
             throw new BuildException("Missing sequential element.");
         }
 
-
         Session session = null;
         try {
             // establish the session
             session = openSession();
             session.setTimeout((int) maxwait);
 
-            for (final Iterator i = localTunnels.iterator(); i.hasNext();) {
-                final LocalTunnel tunnel = (LocalTunnel) i.next();
+            for (LocalTunnel tunnel : localTunnels) {
                 session.setPortForwardingL(tunnel.getLPort(),
                                            tunnel.getRHost(),
                                            tunnel.getRPort());
             }
 
-            for (final Iterator i = remoteTunnels.iterator(); i.hasNext();) {
-                final RemoteTunnel tunnel = (RemoteTunnel) i.next();
+            for (RemoteTunnel tunnel : remoteTunnels) {
                 session.setPortForwardingR(tunnel.getRPort(),
                                            tunnel.getLHost(),
                                            tunnel.getLPort());
             }
 
-            for (final Iterator i = nestedSequential.getNested().iterator();
-                 i.hasNext();) {
-                final Task nestedTask = (Task) i.next();
-                nestedTask.perform();
-            }
+            nestedSequential.getNested().forEach(Task::perform);
             // completed successfully
 
         } catch (final JSchException e) {
             if (e.getMessage().indexOf("session is down") >= 0) {
                 if (getFailonerror()) {
                     throw new BuildException(TIMEOUT_MESSAGE, e);
-                } else {
-                    log(TIMEOUT_MESSAGE, Project.MSG_ERR);
                 }
+                log(TIMEOUT_MESSAGE, Project.MSG_ERR);
             } else {
                 if (getFailonerror()) {
                     throw new BuildException(e);
-                } else {
-                    log("Caught exception: " + e.getMessage(),
-                        Project.MSG_ERR);
                 }
+                log("Caught exception: " + e.getMessage(), Project.MSG_ERR);
             }
         } catch (final BuildException e) {
             // avoid wrapping it into yet another BuildException further down
@@ -196,9 +184,8 @@
         } catch (final Exception e) {
             if (getFailonerror()) {
                 throw new BuildException(e);
-            } else {
-                log("Caught exception: " + e.getMessage(), Project.MSG_ERR);
             }
+            log("Caught exception: " + e.getMessage(), Project.MSG_ERR);
         } finally {
             if (session != null && session.isConnected()) {
                 session.disconnect();
@@ -219,34 +206,44 @@
     }
 
     public class LocalTunnel {
-        public LocalTunnel() {}
 
         int lport = 0;
         String rhost = null;
         int rport = 0;
+
         public void setLPort(final int lport) {
-            final Integer portKey = new Integer(lport);
+            final Integer portKey = Integer.valueOf(lport);
             if (localPortsUsed.contains(portKey)) {
-                throw new BuildException("Multiple local tunnels defined to"
-                                         + " use same local port " + lport);
+                throw new BuildException(
+                    "Multiple local tunnels defined to use same local port %d",
+                    lport);
             }
             localPortsUsed.add(portKey);
             this.lport = lport;
         }
-        public void setRHost(final String rhost) { this.rhost = rhost; }
-        public void setRPort(final int rport) { this.rport = rport; }
+
+        public void setRHost(final String rhost) {
+            this.rhost = rhost;
+        }
+
+        public void setRPort(final int rport) {
+            this.rport = rport;
+        }
+
         public int getLPort() {
             if (lport == 0) {
                 throw new BuildException("lport is required for LocalTunnel.");
             }
             return lport;
         }
+
         public String getRHost() {
             if (rhost == null) {
                 throw new BuildException("rhost is required for LocalTunnel.");
             }
             return rhost;
         }
+
         public int getRPort() {
             if (rport == 0) {
                 throw new BuildException("rport is required for LocalTunnel.");
@@ -256,34 +253,44 @@
     }
 
     public class RemoteTunnel {
-        public RemoteTunnel() {}
 
         int lport = 0;
         String lhost = null;
         int rport = 0;
-        public void setLPort(final int lport) { this.lport = lport; }
-        public void setLHost(final String lhost) { this.lhost = lhost; }
+
+        public void setLPort(final int lport) {
+            this.lport = lport;
+        }
+
+        public void setLHost(final String lhost) {
+            this.lhost = lhost;
+        }
+
         public void setRPort(final int rport) {
-            final Integer portKey = new Integer(rport);
+            final Integer portKey = Integer.valueOf(rport);
             if (remotePortsUsed.contains(portKey)) {
-                throw new BuildException("Multiple remote tunnels defined to"
-                                         + " use same remote port " + rport);
+                throw new BuildException(
+                    "Multiple remote tunnels defined to use same remote port %d",
+                    rport);
             }
             remotePortsUsed.add(portKey);
             this.rport = rport;
         }
+
         public int getLPort() {
             if (lport == 0) {
                 throw new BuildException("lport is required for RemoteTunnel.");
             }
             return lport;
         }
+
         public String getLHost() {
             if (lhost == null) {
                 throw new BuildException("lhost is required for RemoteTunnel.");
             }
             return lhost;
         }
+
         public int getRPort() {
             if (rport == 0) {
                 throw new BuildException("rport is required for RemoteTunnel.");
@@ -310,13 +317,14 @@
      * This is a simple task container.
      */
     public static class NestedSequential implements TaskContainer {
-        private final List<Task> nested = new ArrayList<Task>();
+        private final List<Task> nested = new ArrayList<>();
 
         /**
          * Add a task or type to the container.
          *
          * @param task an unknown element.
          */
+        @Override
         public void addTask(final Task task) {
             nested.add(task);
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java	2018-03-24 12:37:12.000000000 +0000
@@ -35,8 +35,7 @@
 
     /** Constructor for SSHUserInfo. */
     public SSHUserInfo() {
-        super();
-        this.trustAllCertificates = false;
+        this(null, false);
     }
 
     /**
@@ -71,6 +70,7 @@
      * Gets the user's password.
      * @return the user's password
      */
+    @Override
     public String getPassword() {
         return password;
     }
@@ -135,6 +135,7 @@
      * Returns the passphrase.
      * @return String
      */
+    @Override
     public String getPassphrase() {
         return passphrase;
     }
@@ -160,6 +161,7 @@
      * @param message ignored
      * @return true always
      */
+    @Override
     public boolean promptPassphrase(String message) {
         return true;
     }
@@ -169,6 +171,7 @@
      * @param passwordPrompt ignored
      * @return true the first time this is called, false otherwise
      */
+    @Override
     public boolean promptPassword(String passwordPrompt) {
         return true;
     }
@@ -178,6 +181,7 @@
      * @param message ignored
      * @return the value of trustAllCertificates
      */
+    @Override
     public boolean promptYesNo(String message) {
         return trustAllCertificates;
     }
@@ -187,6 +191,7 @@
      * Implement the UserInfo interface (noop).
      * @param message ignored
      */
+    @Override
     public void showMessage(String message) {
         //log(message, Project.MSG_DEBUG);
     }
@@ -201,6 +206,7 @@
      * @return the password in an size one array if there is a password
      *         and if the prompt and echo checks pass.
      */
+    @Override
     public String[] promptKeyboardInteractive(String destination,
                                               String name,
                                               String instruction,
@@ -209,9 +215,7 @@
         if (prompt.length != 1 || echo[0] || this.password == null) {
             return null;
         }
-        String[] response = new String[1];
-        response[0] = this.password;
-        return response;
+        return new String[] { this.password };
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/testing/BlockFor.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/testing/BlockFor.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/testing/BlockFor.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/testing/BlockFor.java	2018-03-24 12:37:12.000000000 +0000
@@ -54,6 +54,7 @@
      * @throws BuildTimeoutException on timeout, using the text in {@link #text}
      *
      */
+    @Override
     protected void processTimeout() throws BuildTimeoutException {
         super.processTimeout();
         throw new BuildTimeoutException(text, getLocation());
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/testing/Funtest.java	2018-03-24 12:37:12.000000000 +0000
@@ -58,6 +58,19 @@
  */
 
 public class Funtest extends Task {
+    /** {@value} */
+    public static final String WARN_OVERRIDING = "Overriding previous definition of ";
+    /** {@value} */
+    public static final String APPLICATION_FORCIBLY_SHUT_DOWN = "Application forcibly shut down";
+    /** {@value} */
+    public static final String SHUTDOWN_INTERRUPTED = "Shutdown interrupted";
+    /** {@value} */
+    public static final String SKIPPING_TESTS
+        = "Condition failed -skipping tests";
+    /** Application exception : {@value} */
+    public static final String APPLICATION_EXCEPTION = "Application Exception";
+    /** Teardown exception : {@value} */
+    public static final String TEARDOWN_EXCEPTION = "Teardown Exception";
 
     /**
      * A condition that must be true before the tests are run. This makes it
@@ -158,20 +171,6 @@
      */
     private BuildException taskException;
 
-    /** {@value} */
-    public static final String WARN_OVERRIDING = "Overriding previous definition of ";
-    /** {@value} */
-    public static final String APPLICATION_FORCIBLY_SHUT_DOWN = "Application forcibly shut down";
-    /** {@value} */
-    public static final String SHUTDOWN_INTERRUPTED = "Shutdown interrupted";
-    /** {@value} */
-    public static final String SKIPPING_TESTS
-        = "Condition failed -skipping tests";
-    /** Application exception : {@value} */
-    public static final String APPLICATION_EXCEPTION = "Application Exception";
-    /** Teardown exception : {@value} */
-    public static final String TEARDOWN_EXCEPTION = "Teardown Exception";
-
     /**
      * Log if the definition is overriding something
      *
@@ -378,8 +377,9 @@
      * @param role role of the task
      */
     private void validateTask(Task task, String role) {
-        if (task!=null && task.getProject() == null) {
-            throw new BuildException(role + " task is not bound to the project" + task);
+        if (task != null && task.getProject() == null) {
+            throw new BuildException("%s task is not bound to the project %s",
+                role, task);
         }
     }
 
@@ -392,6 +392,7 @@
      * test failing that is more important.
      * @throws BuildException if something was caught during the run or teardown.
      */
+    @Override
     public void execute() throws BuildException {
 
         //validation
@@ -561,12 +562,13 @@
     }
 
     private static class NestedCondition extends ConditionBase implements Condition {
+        @Override
         public boolean eval() {
             if (countConditions() != 1) {
                 throw new BuildException(
                     "A single nested condition is required.");
             }
-            return ((Condition) (getConditions().nextElement())).eval();
+            return getConditions().nextElement().eval();
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,13 +21,12 @@
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Field;
 import java.net.URL;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -191,8 +190,8 @@
         InputStream fis = null;
         OutputStream fos = null;
         try {
-            fis = new BufferedInputStream(new FileInputStream(infile));
-            fos = new BufferedOutputStream(new FileOutputStream(outfile));
+            fis = new BufferedInputStream(Files.newInputStream(infile.toPath()));
+            fos = new BufferedOutputStream(Files.newOutputStream(outfile.toPath()));
             final StreamResult res = new StreamResult(fos);
             // not sure what could be the need of this...
             res.setSystemId(JAXPUtils.getSystemId(outfile));
@@ -301,17 +300,11 @@
         // and avoid keeping the handle until the object is garbaged.
         // (always keep control), otherwise you won't be able to delete
         // the file quickly on windows.
-        InputStream xslStream = null;
-        try {
-            xslStream
-                = new BufferedInputStream(stylesheet.getInputStream());
+        try (InputStream xslStream =
+             new BufferedInputStream(stylesheet.getInputStream())) {
             templatesModTime = stylesheet.getLastModified();
             final Source src = getSource(xslStream, stylesheet);
             templates = getFactory().newTemplates(src);
-        } finally {
-            if (xslStream != null) {
-                xslStream.close();
-            }
         }
     }
 
@@ -671,8 +664,7 @@
 
     private void applyReflectionHackForExtensionMethods() {
         // Jigsaw doesn't allow reflection to work, so we can stop trying
-        if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_1_7)
-            && !JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)) {
+        if (!JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)) {
             try { // #51668, #52382
                 final Field _isNotSecureProcessing = tfactory.getClass().getDeclaredField("_isNotSecureProcessing");
                 _isNotSecureProcessing.setAccessible(true);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -69,6 +69,7 @@
      * @ant.attribute ignore="true"
      * @param cmdl A user supplied command line that we won't accept.
      */
+    @Override
     public void setCommand(Commandline cmdl) {
         throw new BuildException(getTaskType()
                                  + " doesn\'t support the command attribute",
@@ -81,6 +82,7 @@
      * @ant.attribute ignore="true"
      * @param skip A user supplied boolean we won't accept.
      */
+    @Override
     public void setSkipEmptyFilesets(boolean skip) {
         throw new BuildException(getTaskType() + " doesn\'t support the "
                                  + "skipemptyfileset attribute",
@@ -93,6 +95,7 @@
      * @ant.attribute ignore="true"
      * @param b A user supplied boolean we won't accept.
      */
+    @Override
     public void setAddsourcefile(boolean b) {
         throw new BuildException(getTaskType()
             + " doesn\'t support the addsourcefile attribute", getLocation());
@@ -103,6 +106,7 @@
      * @return true if a valid OS, for unix this is always true, otherwise
      *              use the superclasses' test (user set).
      */
+    @Override
     protected boolean isValidOs() {
         return getOs() == null && getOsFamily() == null
             ? Os.isFamily(Os.FAMILY_UNIX) : super.isValidOs();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.java	2018-03-24 12:37:12.000000000 +0000
@@ -63,6 +63,7 @@
      * Ensure that all the required arguments and other conditions have
      * been set.
      */
+    @Override
     protected void checkConfiguration() {
         if (!haveGroup) {
             throw new BuildException("Required attribute group not set in "
@@ -76,6 +77,7 @@
      *
      * @param e User supplied executable that we won't accept.
      */
+    @Override
     public void setExecutable(String e) {
         throw new BuildException(getTaskType()
                                  + " doesn\'t support the executable"
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chown.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chown.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chown.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/unix/Chown.java	2018-03-24 12:37:12.000000000 +0000
@@ -63,6 +63,7 @@
      * Ensure that all the required arguments and other conditions have
      * been set.
      */
+    @Override
     protected void checkConfiguration() {
         if (!haveOwner) {
             throw new BuildException("Required attribute owner not set in"
@@ -76,6 +77,7 @@
      *
      * @param e User supplied executable that we won't accept.
      */
+    @Override
     public void setExecutable(String e) {
         throw new BuildException(getTaskType()
                                  + " doesn\'t support the executable"
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java	2018-03-24 12:37:12.000000000 +0000
@@ -32,28 +32,30 @@
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.Properties;
-import java.util.Vector;
+import java.util.Set;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.dispatch.DispatchTask;
 import org.apache.tools.ant.dispatch.DispatchUtils;
-import org.apache.tools.ant.taskdefs.Execute;
 import org.apache.tools.ant.taskdefs.LogOutputStream;
 import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.util.FileUtils;
-import org.apache.tools.ant.util.SymbolicLinkUtils;
 
 /**
  * Creates, Deletes, Records and Restores Symlinks.
@@ -98,28 +100,14 @@
  * &lt;symlink action=&quot;delete&quot; link=&quot;${dir.top}/foo&quot;/&gt;
  * </pre>
  *
- * <p><strong>LIMITATIONS:</strong> Because Java has no direct support for
- * handling symlinks this task divines them by comparing canonical and
- * absolute paths. On non-unix systems this may cause false positives.
- * Furthermore, any operating system on which the command
- * <code>ln -s link resource</code> is not a valid command on the command line
- * will not be able to use action=&quot;delete&quot;, action=&quot;single&quot;
- * or action=&quot;recreate&quot;, but action=&quot;record&quot; should still
- * work. Finally, the lack of support for symlinks in Java means that all links
- * are recorded as links to the <strong>canonical</strong> resource name.
- * Therefore the link: <code>link --&gt; subdir/dir/../foo.bar</code> will be
- * recorded as <code>link=subdir/foo.bar</code> and restored as
- * <code>link --&gt; subdir/foo.bar</code>.</p>
- *
+ * <p><strong>Note:</strong> Starting Ant version 1.10.2, this task relies on the symbolic link support
+ * introduced in Java 7 through the {@link Files} APIs.
  */
 public class Symlink extends DispatchTask {
-    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
-    private static final SymbolicLinkUtils SYMLINK_UTILS =
-        SymbolicLinkUtils.getSymbolicLinkUtils();
 
     private String resource;
     private String link;
-    private Vector fileSets = new Vector();
+    private List<FileSet> fileSets = new ArrayList<>();
     private String linkFileName;
     private boolean overwrite;
     private boolean failonerror;
@@ -185,14 +173,18 @@
                 handleError("Must define the link name for symlink!");
                 return;
             }
+            final Path linkPath = Paths.get(link);
+            if (!Files.isSymbolicLink(linkPath)) {
+                log("Skipping deletion of " + linkPath + " since it's not a symlink", Project.MSG_VERBOSE);
+                // just ignore and silently return (this is consistent
+                // with the current, 1.9.x versions, of Ant)
+                return;
+
+            }
             log("Removing symlink: " + link);
-            SYMLINK_UTILS.deleteSymbolicLink(FILE_UTILS
-                                             .resolveFile(new File("."), link),
-                                             this);
-        } catch (FileNotFoundException fnfe) {
-            handleError(fnfe.toString());
+            deleteSymLink(linkPath);
         } catch (IOException ioe) {
-            handleError(ioe.toString());
+            handleError(ioe.getMessage());
         } finally {
             setDefaults();
         }
@@ -206,28 +198,34 @@
     public void recreate() throws BuildException {
         try {
             if (fileSets.isEmpty()) {
-                handleError("File set identifying link file(s) "
-                            + "required for action recreate");
+                handleError(
+                        "File set identifying link file(s) required for action recreate");
                 return;
             }
-            Properties links = loadLinks(fileSets);
-
-            for (Iterator kitr = links.keySet().iterator(); kitr.hasNext();) {
-                String lnk = (String) kitr.next();
-                String res = links.getProperty(lnk);
-                // handle the case where lnk points to a directory (bug 25181)
+            final Properties links = loadLinks(fileSets);
+            for (final String lnk : links.stringPropertyNames()) {
+                final String res = links.getProperty(lnk);
                 try {
-                    File test = new File(lnk);
-                    if (!SYMLINK_UTILS.isSymbolicLink(lnk)) {
-                        doLink(res, lnk);
-                    } else if (!test.getCanonicalPath().equals(
-                        new File(res).getCanonicalPath())) {
-                        SYMLINK_UTILS.deleteSymbolicLink(test, this);
-                        doLink(res, lnk);
-                    } // else lnk exists, do nothing
-                } catch (IOException ioe) {
-                    handleError("IO exception while creating link");
+                    if (Files.isSymbolicLink(Paths.get(lnk)) &&
+                            new File(lnk).getCanonicalPath().equals(new File(res).getCanonicalPath())) {
+                        // it's already a symlink and the symlink target is the same
+                        // as the target noted in the properties file. So there's no
+                        // need to recreate it
+                        log("not recreating " + lnk + " as it points to the correct target already" ,
+                            Project.MSG_DEBUG);
+                        continue;
+                    }
+                } catch (IOException e) {
+                    final String errMessage = "Failed to check if path " + lnk + " is a symbolic link, linking to " + res;
+                    if (failonerror) {
+                        throw new BuildException(errMessage, e);
+                    }
+                    // log and continue
+                    log(errMessage, Project.MSG_INFO);
+                    continue;
                 }
+                // create the link
+                this.doLink(res, lnk);
             }
         } finally {
             setDefaults();
@@ -249,30 +247,20 @@
                 handleError("Name of file to record links in required");
                 return;
             }
-            // create a hashtable to group them by parent directory:
-            Hashtable byDir = new Hashtable();
+            // create a map to group them by parent directory:
+            Map<File, List<File>> byDir = new HashMap<>();
 
             // get an Iterator of file objects representing links (canonical):
-            for (Iterator litr = findLinks(fileSets).iterator();
-                litr.hasNext();) {
-                File thisLink = (File) litr.next();
-                File parent = thisLink.getParentFile();
-                Vector v = (Vector) byDir.get(parent);
-                if (v == null) {
-                    v = new Vector();
-                    byDir.put(parent, v);
-                }
-                v.addElement(thisLink);
-            }
+            findLinks(fileSets).forEach(lnk -> byDir
+                .computeIfAbsent(lnk.getParentFile(), k -> new ArrayList<>())
+                .add(lnk));
+
             // write a Properties file in each directory:
-            for (Iterator dirs = byDir.keySet().iterator(); dirs.hasNext();) {
-                File dir = (File) dirs.next();
-                Vector linksInDir = (Vector) byDir.get(dir);
+            byDir.forEach((dir, linksInDir) -> {
                 Properties linksToStore = new Properties();
 
                 // fill up a Properties object with link and resource names:
-                for (Iterator dlnk = linksInDir.iterator(); dlnk.hasNext();) {
-                    File lnk = (File) dlnk.next();
+                for (File lnk : linksInDir) {
                     try {
                         linksToStore.put(lnk.getName(), lnk.getCanonicalPath());
                     } catch (IOException ioe) {
@@ -280,7 +268,7 @@
                     }
                 }
                 writePropertyFile(linksToStore, dir);
-            }
+            });
         } finally {
             setDefaults();
         }
@@ -367,61 +355,49 @@
      * @param set      The fileset to add.
      */
     public void addFileset(FileSet set) {
-        fileSets.addElement(set);
+        fileSets.add(set);
     }
 
     /**
      * Delete a symlink (without deleting the associated resource).
      *
-     * <p>This is a convenience method that simply invokes
-     * <code>deleteSymlink(java.io.File)</code>.
+     * <p>This is a convenience method that simply invokes {@link #deleteSymlink(File)}</p>
      *
-     * @param path    A string containing the path of the symlink to delete.
+     * @param path A string containing the path of the symlink to delete.
+     * @throws IOException If the deletion attempt fails
      *
-     * @throws IOException             If calls to <code>File.rename</code>
-     *                                   or <code>File.delete</code> fail.
-     * @deprecated use
-     * org.apache.tools.ant.util.SymbolicLinkUtils#deleteSymbolicLink
-     * instead
+     * @deprecated use {@link Files#delete(Path)} instead
      */
     @Deprecated
-    public static void deleteSymlink(String path)
-        throws IOException {
-        SYMLINK_UTILS.deleteSymbolicLink(new File(path), null);
+    public static void deleteSymlink(final String path)
+            throws IOException {
+        deleteSymlink(Paths.get(path).toFile());
     }
 
     /**
      * Delete a symlink (without deleting the associated resource).
      *
-     * <p>This is a utility method that removes a unix symlink without removing
+     * <p>This is a utility method that removes a symlink without removing
      * the resource that the symlink points to. If it is accidentally invoked
-     * on a real file, the real file will not be harmed.</p>
+     * on a real file, the real file will not be harmed and instead this method
+     * returns silently.</p>
+     *
+     * <p>Since Ant 1.10.2 this method relies on the {@link Files#isSymbolicLink(Path)}
+     * and {@link Files#delete(Path)} to check and delete the symlink
+     * </p>
      *
-     * <p>This method works by
-     * getting the canonical path of the link, using the canonical path to
-     * rename the resource (breaking the link) and then deleting the link.
-     * The resource is then returned to its original name inside a finally
-     * block to ensure that the resource is unharmed even in the event of
-     * an exception.</p>
-     *
-     * <p>Since Ant 1.8.0 this method will try to delete the File object if
-     * it reports it wouldn't exist (as symlinks pointing nowhere usually do).
-     * Prior version would throw a FileNotFoundException in that case.</p>
-     *
-     * @param linkfil    A <code>File</code> object of the symlink to delete.
-     *
-     * @throws IOException             If calls to <code>File.rename</code>,
-     *                                   <code>File.delete</code> or
-     *                                   <code>File.getCanonicalPath</code>
-     *                                   fail.
-     * @deprecated use
-     * org.apache.tools.ant.util.SymbolicLinkUtils#deleteSymbolicLink
-     * instead
+     * @param linkfil A <code>File</code> object of the symlink to delete. Cannot be null.
+     * @throws IOException If the attempt to delete runs into exception
+     *
+     * @deprecated use {@link Files#delete(Path)} instead
      */
     @Deprecated
-    public static void deleteSymlink(File linkfil)
-        throws IOException {
-        SYMLINK_UTILS.deleteSymbolicLink(linkfil, null);
+    public static void deleteSymlink(final File linkfil)
+            throws IOException {
+        if (!Files.isSymbolicLink(linkfil.toPath())) {
+            return;
+        }
+        deleteSymLink(linkfil.toPath());
     }
 
     /**
@@ -434,15 +410,11 @@
      */
     private void writePropertyFile(Properties properties, File dir)
         throws BuildException {
-        BufferedOutputStream bos = null;
-        try {
-            bos = new BufferedOutputStream(
-                new FileOutputStream(new File(dir, linkFileName)));
+        try (BufferedOutputStream bos = new BufferedOutputStream(
+            Files.newOutputStream(new File(dir, linkFileName).toPath()))) {
             properties.store(bos, "Symlinks from " + dir);
         } catch (IOException ioe) {
             throw new BuildException(ioe, getLocation());
-        } finally {
-            FileUtils.close(bos);
         }
     }
 
@@ -463,38 +435,50 @@
     /**
      * Conduct the actual construction of a link.
      *
-     * <p>The link is constructed by calling <code>Execute.runCommand</code>.</p>
-     *
-     * @param res   The path of the resource we are linking to.
-     * @param lnk       The name of the link we wish to make.
+     * @param res The path of the resource we are linking to.
+     * @param lnk The name of the link we wish to make.
      * @throws BuildException when things go wrong
      */
     private void doLink(String res, String lnk) throws BuildException {
-        File linkfil = new File(lnk);
-        String options = "-s";
-        if (overwrite) {
-            options += "f";
-            if (linkfil.exists()) {
-                try {
-                    SYMLINK_UTILS.deleteSymbolicLink(linkfil, this);
-                } catch (FileNotFoundException fnfe) {
-                    log("Symlink disappeared before it was deleted: " + lnk);
-                } catch (IOException ioe) {
-                    log("Unable to overwrite preexisting link or file: " + lnk,
-                        ioe, Project.MSG_INFO);
+        final Path link = Paths.get(lnk);
+        final Path target = Paths.get(res);
+        final boolean alreadyExists = Files.exists(link, LinkOption.NOFOLLOW_LINKS);
+        if (!alreadyExists) {
+            // if the path (at which the link is expected to be created) isn't already present
+            // then we just go ahead and attempt to symlink
+            try {
+                log("creating symlink " + link + " -> " + target, Project.MSG_DEBUG);
+                Files.createSymbolicLink(link, target);
+            } catch (IOException e) {
+                if (failonerror) {
+                    throw new BuildException("Failed to create symlink " + lnk + " to target " + res, e);
                 }
+                log("Unable to create symlink " + lnk + " to target " + res, e, Project.MSG_INFO);
             }
+            return;
+        }
+        // file already exists, see if we are allowed to overwrite
+        if (!overwrite) {
+            log("Skipping symlink creation, since file at " + lnk + " already exists and overwrite is set to false", Project.MSG_INFO);
+            return;
+        }
+        // we have been asked to overwrite, so we now do the necessary steps
+
+        // initiate a deletion of the existing file
+        final boolean existingFileDeleted = link.toFile().delete();
+        if (!existingFileDeleted) {
+            handleError("Deletion of file at " + lnk + " failed, while trying to overwrite it with a symlink");
+            return;
         }
-        String[] cmd = new String[] {"ln", options, res, lnk};
         try {
-            Execute.runCommand(this, cmd);
-        } catch (BuildException failedToExecute) {
+            log("creating symlink " + link + " -> " + target + " after removing original",
+                Project.MSG_DEBUG);
+            Files.createSymbolicLink(link, target);
+        } catch (IOException e) {
             if (failonerror) {
-                throw failedToExecute;
-            } else {
-                //log at the info level, and keep going.
-                log(failedToExecute.getMessage(), failedToExecute, Project.MSG_INFO);
+                throw new BuildException("Failed to create symlink " + lnk + " to target " + res, e);
             }
+            log("Unable to create symlink " + lnk + " to target " + res, e, Project.MSG_INFO);
         }
     }
 
@@ -505,33 +489,33 @@
      * &quot;record&quot;. This means that filesets are interpreted
      * as the directories in which links may be found.</p>
      *
-     * @param v   The filesets specified by the user.
-     * @return A HashSet of <code>File</code> objects containing the
-     *         links (with canonical parent directories).
-     */
-    private HashSet findLinks(Vector v) {
-        HashSet result = new HashSet();
-        final int size = v.size();
-        for (int i = 0; i < size; i++) {
-            FileSet fs = (FileSet) v.get(i);
+     * @param fileSets The filesets specified by the user.
+     * @return A Set of <code>File</code> objects containing the
+     * links (with canonical parent directories).
+     */
+    private Set<File> findLinks(List<FileSet> fileSets) {
+        final Set<File> result = new HashSet<>();
+        for (FileSet fs : fileSets) {
             DirectoryScanner ds = fs.getDirectoryScanner(getProject());
-            String[][] fnd = new String[][]
-                {ds.getIncludedFiles(), ds.getIncludedDirectories()};
+
             File dir = fs.getDir(getProject());
-            for (int j = 0; j < fnd.length; j++) {
-                for (int k = 0; k < fnd[j].length; k++) {
-                    try {
-                        File f = new File(dir, fnd[j][k]);
-                        File pf = f.getParentFile();
-                        String name = f.getName();
-                        if (SYMLINK_UTILS.isSymbolicLink(pf, name)) {
-                            result.add(new File(pf.getCanonicalFile(), name));
+
+            Stream.of(ds.getIncludedFiles(), ds.getIncludedDirectories())
+                    .flatMap(Stream::of).forEach(path -> {
+                        try {
+                            final File f = new File(dir, path);
+                            final File pf = f.getParentFile();
+                            final String name = f.getName();
+                            // we use the canonical path of the parent dir in which the (potential)
+                            // link resides
+                            final File parentDirCanonicalizedFile = new File(pf.getCanonicalPath(), name);
+                            if (Files.isSymbolicLink(parentDirCanonicalizedFile.toPath())) {
+                                result.add(parentDirCanonicalizedFile);
+                            }
+                        } catch (IOException e) {
+                            handleError("IOException: " + path + " omitted");
                         }
-                    } catch (IOException e) {
-                        handleError("IOException: " + fnd[j][k] + " omitted");
-                    }
-                }
-            }
+            });
         }
         return result;
     }
@@ -544,50 +528,50 @@
      * names of the property files with the link information and the
      * subdirectories in which to look for them.</p>
      *
-     * @param v    The <code>FileSet</code>s for this task.
+     * @param fileSets    The <code>FileSet</code>s for this task.
      * @return            The links to be made.
      */
-    private Properties loadLinks(Vector v) {
+    private Properties loadLinks(List<FileSet> fileSets) {
         Properties finalList = new Properties();
         // loop through the supplied file sets:
-        final int size = v.size();
-        for (int i = 0; i < size; i++) {
-            FileSet fs = (FileSet) v.elementAt(i);
+        for (FileSet fs : fileSets) {
             DirectoryScanner ds = new DirectoryScanner();
             fs.setupDirectoryScanner(ds, getProject());
             ds.setFollowSymlinks(false);
             ds.scan();
-            String[] incs = ds.getIncludedFiles();
             File dir = fs.getDir(getProject());
 
             // load included files as properties files:
-            for (int j = 0; j < incs.length; j++) {
-                File inc = new File(dir, incs[j]);
+            for (String name : ds.getIncludedFiles()) {
+                File inc = new File(dir, name);
                 File pf = inc.getParentFile();
                 Properties lnks = new Properties();
-                InputStream is = null;
-                try {
-                    is = new BufferedInputStream(new FileInputStream(inc));
+                try (InputStream is = new BufferedInputStream(
+                    Files.newInputStream(inc.toPath()))) {
                     lnks.load(is);
                     pf = pf.getCanonicalFile();
                 } catch (FileNotFoundException fnfe) {
-                    handleError("Unable to find " + incs[j] + "; skipping it.");
+                    handleError("Unable to find " + name + "; skipping it.");
                     continue;
                 } catch (IOException ioe) {
-                    handleError("Unable to open " + incs[j]
-                                + " or its parent dir; skipping it.");
+                    handleError("Unable to open " + name
+                        + " or its parent dir; skipping it.");
                     continue;
-                } finally {
-                    FileUtils.close(is);
                 }
-                lnks.list(new PrintStream(
-                    new LogOutputStream(this, Project.MSG_INFO)));
+                try {
+                    lnks.store(new PrintStream(
+                        new LogOutputStream(this, Project.MSG_INFO)),
+                        "listing properties");
+                } catch (IOException ex) {
+                    log("failed to log unshortened properties");
+                    lnks.list(new PrintStream(
+                        new LogOutputStream(this, Project.MSG_INFO)));
+                }
                 // Write the contents to our master list of links
                 // This method assumes that all links are defined in
                 // terms of absolute paths, or paths relative to the
                 // working directory:
-                for (Iterator kitr = lnks.keySet().iterator(); kitr.hasNext();) {
-                    String key = (String) kitr.next();
+                for (String key : lnks.stringPropertyNames()) {
                     finalList.put(new File(pf, key).getAbsolutePath(),
                         lnks.getProperty(key));
                 }
@@ -595,4 +579,21 @@
         }
         return finalList;
     }
+
+    private static void deleteSymLink(final Path path) throws IOException {
+        // Implementation note: We intentionally use java.io.File#delete() instead of
+        // java.nio.file.Files#delete(Path) since it turns out that the latter doesn't
+        // update/clear the "canonical file paths cache" maintained by the JRE FileSystemProvider.
+        // Not clearing/updating that cache results in this deleted (and later recreated) symlink
+        // to point to a wrong/outdated target for a few seconds (30 seconds is the time the JRE
+        // maintains the cache entries for). All this is implementation detail of the JRE and
+        // is a JRE bug http://mail.openjdk.java.net/pipermail/core-libs-dev/2017-December/050540.html,
+        // but given that it affects our tests (SymlinkTest#testRecreate consistently fails
+        // on MacOS/Unix) as well as the Symlink task, it makes sense to use this API instead of
+        // the Files#delete(Path) API
+        final boolean deleted = path.toFile().delete();
+        if (!deleted) {
+            throw new IOException("Could not delete symlink at " + path);
+        }
+    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java	2018-03-24 12:37:12.000000000 +0000
@@ -93,6 +93,7 @@
     /**
      * Check the attributes.
      */
+    @Override
     protected void checkConfiguration() {
         if (!haveAttr()) {
             throw new BuildException("Missing attribute parameter",
@@ -107,6 +108,7 @@
      * @param e ignored
      * @ant.attribute ignore="true"
      */
+    @Override
     public void setExecutable(String e) {
         throw new BuildException(getTaskType()
             + " doesn\'t support the executable attribute", getLocation());
@@ -129,6 +131,7 @@
      * @param b ignored
      * @ant.attribute ignore="true"
      */
+    @Override
     public void setAddsourcefile(boolean b) {
         throw new BuildException(getTaskType()
             + " doesn\'t support the addsourcefile attribute", getLocation());
@@ -140,6 +143,7 @@
      * @param skip ignored
      * @ant.attribute ignore="true"
      */
+    @Override
     public void setSkipEmptyFilesets(boolean skip) {
         throw new BuildException(getTaskType() + " doesn\'t support the "
                                  + "skipemptyfileset attribute",
@@ -152,6 +156,7 @@
      * @param parallel ignored
      * @ant.attribute ignore="true"
      */
+    @Override
     public void setParallel(boolean parallel) {
         throw new BuildException(getTaskType()
                                  + " doesn\'t support the parallel attribute",
@@ -164,6 +169,7 @@
      * @param max ignored
      * @ant.attribute ignore="true"
      */
+    @Override
     public void setMaxParallel(int max) {
         throw new BuildException(getTaskType()
                                  + " doesn\'t support the maxparallel attribute",
@@ -175,13 +181,14 @@
      * Default is to allow windows
      * @return true if the os is valid.
      */
+    @Override
     protected boolean isValidOs() {
         return getOs() == null && getOsFamily() == null
             ? Os.isFamily(Os.FAMILY_WINDOWS) : super.isValidOs();
     }
 
     private static String getSignString(boolean attr) {
-        return (attr ? SET : UNSET);
+        return attr ? SET : UNSET;
     }
 
     private void addArg(boolean sign, String attribute) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,8 +18,8 @@
 package org.apache.tools.ant.taskdefs.optional;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.Vector;
 
 import org.apache.tools.ant.AntClassLoader;
@@ -287,42 +287,40 @@
      */
     public void execute() throws BuildException {
         try {
-        int fileProcessed = 0;
-        if (file == null && (filesets.size() == 0)) {
-            throw new BuildException(
-                "Specify at least one source - " + "a file or a fileset.");
-        }
-
-
+            int fileProcessed = 0;
+            if (file == null && (filesets.isEmpty())) {
+                throw new BuildException(
+                    "Specify at least one source - " + "a file or a fileset.");
+            }
 
-        if (file != null) {
-            if (file.exists() && file.canRead() && file.isFile()) {
-                doValidate(file);
-                fileProcessed++;
-            } else {
-                String errorMsg = "File " + file + " cannot be read";
-                if (failOnError) {
-                    throw new BuildException(errorMsg);
+            if (file != null) {
+                if (file.exists() && file.canRead() && file.isFile()) {
+                    doValidate(file);
+                    fileProcessed++;
                 } else {
-                    log(errorMsg, Project.MSG_ERR);
+                    String errorMsg = "File " + file + " cannot be read";
+                    if (failOnError) {
+                        throw new BuildException(errorMsg);
+                    } else {
+                        log(errorMsg, Project.MSG_ERR);
+                    }
                 }
             }
-        }
 
-        final int size = filesets.size();
-        for (int i = 0; i < size; i++) {
+            final int size = filesets.size();
+            for (int i = 0; i < size; i++) {
 
-            FileSet fs = (FileSet) filesets.elementAt(i);
-            DirectoryScanner ds = fs.getDirectoryScanner(getProject());
-            String[] files = ds.getIncludedFiles();
-
-            for (int j = 0; j < files.length; j++) {
-                File srcFile = new File(fs.getDir(getProject()), files[j]);
-                doValidate(srcFile);
-                fileProcessed++;
+                FileSet fs = (FileSet) filesets.elementAt(i);
+                DirectoryScanner ds = fs.getDirectoryScanner(getProject());
+                String[] files = ds.getIncludedFiles();
+
+                for (int j = 0; j < files.length; j++) {
+                    File srcFile = new File(fs.getDir(getProject()), files[j]);
+                    doValidate(srcFile);
+                    fileProcessed++;
+                }
             }
-        }
-        onSuccessfulValidation(fileProcessed);
+            onSuccessfulValidation(fileProcessed);
         } finally {
             cleanup();
         }
@@ -552,7 +550,7 @@
         try {
             log("Validating " + afile.getName() + "... ", Project.MSG_VERBOSE);
             errorHandler.init(afile);
-            InputSource is = new InputSource(new FileInputStream(afile));
+            InputSource is = new InputSource(Files.newInputStream(afile.toPath()));
             String uri = FILE_UTILS.toURI(afile.getAbsolutePath());
             is.setSystemId(uri);
             xmlReader.parse(is);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/xz/Unxz.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/xz/Unxz.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/xz/Unxz.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/xz/Unxz.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,87 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package org.apache.tools.ant.taskdefs.optional.xz;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.Files;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.Unpack;
+import org.tukaani.xz.XZInputStream;
+
+/**
+ * Expands a file that has been compressed with the XZ
+ * algorithm. Normally used to compress non-compressed archives such
+ * as TAR files.
+ *
+ * @since Ant 1.10.1
+ *
+ * @ant.task category="packaging"
+ */
+
+public class Unxz extends Unpack {
+    private static final int BUFFER_SIZE = 8 * 1024;
+    private static final String DEFAULT_EXTENSION = ".xz";
+
+    /**
+     * Get the default extension.
+     * @return the value ".xz"
+     */
+    @Override
+    protected String getDefaultExtension() {
+        return DEFAULT_EXTENSION;
+    }
+
+    /**
+     * Implement the gunzipping.
+     */
+    @Override
+    protected void extract() {
+        if (srcResource.getLastModified() > dest.lastModified()) {
+            log("Expanding " + srcResource.getName() + " to "
+                        + dest.getAbsolutePath());
+
+            try (XZInputStream zIn =
+                new XZInputStream(srcResource.getInputStream());
+                    OutputStream out = Files.newOutputStream(dest.toPath())) {
+                byte[] buffer = new byte[BUFFER_SIZE];
+                int count = 0;
+                do {
+                    out.write(buffer, 0, count);
+                    count = zIn.read(buffer, 0, buffer.length);
+                } while (count != -1);
+            } catch (IOException ioe) {
+                String msg = "Problem expanding xz " + ioe.getMessage();
+                throw new BuildException(msg, ioe, getLocation());
+            }
+        }
+    }
+
+    /**
+     * Whether this task can deal with non-file resources.
+     *
+     * <p>This implementation returns true only.</p>
+     * @return true
+     */
+    @Override
+    protected boolean supportsNonFileResources() {
+        return true;
+    }
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/xz/Xz.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/xz/Xz.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/optional/xz/Xz.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/optional/xz/Xz.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package org.apache.tools.ant.taskdefs.optional.xz;
+
+import java.io.IOException;
+import java.nio.file.Files;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.Pack;
+import org.tukaani.xz.LZMA2Options;
+import org.tukaani.xz.XZOutputStream;
+
+/**
+ * Compresses a file with the XZ algorithm. Normally used to compress
+ * non-compressed archives such as TAR files.
+ *
+ * @since Ant 1.10.1
+ *
+ * @ant.task category="packaging"
+ */
+
+public class Xz extends Pack {
+    /**
+     * Compress the zipFile.
+     */
+    @Override
+    protected void pack() {
+        try (XZOutputStream zOut = new XZOutputStream(
+            Files.newOutputStream(zipFile.toPath()), new LZMA2Options())) {
+            zipResource(getSrcResource(), zOut);
+        } catch (IOException ioe) {
+            String msg = "Problem creating xz " + ioe.getMessage();
+            throw new BuildException(msg, ioe, getLocation());
+        }
+    }
+
+    /**
+     * Whether this task can deal with non-file resources.
+     *
+     * <p>This implementation always returns true only.</p>
+     * @return true
+     */
+    @Override
+    protected boolean supportsNonFileResources() {
+        return true;
+    }
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Pack.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Pack.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Pack.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Pack.java	2018-03-24 12:37:12.000000000 +0000
@@ -38,6 +38,7 @@
 
 public abstract class Pack extends Task {
     private static final int BUFFER_SIZE = 8 * 1024;
+
     // CheckStyle:VisibilityModifier OFF - bc
     protected File zipFile;
     protected File source;
@@ -91,13 +92,14 @@
      */
     public void addConfigured(ResourceCollection a) {
         if (a.size() == 0) {
-            throw new BuildException("No resource selected, " + getTaskName()
-                    + " needs exactly one resource.");
+            throw new BuildException(
+                "No resource selected, %s needs exactly one resource.",
+                getTaskName());
         }
         if (a.size() != 1) {
-            throw new BuildException(getTaskName()
-                    + " cannot handle multiple resources at once. (" + a.size()
-                    + " resources were selected.)");
+            throw new BuildException(
+                "%s cannot handle multiple resources at once. (%d resources were selected.)",
+                getTaskName(), a.size());
         }
         setSrcResource(a.iterator().next());
     }
@@ -112,13 +114,14 @@
         }
 
         if (zipFile.isDirectory()) {
-            throw new BuildException("zipfile attribute must not "
-                                    + "represent a directory!", getLocation());
+            throw new BuildException(
+                "zipfile attribute must not represent a directory!",
+                getLocation());
         }
 
         if (getSrcResource() == null) {
-            throw new BuildException("src attribute or nested resource is"
-                                     + " required", getLocation());
+            throw new BuildException(
+                "src attribute or nested resource is required", getLocation());
         }
     }
 
@@ -126,6 +129,7 @@
      * validate, then hand off to the subclass
      * @throws BuildException on error
      */
+    @Override
     public void execute() throws BuildException {
         validate();
 
@@ -177,11 +181,8 @@
      */
     protected void zipResource(Resource resource, OutputStream zOut)
         throws IOException {
-        InputStream rIn = resource.getInputStream();
-        try {
+        try (InputStream rIn = resource.getInputStream()) {
             zipFile(rIn, zOut);
-        } finally {
-            rIn.close();
         }
     }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Parallel.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Parallel.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Parallel.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Parallel.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,7 +18,6 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.List;
 import java.util.Vector;
 
@@ -56,7 +55,7 @@
     /** Class which holds a list of tasks to execute */
     public static class TaskList implements TaskContainer {
         /** Collection holding the nested tasks */
-        private List tasks = new ArrayList();
+        private List<Task> tasks = new ArrayList<>();
 
         /**
          * Add a nested task to execute parallel (asynchron).
@@ -64,13 +63,14 @@
          * @param nestedTask  Nested task to be executed in parallel.
          *                    must not be null.
          */
+        @Override
         public void addTask(Task nestedTask) {
             tasks.add(nestedTask);
         }
     }
 
     /** Collection holding the nested tasks */
-    private Vector nestedTasks = new Vector();
+    private Vector<Task> nestedTasks = new Vector<>();
 
     /** Semaphore to notify of completed threads */
     private final Object semaphore = new Object();
@@ -150,6 +150,7 @@
      * Add a nested task to execute in parallel.
      * @param nestedTask  Nested task to be executed in parallel
      */
+    @Override
     public void addTask(Task nestedTask) {
         nestedTasks.addElement(nestedTask);
     }
@@ -195,13 +196,12 @@
         this.timeout = timeout;
     }
 
-
-
     /**
      * Execute the parallel tasks
      *
      * @exception BuildException if any of the threads failed.
      */
+    @Override
     public void execute() throws BuildException {
         updateThreadCounts();
         if (numThreads == 0) {
@@ -224,8 +224,8 @@
         if (runnables == null) {
             return;
         }
-        for (int i = 0; i < runnables.length; ++i) {
-            Throwable t = runnables[i].getException();
+        for (TaskRunnable runnable : runnables) {
+            Throwable t = runnable.getException();
             if (t != null) {
                 numExceptions++;
                 if (firstException == null) {
@@ -255,28 +255,21 @@
      * @exception BuildException if any of the threads failed.
      */
     private void spinThreads() throws BuildException {
-        final int numTasks = nestedTasks.size();
-        TaskRunnable[] runnables = new TaskRunnable[numTasks];
         stillRunning = true;
         timedOut = false;
         boolean interrupted = false;
 
-        int threadNumber = 0;
-        for (Enumeration e = nestedTasks.elements(); e.hasMoreElements();
-             threadNumber++) {
-            Task nestedTask = (Task) e.nextElement();
-            runnables[threadNumber]
-                = new TaskRunnable(nestedTask);
-        }
+        TaskRunnable[] runnables = nestedTasks.stream().map(TaskRunnable::new)
+            .toArray(TaskRunnable[]::new);
 
+        final int numTasks = nestedTasks.size();
         final int maxRunning = numTasks < numThreads ? numTasks : numThreads;
-        TaskRunnable[] running = new TaskRunnable[maxRunning];
 
-        threadNumber = 0;
+        TaskRunnable[] running = new TaskRunnable[maxRunning];
         ThreadGroup group = new ThreadGroup("parallel");
 
         TaskRunnable[] daemons = null;
-        if (daemonTasks != null && daemonTasks.tasks.size() != 0) {
+        if (!(daemonTasks == null || daemonTasks.tasks.isEmpty())) {
             daemons = new TaskRunnable[daemonTasks.tasks.size()];
         }
 
@@ -292,7 +285,7 @@
             // start any daemon threads
             if (daemons != null) {
                 for (int i = 0; i < daemons.length; ++i) {
-                    daemons[i] = new TaskRunnable((Task) daemonTasks.tasks.get(i));
+                    daemons[i] = new TaskRunnable(daemonTasks.tasks.get(i));
                     Thread daemonThread =  new Thread(group, daemons[i]);
                     daemonThread.setDaemon(true);
                     daemonThread.start();
@@ -301,6 +294,7 @@
 
             // now run main threads in limited numbers...
             // start initial batch of threads
+            int threadNumber = 0;
             for (int i = 0; i < maxRunning; ++i) {
                 running[i] = runnables[threadNumber++];
                 Thread thread =  new Thread(group, running[i]);
@@ -310,6 +304,7 @@
             if (timeout != 0) {
                 // start the timeout thread
                 Thread timeoutThread = new Thread() {
+                    @Override
                     public synchronized void run() {
                         try {
                             final long start = System.currentTimeMillis();
@@ -393,17 +388,16 @@
         if (numExceptions == 1) {
             if (firstException instanceof BuildException) {
                 throw (BuildException) firstException;
-            } else {
-                throw new BuildException(firstException);
             }
-        } else if (numExceptions > 1) {
+            throw new BuildException(firstException);
+        }
+        if (numExceptions > 1) {
             if (firstExitStatus == null) {
                 throw new BuildException(exceptionMessage.toString(),
                                          firstLocation);
-            } else {
-                throw new ExitStatusException(exceptionMessage.toString(),
-                                              firstExitStatus, firstLocation);
             }
+            throw new ExitStatusException(exceptionMessage.toString(),
+                                          firstExitStatus, firstLocation);
         }
     }
 
@@ -453,6 +447,7 @@
          * Executes the task within a thread and takes care about
          * Exceptions raised within the task.
          */
+        @Override
         public void run() {
             try {
                 LocalProperties.get(getProject()).copy();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Patch.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Patch.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Patch.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Patch.java	2018-03-24 12:37:12.000000000 +0000
@@ -165,12 +165,13 @@
      * execute patch
      * @throws BuildException when it all goes a bit pear shaped
      */
+    @Override
     public void execute() throws BuildException {
         if (!havePatchfile) {
             throw new BuildException("patchfile argument is required",
                                      getLocation());
         }
-        Commandline toExecute = (Commandline) cmd.clone();
+        Commandline toExecute =  (Commandline) cmd.clone();
         toExecute.setExecutable(PATCH);
 
         if (originalFile != null) {
@@ -182,18 +183,14 @@
                                   null);
         exe.setCommandline(toExecute.getCommandline());
 
-        if (directory != null) {
-            if (directory.exists() && directory.isDirectory()) {
-                exe.setWorkingDirectory(directory);
-            } else if (!directory.isDirectory()) {
+        if (directory == null) {
+            exe.setWorkingDirectory(getProject().getBaseDir());
+        } else {
+            if (!directory.isDirectory()) {
                 throw new BuildException(directory + " is not a directory.",
                                          getLocation());
-            } else {
-                throw new BuildException("directory " + directory
-                                         + " doesn\'t exist", getLocation());
             }
-        } else {
-            exe.setWorkingDirectory(getProject().getBaseDir());
+            exe.setWorkingDirectory(directory);
         }
 
         log(toExecute.describeCommand(), Project.MSG_VERBOSE);
@@ -204,9 +201,8 @@
                     + returncode;
                 if (failOnError) {
                     throw new BuildException(msg);
-                } else {
-                    log(msg, Project.MSG_ERR);
                 }
+                log(msg, Project.MSG_ERR);
             }
         } catch (IOException e) {
             throw new BuildException(e, getLocation());
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/PathConvert.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/PathConvert.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/PathConvert.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,6 @@
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
 import java.util.Vector;
@@ -81,7 +80,7 @@
     /**
      * Path prefix map
      */
-    private Vector prefixMap = new Vector();
+    private List<MapEntry> prefixMap = new Vector<>();
     /**
      * User override on path sep char
      */
@@ -97,12 +96,6 @@
     private boolean preserveDuplicates;
 
     /**
-     * Construct a new instance of the PathConvert task.
-     */
-    public PathConvert() {
-    }
-
-    /**
      * Helper class, holds the nested &lt;map&gt; values. Elements will look like
      * this: &lt;map from=&quot;d:&quot; to=&quot;/foo&quot;/&gt;
      *
@@ -142,8 +135,8 @@
          */
         public String apply(String elem) {
             if (from == null || to == null) {
-                throw new BuildException("Both 'from' and 'to' must be set "
-                     + "in a map entry");
+                throw new BuildException(
+                    "Both 'from' and 'to' must be set in a map entry");
             }
             // If we're on windows, then do the comparison ignoring case
             // and treat the two directory characters the same
@@ -213,7 +206,7 @@
      */
     public MapEntry createMap() {
         MapEntry entry = new MapEntry();
-        prefixMap.addElement(entry);
+        prefixMap.add(entry);
         return entry;
     }
 
@@ -251,7 +244,7 @@
         // validateSetup code, the same assumptions can be made as
         // with windows - that ; is the path separator
 
-        targetWindows = !targetOS.equals("unix") && !targetOS.equals("tandem");
+        targetWindows = !"unix".equals(targetOS) && !"tandem".equals(targetOS);
     }
 
     /**
@@ -293,7 +286,6 @@
         pathSep = sep;
     }
 
-
     /**
      * Set the default directory separator string;
      * defaults to current JVM {@link java.io.File#separator File.separator}.
@@ -344,8 +336,9 @@
             if (isReference()) {
                 Object o = refid.getReferencedObject(getProject());
                 if (!(o instanceof ResourceCollection)) {
-                    throw new BuildException("refid '" + refid.getRefId()
-                        + "' does not refer to a resource collection.");
+                    throw new BuildException(
+                        "refid '%s' does not refer to a resource collection.",
+                        refid.getRefId());
                 }
                 getPath().add((ResourceCollection) o);
             }
@@ -361,10 +354,10 @@
             // case-insensitive.
             String fromDirSep = onWindows ? "\\" : "/";
 
-            StringBuffer rslt = new StringBuffer();
+            StringBuilder rslt = new StringBuilder();
 
             ResourceCollection resources = isPreserveDuplicates() ? (ResourceCollection) path : new Union(path);
-            List ret = new ArrayList();
+            List<String> ret = new ArrayList<>();
             FileNameMapper mapperImpl = mapper == null ? new IdentityMapper() : mapper.getImplementation();
             for (Resource r : resources) {
                 String[] mapped = mapperImpl.mapFileName(String.valueOf(r));
@@ -373,8 +366,8 @@
                 }
             }
             boolean first = true;
-            for (Iterator mappedIter = ret.iterator(); mappedIter.hasNext();) {
-                String elem = mapElement((String) mappedIter.next()); // Apply the path prefix map
+            for (String string : ret) {
+                String elem = mapElement(string); // Apply the path prefix map
 
                 // Now convert the path and file separator characters from the
                 // current os to the target os.
@@ -418,25 +411,17 @@
      * @return String Updated element.
      */
     private String mapElement(String elem) {
+        // Iterate over the map entries and apply each one.
+        // Stop when one of the entries actually changes the element.
 
-        int size = prefixMap.size();
+        for (MapEntry entry : prefixMap) {
+            String newElem = entry.apply(elem);
 
-        if (size != 0) {
+            // Note I'm using "!=" to see if we got a new object back from
+            // the apply method.
 
-            // Iterate over the map entries and apply each one.
-            // Stop when one of the entries actually changes the element.
-
-            for (int i = 0; i < size; i++) {
-                MapEntry entry = (MapEntry) prefixMap.elementAt(i);
-                String newElem = entry.apply(elem);
-
-                // Note I'm using "!=" to see if we got a new object back from
-                // the apply method.
-
-                if (newElem != elem) {
-                    elem = newElem;
-                    break; // We applied one, so we're done
-                }
+            if (newElem != elem) {
+                return newElem;
             }
         }
         return elem;
@@ -503,9 +488,8 @@
      * @return BuildException.
      */
     private BuildException noChildrenAllowed() {
-        return new BuildException("You must not specify nested "
-             + "elements when using the refid attribute.");
+        return new BuildException(
+            "You must not specify nested elements when using the refid attribute.");
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java	2018-03-24 12:37:12.000000000 +0000
@@ -56,6 +56,7 @@
      * Add a nested task to predefine attributes and elements on.
      * @param nestedTask  Nested task/type to extend.
      */
+    @Override
     public void addTask(Task nestedTask) {
         if (this.nestedTask != null) {
             throw new BuildException("Only one nested element allowed");
@@ -71,6 +72,7 @@
     /**
      * Make a new definition.
      */
+    @Override
     public void execute() {
         if (nestedTask == null) {
             throw new BuildException("Missing nested element");
@@ -89,7 +91,7 @@
         AntTypeDefinition def = helper.getDefinition(componentName);
         if (def == null) {
             throw new BuildException(
-                "Unable to find typedef " + componentName);
+                "Unable to find typedef %s", componentName);
         }
         PreSetDefinition newDef = new PreSetDefinition(def, nestedTask);
 
@@ -129,7 +131,8 @@
          *
          * @param clazz a <code>Class</code> value.
          */
-        public void setClass(Class clazz) {
+        @Override
+        public void setClass(Class<?> clazz) {
             throw new BuildException("Not supported");
         }
 
@@ -138,6 +141,7 @@
          *
          * @param className a <code>String</code> value.
          */
+        @Override
         public void setClassName(String className) {
             throw new BuildException("Not supported");
         }
@@ -146,6 +150,7 @@
          * Get the classname of the definition.
          * @return the name of the class of this definition.
          */
+        @Override
         public String getClassName() {
             return parent.getClassName();
         }
@@ -155,7 +160,8 @@
          * NOT Supported
          * @param adapterClass the adapterClass.
          */
-        public void setAdapterClass(Class adapterClass) {
+        @Override
+        public void setAdapterClass(Class<?> adapterClass) {
             throw new BuildException("Not supported");
         }
 
@@ -164,7 +170,8 @@
          * NOT SUPPORTED
          * @param adaptToClass the assignable class.
          */
-        public void setAdaptToClass(Class adaptToClass) {
+        @Override
+        public void setAdaptToClass(Class<?> adaptToClass) {
             throw new BuildException("Not supported");
         }
 
@@ -174,6 +181,7 @@
          * NOT SUPPORTED
          * @param classLoader the classLoader.
          */
+        @Override
         public void setClassLoader(ClassLoader classLoader) {
             throw new BuildException("Not supported");
         }
@@ -182,6 +190,7 @@
          * Get the classloader for this definition.
          * @return the classloader for this definition.
          */
+        @Override
         public ClassLoader getClassLoader() {
             return parent.getClassLoader();
         }
@@ -191,7 +200,8 @@
          * @param project the current project.
          * @return the exposed class.
          */
-        public Class getExposedClass(Project project) {
+        @Override
+        public Class<?> getExposedClass(Project project) {
             return parent.getExposedClass(project);
         }
 
@@ -200,7 +210,8 @@
          * @param project the current project.
          * @return the type of the definition.
          */
-        public Class getTypeClass(Project project) {
+        @Override
+        public Class<?> getTypeClass(Project project) {
             return parent.getTypeClass(project);
         }
 
@@ -209,6 +220,7 @@
          * Check if the attributes are correct.
          * @param project the current project.
          */
+        @Override
         public void checkClass(Project project) {
             parent.checkClass(project);
         }
@@ -240,6 +252,7 @@
          * @param project the current project.
          * @return this object.
          */
+        @Override
         public Object create(Project project) {
             return this;
         }
@@ -251,6 +264,7 @@
          * @param project the current project.
          * @return true if the definitions are the same.
          */
+        @Override
         public boolean sameDefinition(AntTypeDefinition other, Project project) {
             return (other != null && other.getClass() == getClass() && parent != null
                 && parent.sameDefinition(((PreSetDefinition) other).parent, project)
@@ -264,6 +278,7 @@
          * @param project the current project.
          * @return true if the definitions are similar.
          */
+        @Override
         public boolean similarDefinition(
             AntTypeDefinition other, Project project) {
             return (other != null && other.getClass().getName().equals(
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,7 +21,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.HashSet;
-import java.util.Iterator;
+import java.util.Set;
 
 /**
  * Destroys all registered <code>Process</code>es when the VM exits.
@@ -30,7 +30,8 @@
  */
 class ProcessDestroyer implements Runnable {
     private static final int THREAD_DIE_TIMEOUT = 20000;
-    private HashSet processes = new HashSet();
+
+    private Set<Process> processes = new HashSet<>();
     // methods to register and unregister shutdown hooks
     private Method addShutdownHookMethod;
     private Method removeShutdownHookMethod;
@@ -49,6 +50,7 @@
         public ProcessDestroyerImpl() {
             super("ProcessDestroyer Shutdown Hook");
         }
+        @Override
         public void run() {
             if (shouldDestroy) {
                 ProcessDestroyer.this.run();
@@ -74,12 +76,11 @@
         try {
             // check to see if the shutdown hook methods exists
             // (support pre-JDK 1.3 and Non-Sun VMs)
-            Class[] paramTypes = {Thread.class};
             addShutdownHookMethod =
-                Runtime.class.getMethod("addShutdownHook", paramTypes);
+                Runtime.class.getMethod("addShutdownHook", Thread.class);
 
             removeShutdownHookMethod =
-                Runtime.class.getMethod("removeShutdownHook", paramTypes);
+                Runtime.class.getMethod("removeShutdownHook", Thread.class);
             // wait to add shutdown hook as needed
         } catch (NoSuchMethodException e) {
             // it just won't be added as a shutdown hook... :(
@@ -95,9 +96,8 @@
     private void addShutdownHook() {
         if (addShutdownHookMethod != null && !running) {
             destroyProcessThread = new ProcessDestroyerImpl();
-            Object[] args = {destroyProcessThread};
             try {
-                addShutdownHookMethod.invoke(Runtime.getRuntime(), args);
+                addShutdownHookMethod.invoke(Runtime.getRuntime(), destroyProcessThread);
                 added = true;
             } catch (IllegalAccessException e) {
                 e.printStackTrace(); //NOSONAR
@@ -119,13 +119,9 @@
      */
     private void removeShutdownHook() {
         if (removeShutdownHookMethod != null && added && !running) {
-            Object[] args = {destroyProcessThread};
             try {
-                Boolean removed =
-                    (Boolean) removeShutdownHookMethod.invoke(
-                        Runtime.getRuntime(),
-                        args);
-                if (!removed.booleanValue()) {
+                if (!Boolean.TRUE.equals(removeShutdownHookMethod
+                    .invoke(Runtime.getRuntime(), destroyProcessThread))) {
                     System.err.println("Could not remove shutdown hook");
                 }
             } catch (IllegalAccessException e) {
@@ -180,7 +176,7 @@
     public boolean add(Process process) {
         synchronized (processes) {
             // if this list is empty, register the shutdown hook
-            if (processes.size() == 0) {
+            if (processes.isEmpty()) {
                 addShutdownHook();
             }
             return processes.add(process);
@@ -198,7 +194,7 @@
     public boolean remove(Process process) {
         synchronized (processes) {
             boolean processRemoved = processes.remove(process);
-            if (processRemoved && processes.size() == 0) {
+            if (processRemoved && processes.isEmpty()) {
                 removeShutdownHook();
             }
             return processRemoved;
@@ -208,13 +204,11 @@
     /**
      * Invoked by the VM when it is exiting.
      */
+    @Override
     public void run() {
         synchronized (processes) {
             running = true;
-            Iterator e = processes.iterator();
-            while (e.hasNext()) {
-                ((Process) e.next()).destroy();
-            }
+            processes.forEach(Process::destroy);
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ProjectHelperTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ProjectHelperTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ProjectHelperTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ProjectHelperTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,7 +18,6 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.tools.ant.BuildException;
@@ -33,7 +32,7 @@
  */
 public class ProjectHelperTask extends Task {
 
-    private List projectHelpers = new ArrayList();
+    private List<ProjectHelper> projectHelpers = new ArrayList<>();
 
     public synchronized void addConfigured(ProjectHelper projectHelper) {
         this.projectHelpers.add(projectHelper);
@@ -41,10 +40,7 @@
 
     @Override
     public void execute() throws BuildException {
-        ProjectHelperRepository repo = ProjectHelperRepository.getInstance();
-        for (Iterator it = projectHelpers.iterator(); it.hasNext();) {
-            ProjectHelper helper = (ProjectHelper) it.next();
-            repo.registerProjectHelper(helper.getClass());
-        }
+        projectHelpers.stream().map(ProjectHelper::getClass).forEach(
+            ProjectHelperRepository.getInstance()::registerProjectHelper);
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/PropertyHelperTask.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/PropertyHelperTask.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/PropertyHelperTask.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/PropertyHelperTask.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,7 +18,6 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.tools.ant.BuildException;
@@ -69,7 +68,7 @@
     }
 
     private PropertyHelper propertyHelper;
-    private List delegates;
+    private List<Object> delegates;
 
     /**
      * Add a new PropertyHelper to be set on the Project.
@@ -104,13 +103,14 @@
      * Execute the task.
      * @throws BuildException on error.
      */
+    @Override
     public void execute() throws BuildException {
         if (getProject() == null) {
             throw new BuildException("Project instance not set");
         }
         if (propertyHelper == null && delegates == null) {
-            throw new BuildException("Either a new PropertyHelper"
-                    + " or one or more PropertyHelper delegates are required");
+            throw new BuildException(
+                "Either a new PropertyHelper or one or more PropertyHelper delegates are required");
         }
         PropertyHelper ph = propertyHelper;
         if (ph == null) {
@@ -120,8 +120,7 @@
         }
         synchronized (ph) {
             if (delegates != null) {
-                for (Iterator iter = delegates.iterator(); iter.hasNext();) {
-                    Object o = iter.next();
+                for (Object o : delegates) {
                     PropertyHelper.Delegate delegate = o instanceof DelegateElement
                             ? ((DelegateElement) o).resolve() : (PropertyHelper.Delegate) o;
                     log("Adding PropertyHelper delegate " + delegate, Project.MSG_DEBUG);
@@ -136,9 +135,9 @@
         }
     }
 
-    private synchronized List getAddDelegateList() {
+    private synchronized List<Object> getAddDelegateList() {
         if (delegates == null) {
-            delegates = new ArrayList();
+            delegates = new ArrayList<>();
         }
         return delegates;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Property.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Property.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Property.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Property.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,12 +18,11 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.nio.file.Files;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 
@@ -218,9 +217,8 @@
                 msg = currentValue + msg;
             }
             internalSetValue(msg);
-        } else if (msg.trim().length() > 0) {
-            throw new BuildException("can't combine nested text with value"
-                                     + " attribute");
+        } else if (!msg.trim().isEmpty()) {
+            throw new BuildException("can't combine nested text with value attribute");
         }
     }
 
@@ -464,27 +462,31 @@
 
         if (name != null) {
             if (untypedValue == null && ref == null) {
-                throw new BuildException("You must specify value, location or "
-                                         + "refid with the name attribute",
-                                         getLocation());
+                throw new BuildException(
+                    "You must specify value, location or refid with the name attribute",
+                    getLocation());
             }
         } else {
-            if (url == null && file == null && resource == null && env == null) {
-                throw new BuildException("You must specify url, file, resource or "
-                                         + "environment when not using the "
-                                         + "name attribute", getLocation());
+            if (url == null && file == null && resource == null
+                && env == null) {
+                throw new BuildException(
+                    "You must specify url, file, resource or environment when not using the name attribute",
+                    getLocation());
             }
         }
 
         if (url == null && file == null && resource == null && prefix != null) {
-            throw new BuildException("Prefix is only valid when loading from "
-                                     + "a url, file or resource", getLocation());
+            throw new BuildException(
+                "Prefix is only valid when loading from a url, file or resource",
+                getLocation());
         }
 
         if (name != null && untypedValue != null) {
             if (relative) {
                 try {
-                    File from = untypedValue instanceof File ? (File)untypedValue : new File(untypedValue.toString());
+                    File from =
+                        untypedValue instanceof File ? (File) untypedValue
+                            : new File(untypedValue.toString());
                     File to = basedir != null ? basedir : getProject().getBaseDir();
                     String relPath = FileUtils.getRelativePath(to, from);
                     relPath = relPath.replace('/', File.separatorChar);
@@ -537,13 +539,8 @@
         Properties props = new Properties();
         log("Loading " + url, Project.MSG_VERBOSE);
         try {
-            InputStream is = url.openStream();
-            try {
+            try (InputStream is = url.openStream()) {
                 loadProperties(props, is, url.getFile().endsWith(".xml"));
-            } finally {
-                if (is != null) {
-                    is.close();
-                }
             }
             addProperties(props);
         } catch (IOException ex) {
@@ -584,12 +581,8 @@
         log("Loading " + file.getAbsolutePath(), Project.MSG_VERBOSE);
         try {
             if (file.exists()) {
-                FileInputStream  fis = null;
-                try {
-                    fis = new FileInputStream(file);
+                try (InputStream fis = Files.newInputStream(file.toPath())) {
                     loadProperties(props, fis, file.getName().endsWith(".xml"));
-                } finally {
-                    FileUtils.close(fis);
                 }
                 addProperties(props);
             } else {
@@ -608,17 +601,16 @@
     protected void loadResource(String name) {
         Properties props = new Properties();
         log("Resource Loading " + name, Project.MSG_VERBOSE);
-        InputStream is = null;
         ClassLoader cL = null;
         boolean cleanup = false;
+        if (classpath != null) {
+            cleanup = true;
+            cL = getProject().createClassLoader(classpath);
+        } else {
+            cL = this.getClass().getClassLoader();
+        }
+        InputStream is = null;
         try {
-            if (classpath != null) {
-                cleanup = true;
-                cL = getProject().createClassLoader(classpath);
-            } else {
-                cL = this.getClass().getClassLoader();
-            }
-
             if (cL == null) {
                 is = ClassLoader.getSystemResourceAsStream(name);
             } else {
@@ -651,9 +643,8 @@
             prefix += ".";
         }
         log("Loading Environment " + prefix, Project.MSG_VERBOSE);
-        Map osEnv = Execute.getEnvironmentVariables();
-        for (Iterator e = osEnv.entrySet().iterator(); e.hasNext();) {
-            Map.Entry entry = (Map.Entry) e.next();
+        Map<String, String> osEnv = Execute.getEnvironmentVariables();
+        for (Map.Entry<String, String> entry : osEnv.entrySet()) {
             props.put(prefix + entry.getKey(), entry.getValue());
         }
         addProperties(props);
@@ -665,18 +656,17 @@
      * @param props the properties to iterate over
      */
     protected void addProperties(Properties props) {
-        HashMap m = new HashMap(props);
-        resolveAllProperties(m);
-        for (Iterator it = m.keySet().iterator(); it.hasNext();) {
-            Object k = it.next();
+        Map<String, Object> m = new HashMap<>();
+        props.forEach((k, v) -> {
             if (k instanceof String) {
-                String propertyName = (String) k;
-                if (prefix != null) {
-                    propertyName = prefix + propertyName;
-                }
-                addProperty(propertyName, m.get(k));
+                m.put((String) k, v);
             }
-        }
+        });
+        resolveAllProperties(m);
+        m.forEach((k, v) -> {
+            String propertyName = prefix == null ? k : prefix + k;
+            addProperty(propertyName, v);
+        });
     }
 
     /**
@@ -711,7 +701,7 @@
      * resolve properties inside a properties hashtable
      * @param props properties object to resolve
      */
-    private void resolveAllProperties(Map props) throws BuildException {
+    private void resolveAllProperties(Map<String, Object> props) throws BuildException {
         PropertyHelper propertyHelper
             = PropertyHelper.getPropertyHelper(getProject());
         new ResolvePropertyMap(
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,9 +17,9 @@
  */
 package org.apache.tools.ant.taskdefs;
 
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
+import java.nio.file.Paths;
 
 import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.BuildException;
@@ -27,6 +27,7 @@
 import org.apache.tools.ant.DefaultLogger;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.SubBuildListener;
+import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.StringUtils;
 
 /**
@@ -357,7 +358,7 @@
     private void openFileImpl(boolean append) throws BuildException {
         if (out == null) {
             try {
-                out = new PrintStream(new FileOutputStream(filename, append));
+                out = new PrintStream(FileUtils.newOutputStream(Paths.get(filename), append));
             } catch (IOException ioe) {
                 throw new BuildException("Problems opening file using a "
                                          + "recorder entry", ioe);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Rename.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Rename.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Rename.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Rename.java	2018-03-24 12:37:12.000000000 +0000
@@ -32,6 +32,7 @@
  * @deprecated The rename task is deprecated since Ant 1.2.  Use move instead.
  * @since Ant 1.1
  */
+@Deprecated
 public class Rename extends Task {
 
     private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Replace.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Replace.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Replace.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Replace.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,8 +21,6 @@
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -30,11 +28,13 @@
 import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.Writer;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Properties;
 
 import org.apache.tools.ant.BuildException;
@@ -70,7 +70,7 @@
     private Resource propertyResource = null;
     private Resource replaceFilterResource = null;
     private Properties properties = null;
-    private ArrayList replacefilters = new ArrayList();
+    private List<Replacefilter> replacefilters = new ArrayList<>();
 
     private File dir = null;
 
@@ -146,39 +146,34 @@
         public void validate() throws BuildException {
             //Validate mandatory attributes
             if (token == null) {
-                String message = "token is a mandatory for replacefilter.";
-                throw new BuildException(message);
+                throw new BuildException(
+                    "token is a mandatory for replacefilter.");
             }
 
             if ("".equals(token.getText())) {
-                String message = "The token must not be an empty "
-                    + "string.";
-                throw new BuildException(message);
+                throw new BuildException(
+                    "The token must not be an empty string.");
             }
 
             //value and property are mutually exclusive attributes
             if ((value != null) && (property != null)) {
-                String message = "Either value or property "
-                    + "can be specified, but a replacefilter "
-                    + "element cannot have both.";
-                throw new BuildException(message);
+                throw new BuildException(
+                    "Either value or property can be specified, but a replacefilter element cannot have both.");
             }
 
             if ((property != null)) {
                 //the property attribute must have access to a property file
                 if (propertyResource == null) {
-                    String message = "The replacefilter's property attribute "
-                        + "can only be used with the replacetask's "
-                        + "propertyFile/Resource attribute.";
-                    throw new BuildException(message);
+                    throw new BuildException(
+                        "The replacefilter's property attribute can only be used with the replacetask's propertyFile/Resource attribute.");
                 }
 
                 //Make sure property exists in property file
                 if (properties == null
                     || properties.getProperty(property) == null) {
-                    String message = "property \"" + property
-                        + "\" was not found in " + propertyResource.getName();
-                    throw new BuildException(message);
+                    throw new BuildException(
+                        "property \"%s\" was not found in %s", property,
+                        propertyResource.getName());
                 }
             }
 
@@ -192,14 +187,15 @@
         public String getReplaceValue() {
             if (property != null) {
                 return properties.getProperty(property);
-            } else if (value != null) {
+            }
+            if (value != null) {
                 return value.getText();
-            } else if (Replace.this.value != null) {
+            }
+            if (Replace.this.value != null) {
                 return Replace.this.value.getText();
-            } else {
-                //Default is empty string
-                return "";
             }
+            //Default is empty string
+            return "";
         }
 
         /**
@@ -355,12 +351,13 @@
      * a StringBuffer. Compatible with the Replacefilter.
      * @since 1.7
      */
-    private class FileInput /* JDK 5: implements Closeable */ {
+    private class FileInput implements AutoCloseable {
+        private static final int BUFF_SIZE = 4096;
+
         private StringBuffer outputBuffer;
         private final InputStream is;
         private Reader reader;
         private char[] buffer;
-        private static final int BUFF_SIZE = 4096;
 
         /**
          * Constructs the input component. Opens the file for reading.
@@ -370,9 +367,11 @@
         FileInput(File source) throws IOException {
             outputBuffer = new StringBuffer();
             buffer = new char[BUFF_SIZE];
-            is = new FileInputStream(source);
+            is = Files.newInputStream(source.toPath());
             try {
-                reader = new BufferedReader(encoding != null ? new InputStreamReader(is, encoding) : new InputStreamReader(is));
+                reader = new BufferedReader(
+                    encoding != null ? new InputStreamReader(is, encoding)
+                        : new InputStreamReader(is));
             } finally {
                 if (reader == null) {
                     is.close();
@@ -395,8 +394,7 @@
          * @throws IOException When the file cannot be read from.
          */
         boolean readChunk() throws IOException {
-            int bufferLength = 0;
-            bufferLength = reader.read(buffer);
+            int bufferLength = reader.read(buffer);
             if (bufferLength < 0) {
                 return false;
             }
@@ -408,6 +406,7 @@
          * Closes the file.
          * @throws IOException When the file cannot be closed.
          */
+        @Override
         public void close() throws IOException {
             is.close();
         }
@@ -419,7 +418,7 @@
      * Replacefilter.
      * @since 1.7
      */
-    private class FileOutput /* JDK 5: implements Closeable */ {
+    private class FileOutput implements AutoCloseable {
         private StringBuffer inputBuffer;
         private final OutputStream os;
         private Writer writer;
@@ -430,9 +429,11 @@
          * @throws IOException When the file cannot be read from.
          */
         FileOutput(File out) throws IOException {
-            os = new FileOutputStream(out);
+            os = Files.newOutputStream(out.toPath());
             try {
-                writer = new BufferedWriter(encoding != null ? new OutputStreamWriter(os, encoding) : new OutputStreamWriter(os));
+                writer = new BufferedWriter(
+                    encoding != null ? new OutputStreamWriter(os, encoding)
+                        : new OutputStreamWriter(os));
             } finally {
                 if (writer == null) {
                     os.close();
@@ -478,6 +479,7 @@
          * Closes the file.
          * @throws IOException When the file cannot be closed.
          */
+        @Override
         public void close() throws IOException {
             os.close();
         }
@@ -488,9 +490,9 @@
      * Do the execution.
      * @throws BuildException if we can't build
      */
+    @Override
     public void execute() throws BuildException {
-
-        ArrayList savedFilters = (ArrayList) replacefilters.clone();
+        List<Replacefilter> savedFilters = new ArrayList<>(replacefilters);
         Properties savedProperties =
             properties == null ? null : (Properties) properties.clone();
 
@@ -498,10 +500,10 @@
             // line separators in values and tokens are "\n"
             // in order to compare with the file contents, replace them
             // as needed
-            StringBuffer val = new StringBuffer(value.getText());
+            StringBuilder val = new StringBuilder(value.getText());
             stringReplace(val, "\r\n", "\n");
             stringReplace(val, "\n", StringUtils.LINE_SEP);
-            StringBuffer tok = new StringBuffer(token.getText());
+            StringBuilder tok = new StringBuilder(token.getText());
             stringReplace(tok, "\r\n", "\n");
             stringReplace(tok, "\n", StringUtils.LINE_SEP);
             Replacefilter firstFilter = createPrimaryfilter();
@@ -512,7 +514,7 @@
         try {
             if (replaceFilterResource != null) {
                 Properties props = getProperties(replaceFilterResource);
-                Iterator e = getOrderedIterator(props);
+                Iterator<Object> e = getOrderedIterator(props);
                 while (e.hasNext()) {
                     String tok = e.next().toString();
                     Replacefilter replaceFilter = createReplacefilter();
@@ -537,19 +539,15 @@
 
             if (dir != null) {
                 DirectoryScanner ds = super.getDirectoryScanner(dir);
-                String[] srcs = ds.getIncludedFiles();
-
-                for (int i = 0; i < srcs.length; i++) {
-                    File file = new File(dir, srcs[i]);
+                for (String src : ds.getIncludedFiles()) {
+                    File file = new File(dir, src);
                     processFile(file);
                 }
             }
 
             if (resources != null) {
                 for (Resource r : resources) {
-                    FileProvider fp =
-                    r.as(FileProvider.class);
-                    processFile(fp.getFile());
+                    processFile(r.as(FileProvider.class).getFile());
                 }
             }
 
@@ -575,23 +573,24 @@
      */
     public void validateAttributes() throws BuildException {
         if (sourceFile == null && dir == null && resources == null) {
-            String message = "Either the file or the dir attribute "
-                + "or nested resources must be specified";
-            throw new BuildException(message, getLocation());
+            throw new BuildException(
+                "Either the file or the dir attribute or nested resources must be specified",
+                getLocation());
         }
         if (propertyResource != null && !propertyResource.isExists()) {
-            String message = "Property file " + propertyResource.getName()
-                + " does not exist.";
-            throw new BuildException(message, getLocation());
-        }
-        if (token == null && replacefilters.size() == 0) {
-            String message = "Either token or a nested replacefilter "
-                + "must be specified";
-            throw new BuildException(message, getLocation());
+            throw new BuildException("Property file "
+                + propertyResource.getName() + " does not exist.",
+                getLocation());
+        }
+        if (token == null && replacefilters.isEmpty()) {
+            throw new BuildException(
+                "Either token or a nested replacefilter must be specified",
+                getLocation());
         }
         if (token != null && "".equals(token.getText())) {
-            String message = "The token attribute must not be an empty string.";
-            throw new BuildException(message, getLocation());
+            throw new BuildException(
+                "The token attribute must not be an empty string.",
+                getLocation());
         }
     }
 
@@ -603,12 +602,7 @@
      */
     public void validateReplacefilters()
             throws BuildException {
-        final int size = replacefilters.size();
-        for (int i = 0; i < size; i++) {
-            Replacefilter element =
-                (Replacefilter) replacefilters.get(i);
-            element.validate();
-        }
+        replacefilters.forEach(Replacefilter::validate);
     }
 
     /**
@@ -632,18 +626,14 @@
         throws BuildException {
         Properties props = new Properties();
 
-        InputStream in = null;
-        try {
-            in = propertyResource.getInputStream();
+        try (
+            InputStream
+            in = propertyResource.getInputStream()){
             props.load(in);
         } catch (IOException e) {
-            String message = "Property resource (" + propertyResource.getName()
-                + ") cannot be loaded.";
-            throw new BuildException(message);
-        } finally {
-            FileUtils.close(in);
+            throw new BuildException("Property resource (%s) cannot be loaded.",
+                propertyResource.getName());
         }
-
         return props;
     }
 
@@ -668,26 +658,19 @@
             File temp = FILE_UTILS.createTempFile("rep", ".tmp",
                     src.getParentFile(), false, true);
             try {
-                FileInput in = new FileInput(src);
-                try {
-                    FileOutput out = new FileOutput(temp);
-                    try {
-                        out.setInputBuffer(buildFilterChain(in.getOutputBuffer()));
-
-                        while (in.readChunk()) {
-                            if (processFilterChain()) {
-                                out.process();
-                            }
+                try (FileInput in = new FileInput(src);
+                     FileOutput out = new FileOutput(temp)) {
+                    out.setInputBuffer(buildFilterChain(in.getOutputBuffer()));
+
+                    while (in.readChunk()) {
+                        if (processFilterChain()) {
+                            out.process();
                         }
+                    }
 
-                        flushFilterChain();
+                    flushFilterChain();
 
-                        out.flush();
-                    } finally {
-                        out.close();
-                    }
-                } finally {
-                    in.close();
+                    out.flush();
                 }
                 boolean changes = (replaceCount != repCountStart);
                 if (changes) {
@@ -714,11 +697,7 @@
      * Flushes all filters.
      */
     private void flushFilterChain() {
-        final int size = replacefilters.size();
-        for (int i = 0; i < size; i++) {
-            Replacefilter filter = (Replacefilter) replacefilters.get(i);
-            filter.flush();
-        }
+        replacefilters.forEach(Replacefilter::flush);
     }
 
     /**
@@ -726,14 +705,7 @@
      * @return true if the filter chain produced new output.
      */
     private boolean processFilterChain() {
-        final int size = replacefilters.size();
-        for (int i = 0; i < size; i++) {
-            Replacefilter filter = (Replacefilter) replacefilters.get(i);
-            if (!filter.process()) {
-                return false;
-            }
-        }
-        return true;
+        return replacefilters.stream().allMatch(Replacefilter::process);
     }
 
     /**
@@ -746,7 +718,7 @@
         StringBuffer buf = inputBuffer;
         final int size = replacefilters.size();
         for (int i = 0; i < size; i++) {
-            Replacefilter filter = (Replacefilter) replacefilters.get(i);
+            Replacefilter filter = replacefilters.get(i);
             filter.setInputBuffer(buf);
             buf = filter.getOutputBuffer();
         }
@@ -758,13 +730,14 @@
      * @param filename <code>String</code>.
      */
     private void logFilterChain(String filename) {
-        final int size = replacefilters.size();
-        for (int i = 0; i < size; i++) {
-            Replacefilter filter = (Replacefilter) replacefilters.get(i);
-            log("Replacing in " + filename + ": " + filter.getToken()
-                    + " --> " + filter.getReplaceValue(), Project.MSG_VERBOSE);
-        }
+        replacefilters
+            .forEach(
+                filter -> log(
+                    "Replacing in " + filename + ": " + filter.getToken()
+                        + " --> " + filter.getReplaceValue(),
+                    Project.MSG_VERBOSE));
     }
+
     /**
      * Set the source file; required unless <code>dir</code> is set.
      * @param file source <code>File</code>.
@@ -953,7 +926,7 @@
      * @param str1 String
      * @param str2 String
      */
-    private void stringReplace(StringBuffer str, String str1, String str2) {
+    private void stringReplace(StringBuilder str, String str1, String str2) {
         int found = str.indexOf(str1);
         final int str1Length = str1.length();
         final int str2Length = str2.length();
@@ -970,17 +943,9 @@
      * @param props Properties
      */
     private Iterator<Object> getOrderedIterator(Properties props) {
-        List<Object> keys = new ArrayList<Object>(props.keySet());
-        Collections.sort(keys, new Comparator<Object>() {
-                //Override annotation is not supported as long as we want to support building Ant on Java 1.5
-                public int compare(Object key1, Object key2) {
-                    return compare(key1.toString(), key2.toString());
-                }
-
-                private int compare(String key1, String key2) {
-                    return key2.length() - key1.length();
-                }
-            });
+        List<Object> keys = new ArrayList<>(props.keySet());
+        Collections.sort(keys, Comparator
+            .comparingInt(o -> Objects.toString(o, "").length()).reversed());
         return keys.iterator();
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ResourceCount.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ResourceCount.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/ResourceCount.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/ResourceCount.java	2018-03-24 12:37:12.000000000 +0000
@@ -61,8 +61,8 @@
     public void setRefid(Reference r) {
         Object o = r.getReferencedObject();
         if (!(o instanceof ResourceCollection)) {
-            throw new BuildException(r.getRefId()
-                + " doesn\'t denote a ResourceCollection");
+            throw new BuildException("%s doesn\'t denote a ResourceCollection",
+                r.getRefId());
         }
         add((ResourceCollection) o);
     }
@@ -70,6 +70,7 @@
     /**
      * Execute as a Task.
      */
+    @Override
     public void execute() {
         if (rc == null) {
             throw new BuildException(ONE_NESTED_MESSAGE);
@@ -86,6 +87,7 @@
      * @return true if the specified ResourceCollection satisfies the set criteria.
      * @throws BuildException if an error occurs.
      */
+    @Override
     public boolean eval() {
         if (rc == null) {
             throw new BuildException(ONE_NESTED_MESSAGE);
@@ -93,7 +95,7 @@
         if (count == null) {
             throw new BuildException(COUNT_REQUIRED);
         }
-        return when.evaluate(new Integer(rc.size()).compareTo(count));
+        return when.evaluate(Integer.valueOf(rc.size()).compareTo(count));
     }
 
     /**
@@ -101,7 +103,7 @@
      * @param c number of Resources as int.
      */
     public void setCount(int c) {
-        count = new Integer(c);
+        count = Integer.valueOf(c);
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Retry.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Retry.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Retry.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Retry.java	2018-03-24 12:37:13.000000000 +0000
@@ -48,11 +48,11 @@
      * set the task
      * @param t the task to retry.
      */
+    @Override
     public synchronized void addTask(Task t) {
         if (nestedTask != null) {
             throw new BuildException(
-                "The retry task container accepts a single nested task"
-                + " (which may be a sequential task container)");
+                "The retry task container accepts a single nested task (which may be a sequential task container)");
         }
         nestedTask = t;
     }
@@ -81,8 +81,9 @@
      * perform the work
      * @throws BuildException if there is an error.
      */
+    @Override
     public void execute() throws BuildException {
-        StringBuffer errorMessages = new StringBuffer();
+        StringBuilder errorMessages = new StringBuilder();
         for (int i = 0; i <= retryCount; i++) {
             try {
                 nestedTask.perform();
@@ -90,7 +91,7 @@
             } catch (Exception e) {
                 errorMessages.append(e.getMessage());
                 if (i >= retryCount) {
-                    StringBuffer exceptionMessage = new StringBuffer();
+                    StringBuilder exceptionMessage = new StringBuilder();
                     exceptionMessage.append("Task [").append(nestedTask.getTaskName());
                     exceptionMessage.append("] failed after [").append(retryCount);
                     exceptionMessage.append("] attempts; giving up.").append(StringUtils.LINE_SEP);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java	2018-03-24 12:37:12.000000000 +0000
@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.Random;
 import java.util.Vector;
+import java.util.stream.Collectors;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -42,8 +43,6 @@
  */
 public abstract class DefaultRmicAdapter implements RmicAdapter {
 
-    private Rmic attributes;
-    private FileNameMapper mapper;
     private static final Random RAND = new Random();
     /** suffix denoting a stub file: {@value} */
     public static final String RMI_STUB_SUFFIX = "_Stub";
@@ -71,16 +70,14 @@
      */
     public static final String STUB_OPTION_COMPAT = "compat";
 
-    /**
-     * Default constructor
-     */
-    public DefaultRmicAdapter() {
-    }
+    private Rmic attributes;
+    private FileNameMapper mapper;
 
     /**
      * Sets Rmic attributes
      * @param attributes the rmic attributes
      */
+    @Override
     public void setRmic(final Rmic attributes) {
         this.attributes = attributes;
         mapper = new RmicFileNameMapper();
@@ -135,6 +132,7 @@
      * </ul>
      * @return a <code>FileNameMapper</code>
      */
+    @Override
     public FileNameMapper getMapper() {
         return mapper;
     }
@@ -143,6 +141,7 @@
      * Gets the CLASSPATH this rmic process will use.
      * @return the classpath
      */
+    @Override
     public Path getClasspath() {
         return getCompileClasspath();
     }
@@ -177,6 +176,18 @@
     }
 
     /**
+     * Whether the iiop and idl switches are supported.
+     *
+     * <p>This implementation returns false if running on Java 11
+     * onwards and true otherwise.</p>
+     * @return true if the iiop and idl switches are supported
+     * @since Ant 1.10.3
+     */
+    protected boolean areIiopAndIdlSupported() {
+        return !JavaEnvUtils.isAtLeastJavaVersion("11");
+    }
+
+    /**
      * Setup rmic argument for rmic.
      * @return the command line
      */
@@ -223,6 +234,9 @@
         }
 
         if (attributes.getIiop()) {
+            if (!areIiopAndIdlSupported()) {
+                throw new BuildException("this rmic implementation doesn't support the -iiop switch");
+            }
             attributes.log("IIOP has been turned on.", Project.MSG_INFO);
             cmd.createArgument().setValue("-iiop");
             if (attributes.getIiopopts() != null) {
@@ -233,6 +247,9 @@
         }
 
         if (attributes.getIdl())  {
+            if (!areIiopAndIdlSupported()) {
+                throw new BuildException("this rmic implementation doesn't support the -idl switch");
+            }
             cmd.createArgument().setValue("-idl");
             attributes.log("IDL has been turned on.", Project.MSG_INFO);
             if (attributes.getIdlopts() != null) {
@@ -311,17 +328,16 @@
      */
     protected String[] filterJvmCompilerArgs(String[] compilerArgs) {
         int len = compilerArgs.length;
-        List args = new ArrayList(len);
+        List<String> args = new ArrayList<>(len);
         for (int i = 0; i < len; i++) {
             String arg = compilerArgs[i];
-            if (!arg.startsWith("-J")) {
-                args.add(arg);
-            } else {
+            if (arg.startsWith("-J")) {
                 attributes.log("Dropping " + arg + " from compiler arguments");
+            } else {
+                args.add(arg);
             }
         }
-        int count = args.size();
-        return (String[]) args.toArray(new String[count]);
+        return args.toArray(new String[args.size()]);
     }
 
 
@@ -331,24 +347,18 @@
      * @param cmd the commandline args
      */
     protected void logAndAddFilesToCompile(Commandline cmd) {
-        Vector compileList = attributes.getCompileList();
+        Vector<String> compileList = attributes.getCompileList();
 
         attributes.log("Compilation " + cmd.describeArguments(),
                        Project.MSG_VERBOSE);
 
-        StringBuffer niceSourceList = new StringBuffer("File");
-        int cListSize = compileList.size();
-        if (cListSize != 1) {
-            niceSourceList.append("s");
-        }
-        niceSourceList.append(" to be compiled:");
-
-        for (int i = 0; i < cListSize; i++) {
-            String arg = (String) compileList.elementAt(i);
-            cmd.createArgument().setValue(arg);
-            niceSourceList.append("    ");
-            niceSourceList.append(arg);
-        }
+        StringBuilder niceSourceList =
+            new StringBuilder(compileList.size() == 1 ? "File" : "Files")
+                .append(" to be compiled:");
+
+        niceSourceList.append(
+            compileList.stream().peek(arg -> cmd.createArgument().setValue(arg))
+                .collect(Collectors.joining("    ")));
 
         attributes.log(niceSourceList.toString(), Project.MSG_VERBOSE);
     }
@@ -380,20 +390,20 @@
      */
     private class RmicFileNameMapper implements FileNameMapper {
 
-        RmicFileNameMapper() {
-        }
-
         /**
          * Empty implementation.
          */
+        @Override
         public void setFrom(String s) {
         }
         /**
          * Empty implementation.
          */
+        @Override
         public void setTo(String s) {
         }
 
+        @Override
         public String[] mapFileName(String name) {
             if (name == null
                 || !name.endsWith(".class")
@@ -438,7 +448,7 @@
             } else if (!attributes.getIdl()) {
                 int lastSlash = base.lastIndexOf(File.separatorChar);
 
-                String dirname = "";
+                String dirname;
                 /*
                  * I know, this is not necessary, but I prefer it explicit (SB)
                  */
@@ -446,6 +456,7 @@
                 if (lastSlash == -1) {
                     // no package
                     index = 0;
+                    dirname = "";
                 } else {
                     index = lastSlash + 1;
                     dirname = base.substring(0, index);
@@ -454,7 +465,7 @@
                 String filename = base.substring(index);
 
                 try {
-                    Class c = attributes.getLoader().loadClass(classname);
+                    Class<?> c = attributes.getLoader().loadClass(classname);
 
                     if (c.isInterface()) {
                         // only stub, no tie
@@ -467,14 +478,15 @@
                          * stub is derived from implementation,
                          * tie from interface name.
                          */
-                        Class interf = attributes.getRemoteInterface(c);
+                        Class<?> interf = attributes.getRemoteInterface(c);
                         String iName = interf.getName();
-                        String iDir = "";
-                        int iIndex = -1;
-                        int lastDot = iName.lastIndexOf(".");
+                        String iDir;
+                        int iIndex;
+                        int lastDot = iName.lastIndexOf('.');
                         if (lastDot == -1) {
                             // no package
                             iIndex = 0;
+                            iDir = "";
                         } else {
                             iIndex = lastDot + 1;
                             iDir = iName.substring(0, iIndex);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/rmic/ForkingSunRmic.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/rmic/ForkingSunRmic.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/rmic/ForkingSunRmic.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/rmic/ForkingSunRmic.java	2018-03-24 12:37:12.000000000 +0000
@@ -46,10 +46,26 @@
     public static final String COMPILER_NAME = "forking";
 
     /**
+     * @since Ant 1.10.3
+     */
+    @Override
+    protected boolean areIiopAndIdlSupported() {
+        boolean supported = !JavaEnvUtils.isAtLeastJavaVersion("11");
+        if (!supported && getRmic().getExecutable() != null) {
+            getRmic().getProject()
+                .log("Allowing -iiop and -idl for forked rmic even though this version of Java doesn't support it.",
+                     Project.MSG_INFO);
+            return true;
+        }
+        return supported;
+    }
+
+    /**
      * exec by creating a new command
      * @return true if the command ran successfully
      * @throws BuildException on error
      */
+    @Override
     public boolean execute() throws BuildException {
         Rmic owner = getRmic();
         Commandline cmd = setupRmicCommand();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java	2018-03-24 12:37:12.000000000 +0000
@@ -43,16 +43,26 @@
      */
     public static final String COMPILER_NAME = "kaffe";
 
+    /**
+     * @since Ant 1.10.3
+     */
+    @Override
+    protected boolean areIiopAndIdlSupported() {
+        // actually I don't think Kaffee supports either, but we've
+        // accepted the flags prior to 1.10.3
+        return true;
+    }
+
     /** {@inheritDoc} */
+    @Override
     public boolean execute() throws BuildException {
         getRmic().log("Using Kaffe rmic", Project.MSG_VERBOSE);
         Commandline cmd = setupRmicCommand();
 
-        Class c = getRmicClass();
+        Class<?> c = getRmicClass();
         if (c == null) {
-            StringBuffer buf = new StringBuffer("Cannot use Kaffe rmic, as it"
-                                                + " is not available.  None"
-                                                + " of ");
+            StringBuilder buf = new StringBuilder(
+                "Cannot use Kaffe rmic, as it is not available.  None of ");
             for (int i = 0; i < RMIC_CLASSNAMES.length; i++) {
                 if (i != 0) {
                     buf.append(", ");
@@ -60,8 +70,8 @@
 
                 buf.append(RMIC_CLASSNAMES[i]);
             }
-            buf.append(" have been found. A common solution is to set the"
-                       + " environment variable JAVA_HOME or CLASSPATH.");
+            buf.append(
+                " have been found. A common solution is to set the environment variable JAVA_HOME or CLASSPATH.");
             throw new BuildException(buf.toString(),
                                      getRmic().getLocation());
         }
@@ -91,7 +101,7 @@
      *
      * @return null if neither class can get loaded.
      */
-    private static Class getRmicClass() {
+    private static Class<?> getRmicClass() {
         for (int i = 0; i < RMIC_CLASSNAMES.length; i++) {
             try {
                 return Class.forName(RMIC_CLASSNAMES[i]);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java	2018-03-24 12:37:12.000000000 +0000
@@ -106,13 +106,17 @@
         }
         if (SunRmic.COMPILER_NAME.equalsIgnoreCase(rmicType)) {
             return new SunRmic();
-        } else if (KaffeRmic.COMPILER_NAME.equalsIgnoreCase(rmicType)) {
+        }
+        if (KaffeRmic.COMPILER_NAME.equalsIgnoreCase(rmicType)) {
             return new KaffeRmic();
-        } else if (WLRmic.COMPILER_NAME.equalsIgnoreCase(rmicType)) {
+        }
+        if (WLRmic.COMPILER_NAME.equalsIgnoreCase(rmicType)) {
             return new WLRmic();
-        } else if (ForkingSunRmic.COMPILER_NAME.equalsIgnoreCase(rmicType)) {
+        }
+        if (ForkingSunRmic.COMPILER_NAME.equalsIgnoreCase(rmicType)) {
             return new ForkingSunRmic();
-        } else if (XNewRmic.COMPILER_NAME.equalsIgnoreCase(rmicType)) {
+        }
+        if (XNewRmic.COMPILER_NAME.equalsIgnoreCase(rmicType)) {
             return new XNewRmic();
         }
         //no match?
@@ -133,7 +137,7 @@
     private static RmicAdapter resolveClassName(String className,
                                                 ClassLoader loader)
             throws BuildException {
-        return (RmicAdapter) ClasspathUtils.newInstance(className,
+        return ClasspathUtils.newInstance(className,
                 loader != null ? loader :
                 RmicAdapterFactory.class.getClassLoader(), RmicAdapter.class);
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java	2018-03-24 12:37:12.000000000 +0000
@@ -51,13 +51,10 @@
      */
     public static final String RMIC_EXECUTABLE = "rmic";
     /** Error message to use with the sun rmic is not the classpath. */
-    public static final String ERROR_NO_RMIC_ON_CLASSPATH = "Cannot use SUN rmic, as it is not "
-                                         + "available.  A common solution is to "
-                                         + "set the environment variable "
-                                         + "JAVA_HOME";
-    public static final String ERROR_NO_RMIC_ON_CLASSPATH_JAVA_9 = "Cannot use SUN rmic, as it is not "
-                                         + "available.  The class we try to use is part of the jdk.rmic module which may not be. "
-                                         + "Please use the 'forking' compiler for JDK 9+";
+    public static final String ERROR_NO_RMIC_ON_CLASSPATH =
+        "Cannot use SUN rmic, as it is not available.  A common solution is to set the environment variable JAVA_HOME";
+    public static final String ERROR_NO_RMIC_ON_CLASSPATH_JAVA_9 =
+        "Cannot use SUN rmic, as it is not available.  The class we try to use is part of the jdk.rmic module which may not be. Please use the 'forking' compiler for JDK 9+";
     /** Error message to use when there is an error starting the sun rmic compiler */
     public static final String ERROR_RMIC_FAILED = "Error starting SUN rmic: ";
 
@@ -66,29 +63,28 @@
      * @return true if the compilation succeeded
      * @throws BuildException on error
      */
+    @Override
     public boolean execute() throws BuildException {
         getRmic().log("Using SUN rmic compiler", Project.MSG_VERBOSE);
         Commandline cmd = setupRmicCommand();
 
         // Create an instance of the rmic, redirecting output to
         // the project log
-        LogOutputStream logstr = new LogOutputStream(getRmic(),
-                                                     Project.MSG_WARN);
+        LogOutputStream logstr =
+            new LogOutputStream(getRmic(), Project.MSG_WARN);
 
         boolean success = false;
         try {
-            Class c = Class.forName(RMIC_CLASSNAME);
-            Constructor cons
-                = c.getConstructor(new Class[]  {OutputStream.class, String.class});
-            Object rmic = cons.newInstance(new Object[] {logstr, "rmic"});
-
-            Method doRmic = c.getMethod("compile",
-                                        new Class [] {String[].class});
-            Boolean ok =
-                (Boolean) doRmic.invoke(rmic,
-                                       (new Object[] {cmd.getArguments()}));
+            Class<?> c = Class.forName(RMIC_CLASSNAME);
+            Constructor<?> cons =
+                c.getConstructor(OutputStream.class, String.class);
+            Object rmic = cons.newInstance(logstr, "rmic");
+
+            Method doRmic = c.getMethod("compile", String[].class);
+            boolean ok = Boolean.TRUE
+                .equals(doRmic.invoke(rmic, (Object) cmd.getArguments()));
             success = true;
-            return ok.booleanValue();
+            return ok;
         } catch (ClassNotFoundException ex) {
             if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)) {
                 throw new BuildException(ERROR_NO_RMIC_ON_CLASSPATH_JAVA_9,
@@ -99,10 +95,9 @@
         } catch (Exception ex) {
             if (ex instanceof BuildException) {
                 throw (BuildException) ex;
-            } else {
-                throw new BuildException(ERROR_RMIC_FAILED,
-                                         ex, getRmic().getLocation());
             }
+            throw new BuildException(ERROR_RMIC_FAILED,
+                                     ex, getRmic().getLocation());
         } finally {
             try {
                 logstr.close();
@@ -122,6 +117,7 @@
      * @param compilerArgs the original compiler arguments
      * @return the filtered set.
      */
+    @Override
     protected String[] preprocessCompilerArgs(String[] compilerArgs) {
         return filterJvmCompilerArgs(compilerArgs);
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java	2018-03-24 12:37:12.000000000 +0000
@@ -40,8 +40,7 @@
 
     /** The error string to use if not able to find the weblogic rmic */
     public static final String ERROR_NO_WLRMIC_ON_CLASSPATH =
-        "Cannot use WebLogic rmic, as it is not "
-        + "available. Add it to Ant's classpath with the -lib option";
+        "Cannot use WebLogic rmic, as it is not available. Add it to Ant's classpath with the -lib option";
 
     /** The error string to use if not able to start the weblogic rmic */
     public static final String ERROR_WLRMIC_FAILED = "Error starting WebLogic rmic: ";
@@ -53,10 +52,21 @@
     public static final String UNSUPPORTED_STUB_OPTION = "Unsupported stub option: ";
 
     /**
+     * @since Ant 1.10.3
+     */
+    @Override
+    protected boolean areIiopAndIdlSupported() {
+        // actually I don't think Weblogic's rmic supports either, but
+        // we've accepted the flags prior to 1.10.3
+        return true;
+    }
+
+    /**
      * Carry out the rmic compilation.
      * @return true if the compilation succeeded
      * @throws  BuildException on error
      */
+    @Override
     public boolean execute() throws BuildException {
         getRmic().log("Using WebLogic rmic", Project.MSG_VERBOSE);
         Commandline cmd = setupRmicCommand(new String[] {"-noexit"});
@@ -64,7 +74,7 @@
         AntClassLoader loader = null;
         try {
             // Create an instance of the rmic
-            Class c = null;
+            Class<?> c;
             if (getRmic().getClasspath() == null) {
                 c = Class.forName(WLRMIC_CLASSNAME);
             } else {
@@ -72,9 +82,8 @@
                     = getRmic().getProject().createClassLoader(getRmic().getClasspath());
                 c = Class.forName(WLRMIC_CLASSNAME, true, loader);
             }
-            Method doRmic = c.getMethod("main",
-                                        new Class [] {String[].class});
-            doRmic.invoke(null, new Object[] {cmd.getArguments()});
+            Method doRmic = c.getMethod("main", String[].class);
+            doRmic.invoke(null, (Object) cmd.getArguments());
             return true;
         } catch (ClassNotFoundException ex) {
             throw new BuildException(ERROR_NO_WLRMIC_ON_CLASSPATH, getRmic().getLocation());
@@ -96,6 +105,7 @@
      * Get the suffix for the rmic stub classes
      * @return the stub suffix
      */
+    @Override
     public String getStubClassSuffix() {
         return WL_RMI_STUB_SUFFIX;
     }
@@ -104,6 +114,7 @@
      * Get the suffix for the rmic skeleton classes
      * @return the skeleton suffix
      */
+    @Override
     public String getSkelClassSuffix() {
         return WL_RMI_SKEL_SUFFIX;
     }
@@ -114,6 +125,7 @@
      * @param compilerArgs the original compiler arguments
      * @return the filtered set.
      */
+    @Override
     protected String[] preprocessCompilerArgs(String[] compilerArgs) {
         return filterJvmCompilerArgs(compilerArgs);
     }
@@ -123,6 +135,7 @@
      * stub option is set, a warning is printed.
      * @return null, for no stub version
      */
+    @Override
     protected String addStubVersionOptions() {
         //handle the many different stub options.
         String stubVersion = getRmic().getStubVersion();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java	2018-03-24 12:37:12.000000000 +0000
@@ -33,14 +33,11 @@
      */
     public static final String COMPILER_NAME = "xnew";
 
-    /** No-arg constructor. */
-    public XNewRmic() {
-    }
-
     /**
      * Create a normal command line, then with -Xnew at the front
      * @return a command line that hands off to thw
      */
+    @Override
     protected Commandline setupRmicCommand() {
         String[] options = new String[] {
                 "-Xnew"
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Rmic.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Rmic.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Rmic.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Rmic.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,6 +21,7 @@
 import java.io.IOException;
 import java.rmi.Remote;
 import java.util.Vector;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
@@ -91,6 +92,23 @@
     public static final String ERROR_RMIC_FAILED
         = "Rmic failed; see the compiler error output for details.";
 
+    /** unable to verify message */
+    public static final String ERROR_UNABLE_TO_VERIFY_CLASS = "Unable to verify class ";
+    /** could not be found message */
+    public static final String ERROR_NOT_FOUND = ". It could not be found.";
+    /** not defined message */
+    public static final String ERROR_NOT_DEFINED = ". It is not defined.";
+    /** loaded error message */
+    public static final String ERROR_LOADING_CAUSED_EXCEPTION = ". Loading caused Exception: ";
+    /** base not exists message */
+    public static final String ERROR_NO_BASE_EXISTS = "base or destdir does not exist: ";
+    /** base not a directory message */
+    public static final String ERROR_NOT_A_DIR = "base or destdir is not a directory:";
+    /** base attribute not set message */
+    public static final String ERROR_BASE_NOT_SET = "base or destdir attribute must be set!";
+
+    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
+
     private File baseDir;
     private File destDir;
     private String classname;
@@ -109,28 +127,11 @@
     private boolean includeAntRuntime = true;
     private boolean includeJavaRuntime = false;
 
-    private Vector compileList = new Vector();
+    private Vector<String> compileList = new Vector<>();
 
     private AntClassLoader loader = null;
 
     private FacadeTaskHelper facade;
-    /** unable to verify message */
-    public static final String ERROR_UNABLE_TO_VERIFY_CLASS = "Unable to verify class ";
-    /** could not be found message */
-    public static final String ERROR_NOT_FOUND = ". It could not be found.";
-    /** not defined message */
-    public static final String ERROR_NOT_DEFINED = ". It is not defined.";
-    /** loaded error message */
-    public static final String ERROR_LOADING_CAUSED_EXCEPTION = ". Loading caused Exception: ";
-    /** base not exists message */
-    public static final String ERROR_NO_BASE_EXISTS = "base or destdir does not exist: ";
-    /** base not a directory message */
-    public static final String ERROR_NOT_A_DIR = "base or destdir is not a directory:";
-    /** base attribute not set message */
-    public static final String ERROR_BASE_NOT_SET = "base or destdir attribute must be set!";
-
-    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
-
     private String executable = null;
 
     private boolean listFiles = false;
@@ -405,7 +406,7 @@
      * Gets file list to compile.
      * @return the list of files to compile.
      */
-    public Vector getFileList() {
+    public Vector<String> getFileList() {
         return compileList;
     }
 
@@ -484,7 +485,7 @@
     /**
      * @return the compile list.
      */
-    public Vector getCompileList() {
+    public Vector<String> getCompileList() {
         return compileList;
     }
 
@@ -496,7 +497,7 @@
      * @since Ant 1.5
      */
     public void setCompiler(String compiler) {
-        if (compiler.length() > 0) {
+        if (!compiler.isEmpty()) {
             facade.setImplementation(compiler);
         }
     }
@@ -651,9 +652,7 @@
                     + outputDir, Project.MSG_INFO);
 
                 if (listFiles) {
-                    for (int i = 0; i < fileCount; i++) {
-                        log(compileList.get(i).toString());
-                    }
+                    compileList.forEach(this::log);
                 }
 
                 // finally, lets execute the compiler!!
@@ -674,11 +673,8 @@
                     log("sourcebase attribute will be ignored.",
                         Project.MSG_WARN);
                 } else {
-                    for (int j = 0; j < fileCount; j++) {
-                        moveGeneratedFile(outputDir, sourceBase,
-                                          (String) compileList.elementAt(j),
-                                          adapter);
-                    }
+                    compileList.forEach(f -> moveGeneratedFile(outputDir,
+                        sourceBase, f, adapter));
                 }
             }
         } finally {
@@ -709,17 +705,18 @@
         String classFileName = classname.replace('.', File.separatorChar)
             + ".class";
         String[] generatedFiles = adapter.getMapper().mapFileName(classFileName);
+        if (generatedFiles == null) {
+            return;
+        }
 
-        for (int i = 0; i < generatedFiles.length; i++) {
-            final String generatedFile = generatedFiles[i];
+        for (String generatedFile : generatedFiles) {
             if (!generatedFile.endsWith(".class")) {
                 // don't know how to handle that - a IDL file doesn't
                 // have a corresponding Java source for example.
                 continue;
             }
-            String sourceFileName = StringUtils.removeSuffix(generatedFile,
-                                                             ".class")
-                + ".java";
+            String sourceFileName =
+                StringUtils.removeSuffix(generatedFile, ".class") + ".java";
 
             File oldFile = new File(baseDir, sourceFileName);
             if (!oldFile.exists()) {
@@ -738,10 +735,9 @@
                 }
                 oldFile.delete();
             } catch (IOException ioe) {
-                String msg = "Failed to copy " + oldFile + " to " + newFile
-                    + " due to "
-                    + ioe.getMessage();
-                throw new BuildException(msg, ioe, getLocation());
+                throw new BuildException("Failed to copy " + oldFile + " to "
+                    + newFile + " due to " + ioe.getMessage(), ioe,
+                    getLocation());
             }
         }
     }
@@ -765,11 +761,9 @@
             SourceFileScanner sfs = new SourceFileScanner(this);
             newFiles = sfs.restrict(files, baseDir, getOutputDir(), mapper);
         }
-        for (int i = 0; i < newFiles.length; i++) {
-            String name = newFiles[i].replace(File.separatorChar, '.');
-            name = name.substring(0, name.lastIndexOf(".class"));
-            compileList.addElement(name);
-        }
+        Stream.of(newFiles).map(s -> s.replace(File.separatorChar, '.'))
+            .map(s -> s.substring(0, s.lastIndexOf(".class")))
+            .forEach(compileList::add);
     }
 
     /**
@@ -779,7 +773,7 @@
      */
     public boolean isValidRmiRemote(String classname) {
         try {
-            Class testClass = loader.loadClass(classname);
+            Class<?> testClass = loader.loadClass(classname);
             // One cannot RMIC an interface for "classic" RMI (JRMP)
             if (testClass.isInterface() && !iiop && !idl) {
                 return false;
@@ -807,26 +801,17 @@
      * @return the topmost interface that extends Remote, or null if there
      *         is none.
      */
-    public Class getRemoteInterface(Class testClass) {
-        if (Remote.class.isAssignableFrom(testClass)) {
-            Class [] interfaces = testClass.getInterfaces();
-            if (interfaces != null) {
-                for (int i = 0; i < interfaces.length; i++) {
-                    if (Remote.class.isAssignableFrom(interfaces[i])) {
-                        return interfaces[i];
-                    }
-                }
-            }
-        }
-        return null;
+    public Class<?> getRemoteInterface(Class<?> testClass) {
+        return Stream.of(testClass.getInterfaces())
+            .filter(Remote.class::isAssignableFrom).findFirst().orElse(null);
     }
 
     /**
      * Check to see if the class or (super)interfaces implement
      * java.rmi.Remote.
      */
-    private boolean isValidRmiRemote (Class testClass) {
-        return getRemoteInterface(testClass) != null;
+    private boolean isValidRmiRemote(Class<?> testClass) {
+        return Remote.class.isAssignableFrom(testClass);
     }
 
     /**
@@ -843,7 +828,7 @@
      * implementation.
      */
     public class ImplementationSpecificArgument extends
-                                                    org.apache.tools.ant.util.facade.ImplementationSpecificArgument {
+        org.apache.tools.ant.util.facade.ImplementationSpecificArgument {
         /**
          * Only pass the specified argument if the
          * chosen compiler implementation matches the
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/SendEmail.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/SendEmail.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/SendEmail.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/SendEmail.java	2018-03-24 12:37:12.000000000 +0000
@@ -39,6 +39,7 @@
      * @deprecated since 1.5.x.
      *             Use {@link #setMailport(int)} instead.
      */
+    @Deprecated
     public void setMailport(Integer value) {
         setMailport(value.intValue());
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Sequential.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Sequential.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Sequential.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Sequential.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,7 +17,7 @@
  */
 package org.apache.tools.ant.taskdefs;
 
-import java.util.Iterator;
+import java.util.List;
 import java.util.Vector;
 
 import org.apache.tools.ant.BuildException;
@@ -41,15 +41,16 @@
 public class Sequential extends Task implements TaskContainer {
 
     /** Optional Vector holding the nested tasks */
-    private Vector nestedTasks = new Vector();
+    private List<Task> nestedTasks = new Vector<>();
 
     /**
      * Add a nested task to Sequential.
      *
      * @param nestedTask  Nested task to execute Sequential
      */
+    @Override
     public void addTask(Task nestedTask) {
-        nestedTasks.addElement(nestedTask);
+        nestedTasks.add(nestedTask);
     }
 
     /**
@@ -57,15 +58,13 @@
      *
      * @throws BuildException if one of the nested tasks fails.
      */
+    @Override
     public void execute() throws BuildException {
         LocalProperties localProperties
             = LocalProperties.get(getProject());
         localProperties.enterScope();
         try {
-            for (Iterator i = nestedTasks.iterator(); i.hasNext();) {
-                Task nestedTask = (Task) i.next();
-                nestedTask.perform();
-            }
+            nestedTasks.forEach(Task::perform);
         } finally {
             localProperties.exitScope();
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/SetPermissions.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/SetPermissions.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/SetPermissions.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/SetPermissions.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,230 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package org.apache.tools.ant.taskdefs;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.DosFileAttributeView;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.Set;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.Resource;
+import org.apache.tools.ant.types.ResourceCollection;
+import org.apache.tools.ant.types.resources.Resources;
+import org.apache.tools.ant.util.PermissionUtils;
+import org.apache.tools.ant.util.StringUtils;
+
+/**
+ * Sets {@link PosixFilePermission}s for resources.
+ *
+ * <p>This task provides a subset of {@link Chmod}'s and {@link
+ * org.apache.tools.ant.taskdefs.optional.windows.Attrib}'s abilities
+ * in less platform dependent way.</p>
+ *
+ * <p>It requires a file system that supports PosixFilePermissions for
+ * its full potential. It can optionally fall back to
+ * DosFilePermissions (only changing the readonly state) on file
+ * systems that don't support POSIX permissions. See {@link
+ * SetPermissions.NonPosixMode}</p>
+ *
+ * @since Ant 1.10.0
+ */
+public class SetPermissions extends Task {
+    private final Set<PosixFilePermission> permissions =
+        EnumSet.noneOf(PosixFilePermission.class);
+    private Resources resources = null;
+    private boolean failonerror = true;
+    private NonPosixMode nonPosixMode = NonPosixMode.fail;
+
+    /**
+     * Options for dealing with file systems that don't support POSIX
+     * permissions.
+     */
+    public enum NonPosixMode {
+        /** Fail the build. */
+        fail,
+        /** Log an error and go on. */
+        pass,
+        /**
+         * Try DosFilePermissions - setting the read-only flag - and
+         * fail the build if that fails as well.
+         */
+        tryDosOrFail,
+        /**
+         * Try DosFilePermissions - setting the read-only flag - and
+         * log an error and go on if that fails as well.
+         */
+        tryDosOrPass
+    }
+
+    /**
+     * Adds permissions as a comma separated list.
+     * @param perms comma separated list of names of {@link PosixFilePermission}s.
+     */
+    public void setPermissions(String perms) {
+        if (perms != null) {
+            Arrays.stream(perms.split(",")) //NOSONAR
+                .map(String::trim)
+                .filter(s -> !s.isEmpty())
+                .map(s -> Enum.valueOf(PosixFilePermission.class, s))
+                .forEach(permissions::add);
+        }
+    }
+
+    /**
+     * A 3 digit octal string, specify the user, group and
+     * other modes in the standard Unix fashion;
+     * @param octalString a <code>String</code> value
+     */
+    public void setMode(String octalString) {
+        int mode = Integer.parseInt(octalString, 8);
+        permissions.addAll(PermissionUtils.permissionsFromMode(mode));
+    }
+
+    /**
+     * Set whether to fail when errors are encountered. If false, note errors
+     * to the output but keep going. Default is true.
+     * <p>Only applies to IO and SecurityExceptions, see {@link
+     * #setNonPosixMode} for ways to deal with file-systems that don't
+     * support PosixPermissions.</p>
+     * @param failonerror true or false.
+     */
+    public void setFailOnError(final boolean failonerror) {
+        this.failonerror = failonerror;
+    }
+
+    /**
+     * Set what to do if changing the permissions of a file is not
+     * possible because the file-system doesn't support POSIX file
+     * permissions.
+     * <p>The default is {@link NonPosixMode#fail}.</p>
+     * @param m what to do if changing the permissions of a file is not possible
+     */
+    public void setNonPosixMode(NonPosixMode m) {
+        this.nonPosixMode = m;
+    }
+
+    /**
+     * Adds a collection of resources to set permissions on.
+     * @param rc a resource collection
+     */
+    public void add(ResourceCollection rc) {
+        if (resources == null) {
+            resources = new Resources();
+        }
+        resources.add(rc);
+    }
+
+    @Override
+    public void execute() {
+        if (resources == null) {
+            throw new BuildException("At least one resource-collection is required");
+        }
+        Resource currentResource = null;
+        try {
+            for (Resource r : resources) {
+                currentResource = r;
+                try {
+                    PermissionUtils.setPermissions(r, permissions, this::posixPermissionsNotSupported);
+                } catch (IOException ioe) {
+                    maybeThrowException(ioe, "Failed to set permissions on '%s' due to %s", r, ioe.getMessage());
+                }
+            }
+        } catch (ClassCastException cce) {
+            maybeThrowException(null,
+                "some specified permissions are not of type PosixFilePermission: %s",
+                StringUtils.join(permissions, ", "));
+        } catch (SecurityException se) {
+            maybeThrowException(null,
+                "the SecurityManager denies role accessUserInformation or write access for SecurityManager.checkWrite for resource '%s'",
+                currentResource);
+        } catch (BuildException be) {
+            // maybe thrown by callback method this::posixPermissionsNotSupported.
+            maybeThrowException(be, be.getMessage());
+        }
+    }
+
+    private void maybeThrowException(Exception exc, String msgFormat, Object... msgArgs) {
+        String msg = String.format(msgFormat, msgArgs);
+        if (failonerror) {
+            if (exc instanceof BuildException) {
+                throw (BuildException) exc;
+            }
+            throw new BuildException(msg, exc);
+        }
+        log("Warning: " + msg, Project.MSG_ERR);
+    }
+
+    private void posixPermissionsNotSupported(Path p) {
+        String msg = String.format(
+            "the associated path '%s' does not support the PosixFileAttributeView",
+            p);
+        switch (nonPosixMode) {
+        case fail:
+            throw new BuildException(msg);
+        case pass:
+            log("Warning: " + msg, Project.MSG_ERR);
+            break;
+        case tryDosOrFail:
+            tryDos(p, true);
+            break;
+        case tryDosOrPass:
+            tryDos(p, false);
+            break;
+        }
+    }
+
+    private void tryDos(Path p, boolean failIfDosIsNotSupported) {
+        log("Falling back to DosFileAttributeView");
+        boolean readOnly = !isWritable();
+        DosFileAttributeView view = Files.getFileAttributeView(p, DosFileAttributeView.class);
+        if (view != null) {
+            try {
+                view.setReadOnly(readOnly);
+            } catch (IOException ioe) {
+                maybeThrowException(ioe, "Failed to set permissions on '%s' due to %s",
+                                    p, ioe.getMessage());
+            } catch (SecurityException uoe) {
+                maybeThrowException(null,
+                    "the SecurityManager denies role accessUserInformation or write access for SecurityManager.checkWrite for resource '%s'",
+                    p);
+            }
+        } else {
+            String msg = String.format(
+                "the associated path '%s' does not support the DosFileAttributeView",
+                p);
+            if (failIfDosIsNotSupported) {
+                throw new BuildException(msg);
+            }
+            log("Warning: " + msg, Project.MSG_ERR);
+        }
+    }
+
+    private boolean isWritable() {
+        return permissions.contains(PosixFilePermission.OWNER_WRITE)
+            || permissions.contains(PosixFilePermission.GROUP_WRITE)
+            || permissions.contains(PosixFilePermission.OTHERS_WRITE);
+    }
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/SignJar.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/SignJar.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/SignJar.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/SignJar.java	2018-03-24 12:37:12.000000000 +0000
@@ -53,6 +53,38 @@
     private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
 
     /**
+     * error string for unit test verification: {@value}
+     */
+    public static final String ERROR_TODIR_AND_SIGNEDJAR
+            = "'destdir' and 'signedjar' cannot both be set";
+    /**
+     * error string for unit test verification: {@value}
+     */
+    public static final String ERROR_TOO_MANY_MAPPERS = "Too many mappers";
+    /**
+     * error string for unit test verification {@value}
+     */
+    public static final String ERROR_SIGNEDJAR_AND_PATHS
+        = "You cannot specify the signed JAR when using paths or filesets";
+    /**
+     * error string for unit test verification: {@value}
+     */
+    public static final String ERROR_BAD_MAP = "Cannot map source file to anything sensible: ";
+    /**
+     * error string for unit test verification: {@value}
+     */
+    public static final String ERROR_MAPPER_WITHOUT_DEST
+        = "The destDir attribute is required if a mapper is set";
+    /**
+     * error string for unit test verification: {@value}
+     */
+    public static final String ERROR_NO_ALIAS = "alias attribute must be set";
+    /**
+     * error string for unit test verification: {@value}
+     */
+    public static final String ERROR_NO_STOREPASS = "storepass attribute must be set";
+
+    /**
      * name to a signature file
      */
     protected String sigfile;
@@ -129,36 +161,10 @@
     private String digestAlg;
 
     /**
-     * error string for unit test verification: {@value}
+     * tsa digest algorithm
      */
-    public static final String ERROR_TODIR_AND_SIGNEDJAR
-            = "'destdir' and 'signedjar' cannot both be set";
-    /**
-     * error string for unit test verification: {@value}
-     */
-    public static final String ERROR_TOO_MANY_MAPPERS = "Too many mappers";
-    /**
-     * error string for unit test verification {@value}
-     */
-    public static final String ERROR_SIGNEDJAR_AND_PATHS
-        = "You cannot specify the signed JAR when using paths or filesets";
-    /**
-     * error string for unit test verification: {@value}
-     */
-    public static final String ERROR_BAD_MAP = "Cannot map source file to anything sensible: ";
-    /**
-     * error string for unit test verification: {@value}
-     */
-    public static final String ERROR_MAPPER_WITHOUT_DEST
-        = "The destDir attribute is required if a mapper is set";
-    /**
-     * error string for unit test verification: {@value}
-     */
-    public static final String ERROR_NO_ALIAS = "alias attribute must be set";
-    /**
-     * error string for unit test verification: {@value}
-     */
-    public static final String ERROR_NO_STOREPASS = "storepass attribute must be set";
+    private String tsaDigestAlg;
+
     // CheckStyle:VisibilityModifier ON
 
     /**
@@ -369,6 +375,26 @@
     }
 
     /**
+     * TSA Digest Algorithm; optional
+     *
+     * @param digestAlg the tsa digest algorithm
+     * @since Ant 1.10.2
+     */
+    public void setTSADigestAlg(String digestAlg) {
+        this.tsaDigestAlg = digestAlg;
+    }
+
+    /**
+     * TSA Digest Algorithm; optional
+     *
+     * @return String
+     * @since Ant 1.10.2
+     */
+    public String getTSADigestAlg() {
+        return tsaDigestAlg;
+    }
+
+    /**
      * sign the jar(s)
      *
      * @throws BuildException on errors
@@ -424,14 +450,7 @@
 
             Path sources = createUnifiedSourcePath();
             //set up our mapping policy
-            FileNameMapper destMapper;
-            if (hasMapper) {
-                destMapper = mapper;
-            } else {
-                //no mapper? use the identity policy
-                destMapper = new IdentityMapper();
-            }
-
+            FileNameMapper destMapper = hasMapper ? mapper : new IdentityMapper();
 
             //at this point the paths are set up with lists of files,
             //and the mapper is ready to map from source dirs to dest files
@@ -570,6 +589,11 @@
                 addProxyFor(cmd, "http");
             }
         }
+
+        if (tsaDigestAlg != null) {
+            addValue(cmd, "-tsadigestalg");
+            addValue(cmd, tsaDigestAlg);
+        }
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Sleep.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Sleep.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Sleep.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Sleep.java	2018-03-24 12:37:12.000000000 +0000
@@ -64,15 +64,12 @@
      */
     private int milliseconds = 0;
 
-
-
     /**
      * Creates new instance
      */
     public Sleep() {
     }
 
-
     /**
      * seconds to add to the sleep time
      *
@@ -82,7 +79,6 @@
         this.seconds = seconds;
     }
 
-
     /**
      * hours to add to the sleep time.
      *
@@ -92,7 +88,6 @@
         this.hours = hours;
     }
 
-
     /**
      * minutes to add to the sleep time
      *
@@ -102,7 +97,6 @@
         this.minutes = minutes;
     }
 
-
     /**
      * milliseconds to add to the sleep time
      *
@@ -112,7 +106,6 @@
         this.milliseconds = milliseconds;
     }
 
-
     /**
      * sleep for a period of time
      *
@@ -126,7 +119,6 @@
         }
     }
 
-
     /**
      * flag controlling whether to break the build on an error.
      *
@@ -136,7 +128,6 @@
         this.failOnError = failOnError;
     }
 
-
     /**
      * return time to sleep
      *
@@ -150,7 +141,6 @@
         // CheckStyle:MagicNumber ON
     }
 
-
     /**
      * verify parameters
      *
@@ -159,12 +149,10 @@
     public void validate()
         throws BuildException {
         if (getSleepTime() < 0) {
-            throw new BuildException("Negative sleep periods are not "
-                                     + "supported");
+            throw new BuildException("Negative sleep periods are not supported");
         }
     }
 
-
     /**
      * Executes this build task. Throws org.apache.tools.ant.BuildException
      * if there is an error during task execution.
@@ -183,12 +171,9 @@
         } catch (Exception e) {
             if (failOnError) {
                 throw new BuildException(e);
-            } else {
-                String text = e.toString();
-                log(text, Project.MSG_ERR);
             }
+            log(e.toString(), Project.MSG_ERR);
         }
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/SQLExec.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/SQLExec.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/SQLExec.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,14 +20,13 @@
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.io.Reader;
 import java.io.StringReader;
+import java.nio.charset.Charset;
 import java.sql.Blob;
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -36,7 +35,7 @@
 import java.sql.SQLWarning;
 import java.sql.Statement;
 import java.sql.Types;
-import java.util.Enumeration;
+import java.util.List;
 import java.util.Locale;
 import java.util.StringTokenizer;
 import java.util.Vector;
@@ -128,7 +127,7 @@
     /**
      * SQL transactions to perform
      */
-    private Vector transactions = new Vector();
+    private List<Transaction> transactions = new Vector<>();
 
     /**
      * SQL Statement delimiter
@@ -352,7 +351,7 @@
      */
     public Transaction createTransaction() {
         Transaction t = new Transaction();
-        transactions.addElement(t);
+        transactions.add(t);
         return t;
     }
 
@@ -562,8 +561,8 @@
      */
     public void setCsvQuoteCharacter(String s) {
         if (s != null && s.length() > 1) {
-            throw new BuildException("The quote character must be a single"
-                                     + " character.");
+            throw new BuildException(
+                "The quote character must be a single character.");
         }
         csvQuoteChar = s;
     }
@@ -614,17 +613,17 @@
      */
     @Override
     public void execute() throws BuildException {
-        Vector savedTransaction = (Vector) transactions.clone();
+        List<Transaction> savedTransaction = new Vector<>(transactions);
         String savedSqlCommand = sqlCommand;
 
         sqlCommand = sqlCommand.trim();
 
         try {
-            if (srcFile == null && sqlCommand.length() == 0 && resources == null) {
-                if (transactions.size() == 0) {
-                    throw new BuildException("Source file or resource collection, "
-                                             + "transactions or sql statement "
-                                             + "must be set!", getLocation());
+            if (srcFile == null && sqlCommand.isEmpty() && resources == null) {
+                if (transactions.isEmpty()) {
+                    throw new BuildException(
+                        "Source file or resource collection, transactions or sql statement must be set!",
+                        getLocation());
                 }
             }
 
@@ -661,7 +660,7 @@
                         FileProvider fp =
                             output.as(FileProvider.class);
                         if (fp != null) {
-                            os = new FileOutputStream(fp.getFile(), append);
+                            os = FileUtils.newOutputStream(fp.getFile().toPath(), append);
                         } else {
                             if (append) {
                                 Appendable a =
@@ -688,10 +687,8 @@
                     }
 
                     // Process all transactions
-                    for (Enumeration e = transactions.elements();
-                         e.hasMoreElements();) {
-
-                        ((Transaction) e.nextElement()).runTransaction(out);
+                    for (Transaction txn : transactions) {
+                        txn.runTransaction(out);
                         if (!isAutocommit()) {
                             log("Committing transaction", Project.MSG_VERBOSE);
                             getConnection().commit();
@@ -700,33 +697,19 @@
                 } finally {
                     FileUtils.close(out);
                 }
-            } catch (IOException e) {
-                closeQuietly();
-                setErrorProperty();
-                if (onError.equals("abort")) {
-                    throw new BuildException(e, getLocation());
-                }
-            } catch (SQLException e) {
+            } catch (IOException | SQLException e) {
                 closeQuietly();
                 setErrorProperty();
-                if (onError.equals("abort")) {
+                if ("abort".equals(onError)) {
                     throw new BuildException(e, getLocation());
                 }
             } finally {
                 try {
-                    if (getStatement() != null) {
-                        getStatement().close();
-                    }
-                } catch (SQLException ex) {
-                    // ignore
-                }
-                try {
-                    if (getConnection() != null) {
-                        getConnection().close();
-                    }
+                    FileUtils.close(getStatement());
                 } catch (SQLException ex) {
                     // ignore
                 }
+                FileUtils.close(getConnection());
             }
 
             log(goodSql + " of " + totalSql + " SQL statements executed successfully");
@@ -746,10 +729,10 @@
     protected void runStatements(Reader reader, PrintStream out)
         throws SQLException, IOException {
         StringBuffer sql = new StringBuffer();
-        String line;
 
         BufferedReader in = new BufferedReader(reader);
 
+        String line;
         while ((line = in.readLine()) != null) {
             if (!keepformat) {
                 line = line.trim();
@@ -801,7 +784,7 @@
      */
     protected void execSQL(String sql, PrintStream out) throws SQLException {
         // Check and ignore empty statements
-        if ("".equals(sql.trim())) {
+        if (sql.trim().isEmpty()) {
             return;
         }
 
@@ -849,20 +832,14 @@
         } catch (SQLException e) {
             log("Failed to execute: " + sql, Project.MSG_ERR);
             setErrorProperty();
-            if (!onError.equals("abort")) {
+            if (!"abort".equals(onError)) {
                 log(e.toString(), Project.MSG_ERR);
             }
-            if (!onError.equals("continue")) {
+            if (!"continue".equals(onError)) {
                 throw e;
             }
         } finally {
-            if (resultSet != null) {
-                try {
-                    resultSet.close();
-                } catch (SQLException e) {
-                    //ignore
-                }
-            }
+            FileUtils.close(resultSet);
         }
     }
 
@@ -876,13 +853,8 @@
      */
     @Deprecated
     protected void printResults(PrintStream out) throws SQLException {
-        ResultSet rs = getStatement().getResultSet();
-        try {
+        try (ResultSet rs = getStatement().getResultSet()) {
             printResults(rs, out);
-        } finally {
-            if (rs != null) {
-                rs.close();
-            }
         }
     }
 
@@ -937,7 +909,7 @@
         if (csvQuoteChar == null || s == null || (!forceCsvQuoteChar && s.indexOf(csvColumnSep) == -1 && s.indexOf(csvQuoteChar) == -1)) {
             return s;
         }
-        StringBuffer sb = new StringBuffer(csvQuoteChar);
+        StringBuilder sb = new StringBuilder(csvQuoteChar);
         int len = s.length();
         char q = csvQuoteChar.charAt(0);
         for (int i = 0; i < len; i++) {
@@ -956,7 +928,7 @@
      * @since Ant 1.7
      */
     private void closeQuietly() {
-        if (!isAutocommit() && getConnection() != null && onError.equals("abort")) {
+        if (!isAutocommit() && getConnection() != null && "abort".equals(onError)) {
             try {
                 getConnection().rollback();
             } catch (SQLException ex) {
@@ -965,7 +937,6 @@
         }
     }
 
-
     /**
      * Caches the connection returned by the base class's getConnection method.
      *
@@ -1005,7 +976,6 @@
             statement = getConnection().createStatement();
             statement.setEscapeProcessing(escapeProcessing);
         }
-
         return statement;
     }
 
@@ -1072,18 +1042,15 @@
          */
         public void addConfigured(ResourceCollection a) {
             if (a.size() != 1) {
-                throw new BuildException("only single argument resource "
-                                         + "collections are supported.");
+                throw new BuildException(
+                    "only single argument resource collections are supported.");
             }
             setSrcResource(a.iterator().next());
         }
 
-        /**
-         *
-         */
         private void runTransaction(PrintStream out)
             throws IOException, SQLException {
-            if (tSqlCommand.length() != 0) {
+            if (!tSqlCommand.isEmpty()) {
                 log("Executing commands", Project.MSG_INFO);
                 runStatements(new StringReader(tSqlCommand), out);
             }
@@ -1091,16 +1058,11 @@
             if (tSrcResource != null) {
                 log("Executing resource: " + tSrcResource.toString(),
                     Project.MSG_INFO);
-                InputStream is = null;
-                Reader reader = null;
-                try {
-                    is = tSrcResource.getInputStream();
-                    reader = (encoding == null) ? new InputStreamReader(is)
-                        : new InputStreamReader(is, encoding);
+                Charset charset = encoding == null ? Charset.defaultCharset()
+                    : Charset.forName(encoding);
+                try (Reader reader = new InputStreamReader(
+                    tSrcResource.getInputStream(), charset)) {
                     runStatements(reader, out);
-                } finally {
-                    FileUtils.close(is);
-                    FileUtils.close(reader);
                 }
             }
         }
@@ -1116,33 +1078,31 @@
             }
             // no match
             return -1;
-        } else {
-            String d = delimiter.trim().toLowerCase(Locale.ENGLISH);
-            if (delimiterType.equals(DelimiterType.NORMAL)) {
-                // still trying to avoid wasteful copying, see
-                // StringUtils.endsWith
-                int endIndex = delimiter.length() - 1;
-                int bufferIndex = buf.length() - 1;
-                while (bufferIndex >= 0 && Character.isWhitespace(buf.charAt(bufferIndex))) {
-                    --bufferIndex;
-                }
-                if (bufferIndex < endIndex) {
+        }
+        String d = delimiter.trim().toLowerCase(Locale.ENGLISH);
+        if (DelimiterType.NORMAL.equals(delimiterType)) {
+            // still trying to avoid wasteful copying, see
+            // StringUtils.endsWith
+            int endIndex = delimiter.length() - 1;
+            int bufferIndex = buf.length() - 1;
+            while (bufferIndex >= 0 && Character.isWhitespace(buf.charAt(bufferIndex))) {
+                --bufferIndex;
+            }
+            if (bufferIndex < endIndex) {
+                return -1;
+            }
+            while (endIndex >= 0) {
+                if (buf.substring(bufferIndex, bufferIndex + 1).toLowerCase(Locale.ENGLISH)
+                        .charAt(0) != d.charAt(endIndex)) {
                     return -1;
                 }
-                while (endIndex >= 0) {
-                    if (buf.substring(bufferIndex, bufferIndex + 1).toLowerCase(Locale.ENGLISH)
-                            .charAt(0) != d.charAt(endIndex)) {
-                        return -1;
-                    }
-                    bufferIndex--;
-                    endIndex--;
-                }
-                return bufferIndex + 1;
-            } else {
-                return currentLine.trim().toLowerCase(Locale.ENGLISH).equals(d)
-                    ? buf.length() - currentLine.length() : -1;
+                bufferIndex--;
+                endIndex--;
             }
+            return bufferIndex + 1;
         }
+        return currentLine.trim().toLowerCase(Locale.ENGLISH).equals(d)
+            ? buf.length() - currentLine.length() : -1;
     }
 
     private void printWarnings(SQLWarning warning, boolean force)
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java	2018-03-24 12:37:12.000000000 +0000
@@ -58,7 +58,6 @@
         this(is, os, closeWhenExhausted, false);
     }
 
-
     /**
      * Create a new StreamPumper.
      * <p><b>Note:</b> If you set useAvailable to true, you must
@@ -114,6 +113,7 @@
      *
      * Terminates as soon as the input stream is closed or an error occurs.
      */
+    @Override
     public void run() {
         synchronized (this) {
             started = true;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/SubAnt.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/SubAnt.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/SubAnt.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,7 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Enumeration;
+import java.util.List;
 import java.util.Vector;
 
 import org.apache.tools.ant.BuildException;
@@ -72,12 +72,12 @@
     private boolean failOnError = true;
     private String output  = null;
 
-    private Vector properties = new Vector();
-    private Vector references = new Vector();
-    private Vector propertySets = new Vector();
+    private List<Property> properties = new Vector<>();
+    private List<Ant.Reference> references = new Vector<>();
+    private List<PropertySet> propertySets = new Vector<>();
 
     /** the targets to call on the new project */
-    private Vector/*<TargetElement>*/ targets = new Vector();
+    private List<TargetElement> targets = new Vector<>();
 
     /**
      * Get the default build file name to use when launching the task.
@@ -297,11 +297,7 @@
         ant = createAntTask(directory);
         String antfilename = file.getAbsolutePath();
         ant.setAntfile(antfilename);
-        final int size = targets.size();
-        for (int i = 0; i < size; i++) {
-            TargetElement targetElement = (TargetElement) targets.get(i);
-            ant.addConfiguredTarget(targetElement);
-        }
+        targets.forEach(ant::addConfiguredTarget);
 
         try {
             if (verbose) {
@@ -332,13 +328,15 @@
     private boolean isHardError(Throwable t) {
         if (t instanceof BuildException) {
             return isHardError(t.getCause());
-        } else if (t instanceof OutOfMemoryError) {
+        }
+        if (t instanceof OutOfMemoryError) {
             return true;
-        } else if (t instanceof ThreadDeath) {
+        }
+        if (t instanceof ThreadDeath) {
             return true;
-        } else { // incl. t == null
-            return false;
         }
+        // incl. t == null
+        return false;
     }
 
     /**
@@ -393,8 +391,7 @@
      * @since Ant 1.7
      */
     public void addConfiguredTarget(TargetElement t) {
-        String name = t.getName();
-        if ("".equals(name)) {
+        if (t.getName().isEmpty()) {
             throw new BuildException("target name must not be empty");
         }
         targets.add(t);
@@ -446,7 +443,7 @@
      * @param  p the property to pass on explicitly to the sub-build.
      */
     public void addProperty(Property p) {
-        properties.addElement(p);
+        properties.add(p);
     }
 
     /**
@@ -456,7 +453,7 @@
      * @param  r the reference to pass on explicitly to the sub-build.
      */
     public void addReference(Ant.Reference r) {
-        references.addElement(r);
+        references.add(r);
     }
 
     /**
@@ -465,7 +462,7 @@
      * @param ps the propertyset
      */
     public void addPropertyset(PropertySet ps) {
-        propertySets.addElement(ps);
+        propertySets.add(ps);
     }
 
     /**
@@ -595,18 +592,14 @@
         }
 
         antTask.setInheritAll(inheritAll);
-        for (Enumeration i = properties.elements(); i.hasMoreElements();) {
-            copyProperty(antTask.createProperty(), (Property) i.nextElement());
-        }
 
-        for (Enumeration i = propertySets.elements(); i.hasMoreElements();) {
-            antTask.addPropertyset((PropertySet) i.nextElement());
-        }
+        properties.forEach(p -> copyProperty(antTask.createProperty(), p));
+
+        propertySets.forEach(antTask::addPropertyset);
 
         antTask.setInheritRefs(inheritRefs);
-        for (Enumeration i = references.elements(); i.hasMoreElements();) {
-            antTask.addReference((Ant.Reference) i.nextElement());
-        }
+
+        references.forEach(antTask::addReference);
 
         return antTask;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Sync.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Sync.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Sync.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Sync.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,12 +19,12 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import java.util.Enumeration;
+import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
@@ -105,7 +105,7 @@
         File toDir = myCopy.getToDir();
 
         // The complete list of files to copy
-        Set allFiles = myCopy.nonOrphans;
+        Set<String> allFiles = myCopy.nonOrphans;
 
         // If the destination directory didn't already exist,
         // or was empty, then no previous file removal is necessary!
@@ -124,7 +124,7 @@
         // will hold the directories matched by SyncTarget in reversed
         // lexicographic order (order is important, that's why we use
         // a LinkedHashSet
-        Set preservedDirectories = new LinkedHashSet();
+        Set<File> preservedDirectories = new LinkedHashSet<>();
 
         // Get rid of all files not listed in the source filesets.
         log("PASS#2: Removing orphan files from " + toDir, Project.MSG_DEBUG);
@@ -186,15 +186,15 @@
      * Position 0 of the array is the number of orphaned directories.
      * Position 1 of the array is the number or orphaned files.
      */
-    private int[] removeOrphanFiles(Set nonOrphans, File toDir,
-                                    Set preservedDirectories) {
+    private int[] removeOrphanFiles(Set<String> nonOrphans, File toDir,
+                                    Set<File> preservedDirectories) {
         int[] removedCount = new int[] {0, 0};
         String[] excls =
-            (String[]) nonOrphans.toArray(new String[nonOrphans.size() + 1]);
+            nonOrphans.toArray(new String[nonOrphans.size() + 1]);
         // want to keep toDir itself
         excls[nonOrphans.size()] = "";
 
-        DirectoryScanner ds = null;
+        DirectoryScanner ds;
         if (syncTarget != null) {
             FileSet fs = syncTarget.toFileSet(false);
             fs.setDir(toDir);
@@ -213,8 +213,8 @@
             FileSelector[] s = syncTarget.getSelectors(getProject());
             if (s.length > 0) {
                 NoneSelector ns = new NoneSelector();
-                for (int i = 0; i < s.length; i++) {
-                    ns.appendSelector(s[i]);
+                for (FileSelector element : s) {
+                    ns.appendSelector(element);
                 }
                 fs.appendSelector(ns);
             }
@@ -227,8 +227,8 @@
 
         ds.scan();
         String[] files = ds.getIncludedFiles();
-        for (int i = 0; i < files.length; i++) {
-            File f = new File(toDir, files[i]);
+        for (String file : files) {
+            File f = new File(toDir, file);
             log("Removing orphan file: " + f, Project.MSG_DEBUG);
             f.delete();
             ++removedCount[1];
@@ -282,7 +282,7 @@
      * @return the number of empty directories actually removed.
      */
     private int removeEmptyDirectories(File dir, boolean removeIfEmpty,
-                                       Set preservedEmptyDirectories) {
+                                       Set<File> preservedEmptyDirectories) {
         int removedCount = 0;
         if (dir.isDirectory()) {
             File[] children = dir.listFiles();
@@ -323,11 +323,9 @@
      *
      * @since Ant 1.8.0
      */
-    private int removeEmptyDirectories(Set preservedEmptyDirectories) {
+    private int removeEmptyDirectories(Set<File> preservedEmptyDirectories) {
         int removedCount = 0;
-        for (Iterator iter = preservedEmptyDirectories.iterator();
-             iter.hasNext();) {
-            File f = (File) iter.next();
+        for (File f : preservedEmptyDirectories) {
             String[] s = f.list();
             if (s == null || s.length == 0) {
                 log("Removing empty directory: " + f, Project.MSG_DEBUG);
@@ -434,8 +432,8 @@
      */
     public void addPreserveInTarget(SyncTarget s) {
         if (syncTarget != null) {
-            throw new BuildException("you must not specify multiple "
-                                     + "preserveintarget elements.");
+            throw new BuildException(
+                "you must not specify multiple preserveintarget elements.");
         }
         syncTarget = s;
     }
@@ -457,11 +455,7 @@
 
         // List of files that must be copied, irrelevant from the
         // fact that they are newer or not than the destination.
-        private Set nonOrphans = new HashSet();
-
-        /** Constructor for MyCopy. */
-        public MyCopy() {
-        }
+        private Set<String> nonOrphans = new HashSet<>();
 
         /**
          * @see Copy#scan(File, File, String[], String[])
@@ -474,12 +468,8 @@
 
             super.scan(fromDir, toDir, files, dirs);
 
-            for (int i = 0; i < files.length; ++i) {
-                nonOrphans.add(files[i]);
-            }
-            for (int i = 0; i < dirs.length; ++i) {
-                nonOrphans.add(dirs[i]);
-            }
+            Collections.addAll(nonOrphans, files);
+            Collections.addAll(nonOrphans, dirs);
         }
 
         /**
@@ -487,12 +477,11 @@
          * {@inheritDoc}
          */
         @Override
-        protected Map scan(Resource[] resources, File toDir) {
+        protected Map<Resource, String[]> scan(Resource[] resources, File toDir) {
             assertTrue("No mapper", mapperElement == null);
 
-            for (int i = 0; i < resources.length; i++) {
-                nonOrphans.add(resources[i].getName());
-            }
+            Stream.of(resources).map(Resource::getName).forEach(nonOrphans::add);
+
             return super.scan(resources, toDir);
         }
 
@@ -539,6 +528,7 @@
          * This just changes the default value of "defaultexcludes" from
          * true to false.
          */
+        // TODO does it? ^
         public SyncTarget() {
             super();
         }
@@ -551,8 +541,8 @@
          */
         @Override
         public void setDir(File dir) throws BuildException {
-            throw new BuildException("preserveintarget doesn't support the dir "
-                                     + "attribute");
+            throw new BuildException(
+                "preserveintarget doesn't support the dir attribute");
         }
 
         /**
@@ -588,8 +578,8 @@
                 PatternSet ps = mergePatterns(getProject());
                 fs.appendIncludes(ps.getIncludePatterns(getProject()));
                 fs.appendExcludes(ps.getExcludePatterns(getProject()));
-                for (Enumeration e = selectorElements(); e.hasMoreElements();) {
-                    fs.appendSelector((FileSelector) e.nextElement());
+                for (FileSelector sel : getSelectors(getProject())) {
+                    fs.appendSelector(sel);
                 }
                 fs.setDefaultexcludes(getDefaultexcludes());
             }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Tar.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Tar.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Tar.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Tar.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,14 +20,15 @@
 
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.nio.file.Files;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -109,10 +110,10 @@
     private TarLongFileMode longFileMode = new TarLongFileMode();
 
     // need to keep the package private version for backwards compatibility
-    Vector<TarFileSet> filesets = new Vector<TarFileSet>();
+    Vector<TarFileSet> filesets = new Vector<>();
     // we must keep two lists since other classes may modify the
     // filesets Vector (it is package private) without us noticing
-    private final Vector<ResourceCollection> resourceCollections = new Vector<ResourceCollection>();
+    private final List<ResourceCollection> resourceCollections = new Vector<>();
 
     // CheckStyle:VisibilityModifier ON
 
@@ -198,8 +199,7 @@
      */
     @Deprecated
     public void setLongfile(final String mode) {
-        log("DEPRECATED - The setLongfile(String) method has been deprecated."
-            + " Use setLongfile(Tar.TarLongFileMode) instead.");
+        log("DEPRECATED - The setLongfile(String) method has been deprecated. Use setLongfile(Tar.TarLongFileMode) instead.");
         this.longFileMode = new TarLongFileMode();
         longFileMode.setValue(mode);
     }
@@ -230,6 +230,7 @@
      * <li>  none - no compression
      * <li>  gzip - Gzip compression
      * <li>  bzip2 - Bzip2 compression
+     * <li>xz - XZ compression, requires XZ for Java
      * </ul>
      * @param mode the compression method.
      */
@@ -272,8 +273,7 @@
                                      getLocation());
         }
 
-        @SuppressWarnings("unchecked")
-        final Vector<TarFileSet> savedFileSets = (Vector<TarFileSet>) filesets.clone();
+        final Vector<TarFileSet> savedFileSets = new Vector<>(filesets);
         try {
             if (baseDir != null) {
                 if (!baseDir.exists()) {
@@ -287,20 +287,19 @@
                 filesets.addElement(mainFileSet);
             }
 
-            if (filesets.size() == 0 && resourceCollections.size() == 0) {
-                throw new BuildException("You must supply either a basedir "
-                                         + "attribute or some nested resource"
-                                         + " collections.",
-                                         getLocation());
+            if (filesets.isEmpty() && resourceCollections.isEmpty()) {
+                throw new BuildException(
+                    "You must supply either a basedir attribute or some nested resource collections.",
+                    getLocation());
             }
 
             // check if tar is out of date with respect to each
             // fileset
             boolean upToDate = true;
-            for(final TarFileSet tfs : filesets) {
+            for (final TarFileSet tfs : filesets) {
                 upToDate &= check(tfs);
             }
-            for(final ResourceCollection rcol : resourceCollections) {
+            for (final ResourceCollection rcol : resourceCollections) {
                 upToDate &= check(rcol);
             }
 
@@ -313,19 +312,17 @@
             final File parent = tarFile.getParentFile();
             if (parent != null && !parent.isDirectory()
                 && !(parent.mkdirs() || parent.isDirectory())) {
-                throw new BuildException("Failed to create missing parent"
-                                         + " directory for " + tarFile);
+                throw new BuildException(
+                    "Failed to create missing parent directory for %s",
+                    tarFile);
             }
 
             log("Building tar: " + tarFile.getAbsolutePath(), Project.MSG_INFO);
 
-            TarOutputStream tOut = null;
-            try {
-                tOut = new TarOutputStream(
-                    compression.compress(
-                        new BufferedOutputStream(
-                            new FileOutputStream(tarFile))),
-                    encoding);
+            try (TarOutputStream tOut = new TarOutputStream(
+                compression.compress(new BufferedOutputStream(
+                    Files.newOutputStream(tarFile.toPath()))),
+                encoding)) {
                 tOut.setDebug(true);
                 if (longFileMode.isTruncateMode()) {
                     tOut.setLongFileMode(TarOutputStream.LONGFILE_TRUNCATE);
@@ -349,8 +346,6 @@
             } catch (final IOException ioe) {
                 final String msg = "Problem creating TAR: " + ioe.getMessage();
                 throw new BuildException(msg, ioe, getLocation());
-            } finally {
-                FileUtils.close(tOut);
             }
         } finally {
             filesets = savedFileSets;
@@ -600,8 +595,8 @@
         } else if (!rc.isFilesystemOnly() && !supportsNonFileResources()) {
             throw new BuildException("only filesystem resources are supported");
         } else if (rc.isFilesystemOnly()) {
-            final Set<File> basedirs = new HashSet<File>();
-            final Map<File, List<String>> basedirToFilesMap = new HashMap<File, List<String>>();
+            final Set<File> basedirs = new HashSet<>();
+            final Map<File, List<String>> basedirToFilesMap = new HashMap<>();
             for (final Resource res : rc) {
                 final FileResource r = ResourceUtils
                     .asFileResource(res.as(FileProvider.class));
@@ -612,7 +607,7 @@
                 basedirs.add(base);
                 List<String> files = basedirToFilesMap.get(base);
                 if (files == null) {
-                    files = new Vector<String>();
+                    files = new Vector<>();
                     basedirToFilesMap.put(base, files);
                 }
                 if (base == Copy.NULL_FILE_PLACEHOLDER) {
@@ -627,9 +622,7 @@
                 upToDate &= check(tmpBase, files);
             }
         } else { // non-file resources
-            final Iterator<Resource> iter = rc.iterator();
-            while (upToDate && iter.hasNext()) {
-                final Resource r = iter.next();
+            for (Resource r : rc) {
                 upToDate = archiveIsUpToDate(r);
             }
         }
@@ -651,10 +644,10 @@
             upToDate = false;
         }
 
-        for (int i = 0; i < files.length; ++i) {
-            if (tarFile.equals(new File(basedir, files[i]))) {
-                throw new BuildException("A tar file cannot include "
-                                         + "itself", getLocation());
+        for (String file : files) {
+            if (tarFile.equals(new File(basedir, file))) {
+                throw new BuildException("A tar file cannot include itself",
+                    getLocation());
             }
         }
         return upToDate;
@@ -692,20 +685,17 @@
             afs = (ArchiveFileSet) rc;
         }
         if (afs != null && afs.size() > 1
-            && afs.getFullpath(this.getProject()).length() > 0) {
-            throw new BuildException("fullpath attribute may only "
-                                     + "be specified for "
-                                     + "filesets that specify a "
-                                     + "single file.");
+            && !afs.getFullpath(this.getProject()).isEmpty()) {
+            throw new BuildException(
+                "fullpath attribute may only be specified for filesets that specify a single file.");
         }
         final TarFileSet tfs = asTarFileSet(afs);
 
         if (isFileFileSet(rc)) {
             final FileSet fs = (FileSet) rc;
-            final String[] files = getFileNames(fs);
-            for (int i = 0; i < files.length; i++) {
-                final File f = new File(fs.getDir(getProject()), files[i]);
-                final String name = files[i].replace(File.separatorChar, '/');
+            for (String file : getFileNames(fs)) {
+                final File f = new File(fs.getDir(getProject()), file);
+                final String name = file.replace(File.separatorChar, '/');
                 tarFile(f, tOut, name, tfs);
             }
         } else if (rc.isFilesystemOnly()) {
@@ -742,7 +732,7 @@
         final DirectoryScanner ds = fs.getDirectoryScanner(fs.getProject());
         final String[] directories = ds.getIncludedDirectories();
         final String[] filesPerSe = ds.getIncludedFiles();
-        final String[] files = new String [directories.length + filesPerSe.length];
+        final String[] files = new String[directories.length + filesPerSe.length];
         System.arraycopy(directories, 0, files, 0, directories.length);
         System.arraycopy(filesPerSe, 0, files, directories.length,
                          filesPerSe.length);
@@ -759,7 +749,7 @@
      * @since Ant 1.7
      */
     protected TarFileSet asTarFileSet(final ArchiveFileSet archiveFileSet) {
-        TarFileSet tfs = null;
+        TarFileSet tfs;
         if (archiveFileSet != null && archiveFileSet instanceof TarFileSet) {
             tfs = (TarFileSet) archiveFileSet;
         } else {
@@ -837,7 +827,6 @@
             if (files == null) {
                 files = getFileNames(this);
             }
-
             return files;
         }
 
@@ -891,7 +880,7 @@
             POSIX = "posix",
             OMIT = "omit";
 
-        private final String[] validModes = {
+        private static final String[] VALID_MODES = {
             WARN, FAIL, TRUNCATE, GNU, POSIX, OMIT
         };
 
@@ -906,7 +895,7 @@
          */
         @Override
         public String[] getValues() {
-            return validModes;
+            return VALID_MODES;
         }
 
         /**
@@ -971,7 +960,11 @@
          *    BZIP2 compression
          */
         private static final String BZIP2 = "bzip2";
-
+        /**
+         *  XZ compression
+         * @since 1.10.1
+         */
+        private static final String XZ = "xz";
 
         /**
          * Default constructor
@@ -987,7 +980,7 @@
          */
         @Override
         public String[] getValues() {
-            return new String[] {NONE, GZIP, BZIP2};
+            return new String[] {NONE, GZIP, BZIP2, XZ};
         }
 
         /**
@@ -1003,14 +996,39 @@
             final String v = getValue();
             if (GZIP.equals(v)) {
                 return new GZIPOutputStream(ostream);
-            } else {
-                if (BZIP2.equals(v)) {
-                    ostream.write('B');
-                    ostream.write('Z');
-                    return new CBZip2OutputStream(ostream);
-                }
+            }
+            if (XZ.equals(v)) {
+                return newXZOutputStream(ostream);
+            }
+            if (BZIP2.equals(v)) {
+                ostream.write('B');
+                ostream.write('Z');
+                return new CBZip2OutputStream(ostream);
             }
             return ostream;
         }
+
+        private static OutputStream newXZOutputStream(OutputStream ostream)
+            throws BuildException {
+            try {
+                Class<?> fClazz = Class.forName("org.tukaani.xz.FilterOptions");
+                Class<?> oClazz = Class.forName("org.tukaani.xz.LZMA2Options");
+                Class<? extends OutputStream> sClazz =
+                    Class.forName("org.tukaani.xz.XZOutputStream")
+                    .asSubclass(OutputStream.class);
+                Constructor<? extends OutputStream> c =
+                    sClazz.getConstructor(OutputStream.class, fClazz);
+                return c.newInstance(ostream, oClazz.newInstance());
+            } catch (ClassNotFoundException ex) {
+                throw new BuildException("xz compression requires the XZ for Java library",
+                                         ex);
+            } catch (NoSuchMethodException
+                     | InstantiationException
+                     | IllegalAccessException
+                     | InvocationTargetException
+                     ex) {
+                throw new BuildException("failed to create XZOutputStream", ex);
+            }
+        }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Taskdef.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Taskdef.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Taskdef.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Taskdef.java	2018-03-24 12:37:12.000000000 +0000
@@ -43,7 +43,6 @@
      * This sets the adapter and the adaptto classes to
      * TaskAdapter and Task.
      */
-
     public Taskdef() {
         setAdapterClass(TaskAdapter.class);
         setAdaptToClass(Task.class);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/TaskOutputStream.java	2018-03-24 12:37:12.000000000 +0000
@@ -38,7 +38,7 @@
  * @deprecated since 1.2.x.
  * Use LogOutputStream instead.
  */
-
+@Deprecated
 public class TaskOutputStream extends OutputStream {
 
     private Task task;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/TempFile.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/TempFile.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/TempFile.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/TempFile.java	2018-03-24 12:37:12.000000000 +0000
@@ -80,7 +80,6 @@
         this.property = property;
     }
 
-
     /**
      * Sets the destination directory. If not set,
      * the basedir directory is used instead.
@@ -91,7 +90,6 @@
         this.destDir = destDir;
     }
 
-
     /**
      * Sets the optional prefix string for the temp file.
      *
@@ -101,7 +99,6 @@
         this.prefix = prefix;
     }
 
-
     /**
      * Sets the optional suffix string for the temp file.
      *
@@ -149,8 +146,9 @@
      *
      * @exception  BuildException  if something goes wrong with the build
      */
+    @Override
     public void execute() throws BuildException {
-        if (property == null || property.length() == 0) {
+        if (property == null || property.isEmpty()) {
             throw new BuildException("no property specified");
         }
         if (destDir == null) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Touch.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Touch.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Touch.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Touch.java	2018-03-24 12:37:12.000000000 +0000
@@ -23,7 +23,7 @@
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Locale;
+import java.util.List;
 import java.util.Vector;
 
 import org.apache.tools.ant.BuildException;
@@ -67,9 +67,11 @@
     public static final DateFormatFactory DEFAULT_DF_FACTORY
         = new DateFormatFactory() {
 
+        @Override
         public DateFormat getPrimaryFormat() {
             return DateUtils.EN_US_DATE_FORMAT_MIN.get();
         }
+        @Override
         public DateFormat getFallbackFormat() {
             return DateUtils.EN_US_DATE_FORMAT_SEC.get();
         }
@@ -79,7 +81,7 @@
     private File file;
     private long millis = -1;
     private String dateTime;
-    private Vector filesets = new Vector();
+    private List<FileSet> filesets = new Vector<>();
     private Union resources;
     private boolean dateTimeConfigured;
     private boolean mkdirs;
@@ -88,12 +90,6 @@
     private DateFormatFactory dfFactory = DEFAULT_DF_FACTORY;
 
     /**
-     * Construct a new <code>Touch</code> task.
-     */
-    public Touch() {
-    }
-
-    /**
      * Sets a single source file to touch.  If the file does not exist
      * an empty file will be created.
      * @param file the <code>File</code> to touch.
@@ -153,9 +149,11 @@
      */
     public void setPattern(final String pattern) {
         dfFactory = new DateFormatFactory() {
+            @Override
             public DateFormat getPrimaryFormat() {
                 return new SimpleDateFormat(pattern);
             }
+            @Override
             public DateFormat getFallbackFormat() {
                 return null;
             }
@@ -179,8 +177,8 @@
      */
     public void add(FileNameMapper fileNameMapper) throws BuildException {
         if (this.fileNameMapper != null) {
-            throw new BuildException("Only one mapper may be added to the "
-                + getTaskName() + " task.");
+            throw new BuildException(
+                "Only one mapper may be added to the %s task.", getTaskName());
         }
         this.fileNameMapper = fileNameMapper;
     }
@@ -219,8 +217,8 @@
      */
     protected synchronized void checkConfiguration() throws BuildException {
         if (file == null && resources == null) {
-            throw new BuildException("Specify at least one source"
-                                   + "--a file or resource collection.");
+            throw new BuildException(
+                "Specify at least one source--a file or resource collection.");
         }
         if (file != null && file.exists() && file.isDirectory()) {
             throw new BuildException("Use a resource collection to touch directories.");
@@ -250,10 +248,9 @@
                     throw new BuildException(pe.getMessage(), pe, getLocation());
                 }
                 if (workmillis < 0) {
-                    throw new BuildException("Date of " + dateTime
-                            + " results in negative " + "milliseconds value "
-                            + "relative to epoch " + "(January 1, 1970, "
-                            + "00:00:00 GMT).");
+                    throw new BuildException(
+                        "Date of %s results in negative milliseconds value relative to epoch (January 1, 1970, 00:00:00 GMT).",
+                        dateTime);
                 }
             }
             log("Setting millis to " + workmillis + " from datetime attribute",
@@ -270,6 +267,7 @@
      * @throws BuildException
      *             if an error occurs.
      */
+    @Override
     public void execute() throws BuildException {
         checkConfiguration();
         touch();
@@ -301,16 +299,12 @@
         // deal with filesets in a special way since the task
         // originally also used the directories and Union won't return
         // them.
-        final int size = filesets.size();
-        for (int i = 0; i < size; i++) {
-            FileSet fs = (FileSet) filesets.elementAt(i);
+        for (FileSet fs : filesets) {
             DirectoryScanner ds = fs.getDirectoryScanner(getProject());
             File fromDir = fs.getDir(getProject());
 
-            String[] srcDirs = ds.getIncludedDirectories();
-
-            for (int j = 0; j < srcDirs.length; j++) {
-                touch(new FileResource(fromDir, srcDirs[j]), defaultTimestamp);
+            for (String srcDir : ds.getIncludedDirectories()) {
+                touch(new FileResource(fromDir, srcDir), defaultTimestamp);
             }
         }
     }
@@ -323,6 +317,7 @@
      * @throws BuildException on error
      * @deprecated since 1.6.x.
      */
+    @Deprecated
     protected void touch(File file) {
         touch(file, getTimestamp());
     }
@@ -366,8 +361,8 @@
             }
         }
         if (!file.canWrite()) {
-            throw new BuildException("Can not change modification date of "
-                                     + "read-only file " + file);
+            throw new BuildException(
+                "Can not change modification date of read-only file %s", file);
         }
         FILE_UTILS.setFileLastModified(file, modTime);
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Tstamp.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Tstamp.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Tstamp.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,16 +19,20 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.NoSuchElementException;
+import java.util.Optional;
 import java.util.StringTokenizer;
 import java.util.TimeZone;
 import java.util.Vector;
+import java.util.function.BiFunction;
+import java.util.function.Function;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Location;
@@ -46,7 +50,7 @@
  */
 public class Tstamp extends Task {
 
-    private Vector customFormats = new Vector();
+    private List<CustomFormat> customFormats = new Vector<>();
     private String prefix = "";
 
     /**
@@ -67,15 +71,12 @@
      * the standard ones, to get their retaliation in early.
      * @throws BuildException on error.
      */
+    @Override
     public void execute() throws BuildException {
         try {
             Date d = getNow();
 
-            Enumeration i = customFormats.elements();
-            while (i.hasMoreElements()) {
-                CustomFormat cts = (CustomFormat) i.nextElement();
-                cts.execute(getProject(), d, getLocation());
-            }
+            customFormats.forEach(cts -> cts.execute(getProject(), d, getLocation()));
 
             SimpleDateFormat dstamp = new SimpleDateFormat("yyyyMMdd");
             setProperty("DSTAMP", dstamp.format(d));
@@ -98,7 +99,7 @@
      */
     public CustomFormat createFormat() {
         CustomFormat cts = new CustomFormat();
-        customFormats.addElement(cts);
+        customFormats.add(cts);
         return cts;
     }
 
@@ -116,16 +117,41 @@
      * @return Date
      */
     protected Date getNow() {
-        String magicNow = getProject().getProperty(MagicNames.TSTAMP_NOW);
-        if (magicNow != null && magicNow.length() > 0) {
+        Optional<Date> now = getNow(
+            MagicNames.TSTAMP_NOW_ISO,
+            s -> Date.from(Instant.parse(s)),
+            (k, v) -> "magic property " + k + " ignored as '" + v + "' is not in valid ISO pattern"
+        );
+        if (now.isPresent()) {
+            return now.get();
+        }
+
+        now = getNow(
+            MagicNames.TSTAMP_NOW,
+            s -> new Date(1000 * Long.parseLong(s)),
+            (k, v) -> "magic property " + k + " ignored as " + v + " is not a valid number"
+        );
+        return now.orElseGet(Date::new);
+    }
+
+    /**
+     * Checks and returns a Date if the specified property is set.
+     * @param propertyName name of the property to check
+     * @param map conversion of the property value as string to Date
+     * @param log supplier of the log message containing the property name and value if
+     *     the conversion fails
+     * @return Optional containing the Date or null
+     */
+    protected Optional<Date> getNow(String propertyName, Function<String, Date> map, BiFunction<String, String, String> log) {
+        String property = getProject().getProperty(propertyName);
+        if (property != null && property.length() > 0) {
             try {
-                return new Date(1000 * Long.parseLong(magicNow));
-            } catch (NumberFormatException ex) {
-                log("magic property " + MagicNames.TSTAMP_NOW + " ignored as "
-                    + magicNow + " is not a valid number");
+                return Optional.ofNullable(map.apply(property));
+            } catch (Exception e) {
+                log(log.apply(propertyName, property));
             }
         }
-        return new Date();
+        return Optional.empty();
     }
 
     /**
@@ -148,12 +174,6 @@
         private int field = Calendar.DATE;
 
         /**
-         * Create a format
-         */
-        public CustomFormat() {
-        }
-
-        /**
          *  The property to receive the date/time string in the given pattern
          * @param propertyName the name of the property.
          */
@@ -228,9 +248,9 @@
          *             encapsulate operations on the unit in its own
          *             class.
          */
+        @Deprecated
         public void setUnit(String unit) {
-            log("DEPRECATED - The setUnit(String) method has been deprecated."
-                + " Use setUnit(Tstamp.Unit) instead.");
+            log("DEPRECATED - The setUnit(String) method has been deprecated. Use setUnit(Tstamp.Unit) instead.");
             Unit u = new Unit();
             u.setValue(unit);
             field = u.getCalendarField();
@@ -317,19 +337,19 @@
                                                 YEAR
                                               };
 
-        private Map calendarFields = new HashMap();
+        private Map<String, Integer> calendarFields = new HashMap<>();
 
         /** Constructor for Unit enumerated type. */
         public Unit() {
             calendarFields.put(MILLISECOND,
-                               new Integer(Calendar.MILLISECOND));
-            calendarFields.put(SECOND, new Integer(Calendar.SECOND));
-            calendarFields.put(MINUTE, new Integer(Calendar.MINUTE));
-            calendarFields.put(HOUR, new Integer(Calendar.HOUR_OF_DAY));
-            calendarFields.put(DAY, new Integer(Calendar.DATE));
-            calendarFields.put(WEEK, new Integer(Calendar.WEEK_OF_YEAR));
-            calendarFields.put(MONTH, new Integer(Calendar.MONTH));
-            calendarFields.put(YEAR, new Integer(Calendar.YEAR));
+                               Integer.valueOf(Calendar.MILLISECOND));
+            calendarFields.put(SECOND, Integer.valueOf(Calendar.SECOND));
+            calendarFields.put(MINUTE, Integer.valueOf(Calendar.MINUTE));
+            calendarFields.put(HOUR, Integer.valueOf(Calendar.HOUR_OF_DAY));
+            calendarFields.put(DAY, Integer.valueOf(Calendar.DATE));
+            calendarFields.put(WEEK, Integer.valueOf(Calendar.WEEK_OF_YEAR));
+            calendarFields.put(MONTH, Integer.valueOf(Calendar.MONTH));
+            calendarFields.put(YEAR, Integer.valueOf(Calendar.YEAR));
         }
 
         /**
@@ -338,14 +358,14 @@
          */
         public int getCalendarField() {
             String key = getValue().toLowerCase(Locale.ENGLISH);
-            Integer i = (Integer) calendarFields.get(key);
-            return i.intValue();
+            return calendarFields.get(key).intValue();
         }
 
         /**
          * Get the valid values.
          * @return the value values.
          */
+        @Override
         public String[] getValues() {
             return UNITS;
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Typedef.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Typedef.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Typedef.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Typedef.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,8 +18,6 @@
 
 package org.apache.tools.ant.taskdefs;
 
-
-
 /**
  *
  * Adds a data type definition to the current project.
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Unpack.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Unpack.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Unpack.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Unpack.java	2018-03-24 12:37:12.000000000 +0000
@@ -50,6 +50,7 @@
      * @ant.attribute ignore="true"
      * @param src a <code>String</code> value
      */
+    @Deprecated
     public void setSrc(String src) {
         log("DEPRECATED - The setSrc(String) method has been deprecated."
             + " Use setSrc(File) instead.");
@@ -65,6 +66,7 @@
      * @ant.attribute ignore="true"
      * @param dest a <code>String</code> value
      */
+    @Deprecated
     public void setDest(String dest) {
         log("DEPRECATED - The setDest(String) method has been deprecated."
             + " Use setDest(File) instead.");
@@ -85,22 +87,20 @@
      */
     public void setSrcResource(Resource src) {
         if (!src.isExists()) {
-            throw new BuildException(
-                "the archive " + src.getName() + " doesn't exist");
+            throw new BuildException("the archive %s doesn't exist",
+                src.getName());
         }
         if (src.isDirectory()) {
-            throw new BuildException(
-                "the archive " + src.getName() + " can't be a directory");
+            throw new BuildException("the archive %s can't be a directory",
+                src.getName());
         }
         FileProvider fp = src.as(FileProvider.class);
         if (fp != null) {
             source = fp.getFile();
         } else if (!supportsNonFileResources()) {
             throw new BuildException(
-                "The source " + src.getName()
-                + " is not a FileSystem "
-                + "Only FileSystem resources are"
-                + " supported.");
+                "The source %s is not a FileSystem Only FileSystem resources are supported.",
+                src.getName());
         }
         srcResource = src;
     }
@@ -111,8 +111,8 @@
      */
     public void addConfigured(ResourceCollection a) {
         if (a.size() != 1) {
-            throw new BuildException("only single argument resource collections"
-                                     + " are supported as archives");
+            throw new BuildException(
+                "only single argument resource collections are supported as archives");
         }
         setSrcResource(a.iterator().next());
     }
@@ -163,6 +163,7 @@
      * Execute the task.
      * @throws BuildException on error
      */
+    @Override
     public void execute() throws BuildException {
         File savedDest = dest; // may be altered in validate
         try {
@@ -199,7 +200,7 @@
 
     private String getLastNamePart(Resource r) {
         String n = r.getName();
-        int idx = n.lastIndexOf("/");
+        int idx = n.lastIndexOf('/');
         return idx < 0 ? n : n.substring(idx + 1);
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Untar.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Untar.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Untar.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Untar.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,9 +20,11 @@
 
 import java.io.BufferedInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.nio.file.Files;
 import java.util.zip.GZIPInputStream;
 
 import org.apache.tools.ant.BuildException;
@@ -35,8 +37,6 @@
 import org.apache.tools.tar.TarEntry;
 import org.apache.tools.tar.TarInputStream;
 
-
-
 /**
  * Untar a file.
  * <p>PatternSets are used to select files to extract
@@ -70,6 +70,7 @@
      *   <li>none - no compression
      *   <li>gzip - Gzip compression
      *   <li>bzip2 - Bzip2 compression
+     *   <li>xz - XZ compression, requires XZ for Java
      * </ul>
      *
      * @param method compression method
@@ -83,33 +84,32 @@
      *
      * @since Ant 1.8.0
      */
+    @Override
     public void setScanForUnicodeExtraFields(boolean b) {
-        throw new BuildException("The " + getTaskName()
-                                 + " task doesn't support the encoding"
-                                 + " attribute", getLocation());
+        throw new BuildException(
+            "The " + getTaskName()
+                + " task doesn't support the encoding attribute",
+            getLocation());
     }
 
     /**
      * @see Expand#expandFile(FileUtils, File, File)
      * {@inheritDoc}
      */
+    @Override
     protected void expandFile(FileUtils fileUtils, File srcF, File dir) {
-        FileInputStream fis = null;
         if (!srcF.exists()) {
             throw new BuildException("Unable to untar "
                     + srcF
                     + " as the file does not exist",
                     getLocation());
         }
-        try {
-            fis = new FileInputStream(srcF);
+        try (InputStream fis = Files.newInputStream(srcF.toPath())) {
             expandStream(srcF.getPath(), fis, dir);
         } catch (IOException ioe) {
             throw new BuildException("Error while expanding " + srcF.getPath()
                                      + "\n" + ioe.toString(),
                                      ioe, getLocation());
-        } finally {
-            FileUtils.close(fis);
         }
     }
 
@@ -120,6 +120,7 @@
      * @param dir       the destination directory
      * @since Ant 1.7
      */
+    @Override
     protected void expandResource(Resource srcR, File dir) {
         if (!srcR.isExists()) {
             throw new BuildException("Unable to untar "
@@ -128,15 +129,11 @@
                                      getLocation());
         }
 
-        InputStream i = null;
-        try {
-            i = srcR.getInputStream();
+        try (InputStream i = srcR.getInputStream()) {
             expandStream(srcR.getName(), i, dir);
         } catch (IOException ioe) {
             throw new BuildException("Error while expanding " + srcR.getName(),
                                      ioe, getLocation());
-        } finally {
-            FileUtils.close(i);
         }
     }
 
@@ -145,16 +142,13 @@
      */
     private void expandStream(String name, InputStream stream, File dir)
         throws IOException {
-        TarInputStream tis = null;
-        try {
-            tis =
-                new TarInputStream(compression.decompress(name,
-                                                          new BufferedInputStream(stream)),
-                                   getEncoding());
+        try (TarInputStream tis = new TarInputStream(
+            compression.decompress(name, new BufferedInputStream(stream)),
+            getEncoding())) {
             log("Expanding: " + name + " into " + dir, Project.MSG_INFO);
-            TarEntry te = null;
             boolean empty = true;
             FileNameMapper mapper = getMapper();
+            TarEntry te;
             while ((te = tis.getNextEntry()) != null) {
                 empty = false;
                 extractFile(FileUtils.getFileUtils(), null, dir, tis,
@@ -162,11 +156,9 @@
                             te.isDirectory(), mapper);
             }
             if (empty && getFailOnEmptyArchive()) {
-                throw new BuildException("archive '" + name + "' is empty");
+                throw new BuildException("archive '%s' is empty", name);
             }
             log("expand complete", Project.MSG_VERBOSE);
-        } finally {
-            FileUtils.close(tis);
         }
     }
 
@@ -190,6 +182,11 @@
          *  BZIP2 compression
          */
         private static final String BZIP2 = "bzip2";
+        /**
+         *  XZ compression
+         * @since 1.10.1
+         */
+        private static final String XZ = "xz";
 
 
         /**
@@ -205,8 +202,9 @@
          *
          * @return valid values
          */
+        @Override
         public String[] getValues() {
-            return new String[] {NONE, GZIP, BZIP2};
+            return new String[] {NONE, GZIP, BZIP2, XZ};
         }
 
         /**
@@ -226,18 +224,41 @@
             final String v = getValue();
             if (GZIP.equals(v)) {
                 return new GZIPInputStream(istream);
-            } else {
-                if (BZIP2.equals(v)) {
-                    final char[] magic = new char[] {'B', 'Z'};
-                    for (int i = 0; i < magic.length; i++) {
-                        if (istream.read() != magic[i]) {
-                            throw new BuildException("Invalid bz2 file." + name);
-                        }
+            }
+            if (XZ.equals(v)) {
+                return newXZInputStream(istream);
+            }
+            if (BZIP2.equals(v)) {
+                final char[] magic = new char[] { 'B', 'Z' };
+                for (int i = 0; i < magic.length; i++) {
+                    if (istream.read() != magic[i]) {
+                        throw new BuildException("Invalid bz2 file." + name);
                     }
-                    return new CBZip2InputStream(istream);
                 }
+                return new CBZip2InputStream(istream);
             }
             return istream;
         }
+
+        private static InputStream newXZInputStream(InputStream istream)
+            throws BuildException {
+            try {
+                Class<? extends InputStream> clazz =
+                    Class.forName("org.tukaani.xz.XZInputStream")
+                    .asSubclass(InputStream.class);
+                Constructor<? extends InputStream> c =
+                    clazz.getConstructor(InputStream.class);
+                return c.newInstance(istream);
+            } catch (ClassNotFoundException ex) {
+                throw new BuildException("xz decompression requires the XZ for Java library",
+                                         ex);
+            } catch (NoSuchMethodException
+                     | InstantiationException
+                     | IllegalAccessException
+                     | InvocationTargetException
+                     ex) {
+                throw new BuildException("failed to create XZInputStream", ex);
+            }
+        }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/UpToDate.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/UpToDate.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/UpToDate.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,8 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Vector;
 
 import org.apache.tools.ant.BuildException;
@@ -51,7 +52,7 @@
     private String value;
     private File sourceFile;
     private File targetFile;
-    private Vector sourceFileSets = new Vector();
+    private List<FileSet> sourceFileSets = new Vector<>();
     private Union sourceResources = new Union();
 
     // CheckStyle:VisibilityModifier OFF - bc
@@ -110,7 +111,7 @@
      * @param fs the source files
      */
     public void addSrcfiles(final FileSet fs) {
-        sourceFileSets.addElement(fs);
+        sourceFileSets.add(fs);
     }
 
     /**
@@ -150,24 +151,23 @@
      * see if the target(s) is/are up-to-date.
      * @return true if the target(s) is/are up-to-date
      */
+    @Override
     public boolean eval() {
-        if (sourceFileSets.size() == 0 && sourceResources.size() == 0
+        if (sourceFileSets.isEmpty() && sourceResources.isEmpty()
             && sourceFile == null) {
-            throw new BuildException("At least one srcfile or a nested "
-                                     + "<srcfiles> or <srcresources> element "
-                                     + "must be set.");
+            throw new BuildException(
+                "At least one srcfile or a nested <srcfiles> or <srcresources> element must be set.");
         }
 
-        if ((sourceFileSets.size() > 0 || sourceResources.size() > 0)
+        if (!(sourceFileSets.isEmpty() && sourceResources.isEmpty())
             && sourceFile != null) {
-            throw new BuildException("Cannot specify both the srcfile "
-                                     + "attribute and a nested <srcfiles> "
-                                     + "or <srcresources> element.");
+            throw new BuildException(
+                "Cannot specify both the srcfile attribute and a nested <srcfiles> or <srcresources> element.");
         }
 
         if (targetFile == null && mapperElement == null) {
-            throw new BuildException("The targetfile attribute or a nested "
-                                     + "mapper element must be set.");
+            throw new BuildException(
+                "The targetfile attribute or a nested mapper element must be set.");
         }
 
         // if the target file is not there, then it can't be up-to-date
@@ -179,8 +179,8 @@
 
         // if the source file isn't there, throw an exception
         if (sourceFile != null && !sourceFile.exists()) {
-            throw new BuildException(sourceFile.getAbsolutePath()
-                                     + " not found.");
+            throw new BuildException("%s not found.",
+                sourceFile.getAbsolutePath());
         }
 
         boolean upToDate = true;
@@ -204,12 +204,12 @@
         // reasons.  If we use the code for union below, we'll always
         // scan all filesets, even if we know the target is out of
         // date after the first test.
-        Enumeration e = sourceFileSets.elements();
-        while (upToDate && e.hasMoreElements()) {
-            FileSet fs = (FileSet) e.nextElement();
+
+        Iterator<FileSet> iter = sourceFileSets.iterator();
+        while (upToDate && iter.hasNext()) {
+            FileSet fs = iter.next();
             DirectoryScanner ds = fs.getDirectoryScanner(getProject());
-            upToDate = scanDir(fs.getDir(getProject()),
-                                           ds.getIncludedFiles());
+            upToDate = scanDir(fs.getDir(getProject()), ds.getIncludedFiles());
         }
 
         if (upToDate) {
@@ -223,12 +223,12 @@
         return upToDate;
     }
 
-
     /**
      * Sets property to true if target file(s) have a more recent timestamp
      * than (each of) the corresponding source file(s).
      * @throws BuildException on error
      */
+    @Override
     public void execute() throws BuildException {
         if (property == null) {
             throw new BuildException("property attribute is required.",
@@ -264,14 +264,11 @@
     }
 
     private FileNameMapper getMapper() {
-        FileNameMapper mapper = null;
         if (mapperElement == null) {
             MergingMapper mm = new MergingMapper();
             mm.setTo(targetFile.getAbsolutePath());
-            mapper = mm;
-        } else {
-            mapper = mapperElement.getImplementation();
+            return mm;
         }
-        return mapper;
+        return mapperElement.getImplementation();
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java	2018-03-24 12:37:12.000000000 +0000
@@ -45,6 +45,9 @@
      */
     public static final String ERROR_NO_FILE = "Not found :";
 
+    /** Error output if there is a failure to verify the jar. */
+    public static final String ERROR_NO_VERIFY = "Failed to verify ";
+
     /**
      * The string we look for in the text to indicate direct verification
      */
@@ -55,8 +58,8 @@
      */
     private boolean certificates = false;
     private BufferingOutputFilter outputCache = new BufferingOutputFilter();
-    /** Error output if there is a failure to verify the jar. */
-    public static final String ERROR_NO_VERIFY = "Failed to verify ";
+
+    private String savedStorePass = null;
 
     /**
      * Ask for certificate information to be printed
@@ -70,6 +73,7 @@
      * verify our jar files
      * @throws BuildException on error.
      */
+    @Override
     public void execute() throws BuildException {
         //validation logic
         final boolean hasJar = jar != null;
@@ -92,11 +96,45 @@
                 FileProvider fr = r.as(FileProvider.class);
                 verifyOneJar(fr.getFile());
             }
-
         } finally {
             endExecution();
         }
+    }
 
+    /**
+     * @since 1.10.3
+     */
+    @Override
+    protected void beginExecution() {
+        // when using a PKCS12 keystore jarsigner -verify will not
+        // prompt for the keystore password but will only properly
+        // verify the jar with -strict enabled if the -storepass
+        // parameter is used. Note that the documentation of jarsigner
+        // says -storepass was never required with -verify - this is
+        // wrong.
+        //
+        // See https://bz.apache.org/bugzilla/show_bug.cgi?id=62194
+        //
+        // So if strict is true then we hide storepass from the base
+        // implementation and instead add the -storepass command line
+        // argument
+        if (storepass != null) {
+            savedStorePass = storepass;
+            setStorepass(null);
+        }
+        super.beginExecution();
+    }
+
+    /**
+     * @since 1.10.3
+     */
+    @Override
+    protected void endExecution() {
+        if (savedStorePass != null) {
+            setStorepass(savedStorePass);
+            savedStorePass = null;
+        }
+        super.endExecution();
     }
 
     /**
@@ -112,6 +150,10 @@
 
         setCommonOptions(cmd);
         bindToKeystore(cmd);
+        if (savedStorePass != null) {
+            addValue(cmd, "-storepass");
+            addValue(cmd, savedStorePass);
+        }
 
         //verify special operations
         addValue(cmd, "-verify");
@@ -123,6 +165,10 @@
         //JAR  is required
         addValue(cmd, jar.getPath());
 
+        if (alias != null) {
+            addValue(cmd, alias);
+        }
+
         log("Verifying JAR: " + jar.getAbsolutePath());
         outputCache.clear();
         BuildException ex = null;
@@ -135,8 +181,8 @@
         //deal with jdk1.4.2 bug:
         if (ex != null) {
             if (results.indexOf("zip file closed") >= 0) {
-                log("You are running " + JARSIGNER_COMMAND + " against a JVM with"
-                    + " a known bug that manifests as an IllegalStateException.",
+                log("You are running " + JARSIGNER_COMMAND
+                    + " against a JVM with a known bug that manifests as an IllegalStateException.",
                     Project.MSG_WARN);
             } else {
                 throw ex;
@@ -154,11 +200,13 @@
 
         private BufferingOutputFilterReader buffer;
 
+        @Override
         public Reader chain(Reader rdr) {
             buffer = new BufferingOutputFilterReader(rdr);
             return buffer;
         }
 
+        @Override
         public String toString() {
             return buffer.toString();
         }
@@ -183,6 +231,7 @@
             this.next = next;
         }
 
+        @Override
         public int read(char[] cbuf, int off, int len) throws IOException {
             //hand down
             int result = next.read(cbuf, off, len);
@@ -192,10 +241,12 @@
             return result;
         }
 
+        @Override
         public void close() throws IOException {
             next.close();
         }
 
+        @Override
         public String toString() {
             return buffer.toString();
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/WaitFor.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/WaitFor.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/WaitFor.java	2018-03-24 12:37:12.000000000 +0000
@@ -89,7 +89,6 @@
         super("waitfor");
     }
 
-
     /**
      * Constructor that takes the name of the task in the task name.
      *
@@ -108,7 +107,6 @@
         maxWait = time;
     }
 
-
     /**
      * Set the max wait time unit
      * @param unit an enumerated <code>Unit</code> value
@@ -117,8 +115,6 @@
         maxWaitMultiplier = unit.getMultiplier();
     }
 
-
-
     /**
      * Set the time between each check
      * @param time a <code>long</code> value
@@ -150,15 +146,15 @@
      */
     public void execute() throws BuildException {
         if (countConditions() > 1) {
-            throw new BuildException("You must not nest more than one "
-                                     + "condition into "
-                                     + getTaskName());
+            throw new BuildException(
+                "You must not nest more than one condition into %s",
+                getTaskName());
         }
         if (countConditions() < 1) {
-            throw new BuildException("You must nest a condition into "
-                                     + getTaskName());
+            throw new BuildException("You must nest a condition into %s",
+                getTaskName());
         }
-        Condition c = (Condition) getConditions().nextElement();
+        Condition c = getConditions().nextElement();
         try {
             long maxWaitMillis = calculateMaxWaitMillis();
             long checkEveryMillis = calculateCheckEveryMillis();
@@ -244,16 +240,16 @@
             MILLISECOND, SECOND, MINUTE, HOUR, DAY, WEEK
         };
 
-        private Map timeTable = new HashMap();
+        private Map<String, Long> timeTable = new HashMap<>();
 
         /** Constructor the Unit enumerated type. */
         public Unit() {
-            timeTable.put(MILLISECOND, new Long(1L));
-            timeTable.put(SECOND,      new Long(ONE_SECOND));
-            timeTable.put(MINUTE,      new Long(ONE_MINUTE));
-            timeTable.put(HOUR,        new Long(ONE_HOUR));
-            timeTable.put(DAY,         new Long(ONE_DAY));
-            timeTable.put(WEEK,        new Long(ONE_WEEK));
+            timeTable.put(MILLISECOND, Long.valueOf(1L));
+            timeTable.put(SECOND,      Long.valueOf(ONE_SECOND));
+            timeTable.put(MINUTE,      Long.valueOf(ONE_MINUTE));
+            timeTable.put(HOUR,        Long.valueOf(ONE_HOUR));
+            timeTable.put(DAY,         Long.valueOf(ONE_DAY));
+            timeTable.put(WEEK,        Long.valueOf(ONE_WEEK));
         }
 
         /**
@@ -262,14 +258,14 @@
          */
         public long getMultiplier() {
             String key = getValue().toLowerCase(Locale.ENGLISH);
-            Long l = (Long) timeTable.get(key);
-            return l.longValue();
+            return timeTable.get(key).longValue();
         }
 
         /**
          * @see EnumeratedAttribute#getValues()
          * {@inheritDoc}
          */
+        @Override
         public String[] getValues() {
             return UNITS;
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/War.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/War.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/War.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/War.java	2018-03-24 12:37:12.000000000 +0000
@@ -27,7 +27,6 @@
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.zip.ZipOutputStream;
 
-
 /**
  * <p>An extension of &lt;jar&gt; to create a WAR archive.
  * Contains special treatment for files that should end up in the
@@ -49,6 +48,10 @@
  */
 public class War extends Jar {
 
+    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
+    /** path to web.xml file */
+    private static final String XML_DESCRIPTOR_PATH = "WEB-INF/web.xml";
+
     /**
      * our web.xml deployment descriptor
      */
@@ -60,10 +63,6 @@
     private boolean needxmlfile = true;
     private File addedWebXmlFile;
 
-    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
-    /** path to web.xml file */
-    private static final String XML_DESCRIPTOR_PATH = "WEB-INF/web.xml";
-
     /** Constructor for the War Task. */
     public War() {
         super();
@@ -92,9 +91,8 @@
     public void setWebxml(File descr) {
         deploymentDescriptor = descr;
         if (!deploymentDescriptor.exists()) {
-            throw new BuildException("Deployment descriptor: "
-                                     + deploymentDescriptor
-                                     + " does not exist.");
+            throw new BuildException("Deployment descriptor:  does not exist.",
+                deploymentDescriptor);
         }
 
         // Create a ZipFileSet for this file, and pass it up.
@@ -104,7 +102,6 @@
         super.addFileset(fs);
     }
 
-
     /**
      * Set the policy on the web.xml file, that is, whether or not it is needed
      * @param needxmlfile whether a web.xml file is needed. Default: true
@@ -117,7 +114,6 @@
      * add files under WEB-INF/lib/
      * @param fs the zip file set to add
      */
-
     public void addLib(ZipFileSet fs) {
         // We just set the prefix for this fileset, and pass it up.
         fs.setPrefix("WEB-INF/lib/");
@@ -190,13 +186,10 @@
                 //check to see if we warn or not
                 if (!FILE_UTILS.fileNameEquals(addedWebXmlFile, file)) {
                     logWhenWriting("Warning: selected " + archiveType
-                                   + " files include a second "
-                                   + XML_DESCRIPTOR_PATH
-                                   + " which will be ignored.\n"
-                                   + "The duplicate entry is at " + file + '\n'
-                                   + "The file that will be used is "
-                                   + addedWebXmlFile,
-                                   Project.MSG_WARN);
+                        + " files include a second " + XML_DESCRIPTOR_PATH
+                        + " which will be ignored.\nThe duplicate entry is at "
+                        + file + "\nThe file that will be used is "
+                        + addedWebXmlFile, Project.MSG_WARN);
                 }
             } else {
                 //no added file, yet
@@ -212,7 +205,6 @@
         }
     }
 
-
     /**
      * Make sure we don't think we already have a web.xml next time this task
      * gets executed.
@@ -224,8 +216,8 @@
             && needxmlfile
             && !isInUpdateMode()
             && hasUpdatedFile()) {
-            throw new BuildException("No WEB-INF/web.xml file was added.\n"
-                    + "If this is your intent, set needxmlfile='false' ");
+            throw new BuildException(
+                "No WEB-INF/web.xml file was added.\nIf this is your intent, set needxmlfile='false' ");
         }
         addedWebXmlFile = null;
         super.cleanUp();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/WhichResource.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/WhichResource.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/WhichResource.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/WhichResource.java	2018-03-24 12:37:12.000000000 +0000
@@ -105,14 +105,11 @@
             setcount++;
         }
 
-
         if (setcount == 0) {
-            throw new BuildException("One of classname or resource must"
-                                     + " be specified");
+            throw new BuildException("One of classname or resource must be specified");
         }
         if (setcount > 1) {
-            throw new BuildException("Only one of classname or resource can"
-                                     + " be specified");
+            throw new BuildException("Only one of classname or resource can be specified");
         }
         if (property == null) {
             throw new BuildException("No property defined");
@@ -123,6 +120,7 @@
      * execute it
      * @throws BuildException on error
      */
+    @Override
     public void execute() throws BuildException {
         validate();
         if (classpath != null) {
@@ -135,11 +133,10 @@
             getProject().log("using system classpath: " + classpath,
                              Project.MSG_DEBUG);
         }
-        AntClassLoader loader = null;
-        try {
-            loader = AntClassLoader.newAntClassLoader(getProject().getCoreLoader(),
-                                                      getProject(),
-                                                      classpath, false);
+        try (AntClassLoader loader =
+             AntClassLoader.newAntClassLoader(getProject().getCoreLoader(),
+                                              getProject(),
+                                              classpath, false)) {
             String loc = null;
             if (classname != null) {
                 //convert a class name into a resource
@@ -155,17 +152,12 @@
             }
 
             log("Searching for " + resource, Project.MSG_VERBOSE);
-            URL url;
-            url = loader.getResource(resource);
+            URL url = loader.getResource(resource);
             if (url != null) {
                 //set the property
                 loc = url.toExternalForm();
                 getProject().setNewProperty(property, loc);
             }
-        } finally {
-            if (loader != null) {
-                loader.cleanup();
-            }
         }
     }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Hashtable;
+import java.util.Map;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -175,19 +177,6 @@
  * @ant.task name="xmlproperty" category="xml"
  */
 public class XmlProperty extends org.apache.tools.ant.Task {
-
-    private Resource src;
-    private String prefix = "";
-    private boolean keepRoot = true;
-    private boolean validate = false;
-    private boolean collapseAttributes = false;
-    private boolean semanticAttributes = false;
-    private boolean includeSemanticAttribute = false;
-    private File rootDirectory = null;
-    private Hashtable addedAttributes = new Hashtable();
-    private XMLCatalog xmlCatalog = new XMLCatalog();
-    private String delimiter = ",";
-
     private static final String ID = "id";
     private static final String REF_ID = "refid";
     private static final String LOCATION = "location";
@@ -200,17 +189,22 @@
 
     private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
 
-    /**
-     * Constructor.
-     */
-    public XmlProperty() {
-        super();
-    }
+    private Resource src;
+    private String prefix = "";
+    private boolean keepRoot = true;
+    private boolean validate = false;
+    private boolean collapseAttributes = false;
+    private boolean semanticAttributes = false;
+    private boolean includeSemanticAttribute = false;
+    private File rootDirectory = null;
+    private Map<String, String> addedAttributes = new Hashtable<>();
+    private XMLCatalog xmlCatalog = new XMLCatalog();
+    private String delimiter = ",";
 
     /**
      * Initializes the task.
      */
-
+    @Override
     public void init() {
         super.init();
         xmlCatalog.setProject(getProject());
@@ -229,6 +223,7 @@
      * @todo validate the source file is valid before opening, print a better error message
      * @todo add a verbose level log message listing the name of the file being loaded
      */
+    @Override
     public void execute() throws BuildException {
         Resource r = getResource();
 
@@ -245,7 +240,7 @@
               factory.setNamespaceAware(false);
               DocumentBuilder builder = factory.newDocumentBuilder();
               builder.setEntityResolver(getEntityResolver());
-              Document document = null;
+              Document document;
               FileProvider fp = src.as(FileProvider.class);
               if (fp != null) {
                   document = builder.parse(fp.getFile());
@@ -258,7 +253,7 @@
               // This task is allow to override its own properties
               // but not other properties.  So we need to keep track
               // of which properties we've added.
-              addedAttributes = new Hashtable();
+              addedAttributes = new Hashtable<>();
 
               if (keepRoot) {
                   addNodeRecursively(topElement, prefix, null);
@@ -377,23 +372,23 @@
                      * semantic meaning) then deal with it
                      * appropriately.
                      */
-                    if (nodeName.equals(ID)) {
+                    if (ID.equals(nodeName)) {
                         // ID has already been found above.
                         continue;
                     }
-                    if (containingPath != null && nodeName.equals(PATH)) {
+                    if (containingPath != null && PATH.equals(nodeName)) {
                         // A "path" attribute for a node within a Path object.
                         containingPath.setPath(attributeValue);
                     } else if (containingPath != null
-                               && container instanceof Path && nodeName.equals(REF_ID)) {
+                               && container instanceof Path && REF_ID.equals(nodeName)) {
                         // A "refid" attribute for a node within a Path object.
                         containingPath.setPath(attributeValue);
                     } else if (containingPath != null && container instanceof Path
-                               && nodeName.equals(LOCATION)) {
+                               && LOCATION.equals(nodeName)) {
                         // A "location" attribute for a node within a
                         // Path object.
                         containingPath.setLocation(resolveFile(attributeValue));
-                    } else if (nodeName.equals(PATHID)) {
+                    } else if (PATHID.equals(nodeName)) {
                         // A node identifying a new path
                         if (container != null) {
                             throw new BuildException("XmlProperty does not support nested paths");
@@ -429,7 +424,7 @@
                 && node.getFirstChild().getNodeType() == Node.CDATA_SECTION_NODE) {
 
             nodeText = node.getFirstChild().getNodeValue();
-            if ("".equals(nodeText) && !semanticEmptyOverride) {
+            if (nodeText.isEmpty() && !semanticEmptyOverride) {
                 emptyNode = true;
             }
         } else if (node.getNodeType() == Node.ELEMENT_NODE
@@ -440,7 +435,7 @@
         } else if (node.getNodeType() == Node.ELEMENT_NODE
                && node.getChildNodes().getLength() == 1
                && node.getFirstChild().getNodeType() == Node.TEXT_NODE
-               && "".equals(node.getFirstChild().getNodeValue())
+               && node.getFirstChild().getNodeValue().isEmpty()
                && !semanticEmptyOverride) {
             nodeText = "";
             emptyNode = true;
@@ -450,7 +445,7 @@
             if (semanticAttributes && id == null && container instanceof String) {
                 id = (String) container;
             }
-            if (nodeText.trim().length() != 0 || emptyNode) {
+            if (!nodeText.trim().isEmpty() || emptyNode) {
                 addProperty(prefix, nodeText, id);
             }
         }
@@ -458,7 +453,7 @@
         // children to reference if needed.  Path objects are
         // definitely used by child path elements, and ID may be used
         // for a child text node.
-        return (addedPath != null ? addedPath : id);
+        return addedPath != null ? addedPath : id;
     }
 
     /**
@@ -481,7 +476,7 @@
             // when we read them, though (instead of keeping them
             // outside of the project and batch adding them at the end)
             // to allow other properties to reference them.
-            value = (String) addedAttributes.get(name) + getDelimiter() + value;
+            value = addedAttributes.get(name) + getDelimiter() + value;
             getProject().setProperty(name, value);
             addedAttributes.put(name, value);
         } else if (getProject().getProperty(name) == null) {
@@ -508,7 +503,7 @@
         if (semanticAttributes) {
             // Never include the "refid" attribute as part of the
             // attribute name.
-            if (attributeName.equals(REF_ID)) {
+            if (REF_ID.equals(attributeName)) {
                 return "";
             }
             // Otherwise, return it appended unless property to hide it is set.
@@ -524,12 +519,7 @@
      * Return whether the provided attribute name is recognized or not.
      */
     private static boolean isSemanticAttribute(String attributeName) {
-        for (int i = 0; i < ATTRIBUTES.length; i++) {
-            if (attributeName.equals(ATTRIBUTES[i])) {
-                return true;
-            }
-        }
-        return false;
+        return Arrays.asList(ATTRIBUTES).contains(attributeName);
     }
 
     /**
@@ -549,11 +539,11 @@
         if (semanticAttributes) {
             String attributeName = attributeNode.getNodeName();
             nodeValue = getProject().replaceProperties(nodeValue);
-            if (attributeName.equals(LOCATION)) {
+            if (LOCATION.equals(attributeName)) {
                 File f = resolveFile(nodeValue);
                 return f.getPath();
             }
-            if (attributeName.equals(REF_ID)) {
+            if (REF_ID.equals(attributeName)) {
                 Object ref = getProject().getReference(nodeValue);
                 if (ref != null) {
                     return ref.toString();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,6 +18,7 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
+import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumMap;
@@ -32,7 +33,6 @@
 import javax.xml.xpath.XPathExpression;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
-import javax.xml.xpath.XPathVariableResolver;
 
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
@@ -71,6 +71,15 @@
  */
 
 public class XSLTProcess extends MatchingTask implements XSLTLogger {
+    /**
+     * The default processor is trax
+     * @since Ant 1.7
+     */
+    public static final String PROCESSOR_TRAX = "trax";
+
+    /** Utilities used for file operations */
+    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
+
     /** destination directory */
     private File destDir = null;
 
@@ -93,7 +102,7 @@
     private String fileDirParameter = null;
 
     /** additional parameters to be passed to the stylesheets */
-    private final List<Param> params = new ArrayList<Param>();
+    private final List<Param> params = new ArrayList<>();
 
     /** Input XML document to be used */
     private File inFile = null;
@@ -119,14 +128,11 @@
     private boolean force = false;
 
     /** XSL output properties to be used */
-    private final Vector outputProperties = new Vector();
+    private final List<OutputProperty> outputProperties = new Vector<>();
 
     /** for resolving entities such as dtds */
     private final XMLCatalog xmlCatalog = new XMLCatalog();
 
-    /** Utilities used for file operations */
-    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
-
     /**
      * Whether to style all files in the included directories as well.
      *
@@ -180,12 +186,6 @@
     private boolean useImplicitFileset = true;
 
     /**
-     * The default processor is trax
-     * @since Ant 1.7
-     */
-    public static final String PROCESSOR_TRAX = "trax";
-
-    /**
      * whether to suppress warnings.
      *
      * @since Ant 1.8.0
@@ -243,12 +243,6 @@
     private TraceConfiguration traceConfiguration;
 
     /**
-     * Creates a new XSLTProcess Task.
-     */
-    public XSLTProcess() {
-    } //-- XSLTProcess
-
-    /**
      * Whether to style all files in the included directories as well;
      * optional, default is true.
      *
@@ -303,8 +297,8 @@
      */
     public void addConfiguredStyle(final Resources rc) {
         if (rc.size() != 1) {
-            handleError("The style element must be specified with exactly one"
-                        + " nested resource.");
+            handleError(
+                "The style element must be specified with exactly one nested resource.");
         } else {
             setXslResource(rc.iterator().next());
         }
@@ -345,13 +339,8 @@
         }
         final File savedBaseDir = baseDir;
 
-        DirectoryScanner scanner;
-        String[]         list;
-        String[]         dirs;
-
         final String baseMessage =
-            "specify the stylesheet either as a filename in style attribute "
-            + "or as a nested resource";
+            "specify the stylesheet either as a filename in style attribute or as a nested resource";
 
         if (xslResource == null && xslFile == null) {
             handleError(baseMessage);
@@ -395,8 +384,7 @@
                      * the wrong version has been used.
                      */
                     if (alternative.exists()) {
-                        log("DEPRECATED - the 'style' attribute should be "
-                            + "relative to the project's");
+                        log("DEPRECATED - the 'style' attribute should be relative to the project's");
                         log("             basedir, not the tasks's basedir.");
                         stylesheet = alternative;
                     }
@@ -427,33 +415,30 @@
             //-- make sure destination directory exists...
             checkDest();
 
+
             if (useImplicitFileset) {
-                scanner = getDirectoryScanner(baseDir);
+                DirectoryScanner scanner = getDirectoryScanner(baseDir);
                 log("Transforming into " + destDir, Project.MSG_INFO);
 
                 // Process all the files marked for styling
-                list = scanner.getIncludedFiles();
-                for (int i = 0; i < list.length; ++i) {
-                    process(baseDir, list[i], destDir, styleResource);
+                for (String element : scanner.getIncludedFiles()) {
+                    process(baseDir, element, destDir, styleResource);
                 }
                 if (performDirectoryScan) {
                     // Process all the directories marked for styling
-                    dirs = scanner.getIncludedDirectories();
-                    for (int j = 0; j < dirs.length; ++j) {
-                        list = new File(baseDir, dirs[j]).list();
-                        for (int i = 0; i < list.length; ++i) {
-                            process(baseDir, dirs[j] + File.separator + list[i], destDir,
+                    for (String dir : scanner.getIncludedDirectories()) {
+                        for (String element : new File(baseDir, dir).list()) {
+                            process(baseDir, dir + File.separator + element, destDir,
                                     styleResource);
                         }
                     }
                 }
-            } else { // only resource collections, there better be some
-                if (resources.size() == 0) {
-                    if (failOnNoResources) {
-                        handleError("no resources specified");
-                    }
-                    return;
+            } else if (resources.isEmpty()) {
+                // only resource collections, there better be some
+                if (failOnNoResources) {
+                    handleError("no resources specified");
                 }
+                return;
             }
             processResources(styleResource);
         } finally {
@@ -686,8 +671,7 @@
      */
     public TraceConfiguration createTrace() {
         if (traceConfiguration != null) {
-            throw new BuildException("can't have more than one trace"
-                                     + " configuration");
+            throw new BuildException("can't have more than one trace configuration");
         }
         traceConfiguration = new TraceConfiguration();
         return traceConfiguration;
@@ -712,12 +696,12 @@
      * @exception Exception if the processor cannot be loaded.
      */
     private void resolveProcessor(final String proc) throws Exception {
-        if (proc.equals(PROCESSOR_TRAX)) {
+        if (PROCESSOR_TRAX.equals(proc)) {
             liaison = new org.apache.tools.ant.taskdefs.optional.TraXLiaison();
         } else {
             //anything else is a classname
-            final Class clazz = loadClass(proc);
-            liaison = (XSLTLiaison) clazz.newInstance();
+            final Class<? extends XSLTLiaison> clazz = loadClass(proc).asSubclass(XSLTLiaison.class);
+            liaison = clazz.newInstance();
         }
     }
 
@@ -729,7 +713,7 @@
      * @param classname the name of the class to load.
      * @return the requested class.
      */
-    private Class loadClass(final String classname) throws ClassNotFoundException {
+    private Class<?> loadClass(final String classname) throws ClassNotFoundException {
         setupLoader();
         if (loader == null) {
             return Class.forName(classname);
@@ -819,29 +803,25 @@
             throws BuildException {
 
         File   outF = null;
-        File   inF = null;
 
         try {
             final long styleSheetLastModified = stylesheet.getLastModified();
-            inF = new File(baseDir, xmlFile);
+            File inF = new File(baseDir, xmlFile);
 
             if (inF.isDirectory()) {
                 log("Skipping " + inF + " it is a directory.", Project.MSG_VERBOSE);
                 return;
             }
-            FileNameMapper mapper = null;
-            if (mapperElement != null) {
-                mapper = mapperElement.getImplementation();
-            } else {
-                mapper = new StyleMapper();
-            }
+            FileNameMapper mapper = mapperElement == null ? new StyleMapper()
+                : mapperElement.getImplementation();
 
             final String[] outFileName = mapper.mapFileName(xmlFile);
             if (outFileName == null || outFileName.length == 0) {
                 log("Skipping " + inFile + " it cannot get mapped to output.", Project.MSG_VERBOSE);
                 return;
-            } else if (outFileName.length > 1) {
-                log("Skipping " + inFile + " its mapping is ambiguos.", Project.MSG_VERBOSE);
+            }
+            if (outFileName.length > 1) {
+                log("Skipping " + inFile + " its mapping is ambiguous.", Project.MSG_VERBOSE);
                 return;
             }
             outF = new File(destDir, outFileName[0]);
@@ -939,8 +919,8 @@
      * Get an enumeration on the outputproperties.
      * @return the outputproperties
      */
-    public Enumeration getOutputProperties() {
-        return outputProperties.elements();
+    public Enumeration<OutputProperty> getOutputProperties() {
+        return Collections.enumeration(outputProperties);
     }
 
     /**
@@ -1185,7 +1165,7 @@
      */
     public OutputProperty createOutputProperty() {
         final OutputProperty p = new OutputProperty();
-        outputProperties.addElement(p);
+        outputProperties.add(p);
         return p;
     }
 
@@ -1246,11 +1226,8 @@
 
         xpathFactory = XPathFactory.newInstance();
         xpath = xpathFactory.newXPath();
-        xpath.setXPathVariableResolver(new XPathVariableResolver() {
-            public Object resolveVariable(final QName variableName) {
-                return getProject().getProperty(variableName.toString());
-            }
-        });
+        xpath.setXPathVariableResolver(
+            variableName -> getProject().getProperty(variableName.toString()));
     }
 
     /**
@@ -1310,16 +1287,15 @@
                 if (p.shouldUse()) {
                     final Object evaluatedParam = evaluateParam(p);
                     if (liaison instanceof XSLTLiaison4) {
-                        ((XSLTLiaison4) liaison).addParam(p.getName(), evaluatedParam);
+                        ((XSLTLiaison4) liaison).addParam(p.getName(),
+                            evaluatedParam);
+                    } else if (evaluatedParam == null || evaluatedParam instanceof String) {
+                        liaison.addParam(p.getName(), (String) evaluatedParam);
                     } else {
-                        if (evaluatedParam == null || evaluatedParam instanceof String) {
-                            liaison.addParam(p.getName(), (String) evaluatedParam);
-                        } else {
-                            log("XSLTLiaison '" + liaison.getClass().getName()
-                                    + "' supports only String parameters. Converting parameter '" + p.getName()
-                                    + "' to its String value '" + evaluatedParam, Project.MSG_WARN);
-                            liaison.addParam(p.getName(), String.valueOf(evaluatedParam));
-                        }
+                        log("XSLTLiaison '" + liaison.getClass().getName()
+                                + "' supports only String parameters. Converting parameter '" + p.getName()
+                                + "' to its String value '" + evaluatedParam, Project.MSG_WARN);
+                        liaison.addParam(p.getName(), String.valueOf(evaluatedParam));
                     }
                 }
             }
@@ -1346,7 +1322,7 @@
 
         ParamType type;
 
-        if (typeName == null || "".equals(typeName)) {
+        if (typeName == null || typeName.isEmpty()) {
             type = ParamType.STRING; // String is default
         } else {
             try {
@@ -1371,11 +1347,10 @@
                 final QName xpathType = ParamType.XPATH_TYPES.get(type);
                 if (xpathType == null) {
                     throw new IllegalArgumentException("Invalid XSLT parameter type: " + typeName);
-                } else {
-                    final XPathExpression xpe = xpath.compile(expression);
-                    // null = evaluate XPath on empty XML document
-                    return xpe.evaluate((Object) null, xpathType);
                 }
+                final XPathExpression xpe = xpath.compile(expression);
+                // null = evaluate XPath on empty XML document
+                return xpe.evaluate((Object) null, xpathType);
         }
     }
 
@@ -1444,9 +1419,8 @@
     protected void handleError(final Throwable ex) {
         if (failOnError) {
             throw new BuildException(ex);
-        } else {
-            log("Caught an exception: " + ex, Project.MSG_WARN);
         }
+        log("Caught an exception: " + ex, Project.MSG_WARN);
     }
 
     /**
@@ -1460,10 +1434,9 @@
     protected void handleTransformationError(final Exception ex) {
         if (failOnError && failOnTransformationError) {
             throw new BuildException(ex);
-        } else {
-            log("Caught an error during transformation: " + ex,
-                Project.MSG_WARN);
         }
+        log("Caught an error during transformation: " + ex,
+            Project.MSG_WARN);
     }
 
     /**
@@ -1478,12 +1451,12 @@
         /**
          * the list of factory attributes to use for TraXLiaison
          */
-        private final List<Attribute> attributes = new ArrayList<Attribute>();
+        private final List<Attribute> attributes = new ArrayList<>();
 
         /**
          * the list of factory features to use for TraXLiaison
          */
-        private final List<Feature> features = new ArrayList<Feature>();
+        private final List<Feature> features = new ArrayList<>();
 
         /**
          * @return the name of the factory.
@@ -1512,7 +1485,7 @@
          * return the attribute elements.
          * @return the enumeration of attributes
          */
-        public Enumeration getAttributes() {
+        public Enumeration<Attribute> getAttributes() {
             return Collections.enumeration(attributes);
         }
 
@@ -1543,8 +1516,7 @@
          *  <li>http://xml.apache.org/xalan/features/incremental (true|false) </li>
          * </ul>
          */
-        public static class Attribute
-            extends ProjectComponent
+        public static class Attribute extends ProjectComponent
             implements DynamicConfigurator {
 
             /** attribute name, mostly processor specific */
@@ -1573,6 +1545,7 @@
              * @return null
              * @throws BuildException never
              */
+            @Override
             public Object createDynamicElement(final String name) throws BuildException {
                 return null;
             }
@@ -1584,6 +1557,7 @@
              * @param value the value of the attribute
              * @throws BuildException on error
              */
+            @Override
             public void setDynamicAttribute(final String name, final String value) throws BuildException {
                 // only 'name' and 'value' exist.
                 if ("name".equalsIgnoreCase(name)) {
@@ -1597,7 +1571,7 @@
                         this.value = Boolean.FALSE;
                     } else {
                         try {
-                            this.value = new Integer(value);
+                            this.value = Integer.valueOf(value);
                         } catch (final NumberFormatException e) {
                             this.value = value;
                         }
@@ -1610,7 +1584,7 @@
                                                              new Reference(getProject(),
                                                                            value));
                 } else {
-                    throw new BuildException("Unsupported attribute: " + name);
+                    throw new BuildException("Unsupported attribute: %s", name);
                 }
             }
         } // -- class Attribute
@@ -1623,7 +1597,9 @@
             private String name;
             private boolean value;
 
-            public Feature() { }
+            public Feature() {
+            }
+
             public Feature(String name, boolean value) {
                 this.name = name;
                 this.value = value;
@@ -1669,10 +1645,15 @@
      * @since Ant 1.6.2
      */
     private class StyleMapper implements FileNameMapper {
+        @Override
         public void setFrom(final String from) {
         }
+
+        @Override
         public void setTo(final String to) {
         }
+
+        @Override
         public String[] mapFileName(String xmlFile) {
             final int dotPos = xmlFile.lastIndexOf('.');
             if (dotPos > 0) {
@@ -1795,7 +1776,7 @@
          *
          * @return OutputStream
          */
-        public java.io.OutputStream getOutputStream() {
+        public OutputStream getOutputStream() {
             return new LogOutputStream(XSLTProcess.this);
         }
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Zip.java ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Zip.java
--- ant-1.9.10/src/main/org/apache/tools/ant/taskdefs/Zip.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/taskdefs/Zip.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,22 +19,22 @@
 
 import java.io.BufferedInputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Files;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Hashtable;
+import java.util.List;
 import java.util.Map;
 import java.util.Stack;
 import java.util.Vector;
+import java.util.stream.Stream;
 import java.util.zip.CRC32;
 
 import org.apache.tools.ant.BuildException;
@@ -44,7 +44,6 @@
 import org.apache.tools.ant.types.ArchiveFileSet;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.PatternSet;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
 import org.apache.tools.ant.types.ZipFileSet;
@@ -86,13 +85,24 @@
     private static final int ROUNDUP_MILLIS = ZIP_FILE_TIMESTAMP_GRANULARITY - 1;
     // CheckStyle:VisibilityModifier OFF - bc
 
+    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
+
+    // For directories:
+    private static final long EMPTY_CRC = new CRC32().getValue();
+
+    private static final ResourceSelector MISSING_SELECTOR =
+            target -> !target.isExists();
+
+    private static final ResourceUtils.ResourceSelectorProvider
+        MISSING_DIR_PROVIDER = sr -> MISSING_SELECTOR;
+
     protected File zipFile;
     // use to scan own archive
     private ZipScanner zs;
     private File baseDir;
-    protected Hashtable<String, String> entries = new Hashtable<String, String>();
-    private final Vector<FileSet> groupfilesets = new Vector<FileSet>();
-    private final Vector<ZipFileSet> filesetsFromGroupfilesets = new Vector<ZipFileSet>();
+    protected Hashtable<String, String> entries = new Hashtable<>();
+    private final List<FileSet> groupfilesets = new Vector<>();
+    private final List<ZipFileSet> filesetsFromGroupfilesets = new Vector<>();
     protected String duplicate = "add";
     private boolean doCompress = true;
     private boolean doUpdate = false;
@@ -101,27 +111,10 @@
     private boolean doFilesonly = false;
     protected String archiveType = "zip";
 
-    // For directories:
-    private static final long EMPTY_CRC = new CRC32().getValue();
     protected String emptyBehavior = "skip";
-    private final Vector<ResourceCollection> resources = new Vector<ResourceCollection>();
-    protected Hashtable<String, String> addedDirs = new Hashtable<String, String>();
-    private final Vector<String> addedFiles = new Vector<String>();
-
-    private static final ResourceSelector MISSING_SELECTOR =
-        new ResourceSelector() {
-            public boolean isSelected(final Resource target) {
-                return !target.isExists();
-            }
-        };
-
-    private static final ResourceUtils.ResourceSelectorProvider
-        MISSING_DIR_PROVIDER = new ResourceUtils.ResourceSelectorProvider() {
-                public ResourceSelector
-                    getTargetSelectorForSource(final Resource sr) {
-                    return MISSING_SELECTOR;
-                }
-            };
+    private final List<ResourceCollection> resources = new Vector<>();
+    protected Hashtable<String, String> addedDirs = new Hashtable<>();
+    private final List<String> addedFiles = new Vector<>();
 
     private String fixedModTime = null; // User-provided.
     private long modTimeMillis = 0; // Calculated.
@@ -157,8 +150,6 @@
         return !doubleFilePass || skipWriting;
     }
 
-    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
-
     // CheckStyle:VisibilityModifier ON
 
     // This boolean is set if the task detects that the
@@ -368,7 +359,7 @@
      * @param set the group (a fileset) to add
      */
     public void addZipGroupFileset(final FileSet set) {
-        groupfilesets.addElement(set);
+        groupfilesets.add(set);
     }
 
     /**
@@ -606,7 +597,7 @@
      *        that you must choose one of a or b, and [c] indicates that you
      *        may use or omit c. &plusmn;ZZZZ is the timezone offset, and may be
      *        literally "Z" to mean GMT.
-     * @since Ant 1.9.10
+     * @since Ant 1.10.2
      */
     public void setModificationtime(String time) {
         fixedModTime = time;
@@ -616,7 +607,7 @@
      * The file modification time previously provided to
      * {@link #setModificationtime(String)} or {@code null} if unset.
      * @return String
-     * @since Ant 1.9.10
+     * @since Ant 1.10.2
      */
     public String getModificationtime() {
         return fixedModTime;
@@ -666,20 +657,17 @@
         processGroupFilesets();
 
         // collect filesets to pass them to getResourcesToAdd
-        final Vector<ResourceCollection> vfss = new Vector<ResourceCollection>();
+        final List<ResourceCollection> vfss = new ArrayList<>();
         if (baseDir != null) {
             final FileSet fs = (FileSet) getImplicitFileSet().clone();
             fs.setDir(baseDir);
-            vfss.addElement(fs);
-        }
-        final int size = resources.size();
-        for (int i = 0; i < size; i++) {
-            final ResourceCollection rc = resources.elementAt(i);
-            vfss.addElement(rc);
+            vfss.add(fs);
         }
+        vfss.addAll(resources);
+
+        final ResourceCollection[] fss =
+            vfss.toArray(new ResourceCollection[vfss.size()]);
 
-        final ResourceCollection[] fss = new ResourceCollection[vfss.size()];
-        vfss.copyInto(fss);
         boolean success = false;
         try {
             // can also handle empty archives
@@ -693,8 +681,9 @@
             final File parent = zipFile.getParentFile();
             if (parent != null && !parent.isDirectory()
                 && !(parent.mkdirs() || parent.isDirectory())) {
-                throw new BuildException("Failed to create missing parent"
-                                         + " directory for " + zipFile);
+                throw new BuildException(
+                    "Failed to create missing parent directory for %s",
+                    zipFile);
             }
 
             updatedFile = true;
@@ -745,32 +734,25 @@
                     oldFiles.setSrc(renamedFile);
                     oldFiles.setDefaultexcludes(false);
 
-                    final int addSize = addedFiles.size();
-                    for (int i = 0; i < addSize; i++) {
-                        final PatternSet.NameEntry ne = oldFiles.createExclude();
-                        ne.setName(addedFiles.elementAt(i));
+                    for (String addedFile : addedFiles) {
+                        oldFiles.createExclude().setName(addedFile);
                     }
                     final DirectoryScanner ds =
                         oldFiles.getDirectoryScanner(getProject());
                     ((ZipScanner) ds).setEncoding(encoding);
 
-                    final String[] f = ds.getIncludedFiles();
-                    Resource[] r = new Resource[f.length];
-                    for (int i = 0; i < f.length; i++) {
-                        r[i] = ds.getResource(f[i]);
-                    }
+                    Stream<String> includedResourceNames =
+                        Stream.of(ds.getIncludedFiles());
 
                     if (!doFilesonly) {
-                        final String[] d = ds.getIncludedDirectories();
-                        final Resource[] dr = new Resource[d.length];
-                        for (int i = 0; i < d.length; i++) {
-                            dr[i] = ds.getResource(d[i]);
-                        }
-                        final Resource[] tmp = r;
-                        r = new Resource[tmp.length + dr.length];
-                        System.arraycopy(dr, 0, r, 0, dr.length);
-                        System.arraycopy(tmp, 0, r, dr.length, tmp.length);
+                        includedResourceNames =
+                            Stream.concat(includedResourceNames,
+                                Stream.of(ds.getIncludedDirectories()));
                     }
+
+                    Resource[] r = includedResourceNames.map(ds::getResource)
+                        .toArray(Resource[]::new);
+
                     addResources(oldFiles, r, zOut);
                 }
                 if (zOut != null) {
@@ -822,16 +804,10 @@
             "zip", ".tmp", zipFile.getParentFile(), true, false);
         try {
             FILE_UTILS.rename(zipFile, renamedFile);
-        } catch (final SecurityException e) {
+        } catch (final SecurityException | IOException e) {
             throw new BuildException(
-                "Not allowed to rename old file ("
-                + zipFile.getAbsolutePath()
-                + ") to temporary file");
-        } catch (final IOException e) {
-            throw new BuildException(
-                "Unable to rename old file ("
-                + zipFile.getAbsolutePath()
-                + ") to temporary file");
+                "Unable to rename old file (%s) to temporary file",
+                zipFile.getAbsolutePath());
         }
         return renamedFile;
     }
@@ -862,23 +838,22 @@
 
     /** Check the attributes and elements */
     private void checkAttributesAndElements() {
-        if (baseDir == null && resources.size() == 0
-            && groupfilesets.size() == 0 && "zip".equals(archiveType)) {
-            throw new BuildException("basedir attribute must be set, "
-                                     + "or at least one "
-                                     + "resource collection must be given!");
+        if (baseDir == null && resources.isEmpty() && groupfilesets.isEmpty()
+            && "zip".equals(archiveType)) {
+            throw new BuildException(
+                "basedir attribute must be set, or at least one resource collection must be given!");
         }
 
         if (zipFile == null) {
-            throw new BuildException("You must specify the "
-                                     + archiveType + " file to create!");
+            throw new BuildException("You must specify the %s file to create!",
+                archiveType);
         }
 
         if (fixedModTime != null) {
             try {
                 modTimeMillis = DateUtils.parseLenientDateTime(fixedModTime).getTime();
             } catch (ParseException pe) {
-                throw new BuildException("Failed to parse date string " + fixedModTime + ".");
+                throw new BuildException("Failed to parse date string %s.", fixedModTime);
             }
             if (roundUp) {
                 modTimeMillis += ROUNDUP_MILLIS;
@@ -886,11 +861,11 @@
         }
 
         if (zipFile.exists() && !zipFile.isFile()) {
-            throw new BuildException(zipFile + " is not a file.");
+            throw new BuildException("%s is not a file.", zipFile);
         }
 
         if (zipFile.exists() && !zipFile.canWrite()) {
-            throw new BuildException(zipFile + " is read-only.");
+            throw new BuildException("%s is read-only.", zipFile);
         }
     }
 
@@ -908,23 +883,18 @@
     /** Process groupfilesets */
     private void processGroupFilesets() {
         // Add the files found in groupfileset to fileset
-        final int size = groupfilesets.size();
-        for (int i = 0; i < size; i++) {
-
+        for (FileSet fs : groupfilesets) {
             logWhenWriting("Processing groupfileset ", Project.MSG_VERBOSE);
-            final FileSet fs = groupfilesets.elementAt(i);
             final FileScanner scanner = fs.getDirectoryScanner(getProject());
-            final String[] files = scanner.getIncludedFiles();
             final File basedir = scanner.getBasedir();
-            for (int j = 0; j < files.length; j++) {
-
-                logWhenWriting("Adding file " + files[j] + " to fileset",
+            for (String file : scanner.getIncludedFiles()) {
+                logWhenWriting("Adding file " + file + " to fileset",
                                Project.MSG_VERBOSE);
                 final ZipFileSet zf = new ZipFileSet();
                 zf.setProject(getProject());
-                zf.setSrc(new File(basedir, files[j]));
+                zf.setSrc(new File(basedir, file));
                 add(zf);
-                filesetsFromGroupfilesets.addElement(zf);
+                filesetsFromGroupfilesets.add(zf);
             }
         }
     }
@@ -968,17 +938,16 @@
         }
 
         if (prefix.length() > 0 && fullpath.length() > 0) {
-            throw new BuildException("Both prefix and fullpath attributes must"
-                                     + " not be set on the same fileset.");
+            throw new BuildException(
+                "Both prefix and fullpath attributes must not be set on the same fileset.");
         }
 
         if (resources.length != 1 && fullpath.length() > 0) {
-            throw new BuildException("fullpath attribute may only be specified"
-                                     + " for filesets that specify a single"
-                                     + " file.");
+            throw new BuildException(
+                "fullpath attribute may only be specified for filesets that specify a single file.");
         }
 
-        if (prefix.length() > 0) {
+        if (!prefix.isEmpty()) {
             if (!prefix.endsWith("/") && !prefix.endsWith("\\")) {
                 prefix += "/";
             }
@@ -997,26 +966,26 @@
                 zf = new ZipFile(zfs.getSrc(getProject()), encoding);
             }
 
-            for (int i = 0; i < resources.length; i++) {
-                String name = null;
-                if (fullpath.length() > 0) {
-                    name = fullpath;
+            for (Resource resource : resources) {
+                String name;
+                if (fullpath.isEmpty()) {
+                    name = resource.getName();
                 } else {
-                    name = resources[i].getName();
+                    name = fullpath;
                 }
                 name = name.replace(File.separatorChar, '/');
 
-                if ("".equals(name)) {
+                if (name.isEmpty()) {
                     continue;
                 }
 
-                if (resources[i].isDirectory()) {
+                if (resource.isDirectory()) {
                     if (doFilesonly) {
                         continue;
                     }
                     final int thisDirMode = zfs != null && zfs.hasDirModeBeenSet()
-                        ? dirMode : getUnixMode(resources[i], zf, dirMode);
-                    addDirectoryResource(resources[i], name, prefix,
+                        ? dirMode : getUnixMode(resource, zf, dirMode);
+                    addDirectoryResource(resource, name, prefix,
                                          base, zOut,
                                          dirMode, thisDirMode);
 
@@ -1026,14 +995,14 @@
 
                     if (dealingWithFiles) {
                         final File f = FILE_UTILS.resolveFile(base,
-                                                        resources[i].getName());
+                                                        resource.getName());
                         zipFile(f, zOut, prefix + name, fileMode);
                     } else {
                         final int thisFileMode =
                             zfs != null && zfs.hasFileModeBeenSet()
-                            ? fileMode : getUnixMode(resources[i], zf,
+                            ? fileMode : getUnixMode(resource, zf,
                                                      fileMode);
-                        addResource(resources[i], name, prefix,
+                        addResource(resource, name, prefix,
                                     zOut, thisFileMode, zf,
                                     zfs == null
                                     ? null : zfs.getSrc(getProject()));
@@ -1061,7 +1030,7 @@
             name = name + "/";
         }
 
-        final int nextToLastSlash = name.lastIndexOf("/", name.length() - 2);
+        final int nextToLastSlash = name.lastIndexOf('/', name.length() - 2);
         if (nextToLastSlash != -1) {
             addParentDirs(base, name.substring(0, nextToLastSlash + 1),
                           zOut, prefix, defaultDirMode);
@@ -1107,25 +1076,18 @@
                 if (keepCompression) {
                     doCompress = (ze.getMethod() == ZipEntry.DEFLATED);
                 }
-                InputStream is = null;
-                try {
-                    is = new BufferedInputStream(zf.getInputStream(ze));
+                try (final BufferedInputStream is = new BufferedInputStream(zf.getInputStream(ze))) {
                     zipFile(is, zOut, prefix + name, ze.getTime(),
                             fromArchive, mode, ze.getExtraFields(true));
                 } finally {
                     doCompress = oldCompress;
-                    FileUtils.close(is);
                 }
             }
         } else {
-            InputStream is = null;
-            try {
-                is = new BufferedInputStream(r.getInputStream());
+            try (final BufferedInputStream is = new BufferedInputStream(r.getInputStream())) {
                 zipFile(is, zOut, prefix + name, r.getLastModified(),
                         fromArchive, mode, r instanceof ZipResource
                         ? ((ZipResource) r).getExtraFields() : null);
-            } finally {
-                FileUtils.close(is);
             }
         }
     }
@@ -1149,15 +1111,14 @@
             addResources((FileSet) rc, resources, zOut);
             return;
         }
-        for (int i = 0; i < resources.length; i++) {
-            final Resource resource = resources[i];
+        for (final Resource resource : resources) {
             String name = resource.getName();
             if (name == null) {
                 continue;
             }
             name = name.replace(File.separatorChar, '/');
 
-            if ("".equals(name)) {
+            if (name.isEmpty()) {
                 continue;
             }
             if (resource.isDirectory() && doFilesonly) {
@@ -1224,9 +1185,7 @@
             log("Note: creating empty " + archiveType + " archive " + zipFile,
                 Project.MSG_INFO);
         }
-        OutputStream os = null;
-        try {
-            os = new FileOutputStream(zipFile);
+        try (OutputStream os = Files.newOutputStream(zipFile.toPath())) {
             // CheckStyle:MagicNumber OFF
             // Cf. PKZIP specification.
             final byte[] empty = new byte[22];
@@ -1241,8 +1200,6 @@
             throw new BuildException("Could not create empty ZIP archive "
                                      + "(" + ioe.getMessage() + ")", ioe,
                                      getLocation());
-        } finally {
-            FileUtils.close(os);
         }
         return true;
     }
@@ -1291,13 +1248,13 @@
                                              final File zipFile,
                                              final boolean needsUpdate)
         throws BuildException {
-        final ArrayList<ResourceCollection> filesets = new ArrayList<ResourceCollection>();
-        final ArrayList<ResourceCollection> rest = new ArrayList<ResourceCollection>();
-        for (int i = 0; i < rcs.length; i++) {
-            if (rcs[i] instanceof FileSet) {
-                filesets.add(rcs[i]);
+        final List<ResourceCollection> filesets = new ArrayList<>();
+        final List<ResourceCollection> rest = new ArrayList<>();
+        for (ResourceCollection rc : rcs) {
+            if (rc instanceof FileSet) {
+                filesets.add(rc);
             } else {
-                rest.add(rcs[i]);
+                rest.add(rc);
             }
         }
         final ResourceCollection[] rc =
@@ -1399,7 +1356,7 @@
                     return new ArchiveState(true, initialResources);
                 }
 
-                if (emptyBehavior.equals("skip")) {
+                if ("skip".equals(emptyBehavior)) {
                     if (doUpdate) {
                         logWhenWriting(archiveType + " archive " + zipFile
                                        + " not updated because no new files were"
@@ -1410,7 +1367,7 @@
                                        + " because no files were included.",
                                        Project.MSG_WARN);
                     }
-                } else if (emptyBehavior.equals("fail")) {
+                } else if ("fail".equals(emptyBehavior)) {
                     throw new BuildException("Cannot create " + archiveType
                                              + " archive " + zipFile
                                              + ": no files were included.",
@@ -1571,8 +1528,8 @@
                 final FileProvider fp =
                     initialResources[i][j].as(FileProvider.class);
                 if (fp != null && zipFile.equals(fp.getFile())) {
-                    throw new BuildException("A zip file cannot include "
-                                             + "itself", getLocation());
+                    throw new BuildException("A zip file cannot include itself",
+                        getLocation());
                 }
             }
 
@@ -1609,8 +1566,8 @@
                 ResourceUtils.selectSources(this, u, mapper,
                                             getZipScanner(),
                                             MISSING_DIR_PROVIDER);
-            if (rc.size() > 0) {
-                final ArrayList<Resource> newer = new ArrayList<Resource>();
+            if (!rc.isEmpty()) {
+                final List<Resource> newer = new ArrayList<>();
                 newer.addAll(Arrays.asList(((Union) rc).listResources()));
                 newer.addAll(Arrays.asList(result));
                 result = newer.toArray(result);
@@ -1633,32 +1590,28 @@
             boolean skipEmptyNames = true;
             if (filesets[i] instanceof ZipFileSet) {
                 final ZipFileSet zfs = (ZipFileSet) filesets[i];
-                skipEmptyNames = zfs.getPrefix(getProject()).equals("")
-                    && zfs.getFullpath(getProject()).equals("");
+                skipEmptyNames = zfs.getPrefix(getProject()).isEmpty()
+                    && zfs.getFullpath(getProject()).isEmpty();
             }
             final DirectoryScanner rs =
                 filesets[i].getDirectoryScanner(getProject());
             if (rs instanceof ZipScanner) {
                 ((ZipScanner) rs).setEncoding(encoding);
             }
-            final Vector<Resource> resources = new Vector<Resource>();
+            final List<Resource> resources = new Vector<>();
             if (!doFilesonly) {
-                final String[] directories = rs.getIncludedDirectories();
-                for (int j = 0; j < directories.length; j++) {
-                    if (!"".equals(directories[j]) || !skipEmptyNames) {
-                        resources.addElement(rs.getResource(directories[j]));
+                for (String d : rs.getIncludedDirectories()) {
+                    if (!(d.isEmpty() && skipEmptyNames)) {
+                        resources.add(rs.getResource(d));
                     }
                 }
             }
-            final String[] files = rs.getIncludedFiles();
-            for (int j = 0; j < files.length; j++) {
-                if (!"".equals(files[j]) || !skipEmptyNames) {
-                    resources.addElement(rs.getResource(files[j]));
+            for (String f : rs.getIncludedFiles()) {
+                if (!(f.isEmpty() && skipEmptyNames)) {
+                    resources.add(rs.getResource(f));
                 }
             }
-
-            result[i] = new Resource[resources.size()];
-            resources.copyInto(result[i]);
+            result[i] = resources.toArray(new Resource[resources.size()]);
         }
         return result;
     }
@@ -1674,25 +1627,19 @@
     protected Resource[][] grabNonFileSetResources(final ResourceCollection[] rcs) {
         final Resource[][] result = new Resource[rcs.length][];
         for (int i = 0; i < rcs.length; i++) {
-            final ArrayList<Resource> dirs = new ArrayList<Resource>();
-            final ArrayList<Resource> files = new ArrayList<Resource>();
+            final List<Resource> dirs = new ArrayList<>();
+            final List<Resource> files = new ArrayList<>();
             for (final Resource r : rcs[i]) {
-                if (r.isExists()) {
-                    if (r.isDirectory()) {
-                        dirs.add(r);
-                    } else {
-                        files.add(r);
-                    }
+                if (r.isDirectory()) {
+                    dirs.add(r);
+                } else if (r.isExists()) {
+                    files.add(r);
                 }
             }
             // make sure directories are in alpha-order - this also
             // ensures parents come before their children
-            Collections.sort(dirs, new Comparator<Resource>() {
-                    public int compare(final Resource r1, final Resource r2) {
-                        return r1.getName().compareTo(r2.getName());
-                    }
-                });
-            final ArrayList<Resource> rs = new ArrayList<Resource>(dirs);
+            Collections.sort(dirs, Comparator.comparing(Resource::getName));
+            final List<Resource> rs = new ArrayList<>(dirs);
             rs.addAll(files);
             result[i] = rs.toArray(new Resource[rs.size()]);
         }
@@ -1727,8 +1674,8 @@
     protected void zipDir(final File dir, final ZipOutputStream zOut, final String vPath,
                           final int mode, final ZipExtraField[] extra)
         throws IOException {
-        zipDir(dir == null ? (Resource) null : new FileResource(dir),
-               zOut, vPath, mode, extra);
+        zipDir(dir == null ? null : new FileResource(dir), zOut, vPath, mode,
+            extra);
     }
 
     /**
@@ -1791,7 +1738,7 @@
      * support a new parameter (extra fields to preserve) without
      * breaking subclasses that override the old method signature.
      */
-    private static final ThreadLocal<ZipExtraField[]> CURRENT_ZIP_EXTRA = new ThreadLocal<ZipExtraField[]>();
+    private static final ThreadLocal<ZipExtraField[]> CURRENT_ZIP_EXTRA = new ThreadLocal<>();
 
     /**
      * Provides the extra fields for the zip entry currently being
@@ -1835,19 +1782,19 @@
 
         if (entries.containsKey(vPath)) {
 
-            if (duplicate.equals("preserve")) {
+            if ("preserve".equals(duplicate)) {
                 logWhenWriting(vPath + " already added, skipping",
                                Project.MSG_INFO);
                 return;
-            } else if (duplicate.equals("fail")) {
-                throw new BuildException("Duplicate file " + vPath
-                                         + " was found and the duplicate "
-                                         + "attribute is 'fail'.");
-            } else {
-                // duplicate equal to add, so we continue
-                logWhenWriting("duplicate file " + vPath
-                               + " found, adding.", Project.MSG_VERBOSE);
             }
+            if ("fail".equals(duplicate)) {
+                throw new BuildException(
+                    "Duplicate file %s was found and the duplicate attribute is 'fail'.",
+                    vPath);
+            }
+            // duplicate equal to add, so we continue
+            logWhenWriting("duplicate file " + vPath
+                           + " found, adding.", Project.MSG_VERBOSE);
         } else {
             logWhenWriting("adding entry " + vPath, Project.MSG_VERBOSE);
         }
@@ -1904,7 +1851,7 @@
                 count = markableInputStream.read(buffer, 0, buffer.length);
             } while (count != -1);
         }
-        addedFiles.addElement(vPath);
+        addedFiles.add(vPath);
     }
 
     /**
@@ -1957,14 +1904,11 @@
                                      getLocation());
         }
 
-        final BufferedInputStream bIn = new BufferedInputStream(new FileInputStream(file));
-        try {
+        try (final BufferedInputStream bIn = new BufferedInputStream(Files.newInputStream(file.toPath()))) {
             // ZIPs store time with a granularity of 2 seconds, round up
             zipFile(bIn, zOut, vPath,
                     file.lastModified() + (roundUp ? ROUNDUP_MILLIS : 0),
                     null, mode);
-        } finally {
-            bIn.close();
         }
     }
 
@@ -1983,7 +1927,7 @@
                                        final int dirMode)
         throws IOException {
         if (!doFilesonly) {
-            final Stack<String> directories = new Stack<String>();
+            final Stack<String> directories = new Stack<>();
             int slashPos = entry.length();
 
             while ((slashPos = entry.lastIndexOf('/', slashPos - 1)) != -1) {
@@ -1996,7 +1940,7 @@
 
             while (!directories.isEmpty()) {
                 final String dir = directories.pop();
-                File f = null;
+                File f;
                 if (baseDir != null) {
                     f = new File(baseDir, dir);
                 } else {
@@ -2023,16 +1967,12 @@
      */
     protected void cleanUp() {
         addedDirs.clear();
-        addedFiles.removeAllElements();
+        addedFiles.clear();
         entries.clear();
         addingNewFiles = false;
         doUpdate = savedDoUpdate;
-        final Enumeration<ZipFileSet> e = filesetsFromGroupfilesets.elements();
-        while (e.hasMoreElements()) {
-            final ZipFileSet zf = e.nextElement();
-            resources.removeElement(zf);
-        }
-        filesetsFromGroupfilesets.removeAllElements();
+        resources.removeAll(filesetsFromGroupfilesets);
+        filesetsFromGroupfilesets.clear();
         HAVE_NON_FILE_SET_RESOURCES_TO_ADD.set(Boolean.FALSE);
     }
 
@@ -2045,10 +1985,10 @@
      * @see #cleanUp
      */
     public void reset() {
-        resources.removeAllElements();
+        resources.clear();
         zipFile = null;
         baseDir = null;
-        groupfilesets.removeAllElements();
+        groupfilesets.clear();
         duplicate = "add";
         archiveType = "zip";
         doCompress = true;
@@ -2066,8 +2006,8 @@
      * @since Ant 1.5.2
      */
     protected static final boolean isEmpty(final Resource[][] r) {
-        for (int i = 0; i < r.length; i++) {
-            if (r[i].length > 0) {
+        for (Resource[] element : r) {
+            if (element.length > 0) {
                 return false;
             }
         }
@@ -2082,19 +2022,18 @@
      */
     protected Resource[] selectFileResources(final Resource[] orig) {
         return selectResources(orig,
-                               new ResourceSelector() {
-                                   public boolean isSelected(final Resource r) {
-                                       if (!r.isDirectory()) {
-                                           return true;
-                                       } else if (doFilesonly) {
-                                           logWhenWriting("Ignoring directory "
-                                                          + r.getName()
-                                                          + " as only files will"
-                                                          + " be added.",
-                                                          Project.MSG_VERBOSE);
-                                       }
-                                       return false;
+                               r -> {
+                                   if (!r.isDirectory()) {
+                                       return true;
+                                   }
+                                   if (doFilesonly) {
+                                       logWhenWriting("Ignoring directory "
+                                                      + r.getName()
+                                                      + " as only files will"
+                                                      + " be added.",
+                                                      Project.MSG_VERBOSE);
                                    }
+                                   return false;
                                });
     }
 
@@ -2105,12 +2044,7 @@
      * @since Ant 1.8.0
      */
     protected Resource[] selectDirectoryResources(final Resource[] orig) {
-        return selectResources(orig,
-                               new ResourceSelector() {
-                                   public boolean isSelected(final Resource r) {
-                                       return r.isDirectory();
-                                   }
-                               });
+        return selectResources(orig, Resource::isDirectory);
     }
 
     /**
@@ -2125,18 +2059,9 @@
         if (orig.length == 0) {
             return orig;
         }
-
-        final ArrayList<Resource> v = new ArrayList<Resource>(orig.length);
-        for (int i = 0; i < orig.length; i++) {
-            if (selector.isSelected(orig[i])) {
-                v.add(orig[i]);
-            }
-        }
-
-        if (v.size() != orig.length) {
-            return v.toArray(new Resource[v.size()]);
-        }
-        return orig;
+        Resource[] result = Stream.of(orig).filter(selector::isSelected)
+            .toArray(Resource[]::new);
+        return result.length == orig.length ? orig : result;
     }
 
     /**
@@ -2207,11 +2132,9 @@
             if (resourcesToAdd == null)  {
                 return true;
             }
-            for (int counter = 0; counter < resourcesToAdd.length; counter++) {
-                if (resourcesToAdd[counter] != null) {
-                    if (resourcesToAdd[counter].length > 0) {
-                        return false;
-                    }
+            for (Resource[] element : resourcesToAdd) {
+                if (element != null && element.length > 0) {
+                    return false;
                 }
             }
             return true;
@@ -2225,7 +2148,7 @@
      * @since Ant 1.8.0
      */
     public static final class UnicodeExtraField extends EnumeratedAttribute {
-        private static final Map<String, UnicodeExtraFieldPolicy> POLICIES = new HashMap<String, UnicodeExtraFieldPolicy>();
+        private static final Map<String, UnicodeExtraFieldPolicy> POLICIES = new HashMap<>();
         private static final String NEVER_KEY = "never";
         private static final String ALWAYS_KEY = "always";
         private static final String N_E_KEY = "not-encodeable";
@@ -2259,7 +2182,6 @@
         }
     }
 
-
     /**
      * The choices for Zip64 extensions.
      *
@@ -2287,7 +2209,7 @@
      * @since Ant 1.9.1
      */
     public static final class Zip64ModeAttribute extends EnumeratedAttribute {
-        private static final Map<String, Zip64Mode> MODES = new HashMap<String, Zip64Mode>();
+        private static final Map<String, Zip64Mode> MODES = new HashMap<>();
 
         private static final String NEVER_KEY = "never";
         private static final String ALWAYS_KEY = "always";
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/Task.java ant-1.10.3/src/main/org/apache/tools/ant/Task.java
--- ant-1.9.10/src/main/org/apache/tools/ant/Task.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/Task.java	2018-03-24 12:37:12.000000000 +0000
@@ -39,6 +39,7 @@
      *             You should not be accessing this variable directly.
      *             Please use the {@link #getOwningTarget()} method.
      */
+    @Deprecated
     protected Target target;
 
     /**
@@ -52,6 +53,7 @@
      *             You should not be accessing this variable directly.
      *             Please use the {@link #getTaskName()} method.
      */
+    @Deprecated
     protected String taskName;
 
     /**
@@ -61,6 +63,7 @@
      *             You should not be accessing this variable directly.
      *             Please use the {@link #getTaskType()} method.
      */
+    @Deprecated
     protected String taskType;
 
     /**
@@ -70,6 +73,7 @@
      *             You should not be accessing this variable directly.
      *             Please use the {@link #getWrapper()} method.
      */
+    @Deprecated
     protected RuntimeConfigurable wrapper;
 
     // CheckStyle:VisibilityModifier ON
@@ -81,10 +85,6 @@
      */
     private boolean invalid;
 
-    /** Sole constructor. */
-    public Task() {
-    }
-
     /**
      * Sets the target container of this task.
      *
@@ -197,12 +197,10 @@
      * @exception BuildException if the task cannot be configured.
      */
     public void maybeConfigure() throws BuildException {
-        if (!invalid) {
-            if (wrapper != null) {
-                wrapper.maybeConfigure(getProject());
-            }
-        } else {
+        if (invalid) {
             getReplacement();
+        } else if (wrapper != null) {
+            wrapper.maybeConfigure(getProject());
         }
     }
 
@@ -290,10 +288,10 @@
      *                 be logged.
      */
     public void log(String msg, int msgLevel) {
-        if (getProject() != null) {
-            getProject().log(this, msg, msgLevel);
-        } else {
+        if (getProject() == null) {
             super.log(msg, msgLevel);
+        } else {
+            getProject().log(this, msg, msgLevel);
         }
     }
 
@@ -323,10 +321,10 @@
      * @since 1.7
      */
     public void log(String msg, Throwable t, int msgLevel) {
-        if (getProject() != null) {
-            getProject().log(this, msg, t, msgLevel);
-        } else {
+        if (getProject() == null) {
             super.log(msg, msgLevel);
+        } else {
+            getProject().log(this, msg, t, msgLevel);
         }
     }
 
@@ -340,7 +338,11 @@
      * is still fired, but with the exception as the cause.
      */
     public final void perform() {
-        if (!invalid) {
+        if (invalid) {
+            UnknownElement ue = getReplacement();
+            Task task = ue.getTask();
+            task.perform();
+        } else {
             getProject().fireTaskStarted(this);
             Throwable reason = null;
             try {
@@ -363,10 +365,6 @@
             } finally {
                 getProject().fireTaskFinished(this, reason);
             }
-        } else {
-            UnknownElement ue = getReplacement();
-            Task task = ue.getTask();
-            task.perform();
         }
     }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/AbstractFileSet.java ant-1.10.3/src/main/org/apache/tools/ant/types/AbstractFileSet.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/AbstractFileSet.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/AbstractFileSet.java	2018-03-24 12:37:12.000000000 +0000
@@ -23,6 +23,8 @@
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Stack;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
@@ -36,18 +38,21 @@
 import org.apache.tools.ant.types.selectors.DepthSelector;
 import org.apache.tools.ant.types.selectors.DifferentSelector;
 import org.apache.tools.ant.types.selectors.ExtendSelector;
+import org.apache.tools.ant.types.selectors.ExecutableSelector;
 import org.apache.tools.ant.types.selectors.FileSelector;
 import org.apache.tools.ant.types.selectors.FilenameSelector;
 import org.apache.tools.ant.types.selectors.MajoritySelector;
 import org.apache.tools.ant.types.selectors.NoneSelector;
 import org.apache.tools.ant.types.selectors.NotSelector;
 import org.apache.tools.ant.types.selectors.OrSelector;
+import org.apache.tools.ant.types.selectors.OwnedBySelector;
 import org.apache.tools.ant.types.selectors.PresentSelector;
 import org.apache.tools.ant.types.selectors.ReadableSelector;
 import org.apache.tools.ant.types.selectors.SelectSelector;
 import org.apache.tools.ant.types.selectors.SelectorContainer;
 import org.apache.tools.ant.types.selectors.SelectorScanner;
 import org.apache.tools.ant.types.selectors.SizeSelector;
+import org.apache.tools.ant.types.selectors.SymlinkSelector;
 import org.apache.tools.ant.types.selectors.TypeSelector;
 import org.apache.tools.ant.types.selectors.WritableSelector;
 import org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector;
@@ -63,8 +68,8 @@
     implements Cloneable, SelectorContainer {
 
     private PatternSet defaultPatterns = new PatternSet();
-    private List<PatternSet> additionalPatterns = new ArrayList<PatternSet>();
-    private List<FileSelector> selectors = new ArrayList<FileSelector>();
+    private List<PatternSet> additionalPatterns = new ArrayList<>();
+    private List<FileSelector> selectors = new ArrayList<>();
 
     private File dir;
     private boolean fileAttributeUsed;
@@ -110,6 +115,7 @@
      * @param r the <code>Reference</code> to use.
      * @throws BuildException on error
      */
+    @Override
     public void setRefid(Reference r) throws BuildException {
         if (dir != null || defaultPatterns.hasPatterns(getProject())) {
             throw tooManyAttributes();
@@ -492,14 +498,14 @@
             return getRef(p).getDirectoryScanner(p);
         }
         dieOnCircularReference();
-        DirectoryScanner ds = null;
+        final DirectoryScanner ds;
         synchronized (this) {
             if (directoryScanner != null && p == getProject()) {
                 ds = directoryScanner;
             } else {
                 if (dir == null) {
-                    throw new BuildException("No directory specified for "
-                                             + getDataTypeName() + ".");
+                    throw new BuildException("No directory specified for %s.",
+                        getDataTypeName());
                 }
                 if (!dir.exists() && errorOnMissingDir) {
                     throw new BuildException(dir.getAbsolutePath()
@@ -507,8 +513,8 @@
                                              .DOES_NOT_EXIST_POSTFIX);
                 }
                 if (!dir.isDirectory() && dir.exists()) {
-                    throw new BuildException(dir.getAbsolutePath()
-                                             + " is not a directory.");
+                    throw new BuildException("%s is not a directory.",
+                        dir.getAbsolutePath());
                 }
                 ds = new DirectoryScanner();
                 setupDirectoryScanner(ds, p);
@@ -580,6 +586,7 @@
      *
      * @return whether any selectors are in this container.
      */
+    @Override
     public synchronized boolean hasSelectors() {
         if (isReference()) {
             return getRef(getProject()).hasSelectors();
@@ -601,12 +608,7 @@
         if (defaultPatterns.hasPatterns(getProject())) {
             return true;
         }
-        for (PatternSet ps : additionalPatterns) {
-            if (ps.hasPatterns(getProject())) {
-                return true;
-            }
-        }
-        return false;
+        return additionalPatterns.stream().anyMatch(ps -> ps.hasPatterns(getProject()));
     }
 
     /**
@@ -614,6 +616,7 @@
      *
      * @return the number of selectors in this container as an <code>int</code>.
      */
+    @Override
     public synchronized int selectorCount() {
         if (isReference()) {
             return getRef(getProject()).selectorCount();
@@ -627,13 +630,13 @@
      * @param p the current project
      * @return a <code>FileSelector[]</code> of the selectors in this container.
      */
+    @Override
     public synchronized FileSelector[] getSelectors(Project p) {
         if (isReference()) {
             return getRef(getProject()).getSelectors(p);
         }
         dieOnCircularReference(p);
-        return (FileSelector[]) (selectors.toArray(
-            new FileSelector[selectors.size()]));
+        return selectors.toArray(new FileSelector[selectors.size()]);
     }
 
     /**
@@ -641,6 +644,7 @@
      *
      * @return an <code>Enumeration</code> of selectors.
      */
+    @Override
     public synchronized Enumeration<FileSelector> selectorElements() {
         if (isReference()) {
             return getRef(getProject()).selectorElements();
@@ -654,6 +658,7 @@
      *
      * @param selector the new <code>FileSelector</code> to add.
      */
+    @Override
     public synchronized void appendSelector(FileSelector selector) {
         if (isReference()) {
             throw noChildrenAllowed();
@@ -669,6 +674,7 @@
      * Add a "Select" selector entry on the selector list.
      * @param selector the <code>SelectSelector</code> to add.
      */
+    @Override
     public void addSelector(SelectSelector selector) {
         appendSelector(selector);
     }
@@ -677,6 +683,7 @@
      * Add an "And" selector entry on the selector list.
      * @param selector the <code>AndSelector</code> to add.
      */
+    @Override
     public void addAnd(AndSelector selector) {
         appendSelector(selector);
     }
@@ -685,6 +692,7 @@
      * Add an "Or" selector entry on the selector list.
      * @param selector the <code>OrSelector</code> to add.
      */
+    @Override
     public void addOr(OrSelector selector) {
         appendSelector(selector);
     }
@@ -693,6 +701,7 @@
      * Add a "Not" selector entry on the selector list.
      * @param selector the <code>NotSelector</code> to add.
      */
+    @Override
     public void addNot(NotSelector selector) {
         appendSelector(selector);
     }
@@ -701,6 +710,7 @@
      * Add a "None" selector entry on the selector list.
      * @param selector the <code>NoneSelector</code> to add.
      */
+    @Override
     public void addNone(NoneSelector selector) {
         appendSelector(selector);
     }
@@ -709,6 +719,7 @@
      * Add a majority selector entry on the selector list.
      * @param selector the <code>MajoritySelector</code> to add.
      */
+    @Override
     public void addMajority(MajoritySelector selector) {
         appendSelector(selector);
     }
@@ -717,6 +728,7 @@
      * Add a selector date entry on the selector list.
      * @param selector the <code>DateSelector</code> to add.
      */
+    @Override
     public void addDate(DateSelector selector) {
         appendSelector(selector);
     }
@@ -725,6 +737,7 @@
      * Add a selector size entry on the selector list.
      * @param selector the <code>SizeSelector</code> to add.
      */
+    @Override
     public void addSize(SizeSelector selector) {
         appendSelector(selector);
     }
@@ -733,6 +746,7 @@
      * Add a DifferentSelector entry on the selector list.
      * @param selector the <code>DifferentSelector</code> to add.
      */
+    @Override
     public void addDifferent(DifferentSelector selector) {
         appendSelector(selector);
     }
@@ -741,6 +755,7 @@
      * Add a selector filename entry on the selector list.
      * @param selector the <code>FilenameSelector</code> to add.
      */
+    @Override
     public void addFilename(FilenameSelector selector) {
         appendSelector(selector);
     }
@@ -749,6 +764,7 @@
      * Add a selector type entry on the selector list.
      * @param selector the <code>TypeSelector</code> to add.
      */
+    @Override
     public void addType(TypeSelector selector) {
         appendSelector(selector);
     }
@@ -757,6 +773,7 @@
      * Add an extended selector entry on the selector list.
      * @param selector the <code>ExtendSelector</code> to add.
      */
+    @Override
     public void addCustom(ExtendSelector selector) {
         appendSelector(selector);
     }
@@ -765,6 +782,7 @@
      * Add a contains selector entry on the selector list.
      * @param selector the <code>ContainsSelector</code> to add.
      */
+    @Override
     public void addContains(ContainsSelector selector) {
         appendSelector(selector);
     }
@@ -773,6 +791,7 @@
      * Add a present selector entry on the selector list.
      * @param selector the <code>PresentSelector</code> to add.
      */
+    @Override
     public void addPresent(PresentSelector selector) {
         appendSelector(selector);
     }
@@ -781,6 +800,7 @@
      * Add a depth selector entry on the selector list.
      * @param selector the <code>DepthSelector</code> to add.
      */
+    @Override
     public void addDepth(DepthSelector selector) {
         appendSelector(selector);
     }
@@ -789,6 +809,7 @@
      * Add a depends selector entry on the selector list.
      * @param selector the <code>DependSelector</code> to add.
      */
+    @Override
     public void addDepend(DependSelector selector) {
         appendSelector(selector);
     }
@@ -797,6 +818,7 @@
      * Add a regular expression selector entry on the selector list.
      * @param selector the <code>ContainsRegexpSelector</code> to add.
      */
+    @Override
     public void addContainsRegexp(ContainsRegexpSelector selector) {
         appendSelector(selector);
     }
@@ -806,6 +828,7 @@
      * @param selector the <code>ModifiedSelector</code> to add.
      * @since ant 1.6
      */
+    @Override
     public void addModified(ModifiedSelector selector) {
         appendSelector(selector);
     }
@@ -819,10 +842,35 @@
     }
 
     /**
+     * @param e ExecutableSelector
+     * @since 1.10.0
+     */
+    public void addExecutable(ExecutableSelector e) {
+        appendSelector(e);
+    }
+
+    /**
+     * @param e SymlinkSelector
+     * @since 1.10.0
+     */
+    public void addSymlink(SymlinkSelector e) {
+        appendSelector(e);
+    }
+
+    /**
+     * @param o OwnedBySelector
+     * @since 1.10.0
+     */
+    public void addOwnedBy(OwnedBySelector o) {
+        appendSelector(o);
+    }
+
+    /**
      * Add an arbitrary selector.
      * @param selector the <code>FileSelector</code> to add.
      * @since Ant 1.6
      */
+    @Override
     public void add(FileSelector selector) {
         appendSelector(selector);
     }
@@ -832,22 +880,14 @@
      *
      * @return a <code>String</code> of included filenames.
      */
+    @Override
     public String toString() {
         if (isReference()) {
             return getRef(getProject()).toString();
         }
         dieOnCircularReference();
         DirectoryScanner ds = getDirectoryScanner(getProject());
-        String[] files = ds.getIncludedFiles();
-        StringBuffer sb = new StringBuffer();
-
-        for (int i = 0; i < files.length; i++) {
-            if (i > 0) {
-                sb.append(';');
-            }
-            sb.append(files[i]);
-        }
-        return sb.toString();
+        return Stream.of(ds.getIncludedFiles()).collect(Collectors.joining(";"));
     }
 
     /**
@@ -857,22 +897,20 @@
      * @return the cloned object
      * @since Ant 1.6
      */
+    @Override
     public synchronized Object clone() {
         if (isReference()) {
             return (getRef(getProject())).clone();
-        } else {
-            try {
-                AbstractFileSet fs = (AbstractFileSet) super.clone();
-                fs.defaultPatterns = (PatternSet) defaultPatterns.clone();
-                fs.additionalPatterns = new ArrayList<PatternSet>(additionalPatterns.size());
-                for (PatternSet ps : additionalPatterns) {
-                    fs.additionalPatterns.add((PatternSet) ps.clone());
-                }
-                fs.selectors = new ArrayList<FileSelector>(selectors);
-                return fs;
-            } catch (CloneNotSupportedException e) {
-                throw new BuildException(e);
-            }
+        }
+        try {
+            AbstractFileSet fs = (AbstractFileSet) super.clone();
+            fs.defaultPatterns = (PatternSet) defaultPatterns.clone();
+            fs.additionalPatterns = additionalPatterns.stream().map(
+                    PatternSet::clone).map(PatternSet.class::cast).collect(Collectors.toList());
+            fs.selectors = new ArrayList<>(selectors);
+            return fs;
+        } catch (CloneNotSupportedException e) {
+            throw new BuildException(e);
         }
     }
 
@@ -914,13 +952,11 @@
         }
         dieOnCircularReference();
         PatternSet ps = (PatternSet) defaultPatterns.clone();
-        final int count = additionalPatterns.size();
-        for (int i = 0; i < count; i++) {
-            ps.append(additionalPatterns.get(i), p);
-        }
+        additionalPatterns.forEach(pat -> ps.append(pat, p));
         return ps;
     }
 
+    @Override
     protected synchronized void dieOnCircularReference(Stack<Object> stk, Project p)
         throws BuildException {
         if (isChecked()) {
@@ -929,11 +965,9 @@
         if (isReference()) {
             super.dieOnCircularReference(stk, p);
         } else {
-            for (FileSelector fileSelector : selectors) {
-                if (fileSelector instanceof DataType) {
-                    pushAndInvokeCircularReferenceCheck((DataType) fileSelector, stk, p);
-                }
-            }
+            selectors.stream().filter(DataType.class::isInstance).forEach(fileSelector ->
+                pushAndInvokeCircularReferenceCheck((DataType) fileSelector, stk, p)
+            );
             for (PatternSet ps : additionalPatterns) {
                 pushAndInvokeCircularReferenceCheck(ps, stk, p);
             }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/AntFilterReader.java ant-1.10.3/src/main/org/apache/tools/ant/types/AntFilterReader.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/AntFilterReader.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/AntFilterReader.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,8 +17,9 @@
  */
 package org.apache.tools.ant.types;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Stack;
-import java.util.Vector;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -31,7 +32,7 @@
 
     private String className;
 
-    private final Vector<Parameter> parameters = new Vector<Parameter>();
+    private final List<Parameter> parameters = new ArrayList<>();
 
     private Path classpath;
 
@@ -69,7 +70,7 @@
         if (isReference()) {
             throw noChildrenAllowed();
         }
-        parameters.addElement(param);
+        parameters.add(param);
     }
 
     /**
@@ -137,9 +138,7 @@
             ((AntFilterReader) getCheckedRef()).getParams();
         }
         dieOnCircularReference();
-        Parameter[] params = new Parameter[parameters.size()];
-        parameters.copyInto(params);
-        return params;
+        return parameters.toArray(new Parameter[parameters.size()]);
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/ArchiveFileSet.java ant-1.10.3/src/main/org/apache/tools/ant/types/ArchiveFileSet.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/ArchiveFileSet.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/ArchiveFileSet.java	2018-03-24 12:37:12.000000000 +0000
@@ -110,6 +110,7 @@
      * @param dir the directory for the fileset
      * @throws BuildException on error
      */
+    @Override
     public void setDir(File dir) throws BuildException {
         checkAttributesAllowed();
         if (src != null) {
@@ -191,13 +192,10 @@
             return ((ArchiveFileSet) getCheckedRef()).getSrc();
         }
         dieOnCircularReference();
-        if (src != null) {
-            FileProvider fp = src.as(FileProvider.class);
-            if (fp != null) {
-                return fp.getFile();
-            }
+        if (src == null) {
+            return null;
         }
-        return null;
+        return src.asOptional(FileProvider.class).map(FileProvider::getFile).orElse(null);
     }
 
     /**
@@ -212,6 +210,7 @@
      * @since Ant 1.8
      */
     // TODO is the above true? AFAICT the calls look circular :/
+    @Override
     protected Object getCheckedRef(Project p) {
         return getRef(p);
     }
@@ -288,11 +287,7 @@
     public String getEncoding() {
         if (isReference()) {
             AbstractFileSet ref = getRef(getProject());
-            if (ref instanceof ArchiveFileSet) {
-                return ((ArchiveFileSet) ref).getEncoding();
-            } else {
-                return null;
-            }
+            return ref instanceof ArchiveFileSet ? ((ArchiveFileSet) ref).getEncoding() : null;
         }
         return encoding;
     }
@@ -310,6 +305,7 @@
      * @param p the project to use
      * @return a directory scanner
      */
+    @Override
     public DirectoryScanner getDirectoryScanner(Project p) {
         if (isReference()) {
             return getRef(p).getDirectoryScanner(p);
@@ -340,6 +336,7 @@
      * @return Iterator of Resources.
      * @since Ant 1.7
      */
+    @Override
     public Iterator<Resource> iterator() {
         if (isReference()) {
             return ((ResourceCollection) (getRef(getProject()))).iterator();
@@ -356,6 +353,7 @@
      * @return size of the collection as int.
      * @since Ant 1.7
      */
+    @Override
     public int size() {
         if (isReference()) {
             return ((ResourceCollection) (getRef(getProject()))).size();
@@ -375,6 +373,7 @@
      * @return whether this is a filesystem-only resource collection.
      * @since Ant 1.7
      */
+    @Override
     public boolean isFilesystemOnly() {
         if (isReference()) {
             return ((ArchiveFileSet) getCheckedRef()).isFilesystemOnly();
@@ -505,9 +504,11 @@
      * @return the cloned archiveFileSet
      * @since Ant 1.6
      */
+    @Override
     public Object clone() {
         if (isReference()) {
-            return getCheckedRef(ArchiveFileSet.class, getDataTypeName(), getProject()).clone();
+            return getCheckedRef(ArchiveFileSet.class, getDataTypeName(),
+                getProject()).clone();
         }
         return super.clone();
     }
@@ -518,6 +519,7 @@
      * @return for file based archivefilesets, included files as a list
      * of semicolon-separated filenames. else just the name of the zip.
      */
+    @Override
     public String toString() {
         if (hasDir && getProject() != null) {
             return super.toString();
@@ -530,6 +532,7 @@
      * @return the prefix.
      * @deprecated since 1.7.
      */
+    @Deprecated
     public String getPrefix() {
         return prefix;
     }
@@ -539,6 +542,7 @@
      * @return the full pathname.
      * @deprecated since 1.7.
      */
+    @Deprecated
     public String getFullpath() {
         return fullpath;
     }
@@ -547,6 +551,7 @@
      * @return the file mode.
      * @deprecated since 1.7.
      */
+    @Deprecated
     public int getFileMode() {
         return fileMode;
     }
@@ -555,6 +560,7 @@
      * @return the dir mode.
      * @deprecated since 1.7.
      */
+    @Deprecated
     public int getDirMode() {
         return dirMode;
     }
@@ -577,6 +583,7 @@
         }
     }
 
+    @Override
     protected synchronized void dieOnCircularReference(Stack<Object> stk, Project p)
         throws BuildException {
         if (isChecked()) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/ArchiveScanner.java ant-1.10.3/src/main/org/apache/tools/ant/types/ArchiveScanner.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/ArchiveScanner.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/ArchiveScanner.java	2018-03-24 12:37:12.000000000 +0000
@@ -272,11 +272,12 @@
      * @return the resource
      * @since Ant 1.5.2
      */
+    @Override
     public Resource getResource(String name) {
         if (src == null) {
             return super.getResource(name);
         }
-        if (name.equals("")) {
+        if ("".equals(name)) {
             // special case in ZIPs, we do not want this thing included
             return new Resource("", true, Long.MAX_VALUE, true);
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/Assertions.java ant-1.10.3/src/main/org/apache/tools/ant/types/Assertions.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/Assertions.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/Assertions.java	2018-03-24 12:37:12.000000000 +0000
@@ -117,7 +117,7 @@
      * @param ref the reference to use
      */
     public void setRefid(Reference ref) {
-        if (assertionList.size() > 0 || enableSystemAssertions != null) {
+        if (!assertionList.isEmpty() || enableSystemAssertions != null) {
             throw tooManyAttributes();
         }
         super.setRefid(ref);
@@ -130,13 +130,12 @@
     private Assertions getFinalReference() {
         if (getRefid() == null) {
             return this;
-        } else {
-            Object o = getRefid().getReferencedObject(getProject());
-            if (!(o instanceof Assertions)) {
-                throw new BuildException("reference is of wrong type");
-            }
-            return (Assertions) o;
         }
+        Object o = getRefid().getReferencedObject(getProject());
+        if (!(o instanceof Assertions)) {
+            throw new BuildException("reference is of wrong type");
+        }
+        return (Assertions) o;
     }
 
     /**
@@ -245,16 +244,16 @@
      * @return a cli
      * @throws CloneNotSupportedException if the super class does not support cloning
      */
+    @Override
     public Object clone() throws CloneNotSupportedException {
         Assertions that = (Assertions) super.clone();
-        that.assertionList = new ArrayList<BaseAssertion>(assertionList);
+        that.assertionList = new ArrayList<>(assertionList);
         return that;
     }
 
     /**
      * base class for our assertion elements.
      */
-
     public abstract static class BaseAssertion {
         private String packageName;
         private String className;
@@ -309,7 +308,7 @@
             if (getPackageName() != null && getClassName() != null) {
                 throw new BuildException("Both package and class have been set");
             }
-            StringBuffer command = new StringBuffer(getCommandPrefix());
+            StringBuilder command = new StringBuilder(getCommandPrefix());
             //see if it is a package or a class
             if (getPackageName() != null) {
                 //packages get a ... prefix
@@ -337,6 +336,7 @@
          * get the prefix used to begin the command; -ea or -da.
          * @return prefix
          */
+        @Override
         public String getCommandPrefix() {
             return "-ea";
         }
@@ -351,6 +351,7 @@
          * get the prefix used to begin the command; -ea or -da.
          * @return prefix
          */
+        @Override
         public String getCommandPrefix() {
             return "-da";
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/Commandline.java ant-1.10.3/src/main/org/apache/tools/ant/types/Commandline.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/Commandline.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/Commandline.java	2018-03-24 12:37:12.000000000 +0000
@@ -25,6 +25,7 @@
 import java.util.List;
 import java.util.ListIterator;
 import java.util.StringTokenizer;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.ProjectComponent;
@@ -229,11 +230,9 @@
          */
         public int getPosition() {
             if (realPos == -1) {
-                realPos = (executable == null ? 0 : 1);
-                for (int i = 0; i < position; i++) {
-                    Argument arg = (Argument) arguments.get(i);
-                    realPos += arg.getParts().length;
-                }
+                realPos = (executable == null ? 0 : 1) + (int)
+                arguments.stream().limit(position).map(Argument::getParts)
+                        .flatMap(Stream::of).count();
             }
             return realPos;
         }
@@ -387,7 +386,7 @@
      * @return the arguments as an array of strings.
      */
     public String[] getArguments() {
-        List<String> result = new ArrayList<String>(arguments.size() * 2);
+        List<String> result = new ArrayList<>(arguments.size() * 2);
         addArgumentsToList(result.listIterator());
         return result.toArray(new String[result.size()]);
     }
@@ -414,6 +413,7 @@
      * Return the command line as a string.
      * @return the command line.
      */
+    @Override
     public String toString() {
         return toString(getCommandline());
     }
@@ -434,17 +434,16 @@
             if (argument.indexOf("\'") > -1) {
                 throw new BuildException("Can\'t handle single and double"
                         + " quotes in same argument");
-            } else {
-                return '\'' + argument + '\'';
             }
-        } else if (argument.indexOf("\'") > -1
-                   || argument.indexOf(" ") > -1
-                   // WIN9x uses a bat file for executing commands
-                   || (IS_WIN_9X && argument.indexOf(';') != -1)) {
+            return '\'' + argument + '\'';
+        }
+        if (argument.indexOf("\'") > -1
+               || argument.indexOf(" ") > -1
+               // WIN9x uses a bat file for executing commands
+               || (IS_WIN_9X && argument.indexOf(';') != -1)) {
             return '\"' + argument + '\"';
-        } else {
-            return argument;
         }
+        return argument;
     }
 
     /**
@@ -488,7 +487,7 @@
         final int inDoubleQuote = 2;
         int state = normal;
         final StringTokenizer tok = new StringTokenizer(toProcess, "\"\' ", true);
-        final ArrayList<String> result = new ArrayList<String>();
+        final ArrayList<String> result = new ArrayList<>();
         final StringBuilder current = new StringBuilder();
         boolean lastTokenHasBeenQuoted = false;
 
@@ -550,10 +549,11 @@
      * Generate a deep clone of the contained object.
      * @return a clone of the contained object
      */
+    @Override
     public Object clone() {
         try {
             Commandline c = (Commandline) super.clone();
-            c.arguments = new ArrayList<Argument>(arguments);
+            c.arguments = new ArrayList<>(arguments);
             return c;
         } catch (CloneNotSupportedException e) {
             throw new BuildException(e);
@@ -644,9 +644,7 @@
         if (args == null || args.length == 0) {
             return "";
         }
-        StringBuffer buf = new StringBuffer("Executing \'");
-        buf.append(args[0]);
-        buf.append("\'");
+        StringBuilder buf = new StringBuilder("Executing \'").append(args[0]).append("\'");
         if (args.length > 1) {
             buf.append(" with ");
             buf.append(describeArguments(args, 1));
@@ -681,7 +679,7 @@
         if (args == null || args.length <= offset) {
             return "";
         }
-        StringBuffer buf = new StringBuffer("argument");
+        StringBuilder buf = new StringBuilder("argument");
         if (args.length > offset) {
             buf.append("s");
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/CommandlineJava.java ant-1.10.3/src/main/org/apache/tools/ant/types/CommandlineJava.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/CommandlineJava.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/CommandlineJava.java	2018-03-24 12:37:12.000000000 +0000
@@ -82,7 +82,7 @@
         /** the system properties. */
         Properties sys = null;
         // CheckStyle:VisibilityModifier ON
-        private Vector<PropertySet> propertySets = new Vector<PropertySet>();
+        private Vector<PropertySet> propertySets = new Vector<>();
 
         /**
          * Get the properties as an array; this is an override of the
@@ -90,15 +90,15 @@
          * @return the array of definitions; may be null.
          * @throws BuildException on error.
          */
+        @Override
         public String[] getVariables() throws BuildException {
 
-            List<String> definitions = new LinkedList<String>();
+            List<String> definitions = new LinkedList<>();
             addDefinitionsToList(definitions.listIterator());
-            if (definitions.size() == 0) {
+            if (definitions.isEmpty()) {
                 return null;
-            } else {
-                return definitions.toArray(new String[definitions.size()]);
             }
+            return definitions.toArray(new String[definitions.size()]);
         }
 
         /**
@@ -182,6 +182,7 @@
          * @exception CloneNotSupportedException for signature.
          */
         @SuppressWarnings("unchecked")
+        @Override
         public Object clone() throws CloneNotSupportedException {
             try {
                 SysProperties c = (SysProperties) super.clone();
@@ -366,6 +367,7 @@
                     return javaCommand.getExecutable();
                 case MODULE:
                     return parseClassFromModuleClassPair(javaCommand.getExecutable());
+                default:
             }
         }
         return null;
@@ -392,6 +394,7 @@
                     javaCommand.setExecutable(createModuleClassPair(module,
                             parseClassFromModuleClassPair(javaCommand.getExecutable())), false);
                     break;
+                default:
             }
         }
         executableType = ExecutableType.MODULE;
@@ -476,7 +479,7 @@
      */
     public String[] getCommandline() {
         //create the list
-        List<String> commands = new LinkedList<String>();
+        List<String> commands = new LinkedList<>();
         //fill it
         addCommandsToList(commands.listIterator());
         //convert to an array
@@ -555,6 +558,7 @@
      * Get a string description.
      * @return the command line as a string.
      */
+    @Override
     public String toString() {
         return Commandline.toString(getCommandline());
     }
@@ -606,6 +610,7 @@
      *             Please dont use this, it effectively creates the
      *             entire command.
      */
+    @Deprecated
     public int size() {
         int size = getActualVMCommand().size() + javaCommand.size()
             + sysProperties.size();
@@ -714,6 +719,7 @@
      * @throws BuildException if anything went wrong.
      * @throws CloneNotSupportedException never.
      */
+    @Override
     public Object clone() throws CloneNotSupportedException {
         try {
             CommandlineJava c = (CommandlineJava) super.clone();
@@ -782,7 +788,7 @@
         Path fullClasspath = modulepath != null
                 ? modulepath.concatSystemClasspath("ignore") : null;
         return fullClasspath != null
-            && fullClasspath.toString().trim().length() > 0;
+            && !fullClasspath.toString().trim().isEmpty();
     }
 
     /**
@@ -792,8 +798,8 @@
      */
     public boolean haveUpgrademodulepath() {
         Path fullClasspath = upgrademodulepath != null
-            ? upgrademodulepath.concatSystemClasspath("ignore") : null;
-        return fullClasspath != null && fullClasspath.toString().trim().length() > 0;
+                ? upgrademodulepath.concatSystemClasspath("ignore") : null;
+        return fullClasspath != null && !fullClasspath.toString().trim().isEmpty();
     }
 
     /**
@@ -828,7 +834,7 @@
      * @since 1.7
      */
     private boolean isCloneVm() {
-        return cloneVm || "true".equals(System.getProperty("ant.build.clonevm"));
+        return cloneVm || Boolean.parseBoolean(System.getProperty("ant.build.clonevm"));
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/DataType.java ant-1.10.3/src/main/org/apache/tools/ant/types/DataType.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/DataType.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/DataType.java	2018-03-24 12:37:12.000000000 +0000
@@ -47,6 +47,7 @@
      *             The user should not be directly referencing
      *             variable. Please use {@link #getRefid} instead.
      */
+    @Deprecated
     protected Reference ref;
 
     /**
@@ -62,6 +63,7 @@
      *             variable. Please use {@link #setChecked} or
      *             {@link #isChecked} instead.
      */
+    @Deprecated
     protected boolean checked = true;
     // CheckStyle:VisibilityModifier ON
 
@@ -342,6 +344,7 @@
      * Basic DataType toString().
      * @return this DataType formatted as a String.
      */
+    @Override
     public String toString() {
         String d = getDescription();
         return d == null ? getDataTypeName() : getDataTypeName() + " " + d;
@@ -352,6 +355,7 @@
      * @return a shallow copy of this DataType.
      * @throws CloneNotSupportedException if there is a problem.
      */
+    @Override
     public Object clone() throws CloneNotSupportedException {
         DataType dt = (DataType) super.clone();
         dt.setDescription(getDescription());
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/defaults.properties ant-1.10.3/src/main/org/apache/tools/ant/types/defaults.properties
--- ant-1.9.10/src/main/org/apache/tools/ant/types/defaults.properties	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/defaults.properties	2018-03-24 12:37:12.000000000 +0000
@@ -94,6 +94,7 @@
 javaresource=org.apache.tools.ant.types.resources.JavaResource
 multirootfileset=org.apache.tools.ant.types.resources.MultiRootFileSet
 javaconstant=org.apache.tools.ant.types.resources.JavaConstantResource
+xzresource=org.apache.tools.ant.types.optional.xz.XzResource
 
 #tokenizer implementations
 linetokenizer=org.apache.tools.ant.util.LineTokenizer
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/Description.java ant-1.10.3/src/main/org/apache/tools/ant/types/Description.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/Description.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/Description.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,8 +17,9 @@
  */
 package org.apache.tools.ant.types;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectHelper;
@@ -90,7 +91,7 @@
         if (t == null) {
             return;
         }
-        for (Task task : findElementInTarget(project, t, "description")) {
+        for (Task task : findElementInTarget(t, "description")) {
             if (!(task instanceof UnknownElement)) {
                 continue;
             }
@@ -102,15 +103,10 @@
         }
     }
 
-    private static List<Task> findElementInTarget(Project project,
-                                              Target t, String name) {
-        final List<Task> elems = new ArrayList<Task>();
-        for (Task task : t.getTasks()) {
-            if (name.equals(task.getTaskName())) {
-                elems.add(task);
-            }
-        }
-        return elems;
+    private static List<Task> findElementInTarget(Target t, String name) {
+        return Stream.of(t.getTasks())
+            .filter(task -> name.equals(task.getTaskName()))
+            .collect(Collectors.toList());
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/DirSet.java ant-1.10.3/src/main/org/apache/tools/ant/types/DirSet.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/DirSet.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/DirSet.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,6 +19,8 @@
 package org.apache.tools.ant.types;
 
 import java.util.Iterator;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.types.resources.FileResourceIterator;
@@ -51,12 +53,12 @@
      * as this one.
      * @return the cloned dirset.
      */
+    @Override
     public Object clone() {
         if (isReference()) {
             return ((DirSet) getRef(getProject())).clone();
-        } else {
-            return super.clone();
         }
+        return super.clone();
     }
 
     /**
@@ -64,6 +66,7 @@
      * @return an Iterator of Resources.
      * @since Ant 1.7
      */
+    @Override
     public Iterator<Resource> iterator() {
         if (isReference()) {
             return ((DirSet) getRef(getProject())).iterator();
@@ -77,6 +80,7 @@
      * @return number of elements as int.
      * @since Ant 1.7
      */
+    @Override
     public int size() {
         if (isReference()) {
             return ((DirSet) getRef(getProject())).size();
@@ -89,6 +93,7 @@
      * @return true indicating that all elements will be FileResources.
      * @since Ant 1.7
      */
+    @Override
     public boolean isFilesystemOnly() {
         return true;
     }
@@ -98,18 +103,10 @@
      *
      * @return a <code>String</code> of included directories.
      */
+    @Override
     public String toString() {
         DirectoryScanner ds = getDirectoryScanner(getProject());
-        String[] dirs = ds.getIncludedDirectories();
-        StringBuffer sb = new StringBuffer();
-
-        for (int i = 0; i < dirs.length; i++) {
-            if (i > 0) {
-                sb.append(';');
-            }
-            sb.append(dirs[i]);
-        }
-        return sb.toString();
+        return Stream.of(ds.getIncludedDirectories()).collect(Collectors.joining(";"));
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/DTDLocation.java ant-1.10.3/src/main/org/apache/tools/ant/types/DTDLocation.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/DTDLocation.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/DTDLocation.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,7 +21,7 @@
  * <p>Helper class to handle the DTD nested element.  Instances of
  * this class correspond to the <code>PUBLIC</code> catalog entry type
  * of the <a
- * href="http://oasis-open.org/committees/entity/spec-2001-08-06.html">
+ * href="https://oasis-open.org/committees/entity/spec-2001-08-06.html">
  * OASIS "Open Catalog" standard</a>.</p>
  *
  * <p>Possible Future Enhancement: Bring the Ant element name into
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java ant-1.10.3/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java	2018-03-24 12:37:12.000000000 +0000
@@ -73,7 +73,7 @@
             throw new BuildException(
                 "You have to provide a subclass from EnumeratedAttribute as clazz-parameter.");
         }
-        EnumeratedAttribute ea = null;
+        EnumeratedAttribute ea;
         try {
             ea = clazz.newInstance();
         } catch (Exception e) {
@@ -146,6 +146,7 @@
      *
      * @return the string form of the value.
      */
+    @Override
     public String toString() {
         return getValue();
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/Environment.java ant-1.10.3/src/main/org/apache/tools/ant/types/Environment.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/Environment.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/Environment.java	2018-03-24 12:37:12.000000000 +0000
@@ -115,9 +115,8 @@
          */
         public String getContent() throws BuildException {
             validate();
-            StringBuffer sb = new StringBuffer(key.trim());
-            sb.append("=").append(value.trim());
-            return sb.toString();
+            return new StringBuilder(key.trim()).append("=")
+                .append(value.trim()).toString();
         }
 
         /**
@@ -126,8 +125,8 @@
          */
         public void validate() {
             if (key == null || value == null) {
-                throw new BuildException("key and value must be specified "
-                    + "for environment variables.");
+                throw new BuildException(
+                    "key and value must be specified for environment variables.");
             }
         }
     }
@@ -136,7 +135,7 @@
      * constructor
      */
     public Environment() {
-        variables = new Vector<Variable>();
+        variables = new Vector<>();
     }
 
     /**
@@ -155,14 +154,10 @@
      * @throws BuildException if any variable is misconfigured
      */
     public String[] getVariables() throws BuildException {
-        if (variables.size() == 0) {
+        if (variables.isEmpty()) {
             return null;
         }
-        String[] result = new String[variables.size()];
-        for (int i = 0; i < result.length; i++) {
-            result[i] = ((Variable) variables.elementAt(i)).getContent();
-        }
-        return result;
+        return variables.stream().map(Variable::getContent).toArray(String[]::new);
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/FileList.java ant-1.10.3/src/main/org/apache/tools/ant/types/FileList.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/FileList.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/FileList.java	2018-03-24 12:37:12.000000000 +0000
@@ -37,7 +37,7 @@
  */
 public class FileList extends DataType implements ResourceCollection {
 
-    private List<String> filenames = new ArrayList<String>();
+    private List<String> filenames = new ArrayList<>();
     private File dir;
 
     /**
@@ -68,8 +68,9 @@
      * @param r the reference to another filelist.
      * @exception BuildException if an error occurs.
      */
+    @Override
     public void setRefid(Reference r) throws BuildException {
-        if ((dir != null) || (filenames.size() != 0)) {
+        if ((dir != null) || (!filenames.isEmpty())) {
             throw tooManyAttributes();
         }
         super.setRefid(r);
@@ -105,7 +106,7 @@
      */
     public void setFiles(String filenames) {
         checkAttributesAllowed();
-        if (filenames != null && filenames.length() > 0) {
+        if (!(filenames == null || filenames.isEmpty())) {
             StringTokenizer tok = new StringTokenizer(
                 filenames, ", \t\n\r\f", false);
             while (tok.hasMoreTokens()) {
@@ -128,7 +129,7 @@
             throw new BuildException("No directory specified for filelist.");
         }
 
-        if (filenames.size() == 0) {
+        if (filenames.isEmpty()) {
             throw new BuildException("No files specified for filelist.");
         }
 
@@ -187,6 +188,7 @@
      * @return an Iterator of Resources.
      * @since Ant 1.7
      */
+    @Override
     public Iterator<Resource> iterator() {
         if (isReference()) {
             return getRef(getProject()).iterator();
@@ -200,9 +202,10 @@
      * @return number of elements as int.
      * @since Ant 1.7
      */
+    @Override
     public int size() {
         if (isReference()) {
-            return ((FileList) getRef(getProject())).size();
+            return getRef(getProject()).size();
         }
         return filenames.size();
     }
@@ -212,6 +215,7 @@
      * @return true indicating that all elements will be FileResources.
      * @since Ant 1.7
      */
+    @Override
     public boolean isFilesystemOnly() {
         return true;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/FileSet.java ant-1.10.3/src/main/org/apache/tools/ant/types/FileSet.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/FileSet.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/FileSet.java	2018-03-24 12:37:12.000000000 +0000
@@ -49,12 +49,12 @@
      * as this one.
      * @return the cloned fileset
      */
+    @Override
     public Object clone() {
         if (isReference()) {
             return ((FileSet) getRef(getProject())).clone();
-        } else {
-            return super.clone();
         }
+        return super.clone();
     }
 
     /**
@@ -62,6 +62,7 @@
      * @return an Iterator of Resources.
      * @since Ant 1.7
      */
+    @Override
     public Iterator<Resource> iterator() {
         if (isReference()) {
             return ((FileSet) getRef(getProject())).iterator();
@@ -75,6 +76,7 @@
      * @return number of elements as int.
      * @since Ant 1.7
      */
+    @Override
     public int size() {
         if (isReference()) {
             return ((FileSet) getRef(getProject())).size();
@@ -87,6 +89,7 @@
      * @return true indicating that all elements will be FileResources.
      * @since Ant 1.7
      */
+    @Override
     public boolean isFilesystemOnly() {
         return true;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/FilterSetCollection.java ant-1.10.3/src/main/org/apache/tools/ant/types/FilterSetCollection.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/FilterSetCollection.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/FilterSetCollection.java	2018-03-24 12:37:12.000000000 +0000
@@ -28,7 +28,7 @@
  */
 public class FilterSetCollection {
 
-    private List<FilterSet> filterSets = new ArrayList<FilterSet>();
+    private List<FilterSet> filterSets = new ArrayList<>();
 
     /**
      * Constructor for a FilterSetCollection.
@@ -75,12 +75,7 @@
     * @return   Return true if there are filter in this set otherwise false.
     */
     public boolean hasFilters() {
-        for (FilterSet filterSet : filterSets) {
-            if (filterSet.hasFilters()) {
-                return true;
-            }
-        }
-        return false;
+        return filterSets.stream().anyMatch(FilterSet::hasFilters);
     }
 }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/FilterSet.java ant-1.10.3/src/main/org/apache/tools/ant/types/FilterSet.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/FilterSet.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/FilterSet.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,7 +18,8 @@
 package org.apache.tools.ant.types;
 
 import java.io.File;
-import java.io.FileInputStream;
+import java.io.InputStream;
+import java.nio.file.Files;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Map;
@@ -28,7 +29,6 @@
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.VectorSet;
 
 /**
@@ -113,12 +113,6 @@
     public class FiltersFile {
 
         /**
-         * Constructor for the FiltersFile object.
-         */
-        public FiltersFile() {
-        }
-
-        /**
          * Sets the file from which filters will be read.
          *
          * @param file the file from which filters will be read.
@@ -186,7 +180,7 @@
 
     private boolean recurse = true;
     private Hashtable<String, String> filterHash = null;
-    private Vector<File> filtersFiles = new Vector<File>();
+    private Vector<File> filtersFiles = new Vector<>();
     private OnMissing onMissingFiltersFile = OnMissing.FAIL;
     private boolean readingFiles = false;
 
@@ -195,7 +189,7 @@
     /**
      * List of ordered filters and filter files.
      */
-    private Vector<Filter> filters = new Vector<Filter>();
+    private Vector<Filter> filters = new Vector<>();
 
     /**
      * Default constructor.
@@ -258,7 +252,7 @@
         }
         dieOnCircularReference();
         if (filterHash == null) {
-            filterHash = new Hashtable<String, String>(getFilters().size());
+            filterHash = new Hashtable<>(getFilters().size());
             for (Enumeration<Filter> e = getFilters().elements(); e.hasMoreElements();) {
                Filter filter = e.nextElement();
                filterHash.put(filter.getToken(), filter.getValue());
@@ -357,39 +351,28 @@
      * @param filtersFile        the file from which filters are read.
      * @exception BuildException when the file cannot be read.
      */
-    public synchronized void readFiltersFromFile(File filtersFile) throws BuildException {
+    public synchronized void readFiltersFromFile(File filtersFile)
+        throws BuildException {
         if (isReference()) {
             throw tooManyAttributes();
         }
         if (!filtersFile.exists()) {
-           handleMissingFile("Could not read filters from file "
-                                     + filtersFile + " as it doesn't exist.");
+            handleMissingFile("Could not read filters from file " + filtersFile
+                + " as it doesn't exist.");
         }
         if (filtersFile.isFile()) {
-           log("Reading filters from " + filtersFile, Project.MSG_VERBOSE);
-           FileInputStream in = null;
-           try {
-              Properties props = new Properties();
-              in = new FileInputStream(filtersFile);
-              props.load(in);
-
-              Enumeration<?> e = props.propertyNames();
-              Vector<Filter> filts = getFilters();
-              while (e.hasMoreElements()) {
-                 String strPropName = (String) e.nextElement();
-                 String strValue = props.getProperty(strPropName);
-                 filts.addElement(new Filter(strPropName, strValue));
-              }
-           } catch (Exception ex) {
-              throw new BuildException("Could not read filters from file: "
-                  + filtersFile, ex);
-           } finally {
-              FileUtils.close(in);
-           }
+            log("Reading filters from " + filtersFile, Project.MSG_VERBOSE);
+            try (InputStream in = Files.newInputStream(filtersFile.toPath())) {
+                Properties props = new Properties();
+                props.load(in);
+                props.forEach((k, v) -> addFilter(new Filter((String) k, (String) v)));
+            } catch (Exception ex) {
+                throw new BuildException(
+                    "Could not read filters from file: " + filtersFile, ex);
+            }
         } else {
-           handleMissingFile(
-               "Must specify a file rather than a directory in "
-               + "the filtersfile attribute:" + filtersFile);
+            handleMissingFile("Must specify a file rather than a directory in "
+                + "the filtersfile attribute:" + filtersFile);
         }
         filterHash = null;
     }
@@ -470,7 +453,7 @@
             throw noChildrenAllowed();
         }
         Properties p = propertySet.getProperties();
-        Set<Map.Entry<Object,Object>> entries = p.entrySet();
+        Set<Map.Entry<Object, Object>> entries = p.entrySet();
         for (Map.Entry<Object, Object> entry : entries) {
             addFilter(new Filter(String.valueOf(entry.getKey()),
                                  String.valueOf(entry.getValue())));
@@ -483,7 +466,7 @@
      * @return Return true if there are filters in this set.
      */
     public synchronized boolean hasFilters() {
-        return getFilters().size() > 0;
+        return !getFilters().isEmpty();
     }
 
     /**
@@ -544,8 +527,6 @@
             try {
                 StringBuilder b = new StringBuilder();
                 int i = 0;
-                String token = null;
-                String value = null;
 
                 while (index > -1) {
                     //can't have zero-length token
@@ -554,11 +535,11 @@
                     if (endIndex == -1) {
                         break;
                     }
-                    token
-                        = line.substring(index + beginToken.length(), endIndex);
+                    String token =
+                        line.substring(index + beginToken.length(), endIndex);
                     b.append(line.substring(i, index));
                     if (tokens.containsKey(token)) {
-                        value = tokens.get(token);
+                        String value = tokens.get(token);
                         if (recurse && !value.equals(token)) {
                             // we have another token, let's parse it.
                             value = replaceTokens(value, token);
@@ -602,7 +583,7 @@
         String beginToken = getBeginToken();
         String endToken = getEndToken();
         if (recurseDepth == 0) {
-            passedTokens = new VectorSet<String>();
+            passedTokens = new VectorSet<>();
         }
         recurseDepth++;
         if (passedTokens.contains(parent) && !duplicateToken) {
@@ -622,14 +603,14 @@
             passedTokens = null;
         } else if (duplicateToken) {
             // should always be the case...
-            if (passedTokens.size() > 0) {
+            if (!passedTokens.isEmpty()) {
                 value = passedTokens.remove(passedTokens.size() - 1);
-                if (passedTokens.size() == 0) {
+                if (passedTokens.isEmpty()) {
                     value = beginToken + value + endToken;
                     duplicateToken = false;
                 }
             }
-        } else if (passedTokens.size() > 0) {
+        } else if (!passedTokens.isEmpty()) {
             // remove last seen token when crawling out of recursion
             passedTokens.remove(passedTokens.size() - 1);
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/FlexInteger.java ant-1.10.3/src/main/org/apache/tools/ant/types/FlexInteger.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/FlexInteger.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/FlexInteger.java	2018-03-24 12:37:12.000000000 +0000
@@ -48,6 +48,7 @@
      * Overridden method to return the decimal value for display
      * @return a string version of the integer
      */
+    @Override
     public String toString() {
         return value.toString();
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/LogLevel.java ant-1.10.3/src/main/org/apache/tools/ant/types/LogLevel.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/LogLevel.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/LogLevel.java	2018-03-24 12:37:12.000000000 +0000
@@ -55,6 +55,7 @@
      * @see EnumeratedAttribute#getValues
      * @return the strings allowed for the level attribute
      */
+    @Override
     public String[] getValues() {
         return new String[] {
             "error",
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/Mapper.java ant-1.10.3/src/main/org/apache/tools/ant/types/Mapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/Mapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/Mapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -187,6 +187,7 @@
      * @param r the reference to another mapper
      * @throws BuildException if other attributes are set
      */
+    @Override
     public void setRefid(Reference r) throws BuildException {
         if (type != null || from != null || to != null) {
             throw tooManyAttributes();
@@ -274,6 +275,7 @@
      *             FileNameMapper implementation directly.
      * @return the referenced Mapper
      */
+    @Deprecated
     protected Mapper getRef() {
         return getCheckedRef(Mapper.class, getDataTypeName());
     }
@@ -306,6 +308,7 @@
         /**
          * @return the filenamemapper names
          */
+        @Override
         public String[] getValues() {
             return new String[] {"identity", "flatten", "glob",
                                  "merge", "regexp", "package", "unpackage"};
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java ant-1.10.3/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/mappers/CutDirsMapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -47,6 +47,7 @@
      * Empty implementation.
      * @param ignore ignored.
      */
+    @Override
     public void setFrom(final String ignore) {
     }
 
@@ -54,15 +55,20 @@
      * Empty implementation.
      * @param ignore ignored.
      */
+    @Override
     public void setTo(final String ignore) {
     }
 
     /** {@inheritDoc}. */
+    @Override
     public String[] mapFileName(final String sourceFileName) {
         if (dirs <= 0) {
             throw new BuildException("dirs must be set to a positive number");
         }
         final char fileSep = File.separatorChar;
+        if (sourceFileName == null) {
+            return null;
+        }
         final String fileSepCorrected =
             sourceFileName.replace('/', fileSep).replace('\\', fileSep);
         int nthMatch = fileSepCorrected.indexOf(fileSep);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java ant-1.10.3/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/mappers/FilterMapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -41,6 +41,7 @@
      * @param from a string
      * @throws BuildException always
      */
+    @Override
     public void setFrom(String from) {
         throw new UnsupportedAttributeException(
             "filtermapper doesn't support the \"from\" attribute.", "from");
@@ -51,6 +52,7 @@
      * @param to a string
      * @throws BuildException always
      */
+    @Override
     public void setTo(String to) {
         throw new UnsupportedAttributeException(
             "filtermapper doesn't support the \"to\" attribute.", "to");
@@ -62,22 +64,25 @@
      * @return  a one-element array of converted filenames, or null if
      *          the filterchain returns an empty string.
      */
+    @Override
     public String[] mapFileName(String sourceFileName) {
+        if (sourceFileName == null) {
+            return null;
+        }
         try {
             Reader stringReader = new StringReader(sourceFileName);
             ChainReaderHelper helper = new ChainReaderHelper();
             helper.setBufferSize(BUFFER_SIZE);
             helper.setPrimaryReader(stringReader);
             helper.setProject(getProject());
-            Vector<FilterChain> filterChains = new Vector<FilterChain>();
+            Vector<FilterChain> filterChains = new Vector<>();
             filterChains.add(this);
             helper.setFilterChains(filterChains);
             String result = FileUtils.safeReadFully(helper.getAssembledReader());
-            if (result.length() == 0) {
+            if (result.isEmpty()) {
                 return null;
-            } else {
-                return new String[] {result};
             }
+            return new String[] {result};
         } catch (BuildException ex) {
             throw ex;
         } catch (Exception ex) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/optional/AbstractScriptComponent.java ant-1.10.3/src/main/org/apache/tools/ant/types/optional/AbstractScriptComponent.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/optional/AbstractScriptComponent.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/optional/AbstractScriptComponent.java	2018-03-24 12:37:12.000000000 +0000
@@ -45,6 +45,7 @@
      * Set the project.
      * @param project the owner of this component.
      */
+    @Override
     public void setProject(Project project) {
         super.setProject(project);
         helper.setProjectComponent(this);
@@ -155,4 +156,14 @@
     public void setSetBeans(boolean setBeans) {
         helper.setSetBeans(setBeans);
     }
+
+    /**
+     * Set the encoding of the script from an external file; optional.
+     *
+     * @param encoding the encoding of the file containing the script source.
+     * @since Ant 1.10.2
+     */
+    public void setEncoding(String encoding) {
+        helper.setEncoding(encoding);
+    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java ant-1.10.3/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java	2018-03-24 12:37:12.000000000 +0000
@@ -41,12 +41,12 @@
      * classes which must be included in the fileset and which are the
      * starting point for the dependency search.
      */
-    private List<String> rootClasses = new ArrayList<String>();
+    private List<String> rootClasses = new ArrayList<>();
 
     /**
      * The list of filesets which contain root classes.
      */
-    private List<FileSet> rootFileSets = new ArrayList<FileSet>();
+    private List<FileSet> rootFileSets = new ArrayList<>();
 
     /**
      * Inner class used to contain info about root classes.
@@ -81,6 +81,16 @@
     }
 
     /**
+     * Create a ClassfileSet from another ClassfileSet.
+     *
+     * @param s the other classfileset.
+     */
+    protected ClassfileSet(ClassfileSet s) {
+        super(s);
+        rootClasses.addAll(s.rootClasses);
+    }
+
+    /**
      * Add a fileset to which contains a collection of root classes used to
      * drive the search from classes.
      *
@@ -93,16 +103,6 @@
     }
 
     /**
-     * Create a ClassfileSet from another ClassfileSet.
-     *
-     * @param s the other classfileset.
-     */
-    protected ClassfileSet(ClassfileSet s) {
-        super(s);
-        rootClasses.addAll(s.rootClasses);
-    }
-
-    /**
      * Set the root class attribute.
      *
      * @param rootClass the name of the root class.
@@ -118,6 +118,7 @@
      *
      * @return a dependency scanner.
      */
+    @Override
     public DirectoryScanner getDirectoryScanner(Project p) {
         if (isReference()) {
             return getRef(p).getDirectoryScanner(p);
@@ -125,7 +126,7 @@
         dieOnCircularReference(p);
         DirectoryScanner parentScanner = super.getDirectoryScanner(p);
         DependScanner scanner = new DependScanner(parentScanner);
-        final Vector<String> allRootClasses = new Vector<String>(rootClasses);
+        final Vector<String> allRootClasses = new Vector<>(rootClasses);
         for (FileSet additionalRootSet : rootFileSets) {
             DirectoryScanner additionalScanner
                 = additionalRootSet.getDirectoryScanner(p);
@@ -160,11 +161,13 @@
      *
      * @return a clone of the class file set.
      */
+    @Override
     public Object clone() {
         return new ClassfileSet(isReference()
             ? (ClassfileSet) (getRef(getProject())) : this);
     }
 
+    @Override
     protected synchronized void dieOnCircularReference(Stack<Object> stk, Project p) {
         if (isChecked()) {
             return;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java ant-1.10.3/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,8 +19,10 @@
 
 import java.io.File;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.Set;
 import java.util.Vector;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
@@ -48,7 +50,7 @@
      */
     private Vector<String> included;
 
-    private Vector<File> additionalBaseDirs = new Vector<File>();
+    private Vector<File> additionalBaseDirs = new Vector<>();
 
     /**
      * The parent scanner which gives the basic set of files. Only files which
@@ -82,15 +84,13 @@
      *
      * @return the names of the files.
      */
+    @Override
     public String[] getIncludedFiles() {
-        String[] files = new String[getIncludedFilesCount()];
-        for (int i = 0; i < files.length; i++) {
-            files[i] = (String) included.elementAt(i);
-        }
-        return files;
+        return included.toArray(new String[getIncludedFilesCount()]);
     }
 
     /** {@inheritDoc}. */
+    @Override
     public synchronized int getIncludedFilesCount() {
         if (included == null) {
             throw new IllegalStateException();
@@ -103,12 +103,14 @@
      *
      * @exception IllegalStateException when basedir was set incorrectly.
      */
+    @Override
     public synchronized void scan() throws IllegalStateException {
-        included = new Vector<String>();
+        included = new Vector<>();
         String analyzerClassName = DEFAULT_ANALYZER_CLASS;
-        DependencyAnalyzer analyzer = null;
+        DependencyAnalyzer analyzer;
         try {
-            Class<? extends DependencyAnalyzer> analyzerClass = Class.forName(analyzerClassName)
+            Class<? extends DependencyAnalyzer> analyzerClass =
+                Class.forName(analyzerClassName)
                     .asSubclass(DependencyAnalyzer.class);
             analyzer = analyzerClass.newInstance();
         } catch (Exception e) {
@@ -116,28 +118,22 @@
                                      + analyzerClassName, e);
         }
         analyzer.addClassPath(new Path(null, basedir.getPath()));
-        for (Enumeration<File> e = additionalBaseDirs.elements(); e.hasMoreElements();) {
-            File additionalBaseDir = e.nextElement();
-            analyzer.addClassPath(new Path(null, additionalBaseDir.getPath()));
-        }
+        additionalBaseDirs.stream().map(File::getPath)
+            .map(p -> new Path(null, p)).forEach(analyzer::addClassPath);
+
+        rootClasses.forEach(analyzer::addRootClass);
+
+        Set<String> parentSet = Stream.of(parentScanner.getIncludedFiles())
+            .collect(Collectors.toSet());
 
-        for (Enumeration<String> e = rootClasses.elements(); e.hasMoreElements();) {
-            String rootClass = e.nextElement();
-            analyzer.addRootClass(rootClass);
-        }
         Enumeration<String> e = analyzer.getClassDependencies();
 
-        String[] parentFiles = parentScanner.getIncludedFiles();
-        Hashtable<String, String> parentSet = new Hashtable<String, String>();
-        for (int i = 0; i < parentFiles.length; ++i) {
-            parentSet.put(parentFiles[i], parentFiles[i]);
-        }
         while (e.hasMoreElements()) {
-            String classname = (String) e.nextElement();
-            String filename = classname.replace('.', File.separatorChar);
-            filename = filename + ".class";
+            String classname = e.nextElement();
+            String filename =
+                classname.replace('.', File.separatorChar) + ".class";
             File depFile = new File(basedir, filename);
-            if (depFile.exists() && parentSet.containsKey(filename)) {
+            if (depFile.exists() && parentSet.contains(filename)) {
                 // This is included
                 included.addElement(filename);
             }
@@ -147,6 +143,7 @@
     /**
      * @see DirectoryScanner#addDefaultExcludes
      */
+    @Override
     public void addDefaultExcludes() {
     }
 
@@ -154,6 +151,7 @@
      * @see DirectoryScanner#getExcludedDirectories
      * {@inheritDoc}.
      */
+    @Override
     public String[] getExcludedDirectories() {
         return null;
     }
@@ -162,6 +160,7 @@
      * @see DirectoryScanner#getExcludedFiles
      * {@inheritDoc}.
      */
+    @Override
     public String[] getExcludedFiles() {
         return null;
     }
@@ -170,6 +169,7 @@
      * @see DirectoryScanner#getIncludedDirectories
      * {@inheritDoc}.
      */
+    @Override
     public String[] getIncludedDirectories() {
         return new String[0];
     }
@@ -178,6 +178,7 @@
      * @see DirectoryScanner#getIncludedDirsCount
      * {@inheritDoc}.
      */
+    @Override
     public int getIncludedDirsCount() {
         return 0;
     }
@@ -186,6 +187,7 @@
      * @see DirectoryScanner#getNotIncludedDirectories
      * {@inheritDoc}.
      */
+    @Override
     public String[] getNotIncludedDirectories() {
         return null;
     }
@@ -194,7 +196,7 @@
      * @see DirectoryScanner#getNotIncludedFiles
      * {@inheritDoc}.
      */
-    /** {@inheritDoc}. */
+    @Override
     public String[] getNotIncludedFiles() {
         return null;
     }
@@ -203,7 +205,7 @@
      * @see DirectoryScanner#setExcludes
      * {@inheritDoc}.
      */
-    /** {@inheritDoc}. */
+    @Override
     public void setExcludes(String[] excludes) {
     }
 
@@ -211,7 +213,7 @@
      * @see DirectoryScanner#setIncludes
      * {@inheritDoc}.
      */
-    /** {@inheritDoc}. */
+    @Override
     public void setIncludes(String[] includes) {
     }
 
@@ -219,7 +221,7 @@
      * @see DirectoryScanner#setCaseSensitive
      * {@inheritDoc}.
      */
-    /** {@inheritDoc}. */
+    @Override
     public void setCaseSensitive(boolean isCaseSensitive) {
     }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/optional/image/Arc.java ant-1.10.3/src/main/org/apache/tools/ant/types/optional/image/Arc.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/optional/image/Arc.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/optional/image/Arc.java	2018-03-24 12:37:12.000000000 +0000
@@ -74,23 +74,24 @@
      * @todo refactor using an EnumeratedAttribute
      */
     public void setType(String strType) {
-        if (strType.equalsIgnoreCase("open")) {
+        if ("open".equalsIgnoreCase(strType)) {
             type = Arc2D.OPEN;
-        } else if (strType.equalsIgnoreCase("pie")) {
+        } else if ("pie".equalsIgnoreCase(strType)) {
             type = Arc2D.PIE;
-        } else if (strType.equalsIgnoreCase("chord")) {
+        } else if ("chord".equalsIgnoreCase(strType)) {
             type = Arc2D.CHORD;
         }
     }
 
     /** {@inheritDoc}. */
+    @Override
     public PlanarImage executeDrawOperation() {
         BufferedImage bi = new BufferedImage(width + (stroke_width * 2),
             height + (stroke_width * 2), BufferedImage.TYPE_4BYTE_ABGR_PRE);
 
-        Graphics2D graphics = (Graphics2D) bi.getGraphics();
+        Graphics2D graphics = bi.createGraphics();
 
-        if (!stroke.equals("transparent")) {
+        if (!"transparent".equalsIgnoreCase(stroke)) {
             BasicStroke bStroke = new BasicStroke(stroke_width);
             graphics.setColor(ColorMapper.getColorByName(stroke));
             graphics.setStroke(bStroke);
@@ -98,24 +99,21 @@
                 height, start, stop, type));
         }
 
-        if (!fill.equals("transparent")) {
+        if (!"transparent".equalsIgnoreCase(fill)) {
             graphics.setColor(ColorMapper.getColorByName(fill));
             graphics.fill(new Arc2D.Double(stroke_width, stroke_width,
                 width, height, start, stop, type));
         }
 
-
-        final int size = instructions.size();
-        for (int i = 0; i < size; i++) {
-            ImageOperation instr = ((ImageOperation) instructions.elementAt(i));
+        for (ImageOperation instr : instructions) {
             if (instr instanceof DrawOperation) {
                 PlanarImage img = ((DrawOperation) instr).executeDrawOperation();
                 graphics.drawImage(img.getAsBufferedImage(), null, 0, 0);
             } else if (instr instanceof TransformOperation) {
-                graphics = (Graphics2D) bi.getGraphics();
                 PlanarImage image = ((TransformOperation) instr)
                     .executeTransformOperation(PlanarImage.wrapRenderedImage(bi));
                 bi = image.getAsBufferedImage();
+                graphics = bi.createGraphics();
             }
         }
         return PlanarImage.wrapRenderedImage(bi);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/optional/image/ColorMapper.java ant-1.10.3/src/main/org/apache/tools/ant/types/optional/image/ColorMapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/optional/image/ColorMapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/optional/image/ColorMapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,15 +18,13 @@
 package org.apache.tools.ant.types.optional.image;
 
 import java.awt.Color;
+import java.util.Locale;
 
 /**
  *
  * @see org.apache.tools.ant.taskdefs.optional.image.Image
  */
 public final class ColorMapper {
-    /** private constructor for Utility class */
-    private ColorMapper() {
-    }
 
     /** black string */
     public static final String COLOR_BLACK = "black";
@@ -69,34 +67,42 @@
      * @todo refactor to use an EnumeratedAttribute (maybe?)
      */
     public static Color getColorByName(String colorName) {
-        if (colorName.equalsIgnoreCase(COLOR_BLACK)) {
-            return Color.black;
-        } else if (colorName.equalsIgnoreCase(COLOR_BLUE)) {
+        switch (colorName.toLowerCase(Locale.ENGLISH)) {
+        case COLOR_BLUE:
             return Color.blue;
-        } else if (colorName.equalsIgnoreCase(COLOR_CYAN)) {
+        case COLOR_CYAN:
             return Color.cyan;
-        } else if (colorName.equalsIgnoreCase(COLOR_DARKGRAY) || colorName.equalsIgnoreCase(COLOR_DARKGREY)) {
+        case COLOR_DARKGRAY:
+        case COLOR_DARKGREY:
             return Color.darkGray;
-        } else if (colorName.equalsIgnoreCase(COLOR_GRAY) || colorName.equalsIgnoreCase(COLOR_GREY)) {
+        case COLOR_GRAY:
+        case COLOR_GREY:
             return Color.gray;
-        } else if (colorName.equalsIgnoreCase(COLOR_LIGHTGRAY) || colorName.equalsIgnoreCase(COLOR_LIGHTGREY)) {
+        case COLOR_LIGHTGRAY:
+        case COLOR_LIGHTGREY:
             return Color.lightGray;
-        } else if (colorName.equalsIgnoreCase(COLOR_GREEN)) {
+        case COLOR_GREEN:
             return Color.green;
-        } else if (colorName.equalsIgnoreCase(COLOR_MAGENTA)) {
+        case COLOR_MAGENTA:
             return Color.magenta;
-        } else if (colorName.equalsIgnoreCase(COLOR_ORANGE)) {
+        case COLOR_ORANGE:
             return Color.orange;
-        } else if (colorName.equalsIgnoreCase(COLOR_PINK)) {
+        case COLOR_PINK:
             return Color.pink;
-        } else if (colorName.equalsIgnoreCase(COLOR_RED)) {
+        case COLOR_RED:
             return Color.red;
-        } else if (colorName.equalsIgnoreCase(COLOR_WHITE)) {
+        case COLOR_WHITE:
             return Color.white;
-        } else if (colorName.equalsIgnoreCase(COLOR_YELLOW)) {
+        case COLOR_YELLOW:
             return Color.yellow;
+        case COLOR_BLACK:
+        default:
+            return Color.black;
         }
-        return Color.black;
+    }
+
+    /** private constructor for Utility class */
+    private ColorMapper() {
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/optional/image/Draw.java ant-1.10.3/src/main/org/apache/tools/ant/types/optional/image/Draw.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/optional/image/Draw.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/optional/image/Draw.java	2018-03-24 12:37:12.000000000 +0000
@@ -49,11 +49,13 @@
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void addRectangle(Rectangle rect) {
         instructions.add(rect);
     }
 
     /** {@inheritDoc}. */
+    @Override
     public void addText(Text text) {
         instructions.add(text);
     }
@@ -75,13 +77,12 @@
     }
 
     /** {@inheritDoc}. */
+    @Override
     public PlanarImage executeTransformOperation(PlanarImage image) {
         BufferedImage bi = image.getAsBufferedImage();
-        Graphics2D graphics = (Graphics2D) bi.getGraphics();
+        Graphics2D graphics = bi.createGraphics();
 
-        final int size = instructions.size();
-        for (int i = 0; i < size; i++) {
-            ImageOperation instr = ((ImageOperation) instructions.elementAt(i));
+        for (ImageOperation instr : instructions) {
             if (instr instanceof DrawOperation) {
                 PlanarImage op = ((DrawOperation) instr).executeDrawOperation();
                 log("\tDrawing to x=" + xloc + " y=" + yloc);
@@ -92,11 +93,8 @@
                 BufferedImage child = op.getAsBufferedImage();
                 log("\tDrawing to x=" + xloc + " y=" + yloc);
                 graphics.drawImage(child, null, xloc, yloc);
-                PlanarImage.wrapRenderedImage(bi);
             }
         }
-        image = PlanarImage.wrapRenderedImage(bi);
-
-        return image;
+        return PlanarImage.wrapRenderedImage(bi);
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java ant-1.10.3/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java	2018-03-24 12:37:12.000000000 +0000
@@ -51,35 +51,33 @@
     }
 
     /** {@inheritDoc}. */
+    @Override
     public PlanarImage executeDrawOperation() {
         BufferedImage bi = new BufferedImage(width, height, BufferedImage.TYPE_4BYTE_ABGR_PRE);
 
-        Graphics2D graphics = (Graphics2D) bi.getGraphics();
+        Graphics2D graphics = bi.createGraphics();
 
-        if (!stroke.equals("transparent")) {
+        if (!"transparent".equalsIgnoreCase(stroke)) {
             BasicStroke bStroke = new BasicStroke(stroke_width);
             graphics.setColor(ColorMapper.getColorByName(stroke));
             graphics.setStroke(bStroke);
             graphics.draw(new Ellipse2D.Double(0, 0, width, height));
         }
 
-        if (!fill.equals("transparent")) {
+        if (!"transparent".equalsIgnoreCase(fill)) {
             graphics.setColor(ColorMapper.getColorByName(fill));
             graphics.fill(new Ellipse2D.Double(0, 0, width, height));
         }
 
-
-        final int size = instructions.size();
-        for (int i = 0; i < size; i++) {
-            ImageOperation instr = ((ImageOperation) instructions.elementAt(i));
+        for (ImageOperation instr : instructions) {
             if (instr instanceof DrawOperation) {
                 PlanarImage img = ((DrawOperation) instr).executeDrawOperation();
                 graphics.drawImage(img.getAsBufferedImage(), null, 0, 0);
             } else if (instr instanceof TransformOperation) {
-                graphics = (Graphics2D) bi.getGraphics();
                 PlanarImage image = ((TransformOperation) instr)
                     .executeTransformOperation(PlanarImage.wrapRenderedImage(bi));
                 bi = image.getAsBufferedImage();
+                graphics = bi.createGraphics();
             }
         }
         return PlanarImage.wrapRenderedImage(bi);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java ant-1.10.3/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java	2018-03-24 12:37:12.000000000 +0000
@@ -27,7 +27,7 @@
  */
 public abstract class ImageOperation extends DataType {
      // CheckStyle:VisibilityModifier OFF - bc
-    protected Vector<ImageOperation> instructions = new Vector<ImageOperation>();
+    protected Vector<ImageOperation> instructions = new Vector<>();
      // CheckStyle:VisibilityModifier ON
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java ant-1.10.3/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java	2018-03-24 12:37:12.000000000 +0000
@@ -68,50 +68,48 @@
     }
 
     /** {@inheritDoc}. */
+    @Override
     public PlanarImage executeDrawOperation() {
         log("\tCreating Rectangle w=" + width + " h=" + height + " arcw="
             + arcwidth + " arch=" + archeight);
         BufferedImage bi = new BufferedImage(width, height, BufferedImage.TYPE_4BYTE_ABGR_PRE);
 
-        Graphics2D graphics = (Graphics2D) bi.getGraphics();
+        Graphics2D graphics = bi.createGraphics();
 
-        if (!stroke.equals("transparent")) {
+        if (!"transparent".equalsIgnoreCase(stroke)) {
             BasicStroke bStroke = new BasicStroke(stroke_width);
             graphics.setColor(ColorMapper.getColorByName(stroke));
             graphics.setStroke(bStroke);
 
-            if ((arcwidth != 0) || (archeight != 0)) {
-                graphics.drawRoundRect(0, 0, width, height, arcwidth, archeight);
-            } else {
+            if (arcwidth == 0 && archeight == 0) {
                 graphics.drawRect(0, 0, width, height);
+            } else {
+                graphics.drawRoundRect(0, 0, width, height, arcwidth, archeight);
             }
         }
 
-        if (!fill.equals("transparent")) {
+        if (!"transparent".equalsIgnoreCase(fill)) {
             graphics.setColor(ColorMapper.getColorByName(fill));
-            if ((arcwidth != 0) || (archeight != 0)) {
+            if (arcwidth == 0 && archeight == 0) {
+                graphics.fillRect(stroke_width, stroke_width,
+                    width - (stroke_width * 2), height - (stroke_width * 2));
+            } else {
                 graphics.fillRoundRect(stroke_width, stroke_width,
                     width - (stroke_width * 2), height - (stroke_width * 2),
                     arcwidth, archeight);
-            } else {
-                graphics.fillRect(stroke_width, stroke_width,
-                    width - (stroke_width * 2), height - (stroke_width * 2));
             }
         }
 
-
-        final int size = instructions.size();
-        for (int i = 0; i < size; i++) {
-            ImageOperation instr = ((ImageOperation) instructions.elementAt(i));
+        for (ImageOperation instr : instructions) {
             if (instr instanceof DrawOperation) {
                 PlanarImage img = ((DrawOperation) instr).executeDrawOperation();
                 graphics.drawImage(img.getAsBufferedImage(), null, 0, 0);
             } else if (instr instanceof TransformOperation) {
-                graphics = (Graphics2D) bi.getGraphics();
                 PlanarImage image
                     = ((TransformOperation) instr)
                     .executeTransformOperation(PlanarImage.wrapRenderedImage(bi));
                 bi = image.getAsBufferedImage();
+                graphics = bi.createGraphics();
             }
         }
         return PlanarImage.wrapRenderedImage(bi);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/optional/image/Rotate.java ant-1.10.3/src/main/org/apache/tools/ant/types/optional/image/Rotate.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/optional/image/Rotate.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/optional/image/Rotate.java	2018-03-24 12:37:12.000000000 +0000
@@ -67,24 +67,21 @@
      * @param image The image to perform the transformation on.
      * @return the transformed image.
      */
+    @Override
     public PlanarImage executeTransformOperation(PlanarImage image) {
-        BufferedImage bi = null;
-        final int size = instructions.size();
-        for (int i = 0; i < size; i++) {
-            ImageOperation instr = ((ImageOperation) instructions.elementAt(i));
+        for (ImageOperation instr : instructions) {
             if (instr instanceof DrawOperation) {
                 // If this TransformOperation has DrawOperation children
                 // then Rotate the first child and return.
                 System.out.println("Exec'ing Draws");
                 PlanarImage op = ((DrawOperation) instr).executeDrawOperation();
-                image = performRotate(op);
-                return image;
-            } else if (instr instanceof TransformOperation) {
-                bi = image.getAsBufferedImage();
+                return performRotate(op);
+            }
+            if (instr instanceof TransformOperation) {
+                BufferedImage bi = image.getAsBufferedImage();
                 System.out.println("Exec'ing Transforms");
                 image = ((TransformOperation) instr)
                     .executeTransformOperation(PlanarImage.wrapRenderedImage(bi));
-                bi = image.getAsBufferedImage();
             }
         }
         System.out.println("Exec'ing as TransformOperation");
@@ -100,16 +97,14 @@
      *  ONE image.
      * @return the image.
      */
+    @Override
     public PlanarImage executeDrawOperation() {
-        final int size = instructions.size();
-        for (int i = 0; i < size; i++) {
-            ImageOperation instr = ((ImageOperation) instructions.elementAt(i));
+        for (ImageOperation instr : instructions) {
             if (instr instanceof DrawOperation) {
                 // If this TransformOperation has DrawOperation children
                 // then Rotate the first child and return.
                 PlanarImage op = ((DrawOperation) instr).executeDrawOperation();
-                op = performRotate(op);
-                return op;
+                return performRotate(op);
             }
         }
         return null;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/optional/image/Scale.java ant-1.10.3/src/main/org/apache/tools/ant/types/optional/image/Scale.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/optional/image/Scale.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/optional/image/Scale.java	2018-03-24 12:37:12.000000000 +0000
@@ -41,8 +41,9 @@
     /** Enumerated class for proportions attribute. */
     public static class ProportionsAttribute extends EnumeratedAttribute {
         /** {@inheritDoc}. */
+        @Override
         public String[] getValues() {
-            return new String[] {"ignore", "width", "height", "cover", "fit"};
+            return new String[] { "ignore", "width", "height", "cover", "fit" };
         }
     }
 
@@ -76,16 +77,14 @@
      * @return the value converted from the width string.
      */
     public float getWidth() {
-        float width = 0.0F;
         int percIndex = widthStr.indexOf('%');
         if (percIndex > 0) {
-            width = Float.parseFloat(widthStr.substring(0, percIndex));
             xPercent = true;
+            float width = Float.parseFloat(widthStr.substring(0, percIndex));
             return width / HUNDRED;
-        } else {
-            xPercent = false;
-            return Float.parseFloat(widthStr);
         }
+        xPercent = false;
+        return Float.parseFloat(widthStr);
     }
 
     /**
@@ -95,13 +94,12 @@
     public float getHeight() {
         int percIndex = heightStr.indexOf('%');
         if (percIndex > 0) {
-            float height = Float.parseFloat(heightStr.substring(0, percIndex));
             yPercent = true;
+            float height = Float.parseFloat(heightStr.substring(0, percIndex));
             return height / HUNDRED;
-        } else {
-            yPercent = false;
-            return Float.parseFloat(heightStr);
         }
+        yPercent = false;
+        return Float.parseFloat(heightStr);
     }
 
     /**
@@ -116,10 +114,10 @@
         float yFl = getHeight();
 
         if (!xPercent) {
-            xFl = (xFl / image.getWidth());
+            xFl = xFl / image.getWidth();
         }
         if (!yPercent) {
-            yFl = (yFl / image.getHeight());
+            yFl = yFl / image.getHeight();
         }
 
         if ("width".equals(proportions)) {
@@ -134,8 +132,8 @@
             xFl = yFl;
         }
 
-        pb.add(new Float(xFl));
-        pb.add(new Float(yFl));
+        pb.add(Float.valueOf(xFl));
+        pb.add(Float.valueOf(yFl));
 
         log("\tScaling to " + (xFl * HUNDRED) + "% x "
             + (yFl * HUNDRED) + "%");
@@ -145,18 +143,16 @@
 
 
     /** {@inheritDoc}. */
+    @Override
     public PlanarImage executeTransformOperation(PlanarImage image) {
-        BufferedImage bi = null;
-        final int size = instructions.size();
-        for (int i = 0; i < size; i++) {
-            ImageOperation instr = ((ImageOperation) instructions.elementAt(i));
+        for (ImageOperation instr : instructions) {
             if (instr instanceof DrawOperation) {
                 return performScale(image);
-            } else if (instr instanceof TransformOperation) {
-                bi = image.getAsBufferedImage();
+            }
+            if (instr instanceof TransformOperation) {
+                BufferedImage bi = image.getAsBufferedImage();
                 image = ((TransformOperation) instr)
                     .executeTransformOperation(PlanarImage.wrapRenderedImage(bi));
-                bi = image.getAsBufferedImage();
             }
         }
         return performScale(image);
@@ -164,10 +160,9 @@
 
 
     /** {@inheritDoc}. */
+    @Override
     public PlanarImage executeDrawOperation() {
-        final int size = instructions.size();
-        for (int i = 0; i < size; i++) {
-            ImageOperation instr = ((ImageOperation) instructions.elementAt(i));
+        for (ImageOperation instr : instructions) {
             if (instr instanceof DrawOperation) {
                 PlanarImage image = null;
                 // If this TransformOperation has DrawOperation children
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/optional/image/Text.java ant-1.10.3/src/main/org/apache/tools/ant/types/optional/image/Text.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/optional/image/Text.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/optional/image/Text.java	2018-03-24 12:37:12.000000000 +0000
@@ -91,6 +91,7 @@
      * Draw the text.
      * @return the resultant image.
      */
+    @Override
     public PlanarImage executeDrawOperation() {
         log("\tCreating Text \"" + strText + "\"");
 
@@ -98,19 +99,18 @@
         int height = 1;
 
         BufferedImage bi = new BufferedImage(width, height, BufferedImage.TYPE_4BYTE_ABGR_PRE);
-        Graphics2D graphics = (Graphics2D) bi.getGraphics();
+        Graphics2D graphics = bi.createGraphics();
         graphics.setRenderingHint(
             RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         graphics.setRenderingHint(
             RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
-        Font f = new Font(font, Font.PLAIN, point);
+        Font f = createFont();
         FontMetrics fmetrics = graphics.getFontMetrics(f);
         height = fmetrics.getMaxAscent() + fmetrics.getMaxDescent();
         width = fmetrics.stringWidth(strText);
 
-
         bi = new BufferedImage(width, height, BufferedImage.TYPE_4BYTE_ABGR_PRE);
-        graphics = (Graphics2D) bi.getGraphics();
+        graphics = bi.createGraphics();
 
         graphics.setRenderingHint(
             RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
@@ -120,7 +120,17 @@
         graphics.setFont(f);
         graphics.setColor(ColorMapper.getColorByName(color));
         graphics.drawString(strText, 0, height - fmetrics.getMaxDescent());
-        PlanarImage image = PlanarImage.wrapRenderedImage(bi);
-        return image;
+        return PlanarImage.wrapRenderedImage(bi);
+    }
+
+    private Font createFont() {
+        int style = Font.PLAIN;
+        if (bold) {
+            style |= Font.BOLD;
+        }
+        if (italic) {
+            style |= Font.ITALIC;
+        }
+        return new Font(font, style, point);
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java ant-1.10.3/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java	2018-03-24 12:37:12.000000000 +0000
@@ -32,6 +32,7 @@
     public abstract PlanarImage executeTransformOperation(PlanarImage img);
 
      /** {@inheritDoc}. */
+    @Override
     public void addRectangle(Rectangle instr) {
         instructions.add(instr);
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/optional/ScriptCondition.java ant-1.10.3/src/main/org/apache/tools/ant/types/optional/ScriptCondition.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/optional/ScriptCondition.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/optional/ScriptCondition.java	2018-03-24 12:37:12.000000000 +0000
@@ -41,6 +41,7 @@
      * @throws org.apache.tools.ant.BuildException
      *          if an error occurs
      */
+    @Override
     public boolean eval() throws BuildException {
         initScriptRunner();
         executeScript("ant_condition");
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java ant-1.10.3/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java	2018-03-24 12:37:12.000000000 +0000
@@ -53,6 +53,7 @@
      * Set the project.
      * @param project the owner of this component.
      */
+    @Override
     public void setProject(Project project) {
         super.setProject(project);
         helper.setProjectComponent(this);
@@ -105,6 +106,7 @@
      * @param token the token to be filtered
      * @return the filtered token
      */
+    @Override
     public String filter(String token) {
         init();
         setToken(token);
@@ -180,4 +182,14 @@
     public void setSetBeans(boolean setBeans) {
         helper.setSetBeans(setBeans);
     }
+
+    /**
+     * Set the encoding of the script from an external file; optional.
+     *
+     * @param encoding the encoding of the file containing the script source.
+     * @since Ant 1.10.2
+     */
+    public void setEncoding(String encoding) {
+        helper.setEncoding(encoding);
+    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/optional/ScriptMapper.java ant-1.10.3/src/main/org/apache/tools/ant/types/optional/ScriptMapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/optional/ScriptMapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/optional/ScriptMapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -35,8 +35,8 @@
      *
      * @param from a string.
      */
+    @Override
     public void setFrom(String from) {
-
     }
 
     /**
@@ -44,15 +44,15 @@
      *
      * @param to a string.
      */
+    @Override
     public void setTo(String to) {
-
     }
 
     /**
      * Reset the list of files
      */
     public void clear() {
-        files = new ArrayList<String>(1);
+        files = new ArrayList<>(1);
     }
 
     /**
@@ -77,15 +77,15 @@
      *         null if it does not.
      */
 
+    @Override
     public String[] mapFileName(String sourceFileName) {
         initScriptRunner();
         getRunner().addBean("source", sourceFileName);
         clear();
         executeScript("ant_mapper");
-        if (files.size() == 0) {
+        if (files.isEmpty()) {
             return null;
-        } else {
-            return files.toArray(new String[files.size()]);
         }
+        return files.toArray(new String[files.size()]);
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/optional/ScriptSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/optional/ScriptSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/optional/ScriptSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/optional/ScriptSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -59,6 +59,7 @@
      * Set the project.
      * @param project the owner of this component.
      */
+    @Override
     public void setProject(Project project) {
         super.setProject(project);
         helper.setProjectComponent(this);
@@ -166,6 +167,7 @@
      *
      * @return whether the file should be selected or not
      */
+    @Override
     public boolean isSelected(File basedir, String filename, File file) {
         init();
         setSelected(true);
@@ -220,4 +222,13 @@
         this.selected = selected;
     }
 
+    /**
+     * Set the encoding of the script from an external file; optional.
+     *
+     * @param encoding the encoding of the file containing the script source.
+     * @since Ant 1.10.2
+     */
+    public void setEncoding(String encoding) {
+        helper.setEncoding(encoding);
+    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/optional/xz/XzResource.java ant-1.10.3/src/main/org/apache/tools/ant/types/optional/xz/XzResource.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/optional/xz/XzResource.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/optional/xz/XzResource.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,82 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+package org.apache.tools.ant.types.optional.xz;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.apache.tools.ant.types.ResourceCollection;
+import org.apache.tools.ant.types.resources.CompressedResource;
+import org.tukaani.xz.LZMA2Options;
+import org.tukaani.xz.XZInputStream;
+import org.tukaani.xz.XZOutputStream;
+
+/**
+ * A XZ compressed resource.
+ *
+ * <p>Wraps around another resource, delegates all queries to that
+ * other resource but uncompresses/compresses streams on the fly.</p>
+ *
+ * @since Ant 1.10.1
+ */
+public class XzResource extends CompressedResource {
+
+    /** A no-arg constructor */
+    public XzResource() {
+    }
+
+    /**
+     * Constructor with another resource to wrap.
+     * @param other the resource to wrap.
+     */
+    public XzResource(ResourceCollection other) {
+        super(other);
+    }
+
+    /**
+     * Decompress on the fly using java.util.zip.XZInputStream.
+     * @param in the stream to wrap.
+     * @return the wrapped stream.
+     * @throws IOException if there is a problem.
+     */
+    @Override
+    protected InputStream wrapStream(InputStream in) throws IOException {
+        return new XZInputStream(in);
+    }
+
+    /**
+     * Compress on the fly using java.util.zip.XZOutStream.
+     * @param out the stream to wrap.
+     * @return the wrapped stream.
+     * @throws IOException if there is a problem.
+     */
+     @Override
+    protected OutputStream wrapStream(OutputStream out) throws IOException {
+        return new XZOutputStream(out, new LZMA2Options());
+    }
+
+    /**
+     * Get the name of the compression method.
+     * @return the string "XZ".
+     */
+    @Override
+    protected String getCompressionName() {
+        return "XZ";
+    }
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/Parameterizable.java ant-1.10.3/src/main/org/apache/tools/ant/types/Parameterizable.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/Parameterizable.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/Parameterizable.java	2018-03-24 12:37:12.000000000 +0000
@@ -27,5 +27,5 @@
      *
      * @param parameters an array of name/type/value parameters.
      */
-    void setParameters(Parameter[] parameters);
+    void setParameters(Parameter... parameters);
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/Path.java ant-1.10.3/src/main/org/apache/tools/ant/types/Path.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/Path.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/Path.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,11 +20,12 @@
 
 import java.io.File;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Locale;
 import java.util.Stack;
-import java.util.Vector;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.MagicNames;
@@ -70,7 +71,6 @@
     public static Path systemClasspath = //NOSONAR
         new Path(null, System.getProperty("java.class.path"));
 
-
     /**
      * The system bootclasspath as a Path object.
      *
@@ -118,6 +118,7 @@
          * Create an iterator.
          * @return an iterator.
          */
+        @Override
         public Iterator<Resource> iterator() {
             return new FileResourceIterator(getProject(), null, parts);
         }
@@ -126,6 +127,7 @@
          * Check if this resource is only for filesystems.
          * @return true.
          */
+        @Override
         public boolean isFilesystemOnly() {
             return true;
         }
@@ -134,6 +136,7 @@
          * Get the number of resources.
          * @return the number of parts.
          */
+        @Override
         public int size() {
             return parts == null ? 0 : parts.length;
         }
@@ -193,6 +196,7 @@
      * @param r the reference to another Path
      * @throws BuildException on error
      */
+    @Override
     public void setRefid(Reference r) throws BuildException {
         if (union != null) {
             throw tooManyAttributes();
@@ -343,9 +347,9 @@
             } else if (f.getParentFile() != null && f.getParentFile().exists()
                        && containsWildcards(f.getName())) {
                 setLocation(f);
-                log("adding " + f + " which contains wildcards and may not"
-                    + " do what you intend it to do depending on your OS or"
-                    + " version of Java", Project.MSG_VERBOSE);
+                log("adding " + f
+                    + " which contains wildcards and may not do what you intend it to do depending on your OS or version of Java",
+                    Project.MSG_VERBOSE);
             } else {
                 log("dropping " + f + " from path as it doesn't exist",
                     Project.MSG_VERBOSE);
@@ -383,6 +387,7 @@
      * CLASSPATH or PATH environment variable definition.
      * @return a textual representation of the path.
      */
+    @Override
     public String toString() {
         return isReference() ? getCheckedRef().toString()
             : union == null ? "" : union.toString();
@@ -395,13 +400,13 @@
      * @return an array of strings, one for each path element
      */
     public static String[] translatePath(Project project, String source) {
-        final Vector<String> result = new Vector<String>();
         if (source == null) {
             return new String[0];
         }
+        final List<String> result = new ArrayList<>();
         PathTokenizer tok = new PathTokenizer(source);
-        StringBuffer element = new StringBuffer();
         while (tok.hasMoreTokens()) {
+            StringBuffer element = new StringBuffer();
             String pathElement = tok.nextToken();
             try {
                 element.append(resolveFile(project, pathElement).getPath());
@@ -413,8 +418,7 @@
             for (int i = 0; i < element.length(); i++) {
                 translateFileSep(element, i);
             }
-            result.addElement(element.toString());
-            element = new StringBuffer();
+            result.add(element.toString());
         }
         return result.toArray(new String[result.size()]);
     }
@@ -456,6 +460,7 @@
      * Fulfill the ResourceCollection contract.
      * @return number of elements as int.
      */
+    @Override
     public synchronized int size() {
         if (isReference()) {
             return ((Path) getCheckedRef()).size();
@@ -468,6 +473,7 @@
      * Clone this Path.
      * @return Path with shallowly cloned Resource children.
      */
+    @Override
     public Object clone() {
         try {
             Path result = (Path) super.clone();
@@ -485,6 +491,7 @@
      * @param p   the project to use to dereference the references.
      * @throws BuildException on error.
      */
+    @Override
     protected synchronized void dieOnCircularReference(Stack<Object> stk, Project p)
         throws BuildException {
         if (isChecked()) {
@@ -555,22 +562,22 @@
         if (o != null) {
             order = o;
         }
-        if (order.equals("only")) {
+        if ("only".equals(order)) {
             // only: the developer knows what (s)he is doing
             result.addExisting(p, true);
 
-        } else if (order.equals("first")) {
+        } else if ("first".equals(order)) {
             // first: developer could use a little help
             result.addExisting(p, true);
             result.addExisting(this);
 
-        } else if (order.equals("ignore")) {
+        } else if ("ignore".equals(order)) {
             // ignore: don't trust anyone
             result.addExisting(this);
 
         } else {
             // last: don't trust the developer
-            if (!order.equals("last")) {
+            if (!"last".equals(order)) {
                 log("invalid value for " + MagicNames.BUILD_SYSCLASSPATH
                     + ": " + order,
                     Project.MSG_WARN);
@@ -697,6 +704,7 @@
      * are added to this container while the Iterator is in use.
      * @return a "fail-fast" Iterator.
      */
+    @Override
     public final synchronized Iterator<Resource> iterator() {
         if (isReference()) {
             return ((Path) getCheckedRef()).iterator();
@@ -713,6 +721,7 @@
      * Fulfill the ResourceCollection contract.
      * @return whether this is a filesystem-only resource collection.
      */
+    @Override
     public synchronized boolean isFilesystemOnly() {
         if (isReference()) {
             return ((Path) getCheckedRef()).isFilesystemOnly();
@@ -730,8 +739,8 @@
      */
     protected ResourceCollection assertFilesystemOnly(ResourceCollection rc) {
         if (rc != null && !(rc.isFilesystemOnly())) {
-            throw new BuildException(getDataTypeName()
-                + " allows only filesystem resources.");
+            throw new BuildException("%s allows only filesystem resources.",
+                getDataTypeName());
         }
         return rc;
     }
@@ -749,7 +758,7 @@
             return false;
         }
         try {
-            Method listMethod = getClass().getMethod("list", (Class[]) null);
+            Method listMethod = getClass().getMethod("list");
             return !listMethod.getDeclaringClass().equals(Path.class);
         } catch (Exception e) {
             //shouldn't happen, but
@@ -770,7 +779,7 @@
      */
     private static boolean containsWildcards(String path) {
         return path != null
-            && (path.indexOf("*") > -1 || path.indexOf("?") > -1);
+            && (path.indexOf('*') > -1 || path.indexOf('?') > -1);
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/PatternSet.java ant-1.10.3/src/main/org/apache/tools/ant/types/PatternSet.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/PatternSet.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/PatternSet.java	2018-03-24 12:37:12.000000000 +0000
@@ -23,12 +23,13 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.StringTokenizer;
+import java.util.function.Predicate;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.PropertyHelper;
-import org.apache.tools.ant.util.FileUtils;
 
 /**
  * Named collection of include/exclude tags.
@@ -38,10 +39,10 @@
  *
  */
 public class PatternSet extends DataType implements Cloneable {
-    private List<NameEntry> includeList = new ArrayList<NameEntry>();
-    private List<NameEntry> excludeList = new ArrayList<NameEntry>();
-    private List<NameEntry> includesFileList = new ArrayList<NameEntry>();
-    private List<NameEntry> excludesFileList = new ArrayList<NameEntry>();
+    private List<NameEntry> includeList = new ArrayList<>();
+    private List<NameEntry> excludeList = new ArrayList<>();
+    private List<NameEntry> includesFileList = new ArrayList<>();
+    private List<NameEntry> excludesFileList = new ArrayList<>();
 
     /**
      * inner class to hold a name on list.  "If" and "Unless" attributes
@@ -150,8 +151,9 @@
         /**
          * @return a printable form of this object.
          */
+        @Override
         public String toString() {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             if (name == null) {
                 buf.append("noname");
             } else {
@@ -181,9 +183,11 @@
             setProject(p.getProject());
             addConfiguredPatternset(p);
         }
+        @Override
         public String[] getIncludePatterns(Project p) {
             return super.getExcludePatterns(p);
         }
+        @Override
         public String[] getExcludePatterns(Project p) {
             return super.getIncludePatterns(p);
         }
@@ -205,6 +209,7 @@
      * @param r the reference to another patternset.
      * @throws BuildException on error.
      */
+    @Override
     public void setRefid(Reference r) throws BuildException {
         if (!includeList.isEmpty() || !excludeList.isEmpty()) {
             throw tooManyAttributes();
@@ -290,7 +295,7 @@
         if (isReference()) {
             throw tooManyAttributes();
         }
-        if (includes != null && includes.length() > 0) {
+        if (includes != null && !includes.isEmpty()) {
             StringTokenizer tok = new StringTokenizer(includes, ", ", false);
             while (tok.hasMoreTokens()) {
                 createInclude().setName(tok.nextToken());
@@ -308,7 +313,7 @@
         if (isReference()) {
             throw tooManyAttributes();
         }
-        if (excludes != null && excludes.length() > 0) {
+        if (excludes != null && !excludes.isEmpty()) {
             StringTokenizer tok = new StringTokenizer(excludes, ", ", false);
             while (tok.hasMoreTokens()) {
                 createExclude().setName(tok.nextToken());
@@ -358,26 +363,19 @@
     private void readPatterns(File patternfile, List<NameEntry> patternlist, Project p)
             throws BuildException {
 
-        BufferedReader patternReader = null;
-        try {
-            // Get a FileReader
-            patternReader = new BufferedReader(new FileReader(patternfile));
+        try (BufferedReader patternReader =
+            new BufferedReader(new FileReader(patternfile))) {
 
             // Create one NameEntry in the appropriate pattern list for each
             // line in the file.
-            String line = patternReader.readLine();
-            while (line != null) {
-                if (line.length() > 0) {
-                    line = p.replaceProperties(line);
-                    addPatternToList(patternlist).setName(line);
-                }
-                line = patternReader.readLine();
-            }
+            patternReader.lines()
+                .filter(((Predicate<String>) String::isEmpty).negate())
+                .map(p::replaceProperties)
+                .forEach(line -> addPatternToList(patternlist).setName(line));
+
         } catch (IOException ioe)  {
             throw new BuildException("An error occurred while reading from pattern file: "
                     + patternfile, ioe);
-        } finally {
-            FileUtils.close(patternReader);
         }
     }
 
@@ -444,8 +442,8 @@
             return getRef(p).hasPatterns(p);
         }
         dieOnCircularReference(p);
-        return includesFileList.size() > 0 || excludesFileList.size() > 0
-                || includeList.size() > 0 || excludeList.size() > 0;
+        return !(includesFileList.isEmpty() && excludesFileList.isEmpty()
+            && includeList.isEmpty() && excludeList.isEmpty());
     }
 
     /**
@@ -460,24 +458,18 @@
      * Convert a vector of NameEntry elements into an array of Strings.
      */
     private String[] makeArray(List<NameEntry> list, Project p) {
-        if (list.size() == 0) {
+        if (list.isEmpty()) {
             return null;
         }
-        ArrayList<String> tmpNames = new ArrayList<String>();
-        for (NameEntry ne : list) {
-            String pattern = ne.evalName(p);
-            if (pattern != null && pattern.length() > 0) {
-                tmpNames.add(pattern);
-            }
-        }
-        return tmpNames.toArray(new String[tmpNames.size()]);
+        return list.stream().map(ne -> ne.evalName(p)).filter(Objects::nonNull)
+            .filter(pattern -> !pattern.isEmpty()).toArray(String[]::new);
     }
 
     /**
      * Read includesfile ot excludesfile if not already done so.
      */
     private void readFiles(Project p) {
-        if (includesFileList.size() > 0) {
+        if (!includesFileList.isEmpty()) {
             for (NameEntry ne : includesFileList) {
                 String fileName = ne.evalName(p);
                 if (fileName != null) {
@@ -491,7 +483,7 @@
             }
             includesFileList.clear();
         }
-        if (excludesFileList.size() > 0) {
+        if (!excludesFileList.isEmpty()) {
             for (NameEntry ne : excludesFileList) {
                 String fileName = ne.evalName(p);
                 if (fileName != null) {
@@ -510,21 +502,24 @@
     /**
      * @return a printable form of this object.
      */
+    @Override
     public String toString() {
-        return "patternSet{ includes: " + includeList + " excludes: " + excludeList + " }";
+        return String.format("patternSet{ includes: %s excludes: %s }",
+            includeList, excludeList);
     }
 
     /**
      * @since Ant 1.6
      * @return a clone of this patternset.
      */
+    @Override
     public Object clone() {
         try {
             PatternSet ps = (PatternSet) super.clone();
-            ps.includeList = new ArrayList<NameEntry>(includeList);
-            ps.excludeList = new ArrayList<NameEntry>(excludeList);
-            ps.includesFileList = new ArrayList<NameEntry>(includesFileList);
-            ps.excludesFileList = new ArrayList<NameEntry>(excludesFileList);
+            ps.includeList = new ArrayList<>(includeList);
+            ps.excludeList = new ArrayList<>(excludeList);
+            ps.includesFileList = new ArrayList<>(includesFileList);
+            ps.excludesFileList = new ArrayList<>(excludesFileList);
             return ps;
         } catch (CloneNotSupportedException e) {
             throw new BuildException(e);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/Permissions.java ant-1.10.3/src/main/org/apache/tools/ant/types/Permissions.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/Permissions.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/Permissions.java	2018-03-24 12:37:12.000000000 +0000
@@ -44,8 +44,8 @@
  */
 public class Permissions {
 
-    private final List<Permission> grantedPermissions = new LinkedList<Permission>();
-    private final List<Permission> revokedPermissions = new LinkedList<Permission>();
+    private final List<Permission> grantedPermissions = new LinkedList<>();
+    private final List<Permission> revokedPermissions = new LinkedList<>();
     private java.security.Permissions granted = null;
     private SecurityManager origSm = null;
     private boolean active = false;
@@ -284,7 +284,7 @@
          */
         public void setActions(final String actions) {
             actionString = actions;
-            if (actions.length() > 0) {
+            if (!actions.isEmpty()) {
                 this.actions = parseActions(actions);
             }
         }
@@ -310,10 +310,8 @@
                     if (!perm.getName().startsWith(name.substring(0, name.length() - 1))) {
                         return false;
                     }
-                } else {
-                    if (!name.equals(perm.getName())) {
-                        return false;
-                    }
+                } else if (!name.equals(perm.getName())) {
+                    return false;
                 }
             }
             if (actions != null) {
@@ -333,11 +331,11 @@
          * @param actions The actions to be parsed.
          */
         private Set<String> parseActions(final String actions) {
-            final Set<String> result = new HashSet<String>();
+            final Set<String> result = new HashSet<>();
             final StringTokenizer tk = new StringTokenizer(actions, ",");
             while (tk.hasMoreTokens()) {
                 final String item = tk.nextToken().trim();
-                if (!item.equals("")) {
+                if (!"".equals(item)) {
                     result.add(item);
                 }
             }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/PropertySet.java ant-1.10.3/src/main/org/apache/tools/ant/types/PropertySet.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/PropertySet.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/PropertySet.java	2018-03-24 12:37:12.000000000 +0000
@@ -22,15 +22,16 @@
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
 import java.util.Stack;
 import java.util.TreeMap;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -50,8 +51,8 @@
     private boolean dynamic = true;
     private boolean negate = false;
     private Set<String> cachedNames;
-    private List<PropertyRef> ptyRefs = new ArrayList<PropertyRef>();
-    private List<PropertySet> setRefs = new ArrayList<PropertySet>();
+    private List<PropertyRef> ptyRefs = new ArrayList<>();
+    private List<PropertySet> setRefs = new ArrayList<>();
     private Mapper mapper;
 
     /**
@@ -118,6 +119,7 @@
          * A debug toString().
          * @return a string version of this object.
          */
+        @Override
         public String toString() {
             return "name=" + name + ", regex=" + regex + ", prefix=" + prefix
                 + ", builtin=" + builtin;
@@ -273,12 +275,12 @@
     }
 
     /**
-     * Convert the system properties to a hashtable.
+     * Convert the system properties to a Map.
      * Use propertynames to get the list of properties (including
      * default ones).
      */
-    private Hashtable<String, Object> getAllSystemProperties() {
-        Hashtable<String, Object>  ret = new Hashtable<String, Object>();
+    private Map<String, Object> getAllSystemProperties() {
+        Map<String, Object>  ret = new HashMap<>();
         for (Enumeration<?> e = System.getProperties().propertyNames();
              e.hasMoreElements();) {
             String name = (String) e.nextElement();
@@ -312,7 +314,7 @@
 
         final Map<String, Object> effectiveProperties = getEffectiveProperties();
         final Set<String> propertyNames = getPropertyNames(effectiveProperties);
-        final Map<String, Object> result = new HashMap<String, Object>();
+        final Map<String, Object> result = new HashMap<>();
 
         //iterate through the names, get the matching values
         for (String name : propertyNames) {
@@ -349,7 +351,7 @@
     private Set<String> getPropertyNames(Map<String, Object> props) {
         Set<String> names;
         if (getDynamic() || cachedNames == null) {
-            names = new HashSet<String>();
+            names = new HashSet<>();
             addPropertyNames(names, props);
             // Add this PropertySet's nested PropertySets' property names.
             for (PropertySet set : setRefs) {
@@ -357,7 +359,7 @@
             }
             if (negate) {
                 //make a copy...
-                HashSet<String> complement = new HashSet<String>(props.keySet());
+                HashSet<String> complement = new HashSet<>(props.keySet());
                 complement.removeAll(names);
                 names = complement;
             }
@@ -427,7 +429,7 @@
      * @return the referenced PropertySet.
      */
     protected PropertySet getRef() {
-        return (PropertySet) getCheckedRef(PropertySet.class, "propertyset");
+        return getCheckedRef(PropertySet.class, "propertyset");
     }
 
     /**
@@ -437,6 +439,7 @@
      * @throws BuildException if another attribute was set, since
      *         refid and all other attributes are mutually exclusive.
      */
+    @Override
     public final void setRefid(Reference r) {
         if (!noAttributeSet) {
             throw tooManyAttributes();
@@ -475,6 +478,7 @@
         static final String SYSTEM = "system";
         static final String COMMANDLINE = "commandline";
         /** {@inheritDoc}. */
+        @Override
         public String[] getValues() {
             return new String[] {ALL, SYSTEM, COMMANDLINE};
         }
@@ -487,13 +491,14 @@
      * The output order is sorted according to the keys' <i>natural order</i>.
      * @return a string rep of this object.
      */
+    @Override
     public String toString() {
         if (isReference()) {
             return getRef().toString();
         }
         dieOnCircularReference();
         StringBuilder b = new StringBuilder();
-        TreeMap<String, Object> sorted = new TreeMap<String, Object>(getPropertyMap());
+        TreeMap<String, Object> sorted = new TreeMap<>(getPropertyMap());
         for (Entry<String, Object> e : sorted.entrySet()) {
             if (b.length() != 0) {
                 b.append(", ");
@@ -510,35 +515,27 @@
      * @return an Iterator of Resources.
      * @since Ant 1.7
      */
+    @Override
     public Iterator<Resource> iterator() {
         if (isReference()) {
             return getRef().iterator();
         }
         dieOnCircularReference();
-        final Set<String> names = getPropertyNames(getEffectiveProperties());
-
-        Mapper myMapper = getMapper();
-        final FileNameMapper m = myMapper == null ? null : myMapper.getImplementation();
-        final Iterator<String> iter = names.iterator();
-
-        return new Iterator<Resource>() {
-            public boolean hasNext() {
-                return iter.hasNext();
-            }
-            public Resource next() {
-                PropertyResource p = new PropertyResource(getProject(), iter.next());
-                return m == null ? (Resource) p : new MappedResource(p, m);
-            }
-            public void remove() {
-                throw new UnsupportedOperationException();
-            }
-        };
+        Stream<Resource> result = getPropertyNames(getEffectiveProperties())
+            .stream().map(name -> new PropertyResource(getProject(), name));
+        Optional<FileNameMapper> m =
+            Optional.ofNullable(getMapper()).map(Mapper::getImplementation);
+        if (m.isPresent()) {
+            result = result.map(p -> new MappedResource(p, m.get()));
+        }
+        return result.iterator();
     }
 
     /**
      * Fulfill the ResourceCollection contract.
      * @return the size of this ResourceCollection.
      */
+    @Override
     public int size() {
         return isReference() ? getRef().size() : getProperties().size();
     }
@@ -547,6 +544,7 @@
      * Fulfill the ResourceCollection contract.
      * @return whether this is a filesystem-only resource collection.
      */
+    @Override
     public boolean isFilesystemOnly() {
         if (isReference()) {
             return getRef().isFilesystemOnly();
@@ -555,6 +553,7 @@
         return false;
     }
 
+    @Override
     protected synchronized void dieOnCircularReference(Stack<Object> stk, Project p)
         throws BuildException {
         if (isChecked()) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/Quantifier.java ant-1.10.3/src/main/org/apache/tools/ant/types/Quantifier.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/Quantifier.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/Quantifier.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,6 +17,12 @@
  */
 package org.apache.tools.ant.types;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.stream.Stream;
+
 import org.apache.tools.ant.BuildException;
 
 /**
@@ -36,59 +42,82 @@
  * @since Ant 1.7
  */
 public class Quantifier extends EnumeratedAttribute {
-    private static final String[] VALUES
-        = new String[] {"all", "each", "every", "any", "some", "one",
-                        "majority", "most", "none"};
+    private static final String[] VALUES =
+            Stream.of(Predicate.values()).map(Predicate::getNames)
+                .flatMap(Collection::stream).toArray(String[]::new);
 
     /** ALL instance */
-    public static final Quantifier ALL = new Quantifier("all");
+    public static final Quantifier ALL = new Quantifier(Predicate.ALL);
+
     /** ANY instance */
-    public static final Quantifier ANY = new Quantifier("any");
+    public static final Quantifier ANY = new Quantifier(Predicate.ANY);
+
     /** ONE instance */
-    public static final Quantifier ONE = new Quantifier("one");
+    public static final Quantifier ONE = new Quantifier(Predicate.ONE);
+
     /** MAJORITY instance */
-    public static final Quantifier MAJORITY = new Quantifier("majority");
+    public static final Quantifier MAJORITY =
+        new Quantifier(Predicate.MAJORITY);
+
     /** NONE instance */
-    public static final Quantifier NONE = new Quantifier("none");
+    public static final Quantifier NONE = new Quantifier(Predicate.NONE);
 
-    private abstract static class Predicate {
-        abstract boolean eval(int t, int f);
-    }
+    private enum Predicate {
+        ALL("all", "each", "every") {
+            @Override
+            boolean eval(int t, int f) {
+                return f == 0;
+            }
+        },
+
+        ANY("any", "some") {
+            @Override
+            boolean eval(int t, int f) {
+                return t > 0;
+            }
+        },
+
+        ONE("one") {
+            @Override
+            boolean eval(int t, int f) {
+                return t == 1;
+            }
+        },
+
+        MAJORITY("majority", "most") {
+            @Override
+            boolean eval(int t, int f) {
+                return t > f;
+            }
+        },
+
+        NONE("none") {
+            @Override
+            boolean eval(int t, int f) {
+                return t == 0;
+            }
+        };
 
-    private static final Predicate ALL_PRED = new Predicate() {
-        boolean eval(int t, int f) { return f == 0; }
-    };
-
-    private static final Predicate ANY_PRED = new Predicate() {
-        boolean eval(int t, int f) { return t > 0; }
-    };
-
-    private static final Predicate ONE_PRED = new Predicate() {
-        boolean eval(int t, int f) { return t == 1; }
-    };
-
-    private static final Predicate MAJORITY_PRED = new Predicate() {
-        boolean eval(int t, int f) { return t > f; }
-    };
-
-    private static final Predicate NONE_PRED = new Predicate() {
-        boolean eval(int t, int f) { return t == 0; }
-    };
-
-    private static final Predicate[] PREDS = new Predicate[VALUES.length];
-
-    static {
-        // CheckStyle:MagicNumber OFF
-        PREDS[0] = ALL_PRED;
-        PREDS[1] = ALL_PRED;
-        PREDS[2] = ALL_PRED;
-        PREDS[3] = ANY_PRED;
-        PREDS[4] = ANY_PRED;
-        PREDS[5] = ONE_PRED;
-        PREDS[6] = MAJORITY_PRED;
-        PREDS[7] = MAJORITY_PRED;
-        PREDS[8] = NONE_PRED;
-        // CheckStyle:MagicNumber ON
+        static Predicate get(String name) {
+            return Stream.of(values()).filter(p -> p.names.contains(name))
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException(name));
+        }
+
+        final Set<String> names;
+
+        Predicate(String primaryName, String... additionalNames) {
+            Set<String> names = new LinkedHashSet<>();
+            names.add(primaryName);
+            Collections.addAll(names, additionalNames);
+            this.names = Collections.unmodifiableSet(names);
+        }
+
+        Set<String> getNames() {
+            return names;
+        }
+
+        abstract boolean eval(int t, int f);
     }
 
     /**
@@ -105,10 +134,15 @@
         setValue(value);
     }
 
+    private Quantifier(Predicate impl) {
+        setValue(impl.getNames().iterator().next());
+    }
+
     /**
      * Return the possible values.
      * @return String[] of EnumeratedAttribute values.
      */
+    @Override
     public String[] getValues() {
         return VALUES;
     }
@@ -139,7 +173,7 @@
         if (index == -1) {
             throw new BuildException("Quantifier value not set.");
         }
-        return PREDS[index].eval(t, f);
+        return Predicate.get(VALUES[index]).eval(t, f);
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/RedirectorElement.java ant-1.10.3/src/main/org/apache/tools/ant/types/RedirectorElement.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/RedirectorElement.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/RedirectorElement.java	2018-03-24 12:37:12.000000000 +0000
@@ -84,13 +84,13 @@
     private Mapper errorMapper;
 
     /** input filter chains. */
-    private Vector<FilterChain> inputFilterChains = new Vector<FilterChain>();
+    private Vector<FilterChain> inputFilterChains = new Vector<>();
 
     /** output filter chains. */
-    private Vector<FilterChain> outputFilterChains = new Vector<FilterChain>();
+    private Vector<FilterChain> outputFilterChains = new Vector<>();
 
     /** error filter chains. */
-    private Vector<FilterChain> errorFilterChains = new Vector<FilterChain>();
+    private Vector<FilterChain> errorFilterChains = new Vector<>();
 
     /** The output encoding */
     private String outputEncoding;
@@ -528,13 +528,13 @@
                 redirector.setError(toFileArray(errorTargets));
             }
         }
-        if (inputFilterChains.size() > 0) {
+        if (!inputFilterChains.isEmpty()) {
             redirector.setInputFilterChains(inputFilterChains);
         }
-        if (outputFilterChains.size() > 0) {
+        if (!outputFilterChains.isEmpty()) {
             redirector.setOutputFilterChains(outputFilterChains);
         }
-        if (errorFilterChains.size() > 0) {
+        if (!errorFilterChains.isEmpty()) {
             redirector.setErrorFilterChains(errorFilterChains);
         }
         if (inputEncoding != null) {
@@ -572,7 +572,7 @@
             return null;
         }
         //remove any null elements
-        ArrayList<File> list = new ArrayList<File>(name.length);
+        ArrayList<File> list = new ArrayList<>(name.length);
         for (int i = 0; i < name.length; i++) {
             if (name[i] != null) {
                 list.add(getProject().resolveFile(name[i]));
@@ -588,6 +588,7 @@
      * @param p   the project to use to dereference the references.
      * @throws BuildException on error.
      */
+    @Override
     protected void dieOnCircularReference(Stack<Object> stk, Project p)
         throws BuildException {
         if (isChecked()) {
@@ -604,7 +605,6 @@
                     stk.pop();
                 }
             }
-            @SuppressWarnings("unchecked")
             final List<? extends List<FilterChain>> filterChainLists = Arrays
                     .<List<FilterChain>> asList(inputFilterChains, outputFilterChains,
                             errorFilterChains);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/Reference.java ant-1.10.3/src/main/org/apache/tools/ant/types/Reference.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/Reference.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/Reference.java	2018-03-24 12:37:12.000000000 +0000
@@ -36,6 +36,7 @@
      *             Please use {@link Reference#Reference(Project,String)}
      *             instead.
      */
+    @Deprecated
     public Reference() {
     }
 
@@ -46,6 +47,7 @@
      *             Please use {@link Reference#Reference(Project,String)}
      *             instead.
      */
+    @Deprecated
     public Reference(String id) {
         setRefId(id);
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/RegularExpression.java ant-1.10.3/src/main/org/apache/tools/ant/types/RegularExpression.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/RegularExpression.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/RegularExpression.java	2018-03-24 12:37:12.000000000 +0000
@@ -69,12 +69,6 @@
     private String myPattern;
     private boolean setPatternPending = false;
 
-    /**
-     * default constructor
-     */
-    public RegularExpression() {
-    }
-
     private void init(Project p) {
         if (!alreadyInit) {
             this.regexp = FACTORY.newRegexp(p);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java ant-1.10.3/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java	2018-03-24 12:37:12.000000000 +0000
@@ -54,6 +54,7 @@
      *  will be a total of two ApacheCatalog instances, and so on.</p>
      * @return the catalog.
      */
+    @Override
     protected Catalog newCatalog() {
         final ApacheCatalog cat = (ApacheCatalog) super.newCatalog();
         cat.setResolver(resolver);
@@ -85,6 +86,7 @@
      *
      * @param entry The CatalogEntry to process.
      */
+    @Override
     public void addEntry(final CatalogEntry entry) {
 
         final int type = entry.getEntryType();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java ant-1.10.3/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,6 @@
 package org.apache.tools.ant.types.resolver;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URL;
 
 import org.apache.tools.ant.BuildException;
@@ -41,9 +40,9 @@
  * <p>The {@link org.apache.tools.ant.types.resolver.ApacheCatalog
  * ApacheCatalog} class is used to parse external catalog files, which
  * can be in either <a
- * href="http://oasis-open.org/committees/entity/background/9401.html">
+ * href="https://oasis-open.org/committees/entity/background/9401.html">
  * plain text format</a> or <a
- * href="http://www.oasis-open.org/committees/entity/spec-2001-08-06.html">
+ * href="https://www.oasis-open.org/committees/entity/spec-2001-08-06.html">
  * XML format</a>.</p>
  *
  * <p>For each entry found in an external catalog file, if any, an
@@ -104,7 +103,7 @@
 
         final Catalog catalog = getCatalog();
         if (!(catalog instanceof ApacheCatalog)) {
-            throw new BuildException("Wrong catalog type found: " + catalog.getClass().getName());
+            throw new BuildException("Wrong catalog type found: %s", catalog.getClass().getName());
         }
         final ApacheCatalog apacheCatalog = (ApacheCatalog) catalog;
 
@@ -113,9 +112,7 @@
 
         try {
             apacheCatalog.parseCatalog(file);
-        } catch (final MalformedURLException ex) {
-            throw new BuildException(ex);
-        } catch (final IOException ex) {
+        } catch (IOException ex) {
             throw new BuildException(ex);
         }
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resolver/package.html ant-1.10.3/src/main/org/apache/tools/ant/types/resolver/package.html
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resolver/package.html	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resolver/package.html	2018-03-24 12:37:12.000000000 +0000
@@ -20,16 +20,16 @@
 <p>These classes enhance the <code>&lt;xmlcatalog&gt;</code> datatype
 to support external catalog files using the xml-commons resolver, in
 accordance with the
-<a href="http://oasis-open.org/committees/entity/spec-2001-08-06.html">
+<a href="https://oasis-open.org/committees/entity/spec-2001-08-06.html">
 OASIS "Open Catalog" standard</a>.  They will be used if and only if
 the xml-commons resolver library is available on the classpath.</p>
 
-@see <A HREF="http://xml.apache.org/commons">Apache xml-commons Project</A>
+@see <a href="https://xml.apache.org/commons">Apache xml-commons Project</a>
 
 @see org.apache.tools.ant.types.XMLCatalog
 @see org.apache.tools.ant.types.resolver.ApacheCatalogResolver
 @see org.apache.tools.ant.types.resolver.ApacheCatalog
 
-@author <A HREF="mailto:cstrong@arielpartners.com">Craeg Strong</A>
+@author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a>
 
 </body>
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/ResourceCollection.java ant-1.10.3/src/main/org/apache/tools/ant/types/ResourceCollection.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/ResourceCollection.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/ResourceCollection.java	2018-03-24 12:37:12.000000000 +0000
@@ -1,50 +1,61 @@
 /*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (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
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (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 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
  */
 package org.apache.tools.ant.types;
 
-import java.util.Iterator;
+import java.util.stream.Stream;
 
 /**
  * Interface describing a collection of Resources.
+ *
  * @since Ant 1.7
  */
 public interface ResourceCollection extends Iterable<Resource> {
 
     /**
-     * Gets the contents of this collection.
-     * @return all resources in the collection
-     */
-    Iterator<Resource> iterator();
-
-    /**
      * Learn the number of contained Resources.
+     *
      * @return number of elements as int.
      */
     int size();
 
     /**
      * Indicate whether this ResourceCollection is composed entirely of
-     * Resources accessible via local filesystem conventions. If true,
-     * all resources returned from this collection should
-     * respond with a {@link org.apache.tools.ant.types.resources.FileProvider}
-     * when asked via {@link Resource#as}.
+     * Resources accessible via local filesystem conventions. If true, all
+     * resources returned from this collection should respond with a
+     * {@link org.apache.tools.ant.types.resources.FileProvider} when asked via
+     * {@link Resource#as}.
+     *
      * @return whether this is a filesystem-only resource collection.
      */
     boolean isFilesystemOnly();
 
+    /**
+     * Return a {@link Stream} over this {@link ResourceCollection}.
+     * @return {@link Stream} of {@link Resource}
+     * @since Ant 1.10.2
+     */
+    default Stream<? extends Resource> stream() {
+        final Stream.Builder<Resource> b = Stream.builder();
+        forEach(b);
+        return b.build();
+    }
+
+    /**
+     * Learn whether this {@link ResourceCollection} is empty.
+     * @return boolean
+     */
+    default boolean isEmpty() {
+        return size() == 0;
+    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/Resource.java ant-1.10.3/src/main/org/apache/tools/ant/types/Resource.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/Resource.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/Resource.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,8 +21,9 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.math.BigInteger;
+import java.util.Collections;
 import java.util.Iterator;
-import java.util.NoSuchElementException;
+import java.util.Optional;
 
 import org.apache.tools.ant.types.resources.FileProvider;
 
@@ -140,7 +141,7 @@
      * @return the name of this resource.
      */
     public String getName() {
-        return isReference() ? ((Resource) getCheckedRef()).getName() : name;
+        return isReference() ? getCheckedRef().getName() : name;
     }
 
     /**
@@ -159,7 +160,7 @@
      */
     public boolean isExists() {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).isExists();
+            return getCheckedRef().isExists();
         }
         //default true:
         return exists == null || exists.booleanValue();
@@ -186,7 +187,7 @@
      */
     public long getLastModified() {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).getLastModified();
+            return getCheckedRef().getLastModified();
         }
         if (!isExists() || lastmodified == null) {
             return UNKNOWN_DATETIME;
@@ -210,7 +211,7 @@
      */
     public boolean isDirectory() {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).isDirectory();
+            return getCheckedRef().isDirectory();
         }
         //default false:
         return directory != null && directory.booleanValue();
@@ -243,7 +244,7 @@
      */
     public long getSize() {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).getSize();
+            return getCheckedRef().getSize();
         }
         return isExists()
             ? (size != null ? size.longValue() : UNKNOWN_SIZE)
@@ -254,13 +255,13 @@
      * Clone this Resource.
      * @return copy of this.
      */
+    @Override
     public Object clone() {
         try {
             return super.clone();
         } catch (CloneNotSupportedException e) {
             throw new UnsupportedOperationException(
-                    "CloneNotSupportedException for a Resource caught. "
-                    + "Derived classes must support cloning.");
+                "CloneNotSupportedException for a Resource caught. Derived classes must support cloning.");
         }
     }
 
@@ -271,9 +272,10 @@
      *         is less than, equal to, or greater than the specified Resource.
      * @since Ant 1.6
      */
+    @Override
     public int compareTo(Resource other) {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).compareTo(other);
+            return getCheckedRef().compareTo(other);
         }
         return toString().compareTo(other.toString());
     }
@@ -284,6 +286,7 @@
      * @return true if the specified Object is equal to this Resource.
      * @since Ant 1.7
      */
+    @Override
     public boolean equals(Object other) {
         if (this == other) {
             return true;
@@ -300,6 +303,7 @@
      * @return hash code as int.
      * @since Ant 1.7
      */
+    @Override
     public int hashCode() {
         if (isReference()) {
             return getCheckedRef().hashCode();
@@ -319,7 +323,7 @@
      */
     public InputStream getInputStream() throws IOException {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).getInputStream();
+            return getCheckedRef().getInputStream();
         }
         throw new UnsupportedOperationException();
     }
@@ -335,7 +339,7 @@
      */
     public OutputStream getOutputStream() throws IOException {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).getOutputStream();
+            return getCheckedRef().getOutputStream();
         }
         throw new UnsupportedOperationException();
     }
@@ -345,24 +349,10 @@
      * @return an Iterator of Resources.
      * @since Ant 1.7
      */
+    @Override
     public Iterator<Resource> iterator() {
-        return isReference() ? ((Resource) getCheckedRef()).iterator()
-            : new Iterator<Resource>() {
-            private boolean done = false;
-            public boolean hasNext() {
-                return !done;
-            }
-            public Resource next() {
-                if (done) {
-                    throw new NoSuchElementException();
-                }
-                done = true;
-                return Resource.this;
-            }
-            public void remove() {
-                throw new UnsupportedOperationException();
-            }
-        };
+        return isReference() ? getCheckedRef().iterator()
+            : Collections.singleton(this).iterator();
     }
 
     /**
@@ -370,8 +360,9 @@
      * @return the size of this ResourceCollection.
      * @since Ant 1.7
      */
+    @Override
     public int size() {
-        return isReference() ? ((Resource) getCheckedRef()).size() : 1;
+        return isReference() ? getCheckedRef().size() : 1;
     }
 
     /**
@@ -379,8 +370,9 @@
      * @return whether this Resource is a FileProvider.
      * @since Ant 1.7
      */
+    @Override
     public boolean isFilesystemOnly() {
-        return (isReference() && ((Resource) getCheckedRef()).isFilesystemOnly())
+        return (isReference() && getCheckedRef().isFilesystemOnly())
             || this.as(FileProvider.class) != null;
     }
 
@@ -389,6 +381,7 @@
      * @return this Resource formatted as a String.
      * @since Ant 1.7
      */
+    @Override
     public String toString() {
         if (isReference()) {
             return getCheckedRef().toString();
@@ -405,7 +398,7 @@
      * @since Ant 1.7
      */
     public final String toLongString() {
-        return isReference() ? ((Resource) getCheckedRef()).toLongString()
+        return isReference() ? getCheckedRef().toLongString()
             : getDataTypeName() + " \"" + toString() + '"';
     }
 
@@ -413,6 +406,7 @@
      * Overrides the base version.
      * @param r the Reference to set.
      */
+    @Override
     public void setRefid(Reference r) {
         if (name != null
             || exists != null
@@ -443,4 +437,20 @@
     public <T> T as(Class<T> clazz) {
         return clazz.isAssignableFrom(getClass()) ? clazz.cast(this) : null;
     }
+
+    /**
+     * Return {@link #as(Class)} as an {@link Optional}.
+     * @param <T> desired type
+     * @param clazz a class
+     * @return {@link Optional} resource of a desired type
+     * @since Ant 1.10.2
+     */
+    public <T> Optional<T> asOptional(Class<T> clazz) {
+        return Optional.ofNullable(as(clazz));
+    }
+
+    @Override
+    protected Resource getCheckedRef() {
+        return (Resource) super.getCheckedRef();
+    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/ResourceLocation.java ant-1.10.3/src/main/org/apache/tools/ant/types/ResourceLocation.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/ResourceLocation.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/ResourceLocation.java	2018-03-24 12:37:12.000000000 +0000
@@ -24,7 +24,7 @@
  * <code>&lt;entity&gt;</code> nested elements.  These correspond to
  * the <code>PUBLIC</code> and <code>URI</code> catalog entry types,
  * respectively, as defined in the <a
- * href="http://oasis-open.org/committees/entity/spec-2001-08-06.html">
+ * href="https://oasis-open.org/committees/entity/spec-2001-08-06.html">
  * OASIS "Open Catalog" standard</a>.</p>
  *
  * <p>Possible Future Enhancements:</p>
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/AbstractClasspathResource.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/AbstractClasspathResource.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/AbstractClasspathResource.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/AbstractClasspathResource.java	2018-03-24 12:37:12.000000000 +0000
@@ -154,14 +154,10 @@
             return  ((Resource) getCheckedRef()).isExists();
         }
         dieOnCircularReference();
-        InputStream is = null;
-        try {
-            is = getInputStream();
+        try (InputStream is = getInputStream()) {
             return is != null;
         } catch (IOException ex) {
             return false;
-        } finally {
-            FileUtils.close(is);
         }
     }
 
@@ -181,18 +177,21 @@
         return !classLoader.needsCleanup()
             ? openInputStream(classLoader.getLoader())
             : new FilterInputStream(openInputStream(classLoader.getLoader())) {
-                    public void close() throws IOException {
-                        FileUtils.close(in);
-                        classLoader.cleanup();
-                    }
-                    protected void finalize() throws Throwable {
-                        try {
-                            close();
-                        } finally {
-                            super.finalize();
-                        }
+                @Override
+                public void close() throws IOException {
+                    FileUtils.close(in);
+                    classLoader.cleanup();
+                }
+
+                @Override
+                protected void finalize() throws Throwable {
+                    try {
+                        close();
+                    } finally {
+                        super.finalize();
                     }
-                };
+                }
+            };
     }
 
     /**
@@ -204,10 +203,10 @@
      */
     protected ClassLoaderWithFlag getClassLoader() {
         ClassLoader cl = null;
-        boolean clNeedsCleanup = false;
         if (loader != null) {
             cl = (ClassLoader) loader.getReferencedObject();
         }
+        boolean clNeedsCleanup = false;
         if (cl == null) {
             if (getClasspath() != null) {
                 Path p = getClasspath().concatSystemClasspath("ignore");
@@ -261,8 +260,15 @@
             loader = l;
             cleanup = needsCleanup && l instanceof AntClassLoader;
         }
-        public ClassLoader getLoader() { return loader; }
-        public boolean needsCleanup() { return cleanup; }
+
+        public ClassLoader getLoader() {
+            return loader;
+        }
+
+        public boolean needsCleanup() {
+            return cleanup;
+        }
+
         public void cleanup() {
             if (cleanup) {
                 ((AntClassLoader) loader).cleanup();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/AbstractResourceCollectionWrapper.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/AbstractResourceCollectionWrapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/AbstractResourceCollectionWrapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/AbstractResourceCollectionWrapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,6 +20,7 @@
 import java.io.File;
 import java.util.Iterator;
 import java.util.Stack;
+import java.util.stream.Collectors;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -85,6 +86,7 @@
      * Fulfill the ResourceCollection contract.
      * @return an Iterator of Resources.
      */
+    @Override
     public final synchronized Iterator<Resource> iterator() {
         if (isReference()) {
             return ((AbstractResourceCollectionWrapper) getCheckedRef()).iterator();
@@ -107,6 +109,7 @@
      * Fulfill the ResourceCollection contract.
      * @return number of elements as int.
      */
+    @Override
     public synchronized int size() {
         if (isReference()) {
             return ((AbstractResourceCollectionWrapper) getCheckedRef()).size();
@@ -182,24 +185,19 @@
     }
 
     /**
-     * Format this BaseResourceCollectionWrapper as a String.
+     * Format this AbstractResourceCollectionWrapper as a String.
      * @return a descriptive <code>String</code>.
      */
+    @Override
     public synchronized String toString() {
         if (isReference()) {
             return getCheckedRef().toString();
         }
-        if (getSize() == 0) {
+        if (isEmpty()) {
             return "";
         }
-        StringBuilder sb = new StringBuilder();
-        for (Resource resource : this) {
-            if (sb.length() > 0) {
-                sb.append(File.pathSeparatorChar);
-            }
-            sb.append(resource);
-        }
-        return sb.toString();
+        return stream().map(Object::toString)
+            .collect(Collectors.joining(File.pathSeparator));
     }
 
     private BuildException oneNested() {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/AllButFirst.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/AllButFirst.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/AllButFirst.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/AllButFirst.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,10 +17,8 @@
  */
 package org.apache.tools.ant.types.resources;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
+import java.util.stream.Collectors;
 
 import org.apache.tools.ant.types.Resource;
 
@@ -36,25 +34,15 @@
      * Take all elements except for the first <code>count</code> elements.
      * @return a Collection of Resources.
      */
+    @Override
     protected Collection<Resource> getCollection() {
-        int ct = getValidCount();
-        Iterator<Resource> iter = getResourceCollection().iterator();
-        List<Resource> al = new ArrayList<Resource>();
-        for (int i = 0; i < ct && iter.hasNext(); i++) {
-            // discard
-            iter.next();
-        }
-        while (iter.hasNext()) {
-            al.add(iter.next());
-        }
-        return al;
+        return getResourceCollection().stream().skip(getValidCount())
+            .collect(Collectors.toList());
     }
 
     @Override
     public synchronized int size() {
-        int sz = getResourceCollection().size();
-        int ct = getValidCount();
-        return sz > ct ? sz - ct : 0;
+        return Math.max(getResourceCollection().size() - getValidCount(), 0);
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/AllButLast.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/AllButLast.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/AllButLast.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/AllButLast.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,10 +18,11 @@
 package org.apache.tools.ant.types.resources;
 
 import java.util.Collection;
-import java.util.List;
+import java.util.Collections;
+import java.util.stream.Collectors;
 
 import org.apache.tools.ant.types.Resource;
-import org.apache.tools.ant.util.CollectionUtils;
+import org.apache.tools.ant.types.ResourceCollection;
 
 /**
  * ResourceCollection that contains all resources of another
@@ -35,19 +36,20 @@
      * Take all elements except for the last <code>count</code> elements.
      * @return a Collection of Resources.
      */
+    @Override
     protected Collection<Resource> getCollection() {
         int ct = getValidCount();
-        List<Resource> result =
-            (List<Resource>) CollectionUtils.asCollection(getResourceCollection()
-                                                          .iterator());
-        return result.subList(0, result.size() - ct);
+        ResourceCollection nested = getResourceCollection();
+        if (ct > nested.size()) {
+            return Collections.emptyList();
+        }
+        return nested.stream().limit((long) nested.size() - ct)
+            .collect(Collectors.toList());
     }
 
     @Override
     public synchronized int size() {
-        int sz = getResourceCollection().size();
-        int ct = getValidCount();
-        return sz > ct ? sz - ct : 0;
+        return Math.max(getResourceCollection().size() - getValidCount(), 0);
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/ArchiveResource.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/ArchiveResource.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/ArchiveResource.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/ArchiveResource.java	2018-03-24 12:37:12.000000000 +0000
@@ -103,12 +103,12 @@
     public void addConfigured(ResourceCollection a) {
         checkChildrenAllowed();
         if (archive != null) {
-            throw new BuildException("you must not specify more than one"
-                                     + " archive");
+            throw new BuildException(
+                "you must not specify more than one archive");
         }
         if (a.size() != 1) {
-            throw new BuildException("only single argument resource collections"
-                                     + " are supported as archives");
+            throw new BuildException(
+                "only single argument resource collections are supported as archives");
         }
         archive = a.iterator().next();
     }
@@ -118,17 +118,17 @@
      * @return the archive as a Resource.
      */
     public Resource getArchive() {
-        return isReference()
-            ? ((ArchiveResource) getCheckedRef()).getArchive() : archive;
+        return isReference() ? getCheckedRef().getArchive() : archive;
     }
 
     /**
      * Get the last modified date of this Resource.
      * @return the last modification date.
      */
+    @Override
     public long getLastModified() {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).getLastModified();
+            return getCheckedRef().getLastModified();
         }
         checkEntry();
         return super.getLastModified();
@@ -138,9 +138,10 @@
      * Get the size of this Resource.
      * @return the long size of this Resource.
      */
+    @Override
     public long getSize() {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).getSize();
+            return getCheckedRef().getSize();
         }
         checkEntry();
         return super.getSize();
@@ -150,9 +151,10 @@
      * Learn whether this Resource represents a directory.
      * @return boolean flag indicating whether the entry is a directory.
      */
+    @Override
     public boolean isDirectory() {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).isDirectory();
+            return getCheckedRef().isDirectory();
         }
         checkEntry();
         return super.isDirectory();
@@ -162,9 +164,10 @@
      * Find out whether this Resource represents an existing Resource.
      * @return boolean existence flag.
      */
+    @Override
     public boolean isExists() {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).isExists();
+            return getCheckedRef().isExists();
         }
         checkEntry();
         return super.isExists();
@@ -176,7 +179,7 @@
      */
     public int getMode() {
         if (isReference()) {
-            return ((ArchiveResource) getCheckedRef()).getMode();
+            return getCheckedRef().getMode();
         }
         checkEntry();
         return mode;
@@ -186,6 +189,7 @@
      * Overrides the super version.
      * @param r the Reference to set.
      */
+    @Override
     public void setRefid(Reference r) {
         if (archive != null || modeSet) {
             throw tooManyAttributes();
@@ -199,6 +203,7 @@
      * @return a negative integer, zero, or a positive integer as this Resource
      *         is less than, equal to, or greater than the specified Resource.
      */
+    @Override
     public int compareTo(Resource another) {
         return this.equals(another) ? 0 : super.compareTo(another);
     }
@@ -209,6 +214,7 @@
      * @return true if another is a Resource representing
      *              the same entry in the same archive.
      */
+    @Override
     public boolean equals(Object another) {
         if (this == another) {
             return true;
@@ -216,7 +222,7 @@
         if (isReference()) {
             return getCheckedRef().equals(another);
         }
-        if (another == null || another.getClass() != getClass()) {
+        if (another == null || !another.getClass().equals(getClass())) {
             return false;
         }
         ArchiveResource r = (ArchiveResource) another;
@@ -228,6 +234,7 @@
      * Get the hash code for this Resource.
      * @return hash code as int.
      */
+    @Override
     public int hashCode() {
         return super.hashCode()
             * (getArchive() == null ? NULL_ARCHIVE : getArchive().hashCode());
@@ -237,6 +244,7 @@
      * Format this Resource as a String.
      * @return String representation of this Resource.
      */
+    @Override
     public String toString() {
         return isReference() ? getCheckedRef().toString()
             : getArchive().toString() + ':' + getName();
@@ -260,10 +268,10 @@
             throw new BuildException("archive attribute not set");
         }
         if (!r.isExists()) {
-            throw new BuildException(r.toString() + " does not exist.");
+            throw new BuildException("%s does not exist.", r);
         }
         if (r.isDirectory()) {
-            throw new BuildException(r + " denotes a directory.");
+            throw new BuildException("%s denotes a directory.", r);
         }
         fetchEntry();
         haveEntry = true;
@@ -277,6 +285,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     protected synchronized void dieOnCircularReference(Stack<Object> stk, Project p) {
         if (isChecked()) {
             return;
@@ -290,4 +299,9 @@
             setChecked(true);
         }
     }
+
+    @Override
+    protected ArchiveResource getCheckedRef() {
+        return (ArchiveResource) super.getCheckedRef();
+    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/Archives.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/Archives.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/Archives.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/Archives.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,6 +21,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Stack;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -31,7 +32,6 @@
 import org.apache.tools.ant.types.ResourceCollection;
 import org.apache.tools.ant.types.TarFileSet;
 import org.apache.tools.ant.types.ZipFileSet;
-import org.apache.tools.ant.util.CollectionUtils;
 
 /**
  * A resource collection that treats all nested resources as archives
@@ -78,16 +78,13 @@
      *
      * @return int
      */
+    @Override
     public int size() {
         if (isReference()) {
-            return ((Archives) getCheckedRef()).size();
+            return getCheckedRef().size();
         }
         dieOnCircularReference();
-        int total = 0;
-        for (final Iterator<ArchiveFileSet> i = grabArchives(); i.hasNext();) {
-            total += i.next().size();
-        }
-        return total;
+        return streamArchives().mapToInt(ArchiveFileSet::size).sum();
     }
 
     /**
@@ -97,15 +94,11 @@
      */
     public Iterator<Resource> iterator() {
         if (isReference()) {
-            return ((Archives) getCheckedRef()).iterator();
+            return getCheckedRef().iterator();
         }
         dieOnCircularReference();
-        final List<Resource> l = new LinkedList<Resource>();
-        for (final Iterator<ArchiveFileSet> i = grabArchives(); i.hasNext();) {
-            l.addAll(CollectionUtils
-                     .asCollection(i.next().iterator()));
-        }
-        return l.iterator();
+        return streamArchives().flatMap(ResourceCollection::stream)
+            .map(Resource.class::cast).iterator();
     }
 
     /**
@@ -113,9 +106,10 @@
      */
     public boolean isFilesystemOnly() {
         if (isReference()) {
-            return ((Archives) getCheckedRef()).isFilesystemOnly();
+            return getCheckedRef().isFilesystemOnly();
         }
         dieOnCircularReference();
+        // TODO check each archive in turn?
         return false;
     }
 
@@ -126,8 +120,8 @@
      */
     @Override
     public void setRefid(final Reference r) {
-        if (zips.getResourceCollections().size() > 0
-            || tars.getResourceCollections().size() > 0) {
+        if (!(zips.getResourceCollections().isEmpty()
+            && tars.getResourceCollections().isEmpty())) {
             throw tooManyAttributes();
         }
         super.setRefid(r);
@@ -160,14 +154,20 @@
      * @return Iterator&lt;ArchiveFileSet&gt;
      */
     protected Iterator<ArchiveFileSet> grabArchives() {
-        final List<ArchiveFileSet> l = new LinkedList<ArchiveFileSet>();
+        return streamArchives().iterator();
+    }
+
+    // TODO this is a pretty expensive operation and so the result
+    // should be cached.
+    private Stream<ArchiveFileSet> streamArchives() {
+        final List<ArchiveFileSet> l = new LinkedList<>();
         for (final Resource r : zips) {
             l.add(configureArchive(new ZipFileSet(), r));
         }
         for (final Resource r : tars) {
             l.add(configureArchive(new TarFileSet(), r));
         }
-        return l.iterator();
+        return l.stream();
     }
 
     /**
@@ -208,4 +208,9 @@
         }
     }
 
+    @Override
+    protected Archives getCheckedRef() {
+        return (Archives) super.getCheckedRef();
+    }
+
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.java	2018-03-24 12:37:12.000000000 +0000
@@ -24,6 +24,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Stack;
+import java.util.stream.Collectors;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -37,7 +38,7 @@
  */
 public abstract class BaseResourceCollectionContainer
         extends DataType implements ResourceCollection, Cloneable {
-    private List<ResourceCollection> rc = new ArrayList<ResourceCollection>();
+    private List<ResourceCollection> rc = new ArrayList<>();
     private Collection<Resource> coll = null;
     private boolean cache = true;
 
@@ -45,7 +46,6 @@
      * Create a new BaseResourceCollectionContainer.
      */
     public BaseResourceCollectionContainer() {
-        // TODO Auto-generated constructor stub
     }
 
     /**
@@ -121,9 +121,7 @@
             throw noChildrenAllowed();
         }
         try {
-            for (ResourceCollection resourceCollection : c) {
-                add(resourceCollection);
-            }
+            c.forEach(this::add);
         } catch (ClassCastException e) {
             throw new BuildException(e);
         }
@@ -135,9 +133,10 @@
      * are added to this container while the Iterator is in use.
      * @return a "fail-fast" Iterator.
      */
+    @Override
     public final synchronized Iterator<Resource> iterator() {
         if (isReference()) {
-            return ((BaseResourceCollectionContainer) getCheckedRef()).iterator();
+            return getCheckedRef().iterator();
         }
         dieOnCircularReference();
         return new FailFast(this, cacheCollection().iterator());
@@ -147,9 +146,11 @@
      * Fulfill the ResourceCollection contract.
      * @return number of elements as int.
      */
+    @Override
     public synchronized int size() {
         if (isReference()) {
-            return getCheckedRef(BaseResourceCollectionContainer.class, getDataTypeName()).size();
+            return getCheckedRef(BaseResourceCollectionContainer.class,
+                getDataTypeName()).size();
         }
         dieOnCircularReference();
         return cacheCollection().size();
@@ -159,27 +160,20 @@
      * Fulfill the ResourceCollection contract.
      * @return whether this is a filesystem-only resource collection.
      */
+    @Override
     public synchronized boolean isFilesystemOnly() {
         if (isReference()) {
-            return ((BaseResourceCollectionContainer) getCheckedRef()).isFilesystemOnly();
+            return getCheckedRef().isFilesystemOnly();
         }
         dieOnCircularReference();
         //first the easy way, if all children are filesystem-only, return true:
-        boolean goEarly = true;
-        for (Iterator<ResourceCollection> i = rc.iterator(); goEarly && i.hasNext();) {
-            goEarly = i.next().isFilesystemOnly();
-        }
-        if (goEarly) {
+        if (rc.stream().allMatch(ResourceCollection::isFilesystemOnly)) {
             return true;
         }
         /* now check each Resource in case the child only
            lets through files from any children IT may have: */
-        for (Resource r : cacheCollection()) {
-            if (r.as(FileProvider.class) == null) {
-                return false;
-            }
-        }
-        return true;
+        return cacheCollection().stream()
+            .allMatch(r -> r.asOptional(FileProvider.class).isPresent());
     }
 
     /**
@@ -226,11 +220,12 @@
      * collections is shallowly cloned.
      * @return a cloned instance.
      */
+    @Override
     public Object clone() {
         try {
             BaseResourceCollectionContainer c
                 = (BaseResourceCollectionContainer) super.clone();
-            c.rc = new ArrayList<ResourceCollection>(rc);
+            c.rc = new ArrayList<>(rc);
             c.coll = null;
             return c;
         } catch (CloneNotSupportedException e) {
@@ -242,21 +237,21 @@
      * Format this BaseResourceCollectionContainer as a String.
      * @return a descriptive <code>String</code>.
      */
+    @Override
     public synchronized String toString() {
         if (isReference()) {
             return getCheckedRef().toString();
         }
-        if (cacheCollection().size() == 0) {
+        if (cacheCollection().isEmpty()) {
             return "";
         }
-        StringBuilder sb = new StringBuilder();
-        for (Resource resource : coll) {
-            if (sb.length() > 0) {
-                sb.append(File.pathSeparatorChar);
-            }
-            sb.append(resource);
-        }
-        return sb.toString();
+        return coll.stream().map(Object::toString)
+            .collect(Collectors.joining(File.pathSeparator));
+    }
+
+    @Override
+    protected BaseResourceCollectionContainer getCheckedRef() {
+        return (BaseResourceCollectionContainer) super.getCheckedRef();
     }
 
     private synchronized Collection<Resource> cacheCollection() {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionWrapper.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionWrapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionWrapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/BaseResourceCollectionWrapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -32,10 +32,12 @@
 
     private Collection<Resource> coll = null;
 
+    @Override
     protected Iterator<Resource> createIterator() {
         return cacheCollection().iterator();
     }
 
+    @Override
     protected int getSize() {
         return cacheCollection().size();
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/BCFileSet.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/BCFileSet.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/BCFileSet.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/BCFileSet.java	2018-03-24 12:37:12.000000000 +0000
@@ -47,6 +47,7 @@
      * @return an Iterator of Resources.
      * @since Ant 1.7
      */
+    @Override
     public Iterator<Resource> iterator() {
         if (isReference()) {
             return ((FileSet) getRef(getProject())).iterator();
@@ -62,6 +63,7 @@
      * @return number of elements as int.
      * @since Ant 1.7
      */
+    @Override
     public int size() {
         if (isReference()) {
             return ((FileSet) getRef(getProject())).size();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/BZip2Resource.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/BZip2Resource.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/BZip2Resource.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/BZip2Resource.java	2018-03-24 12:37:12.000000000 +0000
@@ -53,6 +53,7 @@
      * @return the wrapped stream.
      * @throws IOException if there is a problem.
      */
+    @Override
     protected InputStream wrapStream(InputStream in) throws IOException {
         for (int i = 0; i < MAGIC.length; i++) {
             if (in.read() != MAGIC[i]) {
@@ -68,6 +69,7 @@
      * @return the wrapped stream.
      * @throws IOException if there is a problem.
      */
+    @Override
     protected OutputStream wrapStream(OutputStream out) throws IOException {
         for (int i = 0; i < MAGIC.length; i++) {
             out.write(MAGIC[i]);
@@ -79,6 +81,7 @@
      * Get the name of the compression method.
      * @return the string "Bzip2".
      */
+    @Override
     protected String getCompressionName() {
         return "Bzip2";
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/comparators/Date.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/comparators/Date.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/comparators/Date.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/comparators/Date.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,6 +17,8 @@
  */
 package org.apache.tools.ant.types.resources.comparators;
 
+import java.util.Comparator;
+
 import org.apache.tools.ant.types.Resource;
 
 /**
@@ -32,14 +34,8 @@
      *         argument is less than, equal to, or greater than the second.
      */
     protected int resourceCompare(Resource foo, Resource bar) {
-        long diff = foo.getLastModified() - bar.getLastModified();
-        if (diff > 0) {
-            return +1;
-        } else if (diff < 0) {
-            return -1;
-        } else {
-            return 0;
-        }
+        return Comparator.comparingLong(Resource::getLastModified).compare(foo,
+            bar);
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,7 +17,7 @@
  */
 package org.apache.tools.ant.types.resources.comparators;
 
-import java.util.Iterator;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Stack;
 import java.util.Vector;
@@ -47,7 +47,7 @@
         if (c == null) {
             return;
         }
-        resourceComparators = (resourceComparators == null) ? new Vector<ResourceComparator>() : resourceComparators;
+        resourceComparators = (resourceComparators == null) ? new Vector<>() : resourceComparators;
         resourceComparators.add(c);
         setChecked(false);
     }
@@ -58,6 +58,7 @@
      * @param o the object to check against.
      * @return true if there is equality.
      */
+    @Override
     public synchronized boolean equals(Object o) {
         if (o == this) {
             return true;
@@ -76,6 +77,7 @@
      * Hashcode based on the rules for equality.
      * @return a hashcode.
      */
+    @Override
     public synchronized int hashCode() {
         if (isReference()) {
             return getCheckedRef().hashCode();
@@ -84,16 +86,9 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     protected synchronized int resourceCompare(Resource foo, Resource bar) {
-        //if no nested, natural order:
-        if (resourceComparators == null || resourceComparators.isEmpty()) {
-            return foo.compareTo(bar);
-        }
-        int result = 0;
-        for (Iterator<ResourceComparator> i = resourceComparators.iterator(); result == 0 && i.hasNext();) {
-            result = i.next().resourceCompare(foo, bar);
-        }
-        return result;
+        return composite(resourceComparators).compare(foo, bar);
     }
 
     /**
@@ -103,6 +98,7 @@
      * @param p   the Project to resolve against.
      * @throws BuildException on error.
      */
+    @Override
     protected void dieOnCircularReference(Stack<Object> stk, Project p)
         throws BuildException {
         if (isChecked()) {
@@ -122,4 +118,18 @@
             setChecked(true);
         }
     }
+
+    private static Comparator<Resource> composite(List<? extends Comparator<Resource>> foo) {
+        Comparator<Resource> result = null;
+        if (foo != null) {
+            for (Comparator<Resource> comparator : foo) {
+                if (result == null) {
+                    result = comparator;
+                    continue;
+                }
+                result = result.thenComparing(comparator);
+            }
+        }
+        return result == null ? Comparator.naturalOrder() : result;
+    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/comparators/Exists.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/comparators/Exists.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/comparators/Exists.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/comparators/Exists.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,6 +17,8 @@
  */
 package org.apache.tools.ant.types.resources.comparators;
 
+import java.util.Comparator;
+
 import org.apache.tools.ant.types.Resource;
 
 /**
@@ -33,11 +35,7 @@
      *         argument is less than, equal to, or greater than the second.
      */
     protected int resourceCompare(Resource foo, Resource bar) {
-        boolean f = foo.isExists();
-        if (f == bar.isExists()) {
-            return 0;
-        }
-        return f ? 1 : -1;
+        return Comparator.comparing(Resource::isExists).compare(foo, bar);
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/comparators/FileSystem.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,6 +18,9 @@
 package org.apache.tools.ant.types.resources.comparators;
 
 import java.io.File;
+import java.util.Comparator;
+import java.util.Objects;
+import java.util.function.Function;
 
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.resources.FileProvider;
@@ -36,25 +39,33 @@
      * @param bar the second Resource.
      * @return a negative integer, zero, or a positive integer as the first
      *         argument is less than, equal to, or greater than the second.
-     * @throws ClassCastException if either resource is not an instance of FileResource.
+     * @throws ClassCastException if either resource is not capable of
+     *         exposing a {@link FileProvider}
      */
     protected int resourceCompare(Resource foo, Resource bar) {
-        FileProvider fooFP = foo.as(FileProvider.class);
-        if (fooFP == null) {
-            throw new ClassCastException(foo.getClass()
-                                         + " doesn't provide files");
+        return compare(file(foo), file(bar));
+    }
+
+    private File file(Resource r) {
+        return r.asOptional(FileProvider.class)
+            .orElseThrow(() -> new ClassCastException(
+                r.getClass() + " doesn't provide files"))
+            .getFile();
+    }
+
+    private int compare(File f1, File f2) {
+        if (Objects.equals(f1, f2)) {
+            return 0;
+        }
+        if (FILE_UTILS.isLeadingPath(f1, f2)) {
+            return -1;
         }
-        File foofile = fooFP.getFile();
-        FileProvider barFP = bar.as(FileProvider.class);
-        if (barFP == null) {
-            throw new ClassCastException(bar.getClass()
-                                         + " doesn't provide files");
+        if (FILE_UTILS.isLeadingPath(f2, f1)) {
+            return 1;
         }
-        File barfile = barFP.getFile();
-        return foofile.equals(barfile) ? 0
-            : FILE_UTILS.isLeadingPath(foofile, barfile) ? -1
-            : FILE_UTILS.normalize(foofile.getAbsolutePath()).compareTo(
-                FILE_UTILS.normalize(barfile.getAbsolutePath()));
+        return Comparator
+            .comparing(((Function<File, String>) File::getAbsolutePath)
+                .andThen(FILE_UTILS::normalize))
+            .compare(f1, f2);
     }
-
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/comparators/ResourceComparator.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/comparators/ResourceComparator.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/comparators/ResourceComparator.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/comparators/ResourceComparator.java	2018-03-24 12:37:12.000000000 +0000
@@ -36,10 +36,10 @@
      *         argument is less than, equal to, or greater than the second.
      * @throws ClassCastException if either argument is null.
      */
+    @Override
     public final int compare(Resource foo, Resource bar) {
         dieOnCircularReference();
-        ResourceComparator c =
-            isReference() ? (ResourceComparator) getCheckedRef() : this;
+        ResourceComparator c = isReference() ? getCheckedRef() : this;
         return c.resourceCompare(foo, bar);
     }
 
@@ -48,6 +48,7 @@
      * @param o the Object to compare against.
      * @return true if the specified Object equals this one.
      */
+    @Override
     public boolean equals(Object o) {
         if (isReference()) {
             return getCheckedRef().equals(o);
@@ -62,6 +63,7 @@
      * Hashcode based on the rules for equality.
      * @return a hashcode.
      */
+    @Override
     public synchronized int hashCode() {
         if (isReference()) {
             return getCheckedRef().hashCode();
@@ -78,4 +80,8 @@
      */
     protected abstract int resourceCompare(Resource foo, Resource bar);
 
+    @Override
+    protected ResourceComparator getCheckedRef() {
+        return (ResourceComparator) super.getCheckedRef();
+    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/comparators/Reverse.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/comparators/Reverse.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/comparators/Reverse.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/comparators/Reverse.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,6 +17,8 @@
  */
 package org.apache.tools.ant.types.resources.comparators;
 
+import java.util.Comparator;
+import java.util.Optional;
 import java.util.Stack;
 
 import org.apache.tools.ant.BuildException;
@@ -69,8 +71,8 @@
      *         argument is greater than, equal to, or less than the second.
      */
     protected int resourceCompare(Resource foo, Resource bar) {
-        return -1 * (nested == null
-            ? foo.compareTo(bar) : nested.compare(foo, bar));
+        return Optional.<Comparator<Resource>> ofNullable(nested)
+            .orElseGet(Comparator::naturalOrder).reversed().compare(foo, bar);
     }
 
     protected void dieOnCircularReference(Stack<Object> stk, Project p)
@@ -88,4 +90,5 @@
             setChecked(true);
         }
     }
+
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/comparators/Size.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/comparators/Size.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/comparators/Size.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/comparators/Size.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,6 +17,8 @@
  */
 package org.apache.tools.ant.types.resources.comparators;
 
+import java.util.Comparator;
+
 import org.apache.tools.ant.types.Resource;
 
 /**
@@ -32,8 +34,7 @@
      *         argument is less than, equal to, or greater than the second.
      */
     protected int resourceCompare(Resource foo, Resource bar) {
-        long diff = foo.getSize() - bar.getSize();
-        return diff > 0 ? 1 : (diff == 0 ? 0 : -1);
+        return Comparator.comparingLong(Resource::getSize).compare(foo, bar);
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/comparators/Type.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/comparators/Type.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/comparators/Type.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/comparators/Type.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,6 +17,8 @@
  */
 package org.apache.tools.ant.types.resources.comparators;
 
+import java.util.Comparator;
+
 import org.apache.tools.ant.types.Resource;
 
 /**
@@ -34,11 +36,7 @@
      *         argument is less than, equal to, or greater than the second.
      */
     protected int resourceCompare(Resource foo, Resource bar) {
-        boolean f = foo.isDirectory();
-        if (f == bar.isDirectory()) {
-            return 0;
-        }
-        return f ? 1 : -1;
+        return Comparator.comparing(Resource::isDirectory).compare(foo, bar);
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/CompressedResource.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/CompressedResource.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/CompressedResource.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/CompressedResource.java	2018-03-24 12:37:12.000000000 +0000
@@ -47,6 +47,7 @@
      * @return this Resource formatted as a String.
      * @since Ant 1.7
      */
+    @Override
     public String toString() {
         return getCompressionName() + " compressed " + super.toString();
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/ContentTransformingResource.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/ContentTransformingResource.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/ContentTransformingResource.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/ContentTransformingResource.java	2018-03-24 12:37:12.000000000 +0000
@@ -23,7 +23,6 @@
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.types.ResourceCollection;
-import org.apache.tools.ant.util.FileUtils;
 
 /**
  * A resource that transforms the content of another resource.
@@ -58,9 +57,7 @@
     @Override
     public long getSize() {
         if (isExists()) {
-            InputStream in = null;
-            try {
-                in = getInputStream();
+            try (InputStream in = getInputStream()) {
                 final byte[] buf = new byte[BUFFER_SIZE];
                 int size = 0;
                 int readNow;
@@ -69,14 +66,11 @@
                 }
                 return size;
             } catch (final IOException ex) {
-                throw new BuildException("caught exception while reading "
-                                         + getName(), ex);
-            } finally {
-                FileUtils.close(in);
+                throw new BuildException(
+                    "caught exception while reading " + getName(), ex);
             }
-        } else {
-            return 0;
         }
+        return 0;
     }
 
     /**
@@ -120,24 +114,16 @@
     public <T> T as(final Class<T> clazz) {
         if (Appendable.class.isAssignableFrom(clazz)) {
             if (isAppendSupported()) {
-                final Appendable a =
-                    getResource().as(Appendable.class);
+                final Appendable a = getResource().as(Appendable.class);
                 if (a != null) {
-                    return clazz.cast(new Appendable() {
-                        public OutputStream getAppendOutputStream()
-                                throws IOException {
-                            OutputStream out = a.getAppendOutputStream();
-                            if (out != null) {
-                                out = wrapStream(out);
-                            }
-                            return out;
-                        }
+                    return clazz.cast((Appendable) () -> {
+                        OutputStream out = a.getAppendOutputStream();
+                        return out == null ? null : wrapStream(out);
                     });
                 }
             }
             return null;
         }
-
         return FileProvider.class.isAssignableFrom(clazz)
             ? null : getResource().as(clazz);
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/Difference.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/Difference.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/Difference.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/Difference.java	2018-03-24 12:37:12.000000000 +0000
@@ -38,16 +38,17 @@
      * Calculate the difference of the nested ResourceCollections.
      * @return a Collection of Resources.
      */
+    @Override
     protected Collection<Resource> getCollection() {
         List<ResourceCollection> rcs = getResourceCollections();
         int size = rcs.size();
         if (size < 2) {
-            throw new BuildException("The difference of " + size
-                + " resource collection" + ((size == 1) ? "" : "s")
-                + " is undefined.");
+            throw new BuildException(
+                "The difference of %d resource %s is undefined.", size,
+                size == 1 ? "collection" : "collections");
         }
-        Set<Resource> hs = new HashSet<Resource>();
-        List<Resource> al = new ArrayList<Resource>();
+        Set<Resource> hs = new HashSet<>();
+        List<Resource> al = new ArrayList<>();
         for (ResourceCollection rc : rcs) {
             for (Resource r : rc) {
                 if (hs.add(r)) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/FailFast.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/FailFast.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/FailFast.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/FailFast.java	2018-03-24 12:37:12.000000000 +0000
@@ -32,7 +32,7 @@
  * @since Ant 1.7
  */
 /*package-private*/ class FailFast implements Iterator<Resource> {
-    private static final WeakHashMap<Object, Set<FailFast>> MAP = new WeakHashMap<Object, Set<FailFast>>();
+    private static final WeakHashMap<Object, Set<FailFast>> MAP = new WeakHashMap<>();
 
     /**
      * Invalidate any in-use Iterators from the specified Object.
@@ -46,12 +46,7 @@
     }
 
     private static synchronized void add(FailFast f) {
-        Set<FailFast> s = MAP.get(f.parent);
-        if (s == null) {
-            s = new HashSet<FailFast>();
-            MAP.put(f.parent, s);
-        }
-        s.add(f);
+        MAP.computeIfAbsent(f.parent, k -> new HashSet<>()).add(f);
     }
 
     private static synchronized void remove(FailFast f) {
@@ -95,6 +90,7 @@
      * Fulfill the Iterator contract.
      * @return true if there are more elements.
      */
+    @Override
     public boolean hasNext() {
         if (wrapped == null) {
             return false;
@@ -108,6 +104,7 @@
      * @return the next element.
      * @throws NoSuchElementException if no more elements.
      */
+    @Override
     public Resource next() {
         if (wrapped == null || !wrapped.hasNext()) {
             throw new NoSuchElementException();
@@ -127,6 +124,7 @@
      * Fulfill the Iterator contract.
      * @throws UnsupportedOperationException always.
      */
+    @Override
     public void remove() {
         throw new UnsupportedOperationException();
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/FileResourceIterator.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/FileResourceIterator.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/FileResourceIterator.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/FileResourceIterator.java	2018-03-24 12:37:12.000000000 +0000
@@ -38,6 +38,7 @@
      * Construct a new FileResourceIterator.
      * @deprecated in favor of {@link FileResourceIterator#FileResourceIterator(Project)}
      */
+    @Deprecated
     public FileResourceIterator() {
     }
 
@@ -56,6 +57,7 @@
      * @param basedir the base directory of this instance.
      * @deprecated in favor of {@link FileResourceIterator#FileResourceIterator(Project, File)}
      */
+    @Deprecated
     public FileResourceIterator(File basedir) {
         this(null, basedir);
     }
@@ -79,6 +81,7 @@
      * @param filenames the String[] of filenames.
      * @deprecated in favor of {@link FileResourceIterator#FileResourceIterator(Project, File, String[])}
      */
+    @Deprecated
     public FileResourceIterator(File basedir, String[] filenames) {
         this(null, basedir, filenames);
     }
@@ -114,6 +117,7 @@
      * Find out whether this FileResourceIterator has more elements.
      * @return whether there are more Resources to iterate over.
      */
+    @Override
     public boolean hasNext() {
         return pos < files.length;
     }
@@ -122,6 +126,7 @@
      * Get the next element from this FileResourceIterator.
      * @return the next Object.
      */
+    @Override
     public Resource next() {
         return nextResource();
     }
@@ -129,6 +134,7 @@
     /**
      * Not implemented.
      */
+    @Override
     public void remove() {
         throw new UnsupportedOperationException();
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/FileResource.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/FileResource.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/FileResource.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/FileResource.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,11 +18,10 @@
 package org.apache.tools.ant.types.resources;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Files;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -106,9 +105,10 @@
      * Get the file represented by this FileResource.
      * @return the File.
      */
+    @Override
     public File getFile() {
         if (isReference()) {
-            return ((FileResource) getCheckedRef()).getFile();
+            return getCheckedRef().getFile();
         }
         dieOnCircularReference();
         synchronized (this) {
@@ -139,7 +139,7 @@
      */
     public File getBaseDir() {
         if (isReference()) {
-            return ((FileResource) getCheckedRef()).getBaseDir();
+            return getCheckedRef().getBaseDir();
         }
         dieOnCircularReference();
         return baseDir;
@@ -149,6 +149,7 @@
      * Overrides the super version.
      * @param r the Reference to set.
      */
+    @Override
     public void setRefid(Reference r) {
         if (file != null || baseDir != null) {
             throw tooManyAttributes();
@@ -162,9 +163,10 @@
      * only will be returned.
      * @return the name of this resource.
      */
+    @Override
     public String getName() {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).getName();
+            return getCheckedRef().getName();
         }
         File b = getBaseDir();
         return b == null ? getNotNullFile().getName()
@@ -175,8 +177,9 @@
      * Learn whether this file exists.
      * @return true if this resource exists.
      */
+    @Override
     public boolean isExists() {
-        return isReference() ? ((Resource) getCheckedRef()).isExists()
+        return isReference() ? getCheckedRef().isExists()
             : getNotNullFile().exists();
     }
 
@@ -184,9 +187,10 @@
      * Get the modification time in milliseconds since 01.01.1970 .
      * @return 0 if the resource does not exist.
      */
+    @Override
     public long getLastModified() {
         return isReference()
-            ? ((Resource) getCheckedRef()).getLastModified()
+            ? getCheckedRef().getLastModified()
             : getNotNullFile().lastModified();
     }
 
@@ -194,8 +198,9 @@
      * Learn whether the resource is a directory.
      * @return boolean flag indicating if the resource is a directory.
      */
+    @Override
     public boolean isDirectory() {
-        return isReference() ? ((Resource) getCheckedRef()).isDirectory()
+        return isReference() ? getCheckedRef().isDirectory()
             : getNotNullFile().isDirectory();
     }
 
@@ -203,8 +208,9 @@
      * Get the size of this Resource.
      * @return the size, as a long, 0 if the Resource does not exist.
      */
+    @Override
     public long getSize() {
-        return isReference() ? ((Resource) getCheckedRef()).getSize()
+        return isReference() ? getCheckedRef().getSize()
             : getNotNullFile().length();
     }
 
@@ -213,10 +219,10 @@
      * @return an InputStream object.
      * @throws IOException if an error occurs.
      */
+    @Override
     public InputStream getInputStream() throws IOException {
-        return isReference()
-            ? ((Resource) getCheckedRef()).getInputStream()
-            : new FileInputStream(getNotNullFile());
+        return isReference() ? getCheckedRef().getInputStream()
+            : Files.newInputStream(getNotNullFile().toPath());
     }
 
     /**
@@ -227,9 +233,10 @@
      * @throws UnsupportedOperationException if OutputStreams are not
      *         supported for this Resource type.
      */
+    @Override
     public OutputStream getOutputStream() throws IOException {
         if (isReference()) {
-            return ((FileResource) getCheckedRef()).getOutputStream();
+            return getCheckedRef().getOutputStream();
         }
         return getOutputStream(false);
     }
@@ -237,9 +244,10 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public OutputStream getAppendOutputStream() throws IOException {
         if (isReference()) {
-            return ((FileResource) getCheckedRef()).getAppendOutputStream();
+            return getCheckedRef().getAppendOutputStream();
         }
         return getOutputStream(true);
     }
@@ -256,7 +264,7 @@
                 p.mkdirs();
             }
         }
-        return append ? new FileOutputStream(f.getAbsolutePath(), true) : new FileOutputStream(f);
+        return FileUtils.newOutputStream(f.toPath(), append);
     }
 
     /**
@@ -265,9 +273,10 @@
      * @return a negative integer, zero, or a positive integer as this FileResource
      *         is less than, equal to, or greater than the specified Resource.
      */
+    @Override
     public int compareTo(Resource another) {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).compareTo(another);
+            return getCheckedRef().compareTo(another);
         }
         if (this.equals(another)) {
             return 0;
@@ -294,6 +303,7 @@
      * @param another the other Object to compare.
      * @return true if another is a FileResource representing the same file.
      */
+    @Override
     public boolean equals(Object another) {
         if (this == another) {
             return true;
@@ -314,6 +324,7 @@
      * Get the hash code for this Resource.
      * @return hash code as int.
      */
+    @Override
     public int hashCode() {
         if (isReference()) {
             return getCheckedRef().hashCode();
@@ -325,6 +336,7 @@
      * Get the string representation of this Resource.
      * @return this FileResource formatted as a String.
      */
+    @Override
     public String toString() {
         if (isReference()) {
             return getCheckedRef().toString();
@@ -340,9 +352,10 @@
      * Fulfill the ResourceCollection contract.
      * @return whether this Resource is a FileResource.
      */
+    @Override
     public boolean isFilesystemOnly() {
         if (isReference()) {
-            return ((FileResource) getCheckedRef()).isFilesystemOnly();
+            return getCheckedRef().isFilesystemOnly();
         }
         dieOnCircularReference();
         return true;
@@ -352,9 +365,10 @@
      * Implement the Touchable interface.
      * @param modTime new last modification time.
      */
+    @Override
     public void touch(long modTime) {
         if (isReference()) {
-            ((FileResource) getCheckedRef()).touch(modTime);
+            getCheckedRef().touch(modTime);
             return;
         }
         if (!getNotNullFile().setLastModified(modTime)) {
@@ -383,6 +397,7 @@
      * @throws BuildException if desired
      * @since Ant1.8
      */
+    @Override
     public Resource getResource(String path) {
         File newfile = FILE_UTILS.resolveFile(getFile(), path);
         FileResource fileResource = new FileResource(newfile);
@@ -391,4 +406,9 @@
         }
         return fileResource;
     }
+
+    @Override
+    protected FileResource getCheckedRef() {
+        return (FileResource) super.getCheckedRef();
+    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/Files.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/Files.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/Files.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/Files.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,6 +21,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Vector;
+import java.util.stream.Collectors;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
@@ -39,11 +40,8 @@
 public class Files extends AbstractSelectorContainer
     implements ResourceCollection {
 
-    private static final Iterator<Resource> EMPTY_ITERATOR
-        = Collections.<Resource>emptySet().iterator();
-
     private PatternSet defaultPatterns = new PatternSet();
-    private Vector<PatternSet> additionalPatterns = new Vector<PatternSet>();
+    private Vector<PatternSet> additionalPatterns = new Vector<>();
 
     private boolean useDefaultExcludes = true;
     private boolean caseSensitive = true;
@@ -82,6 +80,7 @@
      * @param r the <code>Reference</code> to use.
      * @throws BuildException if there is a problem.
      */
+    @Override
     public void setRefid(Reference r) throws BuildException {
         if (hasPatterns(defaultPatterns)) {
             throw tooManyAttributes();
@@ -258,7 +257,7 @@
      * @return the defaultexclusions value.
      */
     public synchronized boolean getDefaultexcludes() {
-        return (isReference())
+        return isReference()
             ? getRef().getDefaultexcludes() : useDefaultExcludes;
     }
 
@@ -280,7 +279,7 @@
      * collection is case-sensitive.
      */
     public synchronized boolean isCaseSensitive() {
-        return (isReference())
+        return isReference()
             ? getRef().isCaseSensitive() : caseSensitive;
     }
 
@@ -302,7 +301,7 @@
      *         should be followed.
      */
     public synchronized boolean isFollowSymlinks() {
-        return (isReference())
+        return isReference()
             ? getRef().isFollowSymlinks() : followSymlinks;
     }
 
@@ -310,6 +309,7 @@
      * Fulfill the ResourceCollection contract.
      * @return an Iterator of Resources.
      */
+    @Override
     public synchronized Iterator<Resource> iterator() {
         if (isReference()) {
             return getRef().iterator();
@@ -319,7 +319,7 @@
         int fct = ds.getIncludedFilesCount();
         int dct = ds.getIncludedDirsCount();
         if (fct + dct == 0) {
-            return EMPTY_ITERATOR;
+            return Collections.emptyIterator();
         }
         FileResourceIterator result = new FileResourceIterator(getProject());
         if (fct > 0) {
@@ -335,6 +335,7 @@
      * Fulfill the ResourceCollection contract.
      * @return number of elements as int.
      */
+    @Override
     public synchronized int size() {
         if (isReference()) {
             return getRef().size();
@@ -354,15 +355,8 @@
             return getRef().hasPatterns();
         }
         dieOnCircularReference();
-        if (hasPatterns(defaultPatterns)) {
-            return true;
-        }
-        for (PatternSet patternSet : additionalPatterns) {
-            if (hasPatterns(patternSet)) {
-                return true;
-            }
-        }
-        return false;
+        return hasPatterns(defaultPatterns)
+            || additionalPatterns.stream().anyMatch(this::hasPatterns);
     }
 
     /**
@@ -370,6 +364,7 @@
      *
      * @param selector the new <code>FileSelector</code> to add.
      */
+    @Override
     public synchronized void appendSelector(FileSelector selector) {
         if (isReference()) {
             throw noChildrenAllowed();
@@ -382,22 +377,13 @@
      * Format this Files collection as a String.
      * @return a descriptive <code>String</code>.
      */
+    @Override
     public String toString() {
         if (isReference()) {
             return getRef().toString();
         }
-        Iterator<Resource> i = iterator();
-        if (!i.hasNext()) {
-            return "";
-        }
-        StringBuffer sb = new StringBuffer();
-        while (i.hasNext()) {
-            if (sb.length() > 0) {
-                sb.append(File.pathSeparatorChar);
-            }
-            sb.append(i.next());
-        }
-        return sb.toString();
+        return isEmpty() ? "" : stream().map(Object::toString)
+            .collect(Collectors.joining(File.pathSeparator));
     }
 
     /**
@@ -405,6 +391,7 @@
      * (the list of selectors is a shallow clone of this instance's list).
      * @return a cloned Object.
      */
+    @Override
     public synchronized Object clone() {
         if (isReference()) {
             return getRef().clone();
@@ -451,11 +438,7 @@
         dieOnCircularReference();
         PatternSet ps = new PatternSet();
         ps.append(defaultPatterns, p);
-        final int count = additionalPatterns.size();
-        for (int i = 0; i < count; i++) {
-            Object o = additionalPatterns.elementAt(i);
-            ps.append((PatternSet) o, p);
-        }
+        additionalPatterns.forEach(pat -> ps.append(pat, p));
         return ps;
     }
 
@@ -464,6 +447,7 @@
      * @return true indicating that all elements of a Files collection
      *              will be FileResources.
      */
+    @Override
     public boolean isFilesystemOnly() {
         return true;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/First.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/First.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/First.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/First.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,10 +17,8 @@
  */
 package org.apache.tools.ant.types.resources;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
+import java.util.stream.Collectors;
 
 import org.apache.tools.ant.types.Resource;
 
@@ -35,14 +33,10 @@
      * Take the first <code>count</code> elements.
      * @return a Collection of Resources.
      */
+    @Override
     protected Collection<Resource> getCollection() {
-        int ct = getValidCount();
-        Iterator<Resource> iter = getResourceCollection().iterator();
-        List<Resource> al = new ArrayList<Resource>(ct);
-        for (int i = 0; i < ct && iter.hasNext(); i++) {
-            al.add(iter.next());
-        }
-        return al;
+        return getResourceCollection().stream().limit(getValidCount())
+            .collect(Collectors.toList());
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/GZipResource.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/GZipResource.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/GZipResource.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/GZipResource.java	2018-03-24 12:37:12.000000000 +0000
@@ -23,6 +23,8 @@
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
+import org.apache.tools.ant.types.ResourceCollection;
+
 /**
  * A GZip compressed resource.
  *
@@ -41,7 +43,7 @@
      * Constructor with another resource to wrap.
      * @param other the resource to wrap.
      */
-    public GZipResource(org.apache.tools.ant.types.ResourceCollection other) {
+    public GZipResource(ResourceCollection other) {
         super(other);
     }
 
@@ -51,6 +53,7 @@
      * @return the wrapped stream.
      * @throws IOException if there is a problem.
      */
+    @Override
     protected InputStream wrapStream(InputStream in) throws IOException {
         return new GZIPInputStream(in);
     }
@@ -61,7 +64,8 @@
      * @return the wrapped stream.
      * @throws IOException if there is a problem.
      */
-     protected OutputStream wrapStream(OutputStream out) throws IOException {
+    @Override
+    protected OutputStream wrapStream(OutputStream out) throws IOException {
         return new GZIPOutputStream(out);
     }
 
@@ -69,6 +73,7 @@
      * Get the name of the compression method.
      * @return the string "GZip".
      */
+    @Override
     protected String getCompressionName() {
         return "GZip";
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/Intersect.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/Intersect.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/Intersect.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/Intersect.java	2018-03-24 12:37:12.000000000 +0000
@@ -22,11 +22,14 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
 
+
 /**
  * ResourceCollection representing the intersection
  * of multiple nested ResourceCollections.
@@ -38,27 +41,23 @@
      * Calculate the intersection of the nested ResourceCollections.
      * @return a Collection of Resources.
      */
+    @Override
     protected Collection<Resource> getCollection() {
         List<ResourceCollection> rcs = getResourceCollections();
         int size = rcs.size();
         if (size < 2) {
-            throw new BuildException("The intersection of " + size
-                + " resource collection" + ((size == 1) ? "" : "s")
-                + " is undefined.");
+            throw new BuildException(
+                "The intersection of %d resource %s is undefined.", size,
+                size == 1 ? "collection" : "collections");
         }
+
+        final Function<ResourceCollection, Set<Resource>> toSet =
+            c -> c.stream().collect(Collectors.toSet());
+
         Iterator<ResourceCollection> rc = rcs.iterator();
-        Set<Resource> s = new LinkedHashSet<Resource>(collect(rc.next()));
-        while (rc.hasNext()) {
-            s.retainAll(collect(rc.next()));
-        }
+        Set<Resource> s = new LinkedHashSet<>(toSet.apply(rc.next()));
+        rc.forEachRemaining(c -> s.retainAll(toSet.apply(c)));
         return s;
     }
 
-    private Set<Resource> collect(ResourceCollection rc) {
-        Set<Resource> result = new LinkedHashSet<Resource>();
-        for (Resource r : rc) {
-            result.add(r);
-        }
-        return result;
-    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/JavaConstantResource.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/JavaConstantResource.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/JavaConstantResource.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/JavaConstantResource.java	2018-03-24 12:37:12.000000000 +0000
@@ -36,6 +36,7 @@
      * @return an open input stream for the resource
      * @throws IOException if an error occurs.
      */
+    @Override
     protected InputStream openInputStream(ClassLoader cl) throws IOException {
         String constant = getName();
         if (constant == null) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/JavaResource.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/JavaResource.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/JavaResource.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/JavaResource.java	2018-03-24 12:37:12.000000000 +0000
@@ -79,20 +79,20 @@
      * Get the URL represented by this Resource.
      * @since Ant 1.8.0
      */
+    @Override
     public URL getURL() {
         if (isReference()) {
-            return ((JavaResource) getCheckedRef()).getURL();
+            return getCheckedRef().getURL();
         }
         AbstractClasspathResource.ClassLoaderWithFlag classLoader =
             getClassLoader();
         if (classLoader.getLoader() == null) {
             return ClassLoader.getSystemResource(getName());
-        } else {
-            try {
-                return classLoader.getLoader().getResource(getName());
-            } finally {
-                classLoader.cleanup();
-            }
+        }
+        try {
+            return classLoader.getLoader().getResource(getName());
+        } finally {
+            classLoader.cleanup();
         }
     }
 
@@ -103,9 +103,10 @@
      * JavaResource is less than, equal to, or greater than the
      * specified Resource.
      */
+    @Override
     public int compareTo(Resource another) {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).compareTo(another);
+            return getCheckedRef().compareTo(another);
         }
         if (another.getClass().equals(getClass())) {
             JavaResource otherjr = (JavaResource) another;
@@ -138,4 +139,8 @@
         return super.compareTo(another);
     }
 
+    @Override
+    protected JavaResource getCheckedRef() {
+        return (JavaResource) super.getCheckedRef();
+    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/Last.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/Last.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/Last.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/Last.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,10 +17,9 @@
  */
 package org.apache.tools.ant.types.resources;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -38,33 +37,29 @@
      * Take the last <code>count</code> elements.
      * @return a Collection of Resources.
      */
+    @Override
     protected Collection<Resource> getCollection() {
         int count = getValidCount();
         ResourceCollection rc = getResourceCollection();
-        int i = count;
-        Iterator<Resource> iter = rc.iterator();
         int size = rc.size();
-        for (; i < size; i++) {
-            iter.next();
-        }
+        int skip = Math.max(0, size - count);
 
-        List<Resource> al = new ArrayList<Resource>(count);
-        for (; iter.hasNext(); i++) {
-            al.add(iter.next());
-        }
-        int found = al.size();
+        List<Resource> result =
+            rc.stream().skip(skip).collect(Collectors.toList());
+
+        int found = result.size();
         if (found == count || (size < count && found == size)) {
-            return al;
+            return result;
         }
-
         //mismatch:
-        String msg = "Resource collection " + rc + " reports size " + size
-            + " but returns " + i + " elements.";
+        String msg = String.format(
+            "Resource collection %s reports size %d but returns %d elements.",
+            rc, size, found + skip);
 
         //size was understated -> too many results; warn and continue:
         if (found > count) {
             log(msg, Project.MSG_WARN);
-            return al.subList(found - count, found);
+            return result.subList(found - count, found);
         }
         //size was overstated; we missed some and are now in error-land:
         throw new BuildException(msg);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/LazyResourceCollectionWrapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,6 +21,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.function.Supplier;
 
 import org.apache.tools.ant.types.Resource;
 
@@ -32,24 +33,23 @@
         AbstractResourceCollectionWrapper {
 
     /** List of cached resources */
-    private final List<Resource> cachedResources = new ArrayList<Resource>();
+    private final List<Resource> cachedResources = new ArrayList<>();
 
-    private FilteringIterator filteringIterator;
+    private Iterator<Resource> filteringIterator;
+
+    private final Supplier<Iterator<Resource>> filteringIteratorSupplier =
+        () -> new FilteringIterator(getResourceCollection().iterator());
 
     @Override
     protected Iterator<Resource> createIterator() {
-        Iterator<Resource> iterator;
         if (isCache()) {
             if (filteringIterator == null) {
                 // no worry of thread safety here, see function's contract
-                filteringIterator = new FilteringIterator(
-                        getResourceCollection().iterator());
+                filteringIterator = filteringIteratorSupplier.get();
             }
-            iterator = new CachedIterator(filteringIterator);
-        } else {
-            iterator = new FilteringIterator(getResourceCollection().iterator());
+            return new CachedIterator(filteringIterator);
         }
-        return iterator;
+        return filteringIteratorSupplier.get();
     }
 
     @Override
@@ -84,10 +84,11 @@
 
         protected final Iterator<Resource> it;
 
-        public FilteringIterator(final Iterator<Resource> it) {
+        FilteringIterator(final Iterator<Resource> it) {
             this.it = it;
         }
 
+        @Override
         public boolean hasNext() {
             if (ended) {
                 return false;
@@ -105,6 +106,7 @@
             return true;
         }
 
+        @Override
         public Resource next() {
             if (!hasNext()) {
                 throw new UnsupportedOperationException();
@@ -114,9 +116,6 @@
             return r;
         }
 
-        public void remove() {
-            throw new UnsupportedOperationException();
-        }
     }
 
     /**
@@ -125,7 +124,7 @@
      */
     private class CachedIterator implements Iterator<Resource> {
 
-        int cusrsor = 0;
+        int cursor = 0;
 
         private final Iterator<Resource> it;
 
@@ -140,10 +139,11 @@
             this.it = it;
         }
 
+        @Override
         public boolean hasNext() {
             synchronized (cachedResources) {
                 // have we already cached the next entry ?
-                if (cachedResources.size() > cusrsor) {
+                if (cachedResources.size() > cursor) {
                     return true;
                 }
                 // does the wrapped iterator any more resource ?
@@ -157,6 +157,7 @@
             return true;
         }
 
+        @Override
         public Resource next() {
             // first check that we have some to deliver
             if (!hasNext()) {
@@ -165,10 +166,11 @@
             synchronized (cachedResources) {
                 // return the cached entry as hasNext should have put one for
                 // this iterator
-                return cachedResources.get(cusrsor++);
+                return cachedResources.get(cursor++);
             }
         }
 
+        @Override
         public void remove() {
             throw new UnsupportedOperationException();
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/LogOutputResource.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/LogOutputResource.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/LogOutputResource.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/LogOutputResource.java	2018-03-24 12:37:12.000000000 +0000
@@ -55,6 +55,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public OutputStream getAppendOutputStream() throws IOException {
         return outputStream;
     }
@@ -62,6 +63,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public OutputStream getOutputStream() throws IOException {
         return outputStream;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/MappedResourceCollection.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,10 +18,12 @@
 package org.apache.tools.ant.types.resources;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Objects;
 import java.util.Stack;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -122,10 +124,10 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isFilesystemOnly() {
         if (isReference()) {
-            return ((MappedResourceCollection) getCheckedRef())
-                .isFilesystemOnly();
+            return getCheckedRef().isFilesystemOnly();
         }
         checkInitialized();
         return false;
@@ -134,9 +136,10 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public int size() {
         if (isReference()) {
-            return ((MappedResourceCollection) getCheckedRef()).size();
+            return getCheckedRef().size();
         }
         checkInitialized();
         return cacheCollection().size();
@@ -145,9 +148,10 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public Iterator<Resource> iterator() {
         if (isReference()) {
-            return ((MappedResourceCollection) getCheckedRef()).iterator();
+            return getCheckedRef().iterator();
         }
         checkInitialized();
         return cacheCollection().iterator();
@@ -157,6 +161,7 @@
      * Overrides the base version.
      * @param r the Reference to set.
      */
+    @Override
     public void setRefid(Reference r) {
         if (nested != null || mapper != null) {
             throw tooManyAttributes();
@@ -168,6 +173,7 @@
      * Implement clone.  The nested resource collection and mapper are copied.
      * @return a cloned instance.
      */
+    @Override
     public Object clone() {
         try {
             MappedResourceCollection c =
@@ -188,6 +194,7 @@
      * @param p   the project to use to dereference the references.
      * @throws BuildException on error.
      */
+    @Override
     protected synchronized void dieOnCircularReference(Stack<Object> stk, Project p)
         throws BuildException {
         if (isChecked()) {
@@ -209,8 +216,9 @@
 
     private void checkInitialized() {
         if (nested == null) {
-            throw new BuildException("A nested resource collection element is"
-                                     + " required", getLocation());
+            throw new BuildException(
+                "A nested resource collection element is required",
+                getLocation());
         }
         dieOnCircularReference();
     }
@@ -223,46 +231,37 @@
     }
 
     private Collection<Resource> getCollection() {
-        Collection<Resource> collected = new ArrayList<Resource>();
         FileNameMapper m =
-            mapper != null ? mapper.getImplementation() : new IdentityMapper();
-        for (Resource r : nested) {
-            if (enableMultipleMappings) {
-                String[] n = m.mapFileName(r.getName());
-                if (n != null) {
-                    for (int i = 0; i < n.length; i++) {
-                        collected.add(new MappedResource(r,
-                                                         new MergingMapper(n[i]))
-                                      );
-                    }
-                }
-            } else {
-                collected.add(new MappedResource(r, m));
-            }
+            mapper == null ? new IdentityMapper() : mapper.getImplementation();
+
+        Stream<MappedResource> stream;
+        if (enableMultipleMappings) {
+            stream = nested.stream()
+                .flatMap(r -> Stream.of(m.mapFileName(r.getName()))
+                    .filter(Objects::nonNull)
+                    .map(MergingMapper::new)
+                    .map(mm -> new MappedResource(r, mm)));
+        } else {
+            stream = nested.stream().map(r -> new MappedResource(r, m));
         }
-        return collected;
+        return stream.collect(Collectors.toList());
     }
 
     /**
      * Format this resource collection as a String.
      * @return a descriptive <code>String</code>.
      */
+    @Override
     public String toString() {
         if (isReference()) {
             return getCheckedRef().toString();
         }
-        Iterator<Resource> i = iterator();
-        if (!i.hasNext()) {
-            return "";
-        }
-        StringBuffer sb = new StringBuffer();
-        while (i.hasNext()) {
-            if (sb.length() > 0) {
-                sb.append(File.pathSeparatorChar);
-            }
-            sb.append(i.next());
-        }
-        return sb.toString();
+        return isEmpty() ? "" : stream().map(Object::toString)
+            .collect(Collectors.joining(File.pathSeparator));
     }
 
+    @Override
+    protected MappedResourceCollection getCheckedRef() {
+        return (MappedResourceCollection) super.getCheckedRef();
+    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/MultiRootFileSet.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/MultiRootFileSet.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/MultiRootFileSet.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/MultiRootFileSet.java	2018-03-24 12:37:12.000000000 +0000
@@ -115,18 +115,18 @@
     public Object clone() {
         if (isReference()) {
             return ((MultiRootFileSet) getRef(getProject())).clone();
-        } else {
-            final MultiRootFileSet fs = (MultiRootFileSet) super.clone();
-            fs.baseDirs = new ArrayList<File>(baseDirs);
-            fs.union = null;
-            return fs;
         }
+        final MultiRootFileSet fs = (MultiRootFileSet) super.clone();
+        fs.baseDirs = new ArrayList<>(baseDirs);
+        fs.union = null;
+        return fs;
     }
 
     /**
      * Fulfill the ResourceCollection contract.
      * @return an Iterator of Resources.
      */
+    @Override
     public Iterator<Resource> iterator() {
         if (isReference()) {
             return ((MultiRootFileSet) getRef(getProject())).iterator();
@@ -138,6 +138,7 @@
      * Fulfill the ResourceCollection contract.
      * @return number of elements as int.
      */
+    @Override
     public int size() {
         if (isReference()) {
             return ((MultiRootFileSet) getRef(getProject())).size();
@@ -149,6 +150,7 @@
      * Always returns true.
      * @return true indicating that all elements will be FileResources.
      */
+    @Override
     public boolean isFilesystemOnly() {
         return true;
     }
@@ -202,10 +204,12 @@
             setDir(dir);
         }
 
+        @Override
         public boolean isFilesystemOnly() {
             return true;
         }
 
+        @Override
         public Iterator<Resource> iterator() {
             final DirectoryScanner ds = getDirectoryScanner(getProject());
             String[] names = type == SetType.file
@@ -222,6 +226,7 @@
                                             names);
         }
 
+        @Override
         public int size() {
             final DirectoryScanner ds = getDirectoryScanner(getProject());
             int count = type == SetType.file
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/PropertyResource.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/PropertyResource.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/PropertyResource.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/PropertyResource.java	2018-03-24 12:37:12.000000000 +0000
@@ -39,6 +39,7 @@
         = Resource.getMagicNumber("PropertyResource".getBytes());
 
     private static final InputStream UNSET = new InputStream() {
+        @Override
         public int read() {
             return -1;
         }
@@ -66,7 +67,7 @@
      */
     public String getValue() {
         if (isReference()) {
-            return ((PropertyResource) getCheckedRef()).getValue();
+            return getCheckedRef().getValue();
         }
         Project p = getProject();
         return p == null ? null : p.getProperty(getName());
@@ -79,7 +80,7 @@
      */
     public Object getObjectValue() {
         if (isReference()) {
-            return ((PropertyResource) getCheckedRef()).getObjectValue();
+            return getCheckedRef().getObjectValue();
         }
         Project p = getProject();
         return p == null ? null : PropertyHelper.getProperty(p, getName());
@@ -89,6 +90,7 @@
      * Find out whether this Resource exists.
      * @return true if the Property is set, false otherwise.
      */
+    @Override
     public boolean isExists() {
         if (isReferenceOrProxy()) {
             return getReferencedOrProxied().isExists();
@@ -101,6 +103,7 @@
      * @return the size, as a long, 0 if the Resource does not exist (for
      *         compatibility with java.io.File), or UNKNOWN_SIZE if not known.
      */
+    @Override
     public long getSize() {
         if (isReferenceOrProxy()) {
             return getReferencedOrProxied().getSize();
@@ -115,6 +118,7 @@
      * @param o object to compare
      * @return true if equal to o
      */
+    @Override
     public boolean equals(Object o) {
         if (super.equals(o)) {
             return true;
@@ -126,6 +130,7 @@
      * Get the hash code for this Resource.
      * @return hash code as int.
      */
+    @Override
     public int hashCode() {
         if (isReferenceOrProxy()) {
             return getReferencedOrProxied().hashCode();
@@ -136,6 +141,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toString() {
         if (isReferenceOrProxy()) {
             return getReferencedOrProxied().toString();
@@ -151,6 +157,7 @@
      * @throws UnsupportedOperationException if InputStreams are not
      *         supported for this Resource type.
      */
+    @Override
     public InputStream getInputStream() throws IOException {
         if (isReferenceOrProxy()) {
             return getReferencedOrProxied().getInputStream();
@@ -167,6 +174,7 @@
      * @throws UnsupportedOperationException if OutputStreams are not
      *         supported for this Resource type.
      */
+    @Override
     public OutputStream getOutputStream() throws IOException {
         if (isReferenceOrProxy()) {
             return getReferencedOrProxied().getOutputStream();
@@ -194,7 +202,7 @@
      */
     protected Resource getReferencedOrProxied() {
         if (isReference()) {
-            return (Resource) getCheckedRef(Resource.class, "resource");
+            return getCheckedRef(Resource.class, "resource");
         }
         Object o = getObjectValue();
         if (o instanceof Resource) {
@@ -203,4 +211,9 @@
         throw new IllegalStateException(
                 "This PropertyResource does not reference or proxy another Resource");
     }
+
+    @Override
+    protected PropertyResource getCheckedRef() {
+        return (PropertyResource) super.getCheckedRef();
+    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/ResourceDecorator.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/ResourceDecorator.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/ResourceDecorator.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/ResourceDecorator.java	2018-03-24 12:37:12.000000000 +0000
@@ -59,12 +59,12 @@
     public final void addConfigured(ResourceCollection a) {
         checkChildrenAllowed();
         if (resource != null) {
-            throw new BuildException("you must not specify more than one"
-                                     + " resource");
+            throw new BuildException(
+                "you must not specify more than one resource");
         }
         if (a.size() != 1) {
-            throw new BuildException("only single argument resource collections"
-                                     + " are supported");
+            throw new BuildException(
+                "only single argument resource collections are supported");
         }
         setChecked(false);
         resource = a.iterator().next();
@@ -238,6 +238,7 @@
      * @param name not used.
      * @throws BuildException always.
      */
+    @Override
     public void setName(String name) throws BuildException {
         throw new BuildException("you can't change the name of a "
                                  + getDataTypeName());
@@ -247,6 +248,7 @@
      * Set the exists attribute.
      * @param exists if true, this resource exists.
      */
+    @Override
     public void setExists(boolean exists) {
         throw new BuildException("you can't change the exists state of a "
                                  + getDataTypeName());
@@ -257,6 +259,7 @@
      * @param lastmodified not used.
      * @throws BuildException always.
      */
+    @Override
     public void setLastModified(long lastmodified) throws BuildException {
         throw new BuildException("you can't change the timestamp of a "
                                  + getDataTypeName());
@@ -267,6 +270,7 @@
      * @param directory not used.
      * @throws BuildException always.
      */
+    @Override
     public void setDirectory(boolean directory) throws BuildException {
         throw new BuildException("you can't change the directory state of a "
                                  + getDataTypeName());
@@ -277,6 +281,7 @@
      * @param size not used.
      * @throws BuildException always.
      */
+    @Override
     public void setSize(long size) throws BuildException {
         throw new BuildException("you can't change the size of a "
                                  + getDataTypeName());
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/ResourceList.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/ResourceList.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/ResourceList.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/ResourceList.java	2018-03-24 12:37:12.000000000 +0000
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Stack;
@@ -36,7 +37,6 @@
 import org.apache.tools.ant.types.Reference;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
-import org.apache.tools.ant.util.FileUtils;
 
 /**
  * Reads a resource as text document and creates a resource for each
@@ -44,8 +44,8 @@
  * @since Ant 1.8.0
  */
 public class ResourceList extends DataType implements ResourceCollection {
-    private final Vector<FilterChain> filterChains = new Vector<FilterChain>();
-    private final ArrayList<ResourceCollection> textDocuments = new ArrayList<ResourceCollection>();
+    private final Vector<FilterChain> filterChains = new Vector<>();
+    private final ArrayList<ResourceCollection> textDocuments = new ArrayList<>();
     private final Union cachedResources = new Union();
     private volatile boolean cached = false;
     private String encoding = null;
@@ -105,11 +105,12 @@
      *
      * @param r Reference
      */
+    @Override
     public void setRefid(Reference r) throws BuildException {
         if (encoding != null) {
             throw tooManyAttributes();
         }
-        if (filterChains.size() > 0 || textDocuments.size() > 0) {
+        if (!(filterChains.isEmpty() && textDocuments.isEmpty())) {
             throw noChildrenAllowed();
         }
         super.setRefid(r);
@@ -122,9 +123,10 @@
      *
      * @return a "fail-fast" Iterator.
      */
+    @Override
     public final synchronized Iterator<Resource> iterator() {
         if (isReference()) {
-            return ((ResourceList) getCheckedRef()).iterator();
+            return getCheckedRef().iterator();
         }
         return cache().iterator();
     }
@@ -134,9 +136,10 @@
      *
      * @return number of elements as int.
      */
+    @Override
     public synchronized int size() {
         if (isReference()) {
-            return ((ResourceList) getCheckedRef()).size();
+            return getCheckedRef().size();
         }
         return cache().size();
     }
@@ -146,9 +149,10 @@
      *
      * @return whether this is a filesystem-only resource collection.
      */
+    @Override
     public synchronized boolean isFilesystemOnly() {
         if (isReference()) {
-            return ((ResourceList) getCheckedRef()).isFilesystemOnly();
+            return getCheckedRef().isFilesystemOnly();
         }
         return cache().isFilesystemOnly();
     }
@@ -161,6 +165,7 @@
      * @param p   the project to use to dereference the references.
      * @throws BuildException on error.
      */
+    @Override
     protected synchronized void dieOnCircularReference(Stack<Object> stk, Project p)
         throws BuildException {
         if (isChecked()) {
@@ -181,65 +186,53 @@
         }
     }
 
+    @Override
+    protected ResourceList getCheckedRef() {
+        return (ResourceList) super.getCheckedRef();
+    }
+
     private synchronized ResourceCollection cache() {
         if (!cached) {
             dieOnCircularReference();
-            for (ResourceCollection rc : textDocuments) {
-                for (Resource r : rc) {
-                    cachedResources.add(read(r));
-                }
-            }
+            textDocuments.stream().flatMap(ResourceCollection::stream)
+                .map(this::read).forEach(cachedResources::add);
             cached = true;
         }
         return cachedResources;
     }
 
     private ResourceCollection read(Resource r) {
-        BufferedInputStream bis = null;
-        try {
-            bis = new BufferedInputStream(r.getInputStream());
-            Reader input = null;
-            if (encoding == null) {
-                input = new InputStreamReader(bis);
-            } else {
-                input = new InputStreamReader(bis, encoding);
-            }
-            ChainReaderHelper crh = new ChainReaderHelper();
-            crh.setPrimaryReader(input);
-            crh.setFilterChains(filterChains);
-            crh.setProject(getProject());
+        try (BufferedReader reader = new BufferedReader(open(r))) {
             Union streamResources = new Union();
-            BufferedReader reader = new BufferedReader(crh.getAssembledReader());
-            try {
-                streamResources.setCache(true);
-
-                String line = null;
-                while ((line = reader.readLine()) != null) {
-                    streamResources.add(parse(line));
-                }
-            } finally {
-                reader.close();
-            }
-
+            streamResources.setCache(true);
+            reader.lines().map(this::parse).forEach(streamResources::add);
             return streamResources;
         } catch (final IOException ioe) {
             throw new BuildException("Unable to read resource " + r.getName()
                                      + ": " + ioe, ioe, getLocation());
-        } finally {
-            FileUtils.close(bis);
         }
     }
 
+    private Reader open(Resource r) throws IOException {
+        ChainReaderHelper crh = new ChainReaderHelper();
+        crh.setPrimaryReader(new InputStreamReader(
+            new BufferedInputStream(r.getInputStream()), encoding == null
+                ? Charset.defaultCharset() : Charset.forName(encoding)));
+        crh.setFilterChains(filterChains);
+        crh.setProject(getProject());
+        return crh.getAssembledReader();
+    }
+
     private Resource parse(final String line) {
-        PropertyHelper propertyHelper
-            = (PropertyHelper) PropertyHelper.getPropertyHelper(getProject());
+        PropertyHelper propertyHelper =
+            PropertyHelper.getPropertyHelper(getProject());
         Object expanded = propertyHelper.parseProperties(line);
         if (expanded instanceof Resource) {
             return (Resource) expanded;
         }
         String expandedLine = expanded.toString();
-        int colon = expandedLine.indexOf(":");
-        if (colon != -1) {
+        int colon = expandedLine.indexOf(':');
+        if (colon >= 0) {
             // could be an URL or an absolute file on an OS with drives
             try {
                 return new URLResource(expandedLine);
@@ -252,4 +245,5 @@
         }
         return new FileResource(getProject(), expandedLine);
     }
+
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/Resources.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/Resources.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/Resources.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/Resources.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,13 +20,14 @@
 
 import java.io.File;
 import java.util.AbstractCollection;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Stack;
-import java.util.Vector;
+import java.util.stream.Collectors;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -43,12 +44,15 @@
 public class Resources extends DataType implements ResourceCollection {
     /** static empty ResourceCollection */
     public static final ResourceCollection NONE = new ResourceCollection() {
+        @Override
         public boolean isFilesystemOnly() {
             return true;
         }
+        @Override
         public Iterator<Resource> iterator() {
             return EMPTY_ITERATOR;
         }
+        @Override
         public int size() {
             return 0;
         }
@@ -56,12 +60,15 @@
 
     /** static empty Iterator */
     public static final Iterator<Resource> EMPTY_ITERATOR = new Iterator<Resource>() {
+        @Override
         public Resource next() {
             throw new NoSuchElementException();
         }
+        @Override
         public boolean hasNext() {
             return false;
         }
+        @Override
         public void remove() {
             throw new UnsupportedOperationException();
         }
@@ -72,9 +79,11 @@
 
         MyCollection() {
         }
+        @Override
         public int size() {
             return getCache().size();
         }
+        @Override
         public Iterator<Resource> iterator() {
             return getCache().iterator();
         }
@@ -92,27 +101,30 @@
             private Iterator<ResourceCollection> rci = getNested().iterator();
             private Iterator<Resource> ri = null;
 
+            @Override
             public boolean hasNext() {
                 boolean result = ri != null && ri.hasNext();
                 while (!result && rci.hasNext()) {
-                    ri = ((ResourceCollection) rci.next()).iterator();
+                    ri = rci.next().iterator();
                     result = ri.hasNext();
                 }
                 return result;
             }
+            @Override
             public Resource next() {
                 if (!hasNext()) {
                     throw new NoSuchElementException();
                 }
                 return ri.next();
             }
+            @Override
             public void remove() {
                 throw new UnsupportedOperationException();
             }
         }
     }
 
-    private Vector<ResourceCollection> rc;
+    private List<ResourceCollection> rc;
     private Collection<Resource> coll;
     private boolean cache = false;
 
@@ -152,7 +164,7 @@
             return;
         }
         if (rc == null) {
-            rc = new Vector<ResourceCollection>();
+            rc = Collections.synchronizedList(new ArrayList<>());
         }
         rc.add(c);
         invalidateExistingIterators();
@@ -164,6 +176,7 @@
      * Fulfill the ResourceCollection contract.
      * @return an Iterator of Resources.
      */
+    @Override
     public synchronized Iterator<Resource> iterator() {
         if (isReference()) {
             return getRef().iterator();
@@ -176,6 +189,7 @@
      * Fulfill the ResourceCollection contract.
      * @return number of elements as int.
      */
+    @Override
     public synchronized int size() {
         if (isReference()) {
             return getRef().size();
@@ -188,24 +202,21 @@
      * Fulfill the ResourceCollection contract.
      * @return true if all Resources represent files.
      */
+    @Override
     public boolean isFilesystemOnly() {
         if (isReference()) {
             return getRef().isFilesystemOnly();
         }
         validate();
-
-        for (Iterator<ResourceCollection> i = getNested().iterator(); i.hasNext();) {
-            if (!i.next().isFilesystemOnly()) {
-                return false;
-            }
-        }
-        return true;
+        return getNested().stream()
+            .allMatch(ResourceCollection::isFilesystemOnly);
     }
 
     /**
      * Format this <code>Resources</code> as a String.
      * @return a descriptive <code>String</code>.
      */
+    @Override
     public synchronized String toString() {
         if (isReference()) {
             return getCheckedRef().toString();
@@ -214,14 +225,8 @@
         if (coll == null || coll.isEmpty()) {
             return "";
         }
-        StringBuffer sb = new StringBuffer();
-        for (Resource r : coll) {
-            if (sb.length() > 0) {
-                sb.append(File.pathSeparatorChar);
-            }
-            sb.append(r);
-        }
-        return sb.toString();
+        return coll.stream().map(Object::toString)
+            .collect(Collectors.joining(File.pathSeparator));
     }
 
     /**
@@ -231,6 +236,7 @@
      * @param p   the project to use to dereference the references.
      * @throws BuildException on error.
      */
+    @Override
     protected void dieOnCircularReference(Stack<Object> stk, Project p)
         throws BuildException {
         if (isChecked()) {
@@ -260,8 +266,7 @@
      * @return the referenced ResourceCollection.
      */
     private ResourceCollection getRef() {
-        return (ResourceCollection) getCheckedRef(
-            ResourceCollection.class, "ResourceCollection");
+        return getCheckedRef(ResourceCollection.class, "ResourceCollection");
     }
 
     private synchronized void validate() {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/Restrict.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/Restrict.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/Restrict.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/Restrict.java	2018-03-24 12:37:12.000000000 +0000
@@ -39,13 +39,9 @@
         /**
          * Restrict the nested ResourceCollection based on the nested selectors.
          */
+        @Override
         protected boolean filterResource(Resource r) {
-            for (Iterator<ResourceSelector> i = getSelectors(); i.hasNext();) {
-                if (!i.next().isSelected(r)) {
-                    return true;
-                }
-            }
-            return false;
+            return getResourceSelectors().stream().anyMatch(rsel -> !rsel.isSelected(r));
         }
     };
 
@@ -84,6 +80,7 @@
      * Add a ResourceSelector.
      * @param s the ResourceSelector to add.
      */
+    @Override
     public synchronized void add(ResourceSelector s) {
         if (s == null) {
             return;
@@ -96,9 +93,10 @@
      * Fulfill the ResourceCollection contract.
      * @return an Iterator of Resources.
      */
+    @Override
     public final synchronized Iterator<Resource> iterator() {
         if (isReference()) {
-            return ((Restrict) getCheckedRef()).iterator();
+            return getCheckedRef().iterator();
         }
         dieOnCircularReference();
         return w.iterator();
@@ -108,9 +106,10 @@
      * Fulfill the ResourceCollection contract.
      * @return number of elements as int.
      */
+    @Override
     public synchronized int size() {
         if (isReference()) {
-            return ((Restrict) getCheckedRef()).size();
+            return getCheckedRef().size();
         }
         dieOnCircularReference();
         return w.size();
@@ -120,9 +119,10 @@
      * Fulfill the ResourceCollection contract.
      * @return whether this is a filesystem-only resource collection.
      */
+    @Override
     public synchronized boolean isFilesystemOnly() {
         if (isReference()) {
-            return ((Restrict) getCheckedRef()).isFilesystemOnly();
+            return getCheckedRef().isFilesystemOnly();
         }
         dieOnCircularReference();
         return w.isFilesystemOnly();
@@ -132,6 +132,7 @@
      * Format this Restrict collection as a String.
      * @return the String value of this collection.
      */
+    @Override
     public synchronized String toString() {
         if (isReference()) {
             return getCheckedRef().toString();
@@ -140,6 +141,7 @@
         return w.toString();
     }
 
+    @Override
     protected synchronized void dieOnCircularReference(Stack<Object> stk, Project p) {
         if (isChecked()) {
             return;
@@ -153,4 +155,9 @@
             setChecked(true);
         }
     }
+
+    @Override
+    protected Restrict getCheckedRef() {
+        return (Restrict) super.getCheckedRef();
+    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/selectors/And.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/selectors/And.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/selectors/And.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/selectors/And.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,8 +17,6 @@
  */
 package org.apache.tools.ant.types.resources.selectors;
 
-import java.util.Iterator;
-
 import org.apache.tools.ant.types.Resource;
 
 /**
@@ -37,7 +35,7 @@
      * Convenience constructor.
      * @param r the ResourceSelector[] to add.
      */
-    public And(ResourceSelector[] r) {
+    public And(ResourceSelector... r) {
         super(r);
     }
 
@@ -47,12 +45,7 @@
      * @return whether the Resource was selected.
      */
     public boolean isSelected(Resource r) {
-        for (Iterator<ResourceSelector> i = getSelectors(); i.hasNext();) {
-            if (!i.next().isSelected(r)) {
-                return false;
-            }
-        }
-        return true;
+        return getResourceSelectors().stream().allMatch(s -> s.isSelected(r));
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/selectors/Date.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/selectors/Date.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/selectors/Date.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/selectors/Date.java	2018-03-24 12:37:12.000000000 +0000
@@ -144,15 +144,15 @@
             try {
                 long m = df.parse(dateTime).getTime();
                 if (m < 0) {
-                    throw new BuildException("Date of " + dateTime
-                        + " results in negative milliseconds value"
-                        + " relative to epoch (January 1, 1970, 00:00:00 GMT).");
+                    throw new BuildException(
+                        "Date of %s results in negative milliseconds value relative to epoch (January 1, 1970, 00:00:00 GMT).",
+                        dateTime);
                 }
                 setMillis(m);
             } catch (ParseException pe) {
-                throw new BuildException("Date of " + dateTime
-                        + " Cannot be parsed correctly. It should be in '"
-                        + p + "' format.");
+                throw new BuildException(
+                    "Date of %s Cannot be parsed correctly. It should be in '%s' format.",
+                    dateTime, p);
             }
         }
         return when.evaluate(r.getLastModified(), millis.longValue(), granularity);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/selectors/InstanceOf.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/selectors/InstanceOf.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/selectors/InstanceOf.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/selectors/InstanceOf.java	2018-03-24 12:37:12.000000000 +0000
@@ -110,13 +110,12 @@
         if (type != null) {
             if (project == null) {
                 throw new BuildException(
-                    "No project set for InstanceOf ResourceSelector; "
-                    + "the type attribute is invalid.");
+                    "No project set for InstanceOf ResourceSelector; the type attribute is invalid.");
             }
             AntTypeDefinition d = ComponentHelper.getComponentHelper(
                 project).getDefinition(ProjectHelper.genComponentName(uri, type));
             if (d == null) {
-                throw new BuildException("type " + type + " not found.");
+                throw new BuildException("type %s not found.",type);
             }
             try {
                 c = d.innerGetTypeClass();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/selectors/Majority.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/selectors/Majority.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/selectors/Majority.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/selectors/Majority.java	2018-03-24 12:37:12.000000000 +0000
@@ -25,8 +25,8 @@
  * Majority ResourceSelector.
  * @since Ant 1.7
  */
-public class Majority
-    extends ResourceSelectorContainer implements ResourceSelector {
+public class Majority extends ResourceSelectorContainer
+    implements ResourceSelector {
 
     private boolean tie = true;
 
@@ -40,7 +40,7 @@
      * Convenience constructor.
      * @param r the ResourceSelector[] to add.
      */
-    public Majority(ResourceSelector[] r) {
+    public Majority(ResourceSelector... r) {
         super(r);
     }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/selectors/Name.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/selectors/Name.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/selectors/Name.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/selectors/Name.java	2018-03-24 12:37:12.000000000 +0000
@@ -132,18 +132,17 @@
     private boolean matches(String name) {
         if (pattern != null) {
             return SelectorUtils.match(modify(pattern), modify(name), cs);
-        } else {
-            if (reg == null) {
-                reg = new RegularExpression();
-                reg.setPattern(regex);
-                expression = reg.getRegexp(project);
-            }
-            return expression.matches(modify(name), RegexpUtil.asOptions(cs));
         }
+        if (reg == null) {
+            reg = new RegularExpression();
+            reg.setPattern(regex);
+            expression = reg.getRegexp(project);
+        }
+        return expression.matches(modify(name), RegexpUtil.asOptions(cs));
     }
 
     private String modify(String s) {
-        if (s == null || !handleDirSep || s.indexOf("\\") == -1) {
+        if (s == null || !handleDirSep || s.indexOf('\\') < 0) {
             return s;
         }
         return s.replace('\\', '/');
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/selectors/None.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/selectors/None.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/selectors/None.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/selectors/None.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,8 +17,6 @@
  */
 package org.apache.tools.ant.types.resources.selectors;
 
-import java.util.Iterator;
-
 import org.apache.tools.ant.types.Resource;
 
 /**
@@ -38,7 +36,7 @@
      * Convenience constructor.
      * @param r the ResourceSelector[] to add.
      */
-    public None(ResourceSelector[] r) {
+    public None(ResourceSelector... r) {
         super(r);
     }
 
@@ -48,12 +46,7 @@
      * @return whether the Resource was selected.
      */
     public boolean isSelected(Resource r) {
-        for (Iterator<ResourceSelector> i = getSelectors(); i.hasNext();) {
-            if (i.next().isSelected(r)) {
-                return false;
-            }
-        }
-        return true;
+        return getResourceSelectors().stream().noneMatch(s -> s.isSelected(r));
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/selectors/Or.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/selectors/Or.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/selectors/Or.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/selectors/Or.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,8 +17,6 @@
  */
 package org.apache.tools.ant.types.resources.selectors;
 
-import java.util.Iterator;
-
 import org.apache.tools.ant.types.Resource;
 
 /**
@@ -37,7 +35,7 @@
      * Convenience constructor.
      * @param r the ResourceSelector[] to add.
      */
-    public Or(ResourceSelector[] r) {
+    public Or(ResourceSelector... r) {
         super(r);
     }
 
@@ -47,12 +45,7 @@
      * @return whether the Resource was selected.
      */
     public boolean isSelected(Resource r) {
-        for (Iterator<ResourceSelector> i = getSelectors(); i.hasNext();) {
-            if (i.next().isSelected(r)) {
-                return true;
-            }
-        }
-        return false;
+        return getResourceSelectors().stream().anyMatch(s -> s.isSelected(r));
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/selectors/ResourceSelectorContainer.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/selectors/ResourceSelectorContainer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/selectors/ResourceSelectorContainer.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/selectors/ResourceSelectorContainer.java	2018-03-24 12:37:12.000000000 +0000
@@ -33,7 +33,7 @@
  */
 public class ResourceSelectorContainer extends DataType {
 
-    private final List<ResourceSelector> resourceSelectors = new ArrayList<ResourceSelector>();
+    private final List<ResourceSelector> resourceSelectors = new ArrayList<>();
 
     /**
      * Default constructor.
@@ -43,11 +43,11 @@
 
     /**
      * Construct a new ResourceSelectorContainer with the specified array of selectors.
-     * @param rs the ResourceSelector[] to add.
+     * @param resourceSelectors the ResourceSelector[] to add.
      */
-    public ResourceSelectorContainer(ResourceSelector[] rs) {
-        for (int i = 0; i < rs.length; i++) {
-            add(rs[i]);
+    public ResourceSelectorContainer(ResourceSelector... resourceSelectors) {
+        for (ResourceSelector rsel : resourceSelectors) {
+            add(rsel);
         }
     }
 
@@ -72,7 +72,7 @@
      */
     public boolean hasSelectors() {
         if (isReference()) {
-            return ((ResourceSelectorContainer) getCheckedRef()).hasSelectors();
+            return getCheckedRef().hasSelectors();
         }
         dieOnCircularReference();
         return !resourceSelectors.isEmpty();
@@ -84,7 +84,7 @@
      */
     public int selectorCount() {
         if (isReference()) {
-            return ((ResourceSelectorContainer) getCheckedRef()).selectorCount();
+            return getCheckedRef().selectorCount();
         }
         dieOnCircularReference();
         return resourceSelectors.size();
@@ -96,10 +96,21 @@
      */
     public Iterator<ResourceSelector> getSelectors() {
         if (isReference()) {
-            return ((ResourceSelectorContainer) getCheckedRef()).getSelectors();
+            return getCheckedRef().getSelectors();
+        }
+        return getResourceSelectors().iterator();
+    }
+
+    /**
+     * Get the configured {@link ResourceSelector}s as a {@link List}.
+     * @return {@link List} of {@link ResourceSelector}
+     */
+    public List<ResourceSelector> getResourceSelectors() {
+        if (isReference()) {
+            return getCheckedRef().getResourceSelectors();
         }
         dieOnCircularReference();
-        return Collections.unmodifiableList(resourceSelectors).iterator();
+        return Collections.unmodifiableList(resourceSelectors);
     }
 
     /**
@@ -125,4 +136,8 @@
         }
     }
 
+    @Override
+    protected ResourceSelectorContainer getCheckedRef() {
+        return (ResourceSelectorContainer) super.getCheckedRef();
+    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/SizeLimitCollection.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/SizeLimitCollection.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/SizeLimitCollection.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/SizeLimitCollection.java	2018-03-24 12:37:12.000000000 +0000
@@ -50,10 +50,9 @@
      * Efficient size implementation.
      * @return int size
      */
+    @Override
     public synchronized int size() {
-        int sz = getResourceCollection().size();
-        int ct = getValidCount();
-        return sz < ct ? sz : ct;
+        return Math.min(getResourceCollection().size(), getValidCount());
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/Sort.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/Sort.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/Sort.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/Sort.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,19 +18,15 @@
 package org.apache.tools.ant.types.resources;
 
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Stack;
+import java.util.stream.Collectors;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.DataType;
 import org.apache.tools.ant.types.Resource;
-import org.apache.tools.ant.types.ResourceCollection;
 import org.apache.tools.ant.types.resources.comparators.DelegatedResourceComparator;
 import org.apache.tools.ant.types.resources.comparators.ResourceComparator;
-import org.apache.tools.ant.util.CollectionUtils;
 
 /**
  * ResourceCollection that sorts another ResourceCollection.
@@ -48,15 +44,10 @@
      * Sort the contained elements.
      * @return a Collection of Resources.
      */
+    @Override
     protected synchronized Collection<Resource> getCollection() {
-        ResourceCollection rc = getResourceCollection();
-        Iterator<Resource> iter = rc.iterator();
-        if (!(iter.hasNext())) {
-            return Collections.emptySet();
-        }
-        List<Resource> result = (List<Resource>) CollectionUtils.asCollection(iter);
-        Collections.sort(result, comp);
-        return result;
+        return getResourceCollection().stream().map(Resource.class::cast)
+            .sorted(comp).collect(Collectors.toList());
     }
 
     /**
@@ -80,6 +71,7 @@
      * @param p   the project to use to dereference the references.
      * @throws BuildException on error.
      */
+    @Override
     protected synchronized void dieOnCircularReference(Stack<Object> stk, Project p)
         throws BuildException {
         if (isChecked()) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/StringResource.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/StringResource.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/StringResource.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/StringResource.java	2018-03-24 12:37:12.000000000 +0000
@@ -149,8 +149,8 @@
      */
     @Override
     public synchronized long getSize() {
-        return isReference() ? ((Resource) getCheckedRef()).getSize()
-                : getContent().length();
+        return isReference() ? getCheckedRef().getSize()
+            : getContent().length();
     }
 
     /**
@@ -188,7 +188,7 @@
     @Override
     public synchronized InputStream getInputStream() throws IOException {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).getInputStream();
+            return getCheckedRef().getInputStream();
         }
         String content = getContent();
         if (content == null) {
@@ -209,7 +209,7 @@
     @Override
     public synchronized OutputStream getOutputStream() throws IOException {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).getOutputStream();
+            return getCheckedRef().getOutputStream();
         }
         if (getValue() != null) {
             throw new ImmutableResourceException();
@@ -237,19 +237,9 @@
         return getValue();
     }
 
-    /**
-     * This method is only for use by our private helper output stream.
-     * It contains specific logic for expanding properties.
-     * @param output the output
-     */
-    private void setValueFromOutputStream(String output) {
-        String value;
-        if (getProject() != null) {
-            value = getProject().replaceProperties(output);
-        } else {
-            value = output;
-        }
-        setValue(value);
+    @Override
+    protected StringResource getCheckedRef() {
+        return (StringResource) super.getCheckedRef();
     }
 
     private class StringResourceFilterOutputStream extends FilterOutputStream {
@@ -266,7 +256,18 @@
             String result = encoding == null
                     ? baos.toString() : baos.toString(encoding);
 
-            StringResource.this.setValueFromOutputStream(result);
+            setValueFromOutputStream(result);
         }
+
+        private void setValueFromOutputStream(String output) {
+            String value;
+            if (getProject() != null) {
+                value = getProject().replaceProperties(output);
+            } else {
+                value = output;
+            }
+            setValue(value);
+        }
+
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/TarResource.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/TarResource.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/TarResource.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/TarResource.java	2018-03-24 12:37:12.000000000 +0000
@@ -74,13 +74,14 @@
      * @throws IOException if the tar file cannot be opened,
      *         or the entry cannot be read.
      */
+    @Override
     public InputStream getInputStream() throws IOException {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).getInputStream();
+            return getCheckedRef().getInputStream();
         }
         Resource archive = getArchive();
         final TarInputStream i = new TarInputStream(archive.getInputStream());
-        TarEntry te = null;
+        TarEntry te;
         while ((te = i.getNextEntry()) != null) {
             if (te.getName().equals(getName())) {
                 return i;
@@ -100,9 +101,10 @@
      * @throws UnsupportedOperationException if OutputStreams are not
      *         supported for this Resource type.
      */
+    @Override
     public OutputStream getOutputStream() throws IOException {
         if (isReference()) {
-            return ((Resource) getCheckedRef()).getOutputStream();
+            return getCheckedRef().getOutputStream();
         }
         throw new UnsupportedOperationException(
             "Use the tar task for tar output.");
@@ -113,7 +115,7 @@
      */
     public String getUserName() {
         if (isReference()) {
-            return ((TarResource) getCheckedRef()).getUserName();
+            return getCheckedRef().getUserName();
         }
         checkEntry();
         return userName;
@@ -124,7 +126,7 @@
      */
     public String getGroup() {
         if (isReference()) {
-            return ((TarResource) getCheckedRef()).getGroup();
+            return getCheckedRef().getGroup();
         }
         checkEntry();
         return groupName;
@@ -135,7 +137,7 @@
      */
     public int getUid() {
         if (isReference()) {
-            return ((TarResource) getCheckedRef()).getUid();
+            return getCheckedRef().getUid();
         }
         checkEntry();
         return uid;
@@ -146,7 +148,7 @@
      */
     public int getGid() {
         if (isReference()) {
-            return ((TarResource) getCheckedRef()).getGid();
+            return getCheckedRef().getGid();
         }
         checkEntry();
         return gid;
@@ -155,11 +157,10 @@
     /**
      * fetches information from the named entry inside the archive.
      */
+    @Override
     protected void fetchEntry() {
         Resource archive = getArchive();
-        TarInputStream i = null;
-        try {
-            i = new TarInputStream(archive.getInputStream());
+        try (TarInputStream i = new TarInputStream(archive.getInputStream())) {
             TarEntry te = null;
             while ((te = i.getNextEntry()) != null) {
                 if (te.getName().equals(getName())) {
@@ -170,12 +171,15 @@
         } catch (IOException e) {
             log(e.getMessage(), Project.MSG_DEBUG);
             throw new BuildException(e);
-        } finally {
-            FileUtils.close(i);
         }
         setEntry(null);
     }
 
+    @Override
+    protected TarResource getCheckedRef() {
+        return (TarResource) super.getCheckedRef();
+    }
+
     private void setEntry(TarEntry e) {
         if (e == null) {
             setExists(false);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/Tokens.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/Tokens.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/Tokens.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/Tokens.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,10 +19,11 @@
 
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.Stack;
 
 import org.apache.tools.ant.BuildException;
@@ -31,7 +32,6 @@
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
 import org.apache.tools.ant.util.ConcatResourceInputStream;
-import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.LineTokenizer;
 import org.apache.tools.ant.util.Tokenizer;
 
@@ -51,38 +51,31 @@
      */
     protected synchronized Collection<Resource> getCollection() {
         ResourceCollection rc = getResourceCollection();
-        if (rc.size() == 0) {
+        if (rc.isEmpty()) {
             return Collections.emptySet();
         }
         if (tokenizer == null) {
             tokenizer = new LineTokenizer();
         }
-        ConcatResourceInputStream cat = new ConcatResourceInputStream(rc);
-        cat.setManagingComponent(this);
-
-        InputStreamReader rdr = null;
-        try {
-            if (encoding == null) {
-                rdr = new InputStreamReader(cat);
-            } else {
-                try {
-                    rdr = new InputStreamReader(cat, encoding);
-                } catch (UnsupportedEncodingException e) {
-                    throw new BuildException(e);
-                }
-            }
-            ArrayList<Resource> result = new ArrayList<Resource>();
-            for (String s = tokenizer.getToken(rdr); s != null; s = tokenizer.getToken(rdr)) {
-                StringResource resource = new StringResource(s);
+        try (ConcatResourceInputStream cat = new ConcatResourceInputStream(rc);
+                InputStreamReader rdr = new InputStreamReader(cat,
+                    encoding == null ? Charset.defaultCharset()
+                        : Charset.forName(encoding))) {
+            cat.setManagingComponent(this);
+            List<Resource> result = new ArrayList<>();
+            for (String s = tokenizer.getToken(rdr); s != null; s =
+                tokenizer.getToken(rdr)) {
+                // do not send the Project to the constructor of StringResource, since
+                // the semantics of that constructor clearly state that property value
+                // replacement takes place on the passed string value. We don't want
+                // that to happen.
+                final StringResource resource = new StringResource(s);
                 resource.setProject(getProject());
                 result.add(resource);
             }
             return result;
         } catch (IOException e) {
             throw new BuildException("Error reading tokens", e);
-        } finally {
-            FileUtils.close(rdr);
-            FileUtils.close(cat);
         }
     }
 
@@ -117,6 +110,7 @@
      * @param p   the project to use to dereference the references.
      * @throws BuildException on error.
      */
+    @Override
     protected synchronized void dieOnCircularReference(Stack<Object> stk, Project p)
         throws BuildException {
         if (isChecked()) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/resources/Union.java ant-1.10.3/src/main/org/apache/tools/ant/types/resources/Union.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/resources/Union.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/resources/Union.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,12 +17,12 @@
  */
 package org.apache.tools.ant.types.resources;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.Resource;
@@ -84,8 +84,7 @@
         if (isReference()) {
             return getCheckedRef(Union.class, getDataTypeName()).list();
         }
-        final Collection<String> result = getAllToStrings();
-        return result.toArray(new String[result.size()]);
+        return streamResources().map(Object::toString).toArray(String[]::new);
     }
 
     /**
@@ -96,14 +95,14 @@
         if (isReference()) {
             return getCheckedRef(Union.class, getDataTypeName()).listResources();
         }
-        final Collection<Resource> result = getAllResources();
-        return result.toArray(new Resource[result.size()]);
+        return streamResources().toArray(Resource[]::new);
     }
 
     /**
      * Unify the contained Resources.
      * @return a Collection of Resources.
      */
+    @Override
     protected Collection<Resource> getCollection() {
         return getAllResources();
     }
@@ -118,7 +117,8 @@
     @Deprecated
     @SuppressWarnings("unchecked")
     protected <T> Collection<T> getCollection(boolean asString) { // TODO untypable
-        return asString ? (Collection<T>) getAllToStrings() : (Collection<T>) getAllResources();
+        return asString ? (Collection<T>) getAllToStrings()
+            : (Collection<T>) getAllResources();
     }
 
     /**
@@ -126,12 +126,8 @@
      * @return Collection&lt;String&gt;
      */
     protected Collection<String> getAllToStrings() {
-        final Set<Resource> allResources = getAllResources();
-        final ArrayList<String> result = new ArrayList<String>(allResources.size());
-        for (Resource r : allResources) {
-            result.add(r.toString());
-        }
-        return result;
+        return streamResources(Object::toString)
+            .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
     /**
@@ -139,19 +135,17 @@
      * @return Set&lt;Resource&gt;
      */
     protected Set<Resource> getAllResources() {
-        final List<ResourceCollection> resourceCollections = getResourceCollections();
-        if (resourceCollections.isEmpty()) {
-            return Collections.emptySet();
-        }
-        final LinkedHashSet<Resource> result = new LinkedHashSet<Resource>(
-                resourceCollections.size() * 2);
-        for (ResourceCollection resourceCollection : resourceCollections) {
-            for (Resource r : resourceCollection) {
-                result.add(r);
-            }
-        }
-        return result;
+        return streamResources()
+            .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
-}
+    private Stream<? extends Resource> streamResources() {
+        return streamResources(Function.identity());
+    }
 
+    private <T> Stream<? extends T> streamResources(
+        Function<? super Resource, ? extends T> mapper) {
+        return getResourceCollections().stream()
+            .flatMap(ResourceCollection::stream).map(mapper).distinct();
+    }
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,9 +18,13 @@
 
 package org.apache.tools.ant.types.selectors;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Enumeration;
+import java.util.List;
 import java.util.Stack;
 import java.util.Vector;
+import java.util.stream.Collectors;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -36,18 +40,20 @@
 public abstract class AbstractSelectorContainer extends DataType
     implements Cloneable, SelectorContainer {
 
-    private Vector<FileSelector> selectorsList = new Vector<FileSelector>();
+    private List<FileSelector> selectorsList =
+        Collections.synchronizedList(new ArrayList<>());
 
     /**
      * Indicates whether there are any selectors here.
      * @return true if there are selectors
      */
+    @Override
     public boolean hasSelectors() {
         if (isReference()) {
-            return ((AbstractSelectorContainer) getCheckedRef()).hasSelectors();
+            return getCheckedRef().hasSelectors();
         }
         dieOnCircularReference();
-        return !(selectorsList.isEmpty());
+        return !selectorsList.isEmpty();
     }
 
     /**
@@ -56,7 +62,7 @@
      */
     public int selectorCount() {
         if (isReference()) {
-            return ((AbstractSelectorContainer) getCheckedRef()).selectorCount();
+            return getCheckedRef().selectorCount();
         }
         dieOnCircularReference();
         return selectorsList.size();
@@ -69,13 +75,11 @@
      */
     public FileSelector[] getSelectors(Project p) {
         if (isReference()) {
-            return ((AbstractSelectorContainer) getCheckedRef(p))
-                .getSelectors(p);
+            return getCheckedRef(AbstractSelectorContainer.class,
+                getDataTypeName(), p).getSelectors(p);
         }
         dieOnCircularReference(p);
-        FileSelector[] result = new FileSelector[selectorsList.size()];
-        selectorsList.copyInto(result);
-        return result;
+        return selectorsList.toArray(new FileSelector[selectorsList.size()]);
     }
 
     /**
@@ -84,11 +88,10 @@
      */
     public Enumeration<FileSelector> selectorElements() {
         if (isReference()) {
-            return ((AbstractSelectorContainer) getCheckedRef())
-                .selectorElements();
+            return getCheckedRef().selectorElements();
         }
         dieOnCircularReference();
-        return selectorsList.elements();
+        return Collections.enumeration(selectorsList);
     }
 
     /**
@@ -99,18 +102,8 @@
      * @return comma separated list of Selectors contained in this one
      */
     public String toString() {
-        StringBuilder buf = new StringBuilder();
-        Enumeration<FileSelector> e = selectorElements();
-        if (e.hasMoreElements()) {
-            while (e.hasMoreElements()) {
-                buf.append(e.nextElement().toString());
-                if (e.hasMoreElements()) {
-                    buf.append(", ");
-                }
-            }
-        }
-
-        return buf.toString();
+        return selectorsList.stream().map(Object::toString)
+            .collect(Collectors.joining(", "));
     }
 
     /**
@@ -122,7 +115,7 @@
         if (isReference()) {
             throw noChildrenAllowed();
         }
-        selectorsList.addElement(selector);
+        selectorsList.add(selector);
         setChecked(false);
     }
 
@@ -144,16 +137,11 @@
      */
     public void validate() {
         if (isReference()) {
-            ((AbstractSelectorContainer) getCheckedRef()).validate();
+            getCheckedRef().validate();
         }
         dieOnCircularReference();
-        Enumeration<FileSelector> e = selectorElements();
-        while (e.hasMoreElements()) {
-            Object o = e.nextElement();
-            if (o instanceof BaseSelector) {
-                ((BaseSelector) o).validate();
-            }
-        }
+        selectorsList.stream().filter(BaseSelector.class::isInstance)
+            .map(BaseSelector.class::cast).forEach(BaseSelector::validate);
     }
 
 
@@ -313,6 +301,30 @@
     }
 
     /**
+     * @param e ExecutableSelector
+     * @since 1.10.0
+     */
+    public void addExecutable(ExecutableSelector e) {
+        appendSelector(e);
+    }
+
+    /**
+     * @param e SymlinkSelector
+     * @since 1.10.0
+     */
+    public void addSymlink(SymlinkSelector e) {
+        appendSelector(e);
+    }
+
+    /**
+     * @param o OwnedBySelector
+     * @since 1.10.0
+     */
+    public void addOwnedBy(OwnedBySelector o) {
+        appendSelector(o);
+    }
+
+    /**
      * add an arbitrary selector
      * @param selector the selector to add
      * @since Ant 1.6
@@ -344,10 +356,16 @@
         try {
             AbstractSelectorContainer sc =
                 (AbstractSelectorContainer) super.clone();
-            sc.selectorsList = new Vector<FileSelector>(selectorsList);
+            sc.selectorsList = new Vector<>(selectorsList);
             return sc;
         } catch (CloneNotSupportedException e) {
             throw new BuildException(e);
         }
     }
+
+    @Override
+    protected AbstractSelectorContainer getCheckedRef() {
+        return (AbstractSelectorContainer) super.getCheckedRef();
+    }
+
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/AndSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/AndSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/AndSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/AndSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,7 @@
 package org.apache.tools.ant.types.selectors;
 
 import java.io.File;
-import java.util.Enumeration;
+import java.util.stream.Stream;
 
 /**
  * This selector has a collection of other selectors, all of which have to
@@ -30,12 +30,6 @@
 public class AndSelector extends BaseSelectorContainer {
 
     /**
-     * Default constructor.
-     */
-    public AndSelector() {
-    }
-
-    /**
      * @return a string representation of the selector
      */
     public String toString() {
@@ -60,14 +54,8 @@
      */
     public boolean isSelected(File basedir, String filename, File file) {
         validate();
-        Enumeration<FileSelector> e = selectorElements();
-
-        while (e.hasMoreElements()) {
-            if (!e.nextElement().isSelected(basedir, filename, file)) {
-                return false;
-            }
-        }
-        return true;
+        return Stream.of(getSelectors(getProject()))
+            .allMatch(s -> s.isSelected(basedir, filename, file));
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/BaseExtendSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/BaseExtendSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/BaseExtendSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/BaseExtendSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -30,9 +30,8 @@
  *
  * @since 1.5
  */
-public abstract class BaseExtendSelector
-        extends BaseSelector
-        implements ExtendFileSelector {
+public abstract class BaseExtendSelector extends BaseSelector
+    implements ExtendFileSelector {
 
     // CheckStyle:VisibilityModifier OFF - bc
 
@@ -42,18 +41,13 @@
     // CheckStyle:VisibilityModifier ON
 
     /**
-     * Default constructor.
-     */
-    public BaseExtendSelector() {
-    }
-
-    /**
      * Set all the Parameters for this custom selector, collected by
      * the ExtendSelector class.
      *
      * @param parameters the complete set of parameters for this selector
      */
-    public void setParameters(Parameter[] parameters) {
+    @Override
+    public void setParameters(Parameter... parameters) {
         this.parameters = parameters;
     }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/BaseSelectorContainer.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,9 +19,12 @@
 package org.apache.tools.ant.types.selectors;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Enumeration;
+import java.util.List;
 import java.util.Stack;
-import java.util.Vector;
+import java.util.stream.Collectors;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -36,13 +39,7 @@
 public abstract class BaseSelectorContainer extends BaseSelector
         implements SelectorContainer {
 
-    private Vector<FileSelector> selectorsList = new Vector<FileSelector>();
-
-    /**
-     * Default constructor.
-     */
-    public BaseSelectorContainer() {
-    }
+    private List<FileSelector> selectorsList = Collections.synchronizedList(new ArrayList<>());
 
     /**
      * Indicates whether there are any selectors here.
@@ -50,7 +47,7 @@
      */
     public boolean hasSelectors() {
         dieOnCircularReference();
-        return !(selectorsList.isEmpty());
+        return !selectorsList.isEmpty();
     }
 
     /**
@@ -69,9 +66,7 @@
      */
     public FileSelector[] getSelectors(Project p) {
         dieOnCircularReference();
-        FileSelector[] result = new FileSelector[selectorsList.size()];
-        selectorsList.copyInto(result);
-        return result;
+        return selectorsList.toArray(new FileSelector[selectorsList.size()]);
     }
 
     /**
@@ -80,7 +75,7 @@
      */
     public Enumeration<FileSelector> selectorElements() {
         dieOnCircularReference();
-        return selectorsList.elements();
+        return Collections.enumeration(selectorsList);
     }
 
     /**
@@ -92,15 +87,8 @@
      */
     public String toString() {
         dieOnCircularReference();
-        StringBuilder buf = new StringBuilder();
-        Enumeration<FileSelector> e = selectorElements();
-        while (e.hasMoreElements()) {
-            buf.append(e.nextElement().toString());
-            if (e.hasMoreElements()) {
-                buf.append(", ");
-            }
-        }
-        return buf.toString();
+        return selectorsList.stream().map(Object::toString)
+            .collect(Collectors.joining(", "));
     }
 
     /**
@@ -109,7 +97,7 @@
      * @param selector the new selector to add
      */
     public void appendSelector(FileSelector selector) {
-        selectorsList.addElement(selector);
+        selectorsList.add(selector);
         setChecked(false);
     }
 
@@ -136,16 +124,10 @@
         if (errmsg != null) {
             throw new BuildException(errmsg);
         }
-        Enumeration<FileSelector> e = selectorElements();
-        while (e.hasMoreElements()) {
-            Object o = e.nextElement();
-            if (o instanceof BaseSelector) {
-                ((BaseSelector) o).validate();
-            }
-        }
+        selectorsList.stream().filter(BaseSelector.class::isInstance)
+            .map(BaseSelector.class::cast).forEach(BaseSelector::validate);
     }
 
-
     /**
      * Method that each selector will implement to create their selection
      * behaviour. This is what makes SelectorContainer abstract.
@@ -157,8 +139,7 @@
      * @return whether the file should be selected or not
      */
     public abstract boolean isSelected(File basedir, String filename,
-                                       File file);
-
+        File file);
 
     /* Methods below all add specific selectors */
 
@@ -316,6 +297,30 @@
     }
 
     /**
+     * @param e ExecutableSelector
+     * @since 1.10.0
+     */
+    public void addExecutable(ExecutableSelector e) {
+        appendSelector(e);
+    }
+
+    /**
+     * @param e SymlinkSelector
+     * @since 1.10.0
+     */
+    public void addSymlink(SymlinkSelector e) {
+        appendSelector(e);
+    }
+
+    /**
+     * @param o OwnedBySelector
+     * @since 1.10.0
+     */
+    public void addOwnedBy(OwnedBySelector o) {
+        appendSelector(o);
+    }
+
+    /**
      * add an arbitrary selector
      * @param selector the selector to add
      * @since Ant 1.6
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/BaseSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -37,12 +37,6 @@
     private Throwable cause;
 
     /**
-     * Do nothing constructor.
-     */
-    public BaseSelector() {
-    }
-
-    /**
      * Allows all selectors to indicate a setup error. Note that only
      * the first error message is recorded.
      *
@@ -77,7 +71,6 @@
         return errmsg;
     }
 
-
     /**
      * <p>Subclasses can override this method to provide checking of their
      * state. So long as they call validate() from isSelected(), this will
@@ -87,11 +80,10 @@
      */
     public void verifySettings() {
         if (isReference()) {
-            ((BaseSelector) getCheckedRef()).verifySettings();
+            getCheckedRef().verifySettings();
         }
     }
 
-
     /**
      * Subclasses can use this to throw the requisite exception
      * in isSelected() in the case of an error condition.
@@ -122,6 +114,10 @@
     public abstract boolean isSelected(File basedir, String filename,
                                        File file);
 
+    @Override
+    protected BaseSelector getCheckedRef() {
+        return (BaseSelector) super.getCheckedRef();
+    }
 }
 
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -41,12 +41,6 @@
 public class ContainsRegexpSelector extends BaseExtendSelector
         implements ResourceSelector {
 
-    private String userProvidedExpression = null;
-    private RegularExpression myRegExp = null;
-    private Regexp myExpression = null;
-    private boolean caseSensitive = true;
-    private boolean multiLine = false;
-    private boolean singleLine = false;
     /** Key to used for parameterized custom selector */
     public static final String EXPRESSION_KEY = "expression";
     /** Parameter name for the casesensitive attribute. */
@@ -56,21 +50,19 @@
     /** Parameter name for the singleline attribute. */
     private static final String SL_KEY = "singleline";
 
-    /**
-     * Creates a new <code>ContainsRegexpSelector</code> instance.
-     */
-    public ContainsRegexpSelector() {
-    }
+    private String userProvidedExpression = null;
+    private RegularExpression myRegExp = null;
+    private Regexp myExpression = null;
+    private boolean caseSensitive = true;
+    private boolean multiLine = false;
+    private boolean singleLine = false;
 
     /**
      * @return a string describing this object
      */
     public String toString() {
-        StringBuilder buf = new StringBuilder(
-                "{containsregexpselector expression: ");
-        buf.append(userProvidedExpression);
-        buf.append("}");
-        return buf.toString();
+        return String.format("{containsregexpselector expression: %s}",
+            userProvidedExpression);
     }
 
     /**
@@ -116,7 +108,7 @@
      *
      * @param parameters the complete set of parameters for this selector
      */
-    public void setParameters(Parameter[] parameters) {
+    public void setParameters(Parameter... parameters) {
         super.setParameters(parameters);
         if (parameters != null) {
             for (int i = 0; i < parameters.length; i++) {
@@ -166,11 +158,7 @@
      * @return whether the Resource is selected or not
      */
     public boolean isSelected(Resource r) {
-        String teststr = null;
-        BufferedReader in = null;
-
         // throw BuildException on error
-
         validate();
 
         if (r.isDirectory()) {
@@ -183,40 +171,25 @@
             myExpression = myRegExp.getRegexp(getProject());
         }
 
-        try {
-            in = new BufferedReader(new InputStreamReader(r.getInputStream())); //NOSONAR
-        } catch (Exception e) {
-            throw new BuildException("Could not get InputStream from "
-                    + r.toLongString(), e);
-        }
-        boolean success = false;
-        try {
-            teststr = in.readLine();
-
-            while (teststr != null) {
-
-                if (myExpression.matches(teststr,
-                                         RegexpUtil.asOptions(caseSensitive,
-                                                              multiLine,
-                                                              singleLine))) {
-                    return true;
-                }
-                teststr = in.readLine();
-            }
-            success = true;
-            return false;
-        } catch (IOException ioe) {
-            throw new BuildException("Could not read " + r.toLongString());
-        } finally {
+        try (BufferedReader in =
+            new BufferedReader(new InputStreamReader(r.getInputStream()))) {
             try {
-                in.close();
-            } catch (Exception e) {
-                if (success) {
-                    throw new BuildException("Could not close " //NOSONAR
-                                             + r.toLongString());
+                String teststr = in.readLine();
+
+                while (teststr != null) {
+                    if (myExpression.matches(teststr, RegexpUtil
+                        .asOptions(caseSensitive, multiLine, singleLine))) {
+                        return true;
+                    }
+                    teststr = in.readLine();
                 }
+                return false;
+            } catch (IOException ioe) {
+                throw new BuildException("Could not read " + r.toLongString());
             }
+        } catch (IOException e) {
+            throw new BuildException(
+                "Could not get InputStream from " + r.toLongString(), e);
         }
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/ContainsSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -22,6 +22,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.Charset;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -29,7 +30,6 @@
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.resources.FileResource;
 import org.apache.tools.ant.types.resources.selectors.ResourceSelector;
-import org.apache.tools.ant.util.FileUtils;
 
 /**
  * Selector that filters files/resources based on whether they contain a
@@ -39,10 +39,6 @@
  */
 public class ContainsSelector extends BaseExtendSelector implements ResourceSelector {
 
-    private String contains = null;
-    private boolean casesensitive = true;
-    private boolean ignorewhitespace = false;
-    private String encoding = null;
     /** Key to used for parameterized custom selector */
     public static final String EXPRESSION_KEY = "expression";
     /** Used for parameterized custom selector */
@@ -52,13 +48,10 @@
     /** Used for parameterized custom selector */
     public static final String WHITESPACE_KEY = "ignorewhitespace";
 
-
-    /**
-     * Creates a new <code>ContainsSelector</code> instance.
-     *
-     */
-    public ContainsSelector() {
-    }
+    private String contains = null;
+    private boolean casesensitive = true;
+    private boolean ignorewhitespace = false;
+    private String encoding = null;
 
     /**
      * @return a string describing this object
@@ -66,10 +59,8 @@
     public String toString() {
         StringBuilder buf = new StringBuilder("{containsselector text: ");
         buf.append('"').append(contains).append('"');
-        buf.append(" casesensitive: ");
-        buf.append(casesensitive ? "true" : "false");
-        buf.append(" ignorewhitespace: ");
-        buf.append(ignorewhitespace ? "true" : "false");
+        buf.append(" casesensitive: ").append(casesensitive);
+        buf.append(" ignorewhitespace: ").append(ignorewhitespace);
         buf.append("}");
         return buf.toString();
     }
@@ -117,7 +108,7 @@
      *
      * @param parameters the complete set of parameters for this selector
      */
-    public void setParameters(Parameter[] parameters) {
+    public void setParameters(Parameter... parameters) {
         super.setParameters(parameters);
         if (parameters != null) {
             for (int i = 0; i < parameters.length; i++) {
@@ -169,11 +160,10 @@
      * @return whether the Resource is selected.
      */
     public boolean isSelected(Resource r) {
-
         // throw BuildException on error
         validate();
 
-        if (r.isDirectory() || contains.length() == 0) {
+        if (r.isDirectory() || contains.isEmpty()) {
             return true;
         }
 
@@ -184,38 +174,30 @@
         if (ignorewhitespace) {
             userstr = SelectorUtils.removeWhitespace(userstr);
         }
-        BufferedReader in = null;
-        try {
-            if (encoding != null) {
-                in = new BufferedReader(new InputStreamReader(r.getInputStream(), encoding)); //NOSONAR
-            }   else {
-                in = new BufferedReader(new InputStreamReader(r.getInputStream())); //NOSONAR
-            }
-        } catch (Exception e) {
-            throw new BuildException("Could not get InputStream from "
-                    + r.toLongString(), e);
-        }
-        try {
-            String teststr = in.readLine();
-            while (teststr != null) {
-                if (!casesensitive) {
-                    teststr = teststr.toLowerCase();
+        try (BufferedReader in = new BufferedReader(
+            new InputStreamReader(r.getInputStream(), encoding == null
+                ? Charset.defaultCharset() : Charset.forName(encoding)))) {
+            try {
+                String teststr = in.readLine();
+                while (teststr != null) {
+                    if (!casesensitive) {
+                        teststr = teststr.toLowerCase();
+                    }
+                    if (ignorewhitespace) {
+                        teststr = SelectorUtils.removeWhitespace(teststr);
+                    }
+                    if (teststr.indexOf(userstr) > -1) {
+                        return true;
+                    }
+                    teststr = in.readLine();
                 }
-                if (ignorewhitespace) {
-                    teststr = SelectorUtils.removeWhitespace(teststr);
-                }
-                if (teststr.indexOf(userstr) > -1) {
-                    return true;
-                }
-                teststr = in.readLine();
+                return false;
+            } catch (IOException ioe) {
+                throw new BuildException("Could not read " + r.toLongString());
             }
-            return false;
-        } catch (IOException ioe) {
-            throw new BuildException("Could not read " + r.toLongString());
-        } finally {
-            FileUtils.close(in);
+        } catch (IOException e) {
+            throw new BuildException(
+                "Could not get InputStream from " + r.toLongString(), e);
         }
     }
-
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/DateSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/DateSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/DateSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/DateSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -36,16 +36,6 @@
  */
 public class DateSelector extends BaseExtendSelector {
 
-    /** Utilities used for file operations */
-    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
-
-    private long millis = -1;
-    private String dateTime = null;
-    private boolean includeDirs = false;
-    private long granularity = 0;
-    private String pattern;
-    private TimeComparison when = TimeComparison.EQUAL;
-
     /** Key to used for parameterized custom selector */
     public static final String MILLIS_KEY = "millis";
     /** Key to used for parameterized custom selector */
@@ -59,13 +49,15 @@
     /** Key to used for parameterized custom selector */
     public static final String PATTERN_KEY = "pattern";
 
-    /**
-     * Creates a new <code>DateSelector</code> instance.
-     *
-     */
-    public DateSelector() {
-        granularity = FILE_UTILS.getFileTimestampGranularity();
-    }
+    /** Utilities used for file operations */
+    private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
+
+    private long millis = -1;
+    private String dateTime = null;
+    private boolean includeDirs = false;
+    private long granularity = FILE_UTILS.getFileTimestampGranularity();
+    private String pattern;
+    private TimeComparison when = TimeComparison.EQUAL;
 
     /**
      * @return a string describing this object
@@ -74,8 +66,7 @@
         StringBuilder buf = new StringBuilder("{dateselector date: ");
         buf.append(dateTime);
         buf.append(" compare: ").append(when.getValue());
-        buf.append(" granularity: ");
-        buf.append(granularity);
+        buf.append(" granularity: ").append(granularity);
         if (pattern != null) {
             buf.append(" pattern: ").append(pattern);
         }
@@ -166,7 +157,7 @@
      *
      * @param parameters the complete set of parameters for this selector.
      */
-    public void setParameters(Parameter[] parameters) {
+    public void setParameters(Parameter... parameters) {
         super.setParameters(parameters);
         if (parameters != null) {
             for (int i = 0; i < parameters.length; i++) {
@@ -239,9 +230,7 @@
      * @return whether the file is selected.
      */
     public boolean isSelected(File basedir, String filename, File file) {
-
         validate();
-
         return (file.isDirectory() && !includeDirs)
             || when.evaluate(file.lastModified(), millis, granularity);
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/DependSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/DependSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/DependSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/DependSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -31,14 +31,6 @@
 public class DependSelector extends MappingSelector {
 
     /**
-     * Creates a new <code>DependSelector</code> instance.
-     *
-     */
-    public DependSelector() {
-
-    }
-
-    /**
      * @return a string describing this object
      */
     public String toString() {
@@ -48,8 +40,7 @@
         } else {
             buf.append(targetdir.getName());
         }
-        buf.append(" granularity: ");
-        buf.append(granularity);
+        buf.append(" granularity: ").append(granularity);
         if (map != null) {
             buf.append(" mapper: ");
             buf.append(map.toString());
@@ -61,7 +52,6 @@
         return buf.toString();
     }
 
-
     /**
      * this test is our selection test that compared the file with the destfile
      * @param srcfile the source file
@@ -69,9 +59,7 @@
      * @return true if destination is out of date
      */
     public boolean selectionTest(File srcfile, File destfile) {
-        boolean selected = SelectorUtils.isOutOfDate(srcfile, destfile,
-                granularity);
-        return selected;
+        return SelectorUtils.isOutOfDate(srcfile, destfile, granularity);
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/DepthSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -32,6 +32,11 @@
  */
 public class DepthSelector extends BaseExtendSelector {
 
+    /** Used for parameterized custom selector */
+    public static final String MIN_KEY = "min";
+    /** Used for parameterized custom selector */
+    public static final String MAX_KEY = "max";
+
     // CheckStyle:VisibilityModifier OFF - bc
 
     /** min attribute */
@@ -41,26 +46,13 @@
 
     // CheckStyle:VisibilityModifier ON
 
-    /** Used for parameterized custom selector */
-    public static final String MIN_KEY = "min";
-    /** Used for parameterized custom selector */
-    public static final String MAX_KEY = "max";
-
-    /**
-     * Creates a new <code>DepthSelector</code> instance.
-     *
-     */
-    public DepthSelector() {
-    }
-
     /**
      * @return a string describing this object
      */
     public String toString() {
-        StringBuilder buf = new StringBuilder("{depthselector min: ");
-        buf.append(min);
-        buf.append(" max: ");
-        buf.append(max);
+        StringBuilder buf = new StringBuilder("{depthselector");
+        buf.append(" min: ").append(min);
+        buf.append(" max: ").append(max);
         buf.append("}");
         return buf.toString();
     }
@@ -89,7 +81,7 @@
      *
      * @param parameters the complete set of parameters for this selector
      */
-    public void setParameters(Parameter[] parameters) {
+    public void setParameters(Parameter... parameters) {
         super.setParameters(parameters);
         if (parameters != null) {
             for (int i = 0; i < parameters.length; i++) {
@@ -121,8 +113,7 @@
      */
     public void verifySettings() {
         if (min < 0 && max < 0) {
-            setError("You must set at least one of the min or the "
-                    + "max levels.");
+            setError("You must set at least one of the min or the max levels.");
         }
         if (max < min && max > -1) {
             setError("The maximum depth is lower than the minimum.");
@@ -150,19 +141,17 @@
         // If you felt daring, you could cache the basedir absolute path
         String absBase = basedir.getAbsolutePath();
         String absFile = file.getAbsolutePath();
-        StringTokenizer tokBase = new StringTokenizer(absBase,
-                File.separator);
-        StringTokenizer tokFile = new StringTokenizer(absFile,
-                File.separator);
+        StringTokenizer tokBase = new StringTokenizer(absBase, File.separator);
+        StringTokenizer tokFile = new StringTokenizer(absFile, File.separator);
         while (tokFile.hasMoreTokens()) {
             String filetoken = tokFile.nextToken();
             if (tokBase.hasMoreTokens()) {
                 String basetoken = tokBase.nextToken();
                 // Sanity check. Ditch it if you want faster performance
                 if (!basetoken.equals(filetoken)) {
-                    throw new BuildException("File " + filename
-                            + " does not appear within " + absBase
-                            + "directory");
+                    throw new BuildException(
+                        "File %s does not appear within %s directory", filename,
+                        absBase);
                 }
             } else {
                 depth += 1;
@@ -172,14 +161,12 @@
             }
         }
         if (tokBase.hasMoreTokens()) {
-            throw new BuildException("File " + filename
-                + " is outside of " + absBase + "directory tree");
+            throw new BuildException("File %s is outside of %s directory tree",
+                filename, absBase);
         }
         if (min > -1 && depth < min) {
             return false;
         }
         return true;
     }
-
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -55,7 +55,6 @@
     private boolean ignoreFileTimes = true;
     private boolean ignoreContents = false;
 
-
     /**
      * This flag tells the selector to ignore file times in the comparison
      * @param ignoreFileTimes if true ignore file times
@@ -63,6 +62,7 @@
     public void setIgnoreFileTimes(boolean ignoreFileTimes) {
         this.ignoreFileTimes = ignoreFileTimes;
     }
+
     /**
      * This flag tells the selector to ignore contents
      * @param ignoreContents if true ignore contents
@@ -71,6 +71,7 @@
     public void setIgnoreContents(boolean ignoreContents) {
         this.ignoreContents = ignoreContents;
     }
+
     /**
      * this test is our selection test that compared the file with the destfile
      * @param srcfile the source file
@@ -100,16 +101,15 @@
                 return true;
             }
         }
-        if (!ignoreContents) {
-            //here do a bulk comparison
-            try {
-                return !FILE_UTILS.contentEquals(srcfile, destfile);
-            } catch (IOException e) {
-                throw new BuildException("while comparing " + srcfile + " and "
-                        + destfile, e);
-            }
-        } else {
+        if (ignoreContents) {
             return false;
         }
+        //here do a bulk comparison
+        try {
+            return !FILE_UTILS.contentEquals(srcfile, destfile);
+        } catch (IOException e) {
+            throw new BuildException(
+                "while comparing " + srcfile + " and " + destfile, e);
+        }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/ExecutableSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/ExecutableSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/ExecutableSelector.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/ExecutableSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package org.apache.tools.ant.types.selectors;
+
+import java.io.File;
+import java.nio.file.Files;
+
+/**
+ * A selector that selects executable files.
+ *
+ * <p>Executable is defined in terms of {@link
+ * java.nio.file.Files#isExecutable}, this means the selector will
+ * accept any file that exists and is executable by the
+ * application.</p>
+ *
+ * @since Ant 1.10.0
+ */
+public class ExecutableSelector implements FileSelector {
+
+    public boolean isSelected(File basedir, String filename, File file) {
+        return file != null && Files.isExecutable(file.toPath());
+    }
+
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/ExtendSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,9 @@
 package org.apache.tools.ant.types.selectors;
 
 import java.io.File;
-import java.util.Vector;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
@@ -37,16 +39,11 @@
 
     private String classname = null;
     private FileSelector dynselector = null;
-    private Vector<Parameter> paramVec = new Vector<Parameter>();
+    private List<Parameter> parameters =
+        Collections.synchronizedList(new ArrayList<>());
     private Path classpath = null;
 
     /**
-     * Default constructor.
-     */
-    public ExtendSelector() {
-    }
-
-    /**
      * Sets the classname of the custom selector.
      *
      * @param classname is the class which implements this selector
@@ -61,7 +58,7 @@
     public void selectorCreate() {
         if (classname != null && classname.length() > 0) {
             try {
-                Class<?> c = null;
+                Class<?> c;
                 if (classpath == null) {
                     c = Class.forName(classname);
                 } else {
@@ -96,10 +93,9 @@
      * @param p The new Parameter object
      */
     public void addParam(Parameter p) {
-        paramVec.addElement(p);
+        parameters.add(p);
     }
 
-
     /**
      * Set the classpath to load the classname specified using an attribute.
      * @param classpath the classpath to use
@@ -166,13 +162,12 @@
         } else if (dynselector == null) {
             setError("Internal Error: The custom selector was not created");
         } else if (!(dynselector instanceof ExtendFileSelector)
-                    && (paramVec.size() > 0)) {
-            setError("Cannot set parameters on custom selector that does not "
-                    + "implement ExtendFileSelector");
+                    && !parameters.isEmpty()) {
+            setError(
+                "Cannot set parameters on custom selector that does not implement ExtendFileSelector");
         }
     }
 
-
     /**
      * Allows the custom selector to choose whether to select a file. This
      * is also where the Parameters are passed to the custom selector,
@@ -188,14 +183,12 @@
     public boolean isSelected(File basedir, String filename, File file)
             throws BuildException {
         validate();
-        if (paramVec.size() > 0 && dynselector instanceof ExtendFileSelector) {
-            Parameter[] paramArray = new Parameter[paramVec.size()];
-            paramVec.copyInto(paramArray);
+        if (!parameters.isEmpty() && dynselector instanceof ExtendFileSelector) {
             // We know that dynselector must be non-null if no error message
-            ((ExtendFileSelector) dynselector).setParameters(paramArray);
+            ((ExtendFileSelector) dynselector).setParameters(
+                parameters.toArray(new Parameter[parameters.size()]));
         }
         return dynselector.isSelected(basedir, filename, file);
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/FilenameSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -32,12 +32,6 @@
  * @since 1.5
  */
 public class FilenameSelector extends BaseExtendSelector {
-
-    private String pattern = null;
-    private String regex = null;
-    private boolean casesensitive = true;
-
-    private boolean negated = false;
     /** Used for parameterized custom selector */
     public static final String NAME_KEY = "name";
     /** Used for parameterized custom selector */
@@ -47,18 +41,17 @@
     /** Used for parameterized custom selector */
     public static final String REGEX_KEY = "regex";
 
+    private String pattern = null;
+    private String regex = null;
+    private boolean casesensitive = true;
+
+    private boolean negated = false;
+
     // caches for performance reasons
     private RegularExpression reg;
     private Regexp expression;
 
     /**
-     * Creates a new <code>FilenameSelector</code> instance.
-     *
-     */
-    public FilenameSelector() {
-    }
-
-    /**
      * @return a string describing this object
      */
     public String toString() {
@@ -129,7 +122,7 @@
      *
      * @param parameters the complete set of parameters for this selector
      */
-    public void setParameters(Parameter[] parameters) {
+    public void setParameters(Parameter... parameters) {
         super.setParameters(parameters);
         if (parameters != null) {
             for (int i = 0; i < parameters.length; i++) {
@@ -178,18 +171,16 @@
     public boolean isSelected(File basedir, String filename, File file) {
         validate();
         if (pattern != null) {
-            return (SelectorUtils.matchPath(pattern, filename,
-                                            casesensitive) == !(negated));
-        } else {
-            if (reg == null) {
-                reg = new RegularExpression();
-                reg.setPattern(regex);
-                expression = reg.getRegexp(getProject());
-            }
-            int options = RegexpUtil.asOptions(casesensitive);
-            return expression.matches(filename, options) == !negated;
+            return SelectorUtils.matchPath(pattern, filename,
+                casesensitive) == !(negated);
         }
+        if (reg == null) {
+            reg = new RegularExpression();
+            reg.setPattern(regex);
+            expression = reg.getRegexp(getProject());
+        }
+        int options = RegexpUtil.asOptions(casesensitive);
+        return expression.matches(filename, options) == !negated;
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/FileSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/FileSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/FileSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/FileSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,13 +21,16 @@
 import java.io.File;
 
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Resource;
+import org.apache.tools.ant.types.resources.FileProvider;
+import org.apache.tools.ant.types.resources.selectors.ResourceSelector;
 
 /**
  * This is the interface to be used by all selectors.
  *
  * @since 1.5
  */
-public interface FileSelector {
+public interface FileSelector extends ResourceSelector {
 
     /**
      * Method that each selector will implement to create their
@@ -44,5 +47,15 @@
     boolean isSelected(File basedir, String filename, File file)
             throws BuildException;
 
+    /**
+     * Implement a basic {@link Resource} selection that delegates to this
+     * {@link FileSelector}.
+     * @param r resource
+     * @return whether the resource is selected
+     */
+    default boolean isSelected(Resource r) {
+        return r.asOptional(FileProvider.class).map(FileProvider::getFile)
+                .map(f -> isSelected(null, null, f)).orElse(false);
+    }
 }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/MajoritySelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/MajoritySelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/MajoritySelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/MajoritySelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -37,12 +37,6 @@
     private boolean allowtie = true;
 
     /**
-     * Default constructor.
-     */
-    public MajoritySelector() {
-    }
-
-    /**
      * @return a string describing this object
      */
     public String toString() {
@@ -93,7 +87,8 @@
         }
         if (yesvotes > novotes) {
             return true;
-        } else if (novotes > yesvotes) {
+        }
+        if (novotes > yesvotes) {
             return false;
         }
         // At this point, we know we have a tie.
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -40,20 +40,11 @@
     protected File targetdir = null;
     protected Mapper mapperElement = null;
     protected FileNameMapper map = null;
-    protected int granularity = 0;
+    protected int granularity = (int) FILE_UTILS.getFileTimestampGranularity();
 
     // CheckStyle:VisibilityModifier ON
 
     /**
-     * Creates a new <code>MappingSelector</code> instance.
-     *
-     */
-    public MappingSelector() {
-        granularity = (int) FILE_UTILS.getFileTimestampGranularity();
-    }
-
-
-    /**
      * The name of the file or directory which is checked for out-of-date
      * files.
      *
@@ -140,8 +131,7 @@
         String destname = destfiles[0];
         File destfile = FILE_UTILS.resolveFile(targetdir, destname);
 
-        boolean selected = selectionTest(file, destfile);
-        return selected;
+        return selectionTest(file, destfile);
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,7 +20,7 @@
 
 import java.io.BufferedInputStream;
 import java.io.File;
-import java.io.FileInputStream;
+import java.nio.file.Files;
 import java.security.NoSuchAlgorithmException;
 import java.util.Locale;
 import java.util.zip.Adler32;
@@ -105,6 +105,7 @@
      * This algorithm supports only CRC and Adler.
      * @return <i>true</i> if all is ok, otherwise <i>false</i>.
      */
+    @Override
     public boolean isValid() {
         return "CRC".equals(algorithm) || "ADLER".equals(algorithm);
     }
@@ -115,26 +116,22 @@
      * @param file    File object for which the value should be evaluated.
      * @return        The value for that file
      */
+    @Override
     public String getValue(File file) {
         initChecksum();
-        String rval = null;
 
-        try {
-            if (file.canRead()) {
-                 checksum.reset();
-                 FileInputStream fis = new FileInputStream(file);
-                 CheckedInputStream check = new CheckedInputStream(fis, checksum);
-                 BufferedInputStream in = new BufferedInputStream(check);
-                 while (in.read() != -1) {
-                     // Read the file
-                 }
-                 rval = Long.toString(check.getChecksum().getValue());
-                 in.close();
+        if (file.canRead()) {
+            checksum.reset();
+            try (CheckedInputStream check = new CheckedInputStream(
+                new BufferedInputStream(Files.newInputStream(file.toPath())), checksum)) {
+                // Read the file
+                while (check.read() != -1) {
+                }
+                return Long.toString(check.getChecksum().getValue());
+            } catch (Exception ignored) {
             }
-        } catch (Exception e) {
-            rval = null;
         }
-        return rval;
+        return null;
     }
 
 
@@ -142,11 +139,8 @@
      * Override Object.toString().
      * @return some information about this algorithm.
      */
+    @Override
     public String toString() {
-        StringBuilder buf = new StringBuilder();
-        buf.append("<ChecksumAlgorithm:");
-        buf.append("algorithm=").append(algorithm);
-        buf.append(">");
-        return buf.toString();
+        return String.format("<ChecksumAlgorithm:algorithm=%s>", algorithm);
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,7 +20,7 @@
 
 
 import java.io.File;
-import java.io.FileInputStream;
+import java.nio.file.Files;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -119,10 +119,8 @@
         if ((provider != null) && !"".equals(provider) && !"null".equals(provider)) {
             try {
                 messageDigest = MessageDigest.getInstance(algorithm, provider);
-            } catch (NoSuchAlgorithmException noalgo) {
-                throw new BuildException(noalgo);
-            } catch (NoSuchProviderException noprovider) {
-                throw new BuildException(noprovider);
+            } catch (NoSuchAlgorithmException | NoSuchProviderException e) {
+                throw new BuildException(e);
             }
         } else {
             try {
@@ -141,69 +139,55 @@
      * This algorithm supports only MD5 and SHA.
      * @return <i>true</i> if all is ok, otherwise <i>false</i>.
      */
+    @Override
     public boolean isValid() {
         return "SHA".equals(algorithm) || "MD5".equals(algorithm);
     }
 
-
     /**
      * Computes a value for a file content with the specified digest algorithm.
      * @param file    File object for which the value should be evaluated.
      * @return        The value for that file
      */
     // implementation adapted from ...taskdefs.Checksum, thanks to Magesh for hint
+    @Override
     public String getValue(File file) {
         initMessageDigest();
-        String checksum = null;
         try {
-            if (!file.canRead()) {
-                return null;
-            }
-            FileInputStream fis = null;
-
-            byte[] buf = new byte[readBufferSize];
-            try {
+            if (file.canRead()) {
+                byte[] buf = new byte[readBufferSize];
                 messageDigest.reset();
-                fis = new FileInputStream(file);
-                DigestInputStream dis = new DigestInputStream(fis,
-                                                              messageDigest);
-                while (dis.read(buf, 0, readBufferSize) != -1) {
-                    // do nothing
-                }
-                dis.close();
-                fis.close();
-                fis = null;
-                byte[] fileDigest = messageDigest.digest();
-                StringBuffer checksumSb = new StringBuffer();
-                for (int i = 0; i < fileDigest.length; i++) {
-                    String hexStr
-                        = Integer.toHexString(BYTE_MASK & fileDigest[i]);
-                    if (hexStr.length() < 2) {
-                        checksumSb.append("0");
+                try (DigestInputStream dis = new DigestInputStream(
+                    Files.newInputStream(file.toPath()), messageDigest)) {
+                    // read the whole stream
+                    while (dis.read(buf, 0, readBufferSize) != -1) {
                     }
-                    checksumSb.append(hexStr);
+                    byte[] fileDigest = messageDigest.digest();
+                    StringBuilder checksumSb = new StringBuilder();
+                    for (int i = 0; i < fileDigest.length; i++) {
+                        String hexStr =
+                            Integer.toHexString(BYTE_MASK & fileDigest[i]);
+                        if (hexStr.length() < 2) {
+                            checksumSb.append('0');
+                        }
+                        checksumSb.append(hexStr);
+                    }
+                    return checksumSb.toString();
+                } catch (Exception ignored) {
                 }
-                checksum = checksumSb.toString();
-            } catch (Exception e) {
-                return null;
             }
-        } catch (Exception e) {
-            return null;
+        } catch (Exception ignored) {
         }
-        return checksum;
+        return null;
     }
 
-
     /**
      * Override Object.toString().
      * @return some information about this algorithm.
      */
+    @Override
     public String toString() {
-        StringBuilder buf = new StringBuilder();
-        buf.append("<DigestAlgorithm:");
-        buf.append("algorithm=").append(algorithm);
-        buf.append(";provider=").append(provider);
-        buf.append(">");
-        return buf.toString();
+        return String.format("<DigestAlgorithm:algorithm=%s;provider=%s>",
+            algorithm, provider);
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,9 +21,10 @@
 
 // Java
 import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
-import java.util.Iterator;
-import java.util.Vector;
+import java.util.List;
 
 import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.BuildException;
@@ -114,7 +115,7 @@
  * comparison.</p>
  *
  * <p>A useful scenario for this selector is inside a build environment
- * for homepage generation (e.g. with <a href="http://forrest.apache.org/">
+ * for homepage generation (e.g. with <a href="https://forrest.apache.org/">
  * Apache Forrest</a>).</p><pre>
  * &lt;target name="generate-and-upload-site"&gt;
  *     &lt;echo&gt; generate the site using forrest &lt;/echo&gt;
@@ -209,7 +210,8 @@
      * Parameter vector with parameters for later initialization.
      * @see #configure
      */
-    private Vector<Parameter> configParameter = new Vector<Parameter>();
+    private List<Parameter> configParameter =
+        Collections.synchronizedList(new ArrayList<>());
 
     /**
      * Parameter vector with special parameters for later initialization.
@@ -217,7 +219,8 @@
      * These parameters are used <b>after</b> the parameters with the pattern '*'.
      * @see #configure
      */
-    private Vector<Parameter> specialParameter = new Vector<Parameter>();
+    private List<Parameter> specialParameter =
+        Collections.synchronizedList(new ArrayList<>());
 
     /** The classloader of this class. */
     private ClassLoader myClassLoader = null;
@@ -238,6 +241,7 @@
 
 
     /** Overrides BaseSelector.verifySettings(). */
+    @Override
     public void verifySettings() {
         configure();
         if (cache == null) {
@@ -283,7 +287,7 @@
         //
         Project p = getProject();
         String filename = "cache.properties";
-        File cachefile = null;
+        File cachefile;
         if (p != null) {
             // normal use inside Ant
             cachefile = new File(p.getBaseDir(), filename);
@@ -303,14 +307,14 @@
         // -----  Set the main attributes, pattern '*'  -----
         //
         for (Parameter parameter : configParameter) {
-            if (parameter.getName().indexOf(".") > 0) {
+            if (parameter.getName().indexOf('.') > 0) {
                 // this is a *.* parameter for later use
                 specialParameter.add(parameter);
             } else {
                 useParameter(parameter);
             }
         }
-        configParameter = new Vector<Parameter>();
+        configParameter.clear();
 
         // specify the algorithm classname
         if (algoName != null) {
@@ -322,17 +326,15 @@
             } else if ("checksum".equals(algoName.getValue())) {
                 algorithm = new ChecksumAlgorithm();
             }
+        } else if (algorithmClass != null) {
+            // use Algorithm specified by classname
+            algorithm = loadClass(
+                algorithmClass,
+                "is not an Algorithm.",
+                Algorithm.class);
         } else {
-            if (algorithmClass != null) {
-                // use Algorithm specified by classname
-                algorithm = loadClass(
-                    algorithmClass,
-                    "is not an Algorithm.",
-                    Algorithm.class);
-            } else {
-                // nothing specified - use default
-                algorithm = defaultAlgorithm;
-            }
+            // nothing specified - use default
+            algorithm = defaultAlgorithm;
         }
 
         // specify the cache classname
@@ -341,14 +343,12 @@
             if ("propertyfile".equals(cacheName.getValue())) {
                 cache = new PropertiesfileCache();
             }
+        } else if (cacheClass != null) {
+            // use Cache specified by classname
+            cache = loadClass(cacheClass, "is not a Cache.", Cache.class);
         } else {
-            if (cacheClass != null) {
-                // use Cache specified by classname
-                cache = loadClass(cacheClass, "is not a Cache.", Cache.class);
-            } else {
-                // nothing specified - use default
-                cache = defaultCache;
-            }
+            // nothing specified - use default
+            cache = defaultCache;
         }
 
         // specify the comparator classname
@@ -364,26 +364,22 @@
                 // Have to think about lazy initialization here...  JHM
                 // comparator = new java.text.RuleBasedCollator();
             }
+        } else if (comparatorClass != null) {
+            // use Algorithm specified by classname
+            @SuppressWarnings("unchecked")
+            Comparator<? super String> localComparator = loadClass(
+                comparatorClass, "is not a Comparator.", Comparator.class);
+            comparator = localComparator;
         } else {
-            if (comparatorClass != null) {
-                // use Algorithm specified by classname
-                @SuppressWarnings("unchecked")
-                Comparator<? super String> localComparator = loadClass(comparatorClass, "is not a Comparator.", Comparator.class);
-                comparator = localComparator;
-            } else {
-                // nothing specified - use default
-                comparator = defaultComparator;
-            }
+            // nothing specified - use default
+            comparator = defaultComparator;
         }
 
         //
         // -----  Set the special attributes, pattern '*.*'  -----
         //
-        for (Iterator<Parameter> itSpecial = specialParameter.iterator(); itSpecial.hasNext();) {
-            Parameter par = itSpecial.next();
-            useParameter(par);
-        }
-        specialParameter = new Vector<Parameter>();
+        specialParameter.forEach(this::useParameter);
+        specialParameter.clear();
     }
 
 
@@ -401,7 +397,7 @@
         try {
             // load the specified class
             ClassLoader cl = getClassLoader();
-            Class<?> clazz = null;
+            Class<?> clazz;
             if (cl != null) {
                 clazz = cl.loadClass(classname);
             } else {
@@ -411,11 +407,11 @@
             Object rv = clazz.newInstance();
 
             if (!type.isInstance(rv)) {
-                throw new BuildException("Specified class (" + classname + ") " + msg);
+                throw new BuildException("Specified class (%s) %s", classname, msg);
             }
             return (T) rv;
         } catch (ClassNotFoundException e) {
-            throw new BuildException("Specified class (" + classname + ") not found.");
+            throw new BuildException("Specified class (%s) not found.", classname);
         } catch (Exception e) {
             throw new BuildException(e);
         }
@@ -432,6 +428,7 @@
      * @return whether the resource is selected
      * @see ResourceSelector#isSelected(Resource)
      */
+    @Override
     public boolean isSelected(Resource resource) {
         if (resource.isFilesystemOnly()) {
             // We have a 'resourced' file, so reconvert it and use
@@ -441,30 +438,29 @@
             String filename = fileResource.getName();
             File basedir = fileResource.getBaseDir();
             return isSelected(basedir, filename, file);
-        } else {
-            try {
-                // How to handle non-file-Resources? I copy temporarily the
-                // resource to a file and use the file-implementation.
-                FileUtils fu = FileUtils.getFileUtils();
-                File tmpFile = fu.createTempFile("modified-", ".tmp", null, true, false);
-                Resource tmpResource = new FileResource(tmpFile);
-                ResourceUtils.copyResource(resource, tmpResource);
-                boolean isSelected = isSelected(tmpFile.getParentFile(),
-                                                tmpFile.getName(),
-                                                resource.toLongString());
-                tmpFile.delete();
-                return isSelected;
-            } catch (UnsupportedOperationException uoe) {
-                log("The resource '"
-                  + resource.getName()
-                  + "' does not provide an InputStream, so it is not checked. "
-                  + "According to 'selres' attribute value it is "
-                  + ((selectResourcesWithoutInputStream) ? "" : " not")
-                  + "selected.", Project.MSG_INFO);
-                return selectResourcesWithoutInputStream;
-            } catch (Exception e) {
-                throw new BuildException(e);
-            }
+        }
+        try {
+            // How to handle non-file-Resources? I copy temporarily the
+            // resource to a file and use the file-implementation.
+            FileUtils fu = FileUtils.getFileUtils();
+            File tmpFile = fu.createTempFile("modified-", ".tmp", null, true, false);
+            Resource tmpResource = new FileResource(tmpFile);
+            ResourceUtils.copyResource(resource, tmpResource);
+            boolean isSelected = isSelected(tmpFile.getParentFile(),
+                                            tmpFile.getName(),
+                                            resource.toLongString());
+            tmpFile.delete();
+            return isSelected;
+        } catch (UnsupportedOperationException uoe) {
+            log("The resource '"
+              + resource.getName()
+              + "' does not provide an InputStream, so it is not checked. "
+              + "According to 'selres' attribute value it is "
+              + ((selectResourcesWithoutInputStream) ? "" : " not")
+              + "selected.", Project.MSG_INFO);
+            return selectResourcesWithoutInputStream;
+        } catch (Exception e) {
+            throw new BuildException(e);
         }
     }
 
@@ -477,11 +473,11 @@
      * @param file as described in BaseExtendSelector
      * @return as described in BaseExtendSelector
      */
+    @Override
     public boolean isSelected(File basedir, String filename, File file) {
         return isSelected(basedir, filename, file.getAbsolutePath());
     }
 
-
     /**
      * The business logic of this selector for use as ResourceSelector of
      * FileSelector.
@@ -504,7 +500,7 @@
         String cachedValue = String.valueOf(cache.get(f.getAbsolutePath()));
         String newValue = algorithm.getValue(f);
 
-        boolean rv = (comparator.compare(cachedValue, newValue) != 0);
+        boolean rv = comparator.compare(cachedValue, newValue) != 0;
 
         // Maybe update the cache
         if (update && rv) {
@@ -514,7 +510,6 @@
                 saveCache();
             }
         }
-
         return rv;
     }
 
@@ -694,10 +689,11 @@
      * @see #addParam(String,Object)
      * @param parameters the parameters to set.
      */
-    public void setParameters(Parameter[] parameters) {
+    @Override
+    public void setParameters(Parameter... parameters) {
         if (parameters != null) {
-            for (int i = 0; i < parameters.length; i++) {
-                configParameter.add(parameters[i]);
+            for (Parameter p : parameters) {
+                configParameter.add(p);
             }
         }
     }
@@ -732,23 +728,11 @@
             cn.setValue(value);
             setComparator(cn);
         } else if ("update".equals(key)) {
-            boolean updateValue =
-                ("true".equalsIgnoreCase(value))
-                ? true
-                : false;
-            setUpdate(updateValue);
+            setUpdate("true".equalsIgnoreCase(value));
         } else if ("delayupdate".equals(key)) {
-            boolean updateValue =
-                ("true".equalsIgnoreCase(value))
-                ? true
-                : false;
-            setDelayUpdate(updateValue);
+            setDelayUpdate("true".equalsIgnoreCase(value));
         } else if ("seldirs".equals(key)) {
-            boolean sdValue =
-                ("true".equalsIgnoreCase(value))
-                ? true
-                : false;
-            setSeldirs(sdValue);
+            setSeldirs("true".equalsIgnoreCase(value));
         } else if (key.startsWith(CACHE_PREFIX)) {
             String name = key.substring(CACHE_PREFIX.length());
             tryToSetAParameter(cache, name, value);
@@ -777,7 +761,7 @@
             = IntrospectionHelper.getHelper(prj, obj.getClass());
         try {
             iHelper.setAttribute(prj, obj, name, value);
-        } catch (org.apache.tools.ant.BuildException e) {
+        } catch (BuildException e) {
             // no-op
         }
     }
@@ -790,8 +774,9 @@
      * Override Object.toString().
      * @return information about this selector
      */
+    @Override
     public String toString() {
-        StringBuffer buf = new StringBuffer("{modifiedselector");
+        StringBuilder buf = new StringBuilder("{modifiedselector");
         buf.append(" update=").append(update);
         buf.append(" seldirs=").append(selectDirectories);
         buf.append(" cache=").append(cache);
@@ -808,7 +793,8 @@
     /**
      * Signals that the last target has finished.
      * @param event received BuildEvent
-    */
+     */
+    @Override
     public void buildFinished(BuildEvent event) {
         if (getDelayUpdate()) {
             saveCache();
@@ -819,7 +805,8 @@
     /**
      * Signals that a target has finished.
      * @param event received BuildEvent
-    */
+     */
+    @Override
     public void targetFinished(BuildEvent event) {
         if (getDelayUpdate()) {
             saveCache();
@@ -830,7 +817,8 @@
     /**
      * Signals that a task has finished.
      * @param event received BuildEvent
-    */
+     */
+    @Override
     public void taskFinished(BuildEvent event) {
         if (getDelayUpdate()) {
             saveCache();
@@ -841,7 +829,8 @@
     /**
      * Signals that a build has started.
      * @param event received BuildEvent
-    */
+     */
+    @Override
     public void buildStarted(BuildEvent event) {
         // no-op
     }
@@ -850,7 +839,8 @@
     /**
      * Signals that a target is starting.
      * @param event received BuildEvent
-    */
+     */
+    @Override
     public void targetStarted(BuildEvent event) {
         // no-op
     }
@@ -860,7 +850,8 @@
     /**
      * Signals that a task is starting.
      * @param event received BuildEvent
-    */
+     */
+    @Override
     public void taskStarted(BuildEvent event) {
         // no-op
     }
@@ -869,7 +860,8 @@
     /**
      * Signals a message logging event.
      * @param event received BuildEvent
-    */
+     */
+    @Override
     public void messageLogged(BuildEvent event) {
         // no-op
     }
@@ -904,6 +896,7 @@
          * {@inheritDoc}
          * @see EnumeratedAttribute#getValues()
          */
+        @Override
         public String[] getValues() {
             return new String[] {"propertyfile"};
         }
@@ -934,6 +927,7 @@
          * {@inheritDoc}
          * @see EnumeratedAttribute#getValues()
          */
+        @Override
         public String[] getValues() {
             return new String[] {"hashvalue", "digest", "checksum"};
         }
@@ -964,6 +958,7 @@
          * {@inheritDoc}
          * @see EnumeratedAttribute#getValues()
          */
+        @Override
         public String[] getValues() {
             return new String[] {"equal", "rule"};
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.java	2018-03-24 12:37:12.000000000 +0000
@@ -22,12 +22,9 @@
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.util.Enumeration;
+import java.nio.file.Files;
 import java.util.Iterator;
 import java.util.Properties;
-import java.util.Vector;
 
 
 /**
@@ -119,6 +116,7 @@
      * This cache is valid if the cachefile is set.
      * @return true if all is ok false otherwise
      */
+    @Override
     public boolean isValid() {
         return (cachefile != null);
     }
@@ -130,13 +128,12 @@
     /**
      * Load the cache from underlying properties file.
      */
+    @Override
     public void load() {
         if ((cachefile != null) && cachefile.isFile() && cachefile.canRead()) {
-            try {
-                BufferedInputStream bis = new BufferedInputStream(
-                    new FileInputStream(cachefile));
+            try (BufferedInputStream bis = new BufferedInputStream(
+                Files.newInputStream(cachefile.toPath()))) {
                 cache.load(bis);
-                bis.close();
             } catch (Exception e) {
                 e.printStackTrace(); //NOSONAR
             }
@@ -153,17 +150,16 @@
      * implementation checks the existence of entries before creating the file
      * for performance optimisation.
      */
+    @Override
     public void save() {
         if (!cacheDirty) {
             return;
         }
         if ((cachefile != null) && cache.propertyNames().hasMoreElements()) {
-            try {
-                BufferedOutputStream bos = new BufferedOutputStream(
-                      new FileOutputStream(cachefile));
+            try (BufferedOutputStream bos = new BufferedOutputStream(
+                Files.newOutputStream(cachefile.toPath()))) {
                 cache.store(bos, null);
                 bos.flush();
-                bos.close();
             } catch (Exception e) {
                 e.printStackTrace(); //NOSONAR
             }
@@ -172,6 +168,7 @@
     }
 
     /** Deletes the cache and its underlying file. */
+    @Override
     public void delete() {
         cache = new Properties();
         cachefile.delete();
@@ -184,6 +181,7 @@
      * @param key the key
      * @return the stored value
      */
+    @Override
     public Object get(Object key) {
         if (!cacheLoaded) {
             load();
@@ -200,6 +198,7 @@
      * @param key the key
      * @param value the value
      */
+    @Override
     public void put(Object key, Object value) {
         cache.put(String.valueOf(key), String.valueOf(value));
         cacheDirty = true;
@@ -209,13 +208,9 @@
      * Returns an iterator over the keys in the cache.
      * @return An iterator over the keys.
      */
+    @Override
     public Iterator<String> iterator() {
-        Vector<String> v = new Vector<String>();
-        Enumeration<?> en = cache.propertyNames();
-        while (en.hasMoreElements()) {
-            v.add(en.nextElement().toString());
-        }
-        return v.iterator();
+        return cache.stringPropertyNames().iterator();
     }
 
 
@@ -226,8 +221,9 @@
      * Override Object.toString().
      * @return information about this cache
      */
+    @Override
     public String toString() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append("<PropertiesfileCache:");
         buf.append("cachefile=").append(cachefile);
         buf.append(";noOfEntries=").append(cache.size());
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/NoneSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/NoneSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/NoneSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/NoneSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,7 @@
 package org.apache.tools.ant.types.selectors;
 
 import java.io.File;
-import java.util.Enumeration;
+import java.util.stream.Stream;
 
 /**
  * This selector has a collection of other selectors. All of those selectors
@@ -31,12 +31,6 @@
 public class NoneSelector extends BaseSelectorContainer {
 
     /**
-     * Default constructor.
-     */
-    public NoneSelector() {
-    }
-
-    /**
      * @return a string representation of the selector
      */
     public String toString() {
@@ -61,15 +55,8 @@
      */
     public boolean isSelected(File basedir, String filename, File file) {
         validate();
-        Enumeration<FileSelector> e = selectorElements();
-
-        while (e.hasMoreElements()) {
-            if (e.nextElement().isSelected(basedir, filename, file)) {
-                return false;
-            }
-        }
-        return true;
+        return Stream.of(getSelectors(getProject()))
+            .noneMatch(s -> s.isSelected(basedir, filename, file));
     }
 
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/NotSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/NotSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/NotSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/NotSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -64,8 +64,8 @@
      */
     public void verifySettings() {
         if (selectorCount() != 1) {
-            setError("One and only one selector is allowed within the "
-                + "<not> tag");
+            setError(
+                "One and only one selector is allowed within the <not> tag");
         }
     }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/OrSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/OrSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/OrSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/OrSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,7 @@
 package org.apache.tools.ant.types.selectors;
 
 import java.io.File;
-import java.util.Enumeration;
+import java.util.stream.Stream;
 
 /**
  * This selector has a collection of other selectors, any of which have to
@@ -30,12 +30,6 @@
 public class OrSelector extends BaseSelectorContainer {
 
     /**
-     * Default constructor.
-     */
-    public OrSelector() {
-    }
-
-    /**
      * @return a string representation of the selector
      */
     public String toString() {
@@ -60,15 +54,8 @@
      */
     public boolean isSelected(File basedir, String filename, File file) {
         validate();
-        Enumeration<FileSelector> e = selectorElements();
-
-        // First, check that all elements are correctly configured
-        while (e.hasMoreElements()) {
-            if (e.nextElement().isSelected(basedir, filename, file)) {
-                return true;
-            }
-        }
-        return false;
+        return Stream.of(getSelectors(getProject()))
+            .anyMatch(s -> s.isSelected(basedir, filename, file));
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/OwnedBySelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/OwnedBySelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/OwnedBySelector.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/OwnedBySelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,67 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package org.apache.tools.ant.types.selectors;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.attribute.UserPrincipal;
+
+import org.apache.tools.ant.BuildException;
+
+/**
+ * A selector that selects files based on their owner.
+ *
+ * <p>Owner is defined in terms of {@link
+ * java.nio.file.Files#getOwner}, this means the selector will accept
+ * any file that exists and is owned by the given user. If the {@code
+ * getOwner} method throws an {@code UnsupportedOperationException}
+ * the file in question is not included.</p>
+ *
+ * @since Ant 1.10.0
+ */
+public class OwnedBySelector implements FileSelector {
+
+    private String owner;
+
+    /**
+     * Sets the User-Name to look for.
+     * @param owner the user name
+     */
+    public void setOwner(String owner) {
+        this.owner = owner;
+    }
+
+    @Override
+    public boolean isSelected(File basedir, String filename, File file) {
+        if (owner == null) {
+            throw new BuildException("the owner attribute is required");
+        }
+        if (file != null) {
+            try {
+                UserPrincipal user = Files.getOwner(file.toPath());
+                return user != null && owner.equals(user.getName());
+            } catch (UnsupportedOperationException | IOException ex) {
+                // => not the expected owner
+            }
+        }
+        return false;
+    }
+
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/PresentSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -42,13 +42,6 @@
     private boolean destmustexist = true;
 
     /**
-     * Creates a new <code>PresentSelector</code> instance.
-     *
-     */
-    public PresentSelector() {
-    }
-
-    /**
      * @return a string describing this object
      */
     @Override
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/ReadableSelector.java	2018-03-24 12:37:13.000000000 +0000
@@ -20,10 +20,6 @@
 
 import java.io.File;
 
-import org.apache.tools.ant.types.Resource;
-import org.apache.tools.ant.types.resources.FileProvider;
-import org.apache.tools.ant.types.resources.selectors.ResourceSelector;
-
 /**
  * A selector that selects readable files.
  *
@@ -33,17 +29,11 @@
  *
  * @since Ant 1.8.0
  */
-public class ReadableSelector implements FileSelector, ResourceSelector {
+public class ReadableSelector implements FileSelector {
 
+    @Override
     public boolean isSelected(File basedir, String filename, File file) {
         return file != null && file.canRead();
     }
 
-    public boolean isSelected(Resource r) {
-        FileProvider fp = r.as(FileProvider.class);
-        if (fp != null) {
-            return isSelected(null, null, fp.getFile());
-        }
-        return false;
-    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java	2018-03-24 12:37:12.000000000 +0000
@@ -159,14 +159,14 @@
         if (strIdxStart > strIdxEnd) {
             // String is exhausted
             return true;
-        } else if (patIdxStart > patIdxEnd) {
+        }
+        if (patIdxStart > patIdxEnd) {
             // String not exhausted, but pattern is. Failure.
             return false;
-        } else {
-            // pattern now holds ** while string is not exhausted
-            // this will generate false positives but we can live with that.
-            return true;
         }
+        // pattern now holds ** while string is not exhausted
+        // this will generate false positives but we can live with that.
+        return true;
     }
 
     /**
@@ -245,11 +245,10 @@
                 }
             }
             return true;
-        } else {
-            if (patIdxStart > patIdxEnd) {
-                // String not exhausted, but pattern is. Failure.
-                return false;
-            }
+        }
+        if (patIdxStart > patIdxEnd) {
+            // String not exhausted, but pattern is. Failure.
+            return false;
         }
 
         // up to last '**'
@@ -293,19 +292,17 @@
             int strLength = (strIdxEnd - strIdxStart + 1);
             int foundIdx = -1;
             strLoop:
-                        for (int i = 0; i <= strLength - patLength; i++) {
-                            for (int j = 0; j < patLength; j++) {
-                                String subPat = tokenizedPattern[patIdxStart + j + 1];
-                                String subStr = strDirs[strIdxStart + i + j];
-                                if (!match(subPat, subStr, isCaseSensitive)) {
-                                    continue strLoop;
-                                }
-                            }
-
-                            foundIdx = strIdxStart + i;
-                            break;
-                        }
-
+            for (int i = 0; i <= strLength - patLength; i++) {
+                for (int j = 0; j < patLength; j++) {
+                    String subPat = tokenizedPattern[patIdxStart + j + 1];
+                    String subStr = strDirs[strIdxStart + i + j];
+                    if (!match(subPat, subStr, isCaseSensitive)) {
+                        continue strLoop;
+                    }
+                }
+                foundIdx = strIdxStart + i;
+                break;
+            }
             if (foundIdx == -1) {
                 return false;
             }
@@ -315,11 +312,10 @@
         }
 
         for (int i = patIdxStart; i <= patIdxEnd; i++) {
-            if (!tokenizedPattern[i].equals(DEEP_TREE_MATCH)) {
+            if (!DEEP_TREE_MATCH.equals(tokenizedPattern[i])) {
                 return false;
             }
         }
-
         return true;
     }
 
@@ -366,7 +362,6 @@
         int patIdxEnd = patArr.length - 1;
         int strIdxStart = 0;
         int strIdxEnd = strArr.length - 1;
-        char ch;
 
         boolean containsStar = false;
         for (int i = 0; i < patArr.length; i++) {
@@ -382,11 +377,9 @@
                 return false; // Pattern and string do not have the same size
             }
             for (int i = 0; i <= patIdxEnd; i++) {
-                ch = patArr[i];
-                if (ch != '?') {
-                    if (different(caseSensitive, ch, strArr[i])) {
-                        return false; // Character mismatch
-                    }
+                char ch = patArr[i];
+                if (ch != '?' && different(caseSensitive, ch, strArr[i])) {
+                    return false; // Character mismatch
                 }
             }
             return true; // String matches against pattern
@@ -398,14 +391,13 @@
 
         // Process characters before first star
         while (true) {
-            ch = patArr[patIdxStart];
+            char ch = patArr[patIdxStart];
             if (ch == '*' || strIdxStart > strIdxEnd) {
                 break;
             }
-            if (ch != '?') {
-                if (different(caseSensitive, ch, strArr[strIdxStart])) {
-                    return false; // Character mismatch
-                }
+            if (ch != '?'
+                && different(caseSensitive, ch, strArr[strIdxStart])) {
+                return false; // Character mismatch
             }
             patIdxStart++;
             strIdxStart++;
@@ -418,14 +410,12 @@
 
         // Process characters after last star
         while (true) {
-            ch = patArr[patIdxEnd];
+            char ch = patArr[patIdxEnd];
             if (ch == '*' || strIdxStart > strIdxEnd) {
                 break;
             }
-            if (ch != '?') {
-                if (different(caseSensitive, ch, strArr[strIdxEnd])) {
-                    return false; // Character mismatch
-                }
+            if (ch != '?' && different(caseSensitive, ch, strArr[strIdxEnd])) {
+                return false; // Character mismatch
             }
             patIdxEnd--;
             strIdxEnd--;
@@ -459,15 +449,12 @@
             strLoop:
             for (int i = 0; i <= strLength - patLength; i++) {
                 for (int j = 0; j < patLength; j++) {
-                    ch = patArr[patIdxStart + j + 1];
-                    if (ch != '?') {
-                        if (different(caseSensitive, ch,
-                                      strArr[strIdxStart + i + j])) {
-                            continue strLoop;
-                        }
+                    char ch = patArr[patIdxStart + j + 1];
+                    if (ch != '?' && different(caseSensitive, ch,
+                        strArr[strIdxStart + i + j])) {
+                        continue strLoop;
                     }
                 }
-
                 foundIdx = strIdxStart + i;
                 break;
             }
@@ -475,7 +462,6 @@
             if (foundIdx == -1) {
                 return false;
             }
-
             patIdxStart = patIdxTmp;
             strIdxStart = foundIdx + patLength;
         }
@@ -523,7 +509,7 @@
      * @since Ant 1.6
      */
     public static Vector<String> tokenizePath(String path, String separator) {
-        Vector<String> ret = new Vector<String>();
+        Vector<String> ret = new Vector<>();
         if (FileUtils.isAbsolutePath(path)) {
             String[] s = FILE_UTILS.dissect(path);
             ret.add(s[0]);
@@ -664,7 +650,7 @@
      * @return a String that has had all whitespace removed.
      */
     public static String removeWhitespace(String input) {
-        StringBuffer result = new StringBuffer();
+        StringBuilder result = new StringBuilder();
         if (input != null) {
             StringTokenizer st = new StringTokenizer(input);
             while (st.hasMoreTokens()) {
@@ -680,7 +666,7 @@
      * @return true if the string contains at least a star or a question mark
      */
     public static boolean hasWildcards(String input) {
-        return (input.indexOf('*') != -1 || input.indexOf('?') != -1);
+        return input.indexOf('*') != -1 || input.indexOf('?') != -1;
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/SelectSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -40,16 +40,10 @@
     private Object unlessCondition;
 
     /**
-     * Default constructor.
-     */
-    public SelectSelector() {
-    }
-
-    /**
      * @return a string describing this object
      */
     public String toString() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         if (hasSelectors()) {
             buf.append("{select");
             if (ifCondition != null) {
@@ -80,6 +74,7 @@
      * Indicates whether there are any selectors here.
      * @return whether any selectors are in this container
      */
+    @Override
     public boolean hasSelectors() {
         if (isReference()) {
             return getRef().hasSelectors();
@@ -91,6 +86,7 @@
      * Gives the count of the number of selectors in this container
      * @return the number of selectors in this container
      */
+    @Override
     public int selectorCount() {
         if (isReference()) {
             return getRef().selectorCount();
@@ -103,6 +99,7 @@
      * @param p the current project
      * @return an array of selectors in this container
      */
+    @Override
     public FileSelector[] getSelectors(Project p) {
         if (isReference()) {
             return getRef().getSelectors(p);
@@ -114,6 +111,7 @@
      * Returns an enumerator for accessing the set of selectors.
      * @return an enumerator that goes through each of the selectors
      */
+    @Override
     public Enumeration<FileSelector> selectorElements() {
         if (isReference()) {
             return getRef().selectorElements();
@@ -126,6 +124,7 @@
      *
      * @param selector the new selector to add
      */
+    @Override
     public void appendSelector(FileSelector selector) {
         if (isReference()) {
             throw noChildrenAllowed();
@@ -138,11 +137,11 @@
      * Makes sure that there is only one entry, sets an error message if
      * not.
      */
+    @Override
     public void verifySettings() {
         int cnt = selectorCount();
         if (cnt < 0 || cnt > 1) {
-            setError("Only one selector is allowed within the "
-                + "<selector> tag");
+            setError("Only one selector is allowed within the <selector> tag");
         }
     }
 
@@ -212,6 +211,7 @@
      * can use
      * @return whether the file should be selected or not
      */
+    @Override
     public boolean isSelected(File basedir, String filename, File file) {
         validate();
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/SignedSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/SignedSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/SignedSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/SignedSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -48,6 +48,7 @@
      * @param file     path to file to be selected
      * @return whether the file should be selected or not
      */
+    @Override
     public boolean isSelected(File basedir, String filename, File file) {
         if (file.isDirectory()) {
             return false; // Quick return: directories cannot be signed
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -62,13 +62,6 @@
     private Comparison when = Comparison.EQUAL;
 
     /**
-     * Creates a new <code>SizeSelector</code> instance.
-     *
-     */
-    public SizeSelector() {
-    }
-
-    /**
      * Returns a <code>String</code> object representing the specified
      * SizeSelector. This is "{sizeselector value: " + &lt;"compare",
      * "less", "more", "equal"&gt; + "}".
@@ -164,7 +157,8 @@
      *
      * @param parameters the complete set of parameters for this selector.
      */
-    public void setParameters(Parameter[] parameters) {
+    @Override
+    public void setParameters(Parameter... parameters) {
         super.setParameters(parameters);
         if (parameters != null) {
             for (int i = 0; i < parameters.length; i++) {
@@ -220,6 +214,7 @@
      * @param file A File object for this filename.
      * @return whether the file should be selected or not.
      */
+    @Override
     public boolean isSelected(File basedir, String filename, File file) {
 
         // throw BuildException on error
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/SymlinkSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/SymlinkSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/SymlinkSelector.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/SymlinkSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package org.apache.tools.ant.types.selectors;
+
+import java.io.File;
+import java.nio.file.Files;
+
+/**
+ * A selector that selects symbolic links.
+ *
+ * <p>Executable is defined in terms of {@link
+ * java.nio.file.Files#isSymbolicLink}, this means the selector will
+ * accept any file that exists and is a symbolic link.</p>
+ *
+ * @since Ant 1.10.0
+ */
+public class SymlinkSelector implements FileSelector {
+
+    public boolean isSelected(File basedir, String filename, File file) {
+        return file != null && Files.isSymbolicLink(file.toPath());
+    }
+
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/TokenizedPath.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/TokenizedPath.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/TokenizedPath.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/TokenizedPath.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,10 +19,12 @@
 package org.apache.tools.ant.types.selectors;
 
 import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.FileUtils;
-import org.apache.tools.ant.util.SymbolicLinkUtils;
 
 /**
  * Container for a path that has been split into its components.
@@ -38,9 +40,6 @@
 
     /** Helper. */
     private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
-    /** Helper. */
-    private static final SymbolicLinkUtils SYMLINK_UTILS =
-        SymbolicLinkUtils.getSymbolicLinkUtils();
     /** iterations for case-sensitive scanning. */
     private static final boolean[] CS_SCAN_ONLY = new boolean[] {true};
     /** iterations for non-case-sensitive scanning. */
@@ -141,22 +140,16 @@
      */
     public boolean isSymlink(File base) {
         for (int i = 0; i < tokenizedPath.length; i++) {
-            try {
-                if ((base != null
-                     && SYMLINK_UTILS.isSymbolicLink(base, tokenizedPath[i]))
-                    ||
-                    (base == null
-                     && SYMLINK_UTILS.isSymbolicLink(tokenizedPath[i]))
-                    ) {
-                    return true;
-                }
-                base = new File(base, tokenizedPath[i]);
-            } catch (java.io.IOException ioe) {
-                String msg = "IOException caught while checking "
-                    + "for links, couldn't get canonical path!";
-                // will be caught and redirected to Ant's logging system
-                System.err.println(msg);
+            final Path pathToTraverse;
+            if (base == null) {
+                pathToTraverse = Paths.get(tokenizedPath[i]);
+            } else {
+                pathToTraverse = Paths.get(base.toPath().toString(), tokenizedPath[i]);
+            }
+            if (Files.isSymbolicLink(pathToTraverse)) {
+                return true;
             }
+            base = new File(base, tokenizedPath[i]);
         }
         return false;
     }
@@ -193,8 +186,8 @@
             }
             String[] files = base.list();
             if (files == null) {
-                throw new BuildException("IO error scanning directory "
-                                         + base.getAbsolutePath());
+                throw new BuildException("IO error scanning directory %s",
+                    base.getAbsolutePath());
             }
             boolean found = false;
             boolean[] matchCase = cs ? CS_SCAN_ONLY : CS_THEN_NON_CS;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/TokenizedPattern.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,6 +19,8 @@
 package org.apache.tools.ant.types.selectors;
 
 import java.io.File;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 /**
  * Provides reusable path pattern matching.  PathPattern is preferable
@@ -125,12 +127,7 @@
      * @return boolean
      */
     public boolean containsPattern(String pat) {
-        for (int i = 0; i < tokenizedPattern.length; i++) {
-            if (tokenizedPattern[i].equals(pat)) {
-                return true;
-            }
-        }
-        return false;
+        return Stream.of(tokenizedPattern).anyMatch(Predicate.isEqual(pat));
     }
 
     /**
@@ -179,16 +176,16 @@
     public TokenizedPattern withoutLastToken() {
         if (tokenizedPattern.length == 0) {
             throw new IllegalStateException("can't strip a token from nothing");
-        } else if (tokenizedPattern.length == 1) {
+        }
+        if (tokenizedPattern.length == 1) {
             return EMPTY_PATTERN;
-        } else {
-            String toStrip = tokenizedPattern[tokenizedPattern.length - 1];
-            int index = pattern.lastIndexOf(toStrip);
-            String[] tokens = new String[tokenizedPattern.length - 1];
-            System.arraycopy(tokenizedPattern, 0, tokens, 0,
-                             tokenizedPattern.length - 1);
-            return new TokenizedPattern(pattern.substring(0, index), tokens);
         }
+        String toStrip = tokenizedPattern[tokenizedPattern.length - 1];
+        int index = pattern.lastIndexOf(toStrip);
+        String[] tokens = new String[tokenizedPattern.length - 1];
+        System.arraycopy(tokenizedPattern, 0, tokens, 0,
+                         tokenizedPattern.length - 1);
+        return new TokenizedPattern(pattern.substring(0, index), tokens);
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java	2018-03-24 12:37:12.000000000 +0000
@@ -30,17 +30,10 @@
  */
 public class TypeSelector extends BaseExtendSelector {
 
-    private String type = null;
-
     /** Key to used for parameterized custom selector */
     public static final String TYPE_KEY = "type";
 
-    /**
-     * Creates a new <code>TypeSelector</code> instance.
-     *
-     */
-    public TypeSelector() {
-    }
+    private String type = null;
 
     /**
      * @return a string describing this object
@@ -66,7 +59,8 @@
      *
      * @param parameters the complete set of parameters for this selector
      */
-    public void setParameters(Parameter[] parameters) {
+    @Override
+    public void setParameters(Parameter... parameters) {
         super.setParameters(parameters);
         if (parameters != null) {
             for (int i = 0; i < parameters.length; i++) {
@@ -87,6 +81,7 @@
      * means that the pattern attribute has been set.
      *
      */
+    @Override
     public void verifySettings() {
         if (type == null) {
             setError("The type attribute is required");
@@ -102,6 +97,7 @@
      * @param file is a java.io.File object the selector can use
      * @return whether the file should be selected or not
      */
+    @Override
     public boolean isSelected(File basedir, String filename, File file) {
 
         // throw BuildException on error
@@ -109,9 +105,8 @@
 
         if (file.isDirectory()) {
             return type.equals(FileType.DIR);
-        } else {
-            return type.equals(FileType.FILE);
         }
+        return type.equals(FileType.FILE);
     }
 
     /**
@@ -126,10 +121,10 @@
         /**
          * @return the values as an array of strings
          */
+        @Override
         public String[] getValues() {
             return new String[]{FILE, DIR};
         }
     }
 
-
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/selectors/WritableSelector.java	2018-03-24 12:37:13.000000000 +0000
@@ -20,10 +20,6 @@
 
 import java.io.File;
 
-import org.apache.tools.ant.types.Resource;
-import org.apache.tools.ant.types.resources.FileProvider;
-import org.apache.tools.ant.types.resources.selectors.ResourceSelector;
-
 /**
  * A selector that selects writable files.
  *
@@ -33,14 +29,11 @@
  *
  * @since Ant 1.8.0
  */
-public class WritableSelector implements FileSelector, ResourceSelector {
+public class WritableSelector implements FileSelector {
 
+    @Override
     public boolean isSelected(File basedir, String filename, File file) {
         return file != null && file.canWrite();
     }
 
-    public boolean isSelected(Resource r) {
-        FileProvider fp = r.as(FileProvider.class);
-        return fp != null && isSelected(null, null, fp.getFile());
-    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/spi/Provider.java ant-1.10.3/src/main/org/apache/tools/ant/types/spi/Provider.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/spi/Provider.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/spi/Provider.java	2018-03-24 12:37:12.000000000 +0000
@@ -55,7 +55,7 @@
                 "classname attribute must be set for provider element",
                 getLocation());
         }
-        if (type.length() == 0) {
+        if (type.isEmpty()) {
             throw new BuildException(
                 "Invalid empty classname", getLocation());
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/spi/Service.java ant-1.10.3/src/main/org/apache/tools/ant/types/spi/Service.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/spi/Service.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/spi/Service.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,13 +18,11 @@
 package org.apache.tools.ant.types.spi;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.ProjectComponent;
@@ -36,7 +34,7 @@
  * http://issues.apache.org/bugzilla/show_bug.cgi?id=31520</a>
  */
 public class Service extends ProjectComponent {
-    private List<Provider> providerList = new ArrayList<Provider>();
+    private List<Provider> providerList = new ArrayList<>();
     private String type;
 
     /**
@@ -83,14 +81,9 @@
      * @throws IOException if there is an error.
      */
     public InputStream getAsStream() throws IOException {
-        ByteArrayOutputStream arrayOut = new ByteArrayOutputStream();
-        Writer writer = new OutputStreamWriter(arrayOut, "UTF-8");
-        for (Provider provider : providerList) {
-            writer.write(provider.getClassName());
-            writer.write("\n");
-        }
-        writer.close();
-        return new ByteArrayInputStream(arrayOut.toByteArray());
+        return new ByteArrayInputStream(
+            providerList.stream().map(Provider::getClassName)
+                .collect(Collectors.joining("\n")).getBytes("UTF-8"));
     }
 
     /**
@@ -107,7 +100,7 @@
             throw new BuildException(
                 "Invalid empty type classname", getLocation());
         }
-        if (providerList.size() == 0) {
+        if (providerList.isEmpty()) {
             throw new BuildException(
                 "provider attribute or nested provider element must be set!",
                 getLocation());
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/TarFileSet.java ant-1.10.3/src/main/org/apache/tools/ant/types/TarFileSet.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/TarFileSet.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/TarFileSet.java	2018-03-24 12:37:12.000000000 +0000
@@ -178,6 +178,7 @@
      * Create a new scanner.
      * @return the created scanner.
      */
+    @Override
     protected ArchiveScanner newArchiveScanner() {
         TarScanner zs = new TarScanner();
         zs.setEncoding(getEncoding());
@@ -192,6 +193,7 @@
      * @param r the <code>Reference</code> to use.
      * @throws BuildException on error
      */
+    @Override
     public void setRefid(Reference r) throws BuildException {
         if (userNameSet || userIdSet || groupNameSet || groupIdSet) {
             throw tooManyAttributes();
@@ -205,19 +207,20 @@
      * @param p the project to use
      * @return the abstract fileset instance
      */
+    @Override
     protected AbstractFileSet getRef(Project p) {
         dieOnCircularReference(p);
         Object o = getRefid().getReferencedObject(p);
         if (o instanceof TarFileSet) {
             return (AbstractFileSet) o;
-        } else if (o instanceof FileSet) {
+        }
+        if (o instanceof FileSet) {
             TarFileSet zfs = new TarFileSet((FileSet) o);
             configureFileSet(zfs);
             return zfs;
-        } else {
-            String msg = getRefid().getRefId() + " doesn\'t denote a tarfileset or a fileset";
-            throw new BuildException(msg);
         }
+        String msg = getRefid().getRefId() + " doesn\'t denote a tarfileset or a fileset";
+        throw new BuildException(msg);
     }
 
     /**
@@ -226,6 +229,7 @@
      * specific attributes.
      * @param zfs the archive fileset to configure.
      */
+    @Override
     protected void configureFileSet(ArchiveFileSet zfs) {
         super.configureFileSet(zfs);
         if (zfs instanceof TarFileSet) {
@@ -242,12 +246,12 @@
      * as this one.
      * @return the cloned tarFileSet
      */
+    @Override
     public Object clone() {
         if (isReference()) {
             return ((TarFileSet) getRef(getProject())).clone();
-        } else {
-            return super.clone();
         }
+        return super.clone();
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/TarScanner.java ant-1.10.3/src/main/org/apache/tools/ant/types/TarScanner.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/TarScanner.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/TarScanner.java	2018-03-24 12:37:12.000000000 +0000
@@ -23,7 +23,6 @@
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.types.resources.TarResource;
-import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.tar.TarEntry;
 import org.apache.tools.tar.TarInputStream;
 
@@ -53,35 +52,30 @@
             Map<String, Resource> fileEntries, Map<String, Resource> matchFileEntries,
             Map<String, Resource> dirEntries, Map<String, Resource> matchDirEntries) {
 
-        TarEntry entry = null;
-        TarInputStream ti = null;
-
-        try {
+        try (TarInputStream ti = new TarInputStream(src.getInputStream(), encoding)) {
             try {
-                ti = new TarInputStream(src.getInputStream(), encoding);
-            } catch (IOException ex) {
-                throw new BuildException("problem opening " + srcFile, ex);
-            }
-            while ((entry = ti.getNextEntry()) != null) {
-                Resource r = new TarResource(src, entry);
-                String name = entry.getName();
-                if (entry.isDirectory()) {
-                    name = trimSeparator(name);
-                    dirEntries.put(name, r);
-                    if (match(name)) {
-                        matchDirEntries.put(name, r);
-                    }
-                } else {
-                    fileEntries.put(name, r);
-                    if (match(name)) {
-                        matchFileEntries.put(name, r);
+                TarEntry entry = null;
+                while ((entry = ti.getNextEntry()) != null) {
+                    Resource r = new TarResource(src, entry);
+                    String name = entry.getName();
+                    if (entry.isDirectory()) {
+                        name = trimSeparator(name);
+                        dirEntries.put(name, r);
+                        if (match(name)) {
+                            matchDirEntries.put(name, r);
+                        }
+                    } else {
+                        fileEntries.put(name, r);
+                        if (match(name)) {
+                            matchFileEntries.put(name, r);
+                        }
                     }
                 }
+            } catch (IOException ex) {
+                throw new BuildException("problem reading " + srcFile, ex);
             }
         } catch (IOException ex) {
-            throw new BuildException("problem reading " + srcFile, ex);
-        } finally {
-            FileUtils.close(ti);
+            throw new BuildException("problem opening " + srcFile, ex);
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/XMLCatalog.java ant-1.10.3/src/main/org/apache/tools/ant/types/XMLCatalog.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/XMLCatalog.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/XMLCatalog.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,13 +19,13 @@
 package org.apache.tools.ant.types;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
+import java.nio.file.Files;
 import java.util.Stack;
 import java.util.Vector;
 
@@ -50,7 +50,7 @@
 /**
  * <p>This data type provides a catalog of resource locations (such as
  * DTDs and XML entities), based on the <a
- * href="http://oasis-open.org/committees/entity/spec-2001-08-06.html">
+ * href="https://oasis-open.org/committees/entity/spec-2001-08-06.html">
  * OASIS "Open Catalog" standard</a>.  The catalog entries are used
  * both for Entity resolution and URI resolution, in accordance with
  * the {@link org.xml.sax.EntityResolver EntityResolver} and {@link
@@ -62,9 +62,9 @@
  * external catalog file(s), or both.  In order to use an external
  * catalog file, the xml-commons resolver library ("resolver.jar")
  * must be in your classpath.  External catalog files may be either <a
- * href="http://oasis-open.org/committees/entity/background/9401.html">
+ * href="https://oasis-open.org/committees/entity/background/9401.html">
  * plain text format</a> or <a
- * href="http://www.oasis-open.org/committees/entity/spec-2001-08-06.html">
+ * href="https://www.oasis-open.org/committees/entity/spec-2001-08-06.html">
  * XML format</a>.  If the xml-commons resolver library is not found
  * in the classpath, external catalog files, specified in
  * <code>&lt;catalogpath&gt;</code> paths, will be ignored and a warning will
@@ -353,6 +353,7 @@
      * @param r the reference to which this catalog instance is associated
      * @exception BuildException if this instance already has been configured.
      */
+    @Override
     public void setRefid(Reference r) throws BuildException {
         if (!elements.isEmpty()) {
             throw tooManyAttributes();
@@ -369,6 +370,7 @@
      * @return the resolved entity.
      * @see org.xml.sax.EntityResolver#resolveEntity
      */
+    @Override
     public InputSource resolveEntity(String publicId, String systemId)
         throws SAXException, IOException {
 
@@ -400,6 +402,7 @@
      * @throws TransformerException if an error occurs.
      * @see javax.xml.transform.URIResolver#resolve
      */
+    @Override
     public Source resolve(String href, String base)
         throws TransformerException {
 
@@ -425,7 +428,7 @@
             // setEntityResolver (see setEntityResolver javadoc comment)
             //
             source = new SAXSource();
-            URL baseURL = null;
+            URL baseURL;
             try {
                 if (base == null) {
                     baseURL = FILE_UTILS.getFileURL(getProject().getBaseDir());
@@ -445,6 +448,7 @@
         return source;
     }
 
+    @Override
     protected synchronized void dieOnCircularReference(Stack<Object> stk, Project p)
         throws BuildException {
         if (isChecked()) {
@@ -492,7 +496,7 @@
 
         if (catalogResolver == null) {
 
-            AntClassLoader loader = null;
+            AntClassLoader loader;
             // Memory-Leak in line below
             loader = getProject().createClassLoader(Path.systemClasspath);
 
@@ -587,12 +591,9 @@
      *         of the Resource or null if no such information is available.
      */
     private ResourceLocation findMatchingEntry(String publicId) {
-        for (ResourceLocation element : getElements()) {
-            if (element.getPublicId().equals(publicId)) {
-                return element;
-            }
-        }
-        return null;
+        return getElements().stream()
+            .filter(e -> e.getPublicId().equals(publicId)).findFirst()
+            .orElse(null);
     }
 
     /**
@@ -625,7 +626,7 @@
         String uri = matchingEntry.getLocation();
         // the following line seems to be necessary on Windows under JDK 1.2
         uri = uri.replace(File.separatorChar, '/');
-        URL baseURL = null;
+        URL baseURL;
 
         //
         // The ResourceLocation may specify a relative path for its
@@ -642,7 +643,6 @@
             }
         }
 
-        InputSource source = null;
         URL url = null;
         try {
             url = new URL(baseURL, uri);
@@ -667,14 +667,15 @@
             }
         }
 
-        if (url != null && url.getProtocol().equals("file")) {
+        InputSource source = null;
+        if (url != null && "file".equals(url.getProtocol())) {
             String fileName = FILE_UTILS.fromURI(url.toString());
             if (fileName != null) {
                 log("fileName " + fileName, Project.MSG_DEBUG);
                 File resFile = new File(fileName);
                 if (resFile.exists() && resFile.canRead()) {
                     try {
-                        source = new InputSource(new FileInputStream(resFile));
+                        source = new InputSource(Files.newInputStream(resFile.toPath()));
                         String sysid = JAXPUtils.getSystemId(resFile);
                         source.setSystemId(sysid);
                         log("catalog entry matched a readable file: '"
@@ -698,14 +699,13 @@
 
         InputSource source = null;
 
-        AntClassLoader loader = null;
         Path cp = classpath;
         if (cp != null) {
             cp = classpath.concatSystemClasspath("ignore");
         } else {
             cp = (new Path(getProject())).concatSystemClasspath("last");
         }
-        loader = getProject().createClassLoader(cp);
+        AntClassLoader loader = getProject().createClassLoader(cp);
 
         //
         // for classpath lookup we ignore the base directory
@@ -734,7 +734,7 @@
     private InputSource urlLookup(ResourceLocation matchingEntry) {
 
         String uri = matchingEntry.getLocation();
-        URL baseURL = null;
+        URL baseURL;
 
         //
         // The ResourceLocation may specify a relative url for its
@@ -751,15 +751,15 @@
             }
         }
 
-        InputSource source = null;
-        URL url = null;
+        URL url;
 
         try {
             url = new URL(baseURL, uri);
         } catch (MalformedURLException ex) {
-            // ignore
+            url = null;
         }
 
+        InputSource source = null;
         if (url != null) {
             try {
                 InputStream is = null;
@@ -789,10 +789,8 @@
      * the ExternalResolver strategy.
      */
     private interface CatalogResolver extends URIResolver, EntityResolver {
-
+        @Override
         InputSource resolveEntity(String publicId, String systemId);
-
-        Source resolve(String href, String base) throws TransformerException;
     }
 
     /**
@@ -809,6 +807,7 @@
                 Project.MSG_VERBOSE);
         }
 
+        @Override
         public InputSource resolveEntity(String publicId,
                                          String systemId) {
             InputSource result = null;
@@ -834,6 +833,7 @@
             return result;
         }
 
+        @Override
         public Source resolve(String href, String base)
             throws TransformerException {
 
@@ -945,14 +945,15 @@
                 Project.MSG_VERBOSE);
         }
 
+        @Override
         public InputSource resolveEntity(String publicId,
                                          String systemId) {
-            InputSource result = null;
 
             processExternalCatalogs();
 
             ResourceLocation matchingEntry = findMatchingEntry(publicId);
 
+            InputSource result;
             if (matchingEntry != null) {
 
                 log("Matching catalog entry found for publicId: '"
@@ -996,11 +997,12 @@
             return result;
         }
 
+        @Override
         public Source resolve(String href, String base)
             throws TransformerException {
 
-            SAXSource result = null;
-            InputSource source = null;
+            SAXSource result;
+            InputSource source;
 
             processExternalCatalogs();
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/ZipFileSet.java ant-1.10.3/src/main/org/apache/tools/ant/types/ZipFileSet.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/ZipFileSet.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/ZipFileSet.java	2018-03-24 12:37:12.000000000 +0000
@@ -58,6 +58,7 @@
      * Return a new archive scanner based on this one.
      * @return a new ZipScanner with the same encoding as this one.
      */
+    @Override
     protected ArchiveScanner newArchiveScanner() {
         ZipScanner zs = new ZipScanner();
         zs.setEncoding(getEncoding());
@@ -70,19 +71,20 @@
      * @param p the project to use
      * @return the abstract fileset instance
      */
+    @Override
     protected AbstractFileSet getRef(Project p) {
         dieOnCircularReference(p);
         Object o = getRefid().getReferencedObject(p);
         if (o instanceof ZipFileSet) {
             return (AbstractFileSet) o;
-        } else if (o instanceof FileSet) {
+        }
+        if (o instanceof FileSet) {
             ZipFileSet zfs = new ZipFileSet((FileSet) o);
             configureFileSet(zfs);
             return zfs;
-        } else {
-            String msg = getRefid().getRefId() + " doesn\'t denote a zipfileset or a fileset";
-            throw new BuildException(msg);
         }
+        String msg = getRefid().getRefId() + " doesn\'t denote a zipfileset or a fileset";
+        throw new BuildException(msg);
     }
 
     /**
@@ -90,28 +92,12 @@
      * as this one.
      * @return the cloned zipFileSet
      */
+    @Override
     public Object clone() {
         if (isReference()) {
             return ((ZipFileSet) getRef(getProject())).clone();
-        } else {
-            return super.clone();
-        }
-    }
-
-    /**
-     * A check attributes for zipFileSet.
-     * If there is a reference, and
-     * it is a ZipFileSet, the zip fileset attributes
-     * cannot be used.
-     */
-    private void checkZipFileSetAttributesAllowed() {
-        if (getProject() == null
-            || (isReference()
-                && (getRefid().getReferencedObject(
-                        getProject())
-                    instanceof ZipFileSet))) {
-            checkAttributesAllowed();
         }
+        return super.clone();
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/types/ZipScanner.java ant-1.10.3/src/main/org/apache/tools/ant/types/ZipScanner.java
--- ant-1.9.10/src/main/org/apache/tools/ant/types/ZipScanner.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/types/ZipScanner.java	2018-03-24 12:37:12.000000000 +0000
@@ -52,31 +52,20 @@
      * resources found inside the archive that matched all include
      * patterns and didn't match any exclude patterns.
      */
+    @Override
     protected void fillMapsFromArchive(Resource src, String encoding,
             Map<String, Resource> fileEntries, Map<String, Resource> matchFileEntries,
             Map<String, Resource> dirEntries, Map<String, Resource> matchDirEntries) {
-        ZipEntry entry = null;
-        ZipFile zf = null;
 
-        File srcFile = null;
-        FileProvider fp = src.as(FileProvider.class);
-        if (fp != null) {
-            srcFile = fp.getFile();
-        } else {
-            throw new BuildException("Only file provider resources are supported");
-        }
+        File srcFile = src.asOptional(FileProvider.class)
+            .map(FileProvider::getFile).orElseThrow(() -> new BuildException(
+                "Only file provider resources are supported"));
+
+        try (ZipFile zf = new ZipFile(srcFile, encoding)) {
 
-        try {
-            try {
-                zf = new ZipFile(srcFile, encoding);
-            } catch (ZipException ex) {
-                throw new BuildException("Problem reading " + srcFile, ex);
-            } catch (IOException ex) {
-                throw new BuildException("Problem opening " + srcFile, ex);
-            }
             Enumeration<ZipEntry> e = zf.getEntries();
             while (e.hasMoreElements()) {
-                entry = e.nextElement();
+                ZipEntry entry = e.nextElement();
                 Resource r = new ZipResource(srcFile, encoding, entry);
                 String name = entry.getName();
                 if (entry.isDirectory()) {
@@ -92,8 +81,10 @@
                     }
                 }
             }
-        } finally {
-            ZipFile.closeQuietly(zf);
+        } catch (ZipException ex) {
+            throw new BuildException("Problem reading " + srcFile, ex);
+        } catch (IOException ex) {
+            throw new BuildException("Problem opening " + srcFile, ex);
         }
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/UnknownElement.java ant-1.10.3/src/main/org/apache/tools/ant/UnknownElement.java
--- ant-1.9.10/src/main/org/apache/tools/ant/UnknownElement.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/UnknownElement.java	2018-03-24 12:37:12.000000000 +0000
@@ -24,6 +24,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import org.apache.tools.ant.taskdefs.PreSetDef;
 
@@ -234,10 +235,8 @@
         throws IOException {
         if (realThing instanceof Task) {
             return ((Task) realThing).handleInput(buffer, offset, length);
-        } else {
-            return super.handleInput(buffer, offset, length);
         }
-
+        return super.handleInput(buffer, offset, length);
     }
 
     /**
@@ -311,7 +310,7 @@
      */
     public void addChild(UnknownElement child) {
         if (children == null) {
-            children = new ArrayList<UnknownElement>();
+            children = new ArrayList<>();
         }
         children.add(child);
     }
@@ -341,7 +340,6 @@
         Class<?> parentClass = parent.getClass();
         IntrospectionHelper ih = IntrospectionHelper.getHelper(getProject(), parentClass);
 
-
         if (children != null) {
             Iterator<UnknownElement> it = children.iterator();
             for (int i = 0; it.hasNext(); i++) {
@@ -400,7 +398,7 @@
         // Do the runtime
         getWrapper().applyPreSet(u.getWrapper());
         if (u.children != null) {
-            List<UnknownElement> newChildren = new ArrayList<UnknownElement>(u.children);
+            List<UnknownElement> newChildren = new ArrayList<>(u.children);
             if (children != null) {
                 newChildren.addAll(children);
             }
@@ -505,7 +503,6 @@
      * @return the name to use in logging messages.
      */
     public String getTaskName() {
-        //return elementName;
         return realThing == null
             || !(realThing instanceof Task) ? super.getTaskName()
                                             : ((Task) realThing).getTaskName();
@@ -611,7 +608,7 @@
         }
         UnknownElement other = (UnknownElement) obj;
         // Are the names the same ?
-        if (!equalsString(elementName, other.elementName)) {
+        if (!Objects.equals(elementName, other.elementName)) {
             return false;
         }
         if (!namespace.equals(other.namespace)) {
@@ -636,7 +633,7 @@
         // Are the sub elements the same ?
         final int childrenSize = children == null ? 0 : children.size();
         if (childrenSize == 0) {
-            return other.children == null || other.children.size() == 0;
+            return other.children == null || other.children.isEmpty();
         }
         if (other.children == null) {
             return false;
@@ -654,10 +651,6 @@
         return true;
     }
 
-    private static boolean equalsString(String a, String b) {
-        return (a == null) ? (b == null) : a.equals(b);
-    }
-
     /**
      * Make a copy of the unknown element and set it in the new project.
      * @param newProject the project to create the UE in.
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/ChainedMapper.java ant-1.10.3/src/main/org/apache/tools/ant/util/ChainedMapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/ChainedMapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/ChainedMapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,10 +18,8 @@
 
 package org.apache.tools.ant.util;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
 
 /**
  * A <code>ContainerMapper</code> that chains the results of the first
@@ -32,29 +30,17 @@
 public class ChainedMapper extends ContainerMapper {
 
     /** {@inheritDoc}. */
+    @Override
     public String[] mapFileName(String sourceFileName) {
-        List inputs = new ArrayList();
-        List results = new ArrayList();
-        results.add(sourceFileName);
-        FileNameMapper mapper = null;
-
-        for (Iterator mIter = getMappers().iterator(); mIter.hasNext();) {
-            mapper = (FileNameMapper) (mIter.next());
-            if (mapper != null) {
-                inputs.clear();
-                inputs.addAll(results);
-                results.clear();
-
-                for (Iterator it = inputs.iterator(); it.hasNext();) {
-                    String[] mapped = mapper.mapFileName((String) (it.next()));
-                    if (mapped != null) {
-                        results.addAll(Arrays.asList(mapped));
-                    }
-                }
-            }
-        }
-        return (results.size() == 0) ? null
-            : (String[]) results.toArray(new String[results.size()]);
+        // we invoke the chain even if the sourceFileName is null. Some
+        // resources have a null name and users may use a mapper like
+        // MergeMapper to provide a name for it.
+        String[] result = getMappers().stream()
+            .filter(Objects::nonNull)
+            .reduce(new String[] { sourceFileName }, (i, m) -> Stream.of(i)
+                .map(m::mapFileName).filter(Objects::nonNull).flatMap(Stream::of).toArray(String[]::new),
+                (i, o) -> o);
+        return result == null || result.length == 0 ? null : result;
     }
 }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/ClasspathUtils.java ant-1.10.3/src/main/org/apache/tools/ant/util/ClasspathUtils.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/ClasspathUtils.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/ClasspathUtils.java	2018-03-24 12:37:12.000000000 +0000
@@ -107,8 +107,9 @@
         String pathId = ref.getRefId();
         Object path = p.getReference(pathId);
         if (!(path instanceof Path)) {
-            throw new BuildException("The specified classpathref " + pathId
-                    + " does not reference a Path.");
+            throw new BuildException(
+                "The specified classpathref %s does not reference a Path.",
+                pathId);
         }
         String loaderId = MagicNames.REFID_CLASSPATH_LOADER_PREFIX + pathId;
         return getClassLoaderForPath(p, (Path) path, loaderId, reverseLoader);
@@ -174,8 +175,9 @@
         if (loaderId != null && reuseLoader) {
             Object reusedLoader = p.getReference(loaderId);
             if (reusedLoader != null && !(reusedLoader instanceof ClassLoader)) {
-                throw new BuildException("The specified loader id " + loaderId
-                        + " does not reference a class loader");
+                throw new BuildException(
+                    "The specified loader id %s does not reference a class loader",
+                    loaderId);
             }
             cl = (ClassLoader) reusedLoader;
         }
@@ -232,6 +234,7 @@
      * <p>This uses the userDefinedLoader to load the specified class,
      * and then makes an instance using the default no-argument constructor.</p>
      *
+     * @param <T> desired type
      * @param className the full qualified class name to load.
      * @param userDefinedLoader the classloader to use.
      * @param expectedType the Class that the result should be assignment
@@ -241,14 +244,16 @@
      * @throws BuildException when loading or instantiation failed.
      * @since Ant 1.7
      */
-    public static Object newInstance(String className, ClassLoader userDefinedLoader,
-            Class expectedType) {
+    public static <T> T newInstance(String className, ClassLoader userDefinedLoader,
+            Class<T> expectedType) {
         try {
-            Class clazz = Class.forName(className, true, userDefinedLoader);
-            Object o = clazz.newInstance();
+            @SuppressWarnings("unchecked")
+            Class<T> clazz = (Class<T>) Class.forName(className, true, userDefinedLoader);
+            T o = clazz.newInstance();
             if (!expectedType.isInstance(o)) {
-                throw new BuildException("Class of unexpected Type: " + className + " expected :"
-                        + expectedType);
+                throw new BuildException(
+                    "Class of unexpected Type: %s expected : %s", className,
+                    expectedType);
             }
             return o;
         } catch (ClassNotFoundException e) {
@@ -284,6 +289,9 @@
         return p.getProperty(REUSE_LOADER_REF) != null;
     }
 
+    private ClasspathUtils() {
+    }
+
     /**
      * Delegate that helps out any specific ProjectComponent that needs
      * dynamic classloading.
@@ -455,7 +463,5 @@
             return reverseLoader;
         }
 
-        //TODO no methods yet for getClassname
-        //TODO no method for newInstance using a reverse-classloader
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/CollectionUtils.java ant-1.10.3/src/main/org/apache/tools/ant/util/CollectionUtils.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/CollectionUtils.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/CollectionUtils.java	2018-03-24 12:37:12.000000000 +0000
@@ -25,7 +25,9 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.Objects;
 import java.util.Vector;
+import java.util.stream.Collectors;
 
 // CheckStyle:HideUtilityClassConstructorCheck OFF - bc
 
@@ -48,16 +50,9 @@
      * @since Ant 1.5
      * @deprecated since 1.6.x.
      */
+    @Deprecated
     public static boolean equals(Vector<?> v1, Vector<?> v2) {
-        if (v1 == v2) {
-            return true;
-        }
-
-        if (v1 == null || v2 == null) {
-            return false;
-        }
-
-        return v1.equals(v2);
+        return Objects.equals(v1, v2);
     }
 
     /**
@@ -71,6 +66,7 @@
      * @since Ant 1.5
      * @deprecated since 1.6.x.
      */
+    @Deprecated
     public static boolean equals(Dictionary<?, ?> d1, Dictionary<?, ?> d2) {
         if (d1 == d2) {
             return true;
@@ -109,14 +105,7 @@
      * @since Ant 1.8.0
      */
     public static String flattenToString(Collection<?> c) {
-        final StringBuilder sb = new StringBuilder();
-        for (Object o : c) {
-            if (sb.length() != 0) {
-                sb.append(",");
-            }
-            sb.append(o);
-        }
-        return sb.toString();
+        return c.stream().map(String::valueOf).collect(Collectors.joining(","));
     }
 
     /**
@@ -128,7 +117,9 @@
      * @since Ant 1.6
      * @deprecated since 1.6.x.
      */
-    public static <K, V> void putAll(Dictionary<? super K, ? super V> m1, Dictionary<? extends K, ? extends V> m2) {
+    @Deprecated
+    public static <K, V> void putAll(Dictionary<? super K, ? super V> m1,
+        Dictionary<? extends K, ? extends V> m2) {
         for (Enumeration<? extends K> it = m2.keys(); it.hasMoreElements();) {
             K key = it.nextElement();
             m1.put(key, m2.get(key));
@@ -139,14 +130,13 @@
      * An empty enumeration.
      * @since Ant 1.6
      */
+    @Deprecated
     public static final class EmptyEnumeration<E> implements Enumeration<E> {
-        /** Constructor for the EmptyEnumeration */
-        public EmptyEnumeration() {
-        }
 
         /**
          * @return false always.
          */
+        @Override
         public boolean hasMoreElements() {
             return false;
         }
@@ -155,6 +145,7 @@
          * @return nothing.
          * @throws NoSuchElementException always.
          */
+        @Override
         public E nextElement() throws NoSuchElementException {
             throw new NoSuchElementException();
         }
@@ -170,7 +161,7 @@
      * @since Ant 1.6.3
      */
     public static <E> Enumeration<E> append(Enumeration<E> e1, Enumeration<E> e2) {
-        return new CompoundEnumeration<E>(e1, e2);
+        return new CompoundEnumeration<>(e1, e2);
     }
 
     /**
@@ -181,9 +172,11 @@
      */
     public static <E> Enumeration<E> asEnumeration(final Iterator<E> iter) {
         return new Enumeration<E>() {
+            @Override
             public boolean hasMoreElements() {
                 return iter.hasNext();
             }
+            @Override
             public E nextElement() {
                 return iter.next();
             }
@@ -198,12 +191,15 @@
      */
     public static <E> Iterator<E> asIterator(final Enumeration<E> e) {
         return new Iterator<E>() {
+            @Override
             public boolean hasNext() {
                 return e.hasMoreElements();
             }
+            @Override
             public E next() {
                 return e.nextElement();
             }
+            @Override
             public void remove() {
                 throw new UnsupportedOperationException();
             }
@@ -219,10 +215,8 @@
      * @since Ant 1.8.0
      */
     public static <T> Collection<T> asCollection(final Iterator<? extends T> iter) {
-        List<T> l = new ArrayList<T>();
-        while (iter.hasNext()) {
-            l.add(iter.next());
-        }
+        List<T> l = new ArrayList<>();
+        iter.forEachRemaining(l::add);
         return l;
     }
 
@@ -235,16 +229,17 @@
             this.e2 = e2;
         }
 
+        @Override
         public boolean hasMoreElements() {
             return e1.hasMoreElements() || e2.hasMoreElements();
         }
 
+        @Override
         public E nextElement() throws NoSuchElementException {
             if (e1.hasMoreElements()) {
                 return e1.nextElement();
-            } else {
-                return e2.nextElement();
             }
+            return e2.nextElement();
         }
 
     }
@@ -258,18 +253,11 @@
      * @return frequency
      * @since Ant 1.8.0
      */
+    @Deprecated
     public static int frequency(Collection<?> c, Object o) {
-        // same as Collections.frequency introduced with JDK 1.5
-        int freq = 0;
-        if (c != null) {
-            for (Iterator<?> i = c.iterator(); i.hasNext();) {
-                Object test = i.next();
-                if (o == null ? test == null : o.equals(test)) {
-                    freq++;
-                }
-            }
-        }
-        return freq;
+        return c == null ? 0 : Collections.frequency(c, o);
     }
 
+    private CollectionUtils() {
+    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/CompositeMapper.java ant-1.10.3/src/main/org/apache/tools/ant/util/CompositeMapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/CompositeMapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/CompositeMapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,8 +17,8 @@
  */
 package org.apache.tools.ant.util;
 
-import java.util.Iterator;
-import java.util.LinkedHashSet;
+import java.util.Objects;
+import java.util.stream.Stream;
 
 /**
  * A <code>ContainerMapper</code> that unites the results of its constituent
@@ -28,23 +28,9 @@
 
     /** {@inheritDoc}. */
     public String[] mapFileName(String sourceFileName) {
-        LinkedHashSet results = new LinkedHashSet();
-
-        FileNameMapper mapper = null;
-        for (Iterator mIter = getMappers().iterator(); mIter.hasNext();) {
-            mapper = (FileNameMapper) (mIter.next());
-            if (mapper != null) {
-                String[] mapped = mapper.mapFileName(sourceFileName);
-                if (mapped != null) {
-                    for (int i = 0; i < mapped.length; i++) {
-                        results.add(mapped[i]);
-                    }
-                }
-            }
-        }
-        return (results.size() == 0) ? null
-            : (String[]) results.toArray(new String[results.size()]);
+        String[] result = getMappers().stream().filter(Objects::nonNull)
+            .map(m -> m.mapFileName(sourceFileName)).filter(Objects::nonNull)
+            .flatMap(Stream::of).toArray(String[]::new);
+        return result.length == 0 ? null : result;
     }
-
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/ConcatFileInputStream.java ant-1.10.3/src/main/org/apache/tools/ant/util/ConcatFileInputStream.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/ConcatFileInputStream.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/ConcatFileInputStream.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,9 +20,9 @@
 
 import java.io.BufferedInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
 
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectComponent;
@@ -55,6 +55,7 @@
      * Close the stream.
      * @throws IOException if there is an error.
      */
+    @Override
     public void close() throws IOException {
         closeCurrent();
         eof = true;
@@ -65,6 +66,7 @@
      * @return the byte (0 - 255) or -1 if this is the end of the stream.
      * @throws IOException if there is an error.
      */
+    @Override
     public int read() throws IOException {
         int result = readCurrent();
         if (result == EOF && !eof) {
@@ -119,7 +121,7 @@
             log("Opening " + file[index], Project.MSG_VERBOSE);
             try {
                 currentStream = new BufferedInputStream(
-                    new FileInputStream(file[index]));
+                    Files.newInputStream(file[index].toPath()));
             } catch (IOException eyeOhEx) {
                 log("Failed to open " + file[index], Project.MSG_ERR);
                 throw eyeOhEx;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/ConcatResourceInputStream.java ant-1.10.3/src/main/org/apache/tools/ant/util/ConcatResourceInputStream.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/ConcatResourceInputStream.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/ConcatResourceInputStream.java	2018-03-24 12:37:12.000000000 +0000
@@ -71,6 +71,7 @@
      * Close the stream.
      * @throws IOException if there is an error.
      */
+    @Override
      public void close() throws IOException {
         closeCurrent();
         eof = true;
@@ -81,6 +82,7 @@
      * @return the byte (0 - 255) or -1 if this is the end of the stream.
      * @throws IOException if there is an error.
      */
+    @Override
     public int read() throws IOException {
         if (eof) {
             return EOF;
@@ -122,7 +124,7 @@
     private void nextResource() throws IOException {
         closeCurrent();
         while (iter.hasNext()) {
-            Resource r = (Resource) iter.next();
+            Resource r = iter.next();
             if (!r.isExists()) {
                 continue;
             }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/ContainerMapper.java ant-1.10.3/src/main/org/apache/tools/ant/util/ContainerMapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/ContainerMapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/ContainerMapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,7 +20,6 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.tools.ant.types.Mapper;
@@ -32,7 +31,7 @@
  */
 public abstract class ContainerMapper implements FileNameMapper {
 
-    private List mappers = new ArrayList();
+    private List<FileNameMapper> mappers = new ArrayList<>();
 
     /**
      * Add a <code>Mapper</code>.
@@ -69,9 +68,8 @@
             && ((ContainerMapper) fileNameMapper).contains(this))) {
             throw new IllegalArgumentException(
                 "Circular mapper containment condition detected");
-        } else {
-            mappers.add(fileNameMapper);
         }
+        mappers.add(fileNameMapper);
     }
 
     /**
@@ -81,21 +79,23 @@
      * @return <code>boolean</code>.
      */
     protected synchronized boolean contains(FileNameMapper fileNameMapper) {
-        boolean foundit = false;
-        for (Iterator iter = mappers.iterator(); iter.hasNext() && !foundit;) {
-            FileNameMapper next = (FileNameMapper) (iter.next());
-            foundit = (next == fileNameMapper
-                || (next instanceof ContainerMapper
-                && ((ContainerMapper) next).contains(fileNameMapper)));
+        for (FileNameMapper m : mappers) {
+            if (m == fileNameMapper) {
+                return true;
+            }
+            if (m instanceof ContainerMapper
+                && ((ContainerMapper) m).contains(fileNameMapper)) {
+                return true;
+            }
         }
-        return foundit;
+        return false;
     }
 
     /**
      * Get the <code>List</code> of <code>FileNameMapper</code>s.
      * @return <code>List</code>.
      */
-    public synchronized List getMappers() {
+    public synchronized List<FileNameMapper> getMappers() {
         return Collections.unmodifiableList(mappers);
     }
 
@@ -103,6 +103,7 @@
      * Empty implementation.
      * @param ignore ignored.
      */
+    @Override
     public void setFrom(String ignore) {
         //Empty
     }
@@ -111,6 +112,7 @@
      * Empty implementation.
      * @param ignore ignored.
      */
+    @Override
     public void setTo(String ignore) {
         //Empty
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/DateUtils.java ant-1.10.3/src/main/org/apache/tools/ant/util/DateUtils.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/DateUtils.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/DateUtils.java	2018-03-24 12:37:12.000000000 +0000
@@ -68,12 +68,12 @@
      * some other code is using the format in parallel.
      * Deprecated since ant 1.8
      */
+    @Deprecated
     public static final DateFormat DATE_HEADER_FORMAT
         = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss ", Locale.US);
 
-    private static final DateFormat DATE_HEADER_FORMAT_INT
-    = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss ", Locale.US);
-
+    private static final DateFormat DATE_HEADER_FORMAT_INT =
+        new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss ", Locale.US);
 
 // code from Magesh moved from DefaultLogger and slightly modified
     private static final MessageFormat MINUTE_SECONDS
@@ -95,7 +95,7 @@
      * Provides a thread-local US-style date format. Exactly as used by
      * {@code <touch>}, to minute precision:
      * {@code SimpleDateFormat("MM/dd/yyyy hh:mm a", Locale.US)}
-     * @since Ant 1.9.10
+     * @since Ant 1.10.2
      */
     public static final ThreadLocal<DateFormat> EN_US_DATE_FORMAT_MIN =
         new ThreadLocal<DateFormat>() {
@@ -109,7 +109,7 @@
      * Provides a thread-local US-style date format. Exactly as used by
      * {@code <touch>}, to second precision:
      * {@code SimpleDateFormat("MM/dd/yyyy hh:mm:ss a", Locale.US)}
-     * @since Ant 1.9.10
+     * @since Ant 1.10.2
      */
     public static final ThreadLocal<DateFormat> EN_US_DATE_FORMAT_SEC =
         new ThreadLocal<DateFormat>() {
@@ -245,7 +245,7 @@
                                   cal.get(Calendar.DAY_OF_MONTH),
                                   cal.get(Calendar.DAY_OF_WEEK),
                                   cal.get(Calendar.MILLISECOND));
-        StringBuffer tzMarker = new StringBuffer(offset < 0 ? "-" : "+");
+        StringBuilder tzMarker = new StringBuilder(offset < 0 ? "-" : "+");
         offset = Math.abs(offset);
         int hours = offset / (ONE_HOUR * ONE_MINUTE * ONE_SECOND);
         int minutes = offset / (ONE_MINUTE * ONE_SECOND) - ONE_HOUR * hours;
@@ -355,7 +355,7 @@
      * @param dateStr String
      * @return Date
      * @throws ParseException if date string does not match ISO 8601
-     * @since Ant 1.9.10
+     * @since Ant 1.10.2
      */
     public static Date parseLenientDateTime(String dateStr) throws ParseException {
         try {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java ant-1.10.3/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java	2018-03-24 12:37:12.000000000 +0000
@@ -42,7 +42,7 @@
     private Path classPath = new Path(null);
 
     /** The list of root classes */
-    private final Vector<String> rootClasses = new VectorSet<String>();
+    private final Vector<String> rootClasses = new VectorSet<>();
 
     /** true if dependencies have been determined */
     private boolean determined = false;
@@ -68,6 +68,7 @@
      * @param closure true if dependencies should be traversed to determine
      *      indirect dependencies.
      */
+    @Override
     public void setClosure(boolean closure) {
         this.closure = closure;
     }
@@ -79,10 +80,11 @@
      *
      * @return an enumeration of File instances.
      */
+    @Override
     public Enumeration<File> getFileDependencies() {
         if (!supportsFileDependencies()) {
-            throw new BuildException("File dependencies are not supported "
-                + "by this analyzer");
+            throw new BuildException(
+                "File dependencies are not supported by this analyzer");
         }
         if (!determined) {
             determineDependencies(fileDependencies, classDependencies);
@@ -97,6 +99,7 @@
      * @return an enumeration of Strings, each being the name of a Java
      *      class in dot notation.
      */
+    @Override
     public Enumeration<String> getClassDependencies() {
         if (!determined) {
             determineDependencies(fileDependencies, classDependencies);
@@ -112,6 +115,7 @@
      *         class or null if the class could not be found.
      * @exception IOException if the files in the classpath cannot be read.
      */
+    @Override
     public File getClassContainer(String classname) throws IOException {
         String classLocation = classname.replace('.', '/') + ".class";
         // we look through the classpath elements. If the element is a dir
@@ -127,6 +131,7 @@
      *         source or null if the source for the class could not be found.
      * @exception IOException if the files in the sourcepath cannot be read.
      */
+    @Override
     public File getSourceContainer(String classname) throws IOException {
         String sourceLocation = classname.replace('.', '/') + ".java";
 
@@ -144,6 +149,7 @@
      * @param sourcePath The Path instance specifying the source path
      *      elements.
      */
+    @Override
     public void addSourcePath(Path sourcePath) {
         if (sourcePath == null) {
             return;
@@ -160,6 +166,7 @@
      *
      * @param classPath the Path instance specifying the classpath elements
      */
+    @Override
     public void addClassPath(Path classPath) {
         if (classPath == null) {
             return;
@@ -176,6 +183,7 @@
      *
      * @param className the name of the class in Java dot notation.
      */
+    @Override
     public void addRootClass(String className) {
         if (className == null) {
             return;
@@ -192,6 +200,7 @@
      * @param name the name of the aspect being configured
      * @param info the configuration info.
      */
+    @Override
     public void config(String name, Object info) {
         // do nothing by default
     }
@@ -200,11 +209,12 @@
      * Reset the dependency list. This will reset the determined
      * dependencies and the also list of root classes.
      */
+    @Override
     public void reset() {
         rootClasses.removeAllElements();
         determined = false;
-        fileDependencies = new Vector<File>();
-        classDependencies = new Vector<String>();
+        fileDependencies = new Vector<>();
+        classDependencies = new Vector<>();
     }
 
     /**
@@ -268,16 +278,10 @@
                 }
             } else {
                 // must be a zip of some sort
-                ZipFile zipFile = null;
-                try {
-                    zipFile = new ZipFile(element);
+                try (ZipFile zipFile = new ZipFile(element)) {
                     if (zipFile.getEntry(resourceLocation) != null) {
                         return element;
                     }
-                } finally {
-                    if (zipFile != null) {
-                        zipFile.close();
-                    }
                 }
             }
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java ant-1.10.3/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,8 +19,10 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.Vector;
+
 import org.apache.bcel.classfile.ClassParser;
 import org.apache.bcel.classfile.JavaClass;
 import org.apache.tools.ant.BuildException;
@@ -61,33 +63,33 @@
      * @param classes a vector to be populated with the names of the
      *      dependency classes.
      */
+    @Override
     protected void determineDependencies(Vector<File> files, Vector<String> classes) {
         // we get the root classes and build up a set of
         // classes upon which they depend
-        Hashtable<String, String> dependencies = new Hashtable<String, String>();
-        Hashtable<File, File> containers = new Hashtable<File, File>();
-        Hashtable<String, String> toAnalyze = new Hashtable<String, String>();
-        Hashtable<String, String> nextAnalyze = new Hashtable<String, String>();
+        Set<String> dependencies = new HashSet<>();
+        Set<File> containers = new HashSet<>();
+        Set<String> toAnalyze = new HashSet<>();
+        Set<String> nextAnalyze = new HashSet<>();
 
         for (Enumeration<String> e = getRootClasses(); e.hasMoreElements();) {
-            String classname = e.nextElement();
-            toAnalyze.put(classname, classname);
+            toAnalyze.add(e.nextElement());
         }
 
         int count = 0;
         int maxCount = isClosureRequired() ? MAX_LOOPS : 2;
-        while (toAnalyze.size() != 0 && count++ < maxCount) {
+        while (!toAnalyze.isEmpty() && count++ < maxCount) {
             nextAnalyze.clear();
-            for (String classname : toAnalyze.keySet()) {
-                dependencies.put(classname, classname);
+            for (String classname : toAnalyze) {
+                dependencies.add(classname);
                 try {
                     File container = getClassContainer(classname);
                     if (container == null) {
                         continue;
                     }
-                    containers.put(container, container);
+                    containers.add(container);
 
-                    ClassParser parser = null;
+                    ClassParser parser;
                     if (container.getName().endsWith(".class")) {
                         parser = new ClassParser(container.getPath());
                     } else {
@@ -96,18 +98,16 @@
                     }
 
                     JavaClass javaClass = parser.parse();
-                    String[] interfaces = javaClass.getInterfaceNames();
-                    for (int i = 0; i < interfaces.length; ++i) {
-                        String interfaceName = interfaces[i];
-                        if (!dependencies.containsKey(interfaceName)) {
-                            nextAnalyze.put(interfaceName, interfaceName);
+                    for (String interfaceName : javaClass.getInterfaceNames()) {
+                        if (!dependencies.contains(interfaceName)) {
+                            nextAnalyze.add(interfaceName);
                         }
                     }
 
                     if (javaClass.isClass()) {
                         String superClass = javaClass.getSuperclassName();
-                        if (!dependencies.containsKey(superClass)) {
-                            nextAnalyze.put(superClass, superClass);
+                        if (!dependencies.contains(superClass)) {
+                            nextAnalyze.add(superClass);
                         }
                     }
                 } catch (IOException ioe) {
@@ -115,20 +115,16 @@
                 }
             }
 
-            Hashtable<String, String> temp = toAnalyze;
+            Set<String> temp = toAnalyze;
             toAnalyze = nextAnalyze;
             nextAnalyze = temp;
         }
 
-        files.removeAllElements();
-        for (File f : containers.keySet()) {
-            files.add(f);
-        }
+        files.clear();
+        files.addAll(containers);
 
-        classes.removeAllElements();
-        for (String dependency : dependencies.keySet()) {
-            classes.add(dependency);
-        }
+        classes.clear();
+        classes.addAll(dependencies);
     }
 
     /**
@@ -136,6 +132,7 @@
      *
      * @return true if the analyzer provides dependency file information.
      */
+    @Override
     protected boolean supportsFileDependencies() {
         return true;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java ant-1.10.3/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,8 +17,10 @@
  */
 package org.apache.tools.ant.util.depend.bcel;
 
+import java.util.Collections;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.StringTokenizer;
 
 import org.apache.bcel.classfile.ConstantClass;
@@ -35,7 +37,7 @@
  */
 public class DependencyVisitor extends EmptyVisitor {
     /** The collected dependencies */
-    private final Hashtable<String, String> dependencies = new Hashtable<String, String>();
+    private final Set<String> dependencies = new HashSet<>();
     /**
      * The current class's constant pool - used to determine class names
      * from class references.
@@ -49,7 +51,7 @@
      *      visited classes depend.
      */
     public Enumeration<String> getDependencies() {
-        return dependencies.keys();
+        return Collections.enumeration(dependencies);
     }
 
     /** Clear the current set of collected dependencies. */
@@ -62,6 +64,7 @@
      *
      * @param constantPool the constant pool of the class being visited.
      */
+    @Override
     public void visitConstantPool(final ConstantPool constantPool) {
         this.constantPool = constantPool;
     }
@@ -71,6 +74,7 @@
      *
      * @param constantClass the constantClass entry for the class reference
      */
+    @Override
     public void visitConstantClass(final ConstantClass constantClass) {
         final String classname
              = constantClass.getConstantValue(constantPool).toString();
@@ -84,18 +88,19 @@
      *
      * @param obj the name and type reference being visited.
      */
+    @Override
     public void visitConstantNameAndType(final ConstantNameAndType obj) {
         final String name = obj.getName(constantPool);
-        if (obj.getSignature(constantPool).equals("Ljava/lang/Class;")
+        if ("Ljava/lang/Class;".equals(obj.getSignature(constantPool))
                 && name.startsWith("class$")) {
             String classname
                 = name.substring("class$".length()).replace('$', '.');
             // does the class have a package structure
-            final int index = classname.lastIndexOf(".");
+            final int index = classname.lastIndexOf('.');
             if (index > 0) {
                 char start;
                 // check if the package structure is more than 1 level deep
-                final int index2 = classname.lastIndexOf(".", index - 1);
+                final int index2 = classname.lastIndexOf('.', index - 1);
                 if (index2 != -1) {
                     // class name has more than 1 package level 'com.company.Class'
                     start = classname.charAt(index2 + 1);
@@ -128,6 +133,7 @@
      *
      * @param field the field being visited
      */
+    @Override
     public void visitField(final Field field) {
         addClasses(field.getSignature());
     }
@@ -137,6 +143,7 @@
      *
      * @param javaClass the class being visited.
      */
+    @Override
     public void visitJavaClass(final JavaClass javaClass) {
         addClass(javaClass.getClassName());
     }
@@ -146,9 +153,10 @@
      *
      * @param method the method being visited.
      */
+    @Override
     public void visitMethod(final Method method) {
         final String signature = method.getSignature();
-        final int pos = signature.indexOf(")");
+        final int pos = signature.indexOf(')');
         addClasses(signature.substring(1, pos));
         addClasses(signature.substring(pos + 1));
     }
@@ -159,7 +167,7 @@
      * @param classname the class to be added to the list of dependencies.
      */
     void addClass(final String classname) {
-        dependencies.put(classname, classname);
+        dependencies.add(classname);
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java ant-1.10.3/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,9 +18,12 @@
 package org.apache.tools.ant.util.depend.bcel;
 import java.io.File;
 import java.io.IOException;
+import java.util.Collections;
 import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.Vector;
+
 import org.apache.bcel.classfile.ClassParser;
 import org.apache.bcel.classfile.DescendingVisitor;
 import org.apache.bcel.classfile.JavaClass;
@@ -60,31 +63,28 @@
      * @param classes a vector to be populated with the names of the
      *      dependency classes.
      */
+    @Override
     protected void determineDependencies(Vector<File> files, Vector<String> classes) {
         // we get the root classes and build up a set of
         // classes upon which they depend
-        Hashtable<String, String> dependencies = new Hashtable<String, String>();
-        Hashtable<File, File> containers = new Hashtable<File, File>();
-        Hashtable<String, String> toAnalyze = new Hashtable<String, String>();
-        for (Enumeration<String> e = getRootClasses(); e.hasMoreElements();) {
-            String classname = e.nextElement();
-            toAnalyze.put(classname, classname);
-        }
+        Set<String> dependencies = new HashSet<>();
+        Set<File> containers = new HashSet<>();
+        Set<String> toAnalyze = new HashSet<>(Collections.list(getRootClasses()));
 
         int count = 0;
         int maxCount = isClosureRequired() ? MAX_LOOPS : 2;
-        while (toAnalyze.size() != 0 && count++ < maxCount) {
+        while (!toAnalyze.isEmpty() && count++ < maxCount) {
             DependencyVisitor dependencyVisitor = new DependencyVisitor();
-            for (String classname : toAnalyze.keySet()) {
-                dependencies.put(classname, classname);
+            for (String classname : toAnalyze) {
+                dependencies.add(classname);
                 try {
                     File container = getClassContainer(classname);
                     if (container == null) {
                         continue;
                     }
-                    containers.put(container, container);
+                    containers.add(container);
 
-                    ClassParser parser = null;
+                    ClassParser parser;
                     if (container.getName().endsWith(".class")) {
                         parser = new ClassParser(container.getPath());
                     } else {
@@ -107,21 +107,17 @@
             Enumeration<String> depsEnum = dependencyVisitor.getDependencies();
             while (depsEnum.hasMoreElements()) {
                 String className = depsEnum.nextElement();
-                if (!dependencies.containsKey(className)) {
-                    toAnalyze.put(className, className);
+                if (!dependencies.contains(className)) {
+                    toAnalyze.add(className);
                 }
             }
         }
 
-        files.removeAllElements();
-        for (File f : containers.keySet()) {
-            files.add(f);
-        }
+        files.clear();
+        files.addAll(containers);
 
-        classes.removeAllElements();
-        for (String dependency : dependencies.keySet()) {
-            classes.add(dependency);
-        }
+        classes.clear();
+        classes.addAll(dependencies);
     }
 
     /**
@@ -129,6 +125,7 @@
      *
      * @return true if the analyzer provides dependency file information.
      */
+    @Override
     protected boolean supportsFileDependencies() {
         return true;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/DeweyDecimal.java ant-1.10.3/src/main/org/apache/tools/ant/util/DeweyDecimal.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/DeweyDecimal.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/DeweyDecimal.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,6 +18,8 @@
 package org.apache.tools.ant.util;
 
 import java.util.StringTokenizer;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
  * Utility class to contain version numbers in "Dewey Decimal"
@@ -195,16 +197,8 @@
      * @return the string representation of DeweyDecimal.
      */
     @Override public String toString() {
-        final StringBuffer sb = new StringBuffer();
-
-        for (int i = 0; i < components.length; i++) {
-            if (i != 0) {
-                sb.append('.');
-            }
-            sb.append(components[ i ]);
-        }
-
-        return sb.toString();
+        return IntStream.of(components).mapToObj(Integer::toString)
+            .collect(Collectors.joining("."));
     }
 
     /**
@@ -214,6 +208,7 @@
      * @return result
      * @see java.lang.Comparable#compareTo(Object)
      */
+    @Override
     public int compareTo(DeweyDecimal other) {
         final int max = Math.max(other.components.length, components.length);
         for (int i = 0; i < max; i++) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/DOMElementWriter.java ant-1.10.3/src/main/org/apache/tools/ant/util/DOMElementWriter.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/DOMElementWriter.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/DOMElementWriter.java	2018-03-24 12:37:12.000000000 +0000
@@ -25,7 +25,8 @@
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
@@ -68,7 +69,7 @@
     /**
      * Map (URI to prefix) of known namespaces.
      */
-    private HashMap nsPrefixMap = new HashMap();
+    private Map<String, String> nsPrefixMap = new HashMap<>();
 
     /**
      * Number of generated prefix to use next.
@@ -78,7 +79,7 @@
     /**
      * Map (Element to URI) of namespaces defined on a given element.
      */
-    private HashMap nsURIByElement = new HashMap();
+    private Map<Element, List<String>> nsURIByElement = new HashMap<>();
 
     /**
      * Whether namespaces should be ignored for elements and attributes.
@@ -346,12 +347,10 @@
         }
 
         // write namespace declarations
-        ArrayList al = (ArrayList) nsURIByElement.get(element);
-        if (al != null) {
-            Iterator iter = al.iterator();
-            while (iter.hasNext()) {
-                String uri = (String) iter.next();
-                String prefix = (String) nsPrefixMap.get(uri);
+        List<String> uris = nsURIByElement.get(element);
+        if (uris != null) {
+            for (String uri : uris) {
+                String prefix = nsPrefixMap.get(uri);
                 out.write(" xmlns");
                 if (!"".equals(prefix)) {
                     out.write(":");
@@ -436,7 +435,7 @@
 
     private String encode(final String value, final boolean encodeWhitespace) {
         final int len = value.length();
-        final StringBuffer sb = new StringBuffer(len);
+        final StringBuilder sb = new StringBuilder(len);
         for (int i = 0; i < len; i++) {
             final char c = value.charAt(i);
             switch (c) {
@@ -598,13 +597,17 @@
         // CheckStyle:MagicNumber OFF
         if (c == 0x9 || c == 0xA || c == 0xD) {
             return true;
-        } else if (c < 0x20) {
+        }
+        if (c < 0x20) {
             return false;
-        } else if (c <= 0xD7FF) {
+        }
+        if (c <= 0xD7FF) {
             return true;
-        } else if (c < 0xE000) {
+        }
+        if (c < 0xE000) {
             return false;
-        } else if (c <= 0xFFFD) {
+        }
+        if (c <= 0xFFFD) {
             return true;
         }
         // CheckStyle:MagicNumber ON
@@ -612,31 +615,20 @@
     }
 
     private void removeNSDefinitions(Element element) {
-        ArrayList al = (ArrayList) nsURIByElement.get(element);
-        if (al != null) {
-            Iterator iter = al.iterator();
-            while (iter.hasNext()) {
-                nsPrefixMap.remove(iter.next());
-            }
+        List<String> uris = nsURIByElement.get(element);
+        if (uris != null) {
+            uris.forEach(nsPrefixMap::remove);
             nsURIByElement.remove(element);
         }
     }
 
     private void addNSDefinition(Element element, String uri) {
-        ArrayList al = (ArrayList) nsURIByElement.get(element);
-        if (al == null) {
-            al = new ArrayList();
-            nsURIByElement.put(element, al);
-        }
-        al.add(uri);
+        nsURIByElement.computeIfAbsent(element, e -> new ArrayList<>())
+            .add(uri);
     }
 
     private static String getNamespaceURI(Node n) {
         String uri = n.getNamespaceURI();
-        if (uri == null) {
-            // FIXME: Is "No Namespace is Empty Namespace" really OK?
-            uri = "";
-        }
-        return uri;
+        return uri == null ? "" : uri;
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/DOMUtils.java ant-1.10.3/src/main/org/apache/tools/ant/util/DOMUtils.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/DOMUtils.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/DOMUtils.java	2018-03-24 12:37:12.000000000 +0000
@@ -160,4 +160,7 @@
         Element e = createChildElement(parent, name);
         appendCDATA(e, content);
     }
+
+    private DOMUtils() {
+    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java ant-1.10.3/src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/facade/FacadeTaskHelper.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,6 +20,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.Path;
@@ -37,7 +39,7 @@
     /**
      * Command line arguments.
      */
-    private List<ImplementationSpecificArgument> args = new ArrayList<ImplementationSpecificArgument>();
+    private List<ImplementationSpecificArgument> args = new ArrayList<>();
 
     /**
      * The explicitly chosen implementation.
@@ -126,17 +128,10 @@
      * @return an array of command line arguments.
      */
     public String[] getArgs() {
-        List<String> tmp = new ArrayList<String>(args.size());
-        for (ImplementationSpecificArgument arg : args) {
-            String[] curr = arg.getParts(getImplementation());
-            if (curr != null) {
-                for (int i = 0; i < curr.length; i++) {
-                    tmp.add(curr[i]);
-                }
-            }
-        }
-        String[] res = new String[tmp.size()];
-        return (String[]) tmp.toArray(res);
+        String implementation = getImplementation();
+        return args.stream().map(arg -> arg.getParts(implementation))
+            .filter(Objects::nonNull).flatMap(Stream::of)
+            .toArray(String[]::new);
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/facade/ImplementationSpecificArgument.java ant-1.10.3/src/main/org/apache/tools/ant/util/facade/ImplementationSpecificArgument.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/facade/ImplementationSpecificArgument.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/facade/ImplementationSpecificArgument.java	2018-03-24 12:37:12.000000000 +0000
@@ -30,11 +30,6 @@
 public class ImplementationSpecificArgument extends Commandline.Argument {
     private String impl;
 
-    /** Constructor for ImplementationSpecificArgument. */
-    public ImplementationSpecificArgument() {
-        super();
-    }
-
     /**
      * Set the implementation this argument is for.
      * @param impl the implementation this command line argument is for.
@@ -54,8 +49,7 @@
     public final String[] getParts(String chosenImpl) {
         if (impl == null || impl.equals(chosenImpl)) {
             return super.getParts();
-        } else {
-            return new String[0];
         }
+        return new String[0];
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/FileNameMapper.java ant-1.10.3/src/main/org/apache/tools/ant/util/FileNameMapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/FileNameMapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/FileNameMapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -52,7 +52,9 @@
      * omit the source file in question.</p>
      *
      * @param sourceFileName the name of the source file relative to
-     *                       some given basedirectory.
+     *                       some given basedirectory. Might be {@code
+     *                       null} for resources that don't provide a
+     *                       name.
      * @return an array of strings if the rule applies to the source file, or
      *         null if it does not.
      */
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/FileTokenizer.java ant-1.10.3/src/main/org/apache/tools/ant/util/FileTokenizer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/FileTokenizer.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/FileTokenizer.java	2018-03-24 12:37:12.000000000 +0000
@@ -34,6 +34,7 @@
      * @return the complete input
      * @throws IOException if error reading
      */
+    @Override
     public String getToken(Reader in) throws IOException {
         return FileUtils.readFully(in);
     }
@@ -42,6 +43,7 @@
      * Return the intra-token string
      * @return an empty string always
      */
+    @Override
     public String getPostToken() {
         return "";
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/FileUtils.java ant-1.10.3/src/main/org/apache/tools/ant/util/FileUtils.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/FileUtils.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/FileUtils.java	2018-03-24 12:37:12.000000000 +0000
@@ -31,22 +31,27 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.channels.Channel;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 import java.util.Stack;
 import java.util.StringTokenizer;
 import java.util.Vector;
 import java.util.jar.JarFile;
+import java.util.stream.Collectors;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.PathTokenizer;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.launch.Locator;
 import org.apache.tools.ant.taskdefs.condition.Os;
+import org.apache.tools.ant.types.FilterChain;
 import org.apache.tools.ant.types.FilterSetCollection;
 import org.apache.tools.ant.types.resources.FileResource;
 
@@ -109,6 +114,7 @@
      *             Use getFileUtils instead,
      * FileUtils do not have state.
      */
+    @Deprecated
     public static FileUtils newFileUtils() {
         return new FileUtils();
     }
@@ -272,7 +278,7 @@
      * @since Ant 1.5
      */
     public void copyFile(String sourceFile, String destFile,
-                         FilterSetCollection filters, Vector filterChains,
+                         FilterSetCollection filters, Vector<FilterChain> filterChains,
                          boolean overwrite, boolean preserveLastModified,
                          String encoding, Project project) throws IOException {
         copyFile(new File(sourceFile), new File(destFile), filters, filterChains, overwrite,
@@ -302,7 +308,7 @@
      * @since Ant 1.6
      */
     public void copyFile(String sourceFile, String destFile,
-                         FilterSetCollection filters, Vector filterChains,
+                         FilterSetCollection filters, Vector<FilterChain> filterChains,
                          boolean overwrite, boolean preserveLastModified,
                          String inputEncoding, String outputEncoding,
                          Project project) throws IOException {
@@ -437,7 +443,7 @@
      * @since Ant 1.5
      */
     public void copyFile(File sourceFile, File destFile,
-                         FilterSetCollection filters, Vector filterChains,
+                         FilterSetCollection filters, Vector<FilterChain> filterChains,
                          boolean overwrite, boolean preserveLastModified,
                          String encoding, Project project) throws IOException {
         copyFile(sourceFile, destFile, filters, filterChains,
@@ -473,7 +479,7 @@
      * @since Ant 1.6
      */
     public void copyFile(File sourceFile, File destFile,
-            FilterSetCollection filters, Vector filterChains,
+            FilterSetCollection filters, Vector<FilterChain> filterChains,
             boolean overwrite, boolean preserveLastModified,
             String inputEncoding, String outputEncoding,
             Project project) throws IOException {
@@ -511,7 +517,7 @@
      * @since Ant 1.8
      */
     public void copyFile(File sourceFile, File destFile,
-                         FilterSetCollection filters, Vector filterChains,
+                         FilterSetCollection filters, Vector<FilterChain> filterChains,
                          boolean overwrite, boolean preserveLastModified,
                          boolean append,
                          String inputEncoding, String outputEncoding,
@@ -551,7 +557,7 @@
      * @since Ant 1.8.2
      */
     public void copyFile(File sourceFile, File destFile,
-                         FilterSetCollection filters, Vector filterChains,
+                         FilterSetCollection filters, Vector<FilterChain> filterChains,
                          boolean overwrite, boolean preserveLastModified,
                          boolean append,
                          String inputEncoding, String outputEncoding,
@@ -695,10 +701,10 @@
      * @see PathTokenizer
      */
     public static String translatePath(String toProcess) {
-        if (toProcess == null || toProcess.length() == 0) {
+        if (toProcess == null || toProcess.isEmpty()) {
             return "";
         }
-        StringBuffer path = new StringBuffer(toProcess.length() + EXPAND_SPACE);
+        StringBuilder path = new StringBuilder(toProcess.length() + EXPAND_SPACE);
         PathTokenizer tokenizer = new PathTokenizer(toProcess);
         while (tokenizer.hasMoreTokens()) {
             String pathComponent = tokenizer.nextToken();
@@ -732,7 +738,7 @@
      * @throws java.lang.NullPointerException if path is null.
      */
     public File normalize(final String path) {
-        Stack s = new Stack();
+        Stack<String> s = new Stack<>();
         String[] dissect = dissect(path);
         s.push(dissect[0]);
 
@@ -752,7 +758,7 @@
                 s.push(thisToken);
             }
         }
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         final int size = s.size();
         for (int i = 0; i < size; i++) {
             if (i > 1) {
@@ -780,7 +786,7 @@
         if (!isAbsolutePath(path)) {
             throw new BuildException(path + " is not an absolute path");
         }
-        String root = null;
+        String root;
         int colon = path.indexOf(':');
         if (colon > 0 && (ON_DOS || ON_NETWARE)) {
 
@@ -833,7 +839,7 @@
                 && !name.regionMatches(true, name.length() - 4, ".DIR", 0, 4);
         // CheckStyle:MagicNumber ON
         String device = null;
-        StringBuffer directory = null;
+        StringBuilder directory = null;
         String file = null;
 
         int index = 0;
@@ -846,13 +852,13 @@
             device = path.substring(1, index++);
         }
         if (isDirectory) {
-            directory = new StringBuffer(path.substring(index).replace(File.separatorChar, '.'));
+            directory = new StringBuilder(path.substring(index).replace(File.separatorChar, '.'));
         } else {
             int dirEnd = path.lastIndexOf(File.separatorChar, path.length());
             if (dirEnd == -1 || dirEnd < index) {
                 file = path.substring(index);
             } else {
-                directory = new StringBuffer(path.substring(index, dirEnd).
+                directory = new StringBuilder(path.substring(index, dirEnd).
                                              replace(File.separatorChar, '.'));
                 index = dirEnd + 1;
                 if (path.length() > index) {
@@ -894,6 +900,7 @@
      * boolean, boolean) instead.
      * @return a File reference to the new, nonexistent temporary file.
      */
+    @Deprecated
     public File createTempFile(String prefix, String suffix, File parentDir) {
         return createTempFile(prefix, suffix, parentDir, false, false);
     }
@@ -923,7 +930,7 @@
      */
     public File createTempFile(String prefix, String suffix, File parentDir,
             boolean deleteOnExit, boolean createFile) {
-        File result = null;
+        File result;
         String parent = (parentDir == null)
                 ? System.getProperty("java.io.tmpdir")
                 : parentDir.getPath();
@@ -984,6 +991,7 @@
      * boolean, boolean) instead.
      * @return a File reference to the new, nonexistent temporary file.
      */
+    @Deprecated
     public File createTempFile(String prefix, String suffix,
             File parentDir, boolean deleteOnExit) {
         return createTempFile(prefix, suffix, parentDir, deleteOnExit, false);
@@ -1029,8 +1037,9 @@
      * @since 1.10
      * @deprecated since 1.7. Just use {@link File#getParentFile} directly.
      */
+    @Deprecated
     public File getParentFile(File f) {
-        return (f == null) ? null : f.getParentFile();
+        return f == null ? null : f.getParentFile();
     }
 
     /**
@@ -1059,17 +1068,17 @@
     public static String readFully(Reader rdr, int bufferSize)
         throws IOException {
         if (bufferSize <= 0) {
-            throw new IllegalArgumentException("Buffer size must be greater "
-                                               + "than 0");
+            throw new IllegalArgumentException(
+                "Buffer size must be greater than 0");
         }
         final char[] buffer = new char[bufferSize];
         int bufferLength = 0;
-        StringBuffer textBuffer = null;
+        StringBuilder textBuffer = null;
         while (bufferLength != -1) {
             bufferLength = rdr.read(buffer);
             if (bufferLength > 0) {
-                textBuffer = (textBuffer == null) ? new StringBuffer() : textBuffer;
-                textBuffer.append(new String(buffer, 0, bufferLength));
+                textBuffer = (textBuffer == null) ? new StringBuilder() : textBuffer;
+                textBuffer.append(buffer, 0, bufferLength);
             }
         }
         return (textBuffer == null) ? null : textBuffer.toString();
@@ -1133,15 +1142,15 @@
      * @return true if the file is a symbolic link.
      * @throws IOException on error.
      * @since Ant 1.5
-     * @deprecated use SymbolicLinkUtils instead
+     * @deprecated use {@link Files#isSymbolicLink(Path)} instead
      */
-    public boolean isSymbolicLink(File parent, String name)
+    @Deprecated
+    public boolean isSymbolicLink(final File parent, final String name)
         throws IOException {
-        SymbolicLinkUtils u = SymbolicLinkUtils.getSymbolicLinkUtils();
         if (parent == null) {
-            return u.isSymbolicLink(name);
+            return Files.isSymbolicLink(Paths.get(name));
         }
-        return u.isSymbolicLink(parent, name);
+        return Files.isSymbolicLink(Paths.get(parent.toPath().toString(), name));
     }
 
     /**
@@ -1377,11 +1386,8 @@
             return false;
         }
         final String localFileName = localFile.getName();
-        FilenameFilter ff = new FilenameFilter () {
-            public boolean accept(File dir, String name) {
-                return name.equalsIgnoreCase(localFileName) && (!name.equals(localFileName));
-            }
-        };
+        FilenameFilter ff = (dir, name) -> name.equalsIgnoreCase(localFileName)
+            && (!name.equals(localFileName));
         String[] names = localFile.getParentFile().list(ff);
         return names != null && names.length == 1;
     }
@@ -1450,13 +1456,7 @@
      * @param device output writer, can be null.
      */
     public static void close(Writer device) {
-        if (null != device) {
-            try {
-                device.close();
-            } catch (IOException e) {
-                //ignore
-            }
-        }
+        close((AutoCloseable) device);
     }
 
     /**
@@ -1466,13 +1466,7 @@
      * @param device Reader, can be null.
      */
     public static void close(Reader device) {
-        if (null != device) {
-            try {
-                device.close();
-            } catch (IOException e) {
-                //ignore
-            }
-        }
+        close((AutoCloseable) device);
     }
 
     /**
@@ -1482,13 +1476,7 @@
      * @param device stream, can be null.
      */
     public static void close(OutputStream device) {
-        if (null != device) {
-            try {
-                device.close();
-            } catch (IOException e) {
-                //ignore
-            }
-        }
+        close((AutoCloseable) device);
     }
 
     /**
@@ -1498,13 +1486,7 @@
      * @param device stream, can be null.
      */
     public static void close(InputStream device) {
-        if (null != device) {
-            try {
-                device.close();
-            } catch (IOException e) {
-                //ignore
-            }
-        }
+        close((AutoCloseable) device);
     }
 
     /**
@@ -1515,13 +1497,7 @@
      * @since Ant 1.8.0
      */
     public static void close(Channel device) {
-        if (null != device) {
-            try {
-                device.close();
-            } catch (IOException e) {
-                //ignore
-            }
-        }
+        close((AutoCloseable) device);
     }
 
     /**
@@ -1538,7 +1514,6 @@
                     JarURLConnection juc = (JarURLConnection) conn;
                     JarFile jf = juc.getJarFile();
                     jf.close();
-                    jf = null;
                 } else if (conn instanceof HttpURLConnection) {
                     ((HttpURLConnection) conn).disconnect();
                 }
@@ -1549,6 +1524,24 @@
     }
 
     /**
+     * Close an {@link AutoCloseable} without throwing any exception
+     * if something went wrong.  Do not attempt to close it if the
+     * argument is null.
+     *
+     * @param ac AutoCloseable, can be null.
+     * @since Ant 1.10.0
+     */
+    public static void close(AutoCloseable ac) {
+        if (null != ac) {
+            try {
+                ac.close();
+            } catch (Exception e) {
+                //ignore
+            }
+        }
+    }
+
+    /**
      * Delete the file with {@link File#delete()} if the argument is not null.
      * Do nothing on a null argument.
      * @param file file to delete.
@@ -1640,7 +1633,7 @@
             // Do nothing
         }
 
-        List relativePathStack = new ArrayList();
+        List<String> relativePathStack = new ArrayList<>();
 
         // if "from" part is longer, fill it up with ".."
         // to reach path which is equal to both paths
@@ -1678,7 +1671,7 @@
      *
      * @since Ant 1.7
      */
-    public static String getPath(List pathStack) {
+    public static String getPath(List<String> pathStack) {
         // can safely use '/' because Windows understands '/' as separator
         return getPath(pathStack, '/');
     }
@@ -1692,18 +1685,8 @@
      *
      * @since Ant 1.7
      */
-    public static String getPath(final List pathStack, final char separatorChar) {
-        final StringBuffer buffer = new StringBuffer();
-
-        final Iterator iter = pathStack.iterator();
-        if (iter.hasNext()) {
-            buffer.append(iter.next());
-        }
-        while (iter.hasNext()) {
-            buffer.append(separatorChar);
-            buffer.append(iter.next());
-        }
-        return buffer.toString();
+    public static String getPath(final List<String> pathStack, final char separatorChar) {
+        return pathStack.stream().collect(Collectors.joining(Character.toString(separatorChar)));
     }
 
     /**
@@ -1717,6 +1700,7 @@
     public String getDefaultEncoding() {
         InputStreamReader is = new InputStreamReader(
             new InputStream() { //NOSONAR
+                @Override
                 public int read() {
                     return -1;
                 }
@@ -1727,4 +1711,21 @@
             close(is);
         }
     }
+
+    /**
+     * Opens a new OutputStream for the given Path.
+     * @param path the path of the file
+     * @param append whether to append to or a replace an existing file
+     * @return a stream ready to write to the file
+     * @throws IOException if stream creation fails
+     * @since Ant 1.10.2
+     */
+    public static OutputStream newOutputStream(Path path, boolean append) throws IOException {
+        if (append) {
+            return Files.newOutputStream(path, StandardOpenOption.CREATE, StandardOpenOption.APPEND,
+                StandardOpenOption.WRITE);
+        } else {
+            return Files.newOutputStream(path);
+        }
+    }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/FirstMatchMapper.java ant-1.10.3/src/main/org/apache/tools/ant/util/FirstMatchMapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/FirstMatchMapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/FirstMatchMapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,7 +17,7 @@
  */
 package org.apache.tools.ant.util;
 
-import java.util.Iterator;
+import java.util.Objects;
 
 /**
  * A <code>ContainerMapper</code> that returns the results of its
@@ -28,17 +28,11 @@
 public class FirstMatchMapper extends ContainerMapper {
 
     /** {@inheritDoc}. */
+    @Override
     public String[] mapFileName(String sourceFileName) {
-        for (Iterator iter = getMappers().iterator(); iter.hasNext();) {
-            FileNameMapper mapper = (FileNameMapper) iter.next();
-            if (mapper != null) {
-                String[] mapped = mapper.mapFileName(sourceFileName);
-                if (mapped != null) {
-                    return mapped;
-                }
-            }
-        }
-        return null;
+        return getMappers().stream().filter(Objects::nonNull)
+            .map(m -> m.mapFileName(sourceFileName)).filter(Objects::nonNull)
+            .findFirst().orElse(null);
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java ant-1.10.3/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/FlatFileNameMapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -32,6 +32,7 @@
      * Ignored.
      * @param from ignored.
      */
+    @Override
     public void setFrom(String from) {
     }
 
@@ -39,6 +40,7 @@
      * Ignored.
      * @param to ignored.
      */
+    @Override
     public void setTo(String to) {
     }
 
@@ -48,7 +50,9 @@
      * @param sourceFileName the name to map.
      * @return the file name in a one-element array.
      */
+    @Override
     public String[] mapFileName(String sourceFileName) {
-        return new String[] {new java.io.File(sourceFileName).getName()};
+        return sourceFileName == null ? null
+            : new String[] {new java.io.File(sourceFileName).getName()};
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/GlobPatternMapper.java ant-1.10.3/src/main/org/apache/tools/ant/util/GlobPatternMapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/GlobPatternMapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/GlobPatternMapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -108,42 +108,42 @@
      * Sets the &quot;from&quot; pattern. Required.
      * @param from a string
      */
+    @Override
     public void setFrom(String from) {
-        if (from != null) {
-            int index = from.lastIndexOf("*");
-            if (index == -1) {
-                fromPrefix = from;
-                fromPostfix = "";
-            } else {
-                fromPrefix = from.substring(0, index);
-                fromPostfix = from.substring(index + 1);
-                fromContainsStar = true;
-            }
-            prefixLength = fromPrefix.length();
-            postfixLength = fromPostfix.length();
-        } else {
+        if (from == null) {
             throw new BuildException("this mapper requires a 'from' attribute");
         }
+        int index = from.lastIndexOf('*');
+        if (index < 0) {
+            fromPrefix = from;
+            fromPostfix = "";
+        } else {
+            fromPrefix = from.substring(0, index);
+            fromPostfix = from.substring(index + 1);
+            fromContainsStar = true;
+        }
+        prefixLength = fromPrefix.length();
+        postfixLength = fromPostfix.length();
     }
 
     /**
      * Sets the &quot;to&quot; pattern. Required.
      * @param to a string
      */
+    @Override
     public void setTo(String to) {
-        if (to != null) {
-            int index = to.lastIndexOf("*");
-            if (index == -1) {
-                toPrefix = to;
-                toPostfix = "";
-            } else {
-                toPrefix = to.substring(0, index);
-                toPostfix = to.substring(index + 1);
-                toContainsStar = true;
-            }
-        } else {
+        if (to == null) {
             throw new BuildException("this mapper requires a 'to' attribute");
         }
+        int index = to.lastIndexOf('*');
+        if (index < 0) {
+            toPrefix = to;
+            toPostfix = "";
+        } else {
+            toPrefix = to.substring(0, index);
+            toPostfix = to.substring(index + 1);
+            toContainsStar = true;
+        }
     }
 
     /**
@@ -153,7 +153,11 @@
      * @param sourceFileName the filename to map
      * @return a list of converted filenames
      */
+    @Override
     public String[] mapFileName(String sourceFileName) {
+        if (sourceFileName == null) {
+            return null;
+        }
         String modName = modifyName(sourceFileName);
         if (fromPrefix == null
             || (sourceFileName.length() < (prefixLength + postfixLength))
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/IdentityMapper.java ant-1.10.3/src/main/org/apache/tools/ant/util/IdentityMapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/IdentityMapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/IdentityMapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -31,6 +31,7 @@
      * Ignored.
      * @param from ignored.
      */
+    @Override
     public void setFrom(String from) {
     }
 
@@ -38,6 +39,7 @@
      * Ignored.
      * @param to ignored.
      */
+    @Override
     public void setTo(String to) {
     }
 
@@ -46,7 +48,16 @@
      * @param sourceFileName the name to map.
      * @return the source filename in a one-element array.
      */
+    @Override
     public String[] mapFileName(String sourceFileName) {
+        if (sourceFileName == null) {
+            // The FileNameMapper#mapFileName contract states that:
+            // "if the given rule doesn't apply to the source file,
+            //  implementation must return null"
+            // we consider a null source file name as non-matching and
+            // hence return null
+            return null;
+        }
         return new String[] {sourceFileName};
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/IdentityStack.java ant-1.10.3/src/main/org/apache/tools/ant/util/IdentityStack.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/IdentityStack.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/IdentityStack.java	2018-03-24 12:37:12.000000000 +0000
@@ -41,7 +41,7 @@
         if (s instanceof IdentityStack) {
             return (IdentityStack<E>) s;
         }
-        IdentityStack<E> result = new IdentityStack<E>();
+        IdentityStack<E> result = new IdentityStack<>();
         if (s != null) {
             result.addAll(s);
         }
@@ -70,6 +70,7 @@
      * @return true if the stack contains the object.
      * @see java.util.Vector#contains(Object)
      */
+    @Override
     public synchronized boolean contains(Object o) {
         return indexOf(o) >= 0;
     }
@@ -81,6 +82,7 @@
      * @return the position of the object, -1 if not found.
      * @see java.util.Vector#indexOf(Object, int)
      */
+    @Override
     public synchronized int indexOf(Object o, int pos) {
         final int size = size();
         for (int i = pos; i < size; i++) {
@@ -98,6 +100,7 @@
      * @return the position of the object, -1 if not found.
      * @see java.util.Vector#indexOf(Object, int)
      */
+    @Override
     public synchronized int lastIndexOf(Object o, int pos) {
         for (int i = pos; i >= 0; i--) {
             if (get(i) == o) {
@@ -107,22 +110,25 @@
         return -1;
     }
 
+    @Override
     public synchronized boolean removeAll(Collection<?> c) {
-        if (!(c instanceof Set)) {
-            c = new HashSet(c);
+        if (!(c instanceof Set<?>)) {
+            c = new HashSet<>(c);
         }
         return super.removeAll(c);
     }
 
-    public synchronized boolean retainAll(Collection c) {
-        if (!(c instanceof Set)) {
-            c = new HashSet(c);
+    @Override
+    public synchronized boolean retainAll(Collection<?> c) {
+        if (!(c instanceof Set<?>)) {
+            c = new HashSet<>(c);
         }
         return super.retainAll(c);
     }
 
+    @Override
     public synchronized boolean containsAll(Collection<?> c) {
-        IdentityHashMap map = new IdentityHashMap();
+        IdentityHashMap<Object, Boolean> map = new IdentityHashMap<>();
         for (Object e : this) {
             map.put(e, Boolean.TRUE);
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/java15/ProxyDiagnostics.java ant-1.10.3/src/main/org/apache/tools/ant/util/java15/ProxyDiagnostics.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/java15/ProxyDiagnostics.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/java15/ProxyDiagnostics.java	2018-03-24 12:37:13.000000000 +0000
@@ -25,8 +25,6 @@
 import java.net.SocketAddress;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Iterator;
-import java.util.List;
 
 import org.apache.tools.ant.BuildException;
 
@@ -40,8 +38,6 @@
  */
 public class ProxyDiagnostics {
 
-    private String destination;
-
     private URI destURI;
 
     /** {@value} */
@@ -53,7 +49,6 @@
      * @throws BuildException if the URI is malformed.
      */
     public ProxyDiagnostics(String destination) {
-        this.destination = destination;
         try {
             this.destURI = new URI(destination);
         } catch (URISyntaxException e) {
@@ -73,35 +68,33 @@
      * Get the diagnostics for proxy information.
      * @return the information.
      */
+    @Override
     public String toString() {
         ProxySelector selector = ProxySelector.getDefault();
-        List list = selector.select(destURI);
-        StringBuffer result = new StringBuffer();
-        Iterator proxies = list.listIterator();
-        while (proxies.hasNext()) {
-            Proxy proxy = (Proxy) proxies.next();
+        StringBuilder result = new StringBuilder();
+        for (Proxy proxy : selector.select(destURI)) {
             SocketAddress address = proxy.address();
             if (address == null) {
                 result.append("Direct connection\n");
-            } else {
-                result.append(proxy.toString());
-                if (address instanceof InetSocketAddress) {
-                    InetSocketAddress ina = (InetSocketAddress) address;
-                    result.append(' ');
-                    result.append(ina.getHostName());
-                    result.append(':');
-                    result.append(ina.getPort());
-                    if (ina.isUnresolved()) {
-                        result.append(" [unresolved]");
-                    } else {
-                        InetAddress addr = ina.getAddress();
-                        result.append(" [");
-                        result.append(addr.getHostAddress());
-                        result.append(']');
-                    }
+                continue;
+            }
+            result.append(proxy);
+            if (address instanceof InetSocketAddress) {
+                InetSocketAddress ina = (InetSocketAddress) address;
+                result.append(' ');
+                result.append(ina.getHostName());
+                result.append(':');
+                result.append(ina.getPort());
+                if (ina.isUnresolved()) {
+                    result.append(" [unresolved]");
+                } else {
+                    InetAddress addr = ina.getAddress();
+                    result.append(" [");
+                    result.append(addr.getHostAddress());
+                    result.append(']');
                 }
-                result.append('\n');
             }
+            result.append('\n');
         }
         return result.toString();
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/JavaEnvUtils.java ant-1.10.3/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/JavaEnvUtils.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/JavaEnvUtils.java	2018-03-24 12:37:12.000000000 +0000
@@ -111,11 +111,13 @@
      * Version constant for Java 1.9
      * @deprecated use #JAVA_9 instead
      */
+    @Deprecated
     public static final String JAVA_1_9 = "1.9";
     /**
      * Number Version constant for Java 1.9
      * @deprecated use #VERSION_9 instead
      */
+    @Deprecated
     public static final int VERSION_1_9 = 19;
 
     /**
@@ -250,6 +252,7 @@
      * be 0 for all versions of Java starting with Java 9.
      * @deprecated use #getParsedJavaVersion instead
      */
+    @Deprecated
     public static int getJavaVersionNumber() {
         return javaVersionNumber;
     }
@@ -270,8 +273,8 @@
      * Compares the current Java version to the passed in String -
      * assumes the argument is one of the constants defined in this
      * class.
-     * Note that Ant now requires JDK 1.5+ so {@link #JAVA_1_0} through
-     * {@link #JAVA_1_4} need no longer be tested for.
+     * Note that Ant now requires JDK 1.8+ so {@link #JAVA_1_0} through
+     * {@link #JAVA_1_7} need no longer be tested for.
      * @param version the version to check against the current version.
      * @return true if the version of Java is the same as the given version.
      * @since Ant 1.5
@@ -285,8 +288,8 @@
      * Compares the current Java version to the passed in String -
      * assumes the argument is one of the constants defined in this
      * class.
-     * Note that Ant now requires JDK 1.5+ so {@link #JAVA_1_0} through
-     * {@link #JAVA_1_4} need no longer be tested for.
+     * Note that Ant now requires JDK 1.8+ so {@link #JAVA_1_0} through
+     * {@link #JAVA_1_7} need no longer be tested for.
      * @param version the version to check against the current version.
      * @return true if the version of Java is the same or higher than the
      * given version.
@@ -508,7 +511,7 @@
      * @return a list of test classes depending on the java version.
      */
     public static Vector<String> getJrePackageTestCases() {
-        Vector<String> tests = new Vector<String>();
+        Vector<String> tests = new Vector<>();
         tests.addElement("java.lang.Object");
         if (isAtLeastJavaVersion(JAVA_1_1)) {
             //things like sun.reflection, sun.misc, sun.net
@@ -575,15 +578,11 @@
     public static File createVmsJavaOptionFile(String[] cmds)
             throws IOException {
         File script = FILE_UTILS.createTempFile("ANT", ".JAVA_OPTS", null, false, true);
-        BufferedWriter out = null;
-        try {
-            out = new BufferedWriter(new FileWriter(script));
+        try (BufferedWriter out = new BufferedWriter(new FileWriter(script))) {
             for (int i = 0; i < cmds.length; i++) {
                 out.write(cmds[i]);
                 out.newLine();
             }
-        } finally {
-            FileUtils.close(out);
         }
         return script;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/JAXPUtils.java ant-1.10.3/src/main/org/apache/tools/ant/util/JAXPUtils.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/JAXPUtils.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/JAXPUtils.java	2018-03-24 12:37:12.000000000 +0000
@@ -232,9 +232,8 @@
         Exception nested = e.getException();
         if (nested != null) {
             return new BuildException(nested);
-        } else {
-            return new BuildException(e);
         }
+        return new BuildException(e);
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java ant-1.10.3/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/LayoutPreservingProperties.java	2018-03-24 12:37:12.000000000 +0000
@@ -20,7 +20,6 @@
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -28,9 +27,12 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintStream;
 import java.io.PushbackReader;
+import java.io.Serializable;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 
 /**
@@ -78,6 +80,8 @@
  * although the key-value pair <code>beta=two</code> is removed.</p>
  */
 public class LayoutPreservingProperties extends Properties {
+    private static final long serialVersionUID = 1L;
+
     private String LS = StringUtils.LINE_SEP;
 
     /**
@@ -85,12 +89,12 @@
      * of. Comments and blank lines are logical lines; they are not
      * removed.
      */
-    private ArrayList logicalLines = new ArrayList();
+    private List<LogicalLine> logicalLines = new ArrayList<>();
 
     /**
      * Position in the <code>logicalLines</code> list, keyed by property name.
      */
-    private HashMap keyedPairLines = new HashMap();
+    private Map<String, Integer> keyedPairLines = new HashMap<>();
 
     /**
      * Flag to indicate that, when we remove a property from the file, we
@@ -175,14 +179,14 @@
         value = escapeValue(value);
 
         if (keyedPairLines.containsKey(key)) {
-            final Integer i = (Integer) keyedPairLines.get(key);
+            final Integer i = keyedPairLines.get(key);
             final Pair p = (Pair) logicalLines.get(i.intValue());
             p.setValue(value);
         } else {
             key = escapeName(key);
             final Pair p = new Pair(key, value);
             p.setNew(true);
-            keyedPairLines.put(key, new Integer(logicalLines.size()));
+            keyedPairLines.put(key, Integer.valueOf(logicalLines.size()));
             logicalLines.add(p);
         }
     }
@@ -197,7 +201,7 @@
     @Override
     public Object remove(final Object key) {
         final Object obj = super.remove(key);
-        final Integer i = (Integer) keyedPairLines.remove(key);
+        final Integer i = keyedPairLines.remove(key);
         if (null != i) {
             if (removeComments) {
                 removeCommentsEndingAt(i.intValue());
@@ -211,14 +215,14 @@
     public Object clone() {
         final LayoutPreservingProperties dolly =
             (LayoutPreservingProperties) super.clone();
-        dolly.keyedPairLines = (HashMap) this.keyedPairLines.clone();
-        dolly.logicalLines = (ArrayList) this.logicalLines.clone();
+        dolly.keyedPairLines = new HashMap<>(this.keyedPairLines);
+        dolly.logicalLines = new ArrayList<>(this.logicalLines);
         final int size = dolly.logicalLines.size();
         for (int j = 0; j < size; j++) {
-            final LogicalLine line = (LogicalLine) dolly.logicalLines.get(j);
+            final LogicalLine line = dolly.logicalLines.get(j);
             if (line instanceof Pair) {
                 final Pair p = (Pair) line;
-                dolly.logicalLines.set(j, p.clone());
+                dolly.logicalLines.set(j, (Pair) p.clone());
             }
             // no reason to clone other lines are they are immutable
         }
@@ -232,9 +236,7 @@
      */
     public void listLines(final PrintStream out) {
         out.println("-- logical lines --");
-        final Iterator i = logicalLines.iterator();
-        while (i.hasNext()) {
-            final LogicalLine line = (LogicalLine) i.next();
+        for (LogicalLine line : logicalLines) {
             if (line instanceof Blank) {
                 out.println("blank:   \"" + line + "\"");
             } else if (line instanceof Comment) {
@@ -251,7 +253,7 @@
      * @throws IOException if save fails
      */
     public void saveAs(final File dest) throws IOException {
-        final FileOutputStream fos = new FileOutputStream(dest);
+        final OutputStream fos = Files.newOutputStream(dest.toPath());
         store(fos, null);
         fos.close();
     }
@@ -289,11 +291,9 @@
         osw.write("#" + DateUtils.getDateForHeader() + LS);
 
         boolean writtenSep = false;
-        for (final Iterator i = logicalLines.subList(skipLines, totalLines).iterator();
-             i.hasNext();) {
-            final LogicalLine line = (LogicalLine) i.next();
+        for (LogicalLine line : logicalLines.subList(skipLines, totalLines)) {
             if (line instanceof Pair) {
-                if (((Pair)line).isNew()) {
+                if (((Pair) line).isNew()) {
                     if (!writtenSep) {
                         osw.write(LS);
                         writtenSep = true;
@@ -318,7 +318,7 @@
         final InputStreamReader isr = new InputStreamReader(is, ResourceUtils.ISO_8859_1);
         final PushbackReader pbr = new PushbackReader(isr, 1);
 
-        if (logicalLines.size() > 0) {
+        if (!logicalLines.isEmpty()) {
             // we add a blank line for spacing
             logicalLines.add(new Blank());
         }
@@ -328,8 +328,8 @@
 
         boolean continuation = false;
         boolean comment = false;
-        final StringBuffer fileBuffer = new StringBuffer();
-        final StringBuffer logicalLineBuffer = new StringBuffer();
+        final StringBuilder fileBuffer = new StringBuilder();
+        final StringBuilder logicalLineBuffer = new StringBuilder();
         while (s != null) {
             fileBuffer.append(s).append(LS);
 
@@ -350,7 +350,7 @@
             logicalLineBuffer.append(s);
 
             if (!continuation) {
-                LogicalLine line = null;
+                LogicalLine line;
                 if (comment) {
                     line = new Comment(logicalLineBuffer.toString());
                 } else if (logicalLineBuffer.toString().trim().length() == 0) {
@@ -385,7 +385,7 @@
      * @since Ant 1.8.2
      */
     private String readFirstLine(final PushbackReader r) throws IOException {
-        final StringBuffer sb = new StringBuffer(80);
+        final StringBuilder sb = new StringBuilder(80);
         int ch = r.read();
         boolean hasCR = false;
         // when reaching EOF before the first EOL, assume native line
@@ -455,13 +455,14 @@
         final char[] ch = new char[s.length() + 1];
         s.getChars(0, s.length(), ch, 0);
         ch[s.length()] = '\n';
-        final StringBuffer buffy = new StringBuffer(s.length());
+        final StringBuilder buffy = new StringBuilder(s.length());
         for (int i = 0; i < ch.length; i++) {
             char c = ch[i];
             if (c == '\n') {
                 // we have hit out end-of-string marker
                 break;
-            } else if (c == '\\') {
+            }
+            if (c == '\\') {
                 // possibly an escape sequence
                 c = ch[++i];
                 if (c == 'n') {
@@ -541,7 +542,7 @@
         s.getChars(0, s.length(), ch, 0);
         final String forEscaping = "\t\f\r\n\\:=#!";
         final String escaped = "tfrn\\:=#!";
-        final StringBuffer buffy = new StringBuffer(s.length());
+        final StringBuilder buffy = new StringBuilder(s.length());
         boolean leadingSpace = true;
         for (int i = 0; i < ch.length; i++) {
             final char c = ch[i];
@@ -572,7 +573,7 @@
      */
     private String escapeUnicode(final char ch) {
         return "\\" + UnicodeUtil.EscapeUnicode(ch);
-        }
+    }
 
     /**
      * Remove the comments in the leading up the {@link #logicalLines}
@@ -619,7 +620,9 @@
     /**
      * A logical line of the properties input stream.
      */
-    private abstract static class LogicalLine {
+    private abstract static class LogicalLine implements Serializable {
+        private static final long serialVersionUID = 1L;
+
         private String text;
 
         public LogicalLine(final String text) {
@@ -640,6 +643,8 @@
      * A blank line of the input stream.
      */
     private static class Blank extends LogicalLine {
+        private static final long serialVersionUID = 1L;
+
         public Blank() {
             super("");
         }
@@ -649,6 +654,8 @@
      * A comment line of the input stream.
      */
     private class Comment extends LogicalLine {
+        private static final long serialVersionUID = 1L;
+
         public Comment(final String text) {
             super(text);
         }
@@ -660,6 +667,8 @@
      * line.
      */
     private static class Pair extends LogicalLine implements Cloneable {
+        private static final long serialVersionUID = 1L;
+
         private String name;
         private String value;
         private boolean added;
@@ -677,6 +686,7 @@
             return name;
         }
 
+        @SuppressWarnings("unused")
         public String getValue() {
             return value;
         }
@@ -712,10 +722,10 @@
             if (pos == -1) {
                 // trim leading whitespace only
                 name = text;
-                value = null;
+                setValue(null);
             } else {
                 name = text.substring(0, pos);
-                value = text.substring(pos + 1, text.length());
+                setValue(text.substring(pos + 1, text.length()));
             }
             // trim leading whitespace only
             name = stripStart(name, " \t\f");
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/LazyFileOutputStream.java ant-1.10.3/src/main/org/apache/tools/ant/util/LazyFileOutputStream.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/LazyFileOutputStream.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/LazyFileOutputStream.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,9 +18,9 @@
 package org.apache.tools.ant.util;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import org.apache.tools.ant.util.FileUtils;
 
 /**
  * Class that delays opening the output file until the first bytes
@@ -31,7 +31,7 @@
  */
 public class LazyFileOutputStream extends OutputStream {
 
-    private FileOutputStream fos;
+    private OutputStream fos;
     private File file;
     private boolean append;
     private boolean alwaysCreate;
@@ -107,6 +107,7 @@
      * Close the file.
      * @throws IOException if there is an error.
      */
+    @Override
     public synchronized void close() throws IOException {
         if (alwaysCreate && !closed) {
             ensureOpened();
@@ -122,6 +123,7 @@
      * @param b the bytearray to write.
      * @throws IOException if there is a problem.
      */
+    @Override
     public void write(byte[] b) throws IOException {
         write(b, 0, b.length);
     }
@@ -133,6 +135,7 @@
      * @param len    the number of bytes to write.
      * @throws IOException if there is a problem.
      */
+    @Override
     public synchronized void write(byte[] b, int offset, int len)
         throws IOException {
         ensureOpened();
@@ -144,6 +147,7 @@
      * @param b the byte to write.
      * @throws IOException if there is a problem.
      */
+    @Override
     public synchronized void write(int b) throws IOException {
         ensureOpened();
         fos.write(b);
@@ -155,7 +159,7 @@
         }
 
         if (!opened) {
-            fos = new FileOutputStream(file.getAbsolutePath(), append);
+            fos = FileUtils.newOutputStream(file.toPath(), append);
             opened = true;
         }
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/LazyHashtable.java ant-1.10.3/src/main/org/apache/tools/ant/util/LazyHashtable.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/LazyHashtable.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/LazyHashtable.java	2018-03-24 12:37:12.000000000 +0000
@@ -28,6 +28,7 @@
  *
  * @since Ant 1.6
  */
+@Deprecated
 public class LazyHashtable extends Hashtable {
     // CheckStyle:VisibilityModifier OFF - bc
     protected boolean initAllDone = false;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/LeadPipeInputStream.java ant-1.10.3/src/main/org/apache/tools/ant/util/LeadPipeInputStream.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/LeadPipeInputStream.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/LeadPipeInputStream.java	2018-03-24 12:37:12.000000000 +0000
@@ -81,6 +81,7 @@
      * @return the byte (0 to 255) or -1 if there are no more.
      * @throws IOException if there is an error.
      */
+    @Override
     public synchronized int read() throws IOException {
         int result = -1;
         try {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/LineTokenizer.java ant-1.10.3/src/main/org/apache/tools/ant/util/LineTokenizer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/LineTokenizer.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/LineTokenizer.java	2018-03-24 12:37:12.000000000 +0000
@@ -54,19 +54,19 @@
      * @exception IOException if an error occurs reading
      */
     public String getToken(Reader in) throws IOException {
-        int ch = -1;
-        if (pushed != NOT_A_CHAR) {
+        int ch;
+        if (pushed == NOT_A_CHAR) {
+            ch = in.read();
+        } else {
             ch = pushed;
             pushed = NOT_A_CHAR;
-        } else {
-            ch = in.read();
         }
         if (ch == -1) {
             return null;
         }
 
         lineEnd = "";
-        StringBuffer line = new StringBuffer();
+        StringBuilder line = new StringBuilder();
 
         int state = 0;
         while (ch != -1) {
@@ -104,11 +104,9 @@
     /**
      * @return the line ending character(s) for the current line
      */
+    @Override
     public String getPostToken() {
-        if (includeDelims) {
-            return "";
-        }
-        return lineEnd;
+        return includeDelims ? "" : lineEnd;
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/LinkedHashtable.java ant-1.10.3/src/main/org/apache/tools/ant/util/LinkedHashtable.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/LinkedHashtable.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/LinkedHashtable.java	2018-03-24 12:37:12.000000000 +0000
@@ -43,89 +43,106 @@
     private final LinkedHashMap<K, V> map;
 
     public LinkedHashtable() {
-        map = new LinkedHashMap<K, V>();
+        map = new LinkedHashMap<>();
     }
 
     public LinkedHashtable(int initialCapacity) {
-        map = new LinkedHashMap<K, V>(initialCapacity);
+        map = new LinkedHashMap<>(initialCapacity);
     }
 
     public LinkedHashtable(int initialCapacity, float loadFactor) {
-        map = new LinkedHashMap<K, V>(initialCapacity, loadFactor);
+        map = new LinkedHashMap<>(initialCapacity, loadFactor);
     }
 
     public LinkedHashtable(Map<K, V> m) {
-        map = new LinkedHashMap<K, V>(m);
+        map = new LinkedHashMap<>(m);
     }
 
     public synchronized void clear() {
         map.clear();
     }
 
+    @Override
     public boolean contains(Object value) {
         return containsKey(value);
     }
 
+    @Override
     public synchronized boolean containsKey(Object value) {
         return map.containsKey(value);
     }
 
+    @Override
     public synchronized boolean containsValue(Object value) {
         return map.containsValue(value);
     }
 
+    @Override
     public Enumeration<V> elements() {
         return CollectionUtils.asEnumeration(values().iterator());
     }
 
+    @Override
     public synchronized Set<Map.Entry<K, V>> entrySet() {
         return map.entrySet();
     }
 
+    @Override
     public synchronized boolean equals(Object o) {
         return map.equals(o);
     }
 
+    @Override
     public synchronized V get(Object k) {
         return map.get(k);
     }
 
+    @Override
     public synchronized int hashCode() {
         return map.hashCode();
     }
 
+    @Override
     public synchronized boolean isEmpty() {
         return map.isEmpty();
     }
 
+    @Override
     public Enumeration<K> keys() {
         return CollectionUtils.asEnumeration(keySet().iterator());
     }
 
+    @Override
     public synchronized Set<K> keySet() {
         return map.keySet();
     }
 
+    @Override
     public synchronized V put(K k, V v) {
         return map.put(k, v);
     }
 
+    @Override
     public synchronized void putAll(Map<? extends K, ? extends V> m) {
         map.putAll(m);
     }
 
+    @Override
     public synchronized V remove(Object k) {
         return map.remove(k);
     }
 
+    @Override
     public synchronized int size() {
         return map.size();
     }
 
+    @Override
     public synchronized String toString() {
         return map.toString();
     }
 
+    @Override
     public synchronized Collection<V> values() {
         return map.values();
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/LoaderUtils.java ant-1.10.3/src/main/org/apache/tools/ant/util/LoaderUtils.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/LoaderUtils.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/LoaderUtils.java	2018-03-24 12:37:12.000000000 +0000
@@ -94,7 +94,7 @@
      *
      * @since Ant 1.6
      */
-    public static File getClassSource(Class c) {
+    public static File getClassSource(Class<?> c) {
         return normalizeSource(Locator.getClassSource(c));
     }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/MergingMapper.java ant-1.10.3/src/main/org/apache/tools/ant/util/MergingMapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/MergingMapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/MergingMapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -46,6 +46,7 @@
      * Ignored.
      * @param from ignored.
      */
+    @Override
     public void setFrom(String from) {
     }
 
@@ -53,6 +54,7 @@
      * Sets the name of the merged file.
      * @param to the name of the merged file.
      */
+    @Override
     public void setTo(String to) {
         mergedFile = new String[] {to};
     }
@@ -62,6 +64,7 @@
      * @param sourceFileName ignored.
      * @return a one-element array containing the merged filename.
      */
+    @Override
     public String[] mapFileName(String sourceFileName) {
         return mergedFile;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java ant-1.10.3/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/optional/JavaxScriptRunner.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,10 +18,21 @@
 
 package org.apache.tools.ant.util.optional;
 
-import java.util.Iterator;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.BiConsumer;
+import java.util.stream.Collectors;
+
+import javax.script.Bindings;
+import javax.script.Compilable;
+import javax.script.CompiledScript;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.SimpleBindings;
 
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.util.ReflectWrapper;
+import org.apache.tools.ant.MagicNames;
+import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.ScriptRunnerBase;
 
 /**
@@ -29,19 +40,22 @@
  * @since Ant 1.7.0
  */
 public class JavaxScriptRunner extends ScriptRunnerBase {
-    private ReflectWrapper engine;
+    private ScriptEngine keptEngine;
+    private CompiledScript compiledScript;
 
     /**
      * Get the name of the manager prefix.
      * @return "javax"
      */
+    @Override
     public String getManagerName() {
         return "javax";
     }
 
     /** {@inheritDoc}. */
+    @Override
     public boolean supportsLanguage() {
-        if (engine != null) {
+        if (keptEngine != null) {
             return true;
         }
         checkLanguage();
@@ -63,6 +77,7 @@
      *
      * @exception BuildException if something goes wrong executing the script.
      */
+    @Override
     public void executeScript(String execName) throws BuildException {
         evaluateScript(execName);
     }
@@ -79,28 +94,61 @@
         checkLanguage();
         ClassLoader origLoader = replaceContextLoader();
         try {
-            ReflectWrapper engine = createEngine();
+            if (getCompiled()) {
+                final String compiledScriptRefName =
+                    String.format("%s.%s.%d.%d", MagicNames.SCRIPT_CACHE,
+                        getLanguage(), Objects.hashCode(getScript()),
+                        Objects.hashCode(getClass().getClassLoader()));
+
+                if (null == compiledScript) {
+                    compiledScript = getProject().getReference(compiledScriptRefName);
+                }
+                if (null == compiledScript) {
+                    final ScriptEngine engine = createEngine();
+                    if (engine == null) {
+                        throw new BuildException(
+                            "Unable to create javax script engine for %s",
+                            getLanguage());
+                    }
+                    if (Compilable.class.isInstance(engine)) {
+                        getProject().log("compile script " + execName,
+                            Project.MSG_VERBOSE);
+
+                        compiledScript =
+                            ((Compilable) engine).compile(getScript());
+                    } else {
+                        getProject().log(
+                            "script compilation not available for " + execName,
+                            Project.MSG_VERBOSE);
+                        compiledScript = null;
+                    }
+                    getProject().addReference(compiledScriptRefName,
+                        compiledScript);
+                }
+                if (null != compiledScript) {
+                    final Bindings bindings = new SimpleBindings();
+
+                    applyBindings(bindings::put);
+
+                    getProject().log(
+                        "run compiled script " + compiledScriptRefName,
+                        Project.MSG_DEBUG);
+
+                    return compiledScript.eval(bindings);
+                }
+            }
+
+            ScriptEngine engine = createEngine();
             if (engine == null) {
                 throw new BuildException(
                     "Unable to create javax script engine for "
-                    + getLanguage());
+                        + getLanguage());
             }
-            for (Iterator i = getBeans().keySet().iterator(); i.hasNext();) {
-                String key = (String) i.next();
-                Object value = getBeans().get(key);
-                if ("FX".equalsIgnoreCase(getLanguage())) {
-                    engine.invoke(
-                        "put", String.class, key
-                        + ":" + value.getClass().getName(),
-                        Object.class, value);
-                } else {
-                    engine.invoke(
-                        "put", String.class, key,
-                        Object.class, value);
-                }
-            }
-            // execute the script
-            return engine.invoke("eval", String.class, getScript());
+
+            applyBindings(engine::put);
+
+            return engine.eval(getScript());
+
         } catch (BuildException be) {
             //catch and rethrow build exceptions
 
@@ -114,7 +162,7 @@
             Throwable t = be;
             Throwable te = be.getCause();
             if (te != null) {
-                if  (te instanceof BuildException) {
+                if (te instanceof BuildException) {
                     throw (BuildException) te;
                 } else {
                     t = te;
@@ -126,22 +174,29 @@
         }
     }
 
-    private ReflectWrapper createEngine() {
-        if (engine != null) {
-            return engine;
-        }
-        ReflectWrapper manager = new ReflectWrapper(
-            getClass().getClassLoader(), "javax.script.ScriptEngineManager");
-        Object e = manager.invoke(
-            "getEngineByName", String.class, getLanguage());
-        if (e == null) {
-            return null;
-        }
-        ReflectWrapper ret = new ReflectWrapper(e);
-        if (getKeepEngine()) {
-            this.engine = ret;
+    private void applyBindings(BiConsumer<String, Object> target) {
+        Map<String, Object> source = getBeans();
+
+        if ("FX".equalsIgnoreCase(getLanguage())) {
+            source = source.entrySet().stream()
+                .collect(Collectors.toMap(
+                    e -> String.format("%s:%s", e.getKey(),
+                        e.getValue().getClass().getName()),
+                    Map.Entry::getValue));
+        }
+        source.forEach(target::accept);
+    }
+
+    private ScriptEngine createEngine() {
+        if (keptEngine != null) {
+            return keptEngine;
+        }
+        ScriptEngine result =
+            new ScriptEngineManager().getEngineByName(getLanguage());
+        if (result != null && getKeepEngine()) {
+            this.keptEngine = result;
         }
-        return ret;
+        return result;
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java ant-1.10.3/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/optional/NoExitSecurityManager.java	2018-03-24 12:37:12.000000000 +0000
@@ -36,6 +36,7 @@
      * This throws an ExitException(status) exception.
      * @param status the exit status
      */
+    @Override
     public void checkExit(int status) {
         throw new ExitException(status);
     }
@@ -45,6 +46,7 @@
      * This does nothing.
      * @param perm the requested permission.
      */
+    @Override
     public void checkPermission(Permission perm) {
         // no permission here
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/optional/ScriptRunner.java ant-1.10.3/src/main/org/apache/tools/ant/util/optional/ScriptRunner.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/optional/ScriptRunner.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/optional/ScriptRunner.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,8 +17,7 @@
  */
 package org.apache.tools.ant.util.optional;
 
-import java.util.Hashtable;
-import java.util.Iterator;
+import java.util.Map;
 
 import org.apache.bsf.BSFEngine;
 import org.apache.bsf.BSFException;
@@ -49,6 +48,7 @@
      * Get the name of the manager prefix.
      * @return "bsf"
      */
+    @Override
     public String getManagerName() {
         return "bsf";
     }
@@ -57,10 +57,11 @@
      * Check if bsf supports the language.
      * @return true if bsf can create an engine for this language.
      */
+    @Override
     public boolean supportsLanguage() {
-        Hashtable table = (Hashtable) ReflectUtil.getField(
-            new BSFManager(), "registeredEngines");
-        String engineClassName = (String) table.get(getLanguage());
+        Map<String, String> table =
+            ReflectUtil.getField(new BSFManager(), "registeredEngines");
+        String engineClassName = table.get(getLanguage());
         if (engineClassName == null) {
             getProject().log(
                 "This is no BSF engine class for language '"
@@ -87,6 +88,7 @@
      * @param execName the name that will be passed to BSF for this script execution.
      * @exception BuildException if something goes wrong executing the script.
      */
+    @Override
     public void executeScript(String execName) throws BuildException {
         checkLanguage();
         ClassLoader origLoader = replaceContextLoader();
@@ -113,6 +115,7 @@
      * @return the result of the evaluation
      * @exception BuildException if something goes wrong executing the script.
      */
+    @Override
     public Object evaluateScript(String execName) throws BuildException {
         checkLanguage();
         ClassLoader origLoader = replaceContextLoader();
@@ -145,8 +148,7 @@
     }
 
     private void declareBeans(BSFManager m) throws BSFException {
-        for (Iterator i = getBeans().keySet().iterator(); i.hasNext();) {
-            String key = (String) i.next();
+        for (String key : getBeans().keySet()) {
             Object value = getBeans().get(key);
             if (value != null) {
                 m.declareBean(key, value, value.getClass());
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/optional/WeakishReference12.java ant-1.10.3/src/main/org/apache/tools/ant/util/optional/WeakishReference12.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/optional/WeakishReference12.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/optional/WeakishReference12.java	2018-03-24 12:37:12.000000000 +0000
@@ -30,6 +30,7 @@
  * WeakishReference(Object) constructor, and both that and this are thin
  * facades on the underlying no-longer-abstract base class.
  */
+@Deprecated
 public class WeakishReference12 extends WeakishReference.HardReference  {
 
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/OutputStreamFunneler.java ant-1.10.3/src/main/org/apache/tools/ant/util/OutputStreamFunneler.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/OutputStreamFunneler.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/OutputStreamFunneler.java	2018-03-24 12:37:12.000000000 +0000
@@ -44,6 +44,7 @@
             }
         }
 
+        @Override
         public void flush() throws IOException {
             synchronized (OutputStreamFunneler.this) {
                 dieIfClosed();
@@ -51,6 +52,7 @@
             }
         }
 
+        @Override
         public void write(int b) throws IOException {
             synchronized (OutputStreamFunneler.this) {
                 dieIfClosed();
@@ -58,6 +60,7 @@
             }
         }
 
+        @Override
         public void write(byte[] b) throws IOException {
             synchronized (OutputStreamFunneler.this) {
                 dieIfClosed();
@@ -65,6 +68,7 @@
             }
         }
 
+        @Override
         public void write(byte[] b, int off, int len) throws IOException {
             synchronized (OutputStreamFunneler.this) {
                 dieIfClosed();
@@ -72,6 +76,7 @@
             }
         }
 
+        @Override
         public void close() throws IOException {
             release(this);
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/PackageNameMapper.java ant-1.10.3/src/main/org/apache/tools/ant/util/PackageNameMapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/PackageNameMapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/PackageNameMapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -37,6 +37,7 @@
      *@param  name  Source filename
      *@return       Replaced variable part
      */
+    @Override
     protected String extractVariablePart(String name) {
         String var = name.substring(prefixLength,
                 name.length() - postfixLength);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/PermissionUtils.java ant-1.10.3/src/main/org/apache/tools/ant/util/PermissionUtils.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/PermissionUtils.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/PermissionUtils.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,246 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+package org.apache.tools.ant.util;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.PosixFileAttributeView;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.EnumSet;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import org.apache.tools.ant.types.Resource;
+import org.apache.tools.ant.types.resources.ArchiveResource;
+import org.apache.tools.ant.types.resources.FileProvider;
+
+/**
+ * Contains helper methods for dealing with {@link
+ * PosixFilePermission} or the traditional Unix mode representation of
+ * permissions.
+ *
+ * @since Ant 1.10.0
+ */
+public class PermissionUtils {
+
+    private PermissionUtils() { }
+
+    /**
+     * Translates a set of permissions into a Unix stat(2) {@code
+     * st_mode} result.
+     * @param permissions the permissions
+     * @param type the file type
+     * @return the "mode"
+     */
+    public static int modeFromPermissions(Set<PosixFilePermission> permissions,
+                                          FileType type) {
+        int mode;
+        switch (type) {
+        case SYMLINK:
+            mode = 012;
+            break;
+        case REGULAR_FILE:
+            mode = 010;
+            break;
+        case DIR:
+            mode = 004;
+            break;
+        default:
+            // OTHER could be a character or block device, a socket or a FIFO - so don't set anything
+            mode = 0;
+            break;
+        }
+        mode <<= 3;
+        mode <<= 3; // we don't support sticky, setuid, setgid
+        mode |= modeFromPermissions(permissions, "OWNER");
+        mode <<= 3;
+        mode |= modeFromPermissions(permissions, "GROUP");
+        mode <<= 3;
+        mode |= modeFromPermissions(permissions, "OTHERS");
+        return mode;
+    }
+
+    /**
+     * Translates a Unix stat(2) {@code st_mode} compatible value into
+     * a set of permissions.
+     * @param mode the "mode"
+     * @return set of permissions
+     */
+    public static Set<PosixFilePermission> permissionsFromMode(int mode) {
+        Set<PosixFilePermission> permissions = EnumSet.noneOf(PosixFilePermission.class);
+        addPermissions(permissions, "OTHERS", mode);
+        addPermissions(permissions, "GROUP", mode >> 3);
+        addPermissions(permissions, "OWNER", mode >> 6);
+        return permissions;
+    }
+
+    /**
+     * Sets permissions on a {@link Resource} - doesn't do anything
+     * for unsupported resource types.
+     *
+     * <p>Supported types are:</p>
+     * <ul>
+     *  <li>any {@link FileProvider}</li>
+     *  <li>{@link ArchiveResource}</li>
+     * </ul>
+     *
+     * @param r the resource to set permissions for
+     * @param permissions the permissions
+     * @param posixNotSupportedCallback optional callback that is
+     * invoked for a file provider resource if the file-system holding
+     * the file doesn't support PosixFilePermissions. The Path
+     * corresponding to the file is passed to the callback.
+     * @throws IOException if something goes wrong
+     */
+    public static void setPermissions(Resource r, Set<PosixFilePermission> permissions,
+                                      Consumer<Path> posixNotSupportedCallback)
+        throws IOException {
+        FileProvider f = r.as(FileProvider.class);
+        if (f != null) {
+            Path p = f.getFile().toPath();
+            PosixFileAttributeView view =
+                Files.getFileAttributeView(p, PosixFileAttributeView.class);
+            if (view != null) {
+                view.setPermissions(permissions);
+            } else if (posixNotSupportedCallback != null) {
+                posixNotSupportedCallback.accept(p);
+            }
+        } else if (r instanceof ArchiveResource) {
+            ((ArchiveResource) r).setMode(modeFromPermissions(permissions,
+                                                              FileType.of(r)));
+        }
+    }
+
+    /**
+     * Sets permissions of a {@link Resource} - returns an empty set
+     * for unsupported resource types or file systems that don't
+     * support PosixFilePermissions and no fallback has been
+     * provided..
+     *
+     * <p>Supported types are:</p>
+     * <ul>
+     *  <li>any {@link FileProvider}</li>
+     *  <li>{@link ArchiveResource}</li>
+     * </ul>
+     *
+     * @param r the resource to read permissions from
+     * @param posixNotSupportedFallback optional fallback function to provide
+     * permissions for file system that don't support
+     * PosixFilePermissions. The Path corresponding to the file is
+     * passed to the callback.
+     * @return the permissions
+     * @throws IOException if something goes wrong
+     */
+    public static Set<PosixFilePermission> getPermissions(Resource r,
+            Function<Path, Set<PosixFilePermission>> posixNotSupportedFallback)
+        throws IOException {
+        FileProvider f = r.as(FileProvider.class);
+        if (f != null) {
+            Path p = f.getFile().toPath();
+            PosixFileAttributeView view =
+                Files.getFileAttributeView(p, PosixFileAttributeView.class);
+            if (view != null) {
+                return view.readAttributes().permissions();
+            } else if (posixNotSupportedFallback != null) {
+                return posixNotSupportedFallback.apply(p);
+            }
+        } else if (r instanceof ArchiveResource) {
+            return permissionsFromMode(((ArchiveResource) r).getMode());
+        }
+        return EnumSet.noneOf(PosixFilePermission.class);
+    }
+
+    private static long modeFromPermissions(Set<PosixFilePermission> permissions,
+                                            String prefix) {
+        long mode = 0;
+        if (permissions.contains(PosixFilePermission.valueOf(prefix + "_READ"))) {
+            mode |= 4;
+        }
+        if (permissions.contains(PosixFilePermission.valueOf(prefix + "_WRITE"))) {
+            mode |= 2;
+        }
+        if (permissions.contains(PosixFilePermission.valueOf(prefix + "_EXECUTE"))) {
+            mode |= 1;
+        }
+        return mode;
+    }
+
+    private static void addPermissions(Set<PosixFilePermission> permissions,
+                                       String prefix, long mode) {
+        if ((mode & 1) == 1) {
+            permissions.add(PosixFilePermission.valueOf(prefix + "_EXECUTE"));
+        }
+        if ((mode & 2) == 2) {
+            permissions.add(PosixFilePermission.valueOf(prefix + "_WRITE"));
+        }
+        if ((mode & 4) == 4) {
+            permissions.add(PosixFilePermission.valueOf(prefix + "_READ"));
+        }
+    }
+
+    /**
+     * The supported types of files, maps to the {@code isFoo} methods
+     * in {@link java.nio.file.attribute.BasicFileAttributes}.
+     */
+    public enum FileType {
+        /** A regular file. */
+        REGULAR_FILE,
+        /** A directory. */
+        DIR,
+        /** A symbolic link. */
+        SYMLINK,
+        /** Something that is neither a regular file nor a directory nor a symbolic link. */
+        OTHER;
+
+        /**
+         * Determines the file type of a {@link Path}.
+         *
+         * @param p Path
+         * @return FileType
+         * @throws IOException if file attributes cannot be read
+         */
+        public static FileType of(Path p) throws IOException {
+            BasicFileAttributes attrs =
+                Files.readAttributes(p, BasicFileAttributes.class);
+            if (attrs.isRegularFile()) {
+                return FileType.REGULAR_FILE;
+            } else if (attrs.isDirectory()) {
+                return FileType.DIR;
+            } else if (attrs.isSymbolicLink()) {
+                return FileType.SYMLINK;
+            }
+            return FileType.OTHER;
+        }
+
+        /**
+         * Determines the file type of a {@link Resource}.
+         *
+         * @param r Resource
+         * @return FileType
+         */
+        public static FileType of(Resource r) {
+            if (r.isDirectory()) {
+                return FileType.DIR;
+            }
+            return FileType.REGULAR_FILE;
+        }
+    }
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/PropertyOutputStream.java ant-1.10.3/src/main/org/apache/tools/ant/util/PropertyOutputStream.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/PropertyOutputStream.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/PropertyOutputStream.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,13 +19,15 @@
 package org.apache.tools.ant.util;
 
 import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
 
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.resources.PropertyResource;
 
 /**
- * Exception thrown when an attempt is made to get an OutputStream
- * from an immutable Resource.
+ * {@link OutputStream} that writes an Ant property.
  * @since Ant 1.7
+ * @see PropertyResource#getOutputStream()
  */
 public class PropertyOutputStream extends ByteArrayOutputStream {
     private Project project;
@@ -58,6 +60,7 @@
     /**
      * Close the PropertyOutputStream, storing the property.
      */
+    @Override
     public void close() {
         if (project != null && property != null) {
             String s = new String(toByteArray());
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/ProxySetup.java ant-1.10.3/src/main/org/apache/tools/ant/util/ProxySetup.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/ProxySetup.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/ProxySetup.java	2018-03-24 12:37:12.000000000 +0000
@@ -95,7 +95,7 @@
      * is set, use that instead. Else set to "true".
      */
     public void enableProxies() {
-        if (!(getSystemProxySetting() != null)) {
+        if (getSystemProxySetting() == null) {
             String proxies = owner.getProperty(USE_SYSTEM_PROXIES);
             if (proxies == null || Project.toBoolean(proxies)) {
                 proxies = "true";
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/ReaderInputStream.java ant-1.10.3/src/main/org/apache/tools/ant/util/ReaderInputStream.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/ReaderInputStream.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/ReaderInputStream.java	2018-03-24 12:37:12.000000000 +0000
@@ -60,9 +60,8 @@
         this(reader);
         if (encoding == null) {
             throw new IllegalArgumentException("encoding must not be null");
-        } else {
-            this.encoding = encoding;
         }
+        this.encoding = encoding;
     }
 
     /**
@@ -72,6 +71,7 @@
      *
      * @exception IOException if the original <code>Reader</code> fails to be read
      */
+    @Override
     public synchronized int read() throws IOException {
         if (in == null) {
             throw new IOException("Stream Closed");
@@ -104,6 +104,7 @@
      *         the end of the stream
      * @exception IOException if an error occurs
      */
+    @Override
     public synchronized int read(byte[] b, int off, int len)
         throws IOException {
         if (in == null) {
@@ -144,6 +145,7 @@
      * @param limit the maximum limit of bytes that can be read before the
      *              mark position becomes invalid
      */
+    @Override
     public synchronized void mark(final int limit) {
         try {
             in.mark(limit);
@@ -152,11 +154,11 @@
         }
     }
 
-
     /**
      * @return   the current number of bytes ready for reading
      * @exception IOException if an error occurs
      */
+    @Override
     public synchronized int available() throws IOException {
         if (in == null) {
             throw new IOException("Stream Closed");
@@ -173,6 +175,7 @@
     /**
      * @return false - mark is not supported
      */
+    @Override
     public boolean markSupported() {
         return false;   // would be imprecise
     }
@@ -182,6 +185,7 @@
      *
      * @exception IOException if the Reader fails to be reset
      */
+    @Override
     public synchronized void reset() throws IOException {
         if (in == null) {
             throw new IOException("Stream Closed");
@@ -195,6 +199,7 @@
      *
      * @exception IOException if the original Reader fails to be closed
      */
+    @Override
     public synchronized void close() throws IOException {
         if (in != null) {
             in.close();
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/ReflectUtil.java ant-1.10.3/src/main/org/apache/tools/ant/util/ReflectUtil.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/ReflectUtil.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/ReflectUtil.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,6 +21,8 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.BuildException;
 
@@ -61,16 +63,16 @@
 
     /**
      * Call a method on the object with no parameters.
+     * @param <T> desired type
      * @param obj  the object to invoke the method on.
      * @param methodName the name of the method to call
      * @return the object returned by the method
      */
-    public static Object invoke(Object obj, String methodName) {
+    @SuppressWarnings("unchecked")
+    public static <T> T invoke(Object obj, String methodName) {
         try {
-            Method method;
-            method = obj.getClass().getMethod(
-                        methodName, (Class[]) null);
-            return method.invoke(obj, (Object[]) null);
+            Method method = obj.getClass().getMethod(methodName);
+            return (T) method.invoke(obj);
         } catch (Exception t) {
             throwBuildException(t);
             return null; // NotReached
@@ -81,16 +83,16 @@
      * Call a method on the object with no parameters.
      * Note: Unlike the invoke method above, this
      * calls class or static methods, not instance methods.
+     * @param <T> desired type
      * @param obj  the object to invoke the method on.
      * @param methodName the name of the method to call
      * @return the object returned by the method
      */
-    public static Object invokeStatic(Object obj, String methodName) {
+    @SuppressWarnings("unchecked")
+    public static <T> T invokeStatic(Object obj, String methodName) {
         try {
-            Method method;
-            method = ((Class<?>) obj).getMethod(
-                    methodName, (Class[]) null);
-            return method.invoke(obj, (Object[]) null);
+            Method method = ((Class<?>) obj).getMethod(methodName);
+            return (T) method.invoke(obj);
         } catch (Exception t) {
             throwBuildException(t);
             return null; // NotReached
@@ -99,19 +101,19 @@
 
     /**
      * Call a method on the object with one argument.
+     * @param <T> desired type
      * @param obj  the object to invoke the method on.
      * @param methodName the name of the method to call
      * @param argType    the type of argument.
      * @param arg        the value of the argument.
      * @return the object returned by the method
      */
-    public static Object invoke(
+    @SuppressWarnings("unchecked")
+    public static <T> T invoke(
         Object obj, String methodName, Class<?> argType, Object arg) {
         try {
-            Method method;
-            method = obj.getClass().getMethod(
-                methodName, new Class[] {argType});
-            return method.invoke(obj, new Object[] {arg});
+            Method method = obj.getClass().getMethod(methodName, argType);
+            return (T) method.invoke(obj, arg);
         } catch (Exception t) {
             throwBuildException(t);
             return null; // NotReached
@@ -120,6 +122,7 @@
 
     /**
      * Call a method on the object with two argument.
+     * @param <T> desired type
      * @param obj  the object to invoke the method on.
      * @param methodName the name of the method to call
      * @param argType1   the type of the first argument.
@@ -128,14 +131,14 @@
      * @param arg2       the value of the second argument.
      * @return the object returned by the method
      */
-    public static Object invoke(
+    @SuppressWarnings("unchecked")
+    public static <T> T invoke(
         Object obj, String methodName, Class<?> argType1, Object arg1,
         Class<?> argType2, Object arg2) {
         try {
-            Method method;
-            method = obj.getClass().getMethod(
-                methodName, new Class[] {argType1, argType2});
-            return method.invoke(obj, new Object[] {arg1, arg2});
+            Method method =
+                obj.getClass().getMethod(methodName, argType1, argType2);
+            return (T) method.invoke(obj, arg1, arg2);
         } catch (Exception t) {
             throwBuildException(t);
             return null; // NotReached
@@ -144,17 +147,19 @@
 
     /**
      * Get the value of a field in an object.
+     * @param <T> desired type
      * @param obj the object to look at.
      * @param fieldName the name of the field in the object.
      * @return the value of the field.
      * @throws BuildException if there is an error.
      */
-    public static Object getField(Object obj, String fieldName)
+    @SuppressWarnings("unchecked")
+    public static <T> T getField(Object obj, String fieldName)
         throws BuildException {
         try {
             Field field = obj.getClass().getDeclaredField(fieldName);
             field.setAccessible(true);
-            return field.get(obj);
+            return (T) field.get(obj);
         } catch (Exception t) {
             throwBuildException(t);
             return null; // NotReached
@@ -187,9 +192,8 @@
                 return (BuildException) t2;
             }
             return new BuildException(t2);
-        } else {
-            return new BuildException(t);
         }
+        return new BuildException(t);
     }
 
     /**
@@ -203,13 +207,8 @@
     public static boolean respondsTo(Object o, String methodName)
         throws BuildException {
         try {
-            Method[] methods = o.getClass().getMethods();
-            for (int i = 0; i < methods.length; i++) {
-                if (methods[i].getName().equals(methodName)) {
-                    return true;
-                }
-            }
-            return false;
+            return Stream.of(o.getClass().getMethods()).map(Method::getName)
+                .anyMatch(Predicate.isEqual(methodName));
         } catch (Exception t) {
             throw toBuildException(t);
         }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/ReflectWrapper.java ant-1.10.3/src/main/org/apache/tools/ant/util/ReflectWrapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/ReflectWrapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/ReflectWrapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -28,6 +28,7 @@
 
 public class ReflectWrapper {
     private Object obj;
+
     /**
      * Construct a wrapped object using the no arg constructor.
      * @param loader the classloader to use to construct the class.
@@ -35,11 +36,9 @@
      */
     public ReflectWrapper(ClassLoader loader, String name) {
         try {
-            Class clazz;
-            clazz = Class.forName(name, true, loader);
-            Constructor constructor;
-            constructor = clazz.getConstructor((Class[]) null);
-            obj = constructor.newInstance((Object[]) null);
+            Class<?> clazz = Class.forName(name, true, loader);
+            Constructor<?> constructor = clazz.getConstructor();
+            obj = constructor.newInstance();
         } catch (Exception t) {
             ReflectUtil.throwBuildException(t);
         }
@@ -54,35 +53,39 @@
     }
 
     /**
+     * @param <T> desired type
      * @return the wrapped object.
      */
-    public Object getObject() {
-        return obj;
+    @SuppressWarnings("unchecked")
+    public <T> T getObject() {
+        return (T) obj;
     }
 
     /**
      * Call a method on the object with no parameters.
+     * @param <T> desired type
      * @param methodName the name of the method to call
      * @return the object returned by the method
      */
-    public Object invoke(String methodName) {
+    public <T> T invoke(String methodName) {
         return ReflectUtil.invoke(obj, methodName);
     }
 
     /**
      * Call a method on the object with one argument.
+     * @param <T> desired type
      * @param methodName the name of the method to call
      * @param argType    the type of argument.
      * @param arg        the value of the argument.
      * @return the object returned by the method
      */
-    public Object invoke(
-        String methodName, Class argType, Object arg) {
+    public <T> T invoke(String methodName, Class<?> argType, Object arg) {
         return ReflectUtil.invoke(obj, methodName, argType, arg);
     }
 
     /**
      * Call a method on the object with one argument.
+     * @param <T> desired type
      * @param methodName the name of the method to call
      * @param argType1   the type of the first argument.
      * @param arg1       the value of the first argument.
@@ -90,10 +93,9 @@
      * @param arg2       the value of the second argument.
      * @return the object returned by the method
      */
-    public Object invoke(
-        String methodName, Class argType1, Object arg1,
-        Class argType2, Object arg2) {
-        return ReflectUtil.invoke(
-            obj, methodName, argType1, arg1, argType2, arg2);
+    public <T> T invoke(String methodName, Class<?> argType1, Object arg1,
+        Class<?> argType2, Object arg2) {
+        return ReflectUtil.invoke(obj, methodName, argType1, arg1, argType2,
+            arg2);
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java ant-1.10.3/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java	2018-03-24 12:37:12.000000000 +0000
@@ -40,15 +40,10 @@
     // CheckStyle:VisibilityModifier ON
 
     /**
-     * Constructor for JakartaOroMatcher.
-     */
-    public JakartaOroMatcher() {
-    }
-
-    /**
      * Set the regexp pattern from the String description.
      * @param pattern the pattern to match
      */
+    @Override
     public void setPattern(final String pattern) {
         this.pattern = pattern;
     }
@@ -57,6 +52,7 @@
      * Get a String representation of the regexp pattern
      * @return the pattern
      */
+    @Override
     public String getPattern() {
         return this.pattern;
     }
@@ -71,8 +67,7 @@
         throws BuildException {
         try {
             // compute the compiler options based on the input options first
-            final Pattern p = compiler.compile(pattern, getCompilerOptions(options));
-            return p;
+            return compiler.compile(pattern, getCompilerOptions(options));
         } catch (final Exception e) {
             throw new BuildException(e);
         }
@@ -84,6 +79,7 @@
      * @return true if the pattern matches
      * @throws BuildException on error
      */
+    @Override
     public boolean matches(final String argument) throws BuildException {
         return matches(argument, MATCH_DEFAULT);
     }
@@ -95,10 +91,10 @@
      * @return true if the pattern matches
      * @throws BuildException on error
      */
+    @Override
     public boolean matches(final String input, final int options)
         throws BuildException {
-        final Pattern p = getCompiledPattern(options);
-        return matcher.contains(input, p);
+        return matcher.contains(input, getCompiledPattern(options));
     }
 
     /**
@@ -112,7 +108,8 @@
      * @return the vector of groups
      * @throws BuildException on error
      */
-    public Vector getGroups(final String argument) throws BuildException {
+    @Override
+    public Vector<String> getGroups(final String argument) throws BuildException {
         return getGroups(argument, MATCH_DEFAULT);
     }
 
@@ -127,12 +124,13 @@
      * @return the vector of groups
      * @throws BuildException on error
      */
-    public Vector getGroups(final String input, final int options)
+    @Override
+    public Vector<String> getGroups(final String input, final int options)
         throws BuildException {
         if (!matches(input, options)) {
             return null;
         }
-        final Vector v = new Vector();
+        final Vector<String> v = new Vector<>();
         final MatchResult mr = matcher.getMatch();
         final int cnt = mr.groups();
         for (int i = 0; i < cnt; i++) {
@@ -141,7 +139,7 @@
             if (match == null) {
                 match = "";
             }
-            v.addElement(match);
+            v.add(match);
         }
         return v;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java ant-1.10.3/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java	2018-03-24 12:37:12.000000000 +0000
@@ -29,11 +29,6 @@
 
     private static final int DECIMAL = 10;
 
-    /** Constructor for JakartaOroRegexp */
-    public JakartaOroRegexp() {
-        super();
-    }
-
     /**
      * Perform a substitution on the regular expression.
      * @param input The string to substitute on
@@ -45,7 +40,7 @@
     public String substitute(final String input, final String argument, final int options)
         throws BuildException {
         // translate \1 to $1 so that the Perl5Substitution will work
-        final StringBuffer subst = new StringBuffer();
+        final StringBuilder subst = new StringBuilder();
         for (int i = 0; i < argument.length(); i++) {
             char c = argument.charAt(i);
             if (c == '$') {
@@ -56,7 +51,7 @@
                     c = argument.charAt(i);
                     final int value = Character.digit(c, DECIMAL);
                     if (value > -1) {
-                        subst.append("$").append(value);
+                        subst.append('$').append(value);
                     } else {
                         subst.append(c);
                     }
@@ -87,12 +82,8 @@
      * @return the oro substitution options
      */
     protected int getSubsOptions(final int options) {
-        final boolean replaceAll = RegexpUtil.hasFlag(options, REPLACE_ALL);
-        int subsOptions = 1;
-        if (replaceAll) {
-            subsOptions = Util.SUBSTITUTE_ALL;
-        }
-        return subsOptions;
+        return RegexpUtil.hasFlag(options, REPLACE_ALL) ? Util.SUBSTITUTE_ALL
+            : 1;
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java ant-1.10.3/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java	2018-03-24 12:37:12.000000000 +0000
@@ -35,6 +35,7 @@
      * Set the regexp pattern from the String description.
      * @param pattern the pattern to match
      */
+    @Override
     public void setPattern(String pattern) {
         this.pattern = pattern;
     }
@@ -43,6 +44,7 @@
      * Get a String representation of the regexp pattern
      * @return the pattern
      */
+    @Override
     public String getPattern() {
         return pattern;
     }
@@ -72,6 +74,7 @@
      * @return true if the pattern matches
      * @throws BuildException on error
      */
+    @Override
     public boolean matches(String argument) throws BuildException {
         return matches(argument, MATCH_DEFAULT);
     }
@@ -83,6 +86,7 @@
      * @return true if the pattern matches
      * @throws BuildException on error
      */
+    @Override
     public boolean matches(String input, int options)
         throws BuildException {
         return matches(input, getCompiledPattern(options));
@@ -103,7 +107,8 @@
      * @return the vector of groups
      * @throws BuildException on error
      */
-    public Vector getGroups(String argument) throws BuildException {
+    @Override
+    public Vector<String> getGroups(String argument) throws BuildException {
         return getGroups(argument, MATCH_DEFAULT);
     }
 
@@ -118,13 +123,14 @@
      * @return the vector of groups
      * @throws BuildException on error
      */
-    public Vector getGroups(String input, int options)
+    @Override
+    public Vector<String> getGroups(String input, int options)
         throws BuildException {
         RE reg = getCompiledPattern(options);
         if (!matches(input, reg)) {
             return null;
         }
-        Vector v = new Vector();
+        Vector<String> v = new Vector<>();
         int cnt = reg.getParenCount();
         for (int i = 0; i < cnt; i++) {
             String match = reg.getParen(i);
@@ -132,7 +138,7 @@
             if (match == null) {
                 match = "";
             }
-            v.addElement(match);
+            v.add(match);
         }
         return v;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java ant-1.10.3/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java	2018-03-24 12:37:12.000000000 +0000
@@ -29,11 +29,6 @@
 
     private static final int DECIMAL = 10;
 
-    /** Constructor for JakartaRegexpRegexp */
-    public JakartaRegexpRegexp() {
-        super();
-    }
-
     /**
      * Convert ant regexp substitution option to apache regex options.
      *
@@ -56,12 +51,13 @@
      * @return the result of the operation
      * @throws BuildException on error
      */
+    @Override
     public String substitute(String input, String argument, int options)
         throws BuildException {
-        Vector v = getGroups(input, options);
+        Vector<String> v = getGroups(input, options);
 
         // replace \1 with the corresponding group
-        StringBuffer result = new StringBuffer();
+        StringBuilder result = new StringBuilder();
         for (int i = 0; i < argument.length(); i++) {
             char c = argument.charAt(i);
             if (c == '\\') {
@@ -81,10 +77,8 @@
                 result.append(c);
             }
         }
-        argument = result.toString();
-
         RE reg = getCompiledPattern(options);
         int sOptions = getSubsOptions(options);
-        return reg.subst(input, argument, sOptions);
+        return reg.subst(input, result.toString(), sOptions);
     }
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java ant-1.10.3/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java	2018-03-24 12:37:12.000000000 +0000
@@ -34,14 +34,11 @@
 
     private String pattern;
 
-    /** Constructor for JakartaOroRegexp */
-    public Jdk14RegexpMatcher() {
-    }
-
     /**
      * Set the regexp pattern from the String description.
      * @param pattern the pattern to match
      */
+    @Override
     public void setPattern(String pattern) {
         this.pattern = pattern;
     }
@@ -51,6 +48,7 @@
      * @return the pattern
      * @throws BuildException on error
      */
+    @Override
     public String getPattern() {
         return pattern;
     }
@@ -65,8 +63,7 @@
         throws BuildException {
         int cOptions = getCompilerOptions(options);
         try {
-            Pattern p = Pattern.compile(this.pattern, cOptions);
-            return p;
+            return Pattern.compile(this.pattern, cOptions);
         } catch (PatternSyntaxException e) {
             throw new BuildException(e);
         }
@@ -78,6 +75,7 @@
      * @return true if the pattern matches
      * @throws BuildException on error
      */
+    @Override
     public boolean matches(String argument) throws BuildException {
         return matches(argument, MATCH_DEFAULT);
     }
@@ -89,11 +87,11 @@
      * @return true if the pattern matches
      * @throws BuildException on error
      */
+    @Override
     public boolean matches(String input, int options)
         throws BuildException {
         try {
-            Pattern p = getCompiledPattern(options);
-            return p.matcher(input).find();
+            return getCompiledPattern(options).matcher(input).find();
         } catch (Exception e) {
             throw new BuildException(e);
         }
@@ -110,7 +108,8 @@
      * @return the vector of groups
      * @throws BuildException on error
      */
-    public Vector getGroups(String argument) throws BuildException {
+    @Override
+    public Vector<String> getGroups(String argument) throws BuildException {
         return getGroups(argument, MATCH_DEFAULT);
     }
 
@@ -125,14 +124,15 @@
      * @return the vector of groups
      * @throws BuildException on error
      */
-    public Vector getGroups(String input, int options)
+    @Override
+    public Vector<String> getGroups(String input, int options)
         throws BuildException {
         Pattern p = getCompiledPattern(options);
         Matcher matcher = p.matcher(input);
         if (!matcher.find()) {
             return null;
         }
-        Vector v = new Vector();
+        Vector<String> v = new Vector<>();
         int cnt = matcher.groupCount();
         for (int i = 0; i <= cnt; i++) {
             String match = matcher.group(i);
@@ -140,7 +140,7 @@
             if (match == null) {
                 match = "";
             }
-            v.addElement(match);
+            v.add(match);
         }
         return v;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java ant-1.10.3/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java	2018-03-24 12:37:12.000000000 +0000
@@ -29,11 +29,6 @@
 
     private static final int DECIMAL = 10;
 
-    /** Constructor for Jdk14RegexpRegexp */
-    public Jdk14RegexpRegexp() {
-        super();
-    }
-
     /**
      * Convert ant regexp substitution option to jdk1.4 options.
      *
@@ -56,10 +51,11 @@
      * @return the result of the operation
      * @throws BuildException on error
      */
+    @Override
     public String substitute(String input, String argument, int options)
         throws BuildException {
         // translate \1 to $(1) so that the Matcher will work
-        StringBuffer subst = new StringBuffer();
+        StringBuilder subst = new StringBuilder();
         for (int i = 0; i < argument.length(); i++) {
             char c = argument.charAt(i);
             if (c == '$') {
@@ -70,7 +66,7 @@
                     c = argument.charAt(i);
                     int value = Character.digit(c, DECIMAL);
                     if (value > -1) {
-                        subst.append("$").append(value);
+                        subst.append('$').append(value);
                     } else {
                         subst.append(c);
                     }
@@ -82,7 +78,6 @@
                 subst.append(c);
             }
         }
-        argument = subst.toString();
 
         int sOptions = getSubsOptions(options);
         Pattern p = getCompiledPattern(options);
@@ -90,15 +85,12 @@
 
         Matcher m = p.matcher(input);
         if (RegexpUtil.hasFlag(sOptions, REPLACE_ALL)) {
-            sb.append(m.replaceAll(argument));
+            sb.append(m.replaceAll(subst.toString()));
+        } else if (m.find()) {
+            m.appendReplacement(sb, subst.toString());
+            m.appendTail(sb);
         } else {
-            boolean res = m.find();
-            if (res) {
-                m.appendReplacement(sb, argument);
-                m.appendTail(sb);
-            } else {
-                sb.append(input);
-            }
+            sb.append(input);
         }
         return sb.toString();
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/regexp/RegexpFactory.java ant-1.10.3/src/main/org/apache/tools/ant/util/regexp/RegexpFactory.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/regexp/RegexpFactory.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/regexp/RegexpFactory.java	2018-03-24 12:37:12.000000000 +0000
@@ -30,10 +30,6 @@
  */
 public class RegexpFactory extends RegexpMatcherFactory {
 
-    /** Constructor for RegexpFactory */
-    public RegexpFactory() {
-    }
-
     /***
      * Create a new regular expression matcher instance.
      * @return the matcher instance
@@ -51,7 +47,7 @@
      * @throws BuildException on error
      */
     public Regexp newRegexp(Project p) throws BuildException {
-        String systemDefault = null;
+        String systemDefault;
         if (p == null) {
             systemDefault = System.getProperty(MagicNames.REGEXP_IMPL);
         } else {
@@ -78,8 +74,8 @@
      * @see RegexpMatcherFactory#createInstance(String)
      */
     protected Regexp createRegexpInstance(String classname) throws BuildException {
-        return (Regexp) ClasspathUtils.newInstance(classname, RegexpFactory.class.getClassLoader(),
-                Regexp.class);
+        return ClasspathUtils.newInstance(classname,
+            RegexpFactory.class.getClassLoader(), Regexp.class);
     }
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java ant-1.10.3/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java	2018-03-24 12:37:12.000000000 +0000
@@ -33,10 +33,6 @@
  */
 public class RegexpMatcherFactory {
 
-    /** Constructor for RegexpMatcherFactory. */
-    public RegexpMatcherFactory() {
-    }
-
     /***
      * Create a new regular expression instance.
      * @return the matcher
@@ -54,7 +50,7 @@
      * @throws BuildException on error
      */
     public RegexpMatcher newRegexpMatcher(Project p) throws BuildException {
-        String systemDefault = null;
+        String systemDefault;
         if (p == null) {
             systemDefault = System.getProperty(MagicNames.REGEXP_IMPL);
         } else {
@@ -78,8 +74,8 @@
      * @exception BuildException if an error occurs
      */
     protected RegexpMatcher createInstance(String className) throws BuildException {
-        return (RegexpMatcher) ClasspathUtils.newInstance(className, RegexpMatcherFactory.class
-                .getClassLoader(), RegexpMatcher.class);
+        return ClasspathUtils.newInstance(className,
+            RegexpMatcherFactory.class.getClassLoader(), RegexpMatcher.class);
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java ant-1.10.3/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java	2018-03-24 12:37:12.000000000 +0000
@@ -83,7 +83,7 @@
      * @return the vector of groups
      * @throws BuildException on error
      */
-    Vector getGroups(String argument) throws BuildException;
+    Vector<String> getGroups(String argument) throws BuildException;
 
     /***
      * Does this regular expression match the input, given
@@ -105,6 +105,6 @@
      * @return the vector of groups
      * @throws BuildException on error
      */
-    Vector getGroups(String input, int options) throws BuildException;
+    Vector<String> getGroups(String input, int options) throws BuildException;
 
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/regexp/RegexpUtil.java ant-1.10.3/src/main/org/apache/tools/ant/util/regexp/RegexpUtil.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/regexp/RegexpUtil.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/regexp/RegexpUtil.java	2018-03-24 12:37:12.000000000 +0000
@@ -33,7 +33,7 @@
      * @return true if the flag is set
      */
     public static boolean hasFlag(int options, int flag) {
-        return ((options & flag) > 0);
+        return (options & flag) > 0;
     }
 
     /**
@@ -44,7 +44,7 @@
      * @return the options with the flag unset
      */
     public static int removeFlag(int options, int flag) {
-        return (options & (0xFFFFFFFF - flag));
+        return options & (0xFFFFFFFF - flag);
     }
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java ant-1.10.3/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,7 +18,7 @@
 
 package org.apache.tools.ant.util;
 
-import java.util.Vector;
+import java.util.List;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.regexp.RegexpMatcher;
@@ -77,19 +77,19 @@
      * @param from the from pattern.
      * @throws BuildException on error.
      */
+    @Override
     public void setFrom(String from) throws BuildException {
-        if (from != null) {
-            try {
-                reg.setPattern(from);
-            } catch (NoClassDefFoundError e) {
-                // depending on the implementation the actual RE won't
-                // get instantiated in the constructor.
-                throw new BuildException("Cannot load regular expression matcher",
-                                         e);
-            }
-        } else {
+        if (from == null) {
             throw new BuildException("this mapper requires a 'from' attribute");
         }
+        try {
+            reg.setPattern(from);
+        } catch (NoClassDefFoundError e) {
+            // depending on the implementation the actual RE won't
+            // get instantiated in the constructor.
+            throw new BuildException("Cannot load regular expression matcher",
+                e);
+        }
     }
 
     /**
@@ -97,12 +97,12 @@
      * @param to the to pattern.
      * @throws BuildException on error.
      */
+    @Override
     public void setTo(String to) {
-        if (to != null) {
-            this.to = to.toCharArray();
-        } else {
+        if (to == null) {
             throw new BuildException("this mapper requires a 'to' attribute");
         }
+        this.to = to.toCharArray();
     }
 
     /**
@@ -113,7 +113,11 @@
      * @return a one-element array containing the translated file or
      *         null if the to pattern did not match
      */
+    @Override
     public String[] mapFileName(String sourceFileName) {
+        if (sourceFileName == null) {
+            return null;
+        }
         if (handleDirSep) {
             if (sourceFileName.indexOf("\\") != -1) {
                 sourceFileName = sourceFileName.replace('\\', '/');
@@ -133,7 +137,7 @@
      * @return the translated file name.
      */
     protected String replaceReferences(String source) {
-        Vector v = reg.getGroups(source, regexpOptions);
+        List<String> v = reg.getGroups(source, regexpOptions);
 
         result.setLength(0);
         for (int i = 0; i < to.length; i++) {
@@ -141,7 +145,7 @@
                 if (++i < to.length) {
                     int value = Character.digit(to[i], DECIMAL);
                     if (value > -1) {
-                        result.append((String) v.elementAt(value));
+                        result.append(v.get(value));
                     } else {
                         result.append(to[i]);
                     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/ResourceUtils.java ant-1.10.3/src/main/org/apache/tools/ant/util/ResourceUtils.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/ResourceUtils.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/ResourceUtils.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,8 +21,6 @@
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -30,12 +28,15 @@
 import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.nio.channels.FileChannel;
+import java.nio.charset.Charset;
+import java.nio.file.StandardOpenOption;
 import java.util.Arrays;
 import java.util.Vector;
 
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectComponent;
 import org.apache.tools.ant.filters.util.ChainReaderHelper;
+import org.apache.tools.ant.types.FilterChain;
 import org.apache.tools.ant.types.FilterSetCollection;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
@@ -143,24 +144,8 @@
                                                             final ResourceFactory targets,
                                                             final long granularity) {
         logFuture(logTo, source, granularity);
-        final ResourceSelectorProvider p =
-            new ResourceSelectorProvider() {
-                public ResourceSelector
-                    getTargetSelectorForSource(final Resource sr) {
-                    return new ResourceSelector() {
-                        public boolean isSelected(final Resource target) {
-                            /* Extra I/O, probably wasted:
-                               if (target.isDirectory()) {
-                               return false;
-                               }
-                            */
-                            return SelectorUtils.isOutOfDate(sr, target,
-                                                             granularity);
-                        }
-                    };
-                }
-            };
-        return selectSources(logTo, source, mapper, targets, p);
+        return selectSources(logTo, source, mapper, targets,
+            sr -> target -> SelectorUtils.isOutOfDate(sr, target, granularity));
     }
 
     /**
@@ -182,7 +167,7 @@
                                                    final FileNameMapper mapper,
                                                    final ResourceFactory targets,
                                                    final ResourceSelectorProvider selector) {
-        if (source.size() == 0) {
+        if (source.isEmpty()) {
             logTo.log("No sources found.", Project.MSG_VERBOSE);
             return Resources.NONE;
         }
@@ -302,7 +287,7 @@
      * @since Ant 1.7
      */
     public static void copyResource(final Resource source, final Resource dest,
-                             final FilterSetCollection filters, final Vector filterChains,
+                             final FilterSetCollection filters, final Vector<FilterChain> filterChains,
                              final boolean overwrite, final boolean preserveLastModified,
                              final String inputEncoding, final String outputEncoding,
                              final Project project)
@@ -339,7 +324,7 @@
      * @since Ant 1.8
      */
     public static void copyResource(final Resource source, final Resource dest,
-                            final FilterSetCollection filters, final Vector filterChains,
+                            final FilterSetCollection filters, final Vector<FilterChain> filterChains,
                             final boolean overwrite, final boolean preserveLastModified,
                                     final boolean append,
                             final String inputEncoding, final String outputEncoding,
@@ -379,7 +364,7 @@
      * @since Ant 1.8.2
      */
     public static void copyResource(final Resource source, final Resource dest,
-                            final FilterSetCollection filters, final Vector filterChains,
+                            final FilterSetCollection filters, final Vector<FilterChain> filterChains,
                             final boolean overwrite, final boolean preserveLastModified,
                                     final boolean append,
                                     final String inputEncoding, final String outputEncoding,
@@ -392,8 +377,8 @@
         final boolean filterSetsAvailable = (filters != null
                                              && filters.hasFilters());
         final boolean filterChainsAvailable = (filterChains != null
-                                               && filterChains.size() > 0);
-        String effectiveInputEncoding = null;
+                                               && !filterChains.isEmpty());
+        String effectiveInputEncoding;
         if (source instanceof StringResource) {
             effectiveInputEncoding = ((StringResource) source).getEncoding();
         } else {
@@ -406,25 +391,25 @@
         if (destFile != null && destFile.isFile() && !destFile.canWrite()) {
             if (!force) {
                 throw new ReadOnlyTargetFileException(destFile);
-            } else if (!FILE_UTILS.tryHardToDelete(destFile)) {
-                throw new IOException("failed to delete read-only "
-                                      + "destination file " + destFile);
+            }
+            if (!FILE_UTILS.tryHardToDelete(destFile)) {
+                throw new IOException(
+                    "failed to delete read-only destination file " + destFile);
             }
         }
 
         if (filterSetsAvailable) {
             copyWithFilterSets(source, dest, filters, filterChains,
-                               filterChainsAvailable, append,
-                               effectiveInputEncoding, outputEncoding,
-                               project);
+                               append, effectiveInputEncoding,
+                               outputEncoding, project);
         } else if (filterChainsAvailable
                    || (effectiveInputEncoding != null
                        && !effectiveInputEncoding.equals(outputEncoding))
                    || (effectiveInputEncoding == null && outputEncoding != null)) {
             copyWithFilterChainsOrTranscoding(source, dest, filterChains,
-                                              filterChainsAvailable, append,
-                                              effectiveInputEncoding,
-                                              outputEncoding, project);
+                                              append, effectiveInputEncoding,
+                                              outputEncoding,
+                                              project);
         } else {
             boolean copied = false;
             if (source.as(FileProvider.class) != null
@@ -562,9 +547,8 @@
         if (fileProvider instanceof FileResource || fileProvider == null) {
             return (FileResource) fileProvider;
         }
-        final FileResource result = new FileResource(fileProvider.getFile());
-        result.setProject(Project.getProject(fileProvider));
-        return result;
+        return new FileResource(Project.getProject(fileProvider),
+            fileProvider.getFile());
     }
 
     /**
@@ -583,11 +567,9 @@
      * @since Ant 1.7
      */
     private static int binaryCompare(final Resource r1, final Resource r2) throws IOException {
-        InputStream in1 = null;
-        InputStream in2 = null;
-        try {
-            in1 = new BufferedInputStream(r1.getInputStream());
-            in2 = new BufferedInputStream(r2.getInputStream());
+        try (InputStream in1 = new BufferedInputStream(r1.getInputStream());
+                InputStream in2 =
+                    new BufferedInputStream(r2.getInputStream())) {
 
             for (int b1 = in1.read(); b1 != -1; b1 = in1.read()) {
                 final int b2 = in2.read();
@@ -596,9 +578,6 @@
                 }
             }
             return in2.read() == -1 ? 0 : -1;
-        } finally {
-            FileUtils.close(in1);
-            FileUtils.close(in2);
         }
     }
 
@@ -613,11 +592,10 @@
      * @since Ant 1.7
      */
     private static int textCompare(final Resource r1, final Resource r2) throws IOException {
-        BufferedReader in1 = null;
-        BufferedReader in2 = null;
-        try {
-            in1 = new BufferedReader(new InputStreamReader(r1.getInputStream()));
-            in2 = new BufferedReader(new InputStreamReader(r2.getInputStream()));
+        try (BufferedReader in1 =
+            new BufferedReader(new InputStreamReader(r1.getInputStream()));
+                BufferedReader in2 = new BufferedReader(
+                    new InputStreamReader(r2.getInputStream()))) {
 
             String expected = in1.readLine();
             while (expected != null) {
@@ -631,9 +609,6 @@
                 expected = in1.readLine();
             }
             return in2.readLine() == null ? 0 : -1; //NOSONAR
-        } finally {
-            FileUtils.close(in1);
-            FileUtils.close(in2);
         }
     }
 
@@ -660,10 +635,9 @@
 
     private static void copyWithFilterSets(final Resource source, final Resource dest,
                                            final FilterSetCollection filters,
-                                           final Vector filterChains,
-                                           final boolean filterChainsAvailable,
-                                           final boolean append, final String inputEncoding,
-                                           final String outputEncoding,
+                                           final Vector<FilterChain> filterChains,
+                                           final boolean append,
+                                           final String inputEncoding, final String outputEncoding,
                                            final Project project)
         throws IOException {
 
@@ -673,34 +647,12 @@
             return;
         }
 
-        BufferedReader in = null;
-        BufferedWriter out = null;
-        try {
-            InputStreamReader isr = null;
-            if (inputEncoding == null) {
-                isr = new InputStreamReader(source.getInputStream());
-            } else {
-                isr = new InputStreamReader(source.getInputStream(),
-                                            inputEncoding);
-            }
-            in = new BufferedReader(isr);
-            final OutputStream os = getOutputStream(dest, append, project);
-            OutputStreamWriter osw;
-            if (outputEncoding == null) {
-                osw = new OutputStreamWriter(os);
-            } else {
-                osw = new OutputStreamWriter(os, outputEncoding);
-            }
-            out = new BufferedWriter(osw);
-            if (filterChainsAvailable) {
-                final ChainReaderHelper crh = new ChainReaderHelper();
-                crh.setBufferSize(FileUtils.BUF_SIZE);
-                crh.setPrimaryReader(in);
-                crh.setFilterChains(filterChains);
-                crh.setProject(project);
-                final Reader rdr = crh.getAssembledReader();
-                in = new BufferedReader(rdr);
-            }
+        try (Reader in = filterWith(project, inputEncoding, filterChains,
+                source.getInputStream());
+             BufferedWriter out = new BufferedWriter(new OutputStreamWriter(
+                     getOutputStream(dest, append, project),
+                     charsetFor(outputEncoding)))) {
+
             final LineTokenizer lineTokenizer = new LineTokenizer();
             lineTokenizer.setIncludeDelims(true);
             String newline = null;
@@ -716,16 +668,30 @@
                 }
                 line = lineTokenizer.getToken(in);
             }
-        } finally {
-            FileUtils.close(out);
-            FileUtils.close(in);
         }
     }
 
+    private static Reader filterWith(Project project, String encoding,
+        Vector<FilterChain> filterChains, InputStream input) {
+        Reader r = new InputStreamReader(input, charsetFor(encoding));
+        if (filterChains != null && !filterChains.isEmpty()) {
+            final ChainReaderHelper crh = new ChainReaderHelper();
+            crh.setBufferSize(FileUtils.BUF_SIZE);
+            crh.setPrimaryReader(r);
+            crh.setFilterChains(filterChains);
+            crh.setProject(project);
+            r = crh.getAssembledReader();
+        }
+        return new BufferedReader(r);
+    }
+
+    private static Charset charsetFor(String encoding) {
+        return encoding == null ? Charset.defaultCharset() : Charset.forName(encoding);
+    }
+
     private static void copyWithFilterChainsOrTranscoding(final Resource source,
                                                           final Resource dest,
-                                                          final Vector filterChains,
-                                                          final boolean filterChainsAvailable,
+                                                          final Vector<FilterChain> filterChains,
                                                           final boolean append,
                                                           final String inputEncoding,
                                                           final String outputEncoding,
@@ -738,34 +704,11 @@
             return;
         }
 
-        BufferedReader in = null;
-        BufferedWriter out = null;
-        try {
-            InputStreamReader isr = null;
-            if (inputEncoding == null) {
-                isr = new InputStreamReader(source.getInputStream());
-            } else {
-                isr = new InputStreamReader(source.getInputStream(),
-                                            inputEncoding);
-            }
-            in = new BufferedReader(isr);
-            final OutputStream os = getOutputStream(dest, append, project);
-            OutputStreamWriter osw;
-            if (outputEncoding == null) {
-                osw = new OutputStreamWriter(os);
-            } else {
-                osw = new OutputStreamWriter(os, outputEncoding);
-            }
-            out = new BufferedWriter(osw);
-            if (filterChainsAvailable) {
-                final ChainReaderHelper crh = new ChainReaderHelper();
-                crh.setBufferSize(FileUtils.BUF_SIZE);
-                crh.setPrimaryReader(in);
-                crh.setFilterChains(filterChains);
-                crh.setProject(project);
-                final Reader rdr = crh.getAssembledReader();
-                in = new BufferedReader(rdr);
-            }
+        try (Reader in = filterWith(project, inputEncoding, filterChains,
+                source.getInputStream());
+             BufferedWriter out = new BufferedWriter(new OutputStreamWriter(
+                     getOutputStream(dest, append, project),
+                     charsetFor(outputEncoding)))) {
             final char[] buffer = new char[FileUtils.BUF_SIZE];
             while (true) {
                 final int nRead = in.read(buffer, 0, buffer.length);
@@ -774,10 +717,8 @@
                 }
                 out.write(buffer, 0, nRead);
             }
-        } finally {
-            FileUtils.close(out);
-            FileUtils.close(in);
         }
+
     }
 
     private static void copyUsingFileChannels(final File sourceFile,
@@ -796,30 +737,20 @@
                                   + " for " + destFile);
         }
 
-        FileInputStream in = null;
-        FileOutputStream out = null;
-        FileChannel srcChannel = null;
-        FileChannel destChannel = null;
-
-        try {
-            in = new FileInputStream(sourceFile);
-            out = new FileOutputStream(destFile);
-
-            srcChannel = in.getChannel();
-            destChannel = out.getChannel();
-
+        try (FileChannel srcChannel =
+            FileChannel.open(sourceFile.toPath(), StandardOpenOption.READ);
+                FileChannel destChannel = FileChannel.open(destFile.toPath(),
+                    StandardOpenOption.CREATE,
+                    StandardOpenOption.TRUNCATE_EXISTING,
+                    StandardOpenOption.WRITE)) {
             long position = 0;
             final long count = srcChannel.size();
             while (position < count) {
-                final long chunk = Math.min(MAX_IO_CHUNK_SIZE, count - position);
+                final long chunk =
+                    Math.min(MAX_IO_CHUNK_SIZE, count - position);
                 position +=
                     destChannel.transferFrom(srcChannel, position, chunk);
             }
-        } finally {
-            FileUtils.close(srcChannel);
-            FileUtils.close(destChannel);
-            FileUtils.close(out);
-            FileUtils.close(in);
         }
     }
 
@@ -832,12 +763,8 @@
             log(project, "Skipping (self) copy of " + source +  " to " + dest);
             return;
         }
-
-        InputStream in = null;
-        OutputStream out = null;
-        try {
-            in = source.getInputStream();
-            out = getOutputStream(dest, append, project);
+        try (InputStream in = source.getInputStream();
+             OutputStream out = getOutputStream(dest, append, project)) {
 
             final byte[] buffer = new byte[FileUtils.BUF_SIZE];
             int count = 0;
@@ -845,9 +772,6 @@
                 out.write(buffer, 0, count);
                 count = in.read(buffer, 0, buffer.length);
             } while (count != -1);
-        } finally {
-            FileUtils.close(out);
-            FileUtils.close(in);
         }
     }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java ant-1.10.3/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/ScriptFixBSFPath.java	2018-03-24 12:37:12.000000000 +0000
@@ -56,7 +56,7 @@
             "xslt",       "org.apache.xpath.objects.XObject"};
 
     /** A map of languages for which the engine in located in bsf */
-    private static final Map BSF_LANGUAGE_MAP = new HashMap();
+    private static final Map<String, String> BSF_LANGUAGE_MAP = new HashMap<>();
     static {
         for (int i = 0; i < BSF_LANGUAGES.length; i = i + 2) {
             BSF_LANGUAGE_MAP.put(BSF_LANGUAGES[i], BSF_LANGUAGES[i + 1]);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java ant-1.10.3/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,14 +19,13 @@
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.tools.ant.BuildException;
@@ -34,6 +33,8 @@
 import org.apache.tools.ant.ProjectComponent;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceCollection;
+import org.apache.tools.ant.types.resources.PropertyResource;
+import org.apache.tools.ant.types.resources.StringResource;
 
 /**
  * This is a common abstract base case for script runners.
@@ -51,6 +52,11 @@
     /** Script content */
     private String script = "";
 
+    private String encoding;
+
+    /** Enable script compilation. */
+    private boolean compiled;
+
     /** Project this runner is used in */
     private Project project;
 
@@ -58,7 +64,7 @@
     private ClassLoader scriptLoader;
 
     /** Beans to be provided to the script */
-    private Map beans = new HashMap();
+    private final Map<String, Object> beans = new HashMap<>();
 
     /**
      * Add a list of named objects to the list to be exported to the script
@@ -66,19 +72,17 @@
      * @param dictionary a map of objects to be placed into the script context
      *        indexed by String names.
      */
-    public void addBeans(Map dictionary) {
-        for (Iterator i = dictionary.keySet().iterator(); i.hasNext();) {
-            String key = (String) i.next();
+    public void addBeans(Map<String, ?> dictionary) {
+        dictionary.forEach((k, v) -> {
             try {
-                Object val = dictionary.get(key);
-                addBean(key, val);
+                addBean(k, v);
             } catch (BuildException ex) {
                 // The key is in the dictionary but cannot be retrieved
                 // This is usually due references that refer to tasks
                 // that have not been taskdefed in the current run.
                 // Ignore
             }
-        }
+        });
     }
 
     /**
@@ -94,7 +98,6 @@
         for (int i = 1; isValid && i < key.length(); i++) {
             isValid = Character.isJavaIdentifierPart(key.charAt(i));
         }
-
         if (isValid) {
             beans.put(key, bean);
         }
@@ -104,7 +107,7 @@
      * Get the beans used for the script.
      * @return the map of beans.
      */
-    protected Map getBeans() {
+    protected Map<String, Object> getBeans() {
         return beans;
     }
 
@@ -187,6 +190,33 @@
     }
 
     /**
+     * Whether to use script compilation if available.
+     * @since Ant 1.10.2
+     * @param compiled if true, compile the script if possible.
+     */
+    public final void setCompiled(boolean compiled) {
+        this.compiled = compiled;
+    }
+
+    /**
+     * Get the compiled attribute.
+     * @since Ant 1.10.2
+     * @return the attribute.
+     */
+    public final boolean getCompiled() {
+        return compiled;
+    }
+
+    /**
+     * Set encoding of the script from an external file; optional.
+     * @since Ant 1.10.2
+     * @param encoding  encoding of the external file containing the script source.
+     */
+    public void setEncoding(String encoding) {
+        this.encoding = encoding;
+    }
+
+    /**
      * Load the script from an external file; optional.
      * @param file the file containing the script source.
      */
@@ -195,11 +225,15 @@
         if (!file.exists()) {
             throw new BuildException("file " + filename + " not found.");
         }
-        try {
-            readSource(new FileReader(file), filename);
-        } catch (FileNotFoundException e) {
+
+        try (InputStream in = Files.newInputStream(file.toPath())) {
+            final Charset charset = null == encoding ? Charset.defaultCharset()
+                : Charset.forName(encoding);
+
+            readSource(in, filename, charset);
+        } catch (IOException e) {
             //this can only happen if the file got deleted a short moment ago
-            throw new BuildException("file " + filename + " not found.");
+            throw new BuildException("file " + filename + " not found.", e);
         }
     }
 
@@ -207,20 +241,17 @@
      * Read some source in from the given reader
      * @param in the input stream to pass into a buffered reader.
      * @param name the name to use in error messages
+     * @param charset the encoding for the reader, may be null.
      */
-    private void readSource(Reader reader, String name) {
-        BufferedReader in = null;
-        try {
-            in = new BufferedReader(reader);
-            script += FileUtils.safeReadFully(in);
+    private void readSource(InputStream in, String name, Charset charset) {
+        try (Reader reader =
+            new BufferedReader(new InputStreamReader(in, charset))) {
+            script += FileUtils.safeReadFully(reader);
         } catch (IOException ex) {
             throw new BuildException("Failed to read " + name, ex);
-        } finally {
-            FileUtils.close(in);
         }
     }
 
-
     /**
      * Add a resource to the source list.
      * @since Ant 1.7.1
@@ -228,17 +259,24 @@
      * @throws BuildException if the resource cannot be read
      */
     public void loadResource(Resource sourceResource) {
+        if (sourceResource instanceof StringResource) {
+            script += ((StringResource) sourceResource).getValue();
+            return;
+        }
+        if (sourceResource instanceof PropertyResource) {
+            script += ((PropertyResource) sourceResource).getValue();
+            return;
+        }
+
         String name = sourceResource.toLongString();
-        InputStream in = null;
-        try {
-            in = sourceResource.getInputStream();
+        try (InputStream in = sourceResource.getInputStream()) {
+            readSource(in, name, Charset.defaultCharset());
         } catch (IOException e) {
             throw new BuildException("Failed to open " + name, e);
         } catch (UnsupportedOperationException e) {
             throw new BuildException(
-                "Failed to open " + name + " -it is not readable", e);
+                "Failed to open " + name + " - it is not readable", e);
         }
-        readSource(new InputStreamReader(in), name);
     }
 
     /**
@@ -248,9 +286,7 @@
      * @throws BuildException if a resource cannot be read
      */
     public void loadResources(ResourceCollection collection) {
-        for (Resource resource : collection) {
-            loadResource(resource);
-        }
+        collection.forEach(this::loadResource);
     }
 
     /**
@@ -326,8 +362,7 @@
      */
     protected void checkLanguage() {
         if (language == null) {
-            throw new BuildException(
-                "script language must be specified");
+            throw new BuildException("script language must be specified");
         }
     }
 
@@ -356,5 +391,4 @@
         Thread.currentThread().setContextClassLoader(
                  origLoader);
     }
-
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/ScriptRunnerHelper.java ant-1.10.3/src/main/org/apache/tools/ant/util/ScriptRunnerHelper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/ScriptRunnerHelper.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/ScriptRunnerHelper.java	2018-03-24 12:37:12.000000000 +0000
@@ -31,9 +31,11 @@
 public class ScriptRunnerHelper {
     private ClasspathUtils.Delegate cpDelegate = null;
     private File    srcFile;
+    private String  encoding;
     private String  manager = "auto";
     private String  language;
     private String  text;
+    private boolean compiled = false;
     private boolean setBeans = true;
     private ProjectComponent projectComponent;
     private ClassLoader scriptLoader = null;
@@ -53,6 +55,12 @@
      */
     public ScriptRunnerBase getScriptRunner() {
         ScriptRunnerBase runner = getRunner();
+        runner.setCompiled(compiled);
+
+        if (encoding != null) {
+            // set it first, because runner.setSrc() loads immediately the file
+            runner.setEncoding(encoding);
+        }
         if (srcFile != null) {
             runner.setSrc(srcFile);
         }
@@ -108,6 +116,34 @@
     }
 
     /**
+     * Get the external script file; optional.
+     * @return the file containing the script source.
+     * @since Ant 1.10.2
+     */
+    public File getSrc() {
+        return srcFile;
+    }
+
+    /**
+     * Set the encoding of the script from an external file; optional.
+     *
+     * @param encoding the encoding of the file containing the script source.
+     * @since Ant 1.10.2
+     */
+    public void setEncoding(String encoding) {
+        this.encoding = encoding;
+    }
+
+    /**
+     * Get the external file encoding.
+     * @return the encoding of the file containing the script source.
+     * @since Ant 1.10.2
+     */
+    public String getEncoding() {
+        return encoding;
+    }
+
+    /**
      * Add script text.
      *
      * @param text a component of the script text to be added.
@@ -143,6 +179,28 @@
     }
 
     /**
+     * Enable the compilation of the script if possible.
+     * If this is true and the compilation feature is available in
+     * the script engine, the script is compiled before the first
+     * evaluation, and should be cached for future evaluations.
+     * Otherwise, the script is evaluated each time.
+     * The default is false.
+     *
+     * @param compiled the value to set.
+     */
+    public void setCompiled(boolean compiled) {
+        this.compiled = compiled;
+    }
+
+    /**
+     * Get the compilation feature.
+     * @return the compilation feature.
+     */
+    public boolean getCompiled() {
+        return this.compiled;
+    }
+
+    /**
      * Set the setbeans attribute.
      * If this is true, &lt;script&gt; will create variables in the
      * script instance for all
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/SourceFileScanner.java ant-1.10.3/src/main/org/apache/tools/ant/util/SourceFileScanner.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/SourceFileScanner.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/SourceFileScanner.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,7 @@
 package org.apache.tools.ant.util;
 
 import java.io.File;
-import java.util.Vector;
+import java.util.stream.Stream;
 
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Resource;
@@ -90,28 +90,21 @@
                              FileNameMapper mapper, long granularity) {
         // record destdir for later use in getResource
         this.destDir = destDir;
-        Vector v = new Vector();
-        for (int i = 0; i < files.length; i++) {
-            final String name = files[i];
-            v.addElement(new FileResource(srcDir, name) {
+
+        Resource[] sourceResources =
+            Stream.of(files).map(f -> new FileResource(srcDir, f) {
+                @Override
                 public String getName() {
-                    return name;
+                    return f;
                 }
-            });
-        }
-        Resource[] sourceresources = new Resource[v.size()];
-        v.copyInto(sourceresources);
+            }).toArray(Resource[]::new);
 
         // build the list of sources which are out of date with
         // respect to the target
-        Resource[] outofdate =
-            ResourceUtils.selectOutOfDateSources(task, sourceresources,
-                                                 mapper, this, granularity);
-        String[] result = new String[outofdate.length];
-        for (int counter = 0; counter < outofdate.length; counter++) {
-            result[counter] = outofdate[counter].getName();
-        }
-        return result;
+        return Stream
+            .of(ResourceUtils.selectOutOfDateSources(task, sourceResources,
+                mapper, this, granularity))
+            .map(Resource::getName).toArray(String[]::new);
     }
 
     /**
@@ -150,12 +143,8 @@
      */
     public File[] restrictAsFiles(String[] files, File srcDir, File destDir,
                                   FileNameMapper mapper, long granularity) {
-        String[] res = restrict(files, srcDir, destDir, mapper, granularity);
-        File[] result = new File[res.length];
-        for (int i = 0; i < res.length; i++) {
-            result[i] = new File(srcDir, res[i]);
-        }
-        return result;
+        return Stream.of(restrict(files, srcDir, destDir, mapper, granularity))
+            .map(name -> new File(srcDir, name)).toArray(File[]::new);
     }
 
     /**
@@ -165,6 +154,7 @@
      *
      * @since Ant 1.5.2
      */
+    @Override
     public Resource getResource(String name) {
         return new FileResource(destDir, name);
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/SplitClassLoader.java ant-1.10.3/src/main/org/apache/tools/ant/util/SplitClassLoader.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/SplitClassLoader.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/SplitClassLoader.java	2018-03-24 12:37:12.000000000 +0000
@@ -45,9 +45,10 @@
 
     // forceLoadClass is not convenient here since it would not
     // properly deal with inner classes of these classes.
-    protected synchronized Class loadClass(String classname, boolean resolve)
+    @Override
+    protected synchronized Class<?> loadClass(String classname, boolean resolve)
         throws ClassNotFoundException {
-        Class theClass = findLoadedClass(classname);
+        Class<?> theClass = findLoadedClass(classname);
         if (theClass != null) {
             return theClass;
         }
@@ -57,9 +58,8 @@
                 resolveClass(theClass);
             }
             return theClass;
-        } else {
-            return super.loadClass(classname, resolve);
         }
+        return super.loadClass(classname, resolve);
     }
 
     private boolean isSplit(String classname) {
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/StringTokenizer.java ant-1.10.3/src/main/org/apache/tools/ant/util/StringTokenizer.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/StringTokenizer.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/StringTokenizer.java	2018-03-24 12:37:12.000000000 +0000
@@ -96,8 +96,8 @@
         }
         boolean inToken = true;
         intraString = "";
-        StringBuffer word = new StringBuffer();
-        StringBuffer padding = new StringBuffer();
+        StringBuilder word = new StringBuilder();
+        StringBuilder padding = new StringBuilder();
         while (ch != -1) {
             char c = (char) ch;
             boolean isDelim = isDelim(c);
@@ -116,13 +116,11 @@
                 } else {
                     word.append(c);
                 }
+            } else if (isDelim) {
+                padding.append(c);
             } else {
-                if (isDelim) {
-                    padding.append(c);
-                } else {
-                    pushed = ch;
-                    break;
-                }
+                pushed = ch;
+                break;
             }
             ch = in.read();
         }
@@ -136,6 +134,7 @@
     /**
      * @return the intratoken string
      */
+    @Override
     public String getPostToken() {
         return suppressDelims || includeDelims ? "" : intraString;
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/StringUtils.java ant-1.10.3/src/main/org/apache/tools/ant/util/StringUtils.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/StringUtils.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/StringUtils.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,11 @@
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Vector;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
 import org.apache.tools.ant.BuildException;
 
@@ -81,6 +85,7 @@
      * @return the new string with replaced occurrences.
      * @deprecated Use {@link String#replace(CharSequence, CharSequence)} now.
      */
+    @Deprecated
     public static String replace(String data, String from, String to) {
         return data.replace(from, to);
     }
@@ -148,7 +153,7 @@
      * @since Ant 1.7
      */
     public static String resolveBackSlash(String input) {
-        StringBuffer b = new StringBuffer();
+        StringBuilder b = new StringBuilder();
         boolean backSlashSeen = false;
         for (int i = 0; i < input.length(); ++i) {
             char c = input.charAt(i);
@@ -251,9 +256,8 @@
     public static String removeSuffix(String string, String suffix) {
         if (string.endsWith(suffix)) {
             return string.substring(0, string.length() - suffix.length());
-        } else {
-            return string;
         }
+        return string;
     }
 
     /**
@@ -266,8 +270,55 @@
     public static String removePrefix(String string, String prefix) {
         if (string.startsWith(prefix)) {
             return string.substring(prefix.length());
-        } else {
-            return string;
         }
+        return string;
     }
+
+    /**
+     * Joins the string representation of the elements of a collection to
+     * a joined string with a given separator.
+     * @param collection Collection of the data to be joined (may be null)
+     * @param separator Separator between elements (may be null)
+     * @return the joined string
+     */
+    public static String join(Collection<?> collection, CharSequence separator) {
+        if (collection == null) {
+            return "";
+        }
+        return collection.stream().map(String::valueOf)
+            .collect(joining(separator));
+    }
+
+    /**
+     * Joins the string representation of the elements of an array to
+     * a joined string with a given separator.
+     * @param array Array of the data to be joined (may be null)
+     * @param separator Separator between elements (may be null)
+     * @return the joined string
+     */
+    public static String join(Object[] array, CharSequence separator) {
+        if (array == null) {
+            return "";
+        }
+        return join(Arrays.asList(array), separator);
+    }
+
+    private static Collector<CharSequence, ?, String> joining(CharSequence separator) {
+        return separator == null ? Collectors.joining() : Collectors.joining(separator);
+    }
+
+    /**
+     * @param inputString String to trim
+     * @return null if the input string is null or empty or contain only empty spaces.
+     * It returns the input string without leading and trailing spaces otherwise.
+     *
+     */
+    public static String trimToNull(String inputString) {
+        if (inputString == null) {
+            return null;
+        }
+        String tmpString = inputString.trim();
+        return tmpString.isEmpty() ? null : tmpString;
+    }
+
 }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java ant-1.10.3/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/SymbolicLinkUtils.java	2018-03-24 12:37:12.000000000 +0000
@@ -19,7 +19,6 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FilenameFilter;
 import java.io.IOException;
 
 import org.apache.tools.ant.BuildException;
@@ -31,7 +30,11 @@
  * a symbolic link based on the absent support for them in Java.
  *
  * @since Ant 1.8.0
+ * @deprecated Starting Ant 1.10.2, this class is now deprecated in favour
+ *              of the Java {@link java.nio.file.Files} APIs introduced in
+ *              Java 7, for dealing with symbolic links
  */
+@Deprecated
 public class SymbolicLinkUtils {
     private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
 
@@ -176,11 +179,7 @@
         final File f = new File(parent, name);
         if (!f.exists()) {
             final String localName = f.getName();
-            final String[] c = parent.list(new FilenameFilter() {
-                    public boolean accept(final File d, final String n) {
-                        return localName.equals(n);
-                    }
-                });
+            final String[] c = parent.list((d, n) -> localName.equals(n));
             return c != null && c.length > 0;
         }
         return false;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/TeeOutputStream.java ant-1.10.3/src/main/org/apache/tools/ant/util/TeeOutputStream.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/TeeOutputStream.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/TeeOutputStream.java	2018-03-24 12:37:12.000000000 +0000
@@ -43,6 +43,7 @@
      * Close both output streams.
      * @throws IOException on error.
      */
+    @Override
     public void close() throws IOException {
         try {
             left.close();
@@ -55,6 +56,7 @@
      * Flush both output streams.
      * @throws IOException on error
      */
+    @Override
     public void flush() throws IOException {
         left.flush();
         right.flush();
@@ -65,6 +67,7 @@
      * @param b an array of bytes.
      * @throws IOException on error.
      */
+    @Override
     public void write(byte[] b) throws IOException {
         left.write(b);
         right.write(b);
@@ -77,6 +80,7 @@
      * @param len   the number of bytes to write.
      * @throws IOException on error.
      */
+    @Override
     public void write(byte[] b, int off, int len) throws IOException {
         left.write(b, off, len);
         right.write(b, off, len);
@@ -87,9 +91,9 @@
      * @param b the byte to write.
      * @throws IOException on error.
      */
+    @Override
     public void write(int b) throws IOException {
         left.write(b);
         right.write(b);
     }
 }
-
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/UnPackageNameMapper.java ant-1.10.3/src/main/org/apache/tools/ant/util/UnPackageNameMapper.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/UnPackageNameMapper.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/UnPackageNameMapper.java	2018-03-24 12:37:12.000000000 +0000
@@ -39,6 +39,7 @@
      *@param  name  Source filename
      *@return       Replaced variable part
      */
+    @Override
     protected String extractVariablePart(String name) {
         String var = name.substring(prefixLength,
                 name.length() - postfixLength);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/VectorSet.java ant-1.10.3/src/main/org/apache/tools/ant/util/VectorSet.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/VectorSet.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/VectorSet.java	2018-03-24 12:37:12.000000000 +0000
@@ -42,9 +42,13 @@
 
     private final HashSet<E> set = new HashSet<E>();
 
-    public VectorSet() { super(); }
+    public VectorSet() {
+        super();
+    }
 
-    public VectorSet(int initialCapacity) { super(initialCapacity); }
+    public VectorSet(int initialCapacity) {
+        super(initialCapacity);
+    }
 
     public VectorSet(int initialCapacity, int capacityIncrement) {
         super(initialCapacity, capacityIncrement);
@@ -52,12 +56,11 @@
 
     public VectorSet(Collection<? extends E> c) {
         if (c != null) {
-            for (E e : c) {
-                add(e);
-            }
+            this.addAll(c);
         }
     }
 
+    @Override
     public synchronized boolean add(E o) {
         if (!set.contains(o)) {
             doAdd(size(), o);
@@ -70,6 +73,7 @@
      * This implementation may not add the element at the given index
      * if it is already contained in the collection.
      */
+    @Override
     public void add(int index, E o) {
         doAdd(index, o);
     }
@@ -89,10 +93,12 @@
         }
     }
 
+    @Override
     public synchronized void addElement(E o) {
         doAdd(size(), o);
     }
 
+    @Override
     public synchronized boolean addAll(Collection<? extends E> c) {
         boolean changed = false;
         for (E e : c) {
@@ -105,8 +111,9 @@
      * This implementation may not add all elements at the given index
      * if any of them are already contained in the collection.
      */
+    @Override
     public synchronized boolean addAll(int index, Collection<? extends E> c) {
-        LinkedList toAdd = new LinkedList();
+        LinkedList<E> toAdd = new LinkedList<>();
         for (E e : c) {
             if (set.add(e)) {
                 toAdd.add(e);
@@ -128,11 +135,13 @@
         return true;
     }
 
+    @Override
     public synchronized void clear() {
         super.clear();
         set.clear();
     }
 
+    @Override
     public Object clone() {
         @SuppressWarnings("unchecked")
         final VectorSet<E> vs = (VectorSet<E>) super.clone();
@@ -140,24 +149,29 @@
         return vs;
     }
 
+    @Override
     public synchronized boolean contains(Object o) {
         return set.contains(o);
     }
 
+    @Override
     public synchronized boolean containsAll(Collection<?> c) {
         return set.containsAll(c);
     }
 
+    @Override
     public void insertElementAt(E o, int index) {
         doAdd(index, o);
     }
 
+    @Override
     public synchronized E remove(int index) {
         E o = get(index);
         remove(o);
         return o;
     }
 
+    @Override
     public boolean remove(Object o) {
         return doRemove(o);
     }
@@ -177,6 +191,7 @@
         return false;
     }
 
+    @Override
     public synchronized boolean removeAll(Collection<?> c) {
         boolean changed = false;
         for (Object o : c) {
@@ -185,30 +200,35 @@
         return changed;
     }
 
+    @Override
     public synchronized void removeAllElements() {
         set.clear();
         super.removeAllElements();
     }
 
+    @Override
     public boolean removeElement(Object o) {
         return doRemove(o);
     }
 
+    @Override
     public synchronized void removeElementAt(int index) {
         remove(get(index));
     }
 
+    @Override
     public synchronized void removeRange(final int fromIndex, int toIndex) {
         while (toIndex > fromIndex) {
             remove(--toIndex);
         }
     }
 
+    @Override
     public synchronized boolean retainAll(Collection<?> c) {
         if (!(c instanceof Set)) {
-            c = new HashSet<Object>(c);
+            c = new HashSet<>(c);
         }
-        LinkedList<E> l = new LinkedList<E>();
+        LinkedList<E> l = new LinkedList<>();
         for (E o : this) {
             if (!c.contains(o)) {
                 l.addLast(o);
@@ -221,6 +241,7 @@
         return false;
     }
 
+    @Override
     public synchronized E set(int index, E o) {
         E orig = get(index);
         if (set.add(o)) {
@@ -235,6 +256,7 @@
         return orig;
     }
 
+    @Override
     public void setElementAt(E o, int index) {
         set(index, o);
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/Watchdog.java ant-1.10.3/src/main/org/apache/tools/ant/util/Watchdog.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/Watchdog.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/Watchdog.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,8 +18,9 @@
 
 package org.apache.tools.ant.util;
 
-import java.util.Enumeration;
-import java.util.Vector;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Generalization of <code>ExecuteWatchdog</code>
@@ -31,18 +32,21 @@
  */
 public class Watchdog implements Runnable {
 
-    private Vector observers = new Vector(1);
+    /**
+     * Error string.
+     * {@value}
+     */
+    public static final String ERROR_INVALID_TIMEOUT = "timeout less than 1.";
+
+    private List<TimeoutObserver> observers =
+        Collections.synchronizedList(new ArrayList<>(1));
     private long timeout = -1;
+
     /**
      * marked as volatile to stop the compiler caching values or (in java1.5+,
      * reordering access)
      */
     private volatile boolean stopped = false;
-    /**
-     * Error string.
-     * {@value}
-     */
-    public static final String ERROR_INVALID_TIMEOUT = "timeout less than 1.";
 
     /**
      * Constructor for Watchdog.
@@ -60,8 +64,7 @@
      * @param to the timeout observer to add.
      */
     public void addTimeoutObserver(TimeoutObserver to) {
-        //no need to synchronize, as Vector is always synchronized
-        observers.addElement(to);
+        observers.add(to);
     }
 
     /**
@@ -69,8 +72,7 @@
      * @param to the timeout observer to remove.
      */
     public void removeTimeoutObserver(TimeoutObserver to) {
-        //no need to synchronize, as Vector is always synchronized
-        observers.removeElement(to);
+        observers.remove(to);
     }
 
     /**
@@ -78,10 +80,7 @@
      * This happens in the watchdog thread.
      */
     protected final void fireTimeoutOccured() {
-        Enumeration e = observers.elements();
-        while (e.hasMoreElements()) {
-            ((TimeoutObserver) e.nextElement()).timeoutOccured(this);
-        }
+        observers.forEach(o -> o.timeoutOccured(this));
     }
 
     /**
@@ -108,6 +107,7 @@
      * if the stop flag has not been set when the wait has returned or
      * has been interrupted, the watch dog listeners are informed.
      */
+    @Override
     public synchronized void run() {
         long now = System.currentTimeMillis();
         final long until = now + timeout;
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/WeakishReference.java ant-1.10.3/src/main/org/apache/tools/ant/util/WeakishReference.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/WeakishReference.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/WeakishReference.java	2018-03-24 12:37:12.000000000 +0000
@@ -34,6 +34,7 @@
  * @deprecated deprecated 1.7; will be removed in Ant1.8
  *             Just use {@link java.lang.ref.WeakReference} directly.
  */
+@Deprecated
 public class WeakishReference  {
 
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/util/XMLFragment.java ant-1.10.3/src/main/org/apache/tools/ant/util/XMLFragment.java
--- ant-1.9.10/src/main/org/apache/tools/ant/util/XMLFragment.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/util/XMLFragment.java	2018-03-24 12:37:12.000000000 +0000
@@ -74,9 +74,10 @@
      * @param qName the qualified name of the nested element
      * @return an object that the element is applied to
      */
+    @Override
     public Object createDynamicElement(String uri, String name, String qName) {
-        Element e = null;
-        if (uri.equals("")) {
+        Element e;
+        if ("".equals(uri)) {
             e = doc.createElement(name);
         } else {
             e = doc.createElementNS(uri, qName);
@@ -93,7 +94,7 @@
     private void addText(Node n, String s) {
         s = getProject().replaceProperties(s);
         //only text nodes that are non null after property expansion are added
-        if (s != null && !s.trim().equals("")) {
+        if (s != null && !s.trim().isEmpty()) {
             Text t = doc.createTextNode(s.trim());
             n.appendChild(t);
         }
@@ -124,9 +125,10 @@
          * @param qName the qualified name of the attribute
          * @param value the value of the attribute
          */
+        @Override
         public void setDynamicAttribute(
             String uri, String name, String qName, String value) {
-            if (uri.equals("")) {
+            if ("".equals(uri)) {
                 e.setAttribute(name, value);
             } else {
                 e.setAttributeNS(uri, qName, value);
@@ -140,9 +142,10 @@
          * @param qName the qualified name of the nested element
          * @return an object that the element is applied to
          */
+        @Override
         public Object createDynamicElement(String uri, String name, String qName) {
             Element e2 = null;
-            if (uri.equals("")) {
+            if ("".equals(uri)) {
                 e2 = doc.createElement(name);
             } else {
                 e2 = doc.createElementNS(uri, qName);
diff -Nru ant-1.9.10/src/main/org/apache/tools/ant/XmlLogger.java ant-1.10.3/src/main/org/apache/tools/ant/XmlLogger.java
--- ant-1.9.10/src/main/org/apache/tools/ant/XmlLogger.java	2018-02-03 16:12:25.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/ant/XmlLogger.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,12 +17,13 @@
  */
 package org.apache.tools.ant;
 
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintStream;
 import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Stack;
@@ -31,7 +32,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.apache.tools.ant.util.DOMElementWriter;
-import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.StringUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -108,16 +108,16 @@
     private Document doc = builder.newDocument();
 
     /** Mapping for when tasks started (Task to TimedElement). */
-    private Hashtable<Task, TimedElement> tasks = new Hashtable<Task, TimedElement>();
+    private Hashtable<Task, TimedElement> tasks = new Hashtable<>();
 
     /** Mapping for when targets started (Target to TimedElement). */
-    private Hashtable<Target, TimedElement> targets = new Hashtable<Target, XmlLogger.TimedElement>();
+    private Hashtable<Target, TimedElement> targets = new Hashtable<>();
 
     /**
      * Mapping of threads to stacks of elements
      * (Thread to Stack of TimedElement).
      */
-    private Hashtable<Thread, Stack<TimedElement>> threadStacks = new Hashtable<Thread, Stack<TimedElement>>();
+    private Hashtable<Thread, Stack<TimedElement>> threadStacks = new Hashtable<>();
 
     /**
      * When the build started.
@@ -133,23 +133,20 @@
         private long startTime;
         /** Element created at the start time. */
         private Element element;
+
+        @Override
         public String toString() {
             return element.getTagName() + ":" + element.getAttribute("name");
         }
     }
 
     /**
-     *  Constructs a new BuildListener that logs build events to an XML file.
-     */
-    public XmlLogger() {
-    }
-
-    /**
      * Fired when the build starts, this builds the top-level element for the
      * document and remembers the time of the start of the build.
      *
      * @param event Ignored.
      */
+    @Override
     public void buildStarted(BuildEvent event) {
         buildElement = new TimedElement();
         buildElement.startTime = System.currentTimeMillis();
@@ -163,6 +160,7 @@
      * @param event An event with any relevant extra information.
      *              Will not be <code>null</code>.
      */
+    @Override
     public void buildFinished(BuildEvent event) {
         long totalTime = System.currentTimeMillis() - buildElement.startTime;
         buildElement.element.setAttribute(TIME_ATTR, DefaultLogger.formatTime(totalTime));
@@ -179,25 +177,19 @@
         }
         String outFilename = getProperty(event, "XmlLogger.file", "log.xml");
         String xslUri = getProperty(event, "ant.XmlLogger.stylesheet.uri", "log.xsl");
-        Writer out = null;
-        try {
-            // specify output in UTF8 otherwise accented characters will blow
-            // up everything
-            OutputStream stream = outStream;
-            if (stream == null) {
-                stream = new FileOutputStream(outFilename);
-            }
-            out = new OutputStreamWriter(stream, "UTF8");
+
+        try (OutputStream stream =
+            outStream == null ? Files.newOutputStream(Paths.get(outFilename)) : outStream;
+                Writer out = new OutputStreamWriter(stream, "UTF8")) {
             out.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
             if (xslUri.length() > 0) {
-                out.write("<?xml-stylesheet type=\"text/xsl\" href=\"" + xslUri + "\"?>\n\n");
+                out.write("<?xml-stylesheet type=\"text/xsl\" href=\"" + xslUri
+                    + "\"?>\n\n");
             }
             new DOMElementWriter().write(buildElement.element, out, 0, "\t");
             out.flush();
         } catch (IOException exc) {
             throw new BuildException("Unable to write log file", exc);
-        } finally {
-            FileUtils.close(out);
         }
         buildElement = null;
     }
@@ -217,7 +209,7 @@
     private Stack<TimedElement> getStack() {
         Stack<TimedElement> threadStack = threadStacks.get(Thread.currentThread());
         if (threadStack == null) {
-            threadStack = new Stack<TimedElement>();
+            threadStack = new Stack<>();
             threadStacks.put(Thread.currentThread(), threadStack);
         }
         /* For debugging purposes uncomment:
@@ -235,6 +227,7 @@
      * @param event An event with any relevant extra information.
      *              Will not be <code>null</code>.
      */
+    @Override
     public void targetStarted(BuildEvent event) {
         Target target = event.getTarget();
         TimedElement targetElement = new TimedElement();
@@ -252,6 +245,7 @@
      * @param event An event with any relevant extra information.
      *              Will not be <code>null</code>.
      */
+    @Override
     public void targetFinished(BuildEvent event) {
         Target target = event.getTarget();
         TimedElement targetElement = targets.get(target);
@@ -289,6 +283,7 @@
      * @param event An event with any relevant extra information.
      *              Will not be <code>null</code>.
      */
+    @Override
     public void taskStarted(BuildEvent event) {
         TimedElement taskElement = new TimedElement();
         taskElement.startTime = System.currentTimeMillis();
@@ -312,6 +307,7 @@
      * @param event An event with any relevant extra information.
      *              Will not be <code>null</code>.
      */
+    @Override
     public void taskFinished(BuildEvent event) {
         Task task = event.getTask();
         TimedElement taskElement = tasks.get(task);
@@ -354,10 +350,9 @@
         }
         for (Enumeration<Task> e = tasks.keys(); e.hasMoreElements();) {
             Task key = e.nextElement();
-            if (key instanceof UnknownElement) {
-                if (((UnknownElement) key).getTask() == task) {
-                    return tasks.get(key);
-                }
+            if (key instanceof UnknownElement
+                && ((UnknownElement) key).getTask() == task) {
+                return tasks.get(key);
             }
         }
         return null;
@@ -371,6 +366,7 @@
      * @param event An event with any relevant extra information.
      *              Will not be <code>null</code>.
      */
+    @Override
     public void messageLogged(BuildEvent event) {
         int priority = event.getPriority();
         if (priority > msgOutputLevel) {
@@ -378,7 +374,7 @@
         }
         Element messageElement = doc.createElement(MESSAGE_TAG);
 
-        String name = "debug";
+        String name;
         switch (priority) {
             case Project.MSG_ERR:
                 name = "error";
@@ -432,6 +428,7 @@
      *        see {@link org.apache.tools.ant.Project#MSG_ERR Project}
      *        class for level definitions
      */
+    @Override
     public void setMessageOutputLevel(int level) {
         msgOutputLevel = level;
     }
@@ -442,6 +439,7 @@
      *
      * @param output the output PrintStream.
      */
+    @Override
     public void setOutputPrintStream(PrintStream output) {
         this.outStream = new PrintStream(output, true);
     }
@@ -452,6 +450,7 @@
      * @param emacsMode true if logger should produce emacs compatible
      *        output
      */
+    @Override
     public void setEmacsMode(boolean emacsMode) {
     }
 
@@ -462,6 +461,7 @@
      *
      * @param err the stream we are going to ignore.
      */
+    @Override
     public void setErrorPrintStream(PrintStream err) {
     }
 
diff -Nru ant-1.9.10/src/main/org/apache/tools/mail/ErrorInQuitException.java ant-1.10.3/src/main/org/apache/tools/mail/ErrorInQuitException.java
--- ant-1.9.10/src/main/org/apache/tools/mail/ErrorInQuitException.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/mail/ErrorInQuitException.java	2018-03-24 12:37:12.000000000 +0000
@@ -31,6 +31,8 @@
  */
 public class ErrorInQuitException extends IOException {
 
+    private static final long serialVersionUID = 1L;
+
     /**
      * Initialise from an IOException
      *
diff -Nru ant-1.9.10/src/main/org/apache/tools/mail/MailMessage.java ant-1.10.3/src/main/org/apache/tools/mail/MailMessage.java
--- ant-1.9.10/src/main/org/apache/tools/mail/MailMessage.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/mail/MailMessage.java	2018-03-24 12:37:12.000000000 +0000
@@ -32,8 +32,10 @@
 import java.io.PrintStream;
 import java.net.InetAddress;
 import java.net.Socket;
-import java.util.Enumeration;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.Vector;
+import java.util.stream.Collectors;
 
 /**
  * A class to help send SMTP email.
@@ -113,23 +115,23 @@
     private String from;
 
     /** list of email addresses to reply to */
-    private Vector replyto;
+    private final Vector<String> replyto = new Vector<>();
 
     /** list of email addresses to send to */
-    private Vector to;
+    private final Vector<String> to = new Vector<>();
 
     /** list of email addresses to cc to */
-    private Vector cc;
+    private final Vector<String> cc = new Vector<>();
 
     /** headers to send in the mail */
-    private Vector headersKeys;
-    private Vector headersValues;
+    private final Map<String, String> headers = new LinkedHashMap<>();
 
     private MailPrintStream out;
 
     private SmtpResponseReader in;
 
     private Socket socket;
+
     private static final int OK_READY = 220;
     private static final int OK_HELO = 250;
     private static final int OK_FROM = 250;
@@ -139,46 +141,41 @@
     private static final int OK_DOT = 250;
     private static final int OK_QUIT = 221;
 
-  /**
-   * Constructs a new MailMessage to send an email.
-   * Use localhost as the mail server with port 25.
-   *
-   * @exception IOException if there's any problem contacting the mail server
-   */
-  public MailMessage() throws IOException {
-    this(DEFAULT_HOST, DEFAULT_PORT);
-  }
-
-  /**
-   * Constructs a new MailMessage to send an email.
-   * Use the given host as the mail server with port 25.
-   *
-   * @param host the mail server to use
-   * @exception IOException if there's any problem contacting the mail server
-   */
-  public MailMessage(String host) throws IOException {
-    this(host, DEFAULT_PORT);
-  }
-
-  /**
-   * Constructs a new MailMessage to send an email.
-   * Use the given host and port as the mail server.
-   *
-   * @param host the mail server to use
-   * @param port the port to connect to
-   * @exception IOException if there's any problem contacting the mail server
-   */
-  public MailMessage(String host, int port) throws IOException {
-    this.port = port;
-    this.host = host;
-    replyto = new Vector();
-    to = new Vector();
-    cc = new Vector();
-    headersKeys = new Vector();
-    headersValues = new Vector();
-    connect();
-    sendHelo();
-  }
+    /**
+     * Constructs a new MailMessage to send an email.
+     * Use localhost as the mail server with port 25.
+     *
+     * @exception IOException if there's any problem contacting the mail server
+     */
+    public MailMessage() throws IOException {
+        this(DEFAULT_HOST, DEFAULT_PORT);
+    }
+
+    /**
+     * Constructs a new MailMessage to send an email.
+     * Use the given host as the mail server with port 25.
+     *
+     * @param host the mail server to use
+     * @exception IOException if there's any problem contacting the mail server
+     */
+    public MailMessage(String host) throws IOException {
+        this(host, DEFAULT_PORT);
+    }
+
+    /**
+     * Constructs a new MailMessage to send an email.
+     * Use the given host and port as the mail server.
+     *
+     * @param host the mail server to use
+     * @param port the port to connect to
+     * @exception IOException if there's any problem contacting the mail server
+     */
+    public MailMessage(String host, int port) throws IOException {
+        this.port = port;
+        this.host = host;
+        connect();
+        sendHelo();
+    }
 
     /**
      * Set the port to connect to the SMTP host.
@@ -208,231 +205,219 @@
      *
      */
     public void replyto(String rto) {
-      this.replyto.addElement(rto);
+        this.replyto.addElement(rto);
     }
 
-  /**
-   * Sets the to address.  Also sets the "To" header.  This method may be
-   * called multiple times.
-   *
-   * @param to the to address
-   * @exception IOException if there's any problem reported by the mail server
-   */
-  public void to(String to) throws IOException {
-    sendRcpt(to);
-    this.to.addElement(to);
-  }
-
-  /**
-   * Sets the cc address.  Also sets the "Cc" header.  This method may be
-   * called multiple times.
-   *
-   * @param cc the cc address
-   * @exception IOException if there's any problem reported by the mail server
-   */
-  public void cc(String cc) throws IOException {
-    sendRcpt(cc);
-    this.cc.addElement(cc);
-  }
-
-  /**
-   * Sets the bcc address.  Does NOT set any header since it's a *blind* copy.
-   * This method may be called multiple times.
-   *
-   * @param bcc the bcc address
-   * @exception IOException if there's any problem reported by the mail server
-   */
-  public void bcc(String bcc) throws IOException {
-    sendRcpt(bcc);
-    // No need to keep track of Bcc'd addresses
-  }
-
-  /**
-   * Sets the subject of the mail message.  Actually sets the "Subject"
-   * header.
-   * @param subj the subject of the mail message
-   */
-  public void setSubject(String subj) {
-    setHeader("Subject", subj);
-  }
-
-  /**
-   * Sets the named header to the given value.  RFC 822 provides the rules for
-   * what text may constitute a header name and value.
-   * @param name name of the header
-   * @param value contents of the header
-   */
-  public void setHeader(String name, String value) {
-    // Blindly trust the user doesn't set any invalid headers
-    headersKeys.add(name);
-    headersValues.add(value);
-  }
-
-  /**
-   * Returns a PrintStream that can be used to write the body of the message.
-   * A stream is used since email bodies are byte-oriented.  A writer can
-   * be wrapped on top if necessary for internationalization.
-   * This is actually done in Message.java
-   *
-   * @return a printstream containing the data and the headers of the email
-   * @exception IOException if there's any problem reported by the mail server
-   * @see org.apache.tools.ant.taskdefs.email.Message
-   */
-  public PrintStream getPrintStream() throws IOException {
-    setFromHeader();
-    setReplyToHeader();
-    setToHeader();
-    setCcHeader();
-    setHeader("X-Mailer", "org.apache.tools.mail.MailMessage (ant.apache.org)");
-    sendData();
-    flushHeaders();
-    return out;
-  }
-
-
-  // RFC 822 s4.1: "From:" header must be sent
-  // We rely on error checking by the MTA
-  void setFromHeader() {
-    setHeader("From", from);
-  }
-
-  // RFC 822 s4.1: "Reply-To:" header is optional
-  void setReplyToHeader() {
-    if (!replyto.isEmpty()) {
-      setHeader("Reply-To", vectorToList(replyto));
-    }
-  }
-
-  void setToHeader() {
-    if (!to.isEmpty()) {
-      setHeader("To", vectorToList(to));
-    }
-  }
-
-  void setCcHeader() {
-    if (!cc.isEmpty()) {
-      setHeader("Cc", vectorToList(cc));
-    }
-  }
-
-  String vectorToList(Vector v) {
-    StringBuffer buf = new StringBuffer();
-    Enumeration e = v.elements();
-    while (e.hasMoreElements()) {
-      buf.append(e.nextElement());
-      if (e.hasMoreElements()) {
-        buf.append(", ");
-      }
-    }
-    return buf.toString();
-  }
-
-  void flushHeaders() throws IOException {
-    // RFC 822 s4.1:
-    //   "Header fields are NOT required to occur in any particular order,
-    //    except that the message body MUST occur AFTER the headers"
-    // (the same section specifies a recommended order, which we ignore)
-   final int size = headersKeys.size();
-   for (int i = 0; i < size; i++) {
-      String name = (String) headersKeys.elementAt(i);
-      String value = (String) headersValues.elementAt(i);
-      out.println(name + ": " + value);
-    }
-    out.println();
-    out.flush();
-  }
-
-  /**
-   * Sends the message and closes the connection to the server.
-   * The MailMessage object cannot be reused.
-   *
-   * @exception IOException if there's any problem reported by the mail server
-   */
-  public void sendAndClose() throws IOException {
-      try {
-          sendDot();
-          sendQuit();
-      } finally {
-          disconnect();
-      }
-  }
-
-  // Make a limited attempt to extract a sanitized email address
-  // Prefer text in <brackets>, ignore anything in (parentheses)
-  static String sanitizeAddress(String s) {
-    int paramDepth = 0;
-    int start = 0;
-    int end = 0;
-    int len = s.length();
-
-    for (int i = 0; i < len; i++) {
-      char c = s.charAt(i);
-      if (c == '(') {
-        paramDepth++;
-        if (start == 0) {
-          end = i;  // support "address (name)"
+    /**
+     * Sets the to address.  Also sets the "To" header.  This method may be
+     * called multiple times.
+     *
+     * @param to the to address
+     * @exception IOException if there's any problem reported by the mail server
+     */
+    public void to(String to) throws IOException {
+        sendRcpt(to);
+        this.to.addElement(to);
+    }
+
+    /**
+     * Sets the cc address.  Also sets the "Cc" header.  This method may be
+     * called multiple times.
+     *
+     * @param cc the cc address
+     * @exception IOException if there's any problem reported by the mail server
+     */
+    public void cc(String cc) throws IOException {
+        sendRcpt(cc);
+        this.cc.addElement(cc);
+    }
+
+    /**
+     * Sets the bcc address.  Does NOT set any header since it's a *blind* copy.
+     * This method may be called multiple times.
+     *
+     * @param bcc the bcc address
+     * @exception IOException if there's any problem reported by the mail server
+     */
+    public void bcc(String bcc) throws IOException {
+        sendRcpt(bcc);
+        // No need to keep track of Bcc'd addresses
+    }
+
+    /**
+     * Sets the subject of the mail message.  Actually sets the "Subject"
+     * header.
+     * @param subj the subject of the mail message
+     */
+    public void setSubject(String subj) {
+        setHeader("Subject", subj);
+    }
+
+    /**
+     * Sets the named header to the given value.  RFC 822 provides the rules for
+     * what text may constitute a header name and value.
+     * @param name name of the header
+     * @param value contents of the header
+     */
+    public void setHeader(String name, String value) {
+        // Blindly trust the user doesn't set any invalid headers
+        headers.put(name, value);
+    }
+
+    /**
+     * Returns a PrintStream that can be used to write the body of the message.
+     * A stream is used since email bodies are byte-oriented.  A writer can
+     * be wrapped on top if necessary for internationalization.
+     * This is actually done in Message.java
+     *
+     * @return a printstream containing the data and the headers of the email
+     * @exception IOException if there's any problem reported by the mail server
+     * @see org.apache.tools.ant.taskdefs.email.Message
+     */
+    public PrintStream getPrintStream() throws IOException {
+        setFromHeader();
+        setReplyToHeader();
+        setToHeader();
+        setCcHeader();
+        setHeader("X-Mailer",
+            "org.apache.tools.mail.MailMessage (ant.apache.org)");
+        sendData();
+        flushHeaders();
+        return out;
+    }
+
+    // RFC 822 s4.1: "From:" header must be sent
+    // We rely on error checking by the MTA
+    void setFromHeader() {
+        setHeader("From", from);
+    }
+
+    // RFC 822 s4.1: "Reply-To:" header is optional
+    void setReplyToHeader() {
+        if (!replyto.isEmpty()) {
+            setHeader("Reply-To", vectorToList(replyto));
+        }
+    }
+
+    void setToHeader() {
+        if (!to.isEmpty()) {
+            setHeader("To", vectorToList(to));
         }
-      } else if (c == ')') {
-        paramDepth--;
+    }
+
+    void setCcHeader() {
+        if (!cc.isEmpty()) {
+            setHeader("Cc", vectorToList(cc));
+        }
+    }
+
+    String vectorToList(Vector<String> v) {
+        return v.stream().collect(Collectors.joining(", "));
+    }
+
+    void flushHeaders() throws IOException {
+        // RFC 822 s4.1:
+        //   "Header fields are NOT required to occur in any particular order,
+        //    except that the message body MUST occur AFTER the headers"
+        // (the same section specifies a recommended order, which we ignore)
+        headers.forEach((k, v) -> out.printf("%s: %s%n", k, v));
+        out.println();
+        out.flush();
+    }
+
+    /**
+     * Sends the message and closes the connection to the server.
+     * The MailMessage object cannot be reused.
+     *
+     * @exception IOException if there's any problem reported by the mail server
+     */
+    public void sendAndClose() throws IOException {
+        try {
+            sendDot();
+            sendQuit();
+        } finally {
+            disconnect();
+        }
+    }
+
+    // Make a limited attempt to extract a sanitized email address
+    // Prefer text in <brackets>, ignore anything in (parentheses)
+    static String sanitizeAddress(String s) {
+        int paramDepth = 0;
+        int start = 0;
+        int end = 0;
+        int len = s.length();
+
+        for (int i = 0; i < len; i++) {
+            char c = s.charAt(i);
+            if (c == '(') {
+                paramDepth++;
+                if (start == 0) {
+                    end = i; // support "address (name)"
+                }
+            } else if (c == ')') {
+                paramDepth--;
+                if (end == 0) {
+                    start = i + 1; // support "(name) address"
+                }
+            } else if (paramDepth == 0 && c == '<') {
+                start = i + 1;
+            } else if (paramDepth == 0 && c == '>') {
+                end = i;
+            }
+        }
+
         if (end == 0) {
-          start = i + 1;  // support "(name) address"
+            end = len;
+        }
+
+        return s.substring(start, end);
+    }
+
+    // * * * * * Raw protocol methods below here * * * * *
+
+    void connect() throws IOException {
+        socket = new Socket(host, port);
+        out = new MailPrintStream(
+            new BufferedOutputStream(socket.getOutputStream()));
+        in = new SmtpResponseReader(socket.getInputStream());
+        getReady();
+    }
+
+    void getReady() throws IOException {
+        String response = in.getResponse();
+        int[] ok = {OK_READY};
+        if (!isResponseOK(response, ok)) {
+            throw new IOException(
+                "Didn't get introduction from server: " + response);
         }
-      } else if (paramDepth == 0 && c == '<') {
-        start = i + 1;
-      } else if (paramDepth == 0 && c == '>') {
-        end = i;
-      }
-    }
-
-    if (end == 0) {
-      end = len;
-    }
-
-    return s.substring(start, end);
-  }
-
-  // * * * * * Raw protocol methods below here * * * * *
-
-  void connect() throws IOException {
-    socket = new Socket(host, port);
-    out = new MailPrintStream(
-          new BufferedOutputStream(
-          socket.getOutputStream()));
-    in = new SmtpResponseReader(socket.getInputStream());
-    getReady();
-  }
-
-  void getReady() throws IOException {
-    String response = in.getResponse();
-    int[] ok = {OK_READY};
-    if (!isResponseOK(response, ok)) {
-      throw new IOException(
-        "Didn't get introduction from server: " + response);
-    }
-  }
-  void sendHelo() throws IOException {
-    String local = InetAddress.getLocalHost().getHostName();
-    int[] ok = {OK_HELO};
-    send("HELO " + local, ok);
-  }
-  void sendFrom(String from) throws IOException {
-    int[] ok = {OK_FROM};
-    send("MAIL FROM: " + "<" + sanitizeAddress(from) + ">", ok);
-  }
-  void sendRcpt(String rcpt) throws IOException {
-    int[] ok = {OK_RCPT_1, OK_RCPT_2};
-    send("RCPT TO: " + "<" + sanitizeAddress(rcpt) + ">", ok);
-  }
-
-  void sendData() throws IOException {
-    int[] ok = {OK_DATA};
-    send("DATA", ok);
-  }
-
-  void sendDot() throws IOException {
-    int[] ok = {OK_DOT};
-    send("\r\n.", ok);  // make sure dot is on new line
-  }
+    }
+
+    void sendHelo() throws IOException {
+        String local = InetAddress.getLocalHost().getHostName();
+        int[] ok = {OK_HELO};
+        send("HELO " + local, ok);
+    }
+
+    void sendFrom(String from) throws IOException {
+        int[] ok = {OK_FROM};
+        send("MAIL FROM: " + "<" + sanitizeAddress(from) + ">", ok);
+    }
+
+    void sendRcpt(String rcpt) throws IOException {
+        int[] ok = {OK_RCPT_1, OK_RCPT_2};
+        send("RCPT TO: " + "<" + sanitizeAddress(rcpt) + ">", ok);
+    }
+
+    void sendData() throws IOException {
+        int[] ok = {OK_DATA};
+        send("DATA", ok);
+    }
+
+    void sendDot() throws IOException {
+        int[] ok = {OK_DOT};
+        send("\r\n.", ok); // make sure dot is on new line
+    }
 
     void sendQuit() throws IOException {
         int[] ok = {OK_QUIT};
@@ -444,23 +429,23 @@
     }
 
     void send(String msg, int[] ok) throws IOException {
-        out.rawPrint(msg + "\r\n");  // raw supports <CRLF>.<CRLF>
+        out.rawPrint(msg + "\r\n"); // raw supports <CRLF>.<CRLF>
         String response = in.getResponse();
         if (!isResponseOK(response, ok)) {
-            throw new IOException("Unexpected reply to command: "
-                                  + msg + ": " + response);
+            throw new IOException(
+                "Unexpected reply to command: " + msg + ": " + response);
         }
     }
 
-  boolean isResponseOK(String response, int[] ok) {
-    // Check that the response is one of the valid codes
-    for (int i = 0; i < ok.length; i++) {
-      if (response.startsWith("" + ok[i])) {
-        return true;
-      }
+    boolean isResponseOK(String response, int[] ok) {
+        // Check that the response is one of the valid codes
+        for (int i = 0; i < ok.length; i++) {
+            if (response.startsWith("" + ok[i])) {
+                return true;
+            }
+        }
+        return false;
     }
-    return false;
-  }
 
     void disconnect() throws IOException {
         if (out != null) {
@@ -489,42 +474,43 @@
 */
 class MailPrintStream extends PrintStream {
 
-  private int lastChar;
+    private int lastChar;
 
-  public MailPrintStream(OutputStream out) {
-    super(out, true);  // deprecated, but email is byte-oriented
-  }
-
-  // Mac does \n\r, but that's tough to distinguish from Windows \r\n\r\n.
-  // Don't tackle that problem right now.
-  public void write(int b) {
-    if (b == '\n' && lastChar != '\r') {
-      rawWrite('\r');  // ensure always \r\n
-      rawWrite(b);
-    } else if (b == '.' && lastChar == '\n') {
-      rawWrite('.');  // add extra dot
-      rawWrite(b);
-    } else {
-      rawWrite(b);
-    }
-    lastChar = b;
-  }
-
-  public void write(byte[] buf, int off, int len) {
-    for (int i = 0; i < len; i++) {
-      write(buf[off + i]);
-    }
-  }
-
-  void rawWrite(int b) {
-    super.write(b);
-  }
-
-  void rawPrint(String s) {
-    int len = s.length();
-    for (int i = 0; i < len; i++) {
-      rawWrite(s.charAt(i));
+    public MailPrintStream(OutputStream out) {
+        super(out, true); // deprecated, but email is byte-oriented
     }
-  }
-}
 
+    // Mac does \n\r, but that's tough to distinguish from Windows \r\n\r\n.
+    // Don't tackle that problem right now.
+    @Override
+    public void write(int b) {
+        if (b == '\n' && lastChar != '\r') {
+            rawWrite('\r'); // ensure always \r\n
+            rawWrite(b);
+        } else if (b == '.' && lastChar == '\n') {
+            rawWrite('.'); // add extra dot
+            rawWrite(b);
+        } else {
+            rawWrite(b);
+        }
+        lastChar = b;
+    }
+
+    @Override
+    public void write(byte[] buf, int off, int len) {
+        for (int i = 0; i < len; i++) {
+            write(buf[off + i]);
+        }
+    }
+
+    void rawWrite(int b) {
+        super.write(b);
+    }
+
+    void rawPrint(String s) {
+        int len = s.length();
+        for (int i = 0; i < len; i++) {
+            rawWrite(s.charAt(i));
+        }
+    }
+}
diff -Nru ant-1.9.10/src/main/org/apache/tools/mail/SmtpResponseReader.java ant-1.10.3/src/main/org/apache/tools/mail/SmtpResponseReader.java
--- ant-1.9.10/src/main/org/apache/tools/mail/SmtpResponseReader.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/mail/SmtpResponseReader.java	2018-03-24 12:37:12.000000000 +0000
@@ -35,7 +35,6 @@
     // CheckStyle:VisibilityModifier OFF - bc
     protected BufferedReader reader = null;
     // CheckStyle:VisibilityModifier ON
-    private StringBuffer result = new StringBuffer();
 
     /**
      * Wrap this input stream.
@@ -54,7 +53,7 @@
      * @throws IOException on error.
      */
     public String getResponse() throws IOException {
-        result.setLength(0);
+        StringBuilder result = new StringBuilder();
         String line = reader.readLine();
         // CheckStyle:MagicNumber OFF
         if (line != null && line.length() >= 3) {
@@ -64,7 +63,7 @@
         // CheckStyle:MagicNumber ON
 
         while (line != null) {
-            append(line);
+            appendTo(result, line);
             if (!hasMoreLines(line)) {
                 break;
             }
@@ -95,11 +94,10 @@
     /**
      * Append the text from this line of the response.
      */
-    private void append(String line) {
+    private static void appendTo(StringBuilder target, String line) {
         // CheckStyle:MagicNumber OFF
         if (line.length() > 4) {
-            result.append(line.substring(4));
-            result.append(" ");
+            target.append(line.substring(4)).append(' ');
         }
         // CheckStyle:MagicNumber ON
     }
diff -Nru ant-1.9.10/src/main/org/apache/tools/zip/ZipFile.java ant-1.10.3/src/main/org/apache/tools/zip/ZipFile.java
--- ant-1.9.10/src/main/org/apache/tools/zip/ZipFile.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/zip/ZipFile.java	2018-03-24 12:37:12.000000000 +0000
@@ -35,10 +35,10 @@
 import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import java.util.zip.Inflater;
 import java.util.zip.InflaterInputStream;
 import java.util.zip.ZipException;
@@ -86,13 +86,13 @@
      * List of entries in the order they appear inside the central
      * directory.
      */
-    private final List<ZipEntry> entries = new LinkedList<ZipEntry>();
+    private final List<ZipEntry> entries = new LinkedList<>();
 
     /**
      * Maps String to list of ZipEntrys, name -> actual entries.
      */
     private final Map<String, LinkedList<ZipEntry>> nameMap =
-        new HashMap<String, LinkedList<ZipEntry>>(HASH_SIZE);
+        new HashMap<>(HASH_SIZE);
 
     private static final class OffsetEntry {
         private long headerOffset = -1;
@@ -241,6 +241,7 @@
      * Closes the archive.
      * @throws IOException if an error occurs closing the archive.
      */
+    @Override
     public void close() throws IOException {
         // this flag is only written here and read in finalize() which
         // can never be run in parallel.
@@ -288,9 +289,8 @@
      * @since Ant 1.9.0
      */
     public Enumeration<ZipEntry> getEntriesInPhysicalOrder() {
-        final ZipEntry[] allEntries = entries.toArray(new ZipEntry[0]);
-        Arrays.sort(allEntries, OFFSET_COMPARATOR);
-        return Collections.enumeration(Arrays.asList(allEntries));
+        return entries.stream().sorted(OFFSET_COMPARATOR).collect(Collectors
+            .collectingAndThen(Collectors.toList(), Collections::enumeration));
     }
 
     /**
@@ -322,7 +322,7 @@
     public Iterable<ZipEntry> getEntries(final String name) {
         final List<ZipEntry> entriesOfThatName = nameMap.get(name);
         return entriesOfThatName != null ? entriesOfThatName
-            : Collections.<ZipEntry>emptyList();
+            : Collections.emptyList();
     }
 
     /**
@@ -335,12 +335,11 @@
      * @since 1.9.2
      */
     public Iterable<ZipEntry> getEntriesInPhysicalOrder(final String name) {
-        ZipEntry[] entriesOfThatName = new ZipEntry[0];
         if (nameMap.containsKey(name)) {
-            entriesOfThatName = nameMap.get(name).toArray(entriesOfThatName);
-            Arrays.sort(entriesOfThatName, OFFSET_COMPARATOR);
+            return nameMap.get(name).stream().sorted(OFFSET_COMPARATOR)
+                .collect(Collectors.toList());
         }
-        return Arrays.asList(entriesOfThatName);
+        return Collections.emptyList();
     }
 
     /**
@@ -405,8 +404,8 @@
     protected void finalize() throws Throwable {
         try {
             if (!closed) {
-                System.err.println("Cleaning up unclosed ZipFile for archive "
-                                   + archiveName);
+                System.err.printf("Cleaning up unclosed %s for archive %s%n",
+                    getClass().getSimpleName(), archiveName);
                 close();
             }
         } finally {
@@ -452,8 +451,7 @@
      */
     private Map<ZipEntry, NameAndComment> populateFromCentralDirectory()
         throws IOException {
-        final HashMap<ZipEntry, NameAndComment> noUTF8Flag =
-            new HashMap<ZipEntry, NameAndComment>();
+        final Map<ZipEntry, NameAndComment> noUTF8Flag = new HashMap<>();
 
         positionAtCentralDirectory();
 
@@ -461,8 +459,8 @@
         long sig = ZipLong.getValue(WORD_BUF);
 
         if (sig != CFH_SIG && startsWithLocalFileHeader()) {
-            throw new IOException("central directory is empty, can't expand"
-                                  + " corrupt archive.");
+            throw new IOException(
+                "central directory is empty, can't expand corrupt archive.");
         }
 
         while (sig == CFH_SIG) {
@@ -744,8 +742,8 @@
         archive.seek(ZipEightByteInteger.getLongValue(DWORD_BUF));
         archive.readFully(WORD_BUF);
         if (!Arrays.equals(WORD_BUF, ZipOutputStream.ZIP64_EOCD_SIG)) {
-            throw new ZipException("archive's ZIP64 end of central "
-                                   + "directory locator is corrupt.");
+            throw new ZipException(
+                "archive's ZIP64 end of central directory locator is corrupt.");
         }
         skipBytes(ZIP64_EOCD_CFD_LOCATOR_OFFSET
                   - WORD /* signature has already been read */);
@@ -858,10 +856,10 @@
     private void resolveLocalFileHeaderData(final Map<ZipEntry, NameAndComment>
                                             entriesWithoutUTF8Flag)
         throws IOException {
-        for (final Iterator<ZipEntry> it = entries.iterator(); it.hasNext();) {
+        for (ZipEntry zipEntry : entries) {
             // entries is filled in populateFromCentralDirectory and
             // never modified
-            final Entry ze = (Entry) it.next();
+            final Entry ze = (Entry) zipEntry;
             final OffsetEntry offsetEntry = ze.getOffsetEntry();
             final long offset = offsetEntry.headerOffset;
             archive.seek(offset + LFH_OFFSET_FOR_FILENAME_LENGTH);
@@ -873,8 +871,8 @@
             while (lenToSkip > 0) {
                 final int skipped = archive.skipBytes(lenToSkip);
                 if (skipped <= 0) {
-                    throw new IOException("failed to skip file name in"
-                                          + " local file header");
+                    throw new IOException(
+                        "failed to skip file name in local file header");
                 }
                 lenToSkip -= skipped;
             }
@@ -893,7 +891,7 @@
             final String name = ze.getName();
             LinkedList<ZipEntry> entriesOfThatName = nameMap.get(name);
             if (entriesOfThatName == null) {
-                entriesOfThatName = new LinkedList<ZipEntry>();
+                entriesOfThatName = new LinkedList<>();
                 nameMap.put(name, entriesOfThatName);
             }
             entriesOfThatName.addLast(ze);
@@ -958,7 +956,7 @@
             if (len > remaining) {
                 len = (int) remaining;
             }
-            int ret = -1;
+            int ret;
             synchronized (archive) {
                 archive.seek(loc);
                 ret = archive.read(b, off, len);
@@ -996,25 +994,22 @@
      *
      * @since Ant 1.9.0
      */
-    private final Comparator<ZipEntry> OFFSET_COMPARATOR =
-        new Comparator<ZipEntry>() {
-        public int compare(final ZipEntry e1, final ZipEntry e2) {
-            if (e1 == e2) {
-                return 0;
-            }
-
-            final Entry ent1 = e1 instanceof Entry ? (Entry) e1 : null;
-            final Entry ent2 = e2 instanceof Entry ? (Entry) e2 : null;
-            if (ent1 == null) {
-                return 1;
-            }
-            if (ent2 == null) {
-                return -1;
-            }
-            final long val = (ent1.getOffsetEntry().headerOffset
-                        - ent2.getOffsetEntry().headerOffset);
-            return val == 0 ? 0 : val < 0 ? -1 : +1;
-        }
+    private final Comparator<ZipEntry> OFFSET_COMPARATOR = (e1, e2) -> {
+        if (e1 == e2) {
+            return 0;
+        }
+
+        final Entry ent1 = e1 instanceof Entry ? (Entry) e1 : null;
+        final Entry ent2 = e2 instanceof Entry ? (Entry) e2 : null;
+        if (ent1 == null) {
+            return 1;
+        }
+        if (ent2 == null) {
+            return -1;
+        }
+        final long val = (ent1.getOffsetEntry().headerOffset
+                    - ent2.getOffsetEntry().headerOffset);
+        return val == 0 ? 0 : val < 0 ? -1 : +1;
     };
 
     /**
diff -Nru ant-1.9.10/src/main/org/apache/tools/zip/ZipOutputStream.java ant-1.10.3/src/main/org/apache/tools/zip/ZipOutputStream.java
--- ant-1.9.10/src/main/org/apache/tools/zip/ZipOutputStream.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/main/org/apache/tools/zip/ZipOutputStream.java	2018-03-24 12:37:12.000000000 +0000
@@ -31,12 +31,12 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.FilterOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
+import java.nio.file.Files;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -356,7 +356,7 @@
                 }
                 _raf = null;
             }
-            out = new FileOutputStream(file);
+            out = Files.newOutputStream(file.toPath());
         }
         raf = _raf;
     }
diff -Nru ant-1.9.10/src/tests/antunit/antunit-base.xml ant-1.10.3/src/tests/antunit/antunit-base.xml
--- ant-1.9.10/src/tests/antunit/antunit-base.xml	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/antunit-base.xml	2018-03-24 12:37:12.000000000 +0000
@@ -31,10 +31,6 @@
     <javaversion atleast="10"/>
   </condition>
   <available property="jdk9+" classname="java.lang.module.ModuleDescriptor"/>
-  <available property="jdk1.8+" classname="java.lang.reflect.Executable"/>
-  <available property="jdk1.7+" classname="java.nio.file.FileSystem"/>
-  <available property="jdk1.6+" classname="java.net.CookieStore"/>
-  <available property="jdk1.5+" classname="java.net.Proxy"/>
   <condition property="build.sysclasspath.only">
     <equals arg1="${build.sysclasspath}" arg2="only"/>
   </condition>
diff -Nru ant-1.9.10/src/tests/antunit/core/location/src/task/EchoLocation.java ant-1.10.3/src/tests/antunit/core/location/src/task/EchoLocation.java
--- ant-1.9.10/src/tests/antunit/core/location/src/task/EchoLocation.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/core/location/src/task/EchoLocation.java	2018-03-24 12:37:12.000000000 +0000
@@ -6,7 +6,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
+ *    http://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,
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/apt/AptExample.java ant-1.10.3/src/tests/antunit/taskdefs/apt/AptExample.java
--- ant-1.9.10/src/tests/antunit/taskdefs/apt/AptExample.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/apt/AptExample.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (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
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-/**
- */
-@Distributed(
-        protocol="CORBA",
-        distribution=Distributed.DistributionTypes.FEDERATED
-        )
-public class AptExample {
-}
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/apt/DistributedAnnotationFactory.java ant-1.10.3/src/tests/antunit/taskdefs/apt/DistributedAnnotationFactory.java
--- ant-1.9.10/src/tests/antunit/taskdefs/apt/DistributedAnnotationFactory.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/apt/DistributedAnnotationFactory.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (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
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-import com.sun.mirror.apt.AnnotationProcessorFactory;
-import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Arrays;
-import java.util.Collections;
-
-
-/**
- * This was the first piece of Java1.5 code in the source tree.
- * @since 20050-03-09T21:29:25Z
- */
-public class DistributedAnnotationFactory implements AnnotationProcessorFactory {
-
-    private static final Collection<String> supportedAnnotations
-            = Collections.unmodifiableCollection(Arrays.asList("*"));
-
-    public Collection<String> supportedOptions() {
-        return Collections.emptySet();
-    }
-
-    public Collection<String> supportedAnnotationTypes() {
-        return supportedAnnotations;
-    }
-
-    public AnnotationProcessor getProcessorFor(
-            Set<com.sun.mirror.declaration.AnnotationTypeDeclaration> annotationTypeDeclarations,
-            AnnotationProcessorEnvironment env) {
-        return new DistributedAnnotationProcessor(env);
-    }
-}
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/apt/DistributedAnnotationProcessor.java ant-1.10.3/src/tests/antunit/taskdefs/apt/DistributedAnnotationProcessor.java
--- ant-1.9.10/src/tests/antunit/taskdefs/apt/DistributedAnnotationProcessor.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/apt/DistributedAnnotationProcessor.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (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
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-//found in tools.jar, not the JRE runtime.
-import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.declaration.TypeDeclaration;
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.util.SimpleDeclarationVisitor;
-import static com.sun.mirror.util.DeclarationVisitors.*;
-
-import java.util.Map;
-
-/**
- * Annotation processor outputs stuff
- */
-
-public class DistributedAnnotationProcessor implements AnnotationProcessor {
-
-    public AnnotationProcessorEnvironment env;
-
-    public DistributedAnnotationProcessor(AnnotationProcessorEnvironment env) {
-        this.env = env;
-    }
-
-    public void echo(String text) {
-        env.getMessager().printNotice(text);
-    }
-
-    public void process() {
-        echo("DistributedAnnotationProcessor-is-go");
-
-        Map<String, String> options=env.getOptions();
-        for(String key:options.keySet()) {
-            echo("Option ["+key+"] = "+options.get(key));
-        }
-
-        //work time
-        for (TypeDeclaration typeDecl : env.getSpecifiedTypeDeclarations()) {
-            typeDecl.accept(getDeclarationScanner(new ClassVisitor(),
-                    NO_OP));
-        }
-    }
-
-    private class ClassVisitor extends SimpleDeclarationVisitor {
-        public void visitClassDeclaration(ClassDeclaration d) {
-            echo("visiting "+ d.getQualifiedName());
-        }
-    }
-}
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/apt/Distributed.java ant-1.10.3/src/tests/antunit/taskdefs/apt/Distributed.java
--- ant-1.9.10/src/tests/antunit/taskdefs/apt/Distributed.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/apt/Distributed.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (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
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-import java.lang.annotation.Annotation;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- */
-@Documented
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = ElementType.TYPE)
-public @interface Distributed  {
-
-    public DistributionTypes distribution() default DistributionTypes.LOCAL;
-
-    public String protocol() default "RMI";
-
-    public enum DistributionTypes { SINGLETON, LOCAL, FAULT_TOLERANT, FEDERATED, MOBILE};
-
-
-}
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/apt-test.xml ant-1.10.3/src/tests/antunit/taskdefs/apt-test.xml
--- ant-1.9.10/src/tests/antunit/taskdefs/apt-test.xml	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/apt-test.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,158 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (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
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
-  <import file="../antunit-base.xml" />
-  <!-- apt tests -->
-
-  <property name="build.dir" location="aptbuild" />
-  <property name="classes.dir" location="${build.dir}/classes" />
-  <property name="classes2.dir" location="${build.dir}/classes2" />
-  <property name="preprocess.dir" location="${build.dir}/source" />
-  <property name="src" location="apt" />
-
-  <property name="AptExample.class" location="${classes.dir}/AptExample.class" />
-
-  <macrodef name="assertCompiled">
-    <attribute name="file" />
-    <sequential >
-      <fail  message="not found: @{file}">
-        <condition>
-          <not>
-            <available file="@{file}" />
-          </not>
-        </condition>
-      </fail>
-    </sequential>
-  </macrodef>
-
-  <macrodef name="assertProcessed">
-    <sequential>
-      <au:assertLogContains text="DistributedAnnotationProcessor-is-go"/>
-      <au:assertLogContains text="[-Abuild.dir="/>
-      <au:assertLogContains text="visiting DistributedAnnotationFactory"/>
-    </sequential>
-  </macrodef>
-
-  <presetdef name="assertAptExampleCompiled">
-    <assertCompiled file="${AptExample.class}"/>
-  </presetdef>
-
-  <target name="tearDown" depends="antunit-base.tearDown">
-    <delete dir="${build.dir}"/>
-  </target>
-
-  <target name="setUp">
-    <mkdir dir="${classes.dir}"/>
-    <mkdir dir="${classes2.dir}"/>
-    <mkdir dir="${preprocess.dir}"/>
-  </target>
-
-  <target name="testApt" depends="setUp" unless="jdk1.8+">
-    <apt srcdir="${src}"
-         destdir="${classes.dir}"
-         debug="on"
-         compile="true"
-         preprocessdir="${preprocess.dir}">
-    </apt>
-    <assertAptExampleCompiled />
-  </target>
-
-  <target name="testAptFork" depends="setUp" unless="jdk1.8+">
-    <apt srcdir="${src}"
-         destdir="${classes.dir}"
-         debug="on"
-         compile="true"
-         fork="true"
-         preprocessdir="${preprocess.dir}">
-    </apt>
-    <assertAptExampleCompiled />
-  </target>
-
-  <target name="testAptForkFalse" depends="setUp" unless="jdk1.8+">
-    <apt srcdir="${src}"
-         destdir="${classes.dir}"
-         debug="on"
-         compile="true"
-         fork="false"
-         preprocessdir="${preprocess.dir}">
-    </apt>
-    <assertAptExampleCompiled />
-    <au:assertLogContains text="Apt only runs in its own JVM; fork=false option ignored"/>
-
-  </target>
-
-  <target name="testListAnnotationTypes" depends="setUp" unless="jdk1.8+">
-    <apt srcdir="${src}"
-         destdir="${classes.dir}"
-         debug="on"
-         compile="true"
-         preprocessdir="${preprocess.dir}">
-         <compilerarg value="-XListAnnotationTypes" />
-         <compilerarg value="-Xlint:deprecation" /> 
-    </apt>
-  
-    <assertAptExampleCompiled />
-    <au:assertLogContains text="Set of annotations found:"/>
-    <au:assertLogContains text="Distributed"/>
-  </target>
-
-
-  <!-- use the factory we compiled. To avoid trouble
-    we deliver into a version in a new classpath, otherwise
-    the dependency logic will not run Apt-->
-  <target name="testAptNewFactory" depends="testApt" unless="jdk1.8+">
-    <apt srcdir="${src}"
-         destdir="${classes2.dir}"
-         debug="on"
-         compile="true"
-         factory="DistributedAnnotationFactory"
-         preprocessdir="${preprocess.dir}">
-         <factorypath path="${classes.dir}" />
-         <option name="build.dir" value="${build.dir}" />
-    </apt>
-    <assertAptExampleCompiled />
-    <assertProcessed />
-  </target>
-
-  <target name="testAptNewFactoryFork" depends="testApt" unless="jdk1.8+">
-    <apt srcdir="${src}"
-         destdir="${classes2.dir}"
-         debug="on"
-         compile="true"
-         fork="true"
-         factory="DistributedAnnotationFactory"
-         preprocessdir="${preprocess.dir}">
-         <factorypath path="${classes.dir}" />
-         <option name="build.dir" value="${build.dir}" />
-    </apt>
-    <assertAptExampleCompiled />
-    <assertProcessed />
-  </target>
-
-  <target name="testAptUnderJDK18" if="jdk1.8+">
-    <au:expectfailure expectedMessage="apt does not exist under Java 1.8 and higher">
-      <apt srcdir="${src}"
-           destdir="${classes.dir}"
-           debug="on"
-           compile="true"
-           fork="true"
-           preprocessdir="${preprocess.dir}">
-      </apt>
-    </au:expectfailure>
-  </target>
-</project>
\ No newline at end of file
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/copy-test.xml ant-1.10.3/src/tests/antunit/taskdefs/copy-test.xml
--- ant-1.9.10/src/tests/antunit/taskdefs/copy-test.xml	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/copy-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -83,12 +83,12 @@
   </target>
 
   <target name="testResourceWithoutName"
-          depends="-setupNullByteStreamResource">
-    <au:expectfailure>
-      <copy todir="${output}">
-        <nullstream/>
-      </copy>
-    </au:expectfailure>
+          depends="-setupNullByteStreamResource" description="Tests that a
+          copy operation, of a resource without a name, doesn't run into (NPE)
+           exceptions. The resource itself will however be silently ignored">
+    <copy todir="${output}">
+      <nullstream/>
+    </copy>
   </target>
 
   <target name="testResourceWithoutNameWithMergeMapper"
@@ -312,13 +312,10 @@
     <mkdir dir="${input}"/>
     <touch file="${output}/${file}"/>
   </target>
-  <target name="makeFileUnwritable"
-          depends="createTestdir,makeFileUnwritable-Unix,makeFileUnwritable-Windows"/>
-  <target name="makeFileUnwritable-Unix" id="unix">
-    <chmod file="${output}/${file}" perm="444"/>
-  </target>
-  <target name="makeFileUnwritable-Windows" unless="unix">
-    <attrib file="${output}/${file}" readonly="true"/>
+  <target name="makeFileUnwritable" depends="createTestdir">
+    <setpermissions mode="444" nonPosixMode="tryDosOrFail">
+      <file file="${output}/${file}"/>
+    </setpermissions>
   </target>
 
   <target name="testCopyOverReadOnlyFile" depends="makeFileUnwritable">
@@ -453,14 +450,9 @@
     <mkdir dir="${output}"/>
     <touch file="${input}/somefile"/>
     <touch file="${output}/somefile"/>
-    <exec executable="chmod" osfamily="unix">
-      <arg value="-w"/>
-      <arg file="${output}/somefile"/>
-    </exec>
-    <exec executable="attrib" osfamily="dos">
-      <arg value="+r"/>
-      <arg file="${output}/somefile"/>
-    </exec>
+    <setpermissions mode="444" nonPosixMode="tryDosOrFail">
+      <file file="${output}/somefile"/>
+    </setpermissions>
     <au:expectfailure>
       <copy todir="${output}" file="${input}/somefile"
             overwrite="true"/>
@@ -468,4 +460,20 @@
     <au:assertFileExists file="${input}/somefile"/>
     <au:assertFileExists file="${output}/somefile"/>
   </target>
+
+
+  <target name="test-with-some-resources-mapped-away"
+          description="https://bz.apache.org/bugzilla/show_bug.cgi?id=62076">
+    <mkdir dir="${input}"/>
+    <touch file="${input}/a.filea"/>
+    <touch file="${input}/b.fileb"/>
+    <mkdir dir="${output}"/>
+    <copy todir="${output}">
+      <mappedresources>
+	<fileset dir="${input}" />
+	<globmapper from="a.*" to="*" />
+      </mappedresources>
+    </copy>
+    <au:assertFileExists file="${output}/filea"/>
+  </target>
 </project>
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/jar-test.xml ant-1.10.3/src/tests/antunit/taskdefs/jar-test.xml
--- ant-1.9.10/src/tests/antunit/taskdefs/jar-test.xml	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/jar-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -249,4 +249,76 @@
         resource="${output}/META-INF/MANIFEST.MF"/>
   </target>
 
+  <target name="multiReleaseJarPart1" description="http://openjdk.java.net/jeps/238">
+    <!-- Preparation of the 'MultiRelease-Project' -->
+    <property name="java8.src"  value="${input}/src/java"/>
+    <property name="java9.src"  value="${input}/src/java9"/>
+    <property name="java10.src" value="${input}/src/java10"/>
+    <property name="java8.classes"  value="${input}/build/classes"/>
+    <property name="java9.classes"  value="${input}/build/classes9"/>
+    <property name="java10.classes" value="${input}/build/classes10"/>
+    <macrodef name="create">
+      <attribute name="version" />
+      <sequential>
+        <local name="src"/>
+        <local name="classes"/>
+        <property name="src" value="${java@{version}.src}"/>
+        <property name="classes" value="${java@{version}.classes}"/>
+        <mkdir dir="${src}/org/apache/ant/test"/>
+        <echo file="${src}/org/apache/ant/test/MRJarTest.java">
+          package org.apache.ant.test;
+          public class MRJarTest {
+            public static final String VERSION = "Java@{version}";
+          }
+        </echo>
+        <mkdir dir="${classes}"/>
+        <javac srcdir="${src}" destdir="${classes}" debug="on" includeantruntime="false"/>
+      </sequential>
+    </macrodef>
+    <create version="8"/>
+    <create version="9"/>
+    <create version="10"/>
+    
+    <!-- Now create the MultiReleaseJar -->
+    <jar destfile="${antunit.tmpdir}/mrjar.jar">
+      <manifest>
+        <!-- special mf-entry according to the spec -->
+        <attribute name="Multi-Release" value="true"/>
+      </manifest>
+      <!-- directory structure according to the spec ... -->
+      <!-- ... default classes loadable by old (<Java9) versions -->
+      <fileset dir="${java8.classes}"/>
+      <!-- ... per release classes, require Java9+ for loadable via standard ClassLoader -->
+      <zipfileset prefix="META-INF/versions/9/" dir="${java9.classes}"/>
+      <zipfileset prefix="META-INF/versions/10/" dir="${java10.classes}"/>
+    </jar>
+    
+    <!-- Now some tests -->
+    <au:assertNestedResourceExists>
+      <zipentry zipfile="${antunit.tmpdir}/mrjar.jar" name="META-INF/versions/9/org/apache/ant/test/MRJarTest.class"/>
+    </au:assertNestedResourceExists>
+    <au:assertNestedResourceExists>
+      <zipentry zipfile="${antunit.tmpdir}/mrjar.jar" name="META-INF/versions/10/org/apache/ant/test/MRJarTest.class"/>
+    </au:assertNestedResourceExists>
+  </target>
+
+  <target name="testMultiReleaseJar" depends="multiReleaseJarPart1"
+          unless="build.sysclasspath.only"
+          description="most of the tests happen in , this target contains the part that cannot be tested insid Gump">
+    <loadresource property="valueFrom8">
+      <javaconstant name="org.apache.ant.test.MRJarTest.VERSION">
+        <classpath>
+          <pathelement location="${antunit.tmpdir}/mrjar.jar"/>
+        </classpath>
+      </javaconstant>
+    </loadresource>
+    <au:assertTrue>
+      <or>
+    	<equals arg1="Java8" arg2="${valueFrom8}"/>
+        <!-- maybe we are running on an early version of Java9 -->
+    	<equals arg1="Java9" arg2="${valueFrom8}"/>
+      </or>
+    </au:assertTrue>
+  </target>
+
 </project>
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/javac-test.xml ant-1.10.3/src/tests/antunit/taskdefs/javac-test.xml
--- ant-1.9.10/src/tests/antunit/taskdefs/javac-test.xml	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/javac-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -224,28 +224,7 @@
       <mkdir dir="${javac-dir}/classes"/>
     </sequential>
     
-    <sequential unless:set="jdk9+">
-      <echo>JDK 1.5+</echo>
-      <testJavac source="1.5"/>
-      <delete dir="${javac-dir}/classes"/>
-      <mkdir dir="${javac-dir}/classes"/>
-    </sequential>
-    
-    <sequential if:set="jdk1.6+">
-      <echo>JDK 1.6+</echo>
-      <testJavac source="1.6"/>
-      <delete dir="${javac-dir}/classes"/>
-      <mkdir dir="${javac-dir}/classes"/>
-    </sequential>
-  		
-    <sequential if:set="jdk1.7+">
-      <echo>JDK 1.7+</echo>
-      <testJavac source="1.7"/>
-      <delete dir="${javac-dir}/classes"/>
-      <mkdir dir="${javac-dir}/classes"/>
-    </sequential>
-    
-    <sequential if:set="jdk1.8+">
+    <sequential unless:set="jdk1.9+">
       <echo>JDK 1.8+</echo>
       <testJavac source="1.8"/>
       <delete dir="${javac-dir}/classes"/>
@@ -274,34 +253,6 @@
     </au:expectfailure>
 
     <sequential unless:set="jdk9+">
-      <echo>JDK 1.4+</echo>
-      <testJavac source="1.4" target="1.4"/>
-      <delete dir="${javac-dir}/classes"/>
-      <mkdir dir="${javac-dir}/classes"/>
-    </sequential>
-
-    <sequential unless:set="jdk9+">
-      <echo>JDK 1.5+</echo>
-      <testJavac source="1.5" target="1.5"/>
-      <delete dir="${javac-dir}/classes"/>
-      <mkdir dir="${javac-dir}/classes"/>
-    </sequential>
-    
-    <sequential if:set="jdk1.6+">
-      <echo>JDK 1.6+</echo>
-      <testJavac source="1.6" target="1.6"/>
-      <delete dir="${javac-dir}/classes"/>
-      <mkdir dir="${javac-dir}/classes"/>
-    </sequential>
-        
-    <sequential if:set="jdk1.7+">
-      <echo>JDK 1.7+</echo>
-      <testJavac source="1.7" target="1.7"/>
-      <delete dir="${javac-dir}/classes"/>
-      <mkdir dir="${javac-dir}/classes"/>
-    </sequential>
-    
-    <sequential if:set="jdk1.8+">
       <echo>JDK 1.8+</echo>
       <testJavac source="1.8" target="1.8"/>
       <delete dir="${javac-dir}/classes"/>
@@ -323,7 +274,7 @@
     </sequential>
   </target>
 
-  <target name="testJavacWithNativeHeaderGeneration" if="jdk1.8+" depends="setup">
+  <target name="testJavacWithNativeHeaderGeneration" depends="setup">
     <mkdir dir="${javac-dir}/src/org/example" />
     <mkdir dir="${javac-dir}/classes"/>
     <mkdir dir="${javac-dir}/headers"/>
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/move-test.xml ant-1.10.3/src/tests/antunit/taskdefs/move-test.xml
--- ant-1.9.10/src/tests/antunit/taskdefs/move-test.xml	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/move-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -134,13 +134,10 @@
     <mkdir dir="${input}"/>
     <touch file="${output}/${file}"/>
   </target>
-  <target name="makeFileUnwritable"
-          depends="createTestdir,makeFileUnwritable-Unix,makeFileUnwritable-Windows"/>
-  <target name="makeFileUnwritable-Unix" id="unix">
-    <chmod file="${output}/${file}" perm="444"/>
-  </target>
-  <target name="makeFileUnwritable-Windows" unless="unix">
-    <attrib file="${output}/${file}" readonly="true"/>
+  <target name="makeFileUnwritable" depends="createTestdir">
+    <setpermissions mode="444" nonPosixMode="tryDosOrFail">
+      <file file="${output}/${file}"/>
+    </setpermissions>
   </target>
 
   <target name="testMoveOverReadOnlyFile" depends="makeFileUnwritable">
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/optional/junit/junit-test.xml ant-1.10.3/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
--- ant-1.9.10/src/tests/antunit/taskdefs/optional/junit/junit-test.xml	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/optional/junit/junit-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -317,10 +317,7 @@
   </target>
 
   <target name="testTestMethods">
-    <condition property="source" value="6">
-      <isset property="jdk1.6+"/>
-    </condition>
-    <property name="source" value="5"/>
+    <property name="source" value="8"/>
     <echo file="${input}/T1.java">public class T1 extends
 			junit.framework.TestCase {
 			public void testOK() {}
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/optional/xz/unxz-test.xml ant-1.10.3/src/tests/antunit/taskdefs/optional/xz/unxz-test.xml
--- ant-1.9.10/src/tests/antunit/taskdefs/optional/xz/unxz-test.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/optional/xz/unxz-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (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
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
+  <import file="../../../antunit-base.xml" />
+
+  <target name="setup">
+    <mkdir dir="${output}"/>
+    <available property="xz.present" classname="org.tukaani.xz.XZOutputStream"/>
+  </target>
+
+  <target name="testWithFileResourceToFile" depends="setup" if="xz.present">
+    <unxz dest="${output}/asf-logo.gif">
+      <file file="../../../../../etc/testcases/taskdefs/expected/asf-logo.gif.xz"/>
+    </unxz>
+    <au:assertFilesMatch expected="../../../../../etc/testcases/asf-logo.gif"
+                         actual="${output}/asf-logo.gif"/>
+  </target>
+
+  <target name="testWithFileResourceToDirectory" depends="setup" if="xz.present">
+    <unxz dest="${output}">
+      <file file="../../../../../etc/testcases/taskdefs/expected/asf-logo.gif.xz"/>
+    </unxz>
+    <au:assertFilesMatch expected="../../../../../etc/testcases/asf-logo.gif"
+                         actual="${output}/asf-logo.gif"/>
+  </target>
+
+  <target name="testWithNonFileResourceToFile" depends="setup" if="xz.present">
+    <unxz dest="${output}/greeting.txt">
+      <url url="http://ant.apache.org/webtest/xz/greeting.txt.xz"/>
+    </unxz>
+    <get src="http://ant.apache.org/webtest/gunzip/greeting.txt"
+         dest="${output}/orig.greeting.txt"/>
+    <au:assertFilesMatch expected="${output}/orig.greeting.txt"
+                         actual="${output}/greeting.txt"/>
+  </target>
+
+  <target name="testWithNonFileResourceToDir" depends="setup" if="xz.present">
+    <unxz dest="${output}">
+      <url url="http://ant.apache.org/webtest/xz/greeting.txt.xz"/>
+    </unxz>
+    <get src="http://ant.apache.org/webtest/gunzip/greeting.txt"
+         dest="${output}/orig.greeting.txt"/>
+    <au:assertFilesMatch expected="${output}/orig.greeting.txt"
+                         actual="${output}/greeting.txt"/>
+  </target>
+
+</project>
+
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/optional/xz/xz-test.xml ant-1.10.3/src/tests/antunit/taskdefs/optional/xz/xz-test.xml
--- ant-1.9.10/src/tests/antunit/taskdefs/optional/xz/xz-test.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/optional/xz/xz-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
+
+    <!-- note relies on antunit 1.1 -->
+    <import file="../../../antunit-base.xml" />
+
+    <target name="setUp">
+        <mkdir dir="${output}" />
+        <mkdir dir="${output}/empty" />
+        <touch file="${output}/fileone" />
+        <touch file="${output}/filetwo" />
+        <available property="xz.present" classname="org.tukaani.xz.XZOutputStream"/>
+    </target>
+
+    <target name="testFailNone" if="xz.present">
+        <au:expectfailure expectedmessage="No resource selected, xz needs exactly one resource." message="Should have thrown an exception">
+            <xz destfile="${output}/file.gz">
+                <fileset dir="${output}/empty" />
+            </xz>
+        </au:expectfailure>
+    </target>
+
+    <target name="testFailTwo" if="xz.present">
+        <au:expectfailure expectedmessage="xz cannot handle multiple resources at once. (2 resources were selected.)" message="Should have thrown an exception">
+            <xz destfile="${output}/file.xz">
+                <fileset dir="${output}" />
+            </xz>
+        </au:expectfailure>
+    </target>
+
+</project>
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/secure-input.xml ant-1.10.3/src/tests/antunit/taskdefs/secure-input.xml
--- ant-1.9.10/src/tests/antunit/taskdefs/secure-input.xml	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/secure-input.xml	2018-03-24 12:37:12.000000000 +0000
@@ -22,7 +22,7 @@
   <target name="setUp">
   </target>
 
-  <target name="test-secure-input" if="jdk1.6+">
+  <target name="test-secure-input">
     <input message="secure-input:>" addproperty="the.password">
       <handler classname="org.apache.tools.ant.input.SecureInputHandler" />
     </input>
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/setpermissions-test.xml ant-1.10.3/src/tests/antunit/taskdefs/setpermissions-test.xml
--- ant-1.9.10/src/tests/antunit/taskdefs/setpermissions-test.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/setpermissions-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (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
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
+
+  <import file="../antunit-base.xml" />
+
+  <target name="setUp">
+    <mkdir dir="${input}"/>
+    <property name="file" location="${input}/file"/>
+    <touch file="${file}"/>
+  </target>
+
+  <target name="testRequiresNestedResources" depends="setUp">
+    <au:expectfailure expectedMessage="At least one resource-collection is required">
+      <setpermissions mode="644" />
+    </au:expectfailure>
+  </target>
+
+  <target name="testPermissionsSetViaPermissionsAttribute"
+          depends="setUp">
+    <setpermissions permissions="OWNER_READ,GROUP_READ,OTHERS_READ"
+                    nonPosixMode="tryDosOrFail">
+      <file file="${file}"/>
+    </setpermissions>
+    <au:assertFalse>
+      <isfileselected file="${file}">
+        <writable/>
+      </isfileselected>
+    </au:assertFalse>
+    <au:assertTrue>
+      <isfileselected file="${file}">
+        <readable/>
+      </isfileselected>
+    </au:assertTrue>
+  </target>
+
+  <target name="testPermissionsSetViaModeAttribute"
+          depends="setUp">
+    <setpermissions mode="444" nonPosixMode="tryDosOrFail">
+      <file file="${file}"/>
+    </setpermissions>
+    <au:assertFalse>
+      <isfileselected file="${file}">
+        <writable/>
+      </isfileselected>
+    </au:assertFalse>
+    <au:assertTrue>
+      <isfileselected file="${file}">
+        <readable/>
+      </isfileselected>
+    </au:assertTrue>
+  </target>
+</project>
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/signjar-test.xml ant-1.10.3/src/tests/antunit/taskdefs/signjar-test.xml
--- ant-1.9.10/src/tests/antunit/taskdefs/signjar-test.xml	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/signjar-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -25,6 +25,7 @@
   <property name="signtest.jar" location="${sign.dir}/signtest.jar" />
   <property name="subdirsigntest.jar" location="${subdir}/signtest.jar" />
   <property name="testkeystore" location="../../../etc/testcases/testkeystore" />
+  <property name="testkeystore.pkcs12" location="${input}/testkeystore.pkcs12" />
 
   <macrodef name="assertSigned">
     <attribute name="jar" default="${signtest.jar}" />
@@ -43,11 +44,18 @@
     <verifyjar keystore="${testkeystore}" storepass="apacheant" />
   </presetdef>
 
+  <presetdef name="verify-base-pkcs12">
+    <verifyjar keystore="${testkeystore.pkcs12}" storepass="apacheant"
+               storetype="pkcs12" alias="testonly"/>
+  </presetdef>
+
   <presetdef name="sign">
     <sign-base jar="${signtest.jar}" />
   </presetdef>
 
   <target name="setUp">
+    <mkdir dir="${input}"/>
+    <gunzip src="${testkeystore}.pkcs12.gz" dest="${testkeystore.pkcs12}"/>
     <mkdir dir="${sign.dir}" />
     <mkdir dir="${subdir}" />
   </target>
@@ -60,6 +68,10 @@
     <sign />
   </target>
 
+  <target name="basic-pkcs12" depends="jar" unless="jdk9+" if="jdk1.7+">
+    <sign keystore="${testkeystore.pkcs12}" storetype="pkcs12" strict="true"/>
+  </target>
+
   <target name="testBasic" depends="basic">
     <assertSigned />
   </target>
@@ -232,6 +244,11 @@
     <verify-base jar="${signtest.jar}" />
   </target>
 
+  <target name="testVerifyJarPKCS12" depends="basic-pkcs12"
+          unless="jdk9+" if="jdk1.7+">
+    <verify-base-pkcs12 jar="${signtest.jar}" />
+  </target>
+
   <target name="testVerifyJarCertificates" depends="basic">
     <verify-base jar="${signtest.jar}" certificates="true" verbose="true" />
   </target>
@@ -268,5 +285,15 @@
     </au:expectfailure>
   </target>
 
+  <target name="testVerifyJarStrict" depends="basic" if="jdk1.7+">
+    <verify-base jar="${signtest.jar}" strict="true"/>
+  </target>
+
+  <target name="testVerifyJarStrictPKCS12" depends="basic-pkcs12"
+          if="jdk1.7+" unless="jdk9+"
+          description="https://bz.apache.org/bugzilla/show_bug.cgi?id=62194">
+    <verify-base-pkcs12 jar="${signtest.jar}" strict="true"/>
+  </target>
+
 </project>
 
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/tar-test.xml ant-1.10.3/src/tests/antunit/taskdefs/tar-test.xml
--- ant-1.9.10/src/tests/antunit/taskdefs/tar-test.xml	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/tar-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -24,6 +24,7 @@
   <target name="setUp">
     <mkdir dir="${input}" />
     <mkdir dir="${output}" />
+    <available property="xz.present" classname="org.tukaani.xz.XZOutputStream"/>
   </target>
 
   <target name="testTarFilesetHandlesFilesetReferences" depends="setUp">
@@ -115,4 +116,47 @@
     <untar dest="${output}" src="${output}/x.tar"/>
     <au:assertFileExists file="${output}/${longfile.file.name}"/>
   </target>
+
+  <target name="testGzipCompression" depends="setUp">
+    <au:assertFileExists file="../../../etc/testcases/asf-logo.gif"/>
+    <tar destfile="${input}/asf-logo.gif.tar.gz" compression="gzip">
+      <file file="../../../etc/testcases/asf-logo.gif"/>
+    </tar>
+    <gunzip dest="${input}/asf-logo.gif.tar">
+      <file file="${input}/asf-logo.gif.tar.gz"/>
+    </gunzip>
+    <untar src="${input}/asf-logo.gif.tar" dest="${output}"/>
+    <au:assertFilesMatch
+        expected="../../../etc/testcases/asf-logo.gif"
+        actual="${output}/asf-logo.gif"/>
+  </target>
+
+  <target name="testBzip2Compression" depends="setUp">
+    <au:assertFileExists file="../../../etc/testcases/asf-logo.gif"/>
+    <tar destfile="${input}/asf-logo.gif.tar.bz2" compression="bzip2">
+      <file file="../../../etc/testcases/asf-logo.gif"/>
+    </tar>
+    <bunzip2 dest="${input}/asf-logo.gif.tar">
+      <file file="${input}/asf-logo.gif.tar.bz2"/>
+    </bunzip2>
+    <untar src="${input}/asf-logo.gif.tar" dest="${output}"/>
+    <au:assertFilesMatch
+        expected="../../../etc/testcases/asf-logo.gif"
+        actual="${output}/asf-logo.gif"/>
+  </target>
+
+  <target name="testXzCompression" depends="setUp" if="xz.present">
+    <au:assertFileExists file="../../../etc/testcases/asf-logo.gif"/>
+    <tar destfile="${input}/asf-logo.gif.tar.xz" compression="xz">
+      <file file="../../../etc/testcases/asf-logo.gif"/>
+    </tar>
+    <unxz dest="${input}/asf-logo.gif.tar">
+      <file file="${input}/asf-logo.gif.tar.xz"/>
+    </unxz>
+    <untar src="${input}/asf-logo.gif.tar" dest="${output}"/>
+    <au:assertFilesMatch
+        expected="../../../etc/testcases/asf-logo.gif"
+        actual="${output}/asf-logo.gif"/>
+  </target>
+
 </project>
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/taskdef-antlib-test.xml ant-1.10.3/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
--- ant-1.9.10/src/tests/antunit/taskdefs/taskdef-antlib-test.xml	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/taskdef-antlib-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -18,9 +18,7 @@
 <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
     <import file="../antunit-base.xml" />
 
-    <!-- Java5 has some trouble with the recursive Antlib lookup -->
-
-    <target name="setUp" if="jdk1.6+">
+    <target name="setUp">
         <mkdir dir="${input}/org/example" />
         <property name="tmpdir" location="../../../../build/ant-unit/taskdef" />
         <mkdir dir="${tmpdir}" />
@@ -46,14 +44,14 @@
         <sleep seconds="1"/>
     </target>
 
-    <target name="testAntlib" depends="setUp" if="jdk1.6+">
+    <target name="testAntlib" depends="setUp">
         <taskdef classpath="${test.jar}" uri="antlib:org.example"
                  loaderref="loader1"/>
         <echoooo xmlns="antlib:org.example" message="exemple" />
         <au:assertLogContains text="exempleexempleexempleexemple" />
     </target>
 
-    <target name="testURI" depends="setUp" if="jdk1.6+">
+    <target name="testURI" depends="setUp">
         <taskdef classpath="${test.jar}" uri="urn:my:exemple"
                  loaderref="loader2"
                  resource="org/example/antlib.xml" />
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/taskdef-test.xml ant-1.10.3/src/tests/antunit/taskdefs/taskdef-test.xml
--- ant-1.9.10/src/tests/antunit/taskdefs/taskdef-test.xml	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/taskdef-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -41,7 +41,7 @@
     <au:assertLogContains text="Hello"/>
   </target>
 
-  <target name="testDirWithPling" depends="setUp" if="jdk1.6+"
+  <target name="testDirWithPling" depends="setUp"
           description="https://issues.apache.org/bugzilla/show_bug.cgi?id=50007">
     <property name="dir" location="${tmpdir}/pl!ng"/>
     <mkdir dir="${dir}"/>
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/tstamp-test.xml ant-1.10.3/src/tests/antunit/taskdefs/tstamp-test.xml
--- ant-1.9.10/src/tests/antunit/taskdefs/tstamp-test.xml	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/tstamp-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -24,4 +24,21 @@
     <tstamp/>
     <au:assertPropertyEquals name="DSTAMP" value="19700102"/>
   </target>
+
+  <target name="testMagicPropertyIso">
+    <local name="ant.tstamp.now.iso"/>
+    <property name="ant.tstamp.now.iso" value="1972-04-17T08:07:00Z"/>
+    <tstamp/>
+    <au:assertPropertyEquals name="DSTAMP" value="19720417"/>
+  </target>
+
+  <target name="testMagicPropertyBoth">
+    <local name="ant.tstamp.now"/>
+    <local name="ant.tstamp.now.iso"/>
+    <property name="ant.tstamp.now" value="100000"/>
+    <property name="ant.tstamp.now.iso" value="1972-04-17T08:07:22Z"/>
+    <tstamp/>
+    <!-- 'iso' overrides 'simple' -->
+    <au:assertPropertyEquals name="DSTAMP" value="19720417"/>
+  </target>
 </project>
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/untar-test.xml ant-1.10.3/src/tests/antunit/taskdefs/untar-test.xml
--- ant-1.9.10/src/tests/antunit/taskdefs/untar-test.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/untar-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (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
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<project name="untar-test" default="antunit"
+         xmlns:au="antlib:org.apache.ant.antunit">
+  <import file="../antunit-base.xml" />
+
+  <target name="setUp">
+    <mkdir dir="${input}"/>
+    <mkdir dir="${output}/expected" />
+    <mkdir dir="${output}/actual" />
+    <available property="xz.present" classname="org.tukaani.xz.XZOutputStream"/>
+  </target>
+
+  <target name="testGzipCompression" depends="setUp">
+    <untar src="../../../etc/testcases/taskdefs/expected/asf-logo.gif.tar"
+           dest="${output}/expected"/>
+    <untar src="../../../etc/testcases/taskdefs/expected/asf-logo.gif.tar.gz"
+           compression="gzip"
+           dest="${output}/actual"/>
+    <au:assertFilesMatch expected="${output}/expected/asf-logo.gif"
+                         actual="${output}/actual/asf-logo.gif"/>
+  </target>
+
+  <target name="testBzip2Compression" depends="setUp">
+    <untar src="../../../etc/testcases/taskdefs/expected/asf-logo.gif.tar"
+           dest="${output}/expected"/>
+    <untar src="../../../etc/testcases/taskdefs/expected/asf-logo.gif.tar.bz2"
+           compression="bzip2"
+           dest="${output}/actual"/>
+    <au:assertFilesMatch expected="${output}/expected/asf-logo.gif"
+                         actual="${output}/actual/asf-logo.gif"/>
+  </target>
+
+  <target name="testXZCompression" depends="setUp" if="xz.present">
+    <untar src="../../../etc/testcases/taskdefs/expected/asf-logo.gif.tar"
+           dest="${output}/expected"/>
+    <xz destfile="${input}/asf-logo.gif.tar.xz"
+        src="../../../etc/testcases/taskdefs/expected/asf-logo.gif.tar"/>
+    <untar src="${input}/asf-logo.gif.tar.xz"
+           compression="xz"
+           dest="${output}/actual"/>
+    <au:assertFilesMatch expected="${output}/expected/asf-logo.gif"
+                         actual="${output}/actual/asf-logo.gif"/>
+  </target>
+</project>
diff -Nru ant-1.9.10/src/tests/antunit/taskdefs/xslt-test.xml ant-1.10.3/src/tests/antunit/taskdefs/xslt-test.xml
--- ant-1.9.10/src/tests/antunit/taskdefs/xslt-test.xml	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/taskdefs/xslt-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -187,18 +187,7 @@
     </xslt>
   </target>
 
-
-  <target name="testTraceJdk14" unless="jdk1.5+" depends="setUp">
-    <xslt in="${legacy.dir}/data.xml"
-          out="${output}/out.xml"
-          style="${legacy.dir}/printParams.xsl">
-      <param name="set" expression="myvalue"/>
-      <trace templates="true"/>
-    </xslt>
-    <au:assertLogContains text="Failed to enable tracing" level="warning"/>
-  </target>
-
-  <target name="testTraceJdk15+" if="jdk1.5+" depends="setUp">
+  <target name="testTrace" depends="setUp">
     <xslt in="${legacy.dir}/data.xml"
           out="${output}/out.xml"
           style="${legacy.dir}/printParams.xsl">
diff -Nru ant-1.9.10/src/tests/antunit/types/optional/xz/xzresource-test.xml ant-1.10.3/src/tests/antunit/types/optional/xz/xzresource-test.xml
--- ant-1.9.10/src/tests/antunit/types/optional/xz/xzresource-test.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/types/optional/xz/xzresource-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (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
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
+
+  <import file="../../../antunit-base.xml" />
+
+  <target name="setup">
+    <mkdir dir="${output}"/>
+    <available property="xz.present" classname="org.tukaani.xz.XZOutputStream"/>
+  </target>
+
+  <target name="testDocumentationClaimsOnCopy" if="xz.present">
+    <copy todir="${output}">
+      <xzresource>
+        <file file="../../../../../etc/testcases/taskdefs/expected/asf-logo.gif.xz"/>
+      </xzresource>
+      <mapper type="glob" from="*.xz" to="*"/>
+    </copy>
+    <au:assertFilesMatch expected="../../../../../etc/testcases/asf-logo.gif"
+                         actual="${output}/asf-logo.gif"/>
+  </target>
+</project>
diff -Nru ant-1.9.10/src/tests/antunit/types/resources/selectors/readwrite-test.xml ant-1.10.3/src/tests/antunit/types/resources/selectors/readwrite-test.xml
--- ant-1.9.10/src/tests/antunit/types/resources/selectors/readwrite-test.xml	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/types/resources/selectors/readwrite-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -70,13 +70,10 @@
     </au:assertTrue>
   </target>
 
-  <target name="makeFileUnwritable"
-          depends="createTestdir,makeFileUnwritable-Unix,makeFileUnwritable-Windows"/>
-  <target name="makeFileUnwritable-Unix" id="unix">
-    <chmod file="${output}/${file}" perm="444"/>
-  </target>
-  <target name="makeFileUnwritable-Windows" unless="unix">
-    <attrib file="${output}/${file}" readonly="true"/>
+  <target name="makeFileUnwritable" depends="createTestdir">
+    <setpermissions mode="444" nonPosixMode="tryDosOrFail">
+      <file file="${output}/${file}"/>
+    </setpermissions>
   </target>
 
   <target name="testUnwritable" depends="makeFileUnwritable">
diff -Nru ant-1.9.10/src/tests/antunit/types/resources/tokens-test.xml ant-1.10.3/src/tests/antunit/types/resources/tokens-test.xml
--- ant-1.9.10/src/tests/antunit/types/resources/tokens-test.xml	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/types/resources/tokens-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -44,6 +44,22 @@
     </au:assertTrue>
   </target>
 
+  <target name="testPropReplacement" description="bz-62147 - tests that string resource tokens aren't replaced with property values">
+    <property name="bz-62147-four" value="four"/>
+    <au:assertTrue>
+      <resourcecount count="0">
+        <difference>
+          <tokens>
+            <string>one two three $${bz-62147-four} $${bz-62417-nonexistent-prop}</string>
+          </tokens>
+          <resources>
+            <string value="one two three $${bz-62147-four} $${bz-62417-nonexistent-prop}" />
+          </resources>
+        </difference>
+      </resourcecount>
+    </au:assertTrue>
+  </target>
+
   <target name="testExplicitLines">
     <au:assertTrue>
       <resourcecount count="0">
diff -Nru ant-1.9.10/src/tests/antunit/types/selectors/executable-test.xml ant-1.10.3/src/tests/antunit/types/selectors/executable-test.xml
--- ant-1.9.10/src/tests/antunit/types/selectors/executable-test.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/types/selectors/executable-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (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
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
+
+  <import file="../../antunit-base.xml" />
+
+  <property name="file" value="testfile"/>
+
+  <condition property="unix">
+    <os family="unix"/>
+  </condition>
+
+  <target name="createTestdir">
+    <mkdir dir="${output}"/>
+    <touch file="${output}/${file}"/>
+  </target>
+
+  <target name="testExecutable" depends="makeFileExecutable" if="unix">
+    <au:assertTrue>
+      <resourcecount when="equal" count="1">
+        <fileset dir="${output}">
+          <executable/>
+        </fileset>
+      </resourcecount>
+    </au:assertTrue>
+    <au:assertTrue>
+      <resourcecount when="equal" count="0">
+        <fileset dir="${output}" excludes="${file}">
+          <executable/>
+        </fileset>
+      </resourcecount>
+    </au:assertTrue>
+  </target>
+
+  <target name="makeFileExecutable" depends="createTestdir">
+    <setpermissions mode="755" nonPosixMode="pass">
+      <file file="${output}/${file}"/>
+    </setpermissions>
+  </target>
+
+  <target name="testNotexecutable" depends="createTestdir" if="unix">
+    <au:assertTrue>
+      <resourcecount when="equal" count="0">
+        <fileset dir="${output}">
+          <executable/>
+        </fileset>
+      </resourcecount>
+    </au:assertTrue>
+  </target>
+
+  <target name="testAsFalseConditions" depends="createTestdir" if="unix">
+    <au:assertFalse>
+      <isfileselected file="${output}/${file}">
+        <executable/>
+      </isfileselected>
+    </au:assertFalse>
+  </target>
+
+  <target name="testAsTrueConditions" depends="makeFileExecutable" if="unix">
+    <au:assertTrue>
+      <isfileselected file="${output}/${file}">
+        <executable/>
+      </isfileselected>
+    </au:assertTrue>
+  </target>
+
+</project>
diff -Nru ant-1.9.10/src/tests/antunit/types/selectors/ownedby-test.xml ant-1.10.3/src/tests/antunit/types/selectors/ownedby-test.xml
--- ant-1.9.10/src/tests/antunit/types/selectors/ownedby-test.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/types/selectors/ownedby-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (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
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
+
+  <import file="../../antunit-base.xml" />
+
+  <property name="file" value="testfile"/>
+
+  <condition property="unix">
+    <os family="unix"/>
+  </condition>
+
+  <target name="createTestdir">
+    <mkdir dir="${output}"/>
+    <touch file="${output}/${file}"/>
+  </target>
+
+  <target name="testRequiresOwner" depends="createTestdir">
+    <au:expectfailure expectedMessage="the owner attribute is required">
+      <au:assertTrue>
+        <isfileselected file="${output}/${file}">
+          <ownedBy/>
+        </isfileselected>
+      </au:assertTrue>
+    </au:expectfailure>
+  </target>
+
+  <!-- at least on Jenkins the file is owned by BUILTIN\Administrators -->
+  <target name="testOwnedBy" depends="createTestdir" if="unix">
+    <au:assertTrue>
+      <resourcecount when="equal" count="1">
+        <fileset dir="${output}">
+          <ownedBy owner="${user.name}"/>
+        </fileset>
+      </resourcecount>
+    </au:assertTrue>
+    <au:assertTrue>
+      <resourcecount when="equal" count="0">
+        <fileset dir="${output}" excludes="${file}">
+          <ownedBy owner="${user.name}"/>
+        </fileset>
+      </resourcecount>
+    </au:assertTrue>
+  </target>
+
+  <target name="testAsTrueConditions" depends="createTestdir" if="unix">
+    <au:assertTrue>
+      <isfileselected file="${output}/${file}">
+        <ownedBy owner="${user.name}"/>
+      </isfileselected>
+    </au:assertTrue>
+  </target>
+
+</project>
diff -Nru ant-1.9.10/src/tests/antunit/types/selectors/readwrite-test.xml ant-1.10.3/src/tests/antunit/types/selectors/readwrite-test.xml
--- ant-1.9.10/src/tests/antunit/types/selectors/readwrite-test.xml	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/types/selectors/readwrite-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -64,13 +64,10 @@
     </au:assertTrue>
   </target>
 
-  <target name="makeFileUnwritable"
-          depends="createTestdir,makeFileUnwritable-Unix,makeFileUnwritable-Windows"/>
-  <target name="makeFileUnwritable-Unix" id="unix">
-    <chmod file="${output}/${file}" perm="444"/>
-  </target>
-  <target name="makeFileUnwritable-Windows" unless="unix">
-    <attrib file="${output}/${file}" readonly="true"/>
+  <target name="makeFileUnwritable" depends="createTestdir">
+    <setpermissions mode="444" nonPosixMode="tryDosOrFail">
+      <file file="${output}/${file}"/>
+    </setpermissions>
   </target>
 
   <target name="testUnwritable" depends="makeFileUnwritable">
diff -Nru ant-1.9.10/src/tests/antunit/types/selectors/symlink-test.xml ant-1.10.3/src/tests/antunit/types/selectors/symlink-test.xml
--- ant-1.9.10/src/tests/antunit/types/selectors/symlink-test.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tests/antunit/types/selectors/symlink-test.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (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
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
+
+  <import file="../../antunit-base.xml" />
+
+  <property name="file" value="testfile"/>
+  <property name="link" value="testlink"/>
+
+  <condition property="unix">
+    <os family="unix"/>
+  </condition>
+
+  <target name="createTestdir">
+    <mkdir dir="${output}"/>
+    <touch file="${output}/${file}"/>
+  </target>
+
+  <target name="testSymlink" depends="makeSymlink" if="unix">
+    <au:assertTrue>
+      <resourcecount when="equal" count="1">
+        <fileset dir="${output}">
+          <symlink/>
+        </fileset>
+      </resourcecount>
+    </au:assertTrue>
+    <au:assertTrue>
+      <resourcecount when="equal" count="0">
+        <fileset dir="${output}" excludes="${link}">
+          <symlink/>
+        </fileset>
+      </resourcecount>
+    </au:assertTrue>
+  </target>
+
+  <target name="makeSymlink"
+          depends="createTestdir,makeSymlink-Unix,makeSymlink-Windows"/>
+  <target name="makeSymlink-Unix" if="unix">
+    <symlink link="${output}/${link}" resource="${output}/${file}"/>
+  </target>
+  <target name="makeSymlink-Windows" unless="unix">
+    <!-- no idea how to do this -->
+  </target>
+
+  <target name="testNoSymlink" depends="createTestdir">
+    <au:assertTrue>
+      <resourcecount when="equal" count="0">
+        <fileset dir="${output}">
+          <symlink/>
+        </fileset>
+      </resourcecount>
+    </au:assertTrue>
+  </target>
+
+  <target name="testAsFalseConditions" depends="createTestdir">
+    <au:assertFalse>
+      <isfileselected file="${output}/${link}">
+        <symlink/>
+      </isfileselected>
+    </au:assertFalse>
+  </target>
+
+  <target name="testAsTrueConditions" depends="makeSymlink" if="unix">
+    <au:assertTrue>
+      <isfileselected file="${output}/${link}">
+        <symlink/>
+      </isfileselected>
+    </au:assertTrue>
+  </target>
+
+</project>
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/IntrospectionHelperTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,6 +21,8 @@
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -475,6 +477,7 @@
         attrMap.put("seventeen", Byte.TYPE);
         attrMap.put("eightteen", Short.TYPE);
         attrMap.put("nineteen", Double.TYPE);
+        attrMap.put("twenty", Path.class);
 
         /*
          * JUnit 3.7 adds a getName method to TestCase - so we now
@@ -556,6 +559,8 @@
                          Short.valueOf((short) 18), Short.valueOf((short) 10));
         assertAttrMethod("nineteen", "setNineteen", Double.TYPE,
                          Double.valueOf(19), Double.valueOf((short) 10));
+        assertAttrMethod("twenty", "setTwenty", Path.class,
+                         new File(projectBasedir + 20).toPath(), Paths.get("toto"));
 
         try {
             assertAttrMethod("onehundred", null, null, null, null);
@@ -648,6 +653,18 @@
         assertTrue("Expected 19, received " + d, diff > -1e-6 && diff < 1e-6);
     }
 
+    public void setTwenty(Path p) {
+        String path = p.toAbsolutePath().toString();
+        if (Os.isFamily("unix") || Os.isFamily("openvms")) {
+            assertEquals(projectBasedir + "20", path);
+        } else if (Os.isFamily("netware")) {
+            assertEquals(projectBasedir + "20", path.toLowerCase(Locale.US));
+        } else {
+            assertEquals(":" + projectBasedir + "20",
+                         path.toLowerCase(Locale.US).substring(1));
+        }
+    }
+
     @Test
     public void testGetExtensionPoints() {
         List extensions = ih.getExtensionPoints();
@@ -722,7 +739,7 @@
 
     public void addConfigured(Map m) {
         // Valid extension point
-        assertTrue(m.size() == 0);
+        assertTrue(m.isEmpty());
     }
 
     public void addConfigured(Hashtable h) {
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapterTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -248,6 +248,7 @@
             javac.setProject(prj);
             final Commandline[] cmd = new Commandline[1];
             final DefaultCompilerAdapter impl = new DefaultCompilerAdapter() {
+                @Override
                 public boolean execute() throws BuildException {
                     cmd[0] = setupModernJavacCommand();
                     return true;
@@ -303,6 +304,7 @@
             javac.setProject(prj);
             final Commandline[] cmd = new Commandline[1];
             final DefaultCompilerAdapter impl = new DefaultCompilerAdapter() {
+                @Override
                 public boolean execute() throws BuildException {
                     cmd[0] = setupModernJavacCommand();
                     return true;
@@ -366,6 +368,7 @@
             final LogCapturingJavac javac = new LogCapturingJavac();
             javac.setProject(prj);
             final DefaultCompilerAdapter impl = new DefaultCompilerAdapter() {
+                @Override
                 public boolean execute() throws BuildException {
                     setupModernJavacCommand();
                     return true;
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/CopyTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/CopyTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/CopyTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/CopyTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -222,15 +222,13 @@
         buildRule.executeTarget("testFileResourceWithFilter");
         File file1 = new File(buildRule.getProject().getProperty("to.dir") + "/fileNR.txt");
         assertTrue(file1.exists());
-        FileReader f = null;
         try {
-            f = new FileReader(file1);
-            String file1Content = FileUtils.readFully(f);
-            assertEquals("This is file 42", file1Content);
+            try (FileReader f = new FileReader(file1)) {
+                String file1Content = FileUtils.readFully(f);
+                assertEquals("This is file 42", file1Content);
+            }
         } catch (IOException e) {
             // no-op: not a real business error
-        } finally {
-            FileUtils.close(f);
         }
     }
 
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/GetTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/GetTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/GetTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/GetTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,6 +18,7 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import org.apache.tools.ant.AntAssert;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.BuildFileRule;
 import org.junit.After;
@@ -25,6 +26,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 /**
@@ -103,6 +105,8 @@
     public void test7() {
         try {
             buildRule.executeTarget("test7");
+            AntAssert.assertNotContains("Adding header", buildRule.getLog());
+
             fail("userAgent may not be null or empty");
         } catch (BuildException ex) {
             //TODO assert value
@@ -119,4 +123,35 @@
         buildRule.executeTarget("testUseTomorrow");
     }
 
+    @Test
+    public void testTwoHeadersAreAddedOK() {
+        buildRule.executeTarget("testTwoHeadersAreAddedOK");
+        String log = buildRule.getLog();
+        AntAssert.assertContains("Adding header 'header1'", log);
+        AntAssert.assertContains("Adding header 'header2'", log);
+    }
+
+    @Test
+    public void testEmptyHeadersAreNeverAdded() {
+        buildRule.executeTarget("testEmptyHeadersAreNeverAdded");
+        AntAssert.assertNotContains("Adding header", buildRule.getLog());
+    }
+
+    @Test
+    public void testThatWhenMoreThanOneHeaderHaveSameNameOnlyLastOneIsAdded() {
+        buildRule.executeTarget("testThatWhenMoreThanOneHeaderHaveSameNameOnlyLastOneIsAdded");
+        String log = buildRule.getLog();
+        AntAssert.assertContains("Adding header 'header1'", log);
+
+        int actualHeaderCount = log.split("Adding header ").length - 1;
+
+        assertEquals("Only one header has been added", 1, actualHeaderCount);
+    }
+
+    @Test
+    public void testHeaderSpaceTrimmed() {
+        buildRule.executeTarget("testHeaderSpaceTrimmed");
+        AntAssert.assertContains("Adding header 'header1'", buildRule.getLog());
+    }
+
 }
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/JavacTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/JavacTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/JavacTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/JavacTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -35,7 +35,6 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 /**
  * Testcase for <javac>.
@@ -249,46 +248,31 @@
         assertEquals("1.5", javac.getTarget());
     }
 
-    @Test
+    @Test(expected = BuildException.class)
     public void testModulesourcepathOrSrcDirRequired() {
-        try {
-            javac.checkParameters();
-            fail("Build exception should have been thrown - neither srcDir nor modulesourcepath");
-        } catch (BuildException e) {
-            //pass
-        }
+        javac.checkParameters();
     }
 
-    @Test
+    @Test(expected = BuildException.class)
     public void testModulesourcepathAndSrcDirForbidden() {
-        try {
-            javac.checkParameters();
-            final Path p = new Path(project);
-            p.setPath("src");
-            javac.setSrcdir(p);
-            final Path mp = new Path(project);
-            p.setPath("modsrc");
-            javac.setModulesourcepath(mp);
-            fail("Build exception should have been thrown - neither srcDir nor modulesourcepath");
-        } catch (BuildException e) {
-            //pass
-        }
+        javac.checkParameters();
+        final Path p = new Path(project);
+        p.setPath("src");
+        javac.setSrcdir(p);
+        final Path mp = new Path(project);
+        p.setPath("modsrc");
+        javac.setModulesourcepath(mp);
     }
 
-    @Test
+    @Test(expected = BuildException.class)
     public void testModulesourcepathAndSourcepathForbidden() {
-        try {
-            javac.checkParameters();
-            final Path p = new Path(project);
-            p.setPath("src");
-            javac.setSourcepath(p);
-            final Path mp = new Path(project);
-            p.setPath("modsrc");
-            javac.setModulesourcepath(mp);
-            fail("Build exception should have been thrown - neither srcDir nor modulesourcepath");
-        } catch (BuildException e) {
-            //pass
-        }
+        javac.checkParameters();
+        final Path p = new Path(project);
+        p.setPath("src");
+        javac.setSourcepath(p);
+        final Path mp = new Path(project);
+        p.setPath("modsrc");
+        javac.setModulesourcepath(mp);
     }
 
     @Test
@@ -317,16 +301,11 @@
         }
     }
 
-    @Test
+    @Test(expected = BuildException.class)
     public void testModulesourcepathRequiresDestdir() {
-        try {
-            final Path p = new Path(project);
-            p.setPath("src");
-            javac.setModulesourcepath(p);
-            javac.checkParameters();
-            fail("Build exception should have been thrown - modulesourcepath requires destdir");
-        } catch (BuildException e) {
-            //pass
-        }
+        final Path p = new Path(project);
+        p.setPath("src");
+        javac.setModulesourcepath(p);
+        javac.checkParameters();
     }
 }
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,6 +21,7 @@
 import org.apache.tools.ant.AntAssert;
 import org.apache.tools.ant.BuildFileRule;
 import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.ant.util.JavaEnvUtils;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Rule;
@@ -29,6 +30,7 @@
 import java.io.File;
 
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
 
@@ -48,6 +50,8 @@
 
     @Before
     public void setUp() {
+        /* JAI depends on internal API removed in Java 9 */
+        assumeFalse(JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9));
         buildRule.configureProject(TASKDEFS_DIR + "image.xml");
     }
 
@@ -72,7 +76,7 @@
         buildRule.executeTarget("testSimpleScale");
         AntAssert.assertContains("Processing File", buildRule.getLog());
         File f = new File(buildRule.getOutputDir(), LARGEIMAGE);
-        assumeTrue("Could not change file modificaiton date",
+        assumeTrue("Could not change file modification date",
                 f.setLastModified(f.lastModified() - FILE_UTILS.getFileTimestampGranularity() * 2));
         long lastModified = f.lastModified();
         buildRule.executeTarget("testOverwriteTrue");
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -497,7 +497,7 @@
             assertNotNull(mockProcLauncher.cmd);
             String resCp = null;
             String resMp = null;
-            Set<String> resExports = new TreeSet<String>();
+            Set<String> resExports = new TreeSet<>();
             for (int i = 1; i < mockProcLauncher.cmd.length; i++) {
                 if ("-classpath".equals(mockProcLauncher.cmd[i])) { //NOI18N
                     resCp = mockProcLauncher.cmd[++i];
@@ -554,7 +554,7 @@
             assertNotNull(mockProcLauncher.cmd);
             String resCp = null;
             String resMp = null;
-            Set<String> resExports = new TreeSet<String>();
+            Set<String> resExports = new TreeSet<>();
             for (int i = 1; i < mockProcLauncher.cmd.length; i++) {
                 if ("-classpath".equals(mockProcLauncher.cmd[i])) { //NOI18N
                     resCp = mockProcLauncher.cmd[++i];
@@ -594,8 +594,7 @@
 
         @Override
         public Process exec(Project project, String[] cmd, String[] env, File workingDir) throws IOException {
-            this.cmd = new String[cmd.length];
-            System.arraycopy(cmd, 0, this.cmd, 0, cmd.length);
+            this.cmd = Arrays.copyOf(cmd, cmd.length);
             return new MockProcess();
         }
 
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -254,9 +254,7 @@
     public static class AssertionErrorTest {
         @Test
         public void throwsAssertionError() {
-            AssertionError assertionError = new AssertionError("failure message");
-            assertionError.initCause(new RuntimeException("cause message"));
-            throw assertionError;
+            throw new AssertionError("failure message", new RuntimeException("cause message"));
         }
     }
 }
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/example/jupiter/JupiterSampleTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/example/jupiter/JupiterSampleTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/example/jupiter/JupiterSampleTest.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/example/jupiter/JupiterSampleTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,50 @@
+package org.apache.tools.ant.taskdefs.optional.junitlauncher.example.jupiter;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ *
+ */
+public class JupiterSampleTest {
+
+    private static final String message = "The quick brown fox jumps over the lazy dog";
+
+    @BeforeAll
+    static void beforeAll() {
+    }
+
+    @BeforeEach
+    void beforeEach() {
+    }
+
+    @Test
+    void testSucceeds() {
+        System.out.println(message);
+        System.out.print("<some-other-message>Hello world! <!-- some comment --></some-other-message>");
+    }
+
+    @Test
+    void testFails() {
+        fail("intentionally failing");
+    }
+
+    @Test
+    @Disabled("intentionally skipped")
+    void testSkipped() {
+    }
+
+    @AfterEach
+    void afterEach() {
+    }
+
+    @AfterAll
+    static void afterAll() {
+    }
+}
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTaskTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTaskTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTaskTest.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/JUnitLauncherTaskTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,127 @@
+package org.apache.tools.ant.taskdefs.optional.junitlauncher;
+
+import org.apache.tools.ant.BuildEvent;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.BuildListener;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.ProjectHelper;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.File;
+
+/**
+ * Tests the {@link JUnitLauncherTask}
+ */
+public class JUnitLauncherTaskTest {
+
+    private Project project;
+
+    /**
+     * The JUnit setup method.
+     */
+    @Before
+    public void setUp() {
+        File antFile = new File(System.getProperty("root"), "src/etc/testcases/taskdefs/optional/junitlauncher.xml");
+        this.project = new Project();
+        this.project.init();
+        ProjectHelper.configureProject(project, antFile);
+        project.addBuildListener(new BuildListener() {
+            @Override
+            public void buildStarted(final BuildEvent event) {
+
+            }
+
+            @Override
+            public void buildFinished(final BuildEvent event) {
+
+            }
+
+            @Override
+            public void targetStarted(final BuildEvent event) {
+
+            }
+
+            @Override
+            public void targetFinished(final BuildEvent event) {
+
+            }
+
+            @Override
+            public void taskStarted(final BuildEvent event) {
+
+            }
+
+            @Override
+            public void taskFinished(final BuildEvent event) {
+
+            }
+
+            @Override
+            public void messageLogged(final BuildEvent event) {
+                if (event.getPriority() <= Project.MSG_INFO) {
+                    System.out.println(event.getMessage());
+                }
+            }
+        });
+    }
+
+    /**
+     * Tests that when a test, that's configured with {@code haltOnFailure=true}, stops the build, when the
+     * test fails
+     */
+    @Test
+    public void testFailureStopsBuild() {
+        try {
+            project.executeTarget("test-failure-stops-build");
+            Assert.fail("Test execution failure was expected to stop the build but didn't");
+        } catch (BuildException be) {
+            // expected
+        }
+    }
+
+    /**
+     * Tests that when a test, that's isn't configured with {@code haltOnFailure=true}, continues the
+     * build even when there are test failures
+     */
+    @Test
+    public void testFailureContinuesBuild() {
+        project.executeTarget("test-failure-continues-build");
+    }
+
+
+    /**
+     * Tests the execution of test that's expected to succeed
+     */
+    @Test
+    public void testSuccessfulTests() {
+        project.executeTarget("test-success");
+    }
+
+    /**
+     * Tests execution of a test which is configured to execute only a particular set of test methods
+     */
+    @Test
+    public void testSpecificMethodTest() {
+        project.executeTarget("test-one-specific-method");
+        project.executeTarget("test-multiple-specific-methods");
+    }
+
+    /**
+     * Tests the execution of more than one {@code &lt;test&gt;} elements in the {@code &lt;junitlauncher&gt;} task
+     */
+    @Test
+    public void testMultipleIndividualTests() {
+        project.executeTarget("test-multiple-individual");
+    }
+
+    /**
+     * Tests execution of tests, that have been configured using the {@code &lt;testclasses&gt;} nested element
+     * of the {@code &lt;junitlauncher&gt;} task
+     */
+    @Test
+    public void testTestClasses() {
+        project.executeTarget("test-batch");
+    }
+}
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -129,4 +129,4 @@
         assertEquals(ts1, testFile.lastModified());
     }
 
-}// ReplaceRegExpTest
+}
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,12 +17,14 @@
  */
 package org.apache.tools.ant.taskdefs.optional;
 
+import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.BuildFileRule;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 /**
  * Tests the examples of the &lt;script&gt; task docs.
@@ -64,4 +66,24 @@
         assertTrue(index > -1);
     }
 
+    @Test
+    public void testUseSrcAndEncoding() {
+        final String readerEncoding = "UTF-8";
+        buildRule.getProject().setProperty("useSrcAndEncoding.reader.encoding", readerEncoding);
+        buildRule.executeTarget("useSrcAndEncoding");
+    }
+
+    @Test
+    public void testUseSrcAndEncodingFailure() {
+        final String readerEncoding = "ISO-8859-1";
+        buildRule.getProject().setProperty("useSrcAndEncoding.reader.encoding", readerEncoding);
+        try {
+            buildRule.executeTarget("useSrcAndEncoding");
+            fail("should have failed with reader's encoding [" + readerEncoding
+                    + "] different from the writer's encoding ["
+                    + buildRule.getProject().getProperty("useSrcAndEncoding.encoding") + "]");
+        } catch (BuildException e) {
+            assertTrue(e.getMessage().matches("expected <eacute \\[\u00e9]> but was <eacute \\[\u00c3\u00a9]>"));
+        }
+    }
 }
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/script/ScriptDefTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -140,5 +140,45 @@
             log.indexOf("Attribute value = test") != -1);
     }
 
+    @Test
+    public void testUseSrcAndEncoding() {
+        final String readerEncoding = "UTF-8";
+        buildRule.getProject().setProperty("useSrcAndEncoding.reader.encoding", readerEncoding);
+        buildRule.executeTarget("useSrcAndEncoding");
+    }
+
+    @Test
+    public void testUseSrcAndEncodingFailure() {
+        final String readerEncoding = "ISO-8859-1";
+        buildRule.getProject().setProperty("useSrcAndEncoding.reader.encoding", readerEncoding);
+        try {
+            buildRule.executeTarget("useSrcAndEncoding");
+            fail("should have failed with reader's encoding [" + readerEncoding +
+                "] different from the writer's encoding [" +
+                buildRule.getProject().getProperty("useSrcAndEncoding.encoding") + "]");
+        } catch(BuildException e) {
+            assertTrue(e.getMessage().matches(
+                    "expected <eacute \\[\u00e9]> but was <eacute \\[\u00c3\u00a9]>"));
+        }
+    }
+
+    @Test
+    public void testUseCompiled() {
 
+        final long duration;
+        {
+            long start = System.nanoTime();
+            buildRule.executeTarget("useCompiled");
+            duration = System.nanoTime() - start;
+        }
+
+        final long notCompiledDuration;
+        {
+            long start = System.nanoTime();
+            buildRule.executeTarget("useNotCompiled");
+            notCompiledDuration = System.nanoTime() - start;
+        }
+
+        assertTrue(duration < notCompiledDuration);
+    }
 }
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ssh/ScpTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ssh/ScpTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ssh/ScpTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ssh/ScpTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -150,7 +150,7 @@
     @Test
     public void testMultiResourceCollectionUpload() throws IOException {
         assertNotNull("system property scp.tmp must be set", tempDir);
-        List uploadList = new ArrayList();
+        List<File> uploadList = new ArrayList<>();
         for (int i = 0; i < 5; i++) {
             uploadList.add(createTemporaryFile());
         }
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -35,6 +35,7 @@
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.SymbolicLinkUtils;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Rule;
@@ -46,6 +47,9 @@
 import static org.junit.Assert.fail;
 
 import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 
 /**
  * Test cases for the Symlink task. Link creation, link deletion, recording
@@ -167,6 +171,7 @@
         if (dirlinkRem != null) {
             fail(dirlinkRem);
         }
+
         assertNotNull("Failed to recreate link1",
                       p.getProperty("test.recreate.link1.recreated"));
         assertNotNull("Failed to recreate link2",
@@ -287,6 +292,26 @@
 
     }
 
+    /**
+     * Tests that when {@code symlink} task is used to create a symbolic link and {@code overwrite} option
+     * is {@code false}, then any existing symbolic link at the {@code link} location (whose target is a directory)
+     * doesn't end up create a new symbolic link within the target directory.
+     *
+     *
+     * @throws Exception
+     * @see <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=58683">BZ-58683</a> for more details
+     */
+    @Test
+    public void testOverwriteExistingLink() throws Exception {
+        buildRule.executeTarget("test-overwrite-link");
+        final Project p = buildRule.getProject();
+        final String linkTargetResource = p.getProperty("test.overwrite.link.target.dir");
+        Assert.assertNotNull("Property test.overwrite.link.target.dir is not set", linkTargetResource);
+        final Path targetResourcePath = Paths.get(linkTargetResource);
+        Assert.assertTrue(targetResourcePath + " is not a directory", Files.isDirectory(targetResourcePath));
+        Assert.assertEquals(targetResourcePath + " directory was expected to be empty", 0, Files.list(targetResourcePath).count());
+    }
+
     @After
     public void tearDown() {
         if (buildRule.getProject() != null) {
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/PathConvertTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/PathConvertTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/PathConvertTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/PathConvertTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -57,6 +57,17 @@
         buildRule.executeTarget("testnotargetos");
     }
 
+    /**
+     * Tests that if a {@code mappedresource}, that excludes certain resources, is used in a {@code pathconvert},
+     * then it doesn't lead to a {@link NullPointerException}.
+     *
+     * @see <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=62076">bz-62076</a> for more details
+     */
+    @Test
+    public void testNonMatchingMapper() {
+        buildRule.executeTarget("test-nonmatching-mapper");
+    }
+
     private void test(String target) {
         buildRule.executeTarget(target);
         assertEquals("test#" + BUILD_FILENAME, buildRule.getProject().getProperty("result"));
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/ProtectedJarMethodsTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/ProtectedJarMethodsTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/ProtectedJarMethodsTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/ProtectedJarMethodsTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -21,6 +21,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.tools.ant.BuildFileRule;
 import org.junit.Before;
@@ -50,8 +51,8 @@
     public void testGrabFilesAndDirs() throws IOException {
         buildRule.executeTarget("testIndexTests");
         String archive = buildRule.getProject().getProperty(tempJar);
-        ArrayList dirs = new ArrayList();
-        ArrayList files = new ArrayList();
+        List<String> dirs = new ArrayList<>();
+        List<String> files = new ArrayList<>();
         String[] expectedDirs = new String[] {
             "META-INF/",
             "sub/",
@@ -61,14 +62,14 @@
         };
         Jar.grabFilesAndDirs(archive, dirs, files);
         assertEquals(expectedDirs.length, dirs.size());
-        for (int i = 0; i < expectedDirs.length; i++) {
-            assertTrue("Found " + expectedDirs[i],
-                       dirs.contains(expectedDirs[i]));
+        for (String expectedDir : expectedDirs) {
+            assertTrue("Found " + expectedDir,
+                       dirs.contains(expectedDir));
         }
         assertEquals(expectedFiles.length, files.size());
-        for (int i = 0; i < expectedFiles.length; i++) {
-            assertTrue("Found " + expectedFiles[i],
-                       files.contains(expectedFiles[i]));
+        for (String expectedFile : expectedFiles) {
+            assertTrue("Found " + expectedFile,
+                       files.contains(expectedFile));
         }
     }
 
@@ -81,26 +82,23 @@
 
     @Test
     public void testFindJarNameNoMatch() {
-        assertNull(Jar.findJarName("foo", new String[] {"bar"}));
+        assertNull(Jar.findJarName("foo", new String[] { "bar" }));
     }
 
     @Test
     public void testFindJarNameSimpleMatches() {
-        assertEquals("foo", Jar.findJarName("foo", new String[] {"foo"}));
-        assertEquals("lib/foo", Jar.findJarName("foo",
-                                                new String[] {"lib/foo"}));
-        assertEquals("foo", Jar.findJarName("bar" + File.separatorChar + "foo",
-                                            new String[] {"foo"}));
+        assertEquals("foo", Jar.findJarName("foo", new String[] { "foo" }));
         assertEquals("lib/foo",
-                     Jar.findJarName("bar" + File.separatorChar + "foo",
-                                     new String[] {"lib/foo"}));
+            Jar.findJarName("foo", new String[] { "lib/foo" }));
+        assertEquals("foo", Jar.findJarName("bar" + File.separatorChar + "foo",
+            new String[] { "foo" }));
+        assertEquals("lib/foo", Jar.findJarName(
+            "bar" + File.separatorChar + "foo", new String[] { "lib/foo" }));
     }
 
     @Test
     public void testFindJarNameLongestMatchWins() {
-        assertEquals("lib/foo",
-                     Jar.findJarName("lib/foo",
-                                     new String[] {"foo", "lib/foo",
-                                                   "lib/bar/foo"}));
+        assertEquals("lib/foo", Jar.findJarName("lib/foo",
+            new String[] { "foo", "lib/foo", "lib/bar/foo" }));
     }
 }
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -29,9 +29,10 @@
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
 
 /**
  * Date: 04-Aug-2004
@@ -44,6 +45,9 @@
     @Rule
     public BuildFileRule buildRule = new BuildFileRule();
 
+    @Rule
+    public ExpectedException tried = ExpectedException.none();
+
     /**
      * The JUnit setup method
      */
@@ -198,12 +202,9 @@
      */
     @Test
     public void testBadName() throws Exception {
-        try {
-            buildRule.executeTarget("testBadName");
-            fail("Compile not known");
-        } catch (BuildException ex) {
-            AntAssert.assertContains(RmicAdapterFactory.ERROR_UNKNOWN_COMPILER, ex.getMessage());
-        }
+        tried.expect(BuildException.class);
+        tried.expectMessage(RmicAdapterFactory.ERROR_UNKNOWN_COMPILER);
+        buildRule.executeTarget("testBadName");
     }
 
     /**
@@ -219,12 +220,9 @@
      */
     @Test
     public void testWrongClass() throws Exception {
-        try {
-            buildRule.executeTarget("testWrongClass");
-            fail("Class not an RMIC adapter");
-        } catch (BuildException ex) {
-            AntAssert.assertContains(RmicAdapterFactory.ERROR_NOT_RMIC_ADAPTER, ex.getMessage());
-        }
+        tried.expect(BuildException.class);
+        tried.expectMessage(RmicAdapterFactory.ERROR_NOT_RMIC_ADAPTER);
+        buildRule.executeTarget("testWrongClass");
     }
 
     /**
@@ -232,14 +230,14 @@
      */
     @Test
     public void testDefaultBadClass() throws Exception {
+        tried.expect(BuildException.class);
+        tried.expectMessage(Rmic.ERROR_RMIC_FAILED);
         try {
             buildRule.executeTarget("testDefaultBadClass");
-            fail("expected the class to fail");
-        } catch(BuildException ex) {
-            AntAssert.assertContains(Rmic.ERROR_RMIC_FAILED, ex.getMessage());
+        } finally {
+            // don't look for much text here as it is vendor and version dependent
+            AntAssert.assertContains("unimplemented.class", buildRule.getLog());
         }
-        //dont look for much text here as it is vendor and version dependent
-        AntAssert.assertContains("unimplemented.class", buildRule.getLog());
     }
 
     /**
@@ -247,12 +245,9 @@
      */
     @Test
     public void testMagicProperty() throws Exception {
-        try {
-            buildRule.executeTarget("testMagicProperty");
-            fail("Magic property not working");
-        } catch (BuildException ex) {
-            AntAssert.assertContains(RmicAdapterFactory.ERROR_UNKNOWN_COMPILER, ex.getMessage());
-        }
+        tried.expect(BuildException.class);
+        tried.expectMessage(RmicAdapterFactory.ERROR_UNKNOWN_COMPILER);
+        buildRule.executeTarget("testMagicProperty");
     }
 
     /**
@@ -260,12 +255,9 @@
      */
     @Test
     public void testMagicPropertyOverridesEmptyString() throws Exception {
-        try {
-            buildRule.executeTarget("testMagicPropertyOverridesEmptyString");
-            fail("Magic property not working");
-        } catch (BuildException ex) {
-            AntAssert.assertContains(RmicAdapterFactory.ERROR_UNKNOWN_COMPILER, ex.getMessage());
-        }
+        tried.expect(BuildException.class);
+        tried.expectMessage(RmicAdapterFactory.ERROR_UNKNOWN_COMPILER);
+        buildRule.executeTarget("testMagicPropertyOverridesEmptyString");
     }
 
     @Test
@@ -276,12 +268,9 @@
     @Test
     @Ignore("Previously named to prevent execution")
     public void NotestFailingAdapter() throws Exception {
-        try {
-            buildRule.executeTarget("testFailingAdapter");
-            fail("Expected failures to propagate");
-        } catch (BuildException ex) {
-            AntAssert.assertContains(Rmic.ERROR_RMIC_FAILED, ex.getMessage());
-        }
+        tried.expect(BuildException.class);
+        tried.expectMessage(Rmic.ERROR_RMIC_FAILED);
+        buildRule.executeTarget("testFailingAdapter");
     }
 
     /**
@@ -343,25 +332,22 @@
     }
 
     /**
-     * test that passes -Xnew to sun's rmic.
+     * test that passes -Xnew to sun's rmic running in a different VM.
      *
-     * @throws Exception
+     * @throws Exception if something goes wrong
      */
     @Test
-    public void testXnew() throws Exception {
-        // skipped via unless attribute for JDK > 6
-        buildRule.executeTarget("testXnew");
+    public void testXnewForked() throws Exception {
+        assumeFalse("Current system is Java 9 or newer", JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9));
+        buildRule.executeTarget("testXnewForked");
     }
 
-    /**
-     * test that passes -Xnew to sun's rmic.
-     *
-     * @throws Exception
-     */
     @Test
-    public void testXnewDest() throws Exception {
-        // skipped via unless attribute for JDK > 6
-        buildRule.executeTarget("testXnewDest");
+    public void testXnewForkedJava9plus() throws Exception {
+        assumeTrue("Current system is Java 8 or older", JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9));
+        tried.expect(BuildException.class);
+        tried.expectMessage("JDK9 has removed support for -Xnew");
+        buildRule.executeTarget("testXnewForked");
     }
 
     /**
@@ -370,18 +356,17 @@
      * @throws Exception if something goes wrong
      */
     @Test
-    public void testXnewForked() throws Exception {
-        xnewTest("testXnewForked");
+    public void testXnewForkedDest() throws Exception {
+        assumeFalse("Current system is Java 9 or newer", JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9));
+        buildRule.executeTarget("testXnewForkedDest");
     }
 
-    /**
-     * test that passes -Xnew to sun's rmic running in a different VM.
-     *
-     * @throws Exception if something goes wrong
-     */
     @Test
-    public void testXnewForkedDest() throws Exception {
-        xnewTest("testXnewForkedDest");
+    public void testXnewForkedDestJava9plus() throws Exception {
+        assumeTrue("Current system is Java 8 or older", JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9));
+        tried.expect(BuildException.class);
+        tried.expectMessage("JDK9 has removed support for -Xnew");
+        buildRule.executeTarget("testXnewForkedDest");
     }
 
     /**
@@ -391,7 +376,16 @@
      */
     @Test
     public void testXnewCompiler() throws Exception {
-        xnewTest("testXnewCompiler");
+        assumeFalse("Current system is Java 9 or newer", JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9));
+        buildRule.executeTarget("testXnewCompiler");
+    }
+
+    @Test
+    public void testXnewCompilerJava9plus() throws Exception {
+        assumeTrue("Current system is Java 8 or older", JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9));
+        tried.expect(BuildException.class);
+        tried.expectMessage("JDK9 has removed support for -Xnew");
+        buildRule.executeTarget("testXnewCompiler");
     }
 
     /**
@@ -401,7 +395,16 @@
      */
     @Test
     public void testXnewCompilerDest() throws Exception {
-        xnewTest("testXnewCompilerDest");
+        assumeFalse("Current system is Java 9 or newer", JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9));
+        buildRule.executeTarget("testXnewCompilerDest");
+    }
+
+    @Test
+    public void testXnewCompilerDestJava9plus() throws Exception {
+        assumeTrue("Current system is Java 8 or older", JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9));
+        tried.expect(BuildException.class);
+        tried.expectMessage("JDK9 has removed support for -Xnew");
+        buildRule.executeTarget("testXnewCompilerDest");
     }
 
     /**
@@ -411,6 +414,15 @@
      */
     @Test
     public void testIDL() throws Exception {
+        assumeFalse("Current system is Java 11 or newer", JavaEnvUtils.isAtLeastJavaVersion("11"));
+        buildRule.executeTarget("testIDL");
+    }
+
+    @Test
+    public void testIDLJava11plus() throws Exception {
+        assumeTrue("Current system is Java 10 or older", JavaEnvUtils.isAtLeastJavaVersion("11"));
+        tried.expect(BuildException.class);
+        tried.expectMessage("this rmic implementation doesn't support the -idl switch");
         buildRule.executeTarget("testIDL");
     }
 
@@ -421,9 +433,18 @@
      */
     @Test
     public void testIDLDest() throws Exception {
+        assumeFalse("Current system is Java 11 or newer", JavaEnvUtils.isAtLeastJavaVersion("11"));
         buildRule.executeTarget("testIDLDest");
     }
 
+    @Test
+    public void testIDLDestJava11plus() throws Exception {
+        assumeTrue("Current system is Java 10 or older", JavaEnvUtils.isAtLeastJavaVersion("11"));
+        tried.expect(BuildException.class);
+        tried.expectMessage("this rmic implementation doesn't support the -idl switch");
+        buildRule.executeTarget("testIDL");
+   }
+
     /**
      * test that verifies that IIOP compiles.
      *
@@ -431,6 +452,15 @@
      */
     @Test
     public void testIIOP() throws Exception {
+        assumeFalse("Current system is Java 11 or newer", JavaEnvUtils.isAtLeastJavaVersion("11"));
+        buildRule.executeTarget("testIIOP");
+    }
+
+    @Test
+    public void testIIOPJava11plus() throws Exception {
+        assumeTrue("Current system is Java 10 or older", JavaEnvUtils.isAtLeastJavaVersion("11"));
+        tried.expect(BuildException.class);
+        tried.expectMessage("this rmic implementation doesn't support the -iiop switch");
         buildRule.executeTarget("testIIOP");
     }
 
@@ -441,20 +471,16 @@
      */
     @Test
     public void testIIOPDest() throws Exception {
+        assumeFalse("Current system is Java 11 or newer", JavaEnvUtils.isAtLeastJavaVersion("11"));
         buildRule.executeTarget("testIIOPDest");
     }
 
-    private void xnewTest(String target) {
-        if (!JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)) {
-            buildRule.executeTarget(target);
-        } else {
-            try {
-                buildRule.executeTarget(target);
-                fail("Target should have thrown a BuildException");
-            } catch (BuildException ex) {
-                assertEquals("JDK9 has removed support for -Xnew", ex.getMessage());
-            }
-        }
+    @Test
+    public void testIIOPDestJava11plus() throws Exception {
+        assumeTrue("Current system is Java 10 or older", JavaEnvUtils.isAtLeastJavaVersion("11"));
+        tried.expect(BuildException.class);
+        tried.expectMessage("this rmic implementation doesn't support the -iiop switch");
+        buildRule.executeTarget("testIIOP");
     }
 
     /**
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/taskdefs/SignJarTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -22,7 +22,6 @@
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.BuildFileRule;
-import org.apache.tools.ant.util.JavaEnvUtils;
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Rule;
@@ -106,7 +105,6 @@
 
     @Test
     public void testTsaLocalhost() {
-        Assume.assumeTrue("Only runs on Java 1.5+", JavaEnvUtils.getJavaVersionNumber()>=15);
         try {
             buildRule.executeTarget("testTsaLocalhost");
             fail("Should have thrown exception - no TSA at localhost:0");
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/types/MapperTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/types/MapperTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/types/MapperTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/types/MapperTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -35,6 +35,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -224,6 +225,9 @@
         List list = Arrays.asList(targets);
         assertTrue("cannot find expected target \"def\"", list.contains("def"));
         assertTrue("cannot find expected target \"ghi\"", list.contains("ghi"));
+
+        targets = fileNameMapper.mapFileName("z");
+        assertNull(targets);
     }
 
     @Test
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/types/resources/LazyResourceCollectionTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/types/resources/LazyResourceCollectionTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/types/resources/LazyResourceCollectionTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/types/resources/LazyResourceCollectionTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -18,7 +18,6 @@
 package org.apache.tools.ant.types.resources;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
@@ -34,33 +33,36 @@
 public class LazyResourceCollectionTest {
 
     private class StringResourceCollection implements ResourceCollection {
-        List resources = Arrays.<Resource>asList();
-
-        List createdIterators = new ArrayList();
+        List<StringResourceIterator> createdIterators = new ArrayList<>();
 
+        @Override
         public int size() {
-            return resources.size();
+            return 3;
         }
 
+        @Override
         public Iterator<Resource> iterator() {
             StringResourceIterator it = new StringResourceIterator();
             createdIterators.add(it);
             return it;
         }
 
+        @Override
         public boolean isFilesystemOnly() {
             return false;
         }
     }
 
-    private class StringResourceIterator implements Iterator {
+    private class StringResourceIterator implements Iterator<Resource> {
         int cursor = 0;
 
+        @Override
         public void remove() {
             throw new UnsupportedOperationException();
         }
 
-        public Object next() {
+        @Override
+        public StringResource next() {
             if (cursor < 3) {
                 cursor++;
                 return new StringResource("r" + cursor);
@@ -68,6 +70,7 @@
             return null;
         }
 
+        @Override
         public boolean hasNext() {
             return cursor < 3;
         }
@@ -81,27 +84,24 @@
 
         Iterator<Resource> it = lazyCollection.iterator();
         assertOneCreatedIterator(collectionTest);
-        StringResourceIterator stringResourceIterator = (StringResourceIterator) collectionTest.createdIterators.get(0);
+        StringResourceIterator stringResourceIterator = collectionTest.createdIterators.get(0);
         assertEquals("A resource was loaded without iterating", 1,
-                stringResourceIterator.cursor);
+            stringResourceIterator.cursor);
 
-        StringResource r = (StringResource) it.next();
+        assertStringValue("r1", it.next());
         assertOneCreatedIterator(collectionTest);
-        assertEquals("r1", r.getValue());
         assertEquals("Iterating once load more than 1 resource", 2,
-                stringResourceIterator.cursor);
+            stringResourceIterator.cursor);
 
-        r = (StringResource) it.next();
+        assertStringValue("r2", it.next());
         assertOneCreatedIterator(collectionTest);
-        assertEquals("r2", r.getValue());
         assertEquals("Iterating twice load more than 2 resources", 3,
-                stringResourceIterator.cursor);
+            stringResourceIterator.cursor);
 
-        r = (StringResource) it.next();
+        assertStringValue("r3", it.next());
         assertOneCreatedIterator(collectionTest);
-        assertEquals("r3", r.getValue());
         assertEquals("Iterating 3 times load more than 3 resources", 3,
-                stringResourceIterator.cursor);
+            stringResourceIterator.cursor);
 
         try {
             it.next();
@@ -129,39 +129,36 @@
         Iterator<Resource> it2 = lazyCollection.iterator();
         assertOneCreatedIterator(collectionTest);
 
-        StringResourceIterator stringResourceIterator = (StringResourceIterator) collectionTest.createdIterators.get(0);
+        StringResourceIterator stringResourceIterator = collectionTest.createdIterators.get(0);
         assertEquals("A resource was loaded without iterating", 1,
-                stringResourceIterator.cursor);
+            stringResourceIterator.cursor);
 
-        StringResource r = (StringResource) it1.next();
-        assertEquals("r1", r.getValue());
+        assertStringValue("r1", it1.next());
         assertEquals("Iterating once load more than 1 resource", 2,
-                stringResourceIterator.cursor);
+            stringResourceIterator.cursor);
 
-        r = (StringResource) it2.next();
-        assertEquals("r1", r.getValue());
-        assertEquals("The second iterator did not lookup in the cache for a resource",
-                2, stringResourceIterator.cursor);
+        assertStringValue("r1", it2.next());
+        assertEquals(
+            "The second iterator did not lookup in the cache for a resource", 2,
+            stringResourceIterator.cursor);
 
-        r = (StringResource) it2.next();
-        assertEquals("r2", r.getValue());
+        assertStringValue("r2", it2.next());
         assertEquals("Iterating twice load more than 2 resources", 3,
-                stringResourceIterator.cursor);
+            stringResourceIterator.cursor);
 
-        r = (StringResource) it1.next();
-        assertEquals("r2", r.getValue());
-        assertEquals("The first iterator did not lookup in the cache for a resource",
-                3, stringResourceIterator.cursor);
+        assertStringValue("r2", it1.next());
+        assertEquals(
+            "The first iterator did not lookup in the cache for a resource", 3,
+            stringResourceIterator.cursor);
 
-        r = (StringResource) it2.next();
-        assertEquals("r3", r.getValue());
+        assertStringValue("r3", it2.next());
         assertEquals("Iterating 3 times load more than 3 resources", 3,
-                stringResourceIterator.cursor);
+            stringResourceIterator.cursor);
 
-        r = (StringResource) it1.next();
-        assertEquals("r3", r.getValue());
-        assertEquals("The first iterator did not lookup in the cache for a resource",
-                3, stringResourceIterator.cursor);
+        assertStringValue("r3", it1.next());
+        assertEquals(
+            "The first iterator did not lookup in the cache for a resource", 3,
+            stringResourceIterator.cursor);
 
         try {
             it1.next();
@@ -177,4 +174,8 @@
             // ok
         }
     }
+
+    private void assertStringValue(String expected, Resource r) {
+        assertEquals(expected, r.as(StringResource.class).getValue());
+    }
 }
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/types/selectors/OwnedBySelectorTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/types/selectors/OwnedBySelectorTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/types/selectors/OwnedBySelectorTest.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/types/selectors/OwnedBySelectorTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,53 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package org.apache.tools.ant.types.selectors;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.attribute.UserPrincipal;
+
+import org.apache.tools.ant.taskdefs.condition.Os;
+import org.junit.Assume;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+public class OwnedBySelectorTest {
+
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
+
+    @Test
+    public void ownedByIsTrueForSelf() throws Exception {
+        // at least on Jenkins the file is owned by "BUILTIN\Administrators"
+        Assume.assumeFalse(Os.isFamily("windows"));
+        String self = System.getProperty("user.name");
+        File file = folder.newFile("f.txt");
+        UserPrincipal user = Files.getOwner(file.toPath());
+        assertEquals(self, user.getName());
+
+        OwnedBySelector s = new OwnedBySelector();
+        s.setOwner(self);
+        assertTrue(s.isSelected(null, null, file));
+    }
+
+}
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -106,8 +106,7 @@
         String javaHomeParent = FILE_UTILS.normalize(javaHome + "/..").getAbsolutePath();
         assertTrue(j + " is normalized and in the JDK dir", j.startsWith(javaHomeParent));
 
-        if ((Os.isFamily("mac") && JavaEnvUtils.getJavaVersionNumber() <= JavaEnvUtils.VERSION_1_6)
-            || JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)) {
+        if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)) {
             assertTrue(j + " is normalized and in the JRE dir", j.startsWith(javaHome));
         } else {
             assertTrue(j + " is normalized and not in the JRE dir", !j.startsWith(javaHome));
@@ -139,4 +138,5 @@
         assertTrue(JavaEnvUtils.isJavaVersion("10"));
         assertTrue(JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9));
     }
+
 }
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/util/PermissionUtilsTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/util/PermissionUtilsTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/util/PermissionUtilsTest.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/util/PermissionUtilsTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,160 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package org.apache.tools.ant.util;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.attribute.PosixFileAttributeView;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.EnumSet;
+import java.util.Set;
+
+import org.apache.tools.ant.types.resources.FileResource;
+import org.apache.tools.ant.types.resources.TarResource;
+import org.apache.tools.ant.types.resources.ZipResource;
+import org.apache.tools.tar.TarEntry;
+import org.apache.tools.tar.TarOutputStream;
+import org.apache.tools.zip.ZipEntry;
+import org.apache.tools.zip.ZipOutputStream;
+import org.junit.Assume;
+import org.junit.Test;
+
+public class PermissionUtilsTest {
+
+    @Test
+    public void modeFromPermissionsReturnsExpectedResult() {
+        int mode = PermissionUtils.modeFromPermissions(EnumSet.of(PosixFilePermission.OWNER_READ,
+                                                                  PosixFilePermission.OWNER_WRITE,
+                                                                  PosixFilePermission.OWNER_EXECUTE),
+                                                       PermissionUtils.FileType.REGULAR_FILE);
+        assertEquals("100700", Integer.toString(mode, 8));
+    }
+
+    @Test
+    public void permissionsFromModeReturnsExpectedResult() {
+        Set<PosixFilePermission> s = PermissionUtils.permissionsFromMode(0100753);
+        assertEquals(EnumSet.of(PosixFilePermission.OWNER_READ,
+                                PosixFilePermission.OWNER_WRITE,
+                                PosixFilePermission.OWNER_EXECUTE,
+                                PosixFilePermission.GROUP_READ,
+                                PosixFilePermission.GROUP_EXECUTE,
+                                PosixFilePermission.OTHERS_WRITE,
+                                PosixFilePermission.OTHERS_EXECUTE),
+                     s);
+    }
+
+    @Test
+    public void detectsFileTypeOfRegularFileFromPath() throws IOException {
+        File f = File.createTempFile("ant", ".tst");
+        f.deleteOnExit();
+        assertEquals(PermissionUtils.FileType.REGULAR_FILE,
+                     PermissionUtils.FileType.of(f.toPath()));
+    }
+
+    @Test
+    public void detectsFileTypeOfRegularFileFromResource() throws IOException {
+        File f = File.createTempFile("ant", ".tst");
+        f.deleteOnExit();
+        assertEquals(PermissionUtils.FileType.REGULAR_FILE,
+                     PermissionUtils.FileType.of(new FileResource(f)));
+    }
+
+    @Test
+    public void detectsFileTypeOfDirectoryFromPath() throws IOException {
+        File f = File.createTempFile("ant", ".dir");
+        f.delete();
+        f.mkdirs();
+        f.deleteOnExit();
+        assertEquals(PermissionUtils.FileType.DIR,
+                     PermissionUtils.FileType.of(f.toPath()));
+    }
+
+    @Test
+    public void detectsFileTypeOfDirectoryFromResource() throws IOException {
+        File f = File.createTempFile("ant", ".tst");
+        f.delete();
+        f.mkdirs();
+        f.deleteOnExit();
+        assertEquals(PermissionUtils.FileType.DIR,
+                     PermissionUtils.FileType.of(new FileResource(f)));
+    }
+
+    @Test
+    public void getSetPermissionsWorksForFiles() throws IOException {
+        File f = File.createTempFile("ant", ".tst");
+        f.deleteOnExit();
+        Assume.assumeNotNull(Files.getFileAttributeView(f.toPath(),
+                                                        PosixFileAttributeView.class));
+        Set<PosixFilePermission> s =
+            EnumSet.of(PosixFilePermission.OWNER_READ,
+                       PosixFilePermission.OWNER_WRITE,
+                       PosixFilePermission.OWNER_EXECUTE,
+                       PosixFilePermission.GROUP_READ);
+        PermissionUtils.setPermissions(new FileResource(f), s, null);
+        assertEquals(s, PermissionUtils.getPermissions(new FileResource(f), null));
+    }
+
+    @Test
+    public void getSetPermissionsWorksForZipResources() throws IOException {
+        File f = File.createTempFile("ant", ".zip");
+        f.deleteOnExit();
+        try (ZipOutputStream os = new ZipOutputStream(f)) {
+            ZipEntry e = new ZipEntry("foo");
+            os.putNextEntry(e);
+            os.closeEntry();
+        }
+
+        ZipResource r = new ZipResource();
+        r.setName("foo");
+        r.setArchive(f);
+        Set<PosixFilePermission> s =
+            EnumSet.of(PosixFilePermission.OWNER_READ,
+                       PosixFilePermission.OWNER_WRITE,
+                       PosixFilePermission.OWNER_EXECUTE,
+                       PosixFilePermission.GROUP_READ);
+        PermissionUtils.setPermissions(r, s, null);
+        assertEquals(s, PermissionUtils.getPermissions(r, null));
+    }
+
+    @Test
+    public void getSetPermissionsWorksForTarResources() throws IOException {
+        File f = File.createTempFile("ant", ".zip");
+        f.deleteOnExit();
+        try (TarOutputStream os = new TarOutputStream(new FileOutputStream(f))) {
+            TarEntry e = new TarEntry("foo");
+            os.putNextEntry(e);
+            os.closeEntry();
+        }
+
+        TarResource r = new TarResource();
+        r.setName("foo");
+        r.setArchive(f);
+        Set<PosixFilePermission> s =
+            EnumSet.of(PosixFilePermission.OWNER_READ,
+                       PosixFilePermission.OWNER_WRITE,
+                       PosixFilePermission.OWNER_EXECUTE,
+                       PosixFilePermission.GROUP_READ);
+        PermissionUtils.setPermissions(r, s, null);
+        assertEquals(s, PermissionUtils.getPermissions(r, null));
+    }
+}
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/util/ReaderInputStreamTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/util/ReaderInputStreamTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/util/ReaderInputStreamTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/util/ReaderInputStreamTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -127,9 +127,7 @@
     @SuppressWarnings("resource")
     private void compareBytes(String s, String encoding) throws Exception {
         byte[] expected = s.getBytes(encoding);
-
-        ReaderInputStream r = new ReaderInputStream(
-            new StringReader(s), encoding);
+        ReaderInputStream r = new ReaderInputStream(new StringReader(s), encoding);
         for (int i = 0; i < expected.length; ++i) {
             int expect = expected[i] & 0xFF;
             int read = r.read();
diff -Nru ant-1.9.10/src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java ant-1.10.3/src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java
--- ant-1.9.10/src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -17,14 +17,17 @@
  */
 package org.apache.tools.ant.util;
 
-import java.util.Vector;
-
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Vector;
+
+import org.junit.Test;
+
 /**
  * Test for StringUtils
  */
@@ -33,7 +36,7 @@
     @Test
     public void testSplit() {
         final String data = "a,b,,";
-        Vector res = StringUtils.split(data, ',');
+        Vector<String> res = StringUtils.split(data, ',');
         assertEquals(4, res.size());
         assertEquals("a", res.elementAt(0));
         assertEquals("b", res.elementAt(1));
@@ -44,7 +47,7 @@
     @Test
     public void testSplitLines() {
         final String data = "a\r\nb\nc\nd\ne";
-        Vector res = StringUtils.lineSplit(data);
+        Vector<String> res = StringUtils.lineSplit(data);
         assertEquals(5, res.size());
         assertEquals("a\r", res.elementAt(0));
         assertEquals("b", res.elementAt(1));
@@ -53,6 +56,7 @@
         assertEquals("e", res.elementAt(4));
     }
 
+    @SuppressWarnings("deprecation")
     @Test
     public void testReplace() {
         final String data = "abcabcabca";
@@ -143,13 +147,11 @@
         assertEquals(
             "Does not remove the suffix right.",
             prefix + name,
-            StringUtils.removeSuffix(input, suffix)
-        );
+            StringUtils.removeSuffix(input, suffix));
         assertEquals(
             "Should leave the string unattended.",
             prefix + name + suffix,
-            StringUtils.removeSuffix(input, "bla")
-        );
+            StringUtils.removeSuffix(input, "bla"));
     }
 
     @Test
@@ -158,15 +160,56 @@
         String name = "Name";
         String suffix = "Suffix";
         String input = prefix + name + suffix;
-        assertEquals(
-            "Does not remove the prefix right.",
+        assertEquals("Does not remove the prefix right.",
             name + suffix,
-            StringUtils.removePrefix(input, prefix)
-        );
-        assertEquals(
-            "Should leave the string unattended.",
+            StringUtils.removePrefix(input, prefix));
+        assertEquals("Should leave the string unattended.",
             prefix + name + suffix,
-            StringUtils.removePrefix(input, "bla")
-        );
+            StringUtils.removePrefix(input, "bla"));
+    }
+
+    @Test
+    public void testJoin() {
+        assertEquals("a, b, c", StringUtils.join(Arrays.asList("a", "b", "c"), ", "));
+    }
+
+    @Test
+    public void testJoinEmptyArray() {
+        assertEquals("", StringUtils.join(new String[] {}, ", "));
+    }
+
+    @Test
+    public void testJoinNullCollection() {
+        assertEquals("", StringUtils.join((Collection<String>) null, ", "));
+    }
+
+    @Test
+    public void testJoinNullArray() {
+        assertEquals("", StringUtils.join((String[]) null, ", "));
+    }
+
+    @Test
+    public void testJoinNullSeparator() {
+        assertEquals("abc", StringUtils.join(Arrays.asList("a", "b", "c"), null));
+    }
+
+    @Test
+    public void testTrimToNullWithNullInput() {
+        assertNull(StringUtils.trimToNull(null));
+    }
+
+    @Test
+    public void testTrimToNullWithEmptyInput() {
+        assertNull(StringUtils.trimToNull(""));
+    }
+
+    @Test
+    public void testTrimToNullWithBlankSpaceInput() {
+        assertNull(StringUtils.trimToNull("   "));
+    }
+
+    @Test
+    public void testTrimToNullWithInputPaddedWithSpace() {
+        assertEquals("aaBcDeF", StringUtils.trimToNull(" aaBcDeF  "));
     }
 }
diff -Nru ant-1.9.10/src/tests/junit/org/example/junitlauncher/vintage/AlwaysFailingJUnit4Test.java ant-1.10.3/src/tests/junit/org/example/junitlauncher/vintage/AlwaysFailingJUnit4Test.java
--- ant-1.9.10/src/tests/junit/org/example/junitlauncher/vintage/AlwaysFailingJUnit4Test.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/example/junitlauncher/vintage/AlwaysFailingJUnit4Test.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,16 @@
+package org.example.junitlauncher.vintage;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class AlwaysFailingJUnit4Test {
+
+    @Test
+    public void testWillFail() throws Exception {
+        Assert.assertEquals("Values weren't equal", 3, 4);
+    }
+}
diff -Nru ant-1.9.10/src/tests/junit/org/example/junitlauncher/vintage/JUnit4SampleTest.java ant-1.10.3/src/tests/junit/org/example/junitlauncher/vintage/JUnit4SampleTest.java
--- ant-1.9.10/src/tests/junit/org/example/junitlauncher/vintage/JUnit4SampleTest.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tests/junit/org/example/junitlauncher/vintage/JUnit4SampleTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,25 @@
+package org.example.junitlauncher.vintage;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class JUnit4SampleTest {
+
+    @Test
+    public void testFoo() {
+        Assert.assertEquals(1, 1);
+    }
+
+    @Test
+    public void testBar() throws Exception {
+        Assert.assertTrue(true);
+    }
+
+    @Test
+    public void testFooBar() {
+        Assert.assertFalse(false);
+    }
+}
diff -Nru ant-1.9.10/src/tutorial/hello-world/01-simple/build.xml ant-1.10.3/src/tutorial/hello-world/01-simple/build.xml
--- ant-1.9.10/src/tutorial/hello-world/01-simple/build.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/hello-world/01-simple/build.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project name="HelloWorld" basedir="." default="main">
+
+    <property name="src.dir"     value="src"/>
+
+    <property name="build.dir"   value="build"/>
+    <property name="classes.dir" value="${build.dir}/classes"/>
+    <property name="jar.dir"     value="${build.dir}/jar"/>
+
+    <property name="main-class"  value="oata.HelloWorld"/>
+
+    <target name="clean">
+        <delete dir="${build.dir}"/>
+    </target>
+
+    <target name="compile">
+        <mkdir dir="${classes.dir}"/>
+        <javac includeantruntime="false" srcdir="${src.dir}" destdir="${classes.dir}"/>
+    </target>
+
+    <target name="jar" depends="compile">
+        <mkdir dir="${jar.dir}"/>
+        <jar destfile="${jar.dir}/${ant.project.name}.jar" basedir="${classes.dir}">
+            <manifest>
+                <attribute name="Main-Class" value="${main-class}"/>
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="run" depends="jar">
+        <java jar="${jar.dir}/${ant.project.name}.jar" fork="true"/>
+    </target>
+
+    <target name="clean-build" depends="clean,jar"/>
+
+    <target name="main" depends="clean,run"/>
+
+</project>
diff -Nru ant-1.9.10/src/tutorial/hello-world/01-simple/src/oata/HelloWorld.java ant-1.10.3/src/tutorial/hello-world/01-simple/src/oata/HelloWorld.java
--- ant-1.9.10/src/tutorial/hello-world/01-simple/src/oata/HelloWorld.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/hello-world/01-simple/src/oata/HelloWorld.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,24 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+package oata;
+
+public class HelloWorld {
+    public static void main(String[] args) {
+        System.out.println("Hello World");
+    }
+}
diff -Nru ant-1.9.10/src/tutorial/hello-world/02-logging/build.xml ant-1.10.3/src/tutorial/hello-world/02-logging/build.xml
--- ant-1.9.10/src/tutorial/hello-world/02-logging/build.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/hello-world/02-logging/build.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project name="HelloWorld" basedir="." default="main">
+
+    <property name="src.dir"     value="src"/>
+
+    <property name="build.dir"   value="build"/>
+    <property name="classes.dir" value="${build.dir}/classes"/>
+    <property name="jar.dir"     value="${build.dir}/jar"/>
+    <property name="lib.dir"     value="lib"/>
+
+    <path id="classpath">
+        <fileset dir="${lib.dir}" includes="**/*.jar"/>
+    </path>
+
+    <property name="main-class"  value="oata.HelloWorld"/>
+
+    <target name="clean">
+        <delete dir="${build.dir}"/>
+    </target>
+
+    <target name="compile">
+        <mkdir dir="${classes.dir}"/>
+        <javac includeantruntime="false" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath"/>
+    </target>
+
+    <target name="jar" depends="compile">
+        <mkdir dir="${jar.dir}"/>
+        <jar destfile="${jar.dir}/${ant.project.name}.jar" basedir="${classes.dir}">
+            <manifest>
+                <attribute name="Main-Class" value="${main-class}"/>
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="run" depends="jar">
+        <java classname="${main-class}" fork="true">
+            <classpath>
+                <path refid="classpath"/>
+                <path location="${jar.dir}/${ant.project.name}.jar"/>
+            </classpath>
+        </java>
+    </target>
+
+    <target name="clean-build" depends="clean,jar"/>
+
+    <target name="main" depends="clean,run"/>
+
+</project>
diff -Nru ant-1.9.10/src/tutorial/hello-world/02-logging/src/oata/HelloWorld.java ant-1.10.3/src/tutorial/hello-world/02-logging/src/oata/HelloWorld.java
--- ant-1.9.10/src/tutorial/hello-world/02-logging/src/oata/HelloWorld.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/hello-world/02-logging/src/oata/HelloWorld.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+package oata;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.BasicConfigurator;
+
+public class HelloWorld {
+    static Logger logger = Logger.getLogger(HelloWorld.class);
+
+    public static void main(String[] args) {
+        BasicConfigurator.configure();
+        logger.info("Hello World");          // the old System.out-statement
+    }
+}
diff -Nru ant-1.9.10/src/tutorial/hello-world/03-testing/build.xml ant-1.10.3/src/tutorial/hello-world/03-testing/build.xml
--- ant-1.9.10/src/tutorial/hello-world/03-testing/build.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/hello-world/03-testing/build.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project name="HelloWorld" basedir="." default="main">
+
+    <property name="src.dir"     value="src"/>
+
+    <property name="build.dir"   value="build"/>
+    <property name="classes.dir" value="${build.dir}/classes"/>
+    <property name="jar.dir"     value="${build.dir}/jar"/>
+    <property name="lib.dir"     value="lib"/>
+
+    <path id="application" location="${jar.dir}/${ant.project.name}.jar"/>
+    <path id="classpath">
+        <fileset dir="${lib.dir}" includes="**/*.jar"/>
+    </path>
+
+    <property name="main-class"  value="oata.HelloWorld"/>
+
+    <target name="clean">
+        <delete dir="${build.dir}"/>
+    </target>
+
+    <target name="compile">
+        <mkdir dir="${classes.dir}"/>
+        <javac includeantruntime="false" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath"/>
+        <copy todir="${classes.dir}">
+            <fileset dir="${src.dir}" excludes="**/*.java"/>
+        </copy>
+    </target>
+
+    <target name="jar" depends="compile">
+        <mkdir dir="${jar.dir}"/>
+        <jar destfile="${jar.dir}/${ant.project.name}.jar" basedir="${classes.dir}">
+            <manifest>
+                <attribute name="Main-Class" value="${main-class}"/>
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="run" depends="jar">
+        <java classname="${main-class}" fork="true">
+            <classpath>
+                <path refid="classpath"/>
+                <path refid="application"/>
+            </classpath>
+        </java>
+    </target>
+
+    <target name="junit" depends="jar">
+        <junit printsummary="yes">
+            <classpath>
+                <path refid="classpath"/>
+                <path refid="application"/>
+            </classpath>
+
+            <batchtest fork="yes">
+                <fileset dir="${src.dir}" includes="**/*Test.java"/>
+            </batchtest>
+        </junit>
+    </target>
+
+    <target name="clean-build" depends="clean,jar"/>
+
+    <target name="main" depends="clean,run"/>
+
+</project>
diff -Nru ant-1.9.10/src/tutorial/hello-world/03-testing/src/log4j.properties ant-1.10.3/src/tutorial/hello-world/03-testing/src/log4j.properties
--- ant-1.9.10/src/tutorial/hello-world/03-testing/src/log4j.properties	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/hello-world/03-testing/src/log4j.properties	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+log4j.rootLogger=DEBUG, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%m%n
diff -Nru ant-1.9.10/src/tutorial/hello-world/03-testing/src/oata/HelloWorld.java ant-1.10.3/src/tutorial/hello-world/03-testing/src/oata/HelloWorld.java
--- ant-1.9.10/src/tutorial/hello-world/03-testing/src/oata/HelloWorld.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/hello-world/03-testing/src/oata/HelloWorld.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+package oata;
+
+import org.apache.log4j.Logger;
+
+public class HelloWorld {
+    static Logger logger = Logger.getLogger(HelloWorld.class);
+
+    public static void main(String[] args) {
+        logger.info("Hello World");          // the old System.out-statement
+    }
+}
diff -Nru ant-1.9.10/src/tutorial/hello-world/03-testing/src/oata/HelloWorldTest.java ant-1.10.3/src/tutorial/hello-world/03-testing/src/oata/HelloWorldTest.java
--- ant-1.9.10/src/tutorial/hello-world/03-testing/src/oata/HelloWorldTest.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/hello-world/03-testing/src/oata/HelloWorldTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+package oata;
+
+import org.junit.Test;
+
+import static org.junit.Assert.fail;
+
+public class HelloWorldTest {
+
+    @Test
+    public void testNothing() {
+    }
+
+    @Test
+    public void testWillAlwaysFail() {
+        fail("An error message");
+    }
+
+}
diff -Nru ant-1.9.10/src/tutorial/hello-world/final/build.xml ant-1.10.3/src/tutorial/hello-world/final/build.xml
--- ant-1.9.10/src/tutorial/hello-world/final/build.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/hello-world/final/build.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project name="HelloWorld" basedir="." default="main">
+
+    <property name="src.dir"     value="src"/>
+
+    <property name="build.dir"   value="build"/>
+    <property name="classes.dir" value="${build.dir}/classes"/>
+    <property name="jar.dir"     value="${build.dir}/jar"/>
+    <property name="lib.dir"     value="lib"/>
+    <property name="report.dir"  value="${build.dir}/junitreport"/>
+
+    <path id="application" location="${jar.dir}/${ant.project.name}.jar"/>
+    <path id="classpath">
+        <fileset dir="${lib.dir}" includes="**/*.jar"/>
+    </path>
+
+    <property name="main-class"  value="oata.HelloWorld"/>
+
+    <target name="clean">
+        <delete dir="${build.dir}"/>
+    </target>
+
+    <target name="compile">
+        <mkdir dir="${classes.dir}"/>
+        <javac includeantruntime="false" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath"/>
+        <copy todir="${classes.dir}">
+            <fileset dir="${src.dir}" excludes="**/*.java"/>
+        </copy>
+    </target>
+
+    <target name="jar" depends="compile">
+        <mkdir dir="${jar.dir}"/>
+        <jar destfile="${jar.dir}/${ant.project.name}.jar" basedir="${classes.dir}">
+            <manifest>
+                <attribute name="Main-Class" value="${main-class}"/>
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="run" depends="jar">
+        <java classname="${main-class}" fork="true">
+            <classpath>
+                <path refid="classpath"/>
+                <path refid="application"/>
+            </classpath>
+        </java>
+    </target>
+
+    <target name="junit" depends="jar">
+        <mkdir dir="${report.dir}"/>
+        <junit printsummary="yes" tempdir="${build.dir}">
+            <classpath>
+                <path refid="classpath"/>
+                <path refid="application"/>
+            </classpath>
+
+            <formatter type="xml"/>
+
+            <batchtest fork="yes" todir="${report.dir}">
+                <fileset dir="${src.dir}" includes="**/*Test.java"/>
+            </batchtest>
+        </junit>
+    </target>
+
+    <target name="junitreport">
+        <junitreport todir="${report.dir}">
+            <fileset dir="${report.dir}" includes="TEST-*.xml"/>
+            <report todir="${report.dir}"/>
+        </junitreport>
+    </target>
+
+    <target name="clean-build" depends="clean,jar"/>
+
+    <target name="main" depends="clean,run"/>
+
+</project>
diff -Nru ant-1.9.10/src/tutorial/hello-world/final/src/log4j.properties ant-1.10.3/src/tutorial/hello-world/final/src/log4j.properties
--- ant-1.9.10/src/tutorial/hello-world/final/src/log4j.properties	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/hello-world/final/src/log4j.properties	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+log4j.rootLogger=DEBUG, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%m%n
diff -Nru ant-1.9.10/src/tutorial/hello-world/final/src/oata/HelloWorld.java ant-1.10.3/src/tutorial/hello-world/final/src/oata/HelloWorld.java
--- ant-1.9.10/src/tutorial/hello-world/final/src/oata/HelloWorld.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/hello-world/final/src/oata/HelloWorld.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,28 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+package oata;
+
+import org.apache.log4j.Logger;
+
+public class HelloWorld {
+    static Logger logger = Logger.getLogger(HelloWorld.class);
+
+    public static void main(String[] args) {
+        logger.info("Hello World");          // the old System.out-statement
+    }
+}
diff -Nru ant-1.9.10/src/tutorial/hello-world/final/src/oata/HelloWorldTest.java ant-1.10.3/src/tutorial/hello-world/final/src/oata/HelloWorldTest.java
--- ant-1.9.10/src/tutorial/hello-world/final/src/oata/HelloWorldTest.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/hello-world/final/src/oata/HelloWorldTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+package oata;
+
+import org.junit.Test;
+
+import static org.junit.Assert.fail;
+
+public class HelloWorldTest {
+
+    @Test
+    public void testNothing() {
+    }
+
+    @Test
+    public void testWillAlwaysFail() {
+        fail("An error message");
+    }
+
+}
diff -Nru ant-1.9.10/src/tutorial/tasks-filesets-properties/01-propertyaccess/build.xml ant-1.10.3/src/tutorial/tasks-filesets-properties/01-propertyaccess/build.xml
--- ant-1.9.10/src/tutorial/tasks-filesets-properties/01-propertyaccess/build.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/tasks-filesets-properties/01-propertyaccess/build.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project name="FindTask" basedir="." default="test">
+
+    <property name="src.dir"     value="src"/>
+    <property name="classes.dir" value="classes"/>
+
+    <property name="ant.test.lib" value="ant-testutil.jar"/>
+    <property name="report.dir"   value="report"/>
+    <property name="junit.out.dir.xml"  value="${report.dir}/junit/xml"/>
+    <property name="junit.out.dir.html" value="${report.dir}/junit/html"/>
+
+    <path id="classpath.run">
+        <path path="${java.class.path}"/>
+        <path location="${ant.project.name}.jar"/>
+    </path>
+
+    <path id="classpath.test">
+        <path refid="classpath.run"/>
+        <path location="${ant.test.lib}"/>
+    </path>
+
+    <target name="clean" description="Delete all generated files">
+        <delete failonerror="false" includeEmptyDirs="true">
+            <fileset dir="." includes="${ant.project.name}.jar"/>
+            <fileset dir="${classes.dir}"/>
+            <fileset dir="${report.dir}"/>
+        </delete>
+    </target>
+
+    <target name="compile" description="Compiles the Task">
+        <mkdir dir="${classes.dir}"/>
+        <javac srcdir="${src.dir}" destdir="${classes.dir}" classpath="${ant.test.lib}"/>
+    </target>
+
+    <target name="jar" description="JARs the Task" depends="compile">
+        <jar destfile="${ant.project.name}.jar" basedir="${classes.dir}"/>
+    </target>
+
+    <target name="use.init" description="Taskdef the Find-Task" depends="jar">
+        <taskdef name="find" classname="Find" classpath="${ant.project.name}.jar"/>
+    </target>
+
+    <target name="use.simple" depends="use.init">
+        <find property="test" value="test-value"/>
+        <find print="test"/>
+    </target>
+
+    <target name="junit" description="Runs the unit tests" depends="jar">
+        <delete dir="${junit.out.dir.xml}" />
+        <mkdir  dir="${junit.out.dir.xml}" />
+        <junit printsummary="yes" haltonfailure="no">
+            <classpath refid="classpath.test"/>
+            <formatter type="xml"/>
+            <batchtest fork="yes" todir="${junit.out.dir.xml}">
+                <fileset dir="${src.dir}" includes="**/*Test.java"/>
+            </batchtest>
+        </junit>
+    </target>
+
+    <target name="junitreport" description="Create a report for the rest result">
+        <mkdir dir="${junit.out.dir.html}" />
+        <junitreport todir="${junit.out.dir.html}">
+            <fileset dir="${junit.out.dir.xml}">
+                <include name="*.xml"/>
+            </fileset>
+            <report format="frames" todir="${junit.out.dir.html}"/>
+        </junitreport>
+    </target>
+
+    <target name="test"
+            depends="junit,junitreport"
+            description="Runs unit tests and creates a report"/>
+
+</project>
diff -Nru ant-1.9.10/src/tutorial/tasks-filesets-properties/01-propertyaccess/src/Find.java ant-1.10.3/src/tutorial/tasks-filesets-properties/01-propertyaccess/src/Find.java
--- ant-1.9.10/src/tutorial/tasks-filesets-properties/01-propertyaccess/src/Find.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/tasks-filesets-properties/01-propertyaccess/src/Find.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,50 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.BuildException;
+
+public class Find extends Task {
+
+    private String property;
+    private String value;
+    private String print;
+
+    public void setProperty(String property) {
+        this.property = property;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public void setPrint(String print) {
+        this.print = print;
+    }
+
+    public void execute() {
+        if (print != null) {
+            String propValue = getProject().getProperty(print);
+            log(propValue);
+        } else {
+            if (property == null) throw new BuildException("property not set");
+            if (value    == null) throw new BuildException("value not set");
+            getProject().setNewProperty(property, value);
+        }
+    }
+
+}
diff -Nru ant-1.9.10/src/tutorial/tasks-filesets-properties/01-propertyaccess/src/FindTest.java ant-1.10.3/src/tutorial/tasks-filesets-properties/01-propertyaccess/src/FindTest.java
--- ant-1.9.10/src/tutorial/tasks-filesets-properties/01-propertyaccess/src/FindTest.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/tasks-filesets-properties/01-propertyaccess/src/FindTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+import org.apache.tools.ant.BuildFileRule;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class FindTest {
+
+    @Rule
+    public BuildFileRule rule = new BuildFileRule();
+
+    @Before
+    public void setUp() {
+        rule.configureProject("build.xml");
+    }
+
+    @Test
+    public void testSimple() {
+        rule.executeTarget("use.simple");
+        assertEquals("test-value", rule.getLog());
+    }
+}
diff -Nru ant-1.9.10/src/tutorial/tasks-filesets-properties/02-fileset/build.xml ant-1.10.3/src/tutorial/tasks-filesets-properties/02-fileset/build.xml
--- ant-1.9.10/src/tutorial/tasks-filesets-properties/02-fileset/build.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/tasks-filesets-properties/02-fileset/build.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project name="FindTask" basedir="." default="test">
+
+    <property name="src.dir"     value="src"/>
+    <property name="classes.dir" value="classes"/>
+
+    <property name="ant.test.lib" value="ant-testutil.jar"/>
+    <property name="report.dir"   value="report"/>
+    <property name="junit.out.dir.xml"  value="${report.dir}/junit/xml"/>
+    <property name="junit.out.dir.html" value="${report.dir}/junit/html"/>
+
+    <path id="classpath.run">
+        <path path="${java.class.path}"/>
+        <path location="${ant.project.name}.jar"/>
+    </path>
+
+    <path id="classpath.test">
+        <path refid="classpath.run"/>
+        <path location="${ant.test.lib}"/>
+    </path>
+
+    <target name="clean" description="Delete all generated files">
+        <delete failonerror="false" includeEmptyDirs="true">
+            <fileset dir="." includes="${ant.project.name}.jar"/>
+            <fileset dir="${classes.dir}"/>
+            <fileset dir="${report.dir}"/>
+        </delete>
+    </target>
+
+    <target name="compile" description="Compiles the Task">
+        <mkdir dir="${classes.dir}"/>
+        <javac srcdir="${src.dir}" destdir="${classes.dir}" classpath="${ant.test.lib}"/>
+    </target>
+
+    <target name="jar" description="JARs the Task" depends="compile">
+        <jar destfile="${ant.project.name}.jar" basedir="${classes.dir}"/>
+    </target>
+
+    <target name="use.init" description="Taskdef the Find-Task" depends="jar">
+        <taskdef name="find" classname="Find" classpath="${ant.project.name}.jar"/>
+    </target>
+
+    <target name="use.simple" depends="use.init">
+        <find file="ant.jar" location="location.ant-jar">
+            <fileset dir="${ant.home}" includes="**/*.jar"/>
+        </find>
+    </target>
+
+    <target name="testFileNotPresent" depends="use.init">
+        <find file="a-not-existing-file.jar" location="location.ant-jar">
+            <fileset dir="${ant.home}" includes="**/*.jar"/>
+        </find>
+    </target>
+
+    <target name="testFilePresent" depends="use.init">
+        <find file="ant.jar" location="location.ant-jar">
+            <fileset dir="${ant.home}" includes="**/*.jar"/>
+        </find>
+    </target>
+
+    <target name="junit" description="Runs the unit tests" depends="jar">
+        <delete dir="${junit.out.dir.xml}" />
+        <mkdir  dir="${junit.out.dir.xml}" />
+        <junit printsummary="yes" haltonfailure="no">
+            <classpath refid="classpath.test"/>
+            <sysproperty key="ant.home" value="${ant.home}"/>
+            <formatter type="xml"/>
+            <batchtest fork="yes" todir="${junit.out.dir.xml}">
+                <fileset dir="${src.dir}" includes="**/*Test.java"/>
+            </batchtest>
+        </junit>
+    </target>
+
+    <target name="junitreport" description="Create a report for the rest result">
+        <mkdir dir="${junit.out.dir.html}" />
+        <junitreport todir="${junit.out.dir.html}">
+            <fileset dir="${junit.out.dir.xml}">
+                <include name="*.xml"/>
+            </fileset>
+            <report format="frames" todir="${junit.out.dir.html}"/>
+        </junitreport>
+    </target>
+
+    <target name="test" depends="jar">
+        <junit printsummary="no" haltonfailure="no">
+            <classpath refid="classpath.test"/>
+            <sysproperty key="ant.home" value="${ant.home}"/>
+            <formatter type="brief" usefile="false"/>
+            <batchtest fork="true" todir="${junit.out.dir.xml}">
+                <fileset dir="${src.dir}" includes="**/*Test.java"/>
+            </batchtest>
+        </junit>
+    </target>
+
+    <target name="test2"
+            depends="junit,junitreport"
+            description="Runs unit tests and creates a report"/>
+
+</project>
diff -Nru ant-1.9.10/src/tutorial/tasks-filesets-properties/02-fileset/src/Find.java ant-1.10.3/src/tutorial/tasks-filesets-properties/02-fileset/src/Find.java
--- ant-1.9.10/src/tutorial/tasks-filesets-properties/02-fileset/src/Find.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/tasks-filesets-properties/02-fileset/src/Find.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,71 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.DirectoryScanner;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.io.File;
+
+public class Find extends Task {
+
+    private String file;
+    private String location;
+    private List<FileSet> filesets = new ArrayList<>();
+
+    public void setFile(String file) {
+        this.file = file;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public void addFileset(FileSet fileset) {
+        filesets.add(fileset);
+    }
+
+    protected void validate() {
+        if (file == null) throw new BuildException("file not set");
+        if (location == null) throw new BuildException("location not set");
+        if (filesets.size() < 1) throw new BuildException("fileset not set");
+    }
+
+    public void execute2() {
+        validate();
+        String foundLocation = null;
+        for (FileSet fs : filesets) {
+            DirectoryScanner ds = fs.getDirectoryScanner(getProject());
+            String[] includedFiles = ds.getIncludedFiles();
+            for (String includedFile : includedFiles) {
+                String filename = includedFile.replace('\\','/');
+                filename = filename.substring(filename.lastIndexOf("/") + 1);
+                if (foundLocation == null && file.equals(filename)) {
+                    File base  = ds.getBasedir();
+                    File found = new File(base, includedFile);
+                    foundLocation = found.getAbsolutePath();
+                }
+            }
+        }
+        if (foundLocation != null)
+            getProject().setNewProperty(location, foundLocation);
+    }
+
+}
diff -Nru ant-1.9.10/src/tutorial/tasks-filesets-properties/02-fileset/src/FindTest.java ant-1.10.3/src/tutorial/tasks-filesets-properties/02-fileset/src/FindTest.java
--- ant-1.9.10/src/tutorial/tasks-filesets-properties/02-fileset/src/FindTest.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/tasks-filesets-properties/02-fileset/src/FindTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,84 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.BuildFileRule;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+public class FindTest {
+
+    @Rule
+    public BuildFileRule rule = new BuildFileRule();
+
+    @Rule
+    public ExpectedException tried = ExpectedException.none();
+
+    @Before
+    public void setUp() {
+        rule.configureProject("build.xml");
+    }
+
+    @Test
+    public void testMissingFile() {
+        tried.expect(BuildException.class);
+        tried.expectMessage("file not set");
+        Find find = new Find();
+        find.execute();
+    }
+
+    @Test
+    public void testMissingLocation() {
+        tried.expect(BuildException.class);
+        tried.expectMessage("location not set");
+        Find find = new Find();
+        find.setFile("ant.jar");
+        find.execute();
+    }
+
+    @Test
+    public void testMissingFileset() {
+        tried.expect(BuildException.class);
+        tried.expectMessage("fileset not set");
+        Find find = new Find();
+        find.setFile("ant.jar");
+        find.setLocation("location.ant-jar");
+        find.execute();
+    }
+
+    @Test
+    public void testFileNotPresent() {
+        rule.executeTarget("testFileNotPresent");
+        String result = rule.getProject().getProperty("location.ant-jar");
+        assertNull("Property set to wrong value.", result);
+    }
+
+    @Test
+    public void testFilePresent() {
+        rule.executeTarget("testFilePresent");
+        String result = rule.getProject().getProperty("location.ant-jar");
+        assertNotNull("Property not set.", result);
+        assertTrue("Wrong file found.", result.endsWith("ant.jar"));
+    }
+
+}
diff -Nru ant-1.9.10/src/tutorial/tasks-filesets-properties/03-paths/build.xml ant-1.10.3/src/tutorial/tasks-filesets-properties/03-paths/build.xml
--- ant-1.9.10/src/tutorial/tasks-filesets-properties/03-paths/build.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/tasks-filesets-properties/03-paths/build.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project name="FindTask" basedir="." default="test">
+
+    <property name="src.dir"     value="src"/>
+    <property name="classes.dir" value="classes"/>
+
+    <property name="ant.test.lib" value="ant-testutil.jar"/>
+    <property name="report.dir"   value="report"/>
+    <property name="junit.out.dir.xml"  value="${report.dir}/junit/xml"/>
+    <property name="junit.out.dir.html" value="${report.dir}/junit/html"/>
+
+    <path id="classpath.run">
+        <path path="${java.class.path}"/>
+        <path location="${ant.project.name}.jar"/>
+    </path>
+
+    <path id="classpath.test">
+        <path refid="classpath.run"/>
+        <path location="${ant.test.lib}"/>
+    </path>
+
+    <target name="clean" description="Delete all generated files">
+        <delete failonerror="false" includeEmptyDirs="true">
+            <fileset dir="." includes="${ant.project.name}.jar"/>
+            <fileset dir="${classes.dir}"/>
+            <fileset dir="${report.dir}"/>
+        </delete>
+    </target>
+
+    <target name="compile" description="Compiles the Task">
+        <mkdir dir="${classes.dir}"/>
+        <javac srcdir="${src.dir}" destdir="${classes.dir}" classpath="${ant.test.lib}"/>
+    </target>
+
+    <target name="jar" description="JARs the Task" depends="compile">
+        <jar destfile="${ant.project.name}.jar" basedir="${classes.dir}"/>
+    </target>
+
+    <target name="use.init" description="Taskdef the Find-Task" depends="jar">
+        <taskdef name="find" classname="Find" classpath="${ant.project.name}.jar"/>
+    </target>
+
+    <target name="use.simple" depends="use.init">
+        <find file="ant.jar" location="location.ant-jar">
+            <path>
+                <fileset dir="${ant.home}" includes="**/*.jar"/>
+            </path>
+        </find>
+        <echo>ant.jar found on ${location.ant-jar}</echo>
+    </target>
+
+    <target name="testFileNotPresent" depends="use.init">
+        <find file="a-not-existing-file.jar" location="location.ant-jar">
+            <path>
+                <fileset dir="${ant.home}" includes="**/*.jar"/>
+            </path>
+        </find>
+    </target>
+
+    <target name="testFilePresent" depends="use.init">
+        <find file="ant.jar" location="location.ant-jar">
+            <path>
+                <fileset dir="${ant.home}" includes="**/*.jar"/>
+            </path>
+        </find>
+    </target>
+
+    <target name="junit" description="Runs the unit tests" depends="jar">
+        <delete dir="${junit.out.dir.xml}" />
+        <mkdir  dir="${junit.out.dir.xml}" />
+        <junit printsummary="yes" haltonfailure="no">
+            <classpath refid="classpath.test"/>
+            <sysproperty key="ant.home" value="${ant.home}"/>
+            <formatter type="xml"/>
+            <batchtest fork="yes" todir="${junit.out.dir.xml}">
+                <fileset dir="${src.dir}" includes="**/*Test.java"/>
+            </batchtest>
+        </junit>
+    </target>
+
+    <target name="junitreport" description="Create a report for the rest result">
+        <mkdir dir="${junit.out.dir.html}" />
+        <junitreport todir="${junit.out.dir.html}">
+            <fileset dir="${junit.out.dir.xml}">
+                <include name="*.xml"/>
+            </fileset>
+            <report format="frames" todir="${junit.out.dir.html}"/>
+        </junitreport>
+    </target>
+
+    <target name="test" depends="jar">
+        <junit printsummary="no" haltonfailure="no">
+            <classpath refid="classpath.test"/>
+            <sysproperty key="ant.home" value="${ant.home}"/>
+            <formatter type="brief" usefile="false"/>
+            <batchtest fork="true" todir="${junit.out.dir.xml}">
+                <fileset dir="${src.dir}" includes="**/*Test.java"/>
+            </batchtest>
+        </junit>
+    </target>
+
+    <target name="test2"
+            depends="junit,junitreport"
+            description="Runs unit tests and creates a report"/>
+
+</project>
diff -Nru ant-1.9.10/src/tutorial/tasks-filesets-properties/03-paths/src/Find.java ant-1.10.3/src/tutorial/tasks-filesets-properties/03-paths/src/Find.java
--- ant-1.9.10/src/tutorial/tasks-filesets-properties/03-paths/src/Find.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/tasks-filesets-properties/03-paths/src/Find.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,65 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Path;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Find extends Task {
+
+    private String file;
+    private String location;
+    private List<Path> paths = new ArrayList<>();
+
+    public void setFile(String file) {
+        this.file = file;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public void addPath(Path path) {
+        paths.add(path);
+    }
+
+    protected void validate() {
+        if (file == null) throw new BuildException("file not set");
+        if (location == null) throw new BuildException("location not set");
+        if (paths.size() < 1) throw new BuildException("path not set");
+    }
+
+    public void execute() {
+        validate();
+        String foundLocation = null;
+        for (Path path : paths) {
+            for (String includedFile : path.list()) {
+                String filename = includedFile.replace('\\','/');
+                filename = filename.substring(filename.lastIndexOf("/") + 1);
+                if (foundLocation == null && file.equals(filename)) {
+                    foundLocation = includedFiles[i];
+                }
+            }
+        }
+        if (foundLocation != null)
+            getProject().setNewProperty(location, foundLocation);
+    }
+
+}
diff -Nru ant-1.9.10/src/tutorial/tasks-filesets-properties/03-paths/src/FindTest.java ant-1.10.3/src/tutorial/tasks-filesets-properties/03-paths/src/FindTest.java
--- ant-1.9.10/src/tutorial/tasks-filesets-properties/03-paths/src/FindTest.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/tasks-filesets-properties/03-paths/src/FindTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,84 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.BuildFileRule;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+public class FindTest {
+
+    @Rule
+    public BuildFileRule rule = new BuildFileRule();
+
+    @Rule
+    public ExpectedException tried = ExpectedException.none();
+
+    @Before
+    public void setUp() {
+        rule.configureProject("build.xml");
+    }
+
+    @Test
+    public void testMissingFile() {
+        tried.expect(BuildException.class);
+        tried.expectMessage("file not set");
+        Find find = new Find();
+        find.execute();
+    }
+
+    @Test
+    public void testMissingLocation() {
+        tried.expect(BuildException.class);
+        tried.expectMessage("location not set");
+        Find find = new Find();
+        find.setFile("ant.jar");
+        find.execute();
+    }
+
+    @Test
+    public void testMissingPath() {
+        tried.expect(BuildException.class);
+        tried.expectMessage("path not set");
+        Find find = new Find();
+        find.setFile("ant.jar");
+        find.setLocation("location.ant-jar");
+        find.execute();
+    }
+
+    @Test
+    public void testFileNotPresent() {
+        rule.executeTarget("testFileNotPresent");
+        String result = rule.getProject().getProperty("location.ant-jar");
+        assertNull("Property set to wrong value.", result);
+    }
+
+    @Test
+    public void testFilePresent() {
+        rule.executeTarget("testFilePresent");
+        String result = rule.getProject().getProperty("location.ant-jar");
+        assertNotNull("Property not set.", result);
+        assertTrue("Wrong file found.", result.endsWith("ant.jar"));
+    }
+
+}
diff -Nru ant-1.9.10/src/tutorial/tasks-filesets-properties/04-lists/build.xml ant-1.10.3/src/tutorial/tasks-filesets-properties/04-lists/build.xml
--- ant-1.9.10/src/tutorial/tasks-filesets-properties/04-lists/build.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/tasks-filesets-properties/04-lists/build.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project name="FindTask" basedir="." default="test">
+
+    <property name="src.dir"     value="src"/>
+    <property name="classes.dir" value="classes"/>
+
+    <property name="ant.test.lib" value="ant-testutil.jar"/>
+    <property name="report.dir"   value="report"/>
+    <property name="junit.out.dir.xml"  value="${report.dir}/junit/xml"/>
+    <property name="junit.out.dir.html" value="${report.dir}/junit/html"/>
+
+    <path id="classpath.run">
+        <path path="${java.class.path}"/>
+        <path location="${ant.project.name}.jar"/>
+    </path>
+
+    <path id="classpath.test">
+        <path refid="classpath.run"/>
+        <path location="${ant.test.lib}"/>
+    </path>
+
+    <target name="clean" description="Delete all generated files">
+        <delete failonerror="false" includeEmptyDirs="true">
+            <fileset dir="." includes="${ant.project.name}.jar"/>
+            <fileset dir="${classes.dir}"/>
+            <fileset dir="${report.dir}"/>
+        </delete>
+    </target>
+
+    <target name="compile" description="Compiles the Task">
+        <mkdir dir="${classes.dir}"/>
+        <javac srcdir="${src.dir}" destdir="${classes.dir}" classpath="${ant.test.lib}"/>
+    </target>
+
+    <target name="jar" description="JARs the Task" depends="compile">
+        <jar destfile="${ant.project.name}.jar" basedir="${classes.dir}"/>
+    </target>
+
+    <target name="use.init" description="Taskdef the Find-Task" depends="jar">
+        <taskdef name="find" classname="Find" classpath="${ant.project.name}.jar"/>
+    </target>
+
+    <target name="use.simple" depends="use.init">
+        <find file="ant.jar" location="location.ant-jar">
+            <path>
+                <fileset dir="${ant.home}" includes="**/*.jar"/>
+                <fileset dir="c:/seu" includes="ant*/**/*.jar"/>
+            </path>
+        </find>
+        <echo>ant.jar found on ${location.ant-jar}</echo>
+    </target>
+
+    <target name="use.simple2" depends="use.init">
+        <find file="ant.jar" location="location.ant-jar" delimiter=";">
+            <path>
+                <fileset dir="${ant.home}" includes="**/*.jar"/>
+                <fileset dir="c:/seu" includes="ant*/**/*.jar"/>
+            </path>
+        </find>
+        <echo>ant.jar found on ${location.ant-jar}</echo>
+    </target>
+
+    <target name="testFileNotPresent" depends="use.init">
+        <find file="a-not-existing-file.jar" location="location.ant-jar">
+            <path>
+                <fileset dir="${ant.home}" includes="**/*.jar"/>
+            </path>
+        </find>
+    </target>
+
+    <target name="testFilePresent" depends="use.init">
+        <find file="ant.jar" location="location.ant-jar">
+            <path>
+                <fileset dir="${ant.home}" includes="**/*.jar"/>
+            </path>
+        </find>
+    </target>
+
+    <target name="test.init">
+        <mkdir dir="test1/dir11/dir111"/>
+        <mkdir dir="test1/dir11/dir112"/>
+        <mkdir dir="test1/dir12/"/>
+        <mkdir dir="test1/dir13/dir131"/>
+        <mkdir dir="test1/dir13/dir132"/>
+        <touch file="test1/dir11/dir111/test"/>
+        <touch file="test1/dir11/dir111/not"/>
+        <touch file="test1/dir11/dir111/not2"/>
+        <touch file="test1/dir11/dir112/test"/>
+        <touch file="test1/dir11/dir112/not"/>
+        <touch file="test1/dir11/dir112/not2"/>
+        <touch file="test1/dir12/test"/>
+        <touch file="test1/dir12/not"/>
+        <touch file="test1/dir12/not2"/>
+        <touch file="test1/dir13/dir131/test"/>
+        <touch file="test1/dir13/dir131/not"/>
+        <touch file="test1/dir13/dir131/not2"/>
+        <touch file="test1/dir13/dir132/test"/>
+        <touch file="test1/dir13/dir132/not"/>
+        <touch file="test1/dir13/dir132/not2"/>
+        <mkdir dir="test2"/>
+        <copy todir="test2">
+            <fileset dir="test1"/>
+        </copy>
+    </target>
+
+    <target name="testMultipleFiles" depends="use.init,test.init">
+        <touch file="test1/dir11/dir111/test"/>
+        <find file="test" location="location.test" delimiter=";">
+            <path>
+                <fileset dir="test1"/>
+                <fileset dir="test2"/>
+            </path>
+        </find>
+        <delete>
+            <fileset dir="test1"/>
+            <fileset dir="test2"/>
+        </delete>
+    </target>
+
+    <target name="junit" description="Runs the unit tests" depends="jar">
+        <delete dir="${junit.out.dir.xml}" />
+        <mkdir  dir="${junit.out.dir.xml}" />
+        <junit printsummary="yes" haltonfailure="no">
+            <classpath refid="classpath.test"/>
+            <sysproperty key="ant.home" value="${ant.home}"/>
+            <formatter type="xml"/>
+            <batchtest fork="yes" todir="${junit.out.dir.xml}">
+                <fileset dir="${src.dir}" includes="**/*Test.java"/>
+            </batchtest>
+        </junit>
+    </target>
+
+    <target name="junitreport" description="Create a report for the rest result">
+        <mkdir dir="${junit.out.dir.html}" />
+        <junitreport todir="${junit.out.dir.html}">
+            <fileset dir="${junit.out.dir.xml}">
+                <include name="*.xml"/>
+            </fileset>
+            <report format="frames" todir="${junit.out.dir.html}"/>
+        </junitreport>
+    </target>
+
+    <target name="test" depends="jar">
+        <junit printsummary="no" haltonfailure="no">
+            <classpath refid="classpath.test"/>
+            <sysproperty key="ant.home" value="${ant.home}"/>
+            <formatter type="brief" usefile="false"/>
+            <batchtest fork="true" todir="${junit.out.dir.xml}">
+                <fileset dir="${src.dir}" includes="**/*Test.java"/>
+            </batchtest>
+        </junit>
+    </target>
+
+    <target name="test2"
+            depends="junit,junitreport"
+            description="Runs unit tests and creates a report"/>
+
+</project>
diff -Nru ant-1.9.10/src/tutorial/tasks-filesets-properties/04-lists/src/Find.java ant-1.10.3/src/tutorial/tasks-filesets-properties/04-lists/src/Find.java
--- ant-1.9.10/src/tutorial/tasks-filesets-properties/04-lists/src/Find.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/tasks-filesets-properties/04-lists/src/Find.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,94 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Path;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Find extends Task {
+
+    // =====  internal attributes  =====
+
+    private List<String> foundFiles = new ArrayList<>();
+
+    // =====  attribute support  =====
+
+    private String file;
+    private String location;
+    private List<Path> paths = new ArrayList<>();
+    private String delimiter = null;
+
+    public void setFile(String file) {
+        this.file = file;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public void addPath(Path path) {
+        paths.add(path);
+    }
+
+    public void setDelimiter(String delim) {
+        delimiter = delim;
+    }
+
+    // =====  the tasks work  =====
+
+    protected void validate() {
+        if (file == null) throw new BuildException("file not set");
+        if (location == null) throw new BuildException("location not set");
+        if (paths.isEmpty()) throw new BuildException("path not set");
+    }
+
+    public void execute() {
+        validate();
+        for (Path path : paths) {
+            for (String includedFile : path.list()) {
+                String filename = includedFile.replace('\\','/');
+                filename = filename.substring(filename.lastIndexOf("/") + 1);
+                if (file.equals(filename) && !foundFiles.contains(includedFile)) {
+                    foundFiles.add(includedFile);
+                }
+            }
+        }
+        String rv = null;
+        if (!foundFiles.isEmpty()) {
+            if (delimiter == null) {
+                // only the first
+                rv = foundFiles.get(0);
+            } else {
+                // create list
+                StringBuilder list = new StringBuilder();
+                for (String file : foundFiles) {
+                    if (list.length() > 0) list.append(delimiter);
+                    list.append(file);
+                }
+                rv = list.toString();
+            }
+        }
+
+
+        if (rv != null)
+            getProject().setNewProperty(location, rv);
+    }
+
+}
diff -Nru ant-1.9.10/src/tutorial/tasks-filesets-properties/04-lists/src/FindTest.java ant-1.10.3/src/tutorial/tasks-filesets-properties/04-lists/src/FindTest.java
--- ant-1.9.10/src/tutorial/tasks-filesets-properties/04-lists/src/FindTest.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/tasks-filesets-properties/04-lists/src/FindTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,92 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.BuildFileRule;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+public class FindTest {
+
+    @Rule
+    public BuildFileRule rule = new BuildFileRule();
+
+    @Rule
+    public ExpectedException tried = ExpectedException.none();
+
+    @Before
+    public void setUp() {
+        rule.configureProject("build.xml");
+    }
+
+    @Test
+    public void testMissingFile() {
+        tried.expect(BuildException.class);
+        tried.expectMessage("file not set");
+        Find find = new Find();
+        find.execute();
+    }
+
+    @Test
+    public void testMissingLocation() {
+        tried.expect(BuildException.class);
+        tried.expectMessage("location not set");
+        Find find = new Find();
+        find.setFile("ant.jar");
+        find.execute();
+    }
+
+    @Test
+    public void testMissingPath() {
+        tried.expect(BuildException.class);
+        tried.expectMessage("path not set");
+        Find find = new Find();
+        find.setFile("ant.jar");
+        find.setLocation("location.ant-jar");
+        find.execute();
+    }
+
+    @Test
+    public void testFileNotPresent() {
+        rule.executeTarget("testFileNotPresent");
+        String result = rule.getProject().getProperty("location.ant-jar");
+        assertNull("Property set to wrong value.", result);
+    }
+
+    public void testFilePresent() {
+        rule.executeTarget("testFilePresent");
+        String result = rule.getProject().getProperty("location.ant-jar");
+        assertNotNull("Property not set.", result);
+        assertTrue("Wrong file found.", result.endsWith("ant.jar"));
+    }
+
+
+    public void testMultipleFiles() {
+        rule.executeTarget("testMultipleFiles");
+        String result = rule.getProject().getProperty("location.test");
+        assertNotNull("Property not set.", result);
+        assertTrue("Only one file found.", result.contains(";"));
+        //assertTrue("Wrong file found.", result.endsWith("ant.jar"));
+    }
+
+}
diff -Nru ant-1.9.10/src/tutorial/tasks-filesets-properties/final/build.xml ant-1.10.3/src/tutorial/tasks-filesets-properties/final/build.xml
--- ant-1.9.10/src/tutorial/tasks-filesets-properties/final/build.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/tasks-filesets-properties/final/build.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project name="FindTask" basedir="." default="test">
+
+    <property name="src.dir"     value="src"/>
+    <property name="classes.dir" value="classes"/>
+
+    <property name="ant.test.lib" value="ant-testutil.jar"/>
+    <property name="report.dir"   value="report"/>
+    <property name="junit.out.dir.xml"  value="${report.dir}/junit/xml"/>
+    <property name="junit.out.dir.html" value="${report.dir}/junit/html"/>
+
+    <path id="classpath.run">
+        <path path="${java.class.path}"/>
+        <path location="${ant.project.name}.jar"/>
+    </path>
+
+    <path id="classpath.test">
+        <path refid="classpath.run"/>
+        <path location="${ant.test.lib}"/>
+    </path>
+
+    <target name="clean" description="Delete all generated files">
+        <delete failonerror="false" includeEmptyDirs="true">
+            <fileset dir="." includes="${ant.project.name}.jar"/>
+            <fileset dir="${classes.dir}"/>
+            <fileset dir="${report.dir}"/>
+        </delete>
+    </target>
+
+    <target name="compile" description="Compiles the Task">
+        <mkdir dir="${classes.dir}"/>
+        <javac includeantruntime="true" srcdir="${src.dir}" destdir="${classes.dir}" classpath="${ant.test.lib}"/>
+    </target>
+
+    <target name="jar" description="JARs the Task" depends="compile">
+        <jar destfile="${ant.project.name}.jar" basedir="${classes.dir}"/>
+    </target>
+
+    <target name="use.init" description="Taskdef the Find-Task" depends="jar">
+        <taskdef name="find" classname="Find" classpath="${ant.project.name}.jar"/>
+    </target>
+
+    <target name="use.simple" depends="use.init">
+        <find file="ant.jar" location="location.ant-jar">
+            <path>
+                <fileset dir="${ant.home}" includes="**/*.jar"/>
+                <fileset dir="c:/seu" includes="ant*/**/*.jar"/>
+            </path>
+        </find>
+        <echo>ant.jar found on ${location.ant-jar}</echo>
+    </target>
+
+    <target name="use.simple2" depends="use.init">
+        <find file="ant.jar" location="location.ant-jar" delimiter=";">
+            <path>
+                <fileset dir="${ant.home}" includes="**/*.jar"/>
+                <fileset dir="c:/seu" includes="ant*/**/*.jar"/>
+            </path>
+        </find>
+        <echo>ant.jar found on ${location.ant-jar}</echo>
+    </target>
+
+    <target name="testFileNotPresent" depends="use.init">
+        <find file="a-not-existing-file.jar" location="location.ant-jar">
+            <path>
+                <fileset dir="${ant.home}" includes="**/*.jar"/>
+            </path>
+        </find>
+    </target>
+
+    <target name="testFilePresent" depends="use.init">
+        <find file="ant.jar" location="location.ant-jar">
+            <path>
+                <fileset dir="${ant.home}" includes="**/*.jar"/>
+            </path>
+        </find>
+    </target>
+
+    <target name="test.init">
+        <mkdir dir="test1/dir11/dir111"/>
+        <mkdir dir="test1/dir11/dir112"/>
+        <mkdir dir="test1/dir12/"/>
+        <mkdir dir="test1/dir13/dir131"/>
+        <mkdir dir="test1/dir13/dir132"/>
+        <touch file="test1/dir11/dir111/test"/>
+        <touch file="test1/dir11/dir111/not"/>
+        <touch file="test1/dir11/dir111/not2"/>
+        <touch file="test1/dir11/dir112/test"/>
+        <touch file="test1/dir11/dir112/not"/>
+        <touch file="test1/dir11/dir112/not2"/>
+        <touch file="test1/dir12/test"/>
+        <touch file="test1/dir12/not"/>
+        <touch file="test1/dir12/not2"/>
+        <touch file="test1/dir13/dir131/test"/>
+        <touch file="test1/dir13/dir131/not"/>
+        <touch file="test1/dir13/dir131/not2"/>
+        <touch file="test1/dir13/dir132/test"/>
+        <touch file="test1/dir13/dir132/not"/>
+        <touch file="test1/dir13/dir132/not2"/>
+        <mkdir dir="test2"/>
+        <copy todir="test2">
+            <fileset dir="test1"/>
+        </copy>
+    </target>
+
+    <target name="testMultipleFiles" depends="use.init,test.init">
+        <touch file="test1/dir11/dir111/test"/>
+        <find file="test" location="location.test" delimiter=";">
+            <path>
+                <fileset dir="test1"/>
+                <fileset dir="test2"/>
+            </path>
+        </find>
+        <delete>
+            <fileset dir="test1"/>
+            <fileset dir="test2"/>
+        </delete>
+    </target>
+
+    <target name="junit" description="Runs the unit tests" depends="jar">
+        <delete dir="${junit.out.dir.xml}" />
+        <mkdir  dir="${junit.out.dir.xml}" />
+        <junit printsummary="yes" haltonfailure="no">
+            <classpath refid="classpath.test"/>
+            <sysproperty key="ant.home" value="${ant.home}"/>
+            <formatter type="xml"/>
+            <batchtest fork="yes" todir="${junit.out.dir.xml}">
+                <fileset dir="${src.dir}" includes="**/*Test.java"/>
+            </batchtest>
+        </junit>
+    </target>
+
+    <target name="junitreport" description="Create a report for the rest result">
+        <mkdir dir="${junit.out.dir.html}" />
+        <junitreport todir="${junit.out.dir.html}">
+            <fileset dir="${junit.out.dir.xml}">
+                <include name="*.xml"/>
+            </fileset>
+            <report format="frames" todir="${junit.out.dir.html}"/>
+        </junitreport>
+    </target>
+
+    <target name="test" depends="jar">
+        <junit printsummary="no" haltonfailure="no">
+            <classpath refid="classpath.test"/>
+            <sysproperty key="ant.home" value="${ant.home}"/>
+            <formatter type="brief" usefile="false"/>
+            <batchtest fork="true" todir="${junit.out.dir.xml}">
+                <fileset dir="${src.dir}" includes="**/*Test.java"/>
+            </batchtest>
+        </junit>
+    </target>
+
+    <target name="test2"
+            depends="junit,junitreport"
+            description="Runs unit tests and creates a report"/>
+
+</project>
diff -Nru ant-1.9.10/src/tutorial/tasks-filesets-properties/final/find.html ant-1.10.3/src/tutorial/tasks-filesets-properties/final/find.html
--- ant-1.9.10/src/tutorial/tasks-filesets-properties/final/find.html	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/tasks-filesets-properties/final/find.html	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,84 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<html>
+
+<head>
+<meta http-equiv="Content-Language" content="en-us">
+<title> Find Task</title>
+</head>
+
+<body>
+
+<h2 id="find">Find</h2>
+<h3>Description</h3>
+<p>Searches in a given path for a file and returns the absolute to it as property.
+If delimiter is set this task returns all found locations.</p>
+
+<h3>Parameters</h3>
+<table class="attr">
+  <tr>
+    <td><b>Attribute</b></td>
+    <td><b>Description</b></td>
+    <td><b>Required</b></td>
+  </tr>
+  <tr>
+    <td>file</td>
+    <td>The name of the file to search.</td>
+    <td>yes</td>
+  </tr>
+  <tr>
+    <td>location</td>
+    <td>The name of the property where to store the location</td>
+    <td>yes</td>
+  </tr>
+  <tr>
+    <td>delimiter</td>
+    <td>A delimiter to use when returning the list</td>
+    <td>only if the list is required</td>
+  </tr>
+</table>
+
+<h3>Parameters specified as nested elements</h3>
+
+<h4>path</h4>
+<p>The path where to search the file.</p>
+
+<h3>Examples</h3>
+<pre>
+    &lt;find file="ant.jar" location="loc">
+        &lt;path>
+            &lt;fileset dir="${ant.home}"/>
+        &lt;path>
+    &lt;/find>
+</pre>
+Searches in Ant home directory for a file <samp>ant.jar</samp> and stores its location in
+property <samp>loc</samp> (should be <samp>ANT_HOME/bin/ant.jar</samp>).
+
+<pre>
+    &lt;find file="ant.jar" location="loc" delimiter=";">
+        &lt;path>
+            &lt;fileset dir="C:/"/>
+        &lt;path>
+    &lt;/find>
+    &lt;echo>ant.jar found in: ${loc}&lt;/echo>
+</pre>
+Searches in Windows <samp>C:</samp> drive for all <samp>ant.jar</samp> and stores their locations in
+property <samp>loc</samp> delimited with <q>;</q>. (should need a long time :-)
+After that it prints out the result (e.g. <samp>C:/ant-1.5.4/bin/ant.jar;C:/ant-1.6/bin/ant.jar</samp>).
+
+</body>
+</html>
diff -Nru ant-1.9.10/src/tutorial/tasks-filesets-properties/final/src/Find.java ant-1.10.3/src/tutorial/tasks-filesets-properties/final/src/Find.java
--- ant-1.9.10/src/tutorial/tasks-filesets-properties/final/src/Find.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/tasks-filesets-properties/final/src/Find.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,99 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+//package org.apache.tools.ant.taskdefs;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.Path;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Find extends Task {
+
+    // =====  internal attributes  =====
+
+    private List<String> foundFiles = new ArrayList<>();
+
+    // =====  attribute support  =====
+
+    private String file;
+    private String location;
+    private List<Path> paths = new ArrayList<>();
+    private String delimiter = null;
+
+    public void setFile(String file) {
+        this.file = file;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public void addPath(Path path) {
+        paths.add(path);
+    }
+
+    public void setDelimiter(String delim) {
+        delimiter = delim;
+    }
+
+    // =====  the tasks work  =====
+
+    protected void validate() {
+        if (file == null) throw new BuildException("file not set");
+        if (location == null) throw new BuildException("location not set");
+        if (paths.isEmpty()) throw new BuildException("path not set");
+    }
+
+    public void execute() {
+        validate();
+        // find all files
+        for (Path path : paths) {
+            for (String includedFile : path.list()) {
+                String filename = includedFile.replace('\\', '/');
+                filename = filename.substring(filename.lastIndexOf("/") + 1);
+                if (file.equals(filename) && !foundFiles.contains(includedFile)) {
+                    foundFiles.add(includedFile);
+                }
+            }
+        }
+
+        // create the return value (list/single)
+        String rv = null;
+        if (!foundFiles.isEmpty()) {
+            if (delimiter == null) {
+                // only the first
+                rv = foundFiles.get(0);
+            } else {
+                // create list
+                StringBuilder list = new StringBuilder();
+                for (String file : foundFiles) {
+                    if (list.length() > 0) list.append(delimiter);
+                    list.append(file);
+                }
+                rv = list.toString();
+            }
+        }
+
+        // create the property
+        if (rv != null)
+            getProject().setNewProperty(location, rv);
+    }
+
+}
diff -Nru ant-1.9.10/src/tutorial/tasks-filesets-properties/final/src/FindTest.java ant-1.10.3/src/tutorial/tasks-filesets-properties/final/src/FindTest.java
--- ant-1.9.10/src/tutorial/tasks-filesets-properties/final/src/FindTest.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/tasks-filesets-properties/final/src/FindTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,95 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+//package org.apache.tools.ant.taskdefs;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.BuildFileRule;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+public class FindTest {
+
+    @Rule
+    public BuildFileRule rule = new BuildFileRule();
+
+    @Rule
+    public ExpectedException tried = ExpectedException.none();
+
+    @Before
+    public void setUp() {
+        rule.configureProject("build.xml");
+    }
+
+    @Test
+    public void testMissingFile() {
+        tried.expect(BuildException.class);
+        tried.expectMessage("file not set");
+        Find find = new Find();
+        find.execute();
+    }
+
+    @Test
+    public void testMissingLocation() {
+        tried.expect(BuildException.class);
+        tried.expectMessage("location not set");
+        Find find = new Find();
+        find.setFile("ant.jar");
+        find.execute();
+    }
+
+    @Test
+    public void testMissingPath() {
+        tried.expect(BuildException.class);
+        tried.expectMessage("path not set");
+        Find find = new Find();
+        find.setFile("ant.jar");
+        find.setLocation("location.ant-jar");
+        find.execute();
+    }
+
+    @Test
+    public void testFileNotPresent() {
+        rule.executeTarget("testFileNotPresent");
+        String result = rule.getProject().getProperty("location.ant-jar");
+        assertNull("Property set to wrong value.", result);
+    }
+
+    @Test
+    public void testFilePresent() {
+        rule.executeTarget("testFilePresent");
+        String result = rule.getProject().getProperty("location.ant-jar");
+        assertNotNull("Property not set.", result);
+        assertTrue("Wrong file found.", result.endsWith("ant.jar"));
+    }
+
+    @Test
+    public void testMultipleFiles() {
+        rule.executeTarget("testMultipleFiles");
+        String result = rule.getProject().getProperty("location.test");
+        assertNotNull("Property not set.", result);
+        assertTrue("Only one file found.", result.contains(";"));
+    }
+
+}
diff -Nru ant-1.9.10/src/tutorial/tasks-start-writing/build.xml ant-1.10.3/src/tutorial/tasks-start-writing/build.xml
--- ant-1.9.10/src/tutorial/tasks-start-writing/build.xml	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/tasks-start-writing/build.xml	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (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
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<project name="MyTask" basedir="." default="test">
+
+    <property name="src.dir"     value="src"/>
+    <property name="classes.dir" value="classes"/>
+
+    <property name="ant.test.lib" value="ant-testutil.jar"/>
+    <property name="report.dir"   value="report"/>
+    <property name="junit.out.dir.xml"  value="${report.dir}/junit/xml"/>
+    <property name="junit.out.dir.html" value="${report.dir}/junit/html"/>
+
+    <path id="classpath.run">
+        <path path="${java.class.path}"/>
+        <path location="${ant.project.name}.jar"/>
+    </path>
+
+    <path id="classpath.test">
+        <path refid="classpath.run"/>
+        <path location="${ant.test.lib}"/>
+    </path>
+
+    <target name="clean" description="Delete all generated files">
+        <delete failonerror="false" includeEmptyDirs="true">
+            <fileset dir="." includes="${ant.project.name}.jar"/>
+            <fileset dir="${classes.dir}"/>
+            <fileset dir="${report.dir}"/>
+        </delete>
+    </target>
+
+    <target name="compile" description="Compiles the Task">
+        <mkdir dir="${classes.dir}"/>
+        <javac includeantruntime="true" srcdir="${src.dir}" destdir="${classes.dir}" classpath="${ant.test.lib}"/>
+    </target>
+
+    <target name="jar" description="JARs the Task" depends="compile">
+        <jar destfile="${ant.project.name}.jar" basedir="${classes.dir}"/>
+    </target>
+
+
+    <target name="use.init" description="Taskdef the HelloWorld-Task" depends="jar">
+        <taskdef name="helloworld" classname="HelloWorld" classpath="${ant.project.name}.jar"/>
+    </target>
+
+
+    <target name="use.without" description="Use without any" depends="use.init">
+        <helloworld/>
+    </target>
+
+    <target name="use.message" description="Use with attribute 'message'" depends="use.init">
+        <helloworld message="attribute-text"/>
+    </target>
+
+    <target name="use.fail" description="Use with attribute 'fail'" depends="use.init">
+        <helloworld fail="true"/>
+    </target>
+
+    <target name="use.nestedText" description="Use with nested text" depends="use.init">
+        <helloworld>nested-text</helloworld>
+    </target>
+
+    <target name="use.nestedElement" description="Use with nested 'message'" depends="use.init">
+        <helloworld>
+            <message msg="Nested Element 1"/>
+            <message msg="Nested Element 2"/>
+        </helloworld>
+    </target>
+
+
+    <target name="use"
+            description="Try all (w/out use.fail)"
+            depends="use.without,use.message,use.nestedText,use.nestedElement"/>
+
+
+    <target name="junit" description="Runs the unit tests" depends="jar">
+        <delete dir="${junit.out.dir.xml}" />
+        <mkdir  dir="${junit.out.dir.xml}" />
+        <junit printsummary="yes" haltonfailure="no">
+            <classpath refid="classpath.test"/>
+            <formatter type="xml"/>
+            <batchtest fork="yes" todir="${junit.out.dir.xml}">
+                <fileset dir="${src.dir}" includes="**/*Test.java"/>
+            </batchtest>
+        </junit>
+    </target>
+
+    <target name="junitreport" description="Create a report for the rest result">
+        <mkdir dir="${junit.out.dir.html}" />
+        <junitreport todir="${junit.out.dir.html}">
+            <fileset dir="${junit.out.dir.xml}">
+                <include name="*.xml"/>
+            </fileset>
+            <report format="frames" todir="${junit.out.dir.html}"/>
+        </junitreport>
+    </target>
+
+    <target name="test"
+            depends="junit,junitreport"
+            description="Runs unit tests and creates a report"/>
+
+</project>
diff -Nru ant-1.9.10/src/tutorial/tasks-start-writing/src/HelloWorld.java ant-1.10.3/src/tutorial/tasks-start-writing/src/HelloWorld.java
--- ant-1.9.10/src/tutorial/tasks-start-writing/src/HelloWorld.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/tasks-start-writing/src/HelloWorld.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,87 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.BuildException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The task of the tutorial.
+ * Prints a message or lets the build fail.
+ * @author Jan Matérne
+ * @since 2003-08-19
+ */
+public class HelloWorld extends Task {
+
+
+    /** The message to print. As attribute. */
+    String message;
+    public void setMessage(String msg) {
+        message = msg;
+    }
+
+    /** Should the build fail? Defaults to <i>false</i>. As attribute. */
+    boolean fail = false;
+    public void setFail(boolean b) {
+        fail = b;
+    }
+
+    /** Support for nested text. */
+    public void addText(String text) {
+        message = text;
+    }
+
+
+    /** Do the work. */
+    public void execute() {
+        // handle attribute 'fail'
+        if (fail) throw new BuildException("Fail requested.");
+
+        // handle attribute 'message' and nested text
+        if (message != null) log(message);
+
+        // handle nested elements
+        for (Message msg : messages) {
+            log(msg.getMsg());
+        }
+    }
+
+
+    /** Store nested 'message's. */
+    List<Message> messages = new ArrayList<>();
+
+    /** Factory method for creating nested 'message's. */
+    public Message createMessage() {
+        Message msg = new Message();
+        messages.add(msg);
+        return msg;
+    }
+
+    /** A nested 'message'. */
+    public class Message {
+        // Bean constructor
+        public Message() {}
+
+        /** Message to print. */
+        String msg;
+        public void setMsg(String msg) { this.msg = msg; }
+        public String getMsg() { return msg; }
+    }
+
+}
diff -Nru ant-1.9.10/src/tutorial/tasks-start-writing/src/HelloWorldTest.java ant-1.10.3/src/tutorial/tasks-start-writing/src/HelloWorldTest.java
--- ant-1.9.10/src/tutorial/tasks-start-writing/src/HelloWorldTest.java	1970-01-01 00:00:00.000000000 +0000
+++ ant-1.10.3/src/tutorial/tasks-start-writing/src/HelloWorldTest.java	2018-03-24 12:37:12.000000000 +0000
@@ -0,0 +1,77 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.BuildFileRule;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class HelloWorldTest {
+
+    @Rule
+    public BuildFileRule rule = new BuildFileRule();
+
+    @Rule
+    public ExpectedException tried = ExpectedException.none();
+
+    @Before
+    public void setUp() {
+        // initialize Ant
+        rule.configureProject("build.xml");
+    }
+
+    @Test
+    public void testWithout() {
+        rule.executeTarget("use.without");
+        assertEquals("Message was logged but should not.", "", rule.getLog());
+    }
+
+    @Test
+    public void testMessage() {
+        // execute target 'use.nestedText' and expect a message
+        // 'attribute-text' in the log
+        rule.executeTarget("use.message");
+        assertEquals(rule.getLog(), "attribute-text");
+    }
+
+    @Test
+    public void testFail() {
+        tried.expect(BuildException.class);
+        tried.expectMessage("Fail requested.");
+        // execute target 'use.fail' and expect a BuildException
+        // with text 'Fail requested.'
+        rule.executeTarget("use.fail");
+    }
+
+    @Test
+    public void testNestedText() {
+        rule.executeTarget("use.nestedText");
+        assertEquals("nested-text", rule.getLog());
+    }
+
+    @Test
+    public void testNestedElement() {
+        rule.executeTarget("use.nestedElement");
+        assertTrue(rule.getLog().contains("Nested Element 1"));
+        assertTrue(rule.getLog().contains("Nested Element 2"));
+    }
+}
diff -Nru ant-1.9.10/WHATSNEW ant-1.10.3/WHATSNEW
--- ant-1.9.10/WHATSNEW	2018-02-03 16:12:26.000000000 +0000
+++ ant-1.10.3/WHATSNEW	2018-03-24 12:37:12.000000000 +0000
@@ -1,9 +1,87 @@
-Changes from Ant 1.9.9 TO Ant 1.9.10
-====================================
+Changes from Ant 1.10.2 TO Ant 1.10.3
+=====================================
+
+Changes that could break older environments:
+-------------------------------------------
+
+ * Previous versions of Ant's copy task would throw a BuildException
+   if the "name" of the resource to copy was null. Starting
+   this version, the copy task instead silently skips such resources
+   and no longer throws an exception.
+   ant-dev list https://www.mail-archive.com/dev@ant.apache.org/msg46634.html
+
+ * Reverted the signature change of various clone method
+   implementation in Ant's data-types introduced with 1.10.2 as they
+   broke subclasses of said data-types which tried to override clone.
+
+Fixed bugs:
+-----------
+
+ * Fixed NullPointerException in ChainedMapper
+   Bugzilla Report 62086
+
+ * Fixed NullPointerException when a mappedresource is used in pathconvert
+   Bugzilla Report 62076
+
+ * Fixed an issue where a string, when used as a resource collection, within
+   tokens, would be replaced by property values
+   Bugzilla Report 62147
+
+ * Added a workaround for a bug in the jarsigner tool to <verifyjar>
+   which requires the -storepass command line argument when verifying
+   signatures using -strict together with a PKCS12 keystore. Unlike
+   when signing the jar it will not prompt for the keystore's password
+   and read it from standard input.
+   This means Ant will now pass the keystore's password on the command
+   line when using <verifyjar>, which poses a security risk you should
+   be aware of.
+   Bugzilla Report 62194
+
+Other changes:
+--------------
+
+ * Allow Saxon to be used for junitreport XSL transformation
+   Github Pull Request #57
+
+ * when running on Java 11+ rmic will fail early if iiop or idl are
+   requested. Java11 removes support for CORBA and the switches have
+   been removed from the rmic tool.
+
+ * A new junitlauncher task which support JUnit 5 test framework.
+   Bugzilla Report 61796
+
+Changes from Ant 1.10.1 TO Ant 1.10.2
+=====================================
+
+Changes that could break older environments:
+-------------------------------------------
+
+ * updated the dependency of BCEL to 6.2.
+   Bugzilla Report 61196
+
+ * delete task previously would silently accept wildcard (*)
+   value for the "file" attribute. That's no longer the case
+   and an exception could get thrown by the underlying filesystem
+   for such use. Usage like:
+
+   <delete file="/foo/bar/*.something"/>
+
+   should instead be changed to use resource collections like:
+
+   <delete>
+   	 <fileset dir="/foo/bar/" includes="*.something"/>
+   </delete>
+
+ * Commons Net 3.6 is binary-code, but not source compatible;
+   see change list of Commons Net 3.0 for details
 
  * The Log4jListener is marked as deprecated as the required log4j library
    (in version 1.x) is not maintained any more.
 
+ * Image task is marked as deprecated as the required JAI library is not
+   maintained any more and internal APIs that JAI depended on are no longer
+   available in Java 9.
+
 Fixed bugs:
 -----------
 
@@ -11,6 +89,9 @@
    value.
    Bugzilla Report 60767
 
+ * bootstrapping Ant on Windows failed
+   Bugzilla Report 61027
+
  * Fixed the issue where the SCP based tasks would try to change
    the permissions on the parent directory of a transferred file,
    instead of changing it on the transferred file itself.
@@ -21,6 +102,11 @@
    the same source file (symlinked back to itself).
    Bugzilla Report 60644
 
+ * Fixed the issue where symlink creation with "overwrite=false",
+   on existing symlink whose target was a directory, would end
+   up creating a new symlink under the target directory.
+   Bugzilla Report 58683
+
  * Improvement to the Zip task for reduced memory usage in certain
    cases. Thanks to Glen Lewis for reporting the issue and
    suggesting the fix.
@@ -42,9 +128,23 @@
    values always get quoted.
    Github Pull Request #32
 
+ * Added <encoding> attributes to various script related tasks and a
+   compiled attribute to scriptdef.
+   Github Pull Request #30
+
+ * Added support for jarsigner's -tsadigestalg to <signjar>.
+   Bugzilla Report 60665
+
  * added "regexp" attribute to <linecontainsregexp>
    Bugzilla Report 60968
 
+ * reduced GC pressure by replacing all usage of FileInputStream and
+   FileOutputStream.
+
+ * Task can now also use attribute setters that expect a
+   java.nio.file.Path argument.
+   Bugzilla Report 61042
+
  * added a new magic property ant.tstamp.now that can be used to
    override the current time/date used by <tstamp>.
    Bugzilla Report 61079
@@ -74,20 +174,21 @@
 
  * 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 targets
-   for Ivy and AntUnit to facilitate releases and updates, respectively.
+   JRuby to the latest Java 5 compatible version (1.6.8); added
+   resolve target for AntUnit to facilitate updates.
    Github Pull Request #50
 
-* Updated Commons Net to the latest Java 5 compatible version (2.2).
+ * Updated Java Mail API, Jython, Rhino and Commons Net to the latest
+   stable version (1.6.0, 2.7.0, 1.7.7.2 and 3.6, respectively).
+   Github Pull Request #53
 
-Changes from Ant 1.9.8 TO Ant 1.9.9
-===================================
+Changes from Ant 1.10.0 TO Ant 1.10.1
+=====================================
 
 Fixed bugs:
 -----------
 
- * Ant 1.9.8 made Path#systemClasspath final which broke the Eclipse
+ * Ant 1.10.0 made Path#systemClasspath final which broke the Eclipse
    integration.
    Bugzilla Report 60582
 
@@ -97,17 +198,36 @@
    newlines present in command line arguments.
    Bugzilla Report 60562
 
-Changes from Ant 1.9.7 TO Ant 1.9.8
-===================================
+Other changes:
+--------------
+
+ * new tasks <xz> and <unxz> and resource <xzresource> for XZ
+   compression. Also the compression attribute of <tar>/<untar> now
+   accepts "xz" as valid value.
+   The tasks and type are contained in the new ant-xz.jar and require
+   the library XZ for Java to be on the CLASSPATH.
+   Bugzilla Report 60350
+
+Changes from Ant 1.9.7 TO Ant 1.10.0
+====================================
 
 Changes that could break older environments:
 -------------------------------------------
 
+ * Ant 1.10.x requires Java8 or newer at compile or build time.
+   The 1.9.x series wil stay compatible with Java5.
+
+ * The <apt> task has been removed since apt itself has been removed
+   with Java8.
+
  * <fileset>/<zipfileset>/<tarfileset> exhibited undefined
    behavior when both the dir and file attribute have been used on the
    same instance. This will now cause the build to fail.
    Bugzilla Report 59402
 
+ * <native2ascii> will default to the builtin implementation on Java8
+   as well (sun isn't available for Java9+ anyway).
+
  * The ant.java.version property will now hold the value "9" rather
    than "1.9" if running on Java 9.
 
@@ -115,6 +235,9 @@
    be used when running on Java 9 since this option has been removed.
    Bugzilla Report 59906
 
+ * <javah> will default to the "forking" implementation on Java8
+   as well.
+
 Fixed bugs:
 -----------
 
@@ -162,6 +285,11 @@
 Other changes:
 --------------
 
+ * New file selectors <executable>, <symlink> and <ownedBy>.
+
+ * New task <setpermissions> that provides the ability to set POSIX
+   compatible permssions via NIO's PosixFilePermission
+
  * <junit> now initializes the cause of the AssertionFailedError when
    converting from AssertionError.
    Bugzilla Report 58982
@@ -199,6 +327,9 @@
  * it is now possible to use references to Ant types and classloaders
    built around Ant <path>s as values for TraX factory attributes.
 
+ * AntClassLoader and its subclasses register themselves as parallel
+   capable.
+
  * <junitreport> now enables the feature
    http://www.oracle.com/xml/jaxp/properties/enableExtensionFunctions
    when run on Java 9 so the redirect extension function can be used