This is an automated email from the ASF dual-hosted git repository. bodewig pushed a commit to branch 1.9.x in repository https://gitbox.apache.org/repos/asf/ant.git
commit 157a54d146a485b9ce6b3761d927e0b6c5710e9f Merge: d1ccd32 ea698c4 Author: Stefan Bodewig <[email protected]> AuthorDate: Tue Jul 13 07:39:14 2021 +0200 Merge tag 'rel/1.9.16' and prepare for next iteration Apache Ant 1.9.16 ReleaseInstructions | 3 ++- WHATSNEW | 5 +++++ 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-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-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/pom.xml | 6 +++--- src/etc/poms/pom.xml | 2 +- src/etc/testcases/taskdefs/conditions/antversion.xml | 12 ++++++------ 31 files changed, 88 insertions(+), 82 deletions(-) diff --cc ReleaseInstructions index 18f0f45,5229e13..ff494b6 --- a/ReleaseInstructions +++ b/ReleaseInstructions @@@ -286,7 -286,7 +286,8 @@@ Note: This document was updated in the * ivy.xml in release subdirectory * WHATSNEW (add a new section) * src/etc/testcases/taskdefs/conditions/antversion.xml -- * snap/snapcraft.yml (bump version to [newversion]alpha) ++ * snap/snapcraft.yml (bump version to [newversion]alpha and set grade ++ to devel) Amend the merge commit diff --cc WHATSNEW index 89b4cfa,89b4cfa..ba647fb --- a/WHATSNEW +++ b/WHATSNEW @@@ -1,3 -1,3 +1,6 @@@ ++Changes from Ant 1.9.16 TO Ant 1.9.17 ++===================================== ++ Changes from Ant 1.9.15 TO Ant 1.9.16 ===================================== @@@ -13,6 -13,6 +16,8 @@@ Fixed bugs central repository didn't contain any source files. Bugzilla Report 65110 ++ * fixed potential OutOfMemory errors when reading broken archives ++ using the tar or zip formats or formats derived from zip. Changes from Ant 1.9.14 TO Ant 1.9.15 ===================================== diff --cc build.xml index 01cda3f,0e89184..56f450a --- 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.9.16alpha"/> - <property name="project.version" value="1.9.16"/> ++ <property name="project.version" value="1.9.17alpha"/> <!-- 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.9.16-SNAPSHOT"/> - <property name="pom.version" value="1.9.16"/> -- <property name="manifest-version" value="1.9.16"/> ++ <property name="pom.version" value="1.9.17-SNAPSHOT"/> ++ <property name="manifest-version" value="1.9.17"/> <property name="bootstrap.jar" value="ant-bootstrap.jar"/> <property name="ant.package" value="org/apache/tools/ant"/> diff --cc manual/cover.html index fc665e0,fc665e0..62ae2d3 --- a/manual/cover.html +++ b/manual/cover.html @@@ -19,14 -19,14 +19,14 @@@ <head> <meta http-equiv="Content-Language" content="en-us"> <link rel="stylesheet" type="text/css" href="stylesheets/style.css"> --<title>Apache Ant 1.9.16 User Manual</title> ++<title>Apache Ant 1.9.17 User Manual</title> </head> <body bgcolor="#FFFFFF"> <div align="center"> <h1><img src="images/ant_logo_large.gif" width="190" height="120"></h1> -- <h1>Apache Ant™ 1.9.16 Manual</h1> -- <p align="left">This is the manual for version 1.9.16 of ++ <h1>Apache Ant™ 1.9.17 Manual</h1> ++ <p align="left">This is the manual for version 1.9.17 of <a target="_top" href="http://ant.apache.org/index.html";>Apache Ant</a>. If your version of Ant (as verified with <tt>ant -version</tt>) is older or newer than this diff --cc manual/credits.html index 000952f,000952f..c29df94 --- a/manual/credits.html +++ b/manual/credits.html @@@ -61,7 -61,7 +61,7 @@@ </ul> <center> --<p>Version: 1.9.16</p> ++<p>Version: 1.9.17</p> </center> diff --cc release/ivy.xml index 7810de5,7810de5..ebb2a13 --- 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.9.16"/> ++ module="ant" revision="1.9.17"/> <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 8447296,b352f87..c644c82 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@@ -14,7 -14,7 +14,7 @@@ # limitations under the License. name: ant - version: "1.9.16alpha" -version: "1.9.16" ++version: "1.9.17alpha" 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 2e73c9d,8937fc7..87e3c8c --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-antlr</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <optional>true</optional> <scope>compile</scope> </dependency> diff --cc src/etc/poms/ant-apache-bcel/pom.xml index faec5fc,0538715..554643e --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-bcel</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <name>Apache Ant + BCEL</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-apache-bsf/pom.xml index cfe739b,a0bfd90..399a41a --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-bsf</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <name>Apache Ant + BSF</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-apache-log4j/pom.xml index 8632014,3fb1fb8..33262ee --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-log4j</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <name>Apache Ant + Log4J</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-apache-oro/pom.xml index cd4d259,5e5db28..fb37437 --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-oro</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <name>Apache Ant + Apache Oro</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-apache-regexp/pom.xml index 03d4ea7,59a86d2..ed45f6c --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-regexp</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <name>Apache Ant + Apache Regexp</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-apache-resolver/pom.xml index 76aee27,b46e04d..abc6dd3 --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-resolver</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <name>Apache Ant + Apache Resolver</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-apache-xalan2/pom.xml index 797d11c,04df4bc..1dc0e44 --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-apache-xalan2</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-commons-logging/pom.xml index f33f8f8,0e8ec39..a83eadd --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-commons-logging</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-commons-net/pom.xml index 0005ca3,b5fb9af..caefda5 --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-commons-net</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-jai/pom.xml index b895fbb,a599555..f2d8220 --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-jai</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-javamail/pom.xml index b9846c2,51d8bb1..9765ca5 --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-javamail</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-jdepend/pom.xml index 12fa8ac,8827bbb..aeb76de --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-jdepend</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-jmf/pom.xml index be4e3b2,90d1eda..3c28756 --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-jmf</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <name>Apache Ant + JMF</name> <description>contains the sound task and a soundplayer listener download the dependency from http://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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> diff --cc src/etc/poms/ant-jsch/pom.xml index 3836005,51e7cd4..ffd671e --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-jsch</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-junit/pom.xml index 748b1ea,28bdf7c..82b3aa6 --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-junit</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-junit4/pom.xml index a5912c2,8f1601c..164668a --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-junit4</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant-launcher/pom.xml index 7cfb549,87fa3d1..ceef1da --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-launcher</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <name>Apache Ant Launcher</name> <build> <plugins> diff --cc src/etc/poms/ant-netrexx/pom.xml index e95dce8,c19e811..8728a0a --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-netrexx</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <name>Apache Ant + NetRexx</name> <description>NetRexxC task dependency can be downloaded from http://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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-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 145a019,9100533..2bf04ab --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-swing</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> diff --cc src/etc/poms/ant-testutil/pom.xml index 6cb8fff,fb06778..5483b4e --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-testutil</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/ant/pom.xml index d4a364b,9a96786..970fba3 --- a/src/etc/poms/ant/pom.xml +++ b/src/etc/poms/ant/pom.xml @@@ -27,19 -27,19 +27,19 @@@ <groupId>org.apache.ant</groupId> <artifactId>ant-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <name>Apache Ant Core</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant-launcher</artifactId> - <version>1.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> diff --cc src/etc/poms/pom.xml index ce7f765,9b578b9..9ce09f4 --- 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.9.16-SNAPSHOT</version> - <version>1.9.16</version> ++ <version>1.9.17-SNAPSHOT</version> <packaging>pom</packaging> <description>master POM</description> <licenses> diff --cc src/etc/testcases/taskdefs/conditions/antversion.xml index bae9e89,bae9e89..c97da9f --- 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.9.16" /> ++ <antversion exactly="1.9.17" /> </not> </condition> -- Should be exactly 1.9.16 ++ Should be exactly 1.9.17 </fail> </target> @@@ -45,10 -45,10 +45,10 @@@ <fail> <condition> <not> -- <antversion atleast="1.9.16" /> ++ <antversion atleast="1.9.17" /> </not> </condition> -- Should be at least 1.9.16 ++ Should be at least 1.9.17 </fail> </target> @@@ -57,10 -57,10 +57,10 @@@ <fail> <condition> <not> -- <antversion exactly="1.9.16" /> ++ <antversion exactly="1.9.17" /> </not> </condition> -- Should be exactly 1.9.16 ++ Should be exactly 1.9.17 </fail> </target> </project>
