This is an automated email from the ASF dual-hosted git repository. bodewig pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ant.git
commit 6cd24d61638cba06fabd2d4057d55987a5fe4058 Merge: f291dea 15686e5 Author: Stefan Bodewig <bode...@apache.org> AuthorDate: Wed Sep 30 18:31:28 2020 +0200 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 "bode...@apache.org" # gpg: Korrekte Signatur von "Stefan Bodewig <bode...@apache.org>" [vollständig] # gpg: alias "Stefan Bodewig <stefan.bode...@freenet.de>" [vollständig] # gpg: alias "Stefan Bodewig <ste...@samaflost.de>" [vollständig] # Haupt-Fingerabdruck = CE80 75A2 5154 7BEE 249B C151 A211 5AE1 5F6B 8B72 WHATSNEW | 3 +++ build.xml | 6 +++--- manual/cover.html | 2 +- manual/credits.html | 2 +- release/ivy.xml | 2 +- snap/snapcraft.yaml | 2 +- src/etc/poms/ant-antlr/pom.xml | 6 +++--- src/etc/poms/ant-apache-bcel/pom.xml | 6 +++--- src/etc/poms/ant-apache-bsf/pom.xml | 6 +++--- src/etc/poms/ant-apache-log4j/pom.xml | 6 +++--- src/etc/poms/ant-apache-oro/pom.xml | 6 +++--- src/etc/poms/ant-apache-regexp/pom.xml | 6 +++--- src/etc/poms/ant-apache-resolver/pom.xml | 6 +++--- src/etc/poms/ant-apache-xalan2/pom.xml | 6 +++--- src/etc/poms/ant-commons-logging/pom.xml | 6 +++--- src/etc/poms/ant-commons-net/pom.xml | 6 +++--- src/etc/poms/ant-imageio/pom.xml | 6 +++--- src/etc/poms/ant-jai/pom.xml | 6 +++--- src/etc/poms/ant-javamail/pom.xml | 6 +++--- src/etc/poms/ant-jdepend/pom.xml | 6 +++--- src/etc/poms/ant-jmf/pom.xml | 6 +++--- src/etc/poms/ant-jsch/pom.xml | 6 +++--- src/etc/poms/ant-junit/pom.xml | 6 +++--- src/etc/poms/ant-junit4/pom.xml | 6 +++--- src/etc/poms/ant-junitlauncher/pom.xml | 6 +++--- src/etc/poms/ant-launcher/pom.xml | 4 ++-- src/etc/poms/ant-netrexx/pom.xml | 6 +++--- src/etc/poms/ant-swing/pom.xml | 6 +++--- src/etc/poms/ant-testutil/pom.xml | 6 +++--- src/etc/poms/ant-xz/pom.xml | 6 +++--- src/etc/poms/ant/pom.xml | 6 +++--- src/etc/poms/pom.xml | 2 +- src/etc/testcases/taskdefs/conditions/antversion.xml | 4 ++-- 33 files changed, 87 insertions(+), 84 deletions(-) diff --cc WHATSNEW index 6142efa,2ff4e0e..f17bf4b --- a/WHATSNEW +++ b/WHATSNEW @@@ -1,3 -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 --cc build.xml index 3e75320,8d0db0d..21260f9 --- a/build.xml +++ b/build.xml @@@ -33,10 -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.9"/> ++ <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="pom.version" value="1.10.9"/> -- <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 --cc manual/cover.html index 643a897,643a897..eee288e --- a/manual/cover.html +++ b/manual/cover.html @@@ -19,7 -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 --cc manual/credits.html index 22377a1,22377a1..5c8f03e --- a/manual/credits.html +++ b/manual/credits.html @@@ -61,7 -61,7 +61,7 @@@ <li>Craeg Strong (<a href="mailto:cstr...@arielpartners.com">cstr...@arielpartners.com</a>)</li> </ul> --<p class="center">Version: 1.10.9</p> ++<p class="center">Version: 1.10.10</p> </body> </html> diff --cc release/ivy.xml index d6bef60,d6bef60..b970841 --- a/release/ivy.xml +++ b/release/ivy.xml @@@ -19,7 -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 --cc snap/snapcraft.yaml index e77faac,6b392ef..9f601c6 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@@ -14,7 -14,7 +14,7 @@@ # limitations under the License. name: ant - version: "1.10.9alpha" -version: "1.10.9" ++version: "1.10.10alpha" summary: Apache Ant description: | Apache Ant™ is a Java library and command-line tool whose mission is diff --cc src/etc/poms/ant-antlr/pom.xml index f34877b,d4df6fd..e1ce876 --- a/src/etc/poms/ant-antlr/pom.xml +++ b/src/etc/poms/ant-antlr/pom.xml @@@ -27,13 -27,13 +27,13 @@@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</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.9</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> @@@ -41,7 -41,7 +41,7 @@@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <optional>true</optional> <scope>compile</scope> </dependency> diff --cc src/etc/poms/ant-apache-bcel/pom.xml index 92630a4,6845ab8..e26c74b --- a/src/etc/poms/ant-apache-bcel/pom.xml +++ b/src/etc/poms/ant-apache-bcel/pom.xml @@@ -27,19 -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.9</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.9</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.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-apache-bsf/pom.xml index ddaa63b,cc9e2c7..3d0a84d --- a/src/etc/poms/ant-apache-bsf/pom.xml +++ b/src/etc/poms/ant-apache-bsf/pom.xml @@@ -27,19 -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.9</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.9</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.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-apache-log4j/pom.xml index ff19cb4,47025f9..d580f96 --- a/src/etc/poms/ant-apache-log4j/pom.xml +++ b/src/etc/poms/ant-apache-log4j/pom.xml @@@ -26,19 -26,19 +26,19 @@@ xsi:schemaLocation="http://maven.apache <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</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.9</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.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-apache-oro/pom.xml index e340228,90e9817..4755ece --- a/src/etc/poms/ant-apache-oro/pom.xml +++ b/src/etc/poms/ant-apache-oro/pom.xml @@@ -27,19 -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.9</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.9</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.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-apache-regexp/pom.xml index 12567c0,e264e25..2175651 --- a/src/etc/poms/ant-apache-regexp/pom.xml +++ b/src/etc/poms/ant-apache-regexp/pom.xml @@@ -26,19 -26,19 +26,19 @@@ xsi:schemaLocation="http://maven.apache <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</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.9</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.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-apache-resolver/pom.xml index e5e23a7,4c3f2cd..7dd5ca9 --- a/src/etc/poms/ant-apache-resolver/pom.xml +++ b/src/etc/poms/ant-apache-resolver/pom.xml @@@ -26,19 -26,19 +26,19 @@@ xsi:schemaLocation="http://maven.apache <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</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.9</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.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-apache-xalan2/pom.xml index 1d84634,133c98b..6dc91c6 --- a/src/etc/poms/ant-apache-xalan2/pom.xml +++ b/src/etc/poms/ant-apache-xalan2/pom.xml @@@ -26,20 -26,20 +26,20 @@@ xsi:schemaLocation="http://maven.apache <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</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.9</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.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-commons-logging/pom.xml index fff7074,66ab8ef..ac50996 --- a/src/etc/poms/ant-commons-logging/pom.xml +++ b/src/etc/poms/ant-commons-logging/pom.xml @@@ -26,20 -26,20 +26,20 @@@ xsi:schemaLocation="http://maven.apache <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</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.9</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.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-commons-net/pom.xml index 1467637,92d5acd..3badb2e --- a/src/etc/poms/ant-commons-net/pom.xml +++ b/src/etc/poms/ant-commons-net/pom.xml @@@ -26,20 -26,20 +26,20 @@@ xsi:schemaLocation="http://maven.apache <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</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.9</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.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-imageio/pom.xml index fce93c0,6b27a5d..90ce17a --- a/src/etc/poms/ant-imageio/pom.xml +++ b/src/etc/poms/ant-imageio/pom.xml @@@ -27,20 -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.9</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.9</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.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> diff --cc src/etc/poms/ant-jai/pom.xml index e2f496e,fe2049b..dcbd0b9 --- a/src/etc/poms/ant-jai/pom.xml +++ b/src/etc/poms/ant-jai/pom.xml @@@ -27,13 -27,13 +27,13 @@@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</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.9</version> ++ <version>1.10.10-SNAPSHOT</version> <name>Apache Ant + JAI</name> <description>image task and corresponding types. </description> @@@ -41,7 -41,7 +41,7 @@@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-javamail/pom.xml index 30e8fb4,316f2f0..236dc48 --- a/src/etc/poms/ant-javamail/pom.xml +++ b/src/etc/poms/ant-javamail/pom.xml @@@ -26,13 -26,13 +26,13 @@@ xsi:schemaLocation="http://maven.apache <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</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.9</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 +41,7 @@@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-jdepend/pom.xml index 4e7f2c8,aef2e37..1fdbb2b --- a/src/etc/poms/ant-jdepend/pom.xml +++ b/src/etc/poms/ant-jdepend/pom.xml @@@ -27,13 -27,13 +27,13 @@@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</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.9</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> @@@ -41,7 -41,7 +41,7 @@@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-jmf/pom.xml index e5ad8c9,d1725a1..faa95e9 --- a/src/etc/poms/ant-jmf/pom.xml +++ b/src/etc/poms/ant-jmf/pom.xml @@@ -26,13 -26,13 +26,13 @@@ xsi:schemaLocation="http://maven.apache <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</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-jmf</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <name>Apache Ant + JMF</name> <description>contains the sound task and a soundplayer listener download the dependency from https://java.sun.com/products/java-media/jmf/</description> @@@ -40,7 -40,7 +40,7 @@@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> diff --cc src/etc/poms/ant-jsch/pom.xml index da08df8,82732a0..113ca10 --- a/src/etc/poms/ant-jsch/pom.xml +++ b/src/etc/poms/ant-jsch/pom.xml @@@ -26,13 -26,13 +26,13 @@@ xsi:schemaLocation="http://maven.apache <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</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-jsch</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <name>Apache Ant + JSch</name> <description>contains the sshexec and scp tasks </description> @@@ -40,7 -40,7 +40,7 @@@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-junit/pom.xml index 2116db0,fb1cc9e..10270f1 --- a/src/etc/poms/ant-junit/pom.xml +++ b/src/etc/poms/ant-junit/pom.xml @@@ -26,20 -26,20 +26,20 @@@ xsi:schemaLocation="http://maven.apache <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</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-junit</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</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.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-junit4/pom.xml index eb65486,4baba35..0d423b5 --- a/src/etc/poms/ant-junit4/pom.xml +++ b/src/etc/poms/ant-junit4/pom.xml @@@ -26,20 -26,20 +26,20 @@@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</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-junit4</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</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.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-junitlauncher/pom.xml index 10a16ca,3ea15be..10002d0 --- a/src/etc/poms/ant-junitlauncher/pom.xml +++ b/src/etc/poms/ant-junitlauncher/pom.xml @@@ -26,20 -26,20 +26,20 @@@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</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-junitlauncher</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</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.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-launcher/pom.xml index ec1d9fd,b30e05b..0e53bec --- a/src/etc/poms/ant-launcher/pom.xml +++ b/src/etc/poms/ant-launcher/pom.xml @@@ -27,13 -27,13 +27,13 @@@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</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-launcher</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <name>Apache Ant Launcher</name> <build> <plugins> diff --cc src/etc/poms/ant-netrexx/pom.xml index b8969c2,4ab6b11..b4f703d --- a/src/etc/poms/ant-netrexx/pom.xml +++ b/src/etc/poms/ant-netrexx/pom.xml @@@ -26,13 -26,13 +26,13 @@@ xsi:schemaLocation="http://maven.apache <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</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-netrexx</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <name>Apache Ant + NetRexx</name> <description>NetRexxC task dependency can be downloaded from https://www.ibm.com/software/awdtools/netrexx/download.html</description> @@@ -40,7 -40,7 +40,7 @@@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <!-- Processed too early, before maven-antrun-plugin gets a chance to work: diff --cc src/etc/poms/ant-swing/pom.xml index 7d70705,7bea85d..9056220 --- a/src/etc/poms/ant-swing/pom.xml +++ b/src/etc/poms/ant-swing/pom.xml @@@ -27,20 -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.9</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-swing</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</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.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> diff --cc src/etc/poms/ant-testutil/pom.xml index 1698967,d59bd4f..bf26062 --- a/src/etc/poms/ant-testutil/pom.xml +++ b/src/etc/poms/ant-testutil/pom.xml @@@ -27,20 -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.9</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-testutil</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <name>Apache Ant Test Utilities</name> <description>test utility classes</description> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-xz/pom.xml index 52ecf55,89779a9..1786d91 --- a/src/etc/poms/ant-xz/pom.xml +++ b/src/etc/poms/ant-xz/pom.xml @@@ -26,20 -26,20 +26,20 @@@ xsi:schemaLocation="http://maven.apache <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</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-xz</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</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.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant/pom.xml index 0a9e079,aa2c522..508f033 --- a/src/etc/poms/ant/pom.xml +++ b/src/etc/poms/ant/pom.xml @@@ -27,13 -27,13 +27,13 @@@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</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</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <name>Apache Ant Core</name> <properties> <modules.exclude>org/apache/tools/ant/taskdefs/modules/</modules.exclude> @@@ -42,7 -42,7 +42,7 @@@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant-launcher</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/pom.xml index e85fcaf,5879ab1..2a12d38 --- a/src/etc/poms/pom.xml +++ b/src/etc/poms/pom.xml @@@ -26,7 -26,7 +26,7 @@@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> - <version>1.10.9-SNAPSHOT</version> - <version>1.10.9</version> ++ <version>1.10.10-SNAPSHOT</version> <packaging>pom</packaging> <description>master POM</description> <licenses> diff --cc src/etc/testcases/taskdefs/conditions/antversion.xml index b1305a4,b1305a4..07dc7c5 --- a/src/etc/testcases/taskdefs/conditions/antversion.xml +++ b/src/etc/testcases/taskdefs/conditions/antversion.xml @@@ -32,10 -32,10 +32,10 @@@ <fail> <condition> <not> -- <antversion exactly="1.10.9" /> ++ <antversion exactly="1.10.10" /> </not> </condition> -- Should be exactly 1.10.9 ++ Should be exactly 1.10.10 </fail> </target>