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 65f60bf01ecffb1444a7645c0db8f01f298f796a Merge: dbceb60 e04bc34 Author: Stefan Bodewig <[email protected]> AuthorDate: Wed May 13 18:18:11 2020 +0200 Merge tag 'rel/1.10.8' and bump versions Tagging version 1.10.8 of Ant WHATSNEW | 3 +++ build.xml | 6 +++--- manual/cover.html | 6 +++--- 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, 89 insertions(+), 86 deletions(-) diff --cc WHATSNEW index 6a74163,6a74163..2a39fb8 --- a/WHATSNEW +++ b/WHATSNEW @@@ -1,3 -1,3 +1,6 @@@ ++Changes from Ant 1.10.8 TO Ant 1.10.9 ++===================================== ++ Changes from Ant 1.10.7 TO Ant 1.10.8 ===================================== diff --cc build.xml index 047d459,76df251..4e157d6 --- 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.8alpha"/> - <property name="project.version" value="1.10.8"/> ++ <property name="project.version" value="1.10.9alpha"/> <!-- 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.8-SNAPSHOT"/> - <property name="pom.version" value="1.10.8"/> -- <property name="manifest-version" value="1.10.8"/> ++ <property name="pom.version" value="1.10.9-SNAPSHOT"/> ++ <property name="manifest-version" value="1.10.9"/> <property name="bootstrap.jar" value="ant-bootstrap.jar"/> <property name="ant.package" value="org/apache/tools/ant"/> diff --cc manual/cover.html index 76d0713,76d0713..643a897 --- a/manual/cover.html +++ b/manual/cover.html @@@ -19,13 -19,13 +19,13 @@@ <head> <link rel="stylesheet" type="text/css" href="stylesheets/style.css"> --<title>Apache Ant 1.10.8 User Manual</title> ++<title>Apache Ant 1.10.9 User Manual</title> </head> <body> <h1 class="center"><img src="images/ant_logo_large.gif" width="190" height="120" alt="Apache Ant logo"></h1> -- <h1 class="center">Apache Ant™ 1.10.8 Manual</h1> -- <p>This is the manual for version 1.10.8 of <a href="https://ant.apache.org/"; target="_top">Apache Ant</a>. If your ++ <h1 class="center">Apache Ant™ 1.10.9 Manual</h1> ++ <p>This is the manual for version 1.10.9 of <a href="https://ant.apache.org/"; target="_top">Apache Ant</a>. If your version of Ant (as verified with <kbd>ant -version</kbd>) is older or newer than this version then this is not the correct manual set. Please use the documentation appropriate to your current version. Also, if you are using a version older than the most recent release, we recommend an upgrade to fix bugs as well as provide new diff --cc manual/credits.html index 7271109,7271109..22377a1 --- a/manual/credits.html +++ b/manual/credits.html @@@ -61,7 -61,7 +61,7 @@@ <li>Craeg Strong (<a href="mailto:[email protected]";>[email protected]</a>)</li> </ul> --<p class="center">Version: 1.10.8</p> ++<p class="center">Version: 1.10.9</p> </body> </html> diff --cc release/ivy.xml index 9634f05,9634f05..d6bef60 --- 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.8"/> ++ module="ant" revision="1.10.9"/> <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 be8a572,ac0da11..e77faac --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@@ -14,7 -14,7 +14,7 @@@ # limitations under the License. name: ant - version: "1.10.8alpha" -version: "1.10.8" ++version: "1.10.9alpha" 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 cd9f59a,92bb21b..f34877b --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <optional>true</optional> <scope>compile</scope> </dependency> diff --cc src/etc/poms/ant-apache-bcel/pom.xml index 5320ad2,a7c2a67..92630a4 --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <name>Apache Ant + BCEL</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-apache-bsf/pom.xml index 1eae3e8,ff6c61e..ddaa63b --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <name>Apache Ant + BSF</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-apache-log4j/pom.xml index 561f6be,2f03dc2..ff19cb4 --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <name>Apache Ant + Log4J</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-apache-oro/pom.xml index a714074,35096a2..e340228 --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <name>Apache Ant + Apache Oro</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-apache-regexp/pom.xml index 27f6032,14de4da..12567c0 --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <name>Apache Ant + Apache Regexp</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-apache-resolver/pom.xml index b8271dd,647fba2..e5e23a7 --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <name>Apache Ant + Apache Resolver</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-apache-xalan2/pom.xml index d7d2cc0,2bc3447..1d84634 --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-commons-logging/pom.xml index 1f15c49,59b6dab..fff7074 --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-commons-net/pom.xml index b952afb,339b789..1467637 --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-imageio/pom.xml index 39dd992,b9ee0c8..fce93c0 --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> diff --cc src/etc/poms/ant-jai/pom.xml index e30c1a0,ccdb0a8..e2f496e --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-javamail/pom.xml index 61ed341,a4d9734..30e8fb4 --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-jdepend/pom.xml index 318ffec,fe8b229..4e7f2c8 --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-jmf/pom.xml index c11c1f1,34e0050..e5ad8c9 --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> diff --cc src/etc/poms/ant-jsch/pom.xml index 86472f6,23fbfa3..da08df8 --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-junit/pom.xml index ce8f213,1231f28..2116db0 --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-junit4/pom.xml index 8c897f4,8f17c3b..eb65486 --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-junitlauncher/pom.xml index b8f809f,b79390f..10a16ca --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-launcher/pom.xml index a9d3e47,19427f5..ec1d9fd --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <name>Apache Ant Launcher</name> <build> <plugins> diff --cc src/etc/poms/ant-netrexx/pom.xml index 7a6f6c2,be012c0..b8969c2 --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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 0b4c570,1e50e63..7d70705 --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> diff --cc src/etc/poms/ant-testutil/pom.xml index fe3adc9,5477f63..1698967 --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-xz/pom.xml index 762ae85,a6b70b3..52ecf55 --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant/pom.xml index 678afee,81ce072..d0029eb --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/pom.xml index 5f3a590,a0af55c..e85fcaf --- 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.8-SNAPSHOT</version> - <version>1.10.8</version> ++ <version>1.10.9-SNAPSHOT</version> <packaging>pom</packaging> <description>master POM</description> <licenses> diff --cc src/etc/testcases/taskdefs/conditions/antversion.xml index 39e8739,39e8739..b1305a4 --- 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.8" /> ++ <antversion exactly="1.10.9" /> </not> </condition> -- Should be exactly 1.10.8 ++ Should be exactly 1.10.9 </fail> </target>
