Merge tag 'rel/1.10.5' and prepare next iteration Tagging version 1.10.5 of Ant
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/f5b7d05e Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/f5b7d05e Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/f5b7d05e Branch: refs/heads/master Commit: f5b7d05ef6a204462db45def8979fcc4073c48e2 Parents: 9b7914f c0848d2 Author: Stefan Bodewig <[email protected]> Authored: Fri Jul 13 12:26:22 2018 +0200 Committer: Stefan Bodewig <[email protected]> Committed: Fri Jul 13 12:28:18 2018 +0200 ---------------------------------------------------------------------- WHATSNEW | 3 +++ build.xml | 6 +++--- manual/cover.html | 6 +++--- manual/credits.html | 2 +- release/ivy.xml | 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-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 ++-- 31 files changed, 85 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/WHATSNEW ---------------------------------------------------------------------- diff --cc WHATSNEW index 1426764,1426764..462a041 --- a/WHATSNEW +++ b/WHATSNEW @@@ -1,3 -1,3 +1,6 @@@ ++Changes from Ant 1.10.5 TO Ant 1.10.6 ++===================================== ++ Changes from Ant 1.10.4 TO Ant 1.10.5 ===================================== http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/build.xml ---------------------------------------------------------------------- diff --cc build.xml index c883b70,b8975f8..99b1eee --- 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.5alpha"/> - <property name="project.version" value="1.10.5"/> ++ <property name="project.version" value="1.10.6alpha"/> <!-- 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.5-SNAPSHOT"/> - <property name="pom.version" value="1.10.5"/> -- <property name="manifest-version" value="1.10.5"/> ++ <property name="pom.version" value="1.10.6-SNAPSHOT"/> ++ <property name="manifest-version" value="1.10.6"/> <property name="bootstrap.jar" value="ant-bootstrap.jar"/> <property name="ant.package" value="org/apache/tools/ant"/> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/manual/cover.html ---------------------------------------------------------------------- diff --cc manual/cover.html index a2ea54c,a2ea54c..837f635 --- a/manual/cover.html +++ b/manual/cover.html @@@ -19,13 -19,13 +19,13 @@@ <head> <meta http-equiv="Content-Language" content="en-us"> <link rel="stylesheet" type="text/css" href="stylesheets/style.css"> --<title>Apache Ant 1.10.5 User Manual</title> ++<title>Apache Ant 1.10.6 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.5 Manual</h1> -- <p>This is the manual for version 1.10.5 of <a href="https://ant.apache.org/"; target="_top">Apache Ant</a>. If your ++ <h1 class="center">Apache Ant™ 1.10.6 Manual</h1> ++ <p>This is the manual for version 1.10.6 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 http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/manual/credits.html ---------------------------------------------------------------------- diff --cc manual/credits.html index 5c12b47,5c12b47..6e7b132 --- 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.5</p> ++<p class="center">Version: 1.10.6</p> </body> </html> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/release/ivy.xml ---------------------------------------------------------------------- diff --cc release/ivy.xml index 2f7af30,2f7af30..b90252f --- 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.5"/> ++ module="ant" revision="1.10.6"/> <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"/> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-antlr/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-antlr/pom.xml index 3965b15,5b0c324..dd3d72a --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <optional>true</optional> <scope>compile</scope> </dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-apache-bcel/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-bcel/pom.xml index 07cdd9f,b547b56..3e2cbc8 --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <name>Apache Ant + BCEL</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-apache-bsf/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-bsf/pom.xml index e641ec0,c3fafea..48dded9 --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <name>Apache Ant + BSF</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-apache-log4j/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-log4j/pom.xml index 13e6282,ac2de3e..36dbf70 --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <name>Apache Ant + Log4J</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-apache-oro/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-oro/pom.xml index 1e80110,e6a046a..14c0798 --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <name>Apache Ant + Apache Oro</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-apache-regexp/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-regexp/pom.xml index dfd3a60,4db00fb..70976ff --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <name>Apache Ant + Apache Regexp</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-apache-resolver/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-resolver/pom.xml index 290637a,aef4a8f..120ca64 --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <name>Apache Ant + Apache Resolver</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-apache-xalan2/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-apache-xalan2/pom.xml index fbd868a,baa30aa..45a5332 --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-commons-logging/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-commons-logging/pom.xml index 6363392,9ae9952..6941630 --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-commons-net/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-commons-net/pom.xml index be4dbbd,94ec079..a119fb1 --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-jai/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-jai/pom.xml index 3e88afa,dabca4a..fe6c898 --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-javamail/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-javamail/pom.xml index c34fd5b,1816226..5045720 --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-jdepend/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-jdepend/pom.xml index 37943e6,c37760d..06535be --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-jmf/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-jmf/pom.xml index 31975df,badcc1e..5f44177 --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-jsch/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-jsch/pom.xml index 85b70c3,5eb45dc..2895783 --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-junit/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-junit/pom.xml index ed1b6f4,0a2b302..99b3762 --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-junit4/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-junit4/pom.xml index 30c5c8d,ee9cf04..f64ba58 --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-junitlauncher/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-junitlauncher/pom.xml index 0397013,0925d52..cbb3d9d --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-junitlauncher</artifactId> - <version>1.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-launcher/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-launcher/pom.xml index 85d21b2,c88ad4d..902257e --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <name>Apache Ant Launcher</name> <build> <plugins> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-netrexx/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-netrexx/pom.xml index 8c883c4,4832c44..94cd31c --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <!-- Processed too early, before maven-antrun-plugin gets a chance to work: http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-swing/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-swing/pom.xml index 1bbb2d4,3dae6b7..5447dfd --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-testutil/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-testutil/pom.xml index 10224fa,f89baea..c3cfb94 --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant-xz/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-xz/pom.xml index a358729,7896158..c48695b --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-xz</artifactId> - <version>1.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/ant/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant/pom.xml index 3b2be29,f1ffb03..84be0cb --- 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.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <name>Apache Ant Core</name> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant-launcher</artifactId> - <version>1.10.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/poms/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/pom.xml index 93ee5ee,2324b5b..2c0de1a --- 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.5-SNAPSHOT</version> - <version>1.10.5</version> ++ <version>1.10.6-SNAPSHOT</version> <packaging>pom</packaging> <description>master POM</description> <licenses> http://git-wip-us.apache.org/repos/asf/ant/blob/f5b7d05e/src/etc/testcases/taskdefs/conditions/antversion.xml ---------------------------------------------------------------------- diff --cc src/etc/testcases/taskdefs/conditions/antversion.xml index 80a1133,80a1133..d8ebf4b --- 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.5" /> ++ <antversion exactly="1.10.6" /> </not> </condition> -- Should be exactly 1.10.5 ++ Should be exactly 1.10.6 </fail> </target>
