Merge tag 'rel/1.10.9'

Tagging version 1.10.9 of Ant # gpg: Signatur vom Mi 30 Sep 2020 18:21:08 CEST # gpg: mittels DSA-Schlüssel CE8075A251547BEE249BC151A2115AE15F6B8B72 # gpg: Aussteller "[email protected]" # gpg: Korrekte Signatur von "Stefan Bodewig <[email protected]>" [vollständig] # gpg: alias "Stefan Bodewig <[email protected]>" [vollständig] # gpg: alias "Stefan Bodewig <[email protected]>" [vollständig] # Haupt-Fingerabdruck = CE80 75A2 5154 7BEE 249B C151 A211 5AE1 5F6B 8B72
apache · Sep 30, 2020 · 6cd24d6 · 6cd24d6
2 parents f291dea + 15686e5
commit 6cd24d6
Show file tree

Hide file tree

Showing 33 changed files with 87 additions and 84 deletions.
diff --git a/WHATSNEW b/WHATSNEW
@@ -1,3 +1,6 @@
+Changes from Ant 1.10.9 TO Ant 1.10.10
+======================================
+
 Changes from Ant 1.10.8 TO Ant 1.10.9
 =====================================
 

diff --git 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.9alpha"/>
+  <property name="project.version" value="1.10.10alpha"/>
   <!-- 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.9-SNAPSHOT"/>
-  <property name="manifest-version" value="1.10.9"/>
+  <property name="pom.version" value="1.10.10-SNAPSHOT"/>
+  <property name="manifest-version" value="1.10.10"/>
   <property name="bootstrap.jar" value="ant-bootstrap.jar"/>
 
   <property name="ant.package" value="org/apache/tools/ant"/>

diff --git a/manual/cover.html b/manual/cover.html
@@ -19,7 +19,7 @@
 
 <head>
 <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
-<title>Apache Ant 1.10.9 User Manual</title>
+<title>Apache Ant 1.10.10 User Manual</title>
 </head>
 
 <body>

diff --git a/manual/credits.html b/manual/credits.html
@@ -61,7 +61,7 @@ <h1 class="center">Apache Ant User Manual</h1>
   <li>Craeg Strong (<a href="mailto:[email protected]">[email protected]</a>)</li>
 </ul>
 
-<p class="center">Version: 1.10.9</p>
+<p class="center">Version: 1.10.10</p>
 
 </body>
 </html>
diff --git a/release/ivy.xml b/release/ivy.xml
@@ -19,7 +19,7 @@
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
   <info organisation="org/apache"
-        module="ant" revision="1.10.9"/>
+        module="ant" revision="1.10.10"/>
   <publications xmlns:e="urn:ant.apache.org:ivy-extras">
     <artifact name="ant-parent" type="pom" ext="pom"/>
     <artifact name="ant-parent" type="pom.asc" ext="pom.asc"/>

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 name: ant
-version: "1.10.9alpha"
+version: "1.10.10alpha"
 summary: Apache Ant
 description: |
   Apache Ant™ is a Java library and command-line tool whose mission is

diff --git a/src/etc/poms/ant-antlr/pom.xml b/src/etc/poms/ant-antlr/pom.xml
@@ -27,21 +27,21 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.9-SNAPSHOT</version>
+    <version>1.10.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-antlr</artifactId>
-  <version>1.10.9-SNAPSHOT</version>
+  <version>1.10.10-SNAPSHOT</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>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.9-SNAPSHOT</version>
+      <version>1.10.10-SNAPSHOT</version>
       <optional>true</optional>
       <scope>compile</scope>
     </dependency>

diff --git a/src/etc/poms/ant-apache-bcel/pom.xml b/src/etc/poms/ant-apache-bcel/pom.xml
@@ -27,19 +27,19 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.9-SNAPSHOT</version>
+    <version>1.10.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-bcel</artifactId>
-  <version>1.10.9-SNAPSHOT</version>
+  <version>1.10.10-SNAPSHOT</version>
   <name>Apache Ant + BCEL</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.9-SNAPSHOT</version>
+      <version>1.10.10-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/src/etc/poms/ant-apache-bsf/pom.xml b/src/etc/poms/ant-apache-bsf/pom.xml
@@ -27,19 +27,19 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.9-SNAPSHOT</version>
+    <version>1.10.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-bsf</artifactId>
-  <version>1.10.9-SNAPSHOT</version>
+  <version>1.10.10-SNAPSHOT</version>
   <name>Apache Ant + BSF</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.9-SNAPSHOT</version>
+      <version>1.10.10-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/src/etc/poms/ant-apache-log4j/pom.xml b/src/etc/poms/ant-apache-log4j/pom.xml
@@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.9-SNAPSHOT</version>
+    <version>1.10.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>https://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-log4j</artifactId>
-  <version>1.10.9-SNAPSHOT</version>
+  <version>1.10.10-SNAPSHOT</version>
   <name>Apache Ant + Log4J</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.9-SNAPSHOT</version>
+      <version>1.10.10-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/src/etc/poms/ant-apache-oro/pom.xml b/src/etc/poms/ant-apache-oro/pom.xml
@@ -27,19 +27,19 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.9-SNAPSHOT</version>
+    <version>1.10.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-oro</artifactId>
-  <version>1.10.9-SNAPSHOT</version>
+  <version>1.10.10-SNAPSHOT</version>
   <name>Apache Ant + Apache Oro</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.9-SNAPSHOT</version>
+      <version>1.10.10-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/src/etc/poms/ant-apache-regexp/pom.xml b/src/etc/poms/ant-apache-regexp/pom.xml
@@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.9-SNAPSHOT</version>
+    <version>1.10.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-regexp</artifactId>
-  <version>1.10.9-SNAPSHOT</version>
+  <version>1.10.10-SNAPSHOT</version>
   <name>Apache Ant + Apache Regexp</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.9-SNAPSHOT</version>
+      <version>1.10.10-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/src/etc/poms/ant-apache-resolver/pom.xml b/src/etc/poms/ant-apache-resolver/pom.xml
@@ -26,19 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.9-SNAPSHOT</version>
+    <version>1.10.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-resolver</artifactId>
-  <version>1.10.9-SNAPSHOT</version>
+  <version>1.10.10-SNAPSHOT</version>
   <name>Apache Ant + Apache Resolver</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.9-SNAPSHOT</version>
+      <version>1.10.10-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/src/etc/poms/ant-apache-xalan2/pom.xml b/src/etc/poms/ant-apache-xalan2/pom.xml
@@ -26,20 +26,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.9-SNAPSHOT</version>
+    <version>1.10.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>https://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-xalan2</artifactId>
-  <version>1.10.9-SNAPSHOT</version>
+  <version>1.10.10-SNAPSHOT</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.10.9-SNAPSHOT</version>
+      <version>1.10.10-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/src/etc/poms/ant-commons-logging/pom.xml b/src/etc/poms/ant-commons-logging/pom.xml
@@ -26,20 +26,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.9-SNAPSHOT</version>
+    <version>1.10.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-commons-logging</artifactId>
-  <version>1.10.9-SNAPSHOT</version>
+  <version>1.10.10-SNAPSHOT</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.10.9-SNAPSHOT</version>
+      <version>1.10.10-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/src/etc/poms/ant-commons-net/pom.xml b/src/etc/poms/ant-commons-net/pom.xml
@@ -26,20 +26,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.9-SNAPSHOT</version>
+    <version>1.10.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-commons-net</artifactId>
-  <version>1.10.9-SNAPSHOT</version>
+  <version>1.10.10-SNAPSHOT</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.10.9-SNAPSHOT</version>
+      <version>1.10.10-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/src/etc/poms/ant-imageio/pom.xml b/src/etc/poms/ant-imageio/pom.xml
@@ -27,20 +27,20 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.9-SNAPSHOT</version>
+    <version>1.10.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-imageio</artifactId>
-  <version>1.10.9-SNAPSHOT</version>
+  <version>1.10.10-SNAPSHOT</version>
   <name>Apache Ant + ImageIO</name>
   <description>imageio task and corresponding types.</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.9-SNAPSHOT</version>
+      <version>1.10.10-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/src/etc/poms/ant-jai/pom.xml b/src/etc/poms/ant-jai/pom.xml
@@ -27,21 +27,21 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.9-SNAPSHOT</version>
+    <version>1.10.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jai</artifactId>
-  <version>1.10.9-SNAPSHOT</version>
+  <version>1.10.10-SNAPSHOT</version>
   <name>Apache Ant + JAI</name>
   <description>image task and corresponding types.
   </description>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.9-SNAPSHOT</version>
+      <version>1.10.10-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/src/etc/poms/ant-javamail/pom.xml b/src/etc/poms/ant-javamail/pom.xml
@@ -26,13 +26,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.9-SNAPSHOT</version>
+    <version>1.10.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>https://ant.apache.org/</url>
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-javamail</artifactId>
-  <version>1.10.9-SNAPSHOT</version>
+  <version>1.10.10-SNAPSHOT</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,7 +41,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.9-SNAPSHOT</version>
+      <version>1.10.10-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/src/etc/poms/ant-jdepend/pom.xml b/src/etc/poms/ant-jdepend/pom.xml
@@ -27,21 +27,21 @@
     <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.10.9-SNAPSHOT</version>
+    <version>1.10.10-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <url>https://ant.apache.org/</url>  
   <groupId>org.apache.ant</groupId>
   <artifactId>ant-jdepend</artifactId>
-  <version>1.10.9-SNAPSHOT</version>
+  <version>1.10.10-SNAPSHOT</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>
   <dependencies>
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.10.9-SNAPSHOT</version>
+      <version>1.10.10-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ @@
     <head>
     <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
-    <title>Apache Ant 1.10.9 User Manual</title>
+    <title>Apache Ant 1.10.10 User Manual</title>
     </head>
     <body>
@@ Expand Down @@