Merge branch 'master' into fresh-dependencies

lib/libraries.properties

@@ -55,7 +55,7 @@ jasper-compiler.version=4.1.36
 jasper-runtime.version=${jasper-compiler.version}
 jdepend.version=2.9.1
 jruby.version=1.6.8
-junit.version=4.13
+junit.version=4.13.1
 rhino.version=1.7.13
 junit-platform-launcher.version=1.2.0
 # Only used for internal tests in Ant project

manual/Tasks/ear.html

@@ -143,8 +143,7 @@ <h3>Parameters</h3>
     <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
+      target="_top">index list</a> to speed up classloading.  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>

manual/Tasks/exec.html

@@ -90,9 +90,6 @@ <h4>OpenVMS Users</h4>
     an <q>@</q>-sign (e.g. <var>executable</var>=<q>@[FOO]BAR.COM</q>), just as you would in a DCL
     script</li>
 </ul>
-<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

manual/Tasks/jar.html

@@ -202,7 +202,7 @@ <h3>Parameters</h3>
     <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.
+      target="_top">index list</a> to speed up classloading.
       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>
@@ -508,7 +508,7 @@ <h4>Inline manifest</h4>
 <h4>Service Provider</h4>
 
 <p>The following shows how to create a jar file specifying a service with an implementation of the
-JDK 6 scripting interface:</p>
+scripting interface:</p>
 <pre>
 &lt;jar destfile="pinky.jar"&gt;
     &lt;fileset dir="build/classes"/&gt;
@@ -517,7 +517,7 @@ <h4>Service Provider</h4>
 &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>
+scripting interface:</p>
 <pre>
 &lt;jar destfile="pinkyandbrain.jar"&gt;
     &lt;fileset dir="classes"/&gt;

manual/Tasks/javac.html

@@ -73,7 +73,7 @@ <h3>Description</h3>
   <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 <q>javac1.x</q> with <q>x</q> depending on the JDK version you use while you are
+<p>The default is <q>javacX</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
@@ -93,7 +93,7 @@ <h3>Description</h3>
 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
+<p>If 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,
@@ -404,14 +404,14 @@ <h3>Parameters</h3>
   <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>
+    <td>No, ignored when compiling 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>
+    <td>No, ignored when compiling on JDK 8 or earlier</td>
   </tr>
 </table>
 
@@ -591,10 +591,6 @@ <h3>Examples</h3>
        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>