Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · 5a76fce7
--- a/INSTALL
+++ b/INSTALL
-For installation instructions see the manual in the docs subdirectory
-or online at <http://ant.apache.org/manual/index.html>.
+For installation instructions see the manual by opening manual/index.html
+or see it online at <http://ant.apache.org/manual/index.html>.
--- a/KEYS
+++ b/KEYS
@@ -1495,3 +1495,62 @@ G3GJoHIALPVs33ykG7MKFFqpbJHHc95hcOzs8eVh2/jD53CXILjbhKEGGbejFlx+
 RHkiOuu1l6jXCeh/J1R6YidjsDjKWlRkHifMmw==
 =j+uw
 -----END PGP PUBLIC KEY BLOCK-----
+pub   rsa4096 2018-06-13 [SC] [expires: 2022-06-13]
+      8DA70C00DF7AF1B0D2F9DC74DDBCC1270A29D081
+uid           [ultimate] jaikiran@apache <jaikiran@apache.org>
+sig 3        DDBCC1270A29D081 2018-06-13  jaikiran@apache <jaikiran@apache.org>
+sub   rsa4096 2018-06-13 [E] [expires: 2022-06-13]
+sig          DDBCC1270A29D081 2018-06-13  jaikiran@apache <jaikiran@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+3rZzxBZRMmQz3CJrMw==
+=vLW3
+-----END PGP PUBLIC KEY BLOCK-----
--- a/WHATSNEW
+++ b/WHATSNEW
+Changes from Ant 1.10.3 TO Ant 1.10.4
+=====================================
+
+Changes that could break older environments:
+-------------------------------------------
+
+ * <unzip>, <unjar> and <untar> will no longer extract entries whose
+   names would make the created files be placed outside of the
+   destination directory anymore by default. A new attribute
+   allowFilesToEscapeDest can be used to override the behavior.
+   Another special case is when stripAbsolutePathSpec is false (which
+   no longer is the default) and the entry's name starts with a
+   (back)slash and allowFilesToEscapeDest hasn't been specified
+   explicitly, in this case the file may be created outside of the
+   dest directory as well.
+   In addition stripAbsolutePathSpec is now true by default.
+   Based on a recommendation by the Snyk Security Research Team.
+
+Fixed bugs:
+-----------
+
+ * Delay the class initialization of the test classes until they are
+   passed to JUnit. This way we can avoid that failing static initializers
+   from non-test classes are reported as error when the 'skipNonTests' option
+   is 'true'.
+   Bugzilla Report 60062
+
+ * The junit task when used with includeantruntime="no" was incorrectly
+   printing a warning about multiple versions of ant detected in path
+
+ * <cab> died with a NullPointerException since Ant 1.10.2.
+   Bugzilla Report 62335
+
+ * The <depend> task would fail with 
+   "java.lang.ClassFormatError: Invalid Constant Pool entry Type 19" while
+   parsing a module-info.class. The task is compatible with
+   Java bytecode version 53 now.
+   Bug reported by Simon IJskes https://issues.apache.org/jira/browse/NETBEANS-781
+
+ * Default and SecureInputHandler will now raise an error when then
+   end of the input stream (usually System.in or System.console) are
+   reached before a valid input has been read.
+
+ * junitreport does not list testsuites that fail to start any tests
+   because of an exception inside the all-tests and alltests-errors frames.
+   Bugzilla Report 62443
+
+Other changes:
+--------------
+
+ * AntAssert is deprecated, assertThat from JUnit 4.4+, Hamcrest matchers and/or
+   ExpectedException rule provide equivalent functionality
+
+ * PumpStreamHandler now explicitly verifies the streams for output
+   and error are not null and will throw an exception if they
+   are. This way creating a PumpStreamHandler will fail early as
+   opposed to some obscure errors later when closing streams or
+   finishing threads might fail.
+   Bugzilla Report 62148
+
+ * <property> has a new attribute runtime which can be used to set
+   properties with values taken as snapshots from the
+   availableProcessors, freeMemory, maxMemory and totalMemory methods
+   of the Java Runtime class.
+
+ * linecontains filter now has a new "matchAny" attribute which when
+   set to "true" allows any (instead of all) of the user-specified
+   strings to be present in the line.
+   Bugzilla Report 62313
+
+ * <resourcelist> has a new basedir attribute that can be used to
+   resolve relative names and provides a root for the FileResources
+   generated.
+   Bugzilla Report 62379
+
+ * The <includesfile> and <excludesfile> nested elements of
+   <patternset> and <fileset> now support an encoding attribute that
+   can be used to specify the file's encoding.
+   Bugzilla Report 62379
+
+ * New file selectors, posixGroup and posixPermissions, are available.
+   The new selectors and related ownedBy selector have "followSymlinks"
+   attribute that defaults to "true" for consistency.
+   Bugzilla Report 22370
+
+ * The junitlauncher task now has a "printSummary" attribute which when
+   set to "true" will print the test execution summary to System.out.
+
 Changes from Ant 1.10.2 TO Ant 1.10.3
 =====================================


--- a/build.xml
+++ b/build.xml
@@ -33,10 +33,10 @@
  <property name="name" value="ant"/>
  <!-- this is the directory corresponding to groupId of Ant in the Maven repository -->
  <property name="groupid" value="org/apache/ant"/>
-  <property name="project.version" value="1.10.3"/>
+  <property name="project.version" value="1.10.4"/>
  <!-- pom.version is used when doing a distribution and must match with what is checked in under src/etc/poms -->
-  <property name="pom.version" value="1.10.3"/>
-  <property name="manifest-version" value="1.10.3"/>
+  <property name="pom.version" value="1.10.4"/>
+  <property name="manifest-version" value="1.10.4"/>
  <property name="bootstrap.jar" value="ant-bootstrap.jar"/>

  <property name="ant.package" value="org/apache/tools/ant"/>
@@ -1828,6 +1828,9 @@ ${antunit.reports}
          <exclude name="${taskdefs.package}/TaskdefTest*Task.java"/>
          <exclude name="${optional.package}/junit/TestFormatter.java"/>

+          <!-- JUnit 5 / junitlauncher tests that aren't meant to run by junit task -->
+          <exclude name="${optional.package}/junitlauncher/"/>
+
          <!-- interactive tests -->
          <exclude name="${taskdefs.package}/TestProcess.java"/>
          <exclude name="${optional.package}/splash/SplashScreenTest.java"/>

--- a/debian/changelog
+++ b/debian/changelog
+ant (1.10.4-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+    - Compile with hamcrest-all on the classpath
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 25 Jun 2018 13:11:09 +0200
+
 ant (1.10.3-2) unstable; urgency=medium

  * Team upload.

--- a/debian/patches/0010-reproducible-javadoc-task.patch
+++ b/debian/patches/0010-reproducible-javadoc-task.patch
@@ -5,7 +5,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
 +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
-@@ -1700,6 +1700,16 @@
+@@ -1699,6 +1699,16 @@
      */
     @Override
     public void execute() throws BuildException {

--- a/debian/patches/0011-reproducible-propertyfile-task.patch
+++ b/debian/patches/0011-reproducible-propertyfile-task.patch
@@ -5,7 +5,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
 --- a/src/main/org/apache/tools/ant/util/DateUtils.java
 +++ b/src/main/org/apache/tools/ant/util/DateUtils.java
-@@ -238,6 +238,10 @@
+@@ -227,6 +227,10 @@
      */
     public static String getDateForHeader() {
         Calendar cal = Calendar.getInstance();
@@ -16,7 +16,7 @@ Forwarded: no
         TimeZone tz = cal.getTimeZone();
         int offset = tz.getOffset(cal.get(Calendar.ERA),
                                   cal.get(Calendar.YEAR),
-@@ -258,6 +262,7 @@
+@@ -247,6 +251,7 @@
         }
         tzMarker.append(minutes);
         synchronized (DATE_HEADER_FORMAT_INT) {

--- a/debian/patches/0013-auto-adjust-target.patch
+++ b/debian/patches/0013-auto-adjust-target.patch
@@ -30,7 +30,7 @@ Forwarded: no
         // scan source directories and dest directory to build up
         // compile list
         if (hasPath(src)) {
-@@ -1722,4 +1722,24 @@
+@@ -1713,4 +1713,24 @@
         0x00, 0x00, 0x00, 0x02, 0x00, 0x04
     };
 
@@ -57,7 +57,7 @@ Forwarded: no
 }
 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
 +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
-@@ -2174,7 +2174,7 @@
+@@ -2160,7 +2160,7 @@
             : getProject().getProperty(MagicNames.BUILD_JAVAC_SOURCE);
         if (sourceArg != null) {
             toExecute.createArgument().setValue("-source");

--- a/debian/patches/0015-javadoc-ignore-source-errors.patch
+++ b/debian/patches/0015-javadoc-ignore-source-errors.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
 +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
-@@ -2177,6 +2177,11 @@
+@@ -2163,6 +2163,11 @@
             toExecute.createArgument().setValue(LanguageLevel.adjust(sourceArg, "javadoc -source", this));
         }
 

--- a/debian/rules
+++ b/debian/rules
 #!/usr/bin/make -f

-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
+DEPENDENCIES := antlr bcel bsf commons-logging javax.activation javax.mail jdepend junit junit4 hamcrest-all log4j-1.2 oro regexp xalan2 serializer xml-resolver-1.2 commons-net jsch xz

 %:
 	dh $@ --with maven-repo-helper

--- a/lib/libraries.properties
+++ b/lib/libraries.properties
@@ -48,16 +48,16 @@ jakarta-regexp.version=1.4
 # Later versions of Tomcat provide a jspc task
 jasper-compiler.version=4.1.36
 jasper-runtime.version=${jasper-compiler.version}
-javax.mail-api.version=1.6.0
+javax.mail-api.version=1.6.1
 jdepend.version=2.9.1
 jruby.version=1.6.8
 junit.version=4.12
-rhino.version=1.7.8
-junit-platform-launcher.version=1.1.0
+rhino.version=1.7.10
+junit-platform-launcher.version=1.2.0
 # Only used for internal tests in Ant project
-junit-vintage-engine.version=5.1.0
+junit-vintage-engine.version=5.2.0
 # Only used for internal tests in Ant project
-junit-jupiter-engine.version=5.1.0
+junit-jupiter-engine.version=5.2.0
 jsch.version=0.1.54
 jython.version=2.7.0
 # log4j 1.2.15 requires JMS and a few other Sun jars that are not in the m2 repo

--- a/manual/Tasks/BorlandEJBTasks.html
+++ b/manual/Tasks/BorlandEJBTasks.html
@@ -42,9 +42,9 @@ target="_top">FAQ</a> for this task at his homepage.</p>
 <h3>Borland element</h3>
 <table class="attr">
  <tr>
-    <th>Attribute</th>
-    <th>Description</th>
-    <th>Required</th>
+    <th scope="col">Attribute</th>
+    <th scope="col">Description</th>
+    <th scope="col">Required</th>
  </tr>
  <tr>
    <td>destdir</td>

--- a/manual/Tasks/BorlandGenerateClient.html
+++ b/manual/Tasks/BorlandGenerateClient.html
@@ -32,9 +32,9 @@ generate the client jar file corresponding to an EJB jar file.</p>
 <h3>Parameters</h3>
 <table class="attr">
  <tr>
-    <th>Attribute</th>
-    <th>Description</th>
-    <th>Required</th>
+    <th scope="col">Attribute</th>
+    <th scope="col">Description</th>
+    <th scope="col">Required</th>
  </tr>
  <tr>
    <td>ejbjar</td>

--- a/manual/Tasks/ant.html
+++ b/manual/Tasks/ant.html
@@ -70,9 +70,9 @@ outside of targets in the new project&mdash;but not those defined inside of targ
 <h3>Parameters</h3>
 <table class="attr">
  <tr>
-    <th>Attribute</th>
-    <th>Description</th>
-    <th>Required</th>
+    <th scope="col">Attribute</th>
+    <th scope="col">Description</th>
+    <th scope="col">Required</th>
  </tr>
  <tr>
    <td>antfile</td>
@@ -136,9 +136,9 @@ their <var>id</var>.</p>

 <table class="attr">
  <tr>
-    <th>Attribute</th>
-    <th>Description</th>
-    <th>Required</th>
+    <th scope="col">Attribute</th>
+    <th scope="col">Description</th>
+    <th scope="col">Required</th>
  </tr>
  <tr>
    <td>refid</td>
@@ -167,9 +167,9 @@ using the <var>target</var> attribute.  These will be executed as if Ant had bee
 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>
+    <th scope="col">Attribute</th>
+    <th scope="col">Description</th>
+    <th scope="col">Required</th>
  </tr>
  <tr>
    <td>name</td>
@@ -201,9 +201,9 @@ 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>
+    <th scope="col"><var>dir</var> attribute</th>
+    <th scope="col"><var>inheritAll</var> attribute</th>
+    <th scope="col">new project's <var>basedir</var></th>
  </tr>
  <tr>
    <td>value provided</td>
@@ -236,10 +236,10 @@ 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>
+    <th scope="col">parent <var>dir</var> attribute</th>
+    <th scope="col">parent <var>inheritAll</var> attribute</th>
+    <th scope="col">current <var>inheritAll</var> attribute</th>
+    <th scope="col">new project's <var>basedir</var></th>
  </tr>
  <tr>
    <td>value provided</td>
@@ -293,6 +293,7 @@ will be set to the specified value of the property element unless the correspond
 the <var>dir</var> attribute explicitly.</p>

 <h3>Examples</h3>
+<p>These are different ways of using the task:</p>
 <pre>
 &lt;ant antfile=&quot;subproject/subbuild.xml&quot; target=&quot;compile&quot;/&gt;

@@ -325,12 +326,12 @@ this:</p>
 &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>
+with the <var>id</var> <samp>path1</samp>, but <samp>path2</samp> is not defined; then</p>

 <pre>&lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;true&quot;/&gt;</pre>

 <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>
+definition of <samp>path2</samp> available in the <samp>subbuild</samp>, whereas</p>

 <pre>&lt;ant antfile=&quot;subbuild.xml&quot;/&gt;</pre>

@@ -338,14 +339,14 @@ definition of <samp>path2</samp> available in the <samp>subbuild</samp>.</p>

 <pre>&lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;false&quot;/&gt;</pre>

-<p>will neither override <samp>path1</samp> nor copy <samp>path2</samp>.</p>
+<p>will neither override <samp>path1</samp> nor copy <samp>path2</samp>, while</p>

 <pre>
 &lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;false&quot;&gt;
  &lt;reference refid=&quot;path1&quot;/&gt;
 &lt;/ant&gt;</pre>

-<p>will override <samp>subbuild</samp>'s definition of <samp>path1</samp>.</p>
+<p>will override <samp>subbuild</samp>'s definition of <samp>path1</samp>, and</p>

 <pre>
 &lt;ant antfile=&quot;subbuild.xml&quot; inheritrefs=&quot;false&quot;&gt;

--- a/manual/Tasks/antcall.html
+++ b/manual/Tasks/antcall.html
@@ -67,9 +67,9 @@ undefined.</p>
 <h3>Parameters</h3>
 <table class="attr">
  <tr>
-    <th>Attribute</th>
-    <th>Description</th>
-    <th>Required</th>
+    <th scope="col">Attribute</th>
+    <th scope="col">Description</th>
+    <th scope="col">Required</th>
  </tr>
  <tr>
    <td>target</td>
@@ -111,9 +111,9 @@ their <var>id</var>.</p>

 <table class="attr">
  <tr>
-    <th>Attribute</th>
-    <th>Description</th>
-    <th>Required</th>
+    <th scope="col">Attribute</th>
+    <th scope="col">Description</th>
+    <th scope="col">Required</th>
  </tr>
  <tr>
    <td>refid</td>
@@ -142,9 +142,9 @@ using the <var>target</var> attribute.  These will be executed as if Ant had bee
 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>
+    <th scope="col">Attribute</th>
+    <th scope="col">Description</th>
+    <th scope="col">Required</th>
  </tr>
  <tr>
    <td>name</td>
@@ -154,6 +154,7 @@ single target whose dependencies are the targets so specified, in the order spec
 </table>

 <h3>Examples</h3>
+<p>The following</p>
 <pre>
 &lt;target name=&quot;default&quot;&gt;
  &lt;antcall target=&quot;doSomethingElse&quot;&gt;
@@ -164,13 +165,11 @@ single target whose dependencies are the targets so specified, in the order spec
 &lt;target name=&quot;doSomethingElse&quot;&gt;
  &lt;echo message=&quot;param1=${param1}&quot;/&gt;
 &lt;/target&gt;</pre>
-<p>Will run the target <var>doSomethingElse</var> and echo <code>param1=value</code>.</p>
-
+<p>will run the target <var>doSomethingElse</var> and echo <code>param1=value</code>, whereas</p>
 <pre>
 &lt;antcall ... &gt;
  &lt;reference refid=&quot;path1&quot; torefid=&quot;path2&quot;/&gt;
 &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>


--- a/manual/Tasks/antlr.html
+++ b/manual/Tasks/antlr.html
@@ -43,9 +43,9 @@ the <q>antlr-all.jar</q> target of the Makefile provided with the download.</em>
 <h3>Parameters</h3>
 <table class="attr">
  <tr>
-    <th>Attribute</th>
-    <th>Description</th>
-    <th>Required</th>
+    <th scope="col">Attribute</th>
+    <th scope="col">Description</th>
+    <th scope="col">Required</th>
  </tr>
  <tr>
    <td>target</td>
@@ -137,12 +137,12 @@ nested <code>&lt;jvmarg&gt;</code> attributes, for example:</p>
 in <a href="../using.html#arg">Command line arguments</a>.</p>

 <h3>Example</h3>
+<p>Invoke ANTLR on grammar file <samp>etc/java.g</samp>, writing the generated files
+to <samp>build/src</samp>:</p>
 <pre>
 &lt;antlr
    target=&quot;etc/java.g&quot;
    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>
--- a/manual/Tasks/antstructure.html
+++ b/manual/Tasks/antstructure.html
@@ -53,9 +53,9 @@ task&mdash;see the example below.
 <h3>Parameters</h3>
 <table class="attr">
  <tr>
-    <th>Attribute</th>
-    <th>Description</th>
-    <th>Required</th>
+    <th scope="col">Attribute</th>
+    <th scope="col">Description</th>
+    <th scope="col">Required</th>
  </tr>
  <tr>
    <td>output</td>
@@ -64,11 +64,11 @@ task&mdash;see the example below.
  </tr>
 </table>
 <h3>Examples</h3>
-<pre>&lt;antstructure output=&quot;project.dtd&quot;/&gt;</pre>
+<p>Basic usage</p>

-<p><strong>Emitting your own structure instead of a DTD</strong></p>
+<pre>&lt;antstructure output=&quot;project.dtd&quot;/&gt;</pre>

-<p>First you need to implement the interface</p>
+<p>Emit your own structure instead of a DTD: first you need to implement the interface</p>

 <pre>
 package org.example;
@@ -85,8 +85,8 @@ public class MyPrinter implements AntStructure.StructurePrinter {
  &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 <code class="code">StructurePrinter</code> can accept attributes and nested elements
+just like any other Ant type or task.</p>

 </body>
 </html>
--- a/manual/Tasks/antversion.html
+++ b/manual/Tasks/antversion.html
@@ -32,13 +32,13 @@ as condition).</p>

 <table class="attr">
  <tr>
-    <th rowspan="2">Attribute</th>
-    <th rowspan="2">Description</th>
-    <th colspan="2">Required</th>
+    <th scope="col" rowspan="2">Attribute</th>
+    <th scope="col" rowspan="2">Description</th>
+    <th scope="col" colspan="2">Required</th>
  </tr>
  <tr>
-    <th>Task</th>
-    <th>Condition</th>
+    <th scope="col">Task</th>
+    <th scope="col">Condition</th>
  </tr>
  <tr>
    <td>atleast</td>
@@ -62,17 +62,19 @@ as condition).</p>

 <h3>Examples</h3>

+<p>Store the current Ant version in the property <code>antversion</code>.</p>
 <pre>&lt;antversion property=&quot;antversion&quot;/&gt;</pre>
-<p>Stores the current Ant version in the property <code>antversion</code>.</p>

+<p>Store 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;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
+<p>Set 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>
+<pre>&lt;antversion property=&quot;ant-is-exact-7&quot; exactly=&quot;1.7.0&quot;/&gt;</pre>

+<p>Set <code>Ant17isOnline</code> if Ant 1.7.0 is running and can get a non-error-response from the
+Ant homepage.</p>
 <pre>
 &lt;condition property=&quot;Ant17isOnline&quot;&gt;
  &lt;and&gt;
@@ -80,8 +82,6 @@ would match.</p>
    &lt;http url=&quot;http://ant.apache.org&quot;/&gt;
  &lt;/and&gt;
 &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>
--- a/manual/Tasks/apply.html
+++ b/manual/Tasks/apply.html
@@ -55,9 +55,9 @@ standard input.</p>
 <h3>Parameters</h3>
 <table class="attr">
  <tr>
-    <th>Attribute</th>
-    <th>Description</th>
-    <th>Required</th>
+    <th scope="col">Attribute</th>
+    <th scope="col">Description</th>
+    <th scope="col">Required</th>
  </tr>
  <tr>
    <td>executable</td>
@@ -295,9 +295,9 @@ different, use a nested <code>&lt;srcfile&gt;</code> element between your <code>
 elements to mark the insertion point.</p>
 <table class="attr">
  <tr>
-    <th>Attribute</th>
-    <th>Description</th>
-    <th>Required</th>
+    <th scope="col">Attribute</th>
+    <th scope="col">Description</th>
+    <th scope="col">Required</th>
  </tr>
  <tr>
    <td>prefix</td>
@@ -318,9 +318,9 @@ of the target filename on the command line. If omitted, the target filenames wil
 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>
+    <th scope="col">Attribute</th>
+    <th scope="col">Description</th>
+    <th scope="col">Required</th>
  </tr>
  <tr>
    <td>prefix</td>
@@ -350,6 +350,9 @@ files for each sourcefile.</p>
 (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>
+<p>Invoke <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;ls&quot;&gt;
  &lt;arg value=&quot;-l&quot;/&gt;
@@ -360,9 +363,11 @@ of <code>exec</code>.</p>
  &lt;/fileset&gt;
  &lt;fileset refid=&quot;other.files&quot;/&gt;
 &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>
+
+<p>Invoke <kbd>somecommand arg1 SOURCEFILENAME arg2</kbd> 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 <q>true</q>, <code>SOURCEFILENAME</code> would be
+replaced with the absolute filenames of all files separated by spaces.</p>
 <pre>
 &lt;apply executable=&quot;somecommand&quot; parallel=&quot;false&quot;&gt;
  &lt;arg value=&quot;arg1&quot;/&gt;
@@ -371,10 +376,11 @@ to the command line.</p>
  &lt;fileset dir=&quot;/tmp&quot;/&gt;
 &lt;/apply&gt;
 </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>
+
+<p>Invoke <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;apply executable=&quot;cc&quot; dest=&quot;src/C&quot; parallel=&quot;false&quot;&gt;
  &lt;arg value=&quot;-c&quot;/&gt;
@@ -384,10 +390,15 @@ with the absolute filenames of all files separated by spaces.</p>
  &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>
-<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>
+
+<p>Apply 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;mapper id=&quot;out&quot; type=&quot;glob&quot;
           from=&quot;src${file.separator}*.file&quot;
@@ -400,15 +411,9 @@ file.</p>
    &lt;outputmapper refid=&quot;out&quot;/&gt;
  &lt;/redirector&gt;
 &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>
+
+<p>Apply 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>
 <pre>
 &lt;apply executable="ls" parallel="true"
       force="true" dest="${basedir}" append="true" type="both"&gt;
@@ -417,9 +422,10 @@ in this case.</p>
  &lt;/path&gt;
  &lt;identitymapper/&gt;
 &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>

+<p>Convert all JavaScript files in the <samp>src</samp> directory using the command <kbd>jsmin &lt;
+src/a.js &gt; dest/a.js</kbd>. 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>
 <pre>
 &lt;apply executable="jsmin" addsourcefile="false"&gt;
    &lt;!-- Collect the JS-files --&gt;
@@ -432,9 +438,6 @@ listing all executables that are available on the <code>PATH</code>.</p>
        &lt;outputmapper id="out" type="glob" from="*.js" to="dest/*.js"/&gt;
    &lt;/redirector&gt;
 &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>
--- a/manual/Tasks/attrib.html
+++ b/manual/Tasks/attrib.html
@@ -60,9 +60,9 @@ alternative.</p>
 <h3>Parameters</h3>
 <table class="attr">
  <tr>
-    <th>Attribute</th>
-    <th>Description</th>
-    <th>Required</th>
+    <th scope="col">Attribute</th>
+    <th scope="col">Description</th>
+    <th scope="col">Required</th>
  </tr>
  <tr>
    <td>file</td>
@@ -129,16 +129,17 @@ alternative.</p>

 <h3>Examples</h3>

+<p>Make the <code>run.bat</code> file read-only and hidden.</p>
 <pre>&lt;attrib file=&quot;${dist}/run.bat&quot; readonly=&quot;true&quot; hidden=&quot;true&quot;/&gt;</pre>

-<p>makes the <code>run.bat</code> file read-only and hidden.</p>
-
+<p>Make all <samp>.xml</samp> files below <samp>${meta.inf}</samp> readable.</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>

-<p>makes all <samp>.xml</samp> files below <samp>${meta.inf}</samp> readable.</p>
-
+<p>Make 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>
 <pre>
 &lt;attrib readonly=&quot;true&quot; archive=&quot;true&quot;&gt;
  &lt;fileset dir=&quot;shared/sources1&quot;&gt;
@@ -147,9 +148,5 @@ alternative.</p>
  &lt;fileset refid=&quot;other.shared.sources&quot;/&gt;
 &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>