From 362f5f0c597846c67109972999cb4a7a977dc0ca Mon Sep 17 00:00:00 2001 From: jmkf Date: Sun, 4 Oct 2020 15:13:18 +0200 Subject: [PATCH 1/2] Jkf 1.10 requires jdk8 (#137) * Ant 1.10 requires jdk 8 doc update * Updated the manual to reflect ant requires JDK 8 + --- manual/Tasks/ear.html | 3 +- manual/Tasks/exec.html | 3 - manual/Tasks/jar.html | 6 +- manual/Tasks/javac.html | 12 +-- manual/Tasks/javadoc.html | 84 ++----------------- manual/Tasks/javah.html | 12 ++- manual/Tasks/junitreport.html | 20 ----- manual/Tasks/script.html | 7 +- manual/Tasks/splash.html | 2 +- manual/Tasks/style.html | 6 -- manual/Types/mapper.html | 9 +- manual/Types/regexp.html | 4 +- manual/develop.html | 4 +- manual/install.html | 11 +-- manual/platform.html | 38 --------- manual/running.html | 2 +- manual/tutorial-HelloWorldWithAnt.html | 3 +- .../tutorial-tasks-filesets-properties.html | 13 +-- 18 files changed, 42 insertions(+), 197 deletions(-) diff --git a/manual/Tasks/ear.html b/manual/Tasks/ear.html index 8396c6aadb..9afc0711eb 100644 --- a/manual/Tasks/ear.html +++ b/manual/Tasks/ear.html @@ -143,8 +143,7 @@

Parameters

index whether to create an index list to speed up classloading. This is a JDK 1.3+ specific feature. - Unless you specify additional jars with + target="_top">index list to speed up classloading. Unless you specify additional jars with nested indexjars elements, only the contents of this jar will be included in the index. No; defaults to false diff --git a/manual/Tasks/exec.html b/manual/Tasks/exec.html index 1d2eba2428..b298a65ec0 100644 --- a/manual/Tasks/exec.html +++ b/manual/Tasks/exec.html @@ -90,9 +90,6 @@

OpenVMS Users

an @-sign (e.g. executable=@[FOO]BAR.COM), just as you would in a DCL script -

For <exec> to work in an environment with a JVM older than version 1.4.1-2 it -is also required that the logical JAVA$FORK_SUPPORT_CHDIR is set -to TRUE in the job table (see the JDK Release Notes).

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 diff --git a/manual/Tasks/jar.html b/manual/Tasks/jar.html index 9db18f3090..555dab9a50 100644 --- a/manual/Tasks/jar.html +++ b/manual/Tasks/jar.html @@ -202,7 +202,7 @@

Parameters

index whether to create an index list to speed up classloading. This is a JDK 1.3+ specific feature. + target="_top">index list to speed up classloading. Unless you specify additional jars with nested indexjars elements, only the contents of this jar will be included in the index. No; defaults to false @@ -508,7 +508,7 @@

Inline manifest

Service Provider

The following shows how to create a jar file specifying a service with an implementation of the -JDK 6 scripting interface:

+scripting interface:

 <jar destfile="pinky.jar">
     <fileset dir="build/classes"/>
@@ -517,7 +517,7 @@ 
Service Provider

 </jar>

The following shows how to create a jar file specifying a service with two implementations of the -JDK 6 scripting interface:

+scripting interface:

 <jar destfile="pinkyandbrain.jar">
     <fileset dir="classes"/>
diff --git a/manual/Tasks/javac.html b/manual/Tasks/javac.html
index 30cf3b7cc0..ac770a2fee 100644
--- a/manual/Tasks/javac.html
+++ b/manual/Tasks/javac.html
@@ -73,7 +73,7 @@ 
Description

   
  • sj (Symantec Java compiler) – symantec can be used as an alias.
    • 
   
  • extJavac (run either modern or classic in a JVM of its own).
    • 
 
-
    The default is javac1.x with x depending on the JDK version you use while you are
+
    The default is javacX with X 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 org.apache.tools.ant.taskdefs.compilers). Supply the full classname in
@@ -93,7 +93,7 @@ 
    Description
    
 locks up the files present in the classpath of the <javac> 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.
    
-
    If you are using Java 8 or above and your source contains native methods or fields annotated with
+
    If your source contains native methods or fields annotated with
 the @Native annotation you can set the nativeheaderdir attribute in order to
 use the -h switch of javac 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 @@ 
    Parameters
    
   
     nativeheaderdir
     Specify where to place generated native header files.  Since Ant 1.9.8.
-    No, ignored when running on JDK 7 or earlier
+    No, ignored when compiling on JDK 7 or earlier
   
   
     release
     Specify the value for the --release switch.
    When set and running on JDK 9+
       the source and target attributes as well as the bootclasspath
       will be ignored.  Since Ant 1.9.8.
-    No, ignored when running on JDK 8 or earlier
+    No, ignored when compiling on JDK 8 or earlier
   
 
 
@@ -591,10 +591,6 @@ 
    Examples
    
        fork="true"
        taskname="javac1.4"/>
    -

    Note: 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.

    -

    If you want to activate other compiler options like lint you could use the <compilerarg> element:

    diff --git a/manual/Tasks/javadoc.html b/manual/Tasks/javadoc.html
index 452233cd6f..83987d8848 100644
--- a/manual/Tasks/javadoc.html
+++ b/manual/Tasks/javadoc.html
@@ -50,12 +50,6 @@ 
    Description
    
 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.
    
 
-
    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. JDKs prior to 1.4 are no longer supported.  If you specify
-the executable attribute it is up to you to ensure that this command supports the
-attributes you wish to use.
    
-
 
    Note: When generating the JavaDocs for classes which contains annotations you
 maybe get a java.lang.ClassCastException:
 com.sun.tools.javadoc.ClassDocImpl.  This is
@@ -82,13 +76,11 @@ 
    Parameters
    
   
     Attribute
     Description
-    Availability on Java
     Required
   
   
     sourcepath
     Specify where to find source files
-    all
     At least one of the four or
       nested <sourcepath>, <fileset>,
       module or <packageset>
@@ -97,62 +89,52 @@ 
    Parameters
    
     sourcepathref
     Specify where to find source files by reference to a
       sourcepath defined elsewhere.
-    all
   
   
     sourcefiles
     Comma separated list of source files—see also the nested source
       element.
-    all
   
   
     modulenames
     Comma separated list of module names -- see also
     the nested module element. since Ant 1.10.6
-    all
   
   
     destdir
     Destination directory for output files
-    all
     Yes, unless a doclet has been specified.
   
   
     maxmemory
     Max amount of memory to allocate to the javadoc JVM
-    all
     No
   
   
     packagenames
     Comma separated list of package files (with terminating wildcard)—see also the
       nested package element.
-    all
     No
   
   
     packageList
     The name of a file containing the packages to process
-    all
     No
   
   
     classpath
     Specify where to find user class files
-    all
     No
   
   
     Bootclasspath
     Override location of class files loaded by the bootstrap class loader
-    all
     No
   
   
     classpathref
     Specify where to find user class files by reference
       to a classpath defined elsewhere.
-    all
     No
   
   
@@ -160,136 +142,114 @@ 
    Parameters
    
     Override location of class files loaded by the bootstrap class loader
       by reference to a bootclasspath defined
       elsewhere.
-    all
     No
   
   
     Extdirs
     Override location of installed extensions
-    all
     No
   
   
     Overview
     Read overview documentation from HTML file
-    all
     No
   
   
     access
     Access mode: one of public, protected, package, or private
-    all
     No; default is protected
   
   
     Public
     Show only public classes and members
-    all
     No
   
   
     Protected
     Show protected/public classes and members (default)
-    all
     No
   
   
     Package
     Show package/protected/public classes and members
-    all
     No
   
   
     Private
     Show all classes and members
-    all
     No
   
   
     Old
-    Generate output using JDK 1.1 emulating doclet.
    Note: Since Ant
-      1.8.0 this attribute has no effect because javadoc of Java 1.4 and later
-      does not support the -1.1 switch anymore.
-    1.2
+    Generate output using JDK 1.1 emulating doclet.
    Note:
+      This attribute has no effect unless you're using an pre jdk 1.4 external javadoc 
+   
     No
   
   
     Verbose
     Output messages about what javadoc is doing
-    all
     No
   
   
     Locale
     Locale to be used, e.g. en_US or en_US_WIN
-    all
     No
   
   
     Encoding
     Source file encoding name
-    all
     No
   
   
     Version
     Include @version paragraphs
-    all
     No
   
   
     Use
     Create class and package usage pages
-    all
     No
   
   
     Author
     Include @author paragraphs
-    all
     No
   
   
     Splitindex
     Split index into one file per letter
-    all
     No
   
   
     Windowtitle
     Browser window title for the documentation (text)
-    all
     No
   
   
     Doctitle
     Include title for the package index (first) page (HTML code)
-    all
     No
   
   
     Header
     Include header text for each page (HTML code)
-    all
     No
   
   
     Footer
     Include footer text for each page (HTML code)
-    all
     No
   
   
     bottom
     Include bottom text for each page (HTML code)
-    all
     No
   
   
     link
     Create links to javadoc output at the given URL—see also the
       nested link element.
-    all
     No
   
   
@@ -298,7 +258,6 @@ 
    Parameters
    
       at alt-url by specifying a
       value url alt-url (space as separator). A shorthand for the
       nested link element with offline=true.
-    all
     No
   
   
@@ -306,94 +265,79 @@ 
    Parameters
    
     Group specified packages together in overview page.  The format is as
       described below—see also the nested group
       element.
-    all
     No
   
   
     nodeprecated
     Do not include @deprecated information
-    all
     No
   
   
     nodeprecatedlist
     Do not generate deprecated list
-    all
     No
   
   
     notree
     Do not generate class hierarchy
-    all
     No
   
   
     noindex
     Do not generate index
-    all
     No
   
   
     nohelp
     Do not generate help link
-    all
     No
   
   
     nonavbar
     Do not generate navigation bar
-    all
     No
   
   
     serialwarn
     Generate warning about @serial tag
-    all
     No
   
   
     helpfile
     Specifies the HTML help file to use
-    all
     No
   
   
     stylesheetfile
     Specifies the CSS stylesheet to use
-    all
     No
   
   
     charset
     Charset for cross-platform viewing of generated documentation
-    all
     No
   
   
     docencoding
     Output file encoding name
-    all
     No
   
   
     doclet
     Specifies the class file that starts the doclet used in generating the
       documentation—see also the nested doclet element.
-    all
     No
   
   
     docletpath
     Specifies the path to the doclet class file that is specified with the -doclet
       option.
-    all
     No
   
   
     docletpathref
     Specifies the path to the doclet class file that is specified with the -doclet
       option by reference to a path defined elsewhere.
-    all
     No
   
   
@@ -401,33 +345,28 @@ 
    Parameters
    
     Lets you add additional parameters to the javadoc command line. Useful for
       doclets. Parameters containing spaces need to be quoted using &quot;—see also the
       nested arg element.
-    all
     No
   
   
     failonerror
     Stop the build process if the command exits with a return code other than 0.
-    all
     No
   
   
     failonwarning
     Stop the build process if a warning is emitted—i.e. if javadoc's output
       contains the word warning.  since Ant 1.9.4
-    all
     No
   
   
     excludepackagenames
     comma separated list of packages you don't want docs for—see also the
       nested excludepackage element.
-    all
     No
   
   
     defaultexcludes
     indicates whether default excludes should be used (yes|no).
-    all
     No; defaults to yes
   
   
@@ -440,62 +379,54 @@ 
    Parameters
    
       If enabled, the file will be written to
       the temporary
       directory.
-    all
     No; default is no
   
   
     source
     Enable javadoc to handle Java language features.  Set this to 1.4 to
       document code that compiles using javac -source 1.4, etc.
-    1.4+
     No; default can be provided using the magic
     ant.build.javac.source property.
   
   
     linksource
     Generate hyperlinks to source files.  since Ant 1.6.  (yes|no).
-    1.4+
     No; default is no
   
   
     breakiterator
     Use the new break iterator algorithm.  since Ant 1.6.  (yes|no).
-    1.4+
     No; default is no
   
   
     noqualifier
     Enables the -noqualifier argument—must be all or a colon separated
       list of packages.  since Ant 1.6.
-    1.4+
     No
   
   
     includenosourcepackages
     If set to true, packages that don't contain Java source but
       a package.html will get documented as well.  since Ant 1.6.3.
-    all
     No; default is false
   
   
     executable
     Specify a particular javadoc executable to use in place of the default binary
-      (found in the same JDK as Ant is running in).  since Ant 1.6.3.
-    all
+      (found in the same JDK as Ant is running in).  since Ant 1.6.3. Note:
+      It is up to you to ensure that this command supports the attributes you wish to use.
     No
   
   
     docfilessubdirs
     Enables deep-copying of doc-files subdirectories. since Ant
       1.8.0.
-    1.4
     No; defaults to false
   
   
     excludedocfilessubdir
     Colon-separated list of doc-files subdirectories to exclude
       if docfilessubdirs is true. since Ant 1.8.0.
-    1.4
     No
   
   
@@ -506,14 +437,12 @@ 
    Parameters
    
       (details).  When this flag is set to true, Ant will check whether the
       docs are vulnerable and will try to fix them.
-    1.4
     No; defaults to true
   
   
     modulesourcepath
     Specify where to find module source files
       since Ant 1.10.6
-    all
     No
   
   
@@ -521,14 +450,12 @@ 
    Parameters
    
     Specify where to find module source files by reference to a PATH defined elsewhere.
       since Ant 1.10.6
-    all
     No
   
   
     modulepath
     Specify where to find module files
       since Ant 1.10.6
-    all
     No
   
   
@@ -536,7 +463,6 @@ 
    Parameters
    
     Specify where to find module files by reference to a PATH defined elsewhere.
       since Ant 1.10.6
-    all
     No
   
 
diff --git a/manual/Tasks/javah.html b/manual/Tasks/javah.html
index bc92bf9200..ce652aaa1b 100644
--- a/manual/Tasks/javah.html
+++ b/manual/Tasks/javah.html
@@ -28,11 +28,7 @@ 
    Javah
    
 
    Description
    
 
    Generates JNI headers from a Java class.
    
 
    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 JDK 1.2+
-or pre-1.2 JDK systems are used.
    
+implement native methods.
 
 
    If you are building with Java 8 or above consider
 using javac's nativeheaderdir attribute instead
@@ -86,13 +82,15 @@ 
    Parameters
    
   
   
     force
-    specifies that output files should always be written (JDK 1.2 only)
+    specifies that output files should always be written 
+    (only when using an external javah of JDK 1.2)
     No
   
   
     old
     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)
+      contain JNI-style native method function prototypes) 
+      (only when using an external javah of JDK 1.2)
     No
   
   
diff --git a/manual/Tasks/junitreport.html b/manual/Tasks/junitreport.html
index ce027d6010..27448e402a 100644
--- a/manual/Tasks/junitreport.html
+++ b/manual/Tasks/junitreport.html
@@ -33,26 +33,6 @@ 
    Description
    
 distribution. See Library Dependencies for more
 information.
    
 
-
    Requirements
    
-
-
    The task needs Apache Xalan 2.4.1+ or
-Xalan XSLTC (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.
    
-
-
-
-
-
-
    XalanSun JDK BundleStatus
    2.4.1+JDK 1.4.2-01+OK
    XSLTCJDK 1.5.xOK
    2.xJDK 1.4.xDeprecated,
-use ${ant.home}/etc/junit-frames-xalan1.xsl
    Upgrade Xalan using the JDK endorsement
-mechanism
    
-
-
    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.
    
-
    Since Ant 1.7, we dropped support for Xalan 1, because Xalan 1 was not available anymore
-for quite some time.
    
-
 
    Parameters
    
 
diff --git a/manual/Tasks/script.html b/manual/Tasks/script.html
index 32c2a91c7c..94c8187475 100644
--- a/manual/Tasks/script.html
+++ b/manual/Tasks/script.html
@@ -33,8 +33,8 @@ 
    Description
    Note: This task depends on external libraries not included in the Apache Ant
 distribution.  See Library Dependencies for more
 information.
    
-
    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 manager attribute. The JSR 223 scripting manager is
+
    The task may use the BSF scripting manager or the JSR 223 manager that is included in the JDK.
+This is controlled by the manager attribute. The JSR 223 scripting manager is
 indicated by javax.
    All items (tasks, targets, etc) of the running project are accessible from the script, using
 either their name or id attributes (as long as their names are considered
@@ -81,8 +81,7 @@ 
    Parameters
    
       values: auto, bsf or javax.
       
diff --git a/manual/Tasks/splash.html b/manual/Tasks/splash.html
index 6b54470e55..54945851a2 100644
--- a/manual/Tasks/splash.html
+++ b/manual/Tasks/splash.html
@@ -75,7 +75,7 @@ 
    Deprecated properties
    
-    
+    
diff --git a/manual/Tasks/style.html b/manual/Tasks/style.html
index 2ae47a1b20..9f0a16c68c 100644
--- a/manual/Tasks/style.html
+++ b/manual/Tasks/style.html
@@ -29,12 +29,6 @@ 
    XSLT
    Description
    Process a set of documents via XSLT.
    This is useful for building views of XML based documentation, or for generating code.
    
-
    Note: 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 Library Dependencies for more
-information.
    It is possible to refine the set of files that are being processed. This can be done with
 the includes, includesfile, excludes, excludesfile
 and defaultexcludes attributes. With the includes or includesfile
diff --git a/manual/Types/mapper.html b/manual/Types/mapper.html
index 67f33adf79..4e8fba5429 100644
--- a/manual/Types/mapper.html
+++ b/manual/Types/mapper.html
@@ -338,13 +338,6 @@ 
    regexp
    Note that you need to escape a dollar-sign ($) with another dollar-sign in Ant.
    
 
-
    The regexp mapper needs a supporting library and an implementation
-of org.apache.tools.ant.util.regexp.RegexpMatcher that hides the specifics
-of the library. Since Ant 1.8.0, Java 1.4 or later is required, so the implementation based
-on the java.util.regex 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 CLASSPATH.
    
-
 
    For information about using gnu.regexp or gnu.rex
 with Ant, see this
@@ -364,7 +357,7 @@ 
    regexp
  • If the system property ant.regexp.matcherimpl has been set, it is taken as the name
 of the class implementing org.apache.tools.ant.util.regexp.RegexpMatcher
 that should be used.
    • 
-
  • If it has not been set, uses the JDK 1.4 classes.
    • 
+
  • If it has not been set, uses the default from the java.util.regex package.
    • Examples
    
diff --git a/manual/Types/regexp.html b/manual/Types/regexp.html
index 3e06574b0d..3b661e8e1a 100644
--- a/manual/Types/regexp.html
+++ b/manual/Types/regexp.html
@@ -57,7 +57,7 @@ 
    Examples
    Choice of regular expression implementation
    Apache Ant comes with wrappers for
 the java.util.regex
+target="_top">java.util.regex
 package, jakarta-regexp and jakarta-ORO, see installation
@@ -82,7 +82,7 @@ 
    Choice of regular expression implementation
    We used to recommend that you use Jakarta ORO but since its development has been retired
diff --git a/manual/develop.html b/manual/develop.html
index 33cc48df08..5f738fcc8a 100644
--- a/manual/develop.html
+++ b/manual/develop.html
@@ -165,9 +165,9 @@ 
    Conversions Ant will perform for attributes
    
     inner AddAsisRemove class used in setCr for
     an example.
 
-  
  • A (Java 5) enumeration, Ant will call the setter with the enum constant matching the value
+  
  • An enumeration, Ant will call the setter with the enum constant matching the value
     given in the build file. This is easier than using EnumeratedAttribute
-    and can result in cleaner code, but of course your task will not run on JDK 1.4 or earlier. Note
+    and can result in cleaner code. Note
     that any override of toString() in the enumeration is ignored; the
     build file must use the declared name (see Enum.getName()). You may wish to use
     lowercase enum constant names, in contrast to usual Java style, to look better in build
diff --git a/manual/install.html b/manual/install.html
index 3984bee36b..11a184e61c 100644
--- a/manual/install.html
+++ b/manual/install.html
@@ -242,6 +242,7 @@ 
    System Requirements
    
 
    
 
    
   Note:
+    Ant 1.10.* works with JDK 8 and higher,
     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.
 
    
@@ -573,19 +574,19 @@ 
    Windows and OS/2
    
 
    Assume Ant is installed in c:\ant\. The following sets up the
 environment:
    
 
    set ANT_HOME=c:\ant
-set JAVA_HOME=c:\jdk1.7.0_51
+set JAVA_HOME=c:\jdk11.0.8_10
 set PATH=%PATH%;%ANT_HOME%\bin
    
 
 
    Linux/Unix (bash)
    
 
    Assume Ant is installed in /usr/local/ant. The following sets up
 the environment:
    
 
    export ANT_HOME=/usr/local/ant
-export JAVA_HOME=/usr/local/jdk1.7.0_51
+export JAVA_HOME=/usr/local/jdk-11.0.8+10
 export PATH=${PATH}:${ANT_HOME}/bin
    
 
 
    Linux/Unix (csh)
    
 
    setenv ANT_HOME /usr/local/ant
-setenv JAVA_HOME /usr/local/jdk/jdk1.7.0_51
+setenv JAVA_HOME=/usr/local/jdk-11.0.8+10
 set path=( $path $ANT_HOME/bin )
    
 
 
    
@@ -777,14 +778,14 @@ 
    Library Dependencies
    
   
    • 
+      java.util.regex)
     
+      java.util.regex) or ftp task with commons-net 1.4.1
     
diff --git a/manual/platform.html b/manual/platform.html
index 59c86c1b34..cfa42b148a 100644
--- a/manual/platform.html
+++ b/manual/platform.html
@@ -128,44 +128,6 @@ 
    Apple MacOS X/macOS
    
 like any other Unix.
 
    
 
-
    Novell Netware
    
-
    
-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).
-
    
-
-
    One important item of note is that you need to set up the following to run Ant:
    
-
      
-  
    • CLASSPATH—put ant.jar and any other needed jars on the system
-    classpath.
      • 
-  
    • ANT_OPTS—On NetWare, ANT_OPTS needs to include a parameter of
-    the form, -envCWD=ANT_HOME, with ANT_HOME being the
-    fully expanded location of Ant, not an environment variable.  This is due to
-    the fact that the NetWare System Console has no notion of a current working directory.
      • 
-
    
-
    It is suggested that you create up an ant.ncf that sets up these parameters, and
-calls perl ANT_HOME/dist/bin/runant.pl
    
-
    The following is an example of such an NCF file (assuming Ant is installed
-in sys:/apache-ant/):
    
-
    -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
    
-
-
    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.
    
-
    JVM 1.3 is supported on Novell NetWare versions 5.1 and higher.
    
-
 
    Other platforms
    
 
    
 Support for other platforms is not guaranteed to be complete, as certain techniques to hide platform
diff --git a/manual/running.html b/manual/running.html
index d451b08ccf..7248cd11aa 100644
--- a/manual/running.html
+++ b/manual/running.html
@@ -326,7 +326,7 @@ 
    Java System Properties
    
     
-  
diff --git a/manual/tutorial-HelloWorldWithAnt.html b/manual/tutorial-HelloWorldWithAnt.html
index dc244f470d..6e4d3968b4 100644
--- a/manual/tutorial-HelloWorldWithAnt.html
+++ b/manual/tutorial-HelloWorldWithAnt.html
@@ -239,8 +239,7 @@ 
    Using external libraries
    
 API—customizable to a high degree (including switching off during usual life (= not development) execution). We
 use Log4J for that, because
    
 
      
-
    • it is not part of the JDK (1.4+) and we want to show how to use external libs
      • 
-
    • it can run under JDK 1.2 (as Ant)
      • 
+
    • it is not part of the JDK and we want to show how to use external libs
      • 
 
    • it's highly configurable
      • 
 
    • it's from Apache ;-)
      • 
 
    
diff --git a/manual/tutorial-tasks-filesets-properties.html b/manual/tutorial-tasks-filesets-properties.html
index b9892ff1f6..b116f127be 100644
--- a/manual/tutorial-tasks-filesets-properties.html
+++ b/manual/tutorial-tasks-filesets-properties.html
@@ -658,7 +658,7 @@ 
    Contribute the new task
    
 
  • is the right package used?
    • 
 
  • does the code conform to the styleguide?
    • 
 
  • do all tests pass?
    • 
-
  • does the code compile on JDK 5 (and passes all tests there)?
    • 
+
  • does the code compile on the minimal and current JDK for the Ant distribution (and passes all tests there)?
    • 
 
  • code under Apache license
    • 
 
  • create a patch file
    • 
 
  • publishing that patch file
    • 
@@ -671,12 +671,12 @@ 
    Contribute the new task
    
 
  • Java file begins with Apache license statement. must do that
    • 
 
  • Task does not depend on GPL or LGPL code. ok
    • 
 
  • Source code complies with style guidelines have to check (checkstyle)
    • 
-
  • Code compiles and runs on Java 5 have to try
    • 
+
  • Code compiles and runs on minimal support java version have to try
    • 
 
  • Member variables are private, and provide public accessor methods if access is actually needed. have to
 check (checkstyle)
    • 
 
  • Maybe Task has failonerror attribute to control failure
 behaviour hasn't
    • 
-
  • New test cases written and succeed passed on JDK 8, have to try on JDK 5
    • 
+
  • New test cases written and succeed passed on newest jdk version, have to try on oldest supported jdk version
    • 
 
  • Documentation page written ok
    • 
 
  • Example task declarations in the documentation tested. ok (used in tests)
    • 
 
  • Message to dev contains [SUBMIT] and task name in subject to do
    • 
@@ -764,9 +764,10 @@ 
    Package / Directories
    
 
    Apache license statement
    
 
    Simply copy the license text from one the other source from the Ant source tree.
    
 
-
    Test on JDK 5
    
-
    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
+
    Test on the minimal JDK version
    
+
    Ant 1.10 uses Java 8 for development, but Ant 1.9 is actively maintained, too. That means that updates to Ant code 
+present in Ant 1.9 must be able to run on a JDK 5. (It is fine to address only ant 1.10 and above for new teasks.)
+So we have to test that. You can download older JDKs
 from Oracle [8].
    
 
 
    Clean the ANT_HOME variable, delete the build, bootstrap and dist

From 4ae9d1cd603ca52659891dcd391df813fcee6bb5 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig 
Date: Tue, 13 Oct 2020 19:27:59 +0200
Subject: [PATCH 2/2] bump JUnit to fix
 https://github.com/junit-team/junit4/security/advisories/GHSA-269g-pwp5-87pp

---
 lib/libraries.properties          | 2 +-
 src/etc/poms/ant-junit/pom.xml    | 2 +-
 src/etc/poms/ant-junit4/pom.xml   | 2 +-
 src/etc/poms/ant-testutil/pom.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/libraries.properties b/lib/libraries.properties
index fced7fb1cd..0bf5f1954d 100644
--- a/lib/libraries.properties
+++ b/lib/libraries.properties
@@ -58,7 +58,7 @@ javax.mail.version=1.5.6
 jdepend.version=2.9.1
 # Later versions are built with Java 7
 jruby.version=1.6.8
-junit.version=4.12
+junit.version=4.13.1
 # Later versions are built with Java 6
 rhino.version=1.7R5
 jsch.version=0.1.55
diff --git a/src/etc/poms/ant-junit/pom.xml b/src/etc/poms/ant-junit/pom.xml
index 4efa2b86c7..748b1ea381 100644
--- a/src/etc/poms/ant-junit/pom.xml
+++ b/src/etc/poms/ant-junit/pom.xml
@@ -45,7 +45,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     
       junit
       junit
-      4.12
+      4.13.1
       compile
     
   
diff --git a/src/etc/poms/ant-junit4/pom.xml b/src/etc/poms/ant-junit4/pom.xml
index f0a98b3fa2..a5912c2983 100644
--- a/src/etc/poms/ant-junit4/pom.xml
+++ b/src/etc/poms/ant-junit4/pom.xml
@@ -45,7 +45,7 @@
         
             junit
             junit
-            4.12
+            4.13.1
             compile
         
     
diff --git a/src/etc/poms/ant-testutil/pom.xml b/src/etc/poms/ant-testutil/pom.xml
index ee9a79659f..6cb8fffdc7 100644
--- a/src/etc/poms/ant-testutil/pom.xml
+++ b/src/etc/poms/ant-testutil/pom.xml
@@ -46,7 +46,7 @@
      
       junit
       junit
-      4.12
+      4.13.1
       compile
     
   

    
   
    
 
 
   
    
   
    
     useproxyUse a proxy to access imgurl.
    Note: Only tested on JDK 1.2.2 and above    		Use a proxy to access imgurl.
     No
   
    
   
    
 
 
 
 
 
 
 
 
 
 
 
 
 
 
    
     jakarta-regexp-1.4.jar
     regexp type with mappers (if you do not wish to use
-      java.util.regex)https://attic.apache.org/projects/jakarta-regexp.html
   
    
   
    
     jakarta-oro-2.0.8.jar
     regexp type with mappers (if you do not wish to use
-      java.util.regex) or ftp task with commons-net 1.4.1https://attic.apache.org/projects/jakarta-oro.html
   
    
   ant.regexp.regexpimpl
   classnameclassname for a RegExp implementation; by default, JDK 1.4+
+  classname for a RegExp implementation; by default the java.util.regex
   implementation; RegExp
   Mapper "Choice of regular expression implementation".